update

jleclanche · Dec 7, 2023 · 9cee464 · 9cee464
1 parent 01b0b35
commit 9cee464
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/fireplace/dsl/selector.py b/fireplace/dsl/selector.py
@@ -534,14 +534,14 @@ def CONTROLLED_BY(selector):
 
 NEUTRAL = AttrValue(GameTag.CLASS) == CardClass.NEUTRAL
 
-LEFTMOST_FIELD = FuncSelector(lambda entities, source: [
-	source.game.player1.field[0], source.game.player2.field[0]])
-RIGTHMOST_FIELD = FuncSelector(lambda entities, source: [
-	source.game.player1.field[-1], source.game.player2.field[-1]])
-LEFTMOST_HAND = FuncSelector(lambda entities, source: [
-	source.game.player1.hand[0], source.game.player2.hand[0]])
-RIGTHMOST_HAND = FuncSelector(lambda entities, source: [
-	source.game.player1.hand[-1], source.game.player2.hand[-1]])
+LEFTMOST_FIELD = FuncSelector(lambda entities, source:
+	source.game.player1.field[:1] + source.game.player2.field[:1])
+RIGTHMOST_FIELD = FuncSelector(lambda entities, source:
+	source.game.player1.field[-1:] + source.game.player2.field[-1:])
+LEFTMOST_HAND = FuncSelector(lambda entities, source:
+	source.game.player1.hand[:1] + source.game.player2.hand[-1:])
+RIGTHMOST_HAND = FuncSelector(lambda entities, source:
+	source.game.player1.hand[:1] + source.game.player2.hand[-1:])
 OUTERMOST_HAND = LEFTMOST_HAND + RIGTHMOST_HAND
 
 CARDS_PLAYED_THIS_GAME = FuncSelector(

diff --git a/tests/test_kobolds.py b/tests/test_kobolds.py
@@ -96,3 +96,25 @@ def test_windshear_stormcaller():
 		game.player1.give(totem).play()
 	game.player1.give("LOOT_518").play()
 	assert game.player1.field[5].id == "NEW1_010"
+
+
+def test_crushing_walls():
+	game = prepare_game()
+	game.player1.give(WISP).play()
+	game.end_turn()
+	game.player2.give("LOOT_522").play()
+	assert len(game.player1.field) == 0
+	game.end_turn()
+	game.player1.give(WISP).play()
+	game.player1.give(WISP).play()
+	game.end_turn()
+	game.player2.give("LOOT_522").play()
+	assert len(game.player1.field) == 0
+	game.end_turn()
+	game.player1.give(WISP).play()
+	game.player1.give(CHICKEN).play()
+	game.player1.give(WISP).play()
+	game.end_turn()
+	game.player2.give("LOOT_522").play()
+	assert len(game.player1.field) == 1
+	assert game.player1.field[0].id == CHICKEN