diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java index c51824cae..529246052 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set4/gondor/Card4_128.java @@ -11,11 +11,9 @@ import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.AbstractActionProxy; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.RequiredTriggerAction; -import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision; +import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.ChooseActiveCardEffect; -import com.gempukku.lotro.logic.effects.PlayoutDecisionEffect; -import com.gempukku.lotro.logic.effects.WoundCharactersEffect; +import com.gempukku.lotro.logic.effects.ChooseAndWoundCharactersEffect; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; @@ -60,20 +58,13 @@ public class Card4_128 extends AbstractOldEvent { new AddUntilEndOfPhaseActionProxyEffect( new AbstractActionProxy() { @Override - public List getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResults) { - if (TriggerConditions.losesSkirmish(game, effectResults, Filters.sameCard(minion))) { - final RequiredTriggerAction action = new RequiredTriggerAction(self); + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult) { + if (TriggerConditions.losesSkirmish(game, effectResult, Filters.sameCard(minion)) + && playerId.equals(game.getGameState().getCurrentPlayerId())) { + final OptionalTriggerAction action = new OptionalTriggerAction(self); + action.setVirtualCardAction(true); action.appendEffect( - new PlayoutDecisionEffect(playerId, - new MultipleChoiceAwaitingDecision(1, "Would you like to wound " + minion.getBlueprint().getName(), new String[]{"Yes", "No"}) { - @Override - protected void validDecisionMade(int index, String result) { - if (result.equals("Yes")) { - action.insertEffect( - new WoundCharactersEffect(self, minion)); - } - } - })); + new ChooseAndWoundCharactersEffect(action, playerId, 1, 1, CardType.MINION)); return Collections.singletonList(action); } return null; 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 5972e1f0a..21b4f501e 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 @@ -2,6 +2,7 @@ 20 Nov. 2011 - "Sauron" no longer has his twilight cost reduced by the twilight pool size, instead of burdens spotted. - "Raider Halberd" now correctly adds 2 strength to bearer. +- "New Errand" now correctly allows to choose which minion to wound, if the minion loses that skirmish. 19 Nov. 2011 - "Dead Man of Dunharrow" now correctly has Enduring keyword.