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 61508062d..bcaeff774 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 @@ -109,7 +109,7 @@ var set20 = { '20_109': 'http://lotrtcg.org/coreset/fallenrealms/discipline(r3).jpg', '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.jpg', + '20_112': 'http://lotrtcg.org/coreset/fallenrealms/easterlingcaptaincor(r3).jpg', '20_113': 'http://lotrtcg.org/coreset/fallenrealms/easterlingconscript.jpg', '20_114': 'http://lotrtcg.org/coreset/fallenrealms/easterlingdetachment.jpg', '20_116': 'http://lotrtcg.org/coreset/fallenrealms/easterlingpikeman(r1).jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_112.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_112.java index eabb0f847..4dbcd59b6 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_112.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_112.java @@ -1,33 +1,50 @@ 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.ChooseAndPlayCardFromDiscardEffect; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Race; -import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.modifiers.Modifier; -import com.gempukku.lotro.logic.modifiers.StrengthModifier; +import com.gempukku.lotro.logic.actions.OptionalTriggerAction; +import com.gempukku.lotro.logic.effects.RemoveThreatsEffect; +import com.gempukku.lotro.logic.timing.EffectResult; + +import java.util.Collections; +import java.util.List; /** - * 5 - * •Easterling Captain, Champion of Rhun - * Fallen Realms Minion • Man - * 10 3 4 - * Easterling. Fierce. Toil 2. - * Each wounded Easterling is strength +1. + * ❼ •Easterling Captain, Champion of Rhûn [Fal] + * Minion • Man + * Strength: 10 Vitality: 3 Roaming: 4 + * Easterling. Enduring. (For each wound on this character, this character is strength +2.) Fierce. (During a turn, + * after all normal skirmishes are resolved, this minion must be defended against a second time.) + * When you play this minion, you may remove a threat to play a [Fal] card from your discard pile. + * http://lotrtcg.org/coreset/fallenrealms/easterlingcaptaincor(r3).jpg */ public class Card20_112 extends AbstractMinion { public Card20_112() { - super(5, 10, 3, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Captain", "Champion of Rhun", true); + super(7, 10, 3, 4, Race.MAN, Culture.FALLEN_REALMS, "Easterling Captain", "Champion of Rhun", true); addKeyword(Keyword.EASTERLING); + addKeyword(Keyword.ENDURING); addKeyword(Keyword.FIERCE); - addKeyword(Keyword.TOIL, 2); } @Override - public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { - return new StrengthModifier(self, Filters.and(Keyword.EASTERLING, Filters.wounded), 1); + public List getOptionalAfterTriggers(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (TriggerConditions.played(game, effectResult, self) + && PlayConditions.canRemoveThreat(game, self, 1) + && PlayConditions.canPlayFromDiscard(playerId, game, Culture.FALLEN_REALMS)) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendCost( + new RemoveThreatsEffect(self, 1)); + action.appendEffect( + new ChooseAndPlayCardFromDiscardEffect(playerId, game, Culture.FALLEN_REALMS)); + return Collections.singletonList(action); + } + return null; } }