From 02bf80a59adc3bd2a3ccaa8831d33ad29d144b86 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 09:45:59 +0000 Subject: [PATCH] 20_116 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../cards/set20/fallenRealms/Card20_116.java | 25 ++++++++++--------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js index 12a5cb5f7..575ad0992 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-019/set20.js @@ -114,7 +114,7 @@ var set20 = { '20_113': 'http://lotrtcg.org/coreset/fallenrealms/easterlingconscript.png', '20_114': 'http://lotrtcg.org/coreset/fallenrealms/easterlingdetachment.png', '20_115': 'http://lotrtcg.org/coreset/fallenrealms/easterlinggrunt.png', - '20_116': 'http://lotrtcg.org/coreset/fallenrealms/easterlingpikeman.png', + '20_116': 'http://lotrtcg.org/coreset/fallenrealms/easterlingpikeman(r1).png', '20_117': 'http://lotrtcg.org/coreset/fallenrealms/easterlingrecruit.png', '20_118': 'http://lotrtcg.org/coreset/fallenrealms/easterlingregiment.png', '20_119': 'http://lotrtcg.org/coreset/fallenrealms/easterlingscout.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_116.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_116.java index 14f6188e9..e0933c010 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_116.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_116.java @@ -2,41 +2,42 @@ package com.gempukku.lotro.cards.set20.fallenRealms; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Race; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.actions.ActivateCardAction; +import com.gempukku.lotro.logic.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.effects.AddTwilightEffect; import com.gempukku.lotro.logic.effects.ChooseAndHealCharactersEffect; -import com.gempukku.lotro.logic.timing.Action; +import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; import java.util.List; /** * 4 - * Easterling Guard - * Fallen Realms Minion • Man + * Easterling Pikeman + * Minion • Man * 9 2 4 * Easterling. - * Shadow: Heal this minion to add (1). + * When you play this minion, you may heal an Easterling to add (1). + * http://lotrtcg.org/coreset/fallenrealms/easterlingpikeman(r1).png */ public class Card20_116 extends AbstractMinion { public Card20_116() { - super(4, 9, 2, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Guard"); + super(4, 9, 2, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Pikeman"); addKeyword(Keyword.EASTERLING); } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SHADOW, self, 0) - && PlayConditions.canHeal(self, game, self)) { - ActivateCardAction action = new ActivateCardAction(self); + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.played(game, effectResult, self) + && PlayConditions.canHeal(self, game, Keyword.EASTERLING)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( - new ChooseAndHealCharactersEffect(action, playerId, self)); + new ChooseAndHealCharactersEffect(action, playerId, Keyword.EASTERLING)); action.appendEffect( new AddTwilightEffect(self, 1)); return Collections.singletonList(action);