From db6b97e57fa0432eb5a2433de9d19a9cbc9ff2c1 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Mon, 25 Mar 2013 11:30:42 +0000 Subject: [PATCH] - "Orthanc Pinnacle" should now allow to exert a companion, even if the companion skirmishing Saruman dies in the skirmish. --- .../gemp-lotr-async/src/main/web/includes/changeLog.html | 1 + .../java/com/gempukku/lotro/cards/set20/site/Card20_456.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index 6b35340f8..d09163347 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -5,6 +5,7 @@ - Applied revision 2 changes to set 20. - "Throne of Orthanc" is now unique (per card text). - "Wizard's Wrath" now correctly exerts Saruman. +- "Orthanc Pinnacle" should now allow to exert a companion, even if the companion skirmishing Saruman dies in the skirmish. 20 Mar. 2013 - "Uruk Mender" has now 8 strength (per card text). diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_456.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_456.java index 953824688..b483dabf5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_456.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_456.java @@ -1,6 +1,7 @@ package com.gempukku.lotro.cards.set20.site; import com.gempukku.lotro.cards.AbstractSite; +import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; import com.gempukku.lotro.common.Block; @@ -27,7 +28,8 @@ public class Card20_456 extends AbstractSite { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.forEachWounded(game, effectResult, CardType.COMPANION, Filters.inSkirmishAgainst(Filters.saruman)) + if (TriggerConditions.forEachWounded(game, effectResult, CardType.COMPANION) + && PlayConditions.isActive(game, Filters.saruman, Filters.inSkirmish) && GameUtils.isShadow(game, playerId)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect(