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 16b458ae8..687cc4612 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 - filter: unbound,companion,not(name(Gimli)) + select: 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 c44b0336c..a92012837 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 - filter: unbound,companion,not(name(Gandalf)) + select: 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 93fb56196..14e84cae8 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 - filter: companion,not(ringBearer) + select: 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 a88b66009..b4717e35b 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 - filter: unbound, companion, InSkirmish, resistanceLessThanFilter(self) + select: 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 92af57d5c..ff1de8f08 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 - filter: memory(anotherCompanion) + select: 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 fea244f4e..da9f4e2c4 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 - filter: unbound,hobbit + select: unbound,hobbit with: choose(name(Boromir)) } } @@ -485,7 +485,7 @@ } effect: { type: replaceInSkirmish - filter: unbound,companion,inSkirmishAgainst(minion) + select: 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 2c1f16e26..6bb2509e0 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 - filter: ringBound,companion,inSkirmishAgainst(minion) + select: 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 0cab8dead..8c86b4d18 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 - filter: minion,inSkirmishAgainst(companion) + select: 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 adffb90f8..6e80f6673 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 - filter: dwarf,not(name(Gimli)) + select: 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 dca73c659..c243d3967 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 - filter: unbound,companion,not(name(Gandalf)) + select: 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 3a3c04e74..325c1e515 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, "filter", "with"); + FieldUtils.validateAllowedFields(effectObject, "select", "with"); - final String filter = FieldUtils.getString(effectObject.get("filter"), "filter"); + final String filter = FieldUtils.getString(effectObject.get("select"), "select"); final String with = FieldUtils.getString(effectObject.get("with"), "with"); final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);