diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/OptionalEffect.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/OptionalEffect.java index a06d63513..fcb1dedbd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/OptionalEffect.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/effects/OptionalEffect.java @@ -35,16 +35,17 @@ public class OptionalEffect extends AbstractSubActionEffect { @Override public void playEffect(final LotroGame game) { - game.getUserFeedback().sendAwaitingDecision(_playerId, - new MultipleChoiceAwaitingDecision(1, "Do you wish to " + _optionalEffect.getText(game) + "?", new String[]{"Yes", "No"}) { - @Override - protected void validDecisionMade(int index, String result) { - if (index == 0) { - SubAction subAction = new SubAction(_action); - subAction.appendEffect(_optionalEffect); - processSubAction(game, subAction); + if (_optionalEffect.isPlayableInFull(game)) + game.getUserFeedback().sendAwaitingDecision(_playerId, + new MultipleChoiceAwaitingDecision(1, "Do you wish to " + _optionalEffect.getText(game) + "?", new String[]{"Yes", "No"}) { + @Override + protected void validDecisionMade(int index, String result) { + if (index == 0) { + SubAction subAction = new SubAction(_action); + subAction.appendEffect(_optionalEffect); + processSubAction(game, subAction); + } } - } - }); + }); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java index 4b9200b73..82ea4c294 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_234.java @@ -3,6 +3,7 @@ package com.gempukku.lotro.cards.set1.wraith; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; +import com.gempukku.lotro.cards.effects.OptionalEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; @@ -42,7 +43,14 @@ public class Card1_234 extends AbstractMinion { int minions = Math.max(0, companions - 4); for (int i = 0; i < minions; i++) { action.appendEffect( - new ChooseAndPlayCardFromDiscardEffect(playerId, game, CardType.MINION)); + new OptionalEffect(action, playerId, + new ChooseAndPlayCardFromDiscardEffect(playerId, game, CardType.MINION) { + @Override + public String getText(LotroGame game) { + return "PlayConditions minion from your discard pile"; + } + } + )); } return Collections.singletonList(action); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index a2e07f02a..1d5ee185c 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,6 +1,8 @@
5 Feb. 2012 - "Beyond Dark Mountains" now exerts ISENGARD minion. +- "Úlairë Nertëa" now optionally allows to play the minion, instead of making you play. So you can choose how many +minions to play. 4 Feb. 2012 - "Depths of Moria" now has a corrected name.