From 5e218b106e2241e05165c154a24668a621dd53b7 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Wed, 28 Aug 2019 13:37:29 -0700 Subject: [PATCH] Changed "memory" to "memorize" --- gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json | 4 ++-- .../lotro/cards/build/field/effect/appender/AddKeyword.java | 6 +++--- .../build/field/effect/appender/CantTakeMoreWoundsThan.java | 6 +++--- .../cards/build/field/effect/appender/DiscardFromPlay.java | 4 ++-- .../field/effect/appender/DoesNotAddToArcheryTotal.java | 6 +++--- .../lotro/cards/build/field/effect/appender/Exert.java | 6 +++--- .../lotro/cards/build/field/effect/appender/Heal.java | 6 +++--- .../cards/build/field/effect/appender/ModifyStrength.java | 6 +++--- .../field/effect/appender/PreventCardEffectAppender.java | 6 +++--- .../lotro/cards/build/field/effect/appender/Wound.java | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json index 33b6773e8..c023d47ff 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json +++ b/gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json @@ -198,7 +198,7 @@ "cost": { "type": "exert", "filter": "choose(name(Gimli))", - "memory": "exertedGimli" + "memorize": "exertedGimli" }, "effect": [ { @@ -255,7 +255,7 @@ "type": "exert", "count": 2, "filter": "choose(dwarf)", - "memory": "exertedDwarves" + "memorize": "exertedDwarves" }, { "type": "discardStackedCards", diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java index 1c1c318c3..58046030d 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java @@ -26,11 +26,11 @@ import java.util.Collection; public class AddKeyword implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory", "keyword"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize", "keyword"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); final String keywordString = FieldUtils.getString(effectObject.get("keyword"), "keyword"); final String[] keywordSplit = keywordString.split("\\+"); @@ -59,7 +59,7 @@ public class AddKeyword implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory", "keyword"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize", "keyword"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String type = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java index aca90e349..08ce2c067 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java @@ -24,11 +24,11 @@ import java.util.Collection; public class CantTakeMoreWoundsThan implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "filter", "wounds", "memory"); + FieldUtils.validateAllowedFields(effectObject, "filter", "wounds", "memorize"); final int wounds = FieldUtils.getInteger(effectObject.get("wounds"), "wounds", 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); @@ -49,7 +49,7 @@ public class CantTakeMoreWoundsThan implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "filter", "wounds", "memory"); + FieldUtils.validateAllowedFields(effectObject, "filter", "wounds", "memorize"); final String type = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java index 4d0b03fdc..fb43f663a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java @@ -24,11 +24,11 @@ import java.util.Collection; public class DiscardFromPlay implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java index ba9398964..eb05ed3a4 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java @@ -25,11 +25,11 @@ import java.util.Collection; public class DoesNotAddToArcheryTotal implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); @@ -51,7 +51,7 @@ public class DoesNotAddToArcheryTotal implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String type = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java index a0caffdb3..d731741e6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java @@ -24,13 +24,13 @@ import java.util.Collection; public class Exert implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "player", "count", "times", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "player", "count", "times", "filter", "memorize"); final String player = FieldUtils.getString(effectObject.get("player"), "player", "owner"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final int times = FieldUtils.getInteger(effectObject.get("times"), "times", 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); @@ -52,7 +52,7 @@ public class Exert implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "player", "count", "times", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "player", "count", "times", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final int times = FieldUtils.getInteger(effectObject.get("times"), "times", 1); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java index 0240d6772..ab0aed490 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java @@ -24,11 +24,11 @@ import java.util.Collection; public class Heal implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); @@ -50,7 +50,7 @@ public class Heal implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String type = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java index 0f90aa794..54c7486e8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java @@ -27,12 +27,12 @@ import java.util.Collection; public class ModifyStrength implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "amount", "count", "filter", "until", "memory"); + FieldUtils.validateAllowedFields(effectObject, "amount", "count", "filter", "until", "memorize"); final int amount = FieldUtils.getInteger(effectObject.get("amount"), "amount"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); final TimeResolver.Time time = TimeResolver.resolveTime(effectObject.get("until"), "end(current)"); MultiEffectAppender result = new MultiEffectAppender(); @@ -58,7 +58,7 @@ public class ModifyStrength implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "amount", "count", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "amount", "count", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final String type = FieldUtils.getString(effectObject.get("filter"), "filter"); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java index 48e82dc53..f035f7c63 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java @@ -22,10 +22,10 @@ import org.json.simple.JSONObject; public class PreventCardEffectAppender implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "filter", "memorize"); String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); result.addEffectAppender( @@ -45,7 +45,7 @@ public class PreventCardEffectAppender implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "filter", "memorize"); String type = FieldUtils.getString(effectObject.get("filter"), "filter"); if (type.startsWith("choose(") && type.endsWith(")")) { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java index 4812f5134..888d7029a 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java @@ -24,12 +24,12 @@ import java.util.Collection; public class Wound implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "times", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "times", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final int times = FieldUtils.getInteger(effectObject.get("times"), "times", 1); final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); - final String memory = FieldUtils.getString(effectObject.get("memory"), "memory", "_temp"); + final String memory = FieldUtils.getString(effectObject.get("memorize"), "memorize", "_temp"); MultiEffectAppender result = new MultiEffectAppender(); @@ -51,7 +51,7 @@ public class Wound implements EffectAppenderProducer { @Override public Requirement createCostRequirement(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "count", "times", "filter", "memory"); + FieldUtils.validateAllowedFields(effectObject, "count", "times", "filter", "memorize"); final CountResolver.Count count = CountResolver.resolveCount(effectObject.get("count"), 1); final int times = FieldUtils.getInteger(effectObject.get("times"), "times", 1);