From 3274e75bd893abdd9b798079238789b3b3edf098 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 20 Nov 2013 16:08:51 +0000 Subject: [PATCH] Easterling Conscript --- .../src/main/web/js/gemp-019/set20.js | 2 +- .../cards/set20/fallenRealms/Card20_113.java | 21 +++++++++---------- 2 files changed, 11 insertions(+), 12 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 bcaeff774..21b6ed5b8 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 @@ -110,7 +110,7 @@ var set20 = { '20_110': 'http://lotrtcg.org/coreset/fallenrealms/easterlingbeserker.jpg', '20_111': 'http://lotrtcg.org/coreset/fallenrealms/easterlingbroadshield.jpg', '20_112': 'http://lotrtcg.org/coreset/fallenrealms/easterlingcaptaincor(r3).jpg', - '20_113': 'http://lotrtcg.org/coreset/fallenrealms/easterlingconscript.jpg', + '20_113': 'http://lotrtcg.org/coreset/fallenrealms/easterlingconscript(r3).jpg', '20_114': 'http://lotrtcg.org/coreset/fallenrealms/easterlingdetachment.jpg', '20_116': 'http://lotrtcg.org/coreset/fallenrealms/easterlingpikeman(r1).jpg', '20_117': 'http://lotrtcg.org/coreset/fallenrealms/easterlingrecruit.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_113.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_113.java index ecec605f6..5bad29e41 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_113.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_113.java @@ -1,38 +1,37 @@ 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.cards.effects.choose.ChooseAndDiscardCardsFromPlayEffect; 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.OptionalTriggerAction; import com.gempukku.lotro.logic.timing.EffectResult; +import com.gempukku.lotro.logic.timing.results.PlayCardResult; import java.util.Collections; import java.util.List; /** - * 3 - * Easterling Conscript - * Fallen Realms Minion • Man - * 6 1 4 - * Easterling. Toil 1. - * When you play this minion, you may spot a [Fallen Realms] minion to discard a Free Peoples condition. + * ❹ Easterling Conscript [Fal] + * Minion • Man + * Strength: 7 Vitality: 1 Roaming: 4 + * Easterling. Toil 1. (When you play this card, you may reduce its twilight cost by 1. You do this by exerting one of + * your characters of the same culture as this card.) + * When you play this minion using toil, you may discard a Free Peoples condition. + * http://lotrtcg.org/coreset/fallenrealms/easterlingconscript(r3).jpg */ public class Card20_113 extends AbstractMinion { public Card20_113() { - super(3, 6, 1, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Conscript"); + super(4, 7, 1, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Conscript"); addKeyword(Keyword.EASTERLING); addKeyword(Keyword.TOIL, 1); } @Override public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.played(game, effectResult, self) - && PlayConditions.canSpot(game, Filters.not(self), Culture.FALLEN_REALMS, CardType.MINION)) { + if (TriggerConditions.played(game, effectResult, self) && ((PlayCardResult) effectResult).isPaidToil()) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Side.FREE_PEOPLE, CardType.CONDITION));