From 8d4e146fe6cffe664c01bd6c5510eeae62583703 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Thu, 28 Nov 2024 22:20:49 -0600 Subject: [PATCH] Revert "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." This reverts commit d5bc1492b9d97198c3d3c2ea7bfadb87e4c31877. --- .../cards/build/field/effect/appender/Choice.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 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 bcf6af2c6..581cebb03 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,6 +53,11 @@ 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); @@ -60,16 +65,6 @@ 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,