From d243f13bb0a533dbaa5309584a63bb4d96a09d65 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Sat, 10 Mar 2018 22:50:46 -0500 Subject: [PATCH] Superficial change to 2R57 "Final Cry" Keeps track of whether The Balrog was in a skirmish, but not Whip of Many Thongs (still broken) --- .../lotro/cards/set2/moria/Card2_057.java | 30 ++++++++++++------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_057.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_057.java index 02c103b49..a2e6833a9 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_057.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set2/moria/Card2_057.java @@ -2,14 +2,17 @@ package com.gempukku.lotro.cards.set2.moria; import com.gempukku.lotro.cards.AbstractResponseOldEvent; import com.gempukku.lotro.cards.actions.PlayEventAction; +import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Race; import com.gempukku.lotro.common.Side; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.effects.WoundCharactersEffect; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.SkirmishAboutToEndResult; import java.util.Collections; import java.util.List; @@ -34,17 +37,22 @@ public class Card2_057 extends AbstractResponseOldEvent { } @Override - public List getOptionalAfterActions(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (effectResult.getType() == EffectResult.Type.SKIRMISH_ABOUT_TO_END - && checkPlayRequirements(playerId, game, self, 0, 0, false, false) - && Filters.filter(game.getGameState().getSkirmish().getShadowCharacters(), game.getGameState(), game.getModifiersQuerying(), - Filters.balrog, Filters.hasAttached(Filters.name("Whip of Many Thongs"))).size() > 0) { - PlayEventAction action = new PlayEventAction(self); - action.appendEffect( - new WoundCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); - action.appendEffect( - new WoundCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); - return Collections.singletonList(action); + public List getOptionalAfterActions(String playerId, final LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (checkPlayRequirements(playerId, game, self, 0, 0, false, false) + && effectResult.getType() == EffectResult.Type.SKIRMISH_ABOUT_TO_END) { + SkirmishAboutToEndResult checkSkirmish = (SkirmishAboutToEndResult) effectResult; + for (PhysicalCard minion: checkSkirmish.getMinionsInvolved()) { + if (minion.getBlueprint().getName().equals("The Balrog") + && Filters.filter(game.getGameState().getSkirmish().getShadowCharacters(), game.getGameState(), + game.getModifiersQuerying(), Filters.hasAttached(Filters.name("Whip of Many Thongs"))).size() > 0) { + PlayEventAction action = new PlayEventAction(self); + action.appendEffect( + new WoundCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); + action.appendEffect( + new WoundCharactersEffect(self, CardType.COMPANION, Filters.inSkirmish)); + return Collections.singletonList(action); + } + } } return null; }