From d876d427c4cfbf848a653bc269e1ffcae40b5f90 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 09:55:54 +0000 Subject: [PATCH] 20_157 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/gandalf/Card20_157.java | 12 ++++-------- 2 files changed, 5 insertions(+), 9 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 36ced1bb3..b08b594c8 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 @@ -155,7 +155,7 @@ var set20 = { '20_154': 'http://lotrtcg.org/coreset/gandalf/bolsteredspirits.png', '20_155': 'http://lotrtcg.org/coreset/gandalf/discernment.png', '20_156': 'http://lotrtcg.org/coreset/gandalf/gandalfdotp.png', - '20_157': 'http://lotrtcg.org/coreset/gandalf/gandalfwoti.png', + '20_157': 'http://lotrtcg.org/coreset/gandalf/gandalfwoti(r1).png', '20_158': 'http://lotrtcg.org/coreset/gandalf/gandalfspipe.png', '20_159': 'http://lotrtcg.org/coreset/gandalf/gandalfsstaffdod.png', '20_160': 'http://lotrtcg.org/coreset/gandalf/glamdringtb.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_157.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_157.java index 5dc15f8b3..658c8fe01 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_157.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/gandalf/Card20_157.java @@ -1,9 +1,7 @@ package com.gempukku.lotro.cards.set20.gandalf; import com.gempukku.lotro.cards.AbstractCompanion; -import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; -import com.gempukku.lotro.cards.effects.SelfExertEffect; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Race; @@ -19,9 +17,10 @@ import java.util.List; /** * 4 * •Gandalf, Wisest of the Istari - * Gandalf Companion • Wizard + * Companion • Wizard * 7 4 7 - * Each time you play a [Gandalf] spell, you may exert Gandalf to draw a card. + * Each time you play a [Gandalf] spell, you may draw a card. + * http://lotrtcg.org/coreset/gandalf/gandalfwoti(r1).png */ public class Card20_157 extends AbstractCompanion { public Card20_157() { @@ -30,11 +29,8 @@ public class Card20_157 extends AbstractCompanion { @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.played(game, effectResult, Culture.GANDALF, Keyword.SPELL) - && PlayConditions.canSelfExert(self, game)) { + if (TriggerConditions.played(game, effectResult, Culture.GANDALF, Keyword.SPELL)) { OptionalTriggerAction action = new OptionalTriggerAction(self); - action.appendCost( - new SelfExertEffect(action, self)); action.appendEffect( new DrawCardsEffect(action, playerId, 1)); return Collections.singletonList(action);