From 631b85e9c83e46370c88550bf5d5eff350a72cb8 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 09:59:38 +0000 Subject: [PATCH] 20_176 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/gondor/Card20_176.java | 57 +++++++++---------- 2 files changed, 28 insertions(+), 31 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 b08b594c8..c1f925b49 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 @@ -174,7 +174,7 @@ var set20 = { '20_173': 'http://lotrtcg.org/coreset/gandalf/wizardsforethought.png', '20_174': 'http://lotrtcg.org/coreset/gandalf/youshallnotpass.png', '20_175': 'http://lotrtcg.org/coreset/gondor/aragorndr.png', - '20_176': 'http://lotrtcg.org/coreset/gondor/aragornuofp.png', + '20_176': 'http://lotrtcg.org/coreset/gondor/aragornuofp(r1).png', '20_177': 'http://lotrtcg.org/coreset/gondor/aragornsbowsat.png', '20_178': 'http://lotrtcg.org/coreset/gondor/aragornspipe.png', '20_179': 'http://lotrtcg.org/coreset/gondor/armor.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java index f2c394955..fd930c8d2 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gondor/Card20_176.java @@ -2,18 +2,20 @@ package com.gempukku.lotro.cards.set20.gondor; import com.gempukku.lotro.cards.AbstractCompanion; import com.gempukku.lotro.cards.PlayConditions; +import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.effects.CheckPhaseLimitEffect; -import com.gempukku.lotro.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect; import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; -import com.gempukku.lotro.cards.effects.choose.ChooseOpponentEffect; import com.gempukku.lotro.common.*; -import com.gempukku.lotro.filters.Filters; 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.HealCharactersEffect; import com.gempukku.lotro.logic.modifiers.KeywordModifier; +import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.SpotCondition; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; import java.util.List; @@ -21,11 +23,12 @@ import java.util.List; /** * 4 * •Aragorn, Uniter of Free Peoples - * Gondor Companion • Man + * Companion • Man * 8 4 8 - * Fellowship: Exert an Elf to Heal Aragorn. - * Skirmish: Exert a Dwarf to make Aragorn damage +1. - * Regroup: Exert two unbound Hobbits to make the Shadow player discard a minion (limit once per phase). + * At the start of the fellowship phase, you may exert an Elf to Heal Aragorn. + * While you can spot a Dwarf companion, Aragorn is damage +1. + * Skirmish: Exert a [Rohan] companion to make Aragorn strength +2. + * http://lotrtcg.org/coreset/gondor/aragornuofp(r1).png */ public class Card20_176 extends AbstractCompanion { public Card20_176() { @@ -33,40 +36,34 @@ public class Card20_176 extends AbstractCompanion { } @Override - protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self) + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.startOfPhase(game, effectResult, Phase.FELLOWSHIP) && PlayConditions.canExert(self, game, Race.ELF)) { - ActivateCardAction action = new ActivateCardAction(self); + OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendCost( new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF)); action.appendEffect( new HealCharactersEffect(self, self)); return Collections.singletonList(action); } + return null; + } + + @Override + public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { + return new KeywordModifier(self, self, new SpotCondition(Race.DWARF, CardType.COMPANION), Keyword.DAMAGE, 1); + } + + @Override + protected List getExtraInPlayPhaseActions(String playerId, LotroGame game, PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.SKIRMISH, self) - && PlayConditions.canExert(self, game, Race.DWARF)) { + && PlayConditions.canExert(self, game, Culture.ROHAN, CardType.COMPANION)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.DWARF)); + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Culture.ROHAN, CardType.COMPANION)); action.appendEffect( new AddUntilEndOfPhaseModifierEffect( - new KeywordModifier(self, self, Keyword.DAMAGE, 1))); - return Collections.singletonList(action); - } - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) - && PlayConditions.canExert(self, game, 1, 2, Race.HOBBIT, Filters.unboundCompanion)) { - final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 2, 2, Race.HOBBIT, Filters.unboundCompanion)); - action.appendEffect( - new CheckPhaseLimitEffect(action, self, 1, Phase.REGROUP, - new ChooseOpponentEffect(playerId) { - @Override - protected void opponentChosen(String opponentId) { - action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, opponentId, 1, 1, CardType.MINION)); - } - })); + new StrengthModifier(self, self, 2))); return Collections.singletonList(action); } return null;