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

"Sting" should now correctly apply phase limit

Browse Source
This commit is contained in:
marcin.sciesinski
2020-03-26 08:28:52 -07:00
parent 104528ecb0
commit 99ca25841c
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gemp-lotr/gemp-lotr-async/src/main/web/cards/set1/set1-shire.json
View File

@@ -791,10 +791,14 @@
{
"type": "removeTwilight",
"amount": {
"type": "forEachMatchingInMemory",
"memory": "revealedCards",
"filter": "orc",
"limit": 4
"type": "cardPhaseLimit",
"limit": 4,
"amount": {
"type": "forEachMatchingInMemory",
"memory": "revealedCards",
"filter": "orc",
"limit": 4
}
}
}
]

7
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/resolver/ValueResolver.java
View File

@@ -172,6 +172,13 @@ public class ValueResolver {
final int limit = FieldUtils.getInteger(object.get("value"), "value");
ValueSource valueSource = resolveEvaluator(object.get("amount"), 0, environment);
return (actionContext) -> new LimitEvaluator(valueSource.getEvaluator(actionContext), limit);
} else if (type.equalsIgnoreCase("cardphaselimit")) {
FieldUtils.validateAllowedFields(object, "limit", "amount");
final int limit = FieldUtils.getInteger(object.get("limit"), "limit");
ValueSource valueSource = resolveEvaluator(object.get("amount"), 0, environment);
return (actionContext) -> new CardPhaseLimitEvaluator(actionContext.getGame(), actionContext.getSource(),
actionContext.getGame().getGameState().getCurrentPhase(), limit,
valueSource.getEvaluator(actionContext));
} else if (type.equalsIgnoreCase("countStacked")) {
FieldUtils.validateAllowedFields(object, "on", "filter");
final String on = FieldUtils.getString(object.get("on"), "on");