From dfaaf501264ae61748ad8855cd04109a083154d8 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Mon, 25 Mar 2013 11:05:03 +0000 Subject: [PATCH] 20_319 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/rohan/Card20_319.java | 17 +++++++++-------- 2 files changed, 10 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 b96d5958f..4fdefdcfc 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 @@ -310,7 +310,7 @@ var set20 = { '20_316': 'http://lotrtcg.org/coreset/rohan/eomerec.jpg', '20_317': 'http://lotrtcg.org/coreset/rohan/eomerrm.jpg', '20_318': 'http://lotrtcg.org/coreset/rohan/eomersspear.jpg', - '20_319': 'http://lotrtcg.org/coreset/rohan/eowynlots(r1).jpg', + '20_319': 'http://lotrtcg.org/coreset/rohan/eowynlots(r2).jpg', '20_320': 'http://lotrtcg.org/coreset/rohan/eowynnor.jpg', '20_321': 'http://lotrtcg.org/coreset/rohan/eowynsswordnb.jpg', '20_322': 'http://lotrtcg.org/coreset/rohan/feyheseemed.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_319.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_319.java index c0d2fd24e..309650599 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_319.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/rohan/Card20_319.java @@ -1,14 +1,16 @@ package com.gempukku.lotro.cards.set20.rohan; import com.gempukku.lotro.cards.AbstractCompanion; -import com.gempukku.lotro.common.*; +import com.gempukku.lotro.common.Culture; +import com.gempukku.lotro.common.Keyword; +import com.gempukku.lotro.common.Names; +import com.gempukku.lotro.common.Race; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.modifiers.Modifier; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; -import com.gempukku.lotro.logic.modifiers.SpotCondition; import com.gempukku.lotro.logic.modifiers.StrengthModifier; /** @@ -17,9 +19,9 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; * Companion • Man * 6 3 7 * Valiant. - * While in your starting fellowship, Eowyn's twilight cost is -1. - * While you can spot an exhausted [Rohan] Man, Eowyn is strength +2. - * http://lotrtcg.org/coreset/rohan/eowynlots(r1).png + * While you can spot a [Rohan] Man, Eowyn's twilight cost is -1. + * While Eowyn is exhausted, she is strength +2. + * http://lotrtcg.org/coreset/rohan/eowynlots(r2).jpg */ public class Card20_319 extends AbstractCompanion { public Card20_319() { @@ -29,12 +31,11 @@ public class Card20_319 extends AbstractCompanion { @Override public int getTwilightCostModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { - return (gameState.getCurrentPhase() == Phase.PLAY_STARTING_FELLOWSHIP)?-1:0; + return Filters.canSpot(gameState, modifiersQuerying, Culture.ROHAN, Race.MAN)?-1:0; } @Override public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new StrengthModifier(self, self, - new SpotCondition(Culture.ROHAN, Race.MAN, Filters.exhausted), 2); + return new StrengthModifier(self, Filters.and(self, Filters.exhausted), 2); } }