From 7a34a9bdbdae5498b43d029120c2d3e73c7252c5 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 19 Mar 2013 11:11:11 +0000 Subject: [PATCH] 20_309 --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../lotro/cards/set20/wraith/Card20_309.java | 34 ++++++------------- 2 files changed, 11 insertions(+), 25 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 3cd6838d7..d4c3b26b9 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 @@ -307,7 +307,7 @@ var set20 = { '20_306': 'http://lotrtcg.org/coreset/ringwraith/ulaireenqueama.png', '20_307': 'http://lotrtcg.org/coreset/ringwraith/ulairelemenyats(r1).jpg', '20_308': 'http://lotrtcg.org/coreset/ringwraith/ulairenelyadttr.png', - '20_309': 'http://lotrtcg.org/coreset/ringwraith/ulairenerteatf.png', + '20_309': 'http://lotrtcg.org/coreset/ringwraith/ulairenerteatf(r1).jpg', '20_310': 'http://lotrtcg.org/coreset/ringwraith/ulaireotseatm.png', '20_311': 'http://lotrtcg.org/coreset/ringwraith/ulairetoldearib.png', '20_312': 'http://lotrtcg.org/coreset/ringwraith/witchkingrit.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_309.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_309.java index 12ce5a56b..d958dd56f 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_309.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/wraith/Card20_309.java @@ -1,45 +1,31 @@ package com.gempukku.lotro.cards.set20.wraith; import com.gempukku.lotro.cards.AbstractMinion; -import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.effects.SelfExertEffect; import com.gempukku.lotro.cards.modifiers.FpSkirmishResistanceStrengthOverrideModifier; 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.timing.Action; - -import java.util.Collections; -import java.util.List; +import com.gempukku.lotro.logic.modifiers.Modifier; /** * 4 * •Ulaire Nertea, Twilight Fiend - * Ringwraith Minion • Nazgul - * 9 3 3 - * Twilight. Exert Nertea to make characters skirmishing him use resistance instead of strength to resolve skirmishes. + * Minion • Nazgul + * 9 2 3 + * Twilight. + * Companions bearing [Ringwraith] conditions use resistance instead of strength to resolve skirmishes involving Ulaire Nertea. + * http://lotrtcg.org/coreset/ringwraith/ulairenerteatf(r1).jpg */ public class Card20_309 extends AbstractMinion { public Card20_309() { - super(4, 9, 3, 3, Race.NAZGUL, Culture.WRAITH, Names.nertea, "Twilight Fiend", true); + super(4, 9, 2, 3, Race.NAZGUL, Culture.WRAITH, Names.nertea, "Twilight Fiend", true); addKeyword(Keyword.TWILIGHT); } @Override - protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) - && PlayConditions.canSelfExert(self, game)) { - ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new SelfExertEffect(action, self)); - action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new FpSkirmishResistanceStrengthOverrideModifier(self, Filters.and(Filters.character, Filters.inSkirmishAgainst(self)), null))); - return Collections.singletonList(action); - } - return null; + public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { + return new FpSkirmishResistanceStrengthOverrideModifier(self, + Filters.and(CardType.COMPANION, Filters.hasAttached(Culture.WRAITH, CardType.CONDITION), Filters.inSkirmishAgainst(self)), null); } }