From b69097c4e5ea2db258f5d451d1130a787055a905 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 8 Nov 2024 19:41:06 -0600 Subject: [PATCH] Fixed set 8 Eomer and Faramir only playing 1 revealed card. Added Now For Wrath unit test. --- .../cards/official/set08/set08-Gondor.hjson | 19 +++++++++++++++---- .../cards/official/set08/set08-Rohan.hjson | 16 ++++++++++++---- .../effect/appender/PlayCardFromDrawDeck.java | 2 +- .../pc/vsets/set_v02/Card_V2_051_Tests.java | 2 +- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson index 4b1cd5b98..ed1b247fe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gondor.hjson @@ -201,10 +201,21 @@ memorize: revealedCards } { - type: playCardFromDrawDeck - select: choose(memory(revealedCards),knight) - showAll: false - shuffle: true + type: Repeat + times: { + type: ForEachInMemory + memory: revealedCards + filter: knight + } + effect: { + type: playCardFromDrawDeck + select: choose(memory(revealedCards),knight) + showAll: false + shuffle: false + } + } + { + type: shuffleDeck } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Rohan.hjson index fd1820b40..a98604a1d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Rohan.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Rohan.hjson @@ -140,10 +140,18 @@ memorize: revealedCards } { - type: playCardFromDrawDeck - select: choose(memory(revealedCards),culture(rohan),possession) - showAll: false - shuffle: false + type: Repeat + times: { + type: ForEachInMemory + memory: revealedCards + filter: culture(rohan),possession + } + effect: { + type: playCardFromDrawDeck + select: choose(memory(revealedCards),culture(rohan),possession) + showAll: false + shuffle: false + } } { type: shuffleDeck diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDrawDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDrawDeck.java index b76dc6c1a..7c56383e2 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDrawDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PlayCardFromDrawDeck.java @@ -68,7 +68,7 @@ public class PlayCardFromDrawDeck implements EffectAppenderProducer { final CostToEffectAction playCardAction = PlayUtils.getPlayCardAction(actionContext.getGame(), cardsToPlay.iterator().next(), costModifier, onFilterable, false); return new StackActionEffect(playCardAction); } else { - // This will notify any effect that uses playing from deck as a cost, that the cost was not "payed" + // This will notify any effect that uses playing from deck as a cost, that the cost was not "paid" return new FailedEffect(); } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java index 1a00834f8..171610117 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/unofficial/pc/vsets/set_v02/Card_V2_051_Tests.java @@ -57,7 +57,7 @@ public class Card_V2_051_Tests } @Test - public void NowforWrathTest1() throws DecisionResultInvalidException, CardNotFoundException { + public void NowforWrathReactsToReconciledPossessionDiscard() throws DecisionResultInvalidException, CardNotFoundException { //Pre-game setup var scn = GetScenario();