diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson index 7af817d9a..6815cabf2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Dunland.hjson @@ -193,7 +193,7 @@ unique: false side: Shadow culture: Dunland - twilight: 7 + twilight: 0 type: Artifact keywords: Support Area effects: [ diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson index 617cd9c9e..c17d28ae5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV02/V2-Rohan.hjson @@ -193,7 +193,7 @@ collInfo: V2_48 rarity: _ } - title: Fortress of My Fathers + title: Stronghold of My Fathers unique: false side: Free Peoples culture: Rohan diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseCardsFromDeckEffect.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseCardsFromDeckEffect.java index 0ab9f68a0..9d0b1ce94 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseCardsFromDeckEffect.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/choose/ChooseCardsFromDeckEffect.java @@ -81,26 +81,31 @@ public abstract class ChooseCardsFromDeckEffect extends AbstractEffect { cardsSelected(game, cards); } } else { - game.getUserFeedback().sendAwaitingDecision(_playerId, - new ArbitraryCardsSelectionDecision(1, "Choose cards from deck", new LinkedList<>(cards), minimum, _maximum) { - @Override - public void decisionMade(String result) throws DecisionResultInvalidException { - var actualSelection = getSelectedCardsByResponse(result); - if (showAll) { + + if (showAll) { + game.getUserFeedback().sendAwaitingDecision(_playerId, + new ArbitraryCardsSelectionDecision(1, "You may inspect the contents of your deck before retrieving cards", game.getGameState().getDeck(_deckId), new LinkedList<>(), 0, 0) { + @Override + public void decisionMade(String ignored) throws DecisionResultInvalidException { game.getUserFeedback().sendAwaitingDecision(_playerId, - new ArbitraryCardsSelectionDecision(2, "You may inspect the contents of your deck while retrieving cards", game.getGameState().getDeck(_deckId), new LinkedList<>(), 0, 0) { + new ArbitraryCardsSelectionDecision(2, "Choose cards from deck", new LinkedList<>(cards), minimum, _maximum) { @Override - public void decisionMade(String result2) throws DecisionResultInvalidException { - cardsSelected(game, actualSelection); + public void decisionMade(String result) throws DecisionResultInvalidException { + cardsSelected(game, getSelectedCardsByResponse(result)); } }); } - else { - cardsSelected(game, actualSelection); + }); + } + else { + game.getUserFeedback().sendAwaitingDecision(_playerId, + new ArbitraryCardsSelectionDecision(1, "Choose cards from deck", new LinkedList<>(cards), minimum, _maximum) { + @Override + public void decisionMade(String result) throws DecisionResultInvalidException { + cardsSelected(game, getSelectedCardsByResponse(result)); } - } - }); - + }); + } } return new FullEffectResult(success); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java index d6c6e82f7..95866596e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_087_Tests.java @@ -75,13 +75,12 @@ public class Card_01_087_Tests assertEquals(Zone.DECK, bb.getZone()); scn.FreepsPlayCard(late); + assertTrue(scn.FreepsDecisionAvailable("You may inspect the contents of your deck before retrieving cards")); + scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); assertEquals(2, scn.GetFreepsCardChoiceCount()); scn.FreepsChooseCardBPFromSelection(gandalf); - assertTrue(scn.FreepsDecisionAvailable("You may inspect the contents of your deck while retrieving cards")); - scn.FreepsDismissRevealedCards(); - assertEquals(Zone.FREE_CHARACTERS, gandalf.getZone()); assertEquals(Zone.DECK, bb.getZone()); } @@ -104,11 +103,11 @@ public class Card_01_087_Tests assertEquals(Zone.DECK, bb.getZone()); scn.FreepsPlayCard(late); + assertTrue(scn.FreepsDecisionAvailable("You may inspect the contents of your deck before retrieving cards")); + scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); assertEquals(2, scn.GetFreepsCardChoiceCount()); scn.FreepsChooseCardBPFromSelection(bb); - assertTrue(scn.FreepsDecisionAvailable("You may inspect the contents of your deck while retrieving cards")); - scn.FreepsDismissRevealedCards(); assertEquals(Zone.DECK, gandalf.getZone()); assertEquals(Zone.SUPPORT, bb.getZone()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_001_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_001_Tests.java index f00968556..2ee31a5fd 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_001_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set09/Card_09_001_Tests.java @@ -223,9 +223,9 @@ public class Card_09_001_Tests assertTrue(scn.FreepsActionAvailable(ring)); scn.FreepsUseCardAction(ring); + scn.FreepsDismissRevealedCards(); assertEquals(2, scn.FreepsGetSelectableCount()); scn.FreepsChooseCardBPFromSelection(ring1); - scn.FreepsDismissRevealedCards(); assertEquals(3, scn.GetBurdens()); assertEquals(Zone.ATTACHED, ring1.getZone()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_235_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_235_Tests.java index 2d47a4ce3..1632e0f3d 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_235_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set11/Card_11_235_Tests.java @@ -91,6 +91,7 @@ public class Card_11_235_Tests assertTrue(scn.FreepsHasOptionalTriggerAvailable()); scn.FreepsAcceptOptionalTrigger(); + scn.FreepsDismissRevealedCards(); //Not Listening is a response event, it shouldn't show up //Clever Hobbits is a skirmish event, also shouldn't show @@ -100,7 +101,6 @@ public class Card_11_235_Tests assertEquals(Zone.DECK, dontlook.getZone()); assertEquals(Zone.DECK, smeagol.getZone()); scn.FreepsChooseCardBPFromSelection(dontlook); - scn.FreepsDismissRevealedCards(); assertEquals(Zone.SUPPORT, dontlook.getZone()); assertEquals(Zone.DECK, smeagol.getZone()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set18/Card_18_132_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set18/Card_18_132_Tests.java index 83d632d81..53a261b95 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set18/Card_18_132_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set18/Card_18_132_Tests.java @@ -181,10 +181,10 @@ public class Card_18_132_Tests assertEquals(Zone.DECK, cantea.getZone()); scn.ShadowChoose("5"); + scn.ShadowDismissRevealedCards(); assertEquals(2, scn.ShadowGetSelectableCount()); // orc + cantea, but not TWK scn.ShadowChooseCardBPFromSelection(orc); - scn.ShadowDismissRevealedCards(); assertEquals(Zone.SHADOW_CHARACTERS, orc.getZone()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set02/Card_02_045_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set02/Card_02_045_ErrataTests.java index b90a06268..1808ac268 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set02/Card_02_045_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set02/Card_02_045_ErrataTests.java @@ -115,9 +115,10 @@ public class Card_02_045_ErrataTests assertEquals(Zone.DECK, sauron.getZone()); assertTrue(scn.ShadowHasOptionalTriggerAvailable()); scn.ShadowAcceptOptionalTrigger(); + scn.ShadowDismissRevealedCards(); assertEquals(3, scn.GetShadowCardChoiceCount()); scn.ShadowChooseCardBPFromSelection(sauron); - scn.ShadowDismissRevealedCards(); + //Decline the prevention scn.FreepsChooseNo(); assertEquals(Zone.DISCARD, attention.getZone()); @@ -154,12 +155,12 @@ public class Card_02_045_ErrataTests assertTrue(scn.ShadowHasOptionalTriggerAvailable()); scn.ShadowAcceptOptionalTrigger(); assertEquals(3, scn.GetShadowCardChoiceCount()); + scn.ShadowDismissRevealedCards(); scn.ShadowChooseCardBPFromSelection(sauron); //Accept the prevention assertEquals(7, scn.GetFreepsDeckCount()); assertEquals(0, scn.GetFreepsDiscardCount()); - scn.ShadowDismissRevealedCards(); scn.FreepsChooseYes(); assertEquals(1, scn.GetFreepsDeckCount()); assertEquals(6, scn.GetFreepsDiscardCount()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_082_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_082_ErrataTests.java index 81f23434a..5fc2ec4d3 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_082_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_082_ErrataTests.java @@ -132,6 +132,7 @@ public class Card_18_082_ErrataTests scn.FreepsChooseCardIDFromSelection(chaff1, shadow1); assertEquals(Zone.DECK, chaff1.getZone()); assertEquals(Zone.DECK, shadow1.getZone()); + scn.ShadowDismissRevealedCards(); assertTrue(scn.ShadowDecisionAvailable("Choose card")); // 5 starting freeps cards - 2 put in hand + 1 shuffled into deck @@ -139,7 +140,7 @@ public class Card_18_082_ErrataTests assertEquals(Zone.DECK, chaff3.getZone()); assertEquals(Zone.DECK, chaff4.getZone()); scn.ShadowChooseCardBPFromSelection(chaff3, chaff4); - scn.ShadowDismissRevealedCards(); + assertEquals(Zone.DISCARD, chaff3.getZone()); assertEquals(Zone.DISCARD, chaff4.getZone()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_096_ErrataTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_096_ErrataTests.java index a2d4d3cb2..2fa052516 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_096_ErrataTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/errata/set18/Card_18_096_ErrataTests.java @@ -99,10 +99,11 @@ public class Card_18_096_ErrataTests assertTrue(scn.FreepsActionAvailable(horn)); scn.FreepsUseCardAction(horn); + scn.FreepsDismissRevealedCards(); assertEquals(1, scn.GetWoundsOn(eomer)); scn.FreepsChooseCardBPFromSelection(worker); - scn.FreepsDismissRevealedCards(); + assertEquals(Zone.SUPPORT, worker.getZone()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_013_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_013_Tests.java index 2ae70aa14..97e566fd4 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_013_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_013_Tests.java @@ -92,11 +92,11 @@ public class Card_V1_013_Tests assertEquals(0, scn.GetTwilight()); scn.FreepsPlayCard(counsel); + scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); // Choices available should be 1 Elrond, 1 Galadriel, 1 Orophin assertEquals(3, scn.GetFreepsCardChoiceCount()); scn.FreepsChooseCardBPFromSelection(scn.GetFreepsCard("elrond")); - scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Would you like to pay")); scn.FreepsChooseYes(); @@ -125,11 +125,11 @@ public class Card_V1_013_Tests assertEquals(0, scn.GetTwilight()); scn.FreepsPlayCard(counsel); + scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); // Choices available should be 1 Elrond, 1 Galadriel, 1 Orophin assertEquals(3, scn.GetFreepsCardChoiceCount()); scn.FreepsChooseCardBPFromSelection(scn.GetFreepsCard("elrond")); - scn.FreepsDismissRevealedCards(); assertTrue(scn.FreepsDecisionAvailable("Would you like to pay")); scn.FreepsChooseNo(); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_037_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_037_Tests.java index e794a20c1..ff287f0ce 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_037_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_037_Tests.java @@ -96,9 +96,9 @@ public class Card_V1_037_Tests assertTrue(scn.ShadowPlayAvailable(fell2)); scn.ShadowPlayCard(fell2); + scn.ShadowDismissRevealedCards(); scn.ShadowChooseCardBPFromSelection(blade); - scn.ShadowDismissRevealedCards(); assertEquals(Zone.ATTACHED, blade.getZone()); assertEquals(nazgul, blade.getAttachedTo()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_050_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_050_Tests.java index 65ae1398d..9ac9e3bba 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_050_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_050_Tests.java @@ -125,6 +125,7 @@ public class Card_V1_050_Tests assertEquals(0, scn.GetWoundsOn(bilbo)); scn.FreepsUseCardAction(bilbo); + scn.FreepsDismissRevealedCards(); assertEquals(2, scn.GetWoundsOn(bilbo)); assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); assertEquals(3, scn.GetFreepsCardChoiceCount()); // coat, sting, and phial @@ -137,7 +138,6 @@ public class Card_V1_050_Tests assertTrue(scn.FreepsDecisionAvailable("Choose cards from deck")); assertEquals(2, scn.GetFreepsCardChoiceCount()); scn.FreepsChooseCardBPFromSelection(phial); - scn.FreepsDismissRevealedCards(); assertEquals(Zone.ATTACHED, phial.getZone()); assertEquals(frodo, phial.getAttachedTo()); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_057_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_057_Tests.java index 666b1d2b5..d13c30c9d 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_057_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v01/Card_V1_057_Tests.java @@ -89,9 +89,9 @@ public class Card_V1_057_Tests assertEquals(Zone.DECK, cond.getZone()); scn.FreepsAcceptOptionalTrigger(); + scn.FreepsDismissRevealedCards(); assertEquals(1, scn.GetWoundsOn(frodo)); scn.FreepsChooseCardBPFromSelection(cond); - scn.FreepsDismissRevealedCards(); assertEquals(Zone.ATTACHED, cond.getZone()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java index 503b29af1..50f6ca456 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_022_Tests.java @@ -116,13 +116,13 @@ public class Card_V2_022_Tests assertEquals(8, scn.GetShadowDeckCount()); scn.ShadowPlayCard(folly); + scn.ShadowDismissRevealedCards(); //8 cards, 7 items, but 2 are free peoples assertEquals(5, scn.GetShadowCardChoiceCount()); scn.ShadowDecisionAvailable("Choose cards from deck"); assertEquals(0, scn.ShadowGetChoiceMin()); assertEquals(4, scn.ShadowGetChoiceMax()); scn.ShadowChooseCardBPFromSelection(item1, item2, item3, item4); - scn.ShadowDismissRevealedCards(); assertEquals(4, scn.GetShadowHandCount()); assertEquals(4, scn.GetShadowDeckCount()); } @@ -153,13 +153,13 @@ public class Card_V2_022_Tests assertEquals(9, scn.GetShadowDeckCount()); scn.ShadowPlayCard(folly); + scn.ShadowDismissRevealedCards(); //8 cards, 7 items, but 2 are free peoples assertEquals(5, scn.GetShadowCardChoiceCount()); scn.ShadowDecisionAvailable("Choose cards from deck"); assertEquals(0, scn.ShadowGetChoiceMin()); assertEquals(4, scn.ShadowGetChoiceMax()); scn.ShadowChooseCardBPFromSelection(item1, item2, item3, item4); - scn.ShadowDismissRevealedCards(); assertEquals(4, scn.GetShadowHandCount()); assertEquals(4, scn.GetShadowDeckCount()); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_036_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_036_Tests.java index 38094d65e..80287d0c1 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_036_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_036_Tests.java @@ -128,22 +128,22 @@ public class Card_V2_036_Tests assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); scn.ShadowChooseMultipleChoiceOption("deck"); + scn.ShadowDismissRevealedCards(); assertEquals(3, scn.ShadowGetSelectableCount()); assertEquals(Zone.DECK, warg1.getZone()); scn.ShadowChooseCardBPFromSelection(warg1); - scn.ShadowDismissRevealedCards(); assertEquals(Zone.STACKED, warg1.getZone()); assertSame(pit, warg1.getStackedOn()); //We now optionally do it all again a second time assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); scn.ShadowChooseMultipleChoiceOption("deck"); + scn.ShadowDismissRevealedCards(); assertEquals(2, scn.ShadowGetSelectableCount()); assertEquals(Zone.DECK, warg2.getZone()); scn.ShadowChooseCardBPFromSelection(warg2); - scn.ShadowDismissRevealedCards(); assertEquals(Zone.STACKED, warg2.getZone()); assertSame(pit, warg2.getStackedOn()); @@ -174,11 +174,11 @@ public class Card_V2_036_Tests assertTrue(scn.ShadowDecisionAvailable("Choose action to perform")); scn.ShadowChooseMultipleChoiceOption("deck"); + scn.ShadowDismissRevealedCards(); assertEquals(1, scn.ShadowGetSelectableCount()); assertEquals(Zone.DECK, warg1.getZone()); scn.ShadowChooseCardBPFromSelection(warg1); - scn.ShadowDismissRevealedCards(); assertEquals(Zone.STACKED, warg1.getZone()); assertSame(pit, warg1.getStackedOn());