From 0508abaa3137b8acf6f31d0aece4c045c165faa9 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 5 Mar 2012 04:22:02 +0000 Subject: [PATCH] - "Discard to heal" actions now shows the card to the opponent, the same way, as in case of played events. --- .../java/com/gempukku/lotro/cards/AbstractAlly.java | 10 +++++++++- .../com/gempukku/lotro/cards/AbstractCompanion.java | 10 +++++++++- .../src/main/webapp/includes/changeLog.html | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java index 83c4dc47a..292ec0c22 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractAlly.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.DiscardCardsFromHandEffect; import com.gempukku.lotro.logic.effects.HealCharactersEffect; import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.timing.UnrespondableEffect; import java.util.Collections; import java.util.List; @@ -44,11 +45,18 @@ public class AbstractAlly extends AbstractPermanent { return _race; } - protected final List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + protected final List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canHealByDiscarding(game.getGameState(), game.getModifiersQuerying(), self)) { // TODO this is not really an activated action... ActivateCardAction action = new ActivateCardAction(self); action.appendCost(new DiscardCardsFromHandEffect(null, playerId, Collections.singleton(self), false)); + action.appendCost( + new UnrespondableEffect() { + @Override + protected void doPlayEffect(LotroGame game) { + game.getGameState().eventPlayed(self); + } + }); PhysicalCard active = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName())); if (active != null) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java index a1256fe16..eea0bb822 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/AbstractCompanion.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.logic.actions.ActivateCardAction; import com.gempukku.lotro.logic.effects.DiscardCardsFromHandEffect; import com.gempukku.lotro.logic.effects.HealCharactersEffect; import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.timing.UnrespondableEffect; import java.util.Collections; import java.util.List; @@ -46,10 +47,17 @@ public abstract class AbstractCompanion extends AbstractPermanent { && PlayConditions.checkRuleOfNine(game.getGameState(), game.getModifiersQuerying(), self); } - protected final List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { + protected final List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canHealByDiscarding(game.getGameState(), game.getModifiersQuerying(), self)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost(new DiscardCardsFromHandEffect(null, playerId, Collections.singleton(self), false)); + action.appendCost( + new UnrespondableEffect() { + @Override + protected void doPlayEffect(LotroGame game) { + game.getGameState().eventPlayed(self); + } + }); PhysicalCard active = Filters.findFirstActive(game.getGameState(), game.getModifiersQuerying(), Filters.name(self.getBlueprint().getName())); if (active != 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 54d2d629c..a608f68ee 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,4 +1,7 @@
+5 Mar. 2012
+- "Discard to heal" actions now shows the card to the opponent, the same way, as in case of played events.
+
 3 Mar. 2012
 - "The Palantir of Orthanc, Recovered Seeing Stone" should no longer discard itself.
 - "With All Possible Speed" can be played in skirmish phase only.