From 791a2b482f170a50ba32d8cbe202c9b8544fb841 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Wed, 20 Nov 2024 22:53:33 -0600 Subject: [PATCH] Now that hand->deck actions default to not revealing the placed cards, went through all cards that use these actions and turned on revealing for those that should announce the placed card. --- .../src/main/resources/cards/official/set01/set01-Elven.hjson | 1 + .../main/resources/cards/official/set03/set03-Isengard.hjson | 1 + .../src/main/resources/cards/official/set04/set04-Rohan.hjson | 1 + .../src/main/resources/cards/official/set06/set06-Dwarven.hjson | 2 ++ .../src/main/resources/cards/official/set08/set08-Shire.hjson | 1 + .../src/main/resources/cards/official/set09/set09-Gollum.hjson | 1 + .../main/resources/cards/official/set11/set11-Ringwraith.hjson | 1 + .../src/main/resources/cards/official/set17/set17-Orc.hjson | 1 + .../cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson | 1 + .../unofficial/pc/errata/set03/set03-Isengard-errata.hjson | 1 + .../field/effect/appender/PutCardsFromHandOnBottomOfDeck.java | 1 - .../field/effect/appender/PutCardsFromHandOnTopOfDeck.java | 1 - 12 files changed, 11 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set01-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set01-Elven.hjson index 74807ada2..2d19a9926 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set01-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set01-Elven.hjson @@ -1155,6 +1155,7 @@ { type: putCardsFromHandOnBottomOfDeck select: memory(revealedCards) + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Isengard.hjson index fd687e689..379280dfe 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set03/set03-Isengard.hjson @@ -822,6 +822,7 @@ type: putCardsFromHandOnTopOfDeck hand: fp select: memory(revealedCard) + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Rohan.hjson index f780a9c6e..5f5f75bf6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Rohan.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Rohan.hjson @@ -1365,6 +1365,7 @@ { type: putCardsFromHandOnBottomOfDeck select: choose(villager) + reveal: true } ] effect: { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Dwarven.hjson index 754135412..8b113034a 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Dwarven.hjson @@ -175,10 +175,12 @@ { type: putCardsFromHandOnTopOfDeck select: choose(culture(dwarven)) + reveal: true } { type: putCardsFromhandOnBottomOfDeck select: choose(culture(dwarven)) + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson index c42ae3c57..688e6d642 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Shire.hjson @@ -34,6 +34,7 @@ { type: putCardsFromHandOnBottomOfDeck select: all(side(free people)) + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Gollum.hjson index c07bb8156..ad2d40224 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set09-Gollum.hjson @@ -138,6 +138,7 @@ effect: { type: putCardsFromHandOnBottomOfDeck select: choose(side(shadow)) + reveal: true } } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Ringwraith.hjson index 27060490f..b95a3f4bb 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Ringwraith.hjson @@ -277,6 +277,7 @@ { type: putCardsFromHandOnBottomOfDeck select: memory(revealedCard) + reveal: true } { type: drawCards diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Orc.hjson index 0b80fbe66..f247ad6d1 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Orc.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Orc.hjson @@ -148,6 +148,7 @@ player: free people select: choose(memory(revealedCards),side(free people)) count: 2 + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson index 0a3edc991..a5e3501ef 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Elven-errata.hjson @@ -509,6 +509,7 @@ select: choose(memory(revealedCards)) player: freeps hand: shadow + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson index 46587c348..fd1c344fa 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set03/set03-Isengard-errata.hjson @@ -584,6 +584,7 @@ select: all(memory(revealedCard)) player: shadow hand: freeps + reveal: true } ] } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java index 2dcf21807..04f0fb674 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnBottomOfDeck.java @@ -28,7 +28,6 @@ public class PutCardsFromHandOnBottomOfDeck implements EffectAppenderProducer { final String player = FieldUtils.getString(effectObject.get("player"), "player", "you"); final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)"); final ValueSource count = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); - // TODO - changed the default - have to go through all cards to check which should be revealed final boolean reveal = FieldUtils.getBoolean(effectObject.get("reveal"), "reveal", false); MultiEffectAppender result = new MultiEffectAppender(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java index 90df9220d..c2ae4483f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PutCardsFromHandOnTopOfDeck.java @@ -29,7 +29,6 @@ public class PutCardsFromHandOnTopOfDeck implements EffectAppenderProducer { final String hand = FieldUtils.getString(effectObject.get("hand"), "hand", "you"); final String select = FieldUtils.getString(effectObject.get("select"), "select", "choose(any)"); final ValueSource count = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment); - // TODO - changed the default - have to go through all cards to check which should be revealed final boolean reveal = FieldUtils.getBoolean(effectObject.get("reveal"), "reveal", false); MultiEffectAppender result = new MultiEffectAppender();