From 43184e39673227caf066b2deb77e4d7f34cc845c Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 31 May 2024 13:42:48 -0500 Subject: [PATCH] Renamed MemorizeValue -> MemorizeInfo. Minor parameter tweaks in other effects. --- .../resources/cards/official/set01/set1-wraith.hjson | 4 ++-- .../main/resources/cards/official/set13/set13-Orc.hjson | 4 ++-- .../resources/cards/official/set13/set13-Rohan.hjson | 4 ++-- .../resources/cards/official/set15/set15-Gandalf.hjson | 8 ++++---- .../resources/cards/official/set15/set15-Sites.hjson | 4 ++-- .../resources/cards/official/set17/set17-Elven.hjson | 8 ++++---- .../pc/errata/set01/set01-Ringwraith-errata.hjson | 4 ++-- .../cards/build/field/effect/EffectAppenderFactory.java | 2 +- .../build/field/effect/appender/MemorizeDiscard.java | 4 ++-- .../appender/{MemorizeValue.java => MemorizeInfo.java} | 9 ++++----- 10 files changed, 25 insertions(+), 26 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/{MemorizeValue.java => MemorizeInfo.java} (83%) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson index 3b9a00464..69317ca77 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-wraith.hjson @@ -982,9 +982,9 @@ } effect: [ { - type: MemorizeValue + type: MemorizeInfo memory: choice - value: yes + info: yes } { type: If 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 319730c1b..6471c184c 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 @@ -1139,9 +1139,9 @@ amount: 2 } effect: { - type: memorizeValue + type: MemorizeInfo memory: removedBurdens - value: yes + info: yes } } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Rohan.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Rohan.hjson index 8e9521600..17b8c6174 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Rohan.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Rohan.hjson @@ -857,9 +857,9 @@ select: choose(name(Théoden)) } effect: { - type: memorizeValue + type: MemorizeInfo memory: exertedTheoden - value: yes + info: yes } } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson index 326075ba5..444ca8414 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gandalf.hjson @@ -391,9 +391,9 @@ filter: ent } true: { - type: memorizeValue + type: MemorizeInfo memory: effect - value: first + info: first } } { @@ -404,9 +404,9 @@ count: 2 } true: { - type: memorizeValue + type: MemorizeInfo memory: effect - value: second + info: second } } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Sites.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Sites.hjson index 407f59c4c..8504217a3 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Sites.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Sites.hjson @@ -343,9 +343,9 @@ } effect: [ { - type: memorizeValue + type: MemorizeInfo memory: used - value: yes + info: yes } { type: storeWhileInZone diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson index 3ecf8b7b7..056419d08 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set17/set17-Elven.hjson @@ -544,9 +544,9 @@ type: addThreats } { - type: memorizeValue + type: MemorizeInfo memory: played - value: first + info: first } ] } @@ -558,9 +558,9 @@ amount: 3 } { - type: memorizeValue + type: MemorizeInfo memory: played - value: second + info: second } ] } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson index 01d308b44..847cf2ee9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set01/set01-Ringwraith-errata.hjson @@ -32,9 +32,9 @@ } effect: [ { - type: MemorizeValue + type: MemorizeInfo memory: choice - value: yes + info: yes } { type: If 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 134e400be..32d443fcb 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 @@ -85,11 +85,11 @@ public class EffectAppenderFactory { effectAppenderProducers.put("memorize", new MemorizeActive()); effectAppenderProducers.put("memorizeactive", new MemorizeActive()); effectAppenderProducers.put("memorizediscard", new MemorizeDiscard()); + effectAppenderProducers.put("memorizeinfo", new MemorizeInfo()); effectAppenderProducers.put("memorizenumber", new MemorizeNumber()); effectAppenderProducers.put("memorizestacked", new MemorizeStacked()); effectAppenderProducers.put("memorizetitle", new MemorizeTitle()); effectAppenderProducers.put("memorizetopofdeck", new MemorizeTopOfDeck()); - effectAppenderProducers.put("memorizevalue", new MemorizeValue()); effectAppenderProducers.put("modifyarcherytotal", new ModifyArcheryTotal()); effectAppenderProducers.put("modifyresistance", new ModifyResistance()); effectAppenderProducers.put("modifysitenumber", new ModifySiteNumber()); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeDiscard.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeDiscard.java index d607ade5a..7f1487546 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeDiscard.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeDiscard.java @@ -25,12 +25,12 @@ public class MemorizeDiscard implements EffectAppenderProducer { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { FieldUtils.validateAllowedFields(effectObject, "filter", "memory", "uniqueTitles"); - final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); + final String filter = FieldUtils.getString(effectObject.get("filter"), "filter", "any"); final String memory = FieldUtils.getString(effectObject.get("memory"), "memory"); final boolean uniqueTitles = FieldUtils.getBoolean(effectObject.get("uniqueTitles"), "uniqueTitles", false); if (memory == null) - throw new InvalidCardDefinitionException("Memory is required for a Memorize effect."); + throw new InvalidCardDefinitionException("Memory is required for a MemorizeDiscard effect."); final FilterableSource filterSource = environment.getFilterFactory().generateFilter(filter, environment); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeValue.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeInfo.java similarity index 83% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeValue.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeInfo.java index 3c750134f..1ee41ff91 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeValue.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/MemorizeInfo.java @@ -12,12 +12,12 @@ import com.gempukku.lotro.logic.timing.Effect; import com.gempukku.lotro.logic.timing.UnrespondableEffect; import org.json.simple.JSONObject; -public class MemorizeValue implements EffectAppenderProducer { +public class MemorizeInfo implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "value", "memory"); + FieldUtils.validateAllowedFields(effectObject, "info", "memory"); - final String value = FieldUtils.getString(effectObject.get("value"), "value"); + final String info = FieldUtils.getString(effectObject.get("info"), "info"); final String memory = FieldUtils.getString(effectObject.get("memory"), "memory"); if (memory == null) @@ -29,11 +29,10 @@ public class MemorizeValue implements EffectAppenderProducer { return new UnrespondableEffect() { @Override protected void doPlayEffect(LotroGame game) { - actionContext.setValueToMemory(memory, value); + actionContext.setValueToMemory(memory, info); } }; } }; } - }