Renamed MemorizeValue -> MemorizeInfo. Minor parameter tweaks in other effects.

This commit is contained in:
Christian 'ketura' McCarty
2024-05-31 13:42:48 -05:00
parent 26d875e353
commit 43184e3967
10 changed files with 25 additions and 26 deletions

View File

@@ -982,9 +982,9 @@
}
effect: [
{
type: MemorizeValue
type: MemorizeInfo
memory: choice
value: yes
info: yes
}
{
type: If

View File

@@ -1139,9 +1139,9 @@
amount: 2
}
effect: {
type: memorizeValue
type: MemorizeInfo
memory: removedBurdens
value: yes
info: yes
}
}
}

View File

@@ -857,9 +857,9 @@
select: choose(name(Théoden))
}
effect: {
type: memorizeValue
type: MemorizeInfo
memory: exertedTheoden
value: yes
info: yes
}
}
}

View File

@@ -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
}
}
]

View File

@@ -343,9 +343,9 @@
}
effect: [
{
type: memorizeValue
type: MemorizeInfo
memory: used
value: yes
info: yes
}
{
type: storeWhileInZone

View File

@@ -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
}
]
}

View File

@@ -32,9 +32,9 @@
}
effect: [
{
type: MemorizeValue
type: MemorizeInfo
memory: choice
value: yes
info: yes
}
{
type: If

View File

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

View File

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

View File

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