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 71273f802..370084439 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 @@ -375,7 +375,7 @@ var set20 = { '20_374': 'http://lotrtcg.org/coreset/sauron/shadowintheeast(r1).png', '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.png', + '20_377': 'http://lotrtcg.org/coreset/sauron/trollofgorgoroth(r1).png', '20_378': 'http://lotrtcg.org/coreset/sauron/trollofmorannon.png', '20_379': 'http://lotrtcg.org/coreset/sauron/viciousologhai.png', '20_380': 'http://lotrtcg.org/coreset/sauron/warcryofmorannon.png', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_377.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_377.java index 010042c70..9738bbe06 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_377.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_377.java @@ -4,14 +4,15 @@ 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.cards.modifiers.evaluator.CountFPCulturesEvaluator; +import com.gempukku.lotro.cards.modifiers.evaluator.NegativeEvaluator; import com.gempukku.lotro.common.*; 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.OptionalTriggerAction; -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; @@ -20,27 +21,29 @@ import java.util.List; /** * 4 * Troll of Gorgoroth - * Sauron Minion • Troll - * 12 3 6 + * Minion • Troll + * 14 3 6 * Fierce. - * This minion's twilight cost is +1 for each Free Peoples culture you can spot. - * When you play this minion in region 3, you may discard a Free Peoples condition. + * This minion is strength -1 for Free Peoples culture you can spot. + * When you play this minion in region 3, you may spot another [Sauron] minion to discard a Free Peoples condition. + * http://lotrtcg.org/coreset/sauron/trollofgorgoroth(r1).png */ public class Card20_377 extends AbstractMinion { public Card20_377() { - super(4, 12, 3, 6, Race.TROLL, Culture.SAURON, "Troll of Gorgoroth"); + super(4, 14, 3, 6, Race.TROLL, Culture.SAURON, "Troll of Gorgoroth"); addKeyword(Keyword.FIERCE); } @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 getOptionalAfterTriggers(String playerId, 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, Filters.not(self), Culture.SAURON, CardType.MINION)) { OptionalTriggerAction action = new OptionalTriggerAction(self); action.appendEffect( new ChooseAndDiscardCardsFromPlayEffect(action, playerId, 1, 1, Side.FREE_PEOPLE, CardType.CONDITION));