From d5bc1492b9d97198c3d3c2ea7bfadb87e4c31877 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sat, 16 Nov 2024 21:24:00 -0600 Subject: [PATCH] Incorporating PR #121 from Phallen Cassidy: when neither branch of a choice can be fulfilled, resorts to having the player choose which to perform rather than performing neither. --- .../cards/build/field/effect/appender/Choice.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java index 581cebb03..bcf6af2c6 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/cards/build/field/effect/appender/Choice.java @@ -53,11 +53,6 @@ public class Choice implements EffectAppenderProducer { textIndex++; } - if (playableEffectAppenders.size() == 0) { - actionContext.setValueToMemory(memorize, ""); - return null; - } - if (playableEffectAppenders.size() == 1) { SubAction subAction = new SubAction(action); playableEffectAppenders.get(0).appendEffect(cost, subAction, delegateActionContext); @@ -65,6 +60,16 @@ public class Choice implements EffectAppenderProducer { return new StackActionEffect(subAction); } + if (playableEffectAppenders.isEmpty()) { + actionContext.setValueToMemory(memorize, ""); + textIndex = 0; + for (EffectAppender possibleEffectAppender : possibleEffectAppenders) { + playableEffectAppenders.add(possibleEffectAppender); + effectTexts.add(GameUtils.substituteText(textArray[textIndex], actionContext)); + textIndex++; + } + } + SubAction subAction = new SubAction(action); subAction.appendCost( new PlayoutDecisionEffect(choosingPlayer,