ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed "memory" to "memorize"

Browse Source
This commit is contained in:
marcin.sciesinski
2019-08-28 13:37:29 -07:00
parent 120988b295
commit 5e218b106e
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/web/cards/set40.json
View File

@@ -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",

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/AddKeyword.java
View File

@@ -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");

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/CantTakeMoreWoundsThan.java
View File

@@ -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");

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DiscardFromPlay.java
View File

@@ -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();

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/DoesNotAddToArcheryTotal.java
View File

@@ -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");

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Exert.java
View File

@@ -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);

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Heal.java
View File

@@ -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");

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ModifyStrength.java
View File

@@ -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");

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/PreventCardEffectAppender.java
View File

@@ -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(")")) {

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Wound.java
View File

@@ -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);