From 0ee0199850de89da9921f519f5950d9a5ae70696 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Fri, 1 Nov 2024 19:30:41 -0500 Subject: [PATCH] Revert "Fixing "filter -> select" in replaceInSkirmish effect" This reverts commit 2089737fd1651d0d736c9b7e7bf39eec5be70c25. --- .../main/resources/cards/official/set08/set08-Dwarven.hjson | 2 +- .../main/resources/cards/official/set08/set08-Gandalf.hjson | 2 +- .../src/main/resources/cards/official/set10/set10-Shire.hjson | 2 +- .../src/main/resources/cards/official/set11/set11-Shire.hjson | 2 +- .../main/resources/cards/official/set12/set12-Gandalf.hjson | 2 +- .../main/resources/cards/official/set12/set12-Gondor.hjson | 4 ++-- .../src/main/resources/cards/official/set13/set13-Shire.hjson | 2 +- .../main/resources/cards/official/set15/set15-Gollum.hjson | 2 +- .../cards/unofficial/second-edition/set40/set40-dwarven.hjson | 2 +- .../cards/unofficial/second-edition/set40/set40-gandalf.hjson | 2 +- .../cards/build/field/effect/appender/ReplaceInSkirmish.java | 4 ++-- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson index 687cc4612..16b458ae8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson @@ -216,7 +216,7 @@ effect: [ { type: replaceInSkirmish - select: unbound,companion,not(name(Gimli)) + filter: unbound,companion,not(name(Gimli)) with: choose(name(Gimli)) } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson index a92012837..c44b0336c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson @@ -206,7 +206,7 @@ effect: [ { type: replaceInSkirmish - select: unbound,companion,not(name(Gandalf)) + filter: unbound,companion,not(name(Gandalf)) with: choose(name(Gandalf)) } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Shire.hjson index 14e84cae8..93fb56196 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Shire.hjson @@ -100,7 +100,7 @@ effect: [ { type: replaceInSkirmish - select: companion,not(ringBearer) + filter: companion,not(ringBearer) with: memory(exertedHobbit) } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson index b4717e35b..a88b66009 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson @@ -501,7 +501,7 @@ ] effect: { type: replaceInSkirmish - select: unbound, companion, InSkirmish, resistanceLessThanFilter(self) + filter: unbound, companion, InSkirmish, resistanceLessThanFilter(self) with: self } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gandalf.hjson index ff1de8f08..92af57d5c 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gandalf.hjson @@ -172,7 +172,7 @@ } { type: replaceInSkirmish - select: memory(anotherCompanion) + filter: memory(anotherCompanion) with: self } ] diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gondor.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gondor.hjson index da9f4e2c4..fea244f4e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gondor.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gondor.hjson @@ -48,7 +48,7 @@ } effect: { type: replaceInSkirmish - select: unbound,hobbit + filter: unbound,hobbit with: choose(name(Boromir)) } } @@ -485,7 +485,7 @@ } effect: { type: replaceInSkirmish - select: unbound,companion,inSkirmishAgainst(minion) + filter: unbound,companion,inSkirmishAgainst(minion) with: choose(culture(gondor),companion,notAssignedToSkirmish) } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson index 6bb2509e0..2c1f16e26 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson @@ -541,7 +541,7 @@ } effect: { type: replaceInSkirmish - select: ringBound,companion,inSkirmishAgainst(minion) + filter: ringBound,companion,inSkirmishAgainst(minion) with: self } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gollum.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gollum.hjson index 8c86b4d18..0cab8dead 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gollum.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gollum.hjson @@ -164,7 +164,7 @@ } effect: { type: replaceInSkirmish - select: minion,inSkirmishAgainst(companion) + filter: minion,inSkirmishAgainst(companion) with: choose(name(Gollum)) } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson index 6e80f6673..adffb90f8 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson @@ -93,7 +93,7 @@ effect: [ { type: replaceInSkirmish - select: dwarf,not(name(Gimli)) + filter: dwarf,not(name(Gimli)) with: memory(exertedGimli) } { diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson index c243d3967..dca73c659 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson @@ -933,7 +933,7 @@ effect: [ { type: replaceInSkirmish - select: unbound,companion,not(name(Gandalf)) + filter: unbound,companion,not(name(Gandalf)) with: memory(gandalf) } { diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java index 325c1e515..3a3c04e74 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/ReplaceInSkirmish.java @@ -18,9 +18,9 @@ import org.json.simple.JSONObject; public class ReplaceInSkirmish implements EffectAppenderProducer { @Override public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { - FieldUtils.validateAllowedFields(effectObject, "select", "with"); + FieldUtils.validateAllowedFields(effectObject, "filter", "with"); - final String filter = FieldUtils.getString(effectObject.get("select"), "select"); + final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); final String with = FieldUtils.getString(effectObject.get("with"), "with"); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);