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

Revert "Fixing "filter -> select" in replaceInSkirmish effect"

Browse Source 
This reverts commit 2089737fd1.
This commit is contained in:
Christian 'ketura' McCarty
2024-11-01 19:30:41 -05:00
parent 2089737fd1
commit 0ee0199850
11 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Dwarven.hjson
View File

@@ -216,7 +216,7 @@
effect: [
{
type: replaceInSkirmish
select: unbound,companion,not(name(Gimli))
filter: unbound,companion,not(name(Gimli))
with: choose(name(Gimli))
}
]

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set08/set08-Gandalf.hjson
View File

@@ -206,7 +206,7 @@
effect: [
{
type: replaceInSkirmish
select: unbound,companion,not(name(Gandalf))
filter: unbound,companion,not(name(Gandalf))
with: choose(name(Gandalf))
}
]

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set10/set10-Shire.hjson
View File

@@ -100,7 +100,7 @@
effect: [
{
type: replaceInSkirmish
select: companion,not(ringBearer)
filter: companion,not(ringBearer)
with: memory(exertedHobbit)
}
]

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set11/set11-Shire.hjson
View File

@@ -501,7 +501,7 @@
]
effect: {
type: replaceInSkirmish
select: unbound, companion, InSkirmish, resistanceLessThanFilter(self)
filter: unbound, companion, InSkirmish, resistanceLessThanFilter(self)
with: self
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gandalf.hjson
View File

@@ -172,7 +172,7 @@
}
{
type: replaceInSkirmish
select: memory(anotherCompanion)
filter: memory(anotherCompanion)
with: self
}
]

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set12/set12-Gondor.hjson
View File

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

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Shire.hjson
View File

@@ -541,7 +541,7 @@
}
effect: {
type: replaceInSkirmish
select: ringBound,companion,inSkirmishAgainst(minion)
filter: ringBound,companion,inSkirmishAgainst(minion)
with: self
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set15/set15-Gollum.hjson
View File

@@ -164,7 +164,7 @@
}
effect: {
type: replaceInSkirmish
select: minion,inSkirmishAgainst(companion)
filter: minion,inSkirmishAgainst(companion)
with: choose(name(Gollum))
}
}

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-dwarven.hjson
View File

@@ -93,7 +93,7 @@
effect: [
{
type: replaceInSkirmish
select: dwarf,not(name(Gimli))
filter: dwarf,not(name(Gimli))
with: memory(exertedGimli)
}
{

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/second-edition/set40/set40-gandalf.hjson
View File

@@ -933,7 +933,7 @@
effect: [
{
type: replaceInSkirmish
select: unbound,companion,not(name(Gandalf))
filter: unbound,companion,not(name(Gandalf))
with: memory(gandalf)
}
{

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

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