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 3129610b0..0c5f28990 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 @@ -82,7 +82,7 @@ var set20 = { '20_82': 'http://lotrtcg.org/coreset/elven/elvenreflexes.jpg', '20_83': 'http://lotrtcg.org/coreset/elven/forewarned.jpg', '20_84': 'http://lotrtcg.org/coreset/elven/galadrielwlol.jpg', - '20_85': 'http://lotrtcg.org/coreset/elven/galadrielswisdom.jpg', + '20_85': 'http://www.lotrtcg.org/coreset/elven/galadrielswisdom(r2).jpg', '20_86': 'http://lotrtcg.org/coreset/elven/golradircoi.jpg', '20_87': 'http://lotrtcg.org/coreset/elven/gwemegilefb.jpg', '20_88': 'http://lotrtcg.org/coreset/elven/haldirge.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_085.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_085.java index 6db5dfab2..b5ce813d5 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_085.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/elven/Card20_085.java @@ -19,8 +19,10 @@ import java.util.List; /** * 2 * Galadriel's Wisdom - * Elven Event • Regroup - * Exert Galadriel twice to reveal the top card of your draw deck. Discard X Shadow conditions, where X is the revealed card's twilight cost. + * Event • Regroup + * Exert Galadriel and reveal the top card of your draw deck to discard a Shadow condition (or 2 Shadow conditions + * if you reveal an [Elven] card). + * http://www.lotrtcg.org/coreset/elven/galadrielswisdom(r2).jpg */ public class Card20_085 extends AbstractEvent { public Card20_085() { @@ -30,23 +32,25 @@ public class Card20_085 extends AbstractEvent { @Override public boolean checkPlayRequirements(String playerId, LotroGame game, PhysicalCard self, int withTwilightRemoved, int twilightModifier, boolean ignoreRoamingPenalty, boolean ignoreCheckingDeadPile) { return super.checkPlayRequirements(playerId, game, self, withTwilightRemoved, twilightModifier, ignoreRoamingPenalty, ignoreCheckingDeadPile) - && PlayConditions.canExert(self, game, 2, 1, Filters.galadriel); + && PlayConditions.canExert(self, game, 1, 1, Filters.galadriel); } @Override public PlayEventAction getPlayCardAction(final String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { final PlayEventAction action = new PlayEventAction(self); - action.appendEffect( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, 2, Filters.galadriel)); - action.appendEffect( + action.appendCost( + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.galadriel)); + action.appendCost( new RevealTopCardsOfDrawDeckEffect(self, playerId, 1) { @Override protected void cardsRevealed(List revealedCards) { + int count = 1; for (PhysicalCard revealedCard : revealedCards) { - int twilightCost = revealedCard.getBlueprint().getTwilightCost(); - action.appendEffect( - new ChooseAndDiscardCardsFromPlayEffect(action, playerId, twilightCost, twilightCost, CardType.CONDITION, Side.SHADOW)); + if (revealedCard.getBlueprint().getCulture() == Culture.ELVEN) + count = 2; } + action.appendEffect( + new ChooseAndDiscardCardsFromPlayEffect(action, playerId, count, count, CardType.CONDITION, Side.SHADOW)); } }); return action;