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

Consolidating Exerts / ExertedBy -> Exerted

Browse Source
This commit is contained in:
Christian 'ketura' McCarty
2024-05-30 16:30:15 -05:00
parent 5ae6a7def7
commit 9c2fa0479f
14 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set01/set1-moria.hjson
View File

@@ -659,7 +659,7 @@
type: responseEvent
trigger: [
{
type: exerts
type: exerted
filter: ring bearer
}
{

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set02/set2-isengard.hjson
View File

@@ -58,7 +58,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: culture(shire),ally
}
effect: {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set07/set07-Ringwraith.hjson
View File

@@ -2150,7 +2150,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: bearer
}
effect: {

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

@@ -397,7 +397,7 @@
effects: {
type: responseEvent
trigger: {
type: exerts
type: exerted
filter: minion
memorize: exertedMinion
}

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

@@ -495,7 +495,7 @@
type: trigger
optional: true
trigger: {
type: exerts
type: exerted
filter: companion
}
effect: {

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

@@ -233,7 +233,7 @@
type: trigger
optional: true
trigger: {
type: exerts
type: exerted
filter: companion
}
effect: {

6
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/official/set13/set13-Gondor.hjson
View File

@@ -1071,7 +1071,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: name(Denethor)
}
effect: {
@@ -1083,7 +1083,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: name(Boromir)
}
effect: {
@@ -1095,7 +1095,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: name(Faramir)
}
cost: {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set31/set31-shadow.hjson
View File

@@ -186,7 +186,7 @@
type: Response
trigger: [
{
type: exerts
type: exerted
filter: name(Bilbo)
}
{

4
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/hobbit/set33/set33-fp.hjson
View File

@@ -356,9 +356,9 @@
type: trigger
optional: true
trigger: {
type: exertedBy
type: exerted
filter: name(Balin)
by: culture(dwarven),event
source: culture(dwarven),event
}
effect: {
type: heal

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/errata/set11/set11-Orc-errata.hjson
View File

@@ -31,7 +31,7 @@
{
type: trigger
trigger: {
type: exerts
type: exerted
filter: companion
}
effect: {

2
gemp-lotr/gemp-lotr-cards/src/main/resources/cards/unofficial/pc/setV01/V1_sites.hjson
View File

@@ -145,7 +145,7 @@
type: trigger
optional: true
trigger: {
type: exerts
type: exerted
filter: your,companion
memorize: exertedComp
}

6
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/ExertedBy.java → gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/Exerted.java
View File

@@ -11,14 +11,14 @@ import com.gempukku.lotro.logic.timing.TriggerConditions;
import com.gempukku.lotro.logic.timing.results.ExertResult;
import org.json.simple.JSONObject;
public class ExertedBy implements TriggerCheckerProducer {
public class Exerted implements TriggerCheckerProducer {
@Override
public TriggerChecker getTriggerChecker(JSONObject value, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(value, "filter", "memorize", "by");
FieldUtils.validateAllowedFields(value, "filter", "memorize", "source");
final String filter = FieldUtils.getString(value.get("filter"), "filter", "any");
final String memorize = FieldUtils.getString(value.get("memorize"), "memorize");
final String byFilter = FieldUtils.getString(value.get("by"), "by");
final String byFilter = FieldUtils.getString(value.get("source"), "source", "any");
final FilterableSource filterableSource = environment.getFilterFactory().generateFilter(filter, environment);

3
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/trigger/TriggerCheckerFactory.java
View File

@@ -45,8 +45,7 @@ public class TriggerCheckerFactory {
triggerCheckers.put("cancelledskirmish", new CancelledSkirmish());
triggerCheckers.put("constantlycheck", new ConstantlyCheckTrigger());
triggerCheckers.put("discarded", new Discarded());
triggerCheckers.put("exertedby", new ExertedBy());
triggerCheckers.put("exerts", new Exerts());
triggerCheckers.put("exerted", new Exerted());
triggerCheckers.put("exertsforspecialability", new ExertsForSpecialAbility());
triggerCheckers.put("exertstoplay", new ExertsToPlay());
triggerCheckers.put("fpdecidedifmoving", new FPDecidedIfMoving());

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TriggerConditions.java
View File

@@ -176,9 +176,7 @@ public class TriggerConditions {
}
public static boolean forEachExerted(LotroGame game, EffectResult effectResult, Filterable... filters) {
if (effectResult.getType() == EffectResult.Type.FOR_EACH_EXERTED)
return Filters.and(filters).accepts(game, ((ExertResult) effectResult).getExertedCard());
return false;
return forEachExertedBy(game, effectResult, Filters.any, filters);
}
public static boolean forEachExertedBy(LotroGame game, EffectResult effectResult, Filterable exertedBy, Filterable... exerted) {