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

You Cannot Pass!

Browse Source
This commit is contained in:
Phallen Cassidy
2020-04-03 17:21:30 -04:00
parent 748b3cb769
commit 44db3f6348
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/web/cards/set2/set2-gandalf.json
View File

@@ -27,6 +27,7 @@
"culture": "gandalf", "culture": "gandalf",
"cost": 2, "cost": 2,
"type": "artifact", "type": "artifact",
"possession": "staff",
"vitality": 1, "vitality": 1,
"target": "name(Gandalf)", "target": "name(Gandalf)",
"effects": [ "effects": [
@@ -263,6 +264,7 @@
"type": "event", "type": "event",
"effect": { "effect": {
"type": "removeKeyword", "type": "removeKeyword",
"keyword": "fierce",
"until": "start(regroup)", "until": "start(regroup)",
"filter": "choose(minion)" "filter": "choose(minion)"
} }
@@ -290,4 +292,4 @@
} }
} }
} }
} }

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

@@ -3,6 +3,7 @@ package com.gempukku.lotro.cards.build.field.effect.appender;
import com.gempukku.lotro.cards.build.ActionContext; import com.gempukku.lotro.cards.build.ActionContext;
import com.gempukku.lotro.cards.build.CardGenerationEnvironment; import com.gempukku.lotro.cards.build.CardGenerationEnvironment;
import com.gempukku.lotro.cards.build.InvalidCardDefinitionException; import com.gempukku.lotro.cards.build.InvalidCardDefinitionException;
import com.gempukku.lotro.cards.build.PlayerSource;
import com.gempukku.lotro.cards.build.field.FieldUtils; import com.gempukku.lotro.cards.build.field.FieldUtils;
import com.gempukku.lotro.cards.build.field.effect.EffectAppender; import com.gempukku.lotro.cards.build.field.effect.EffectAppender;
import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer; import com.gempukku.lotro.cards.build.field.effect.EffectAppenderProducer;
@@ -16,7 +17,7 @@ import org.json.simple.JSONObject;
public class ChooseYesOrNo implements EffectAppenderProducer { public class ChooseYesOrNo implements EffectAppenderProducer {
@Override @Override
public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException { public EffectAppender createEffectAppender(JSONObject effectObject, CardGenerationEnvironment environment) throws InvalidCardDefinitionException {
FieldUtils.validateAllowedFields(effectObject, "text", "memorize", "yes", "no"); FieldUtils.validateAllowedFields(effectObject, "text", "player", "memorize", "yes", "no");
final String text = FieldUtils.getString(effectObject.get("text"), "text"); final String text = FieldUtils.getString(effectObject.get("text"), "text");
if (text == null) if (text == null)
@@ -24,11 +25,12 @@ public class ChooseYesOrNo implements EffectAppenderProducer {
final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize"); final String memorize = FieldUtils.getString(effectObject.get("memorize"), "memorize");
final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes"); final String yesAnswer = FieldUtils.getString(effectObject.get("yes"), "yes");
final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no"); final String noAnswer = FieldUtils.getString(effectObject.get("no"), "no");
PlayerSource playerSource = PlayerResolver.resolvePlayer(FieldUtils.getString(effectObject.get("player"), "player", "you"), environment);
return new DelayedAppender() { return new DelayedAppender() {
@Override @Override
protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) { protected Effect createEffect(boolean cost, CostToEffectAction action, ActionContext actionContext) {
return new PlayoutDecisionEffect(actionContext.getPerformingPlayer(), return new PlayoutDecisionEffect(playerSource.getPlayer(actionContext),
new YesNoDecision(text) { new YesNoDecision(text) {
@Override @Override
protected void yes() { protected void yes() {