From fc5bcd169e71601488450367fe403b2aa605d114 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 12 Nov 2023 14:30:02 -0600 Subject: [PATCH] Renaming json effect CantBeOverwhelmedMultiplier -> AlterOverwhelmMultiplier --- .../src/main/resources/cards/official/set01/set1-shire.hjson | 2 +- .../src/main/resources/cards/official/set09/set9-2.hjson | 2 +- .../main/resources/cards/unofficial/pc/setV01/V1_shire.hjson | 2 +- .../cards/unofficial/second-edition/set40/set40-shire.hjson | 4 ++-- .../lotro/cards/build/field/effect/EffectAppenderFactory.java | 2 +- ...erwhelmedMultiplier.java => AlterOverwhelmMultiplier.java} | 2 +- .../field/effect/appender/AssignFpCharacterToSkirmish.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/{CantBeOverwhelmedMultiplier.java => AlterOverwhelmMultiplier.java} (97%) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson index e4c97ed95..ef8faf1e3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-shire.hjson @@ -72,7 +72,7 @@ filter: self } effect: { - type: cantBeOverwhelmedMultiplier + type: AlterOverwhelmMultiplier filter: choose(hobbit) } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson index 2f13d831b..309f69a2f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set09/set9-2.hjson @@ -1059,7 +1059,7 @@ phase: skirmish effect: [ { - type: cantBeOverwhelmedMultiplier + type: AlterOverwhelmMultiplier filter: choose(unbound,hobbit) } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson index cb156ad12..9cc9ef651 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_shire.hjson @@ -141,7 +141,7 @@ } effect: [ { - type: cantBeOverwhelmedMultiplier + type: AlterOverwhelmMultiplier filter: choose(culture(shire),companion,inSkirmish) memorize: shireCompanion } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson index 16aa90503..42896b16f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-shire.hjson @@ -104,7 +104,7 @@ filter: self } effect: { - type: cantBeOverwhelmedMultiplier + type: AlterOverwhelmMultiplier filter: choose(hobbit) multiplier: 3 } @@ -1011,7 +1011,7 @@ ] effects: [ { - type: cantBeOverwhelmedMultiplier + type: AlterOverwhelmMultiplier filter: choose(hobbit) } { 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 b55174a0d..636c376c9 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 @@ -28,7 +28,7 @@ public class EffectAppenderFactory { effectAppenderProducers.put("cancelevent", new CancelEvent()); effectAppenderProducers.put("cancelskirmish", new CancelSkirmish()); effectAppenderProducers.put("cantbeassignedtoskirmish", new CantBeAssignedToSkirmish()); - effectAppenderProducers.put("cantbeoverwhelmedmultiplier", new CantBeOverwhelmedMultiplier()); + effectAppenderProducers.put("alteroverwhelmmultiplier", new AlterOverwhelmMultiplier()); effectAppenderProducers.put("canttakemorewoundsthan", new CantTakeMoreWoundsThan()); effectAppenderProducers.put("canttakewounds", new CantTakeWounds()); effectAppenderProducers.put("choice", new Choice()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AlterOverwhelmMultiplier.java similarity index 97% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AlterOverwhelmMultiplier.java index 11bebef6c..4d14e5009 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantBeOverwhelmedMultiplier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AlterOverwhelmMultiplier.java @@ -19,7 +19,7 @@ import org.json.simple.JSONObject; import java.util.Collection; -public class CantBeOverwhelmedMultiplier implements EffectAppenderProducer { +public class AlterOverwhelmMultiplier implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "filter", "until", "multiplier", "memorize"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignFpCharacterToSkirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignFpCharacterToSkirmish.java index 7f74df720..3f50b0c9d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignFpCharacterToSkirmish.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AssignFpCharacterToSkirmish.java @@ -74,6 +74,6 @@ public class AssignFpCharacterToSkirmish implements EffectAppenderProducer { return environment.getFilterFactory().generateFilter(filter.substring(filter.indexOf("(") + 1, filter.lastIndexOf(")")), environment); if (filter.equals("self")) return ActionContext::getSource; - throw new InvalidCardDefinitionException("The filters for this effect have to be of 'choose' type or 'self'"); + throw new InvalidCardDefinitionException("The selectors for this effect have to be of 'choose' type or 'self'"); } }