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 93ba136e6..05c025ec7 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 @@ -350,7 +350,7 @@ var set20 = { '20_357': 'http://lotrtcg.org/coreset/sauron/gatheringevil(r1).jpg', '20_358': 'http://lotrtcg.org/coreset/sauron/gothmogvc.jpg', '20_359': 'http://lotrtcg.org/coreset/sauron/gothmogswargrb.jpg', - '20_360': 'http://lotrtcg.org/coreset/sauron/greateyel(r1).jpg', + '20_360': 'http://lotrtcg.org/coreset/sauron/greateyel(r3).jpg', '20_361': 'http://lotrtcg.org/coreset/sauron/grondwh(r1).jpg', '20_362': 'http://lotrtcg.org/coreset/sauron/mouthofsauronbgm.jpg', '20_363': 'http://lotrtcg.org/coreset/sauron/ologhaimalice.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_360.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_360.java index 4bacb6ed7..8f7814428 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_360.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/sauron/Card20_360.java @@ -3,18 +3,19 @@ package com.gempukku.lotro.cards.set20.sauron; import com.gempukku.lotro.cards.AbstractMinion; import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.TriggerConditions; -import com.gempukku.lotro.cards.effects.AddUntilStartOfPhaseModifierEffect; +import com.gempukku.lotro.cards.effects.AddBurdenEffect; +import com.gempukku.lotro.cards.effects.RevealCardEffect; import com.gempukku.lotro.cards.effects.SelfExertEffect; -import com.gempukku.lotro.cards.modifiers.FPCulturesSpotCountModifier; +import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; import com.gempukku.lotro.cards.modifiers.evaluator.CountActiveEvaluator; import com.gempukku.lotro.common.CardType; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Phase; -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.actions.OptionalTriggerAction; import com.gempukku.lotro.logic.actions.RequiredTriggerAction; import com.gempukku.lotro.logic.effects.AddThreatsEffect; import com.gempukku.lotro.logic.timing.Action; @@ -24,14 +25,15 @@ import java.util.Collections; import java.util.List; /** - * 3 - * •The Great Eye, Lidless + * ❸ •The Great Eye, Lidless [Sau] * Minion - * 6 4 6 - * Cunning. - * When you play this minion, spot another [Sauron] minion to add a threat for each companion over 4. - * Shadow: Exert The Great Eye twice to make the number of Free Peoples cultures you can spot -1 until the regroup phase. - * http://lotrtcg.org/coreset/sauron/greateyel(r1).png + * Strength: 6 Vitality: 4 Roaming: 6 + * Cunning. (This minion may not take wounds during the archery phase and may not be assigned to a skirmish.) + * When you play The Great Eye, add a threat for each companion over 4. + * Each time the Ring-bearer puts on The One Ring, you may reveal this card from hand to add a burden. + * Skirmish: Exert The Great Eye to make a [Sau] minion strength +2. + *

+ * http://lotrtcg.org/coreset/sauron/greateyel(r3).jpg */ public class Card20_360 extends AbstractMinion { public Card20_360() { @@ -39,10 +41,23 @@ public class Card20_360 extends AbstractMinion { addKeyword(Keyword.CUNNING); } + @Override + public List getOptionalAfterTriggersFromHand(String playerId, LotroGame game, EffectResult effectResult, PhysicalCard self) { + if (effectResult.getType() == EffectResult.Type.PUT_ON_THE_ONE_RING + && !playerId.equals(game.getGameState().getCurrentPlayerId())) { + OptionalTriggerAction action = new OptionalTriggerAction(self); + action.appendCost( + new RevealCardEffect(self, self)); + action.appendEffect( + new AddBurdenEffect(playerId, self, 1)); + return Collections.singletonList(action); + } + return null; + } + @Override public List getRequiredAfterTriggers(LotroGame game, EffectResult effectResult, PhysicalCard self) { - if (TriggerConditions.played(game, effectResult, self) - && PlayConditions.canSpot(game, Filters.not(self), Culture.SAURON, CardType.MINION)) { + if (TriggerConditions.played(game, effectResult, self)) { RequiredTriggerAction action = new RequiredTriggerAction(self); action.appendEffect( new AddThreatsEffect(self.getOwner(), self, @@ -54,16 +69,14 @@ public class Card20_360 extends AbstractMinion { @Override protected List getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SHADOW, self, 0) - && PlayConditions.canSelfExert(self, 2, game)) { + if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SKIRMISH, self, 0) + && PlayConditions.canSelfExert(self, game)) { ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new SelfExertEffect(action, self)); action.appendCost( new SelfExertEffect(action, self)); action.appendEffect( - new AddUntilStartOfPhaseModifierEffect( - new FPCulturesSpotCountModifier(self, playerId, -1), Phase.REGROUP)); + new ChooseAndAddUntilEOPStrengthBonusEffect( + action, self, playerId, 2, Culture.SAURON, CardType.MINION)); return Collections.singletonList(action); } return null;