From 6a05210198e11c5aded7cf56bd251ea44413a7a4 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 1 Jun 2024 18:50:27 -0500 Subject: [PATCH] Rename StackCards -> StackCardsFromPlay --- .../main/resources/cards/official/set01/set1-moria.hjson | 2 +- .../main/resources/cards/official/set04/set04-Dunland.hjson | 4 ++-- .../main/resources/cards/official/set04/set04-Gandalf.hjson | 2 +- .../resources/cards/official/set04/set04-Isengard.hjson | 6 +++--- .../main/resources/cards/official/set05/set05-Sauron.hjson | 2 +- .../resources/cards/official/set06/set06-Isengard.hjson | 2 +- .../main/resources/cards/official/set07/set07-Sauron.hjson | 6 +++--- .../main/resources/cards/official/set08/set08-Gollum.hjson | 2 +- .../resources/cards/official/set08/set08-Ringwraith.hjson | 2 +- .../main/resources/cards/official/set08/set08-Sauron.hjson | 6 +++--- .../main/resources/cards/official/set10/set10-Sauron.hjson | 2 +- .../src/main/resources/cards/official/set13/set13-Orc.hjson | 2 +- .../src/main/resources/cards/official/set17/set17-Men.hjson | 2 +- .../src/main/resources/cards/official/set18/set18-Men.hjson | 2 +- .../cards/unofficial/hobbit/set31/set31-shadow.hjson | 2 +- .../cards/unofficial/hobbit/set32/set32-shadow.hjson | 2 +- .../cards/unofficial/hobbit/set33/set33-shadow.hjson | 2 +- .../resources/cards/unofficial/pc/setV01/V1_elven.hjson | 2 +- .../resources/cards/unofficial/pc/setV01/V1_moria.hjson | 2 +- .../unofficial/second-edition/set40/set40-isengard.hjson | 2 +- .../cards/unofficial/second-edition/set40/set40-moria.hjson | 6 +++--- .../cards/build/field/effect/EffectAppenderFactory.java | 2 +- .../appender/{StackCards.java => StackCardsFromPlay.java} | 4 ++-- 23 files changed, 33 insertions(+), 33 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/{StackCards.java => StackCardsFromPlay.java} (95%) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson index bdfd68596..e1ae7b516 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson @@ -481,7 +481,7 @@ filter: your,culture(moria),orc,inSkirmish } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,culture(moria),orc,inSkirmish) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson index c381a4a07..e208f5711 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Dunland.hjson @@ -409,7 +409,7 @@ filter: self } effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } @@ -1124,7 +1124,7 @@ filter: self } effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson index 119a872cc..95287ae99 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Gandalf.hjson @@ -802,7 +802,7 @@ filter: unbound,hobbit } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(unbound,hobbit,gettingDiscarded) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson index b41fa3302..443e82393 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set04/set04-Isengard.hjson @@ -2623,7 +2623,7 @@ type: controlsSite } effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } @@ -3761,7 +3761,7 @@ type: controlsSite } effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } @@ -3893,7 +3893,7 @@ type: controlsSite } effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Sauron.hjson index 588330b08..fe2bea699 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set05/set05-Sauron.hjson @@ -996,7 +996,7 @@ } ] effect: { - type: stackCards + type: StackCardsFromPlay select: memory(spottedOrc) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson index 6aea910cb..a646683a4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set06/set06-Isengard.hjson @@ -1126,7 +1126,7 @@ against: culture(isengard),man } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(possession) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson index ae5a378af..2c176a85b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Sauron.hjson @@ -709,7 +709,7 @@ count: 1 } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(culture(sauron),orc,besieger) where: choose(controlledSite) } @@ -724,7 +724,7 @@ count: 2 } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(culture(sauron),orc,not(besieger)) where: choose(controlledSite) } @@ -1073,7 +1073,7 @@ type: activated phase: skirmish cost: { - type: stackCards + type: StackCardsFromPlay select: choose(besieger) where: choose(controlledSite) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gollum.hjson index 003132702..d8ba5c89e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gollum.hjson @@ -553,7 +553,7 @@ } ] effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,or(orc,and(culture(gollum),minion))) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson index 974809709..d37dc32c7 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Ringwraith.hjson @@ -297,7 +297,7 @@ } ] effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,culture(wraith),minion) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson index d6ee50515..6021a623d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Sauron.hjson @@ -316,7 +316,7 @@ select: self } { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } @@ -968,7 +968,7 @@ type: removeThreats } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,culture(sauron),minion) where: choose(controlledSite) } @@ -1051,7 +1051,7 @@ select: self } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,besieger) where: choose(controlledSite) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson index 97c291aa3..73d923390 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Sauron.hjson @@ -622,7 +622,7 @@ type: activated phase: regroup effect: { - type: stackCards + type: StackCardsFromPlay select: self where: choose(controlledSite) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Orc.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Orc.hjson index d5e6f9f5d..bef77142b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Orc.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Orc.hjson @@ -244,7 +244,7 @@ memorize: spottedMinion } effect: { - type: stackCards + type: StackCardsFromPlay select: memory(spottedMinion) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Men.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Men.hjson index 7188ce362..822ae7d8c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Men.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Men.hjson @@ -518,7 +518,7 @@ checkTarget: true } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(culture(men),minion) where: choose(culture(men),possession,zone(support)) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Men.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Men.hjson index 7e37b69ef..d6d32fb31 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Men.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set18/set18-Men.hjson @@ -949,7 +949,7 @@ select: self } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(culture(men),man) where: choose(possession) } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson index 4b4b9a546..8a9c610f4 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson @@ -617,7 +617,7 @@ filter: your,orc,inSkirmish } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,orc,inSkirmish) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson index 9542b6cc5..a26776398 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set32/set32-shadow.hjson @@ -609,7 +609,7 @@ times: 2 } effect: { - type: stackCards + type: StackCardsFromPlay select: memory(wiseCharacter) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson index 1ebf51d50..f4d936a30 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-shadow.hjson @@ -442,7 +442,7 @@ } ] effect: { - type: stackCards + type: StackCardsFromPlay select: choose(lowestStrength(culture(dwarven),companion)) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven.hjson index ceea71c25..fb36da5bd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_elven.hjson @@ -289,7 +289,7 @@ phase: fellowship cost: { - type: stackcards + type: StackCardsFromPlay select: choose(your,or(tale,artifact),not(self)) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson index 1f611b1ba..ea5e4b079 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_moria.hjson @@ -14,7 +14,7 @@ filter: your,tentacle,inSkirmish } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(your,tentacle,inSkirmish) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson index 4a38af842..f11e43510 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-isengard.hjson @@ -653,7 +653,7 @@ type: activated phase: regroup effect: { - type: stackCards + type: StackCardsFromPlay select: choose(name(Saruman),not(exhausted)) where: self } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson index 9d964a4dc..2f5fe2ca5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-moria.hjson @@ -277,7 +277,7 @@ filter: self } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(goblin) where: choose(culture(moria),condition) } @@ -570,7 +570,7 @@ filter: culture(moria),goblin,inSkirmish } effect: { - type: stackCards + type: StackCardsFromPlay where: self select: choose(culture(moria),goblin,inSkirmish) } @@ -806,7 +806,7 @@ amount: 3 } effect: { - type: stackCards + type: StackCardsFromPlay select: choose(culture(moria),goblin) where: choose(culture(moria),support area,condition) } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java index f87c60ba3..0b5e71137 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/EffectAppenderFactory.java @@ -176,7 +176,7 @@ public class EffectAppenderFactory { effectAppenderProducers.put("shuffledeck", new ShuffleDeck()); effectAppenderProducers.put("shufflehandintodrawdeck", new ShuffleHandIntoDrawDeck()); effectAppenderProducers.put("spot", new Spot()); - effectAppenderProducers.put("stackcards", new StackCards()); + effectAppenderProducers.put("stackcardsfromplay", new StackCardsFromPlay()); effectAppenderProducers.put("stackcardsfromdeck", new StackCardsFromDeck()); effectAppenderProducers.put("stackcardsfromdiscard", new StackCardsFromDiscard()); effectAppenderProducers.put("stackcardsfromhand", new StackCardsFromHand()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCards.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromPlay.java similarity index 95% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCards.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromPlay.java index 45b7ea141..275d0d1ee 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCards.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/StackCardsFromPlay.java @@ -19,7 +19,7 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; -public class StackCards implements EffectAppenderProducer { +public class StackCardsFromPlay implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "select", "where", "count"); @@ -28,7 +28,7 @@ public class StackCards implements EffectAppenderProducer { final String where = FieldUtils.getString(effectObject.get("where"), "where"); if (where == null) - throw new InvalidCardDefinitionException("You need to define where to stack the cards"); + throw new InvalidCardDefinitionException("You need to define where to stack the cards for StackCards effect"); final ValueSource valueSource = ValueResolver.resolveEvaluator(effectObject.get("count"), 1, environment);