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 370084439..da9266bf0 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 @@ -376,7 +376,7 @@ var set20 = { '20_375': 'http://lotrtcg.org/coreset/sauron/threatofmordor(r1).png', '20_376': 'http://lotrtcg.org/coreset/sauron/threateningologhai(r1).png', '20_377': 'http://lotrtcg.org/coreset/sauron/trollofgorgoroth(r1).png', - '20_378': 'http://lotrtcg.org/coreset/sauron/trollofmorannon.png', + '20_378': 'http://lotrtcg.org/coreset/sauron/trollofmorannon(r1).png', '20_379': 'http://lotrtcg.org/coreset/sauron/viciousologhai.png', '20_380': 'http://lotrtcg.org/coreset/sauron/warcryofmorannon.png', '20_381': 'http://lotrtcg.org/coreset/sauron/firesrageunchecked.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_378.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_378.java index 677c45ff1..83ef9122e 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_378.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_378.java @@ -4,16 +4,18 @@ import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; import com.gempukku.lotro.cards.effects.AddBurdenEffect; +import com.gempukku.lotro.cards.modifiers.evaluator.CountFPCulturesEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.NegativeEvaluator; +import com.gempukku.lotro.common.CardType; 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.GameState; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.GameUtils; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; -import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; +import com.gempukku.lotro.logic.modifiers.Modifier; +import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.timing.EffectResult; import java.util.Collections; @@ -21,28 +23,31 @@ import java.util.List; /** * 4 - * Troll of Morannon - * Sauron Minion • Troll - * 12 3 6 + * •Troll of Morannon + * Minion • Troll + * 14 3 6 * Damage +1. Fierce. - * This minion's twilight cost is +1 for each Free Peoples culture you can spot. - * When you play this minion in region 3, add a burden. + * This minion is strength -1 for each Free Peoples culture you can spot. + * When you play this minion in region 3, you may spot a [Sauron] or [Ringwraith] minion to add a burden. + * http://lotrtcg.org/coreset/sauron/trollofmorannon(r1).png */ public class Card20_378 extends AbstractMinion { public Card20_378() { - super(4, 12, 3, 6, Race.TROLL, Culture.SAURON, "Troll of Morannon"); + super(4, 12, 3, 6, Race.TROLL, Culture.SAURON, "Troll of Morannon", null, true); addKeyword(Keyword.FIERCE); + addKeyword(Keyword.DAMAGE, 1); } @Override - public int getTwilightCostModifier(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard self) { - return GameUtils.getSpottableFPCulturesCount(gameState, modifiersQuerying, self.getOwner()); + public Modifier getAlwaysOnModifier(LotroGame game, PhysicalCard self) { + return new StrengthModifier(self, self, null, new NegativeEvaluator(new CountFPCulturesEvaluator(self.getOwner()))); } @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { if (TriggerConditions.played(game, effectResult, self) - && PlayConditions.location(game, Filters.region(3))) { + && PlayConditions.location(game, Filters.region(3)) + && PlayConditions.canSpot(game, CardType.MINION, Filters.or(Culture.SAURON, Culture.WRAITH))) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddBurdenEffect(self.getOwner(), self, 1));