From 372a565680b18104257653643b47770a032d99db Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 20 Nov 2013 16:00:01 +0000 Subject: [PATCH] Dwarven Vigor and Called to Mordor --- .../src/main/web/js/gemp-019/set20.js | 4 +- .../lotro/cards/set20/dwarven/Card20_048.java | 23 +++++------ .../cards/set20/fallenRealms/Card20_108.java | 41 +++++++++++-------- 3 files changed, 38 insertions(+), 30 deletions(-) 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 5cadb0891..38d94be5b 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 @@ -45,7 +45,7 @@ var set20 = { '20_45': 'http://lotrtcg.org/coreset/dwarven/dwarvenbracers.jpg', '20_46': 'http://lotrtcg.org/coreset/dwarven/dwarvenfrenzy.jpg', '20_47': 'http://lotrtcg.org/coreset/dwarven/dwarvenire.jpg', - '20_48': 'http://lotrtcg.org/coreset/dwarven/dwarvenvigor(r1).jpg', + '20_48': 'http://lotrtcg.org/coreset/dwarven/dwarvenvigor(r3).jpg', '20_49': 'http://lotrtcg.org/coreset/dwarven/enduranceofdwarves.jpg', '20_50': 'http://lotrtcg.org/coreset/dwarven/farindoe.jpg', '20_51': 'http://lotrtcg.org/coreset/dwarven/festivefolk.jpg', @@ -105,7 +105,7 @@ var set20 = { '20_105': 'http://lotrtcg.org/coreset/elven/vilyaerop.jpg', '20_106': 'http://lotrtcg.org/coreset/elven/wchshitd.jpg', '20_107': 'http://lotrtcg.org/coreset/fallenrealms/armoredmumak.jpg', - '20_108': 'http://lotrtcg.org/coreset/fallenrealms/calledtomordor.jpg', + '20_108': 'http://lotrtcg.org/coreset/fallenrealms/calledtomordor(r3).jpg', '20_109': 'http://lotrtcg.org/coreset/fallenrealms/discipline.jpg', '20_110': 'http://lotrtcg.org/coreset/fallenrealms/easterlingbeserker.jpg', '20_111': 'http://lotrtcg.org/coreset/fallenrealms/easterlingbroadshield.jpg', diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_048.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_048.java index b44307d42..8a7a791a0 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_048.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/dwarven/Card20_048.java @@ -13,16 +13,14 @@ import com.gempukku.lotro.logic.modifiers.StrengthModifier; import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator; /** - * 1 - * Dwarven Vigor + * ❶ •Dwarven Vigor [Dwa] * Condition • Support Area - * While there is a [Dwarven] card stacked on this condition, each Dwarf is strength +1 for each point of vitality - * over 3 that he has. - * http://lotrtcg.org/coreset/dwarven/dwarvenvigor(r1).png + * While there is a [Dwa] card stacked on this condition, each Dwarf is strength +1 for each point of vitality over 3 that he has. + * http://lotrtcg.org/coreset/dwarven/dwarvenvigor(r3).jpg */ public class Card20_048 extends AbstractPermanent { public Card20_048() { - super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Dwarven Vigor"); + super(Side.FREE_PEOPLE, 1, CardType.CONDITION, Culture.DWARVEN, Zone.SUPPORT, "Dwarven Vigor", null, true); } @Override @@ -31,13 +29,14 @@ public class Card20_048 extends AbstractPermanent { new Condition() { @Override public boolean isFullfilled(GameState gameState, ModifiersQuerying modifiersQuerying) { - return Filters.filter(gameState.getStackedCards(self), gameState, modifiersQuerying, Culture.DWARVEN).size()>0; + return Filters.filter(gameState.getStackedCards(self), gameState, modifiersQuerying, Culture.DWARVEN).size() > 0; } }, new Evaluator() { - @Override - public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard cardAffected) { - return Math.max(0, modifiersQuerying.getVitality(gameState, cardAffected)-3); - } - }); + @Override + public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard cardAffected) { + return Math.max(0, modifiersQuerying.getVitality(gameState, cardAffected) - 3); + } + } + ); } } diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_108.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_108.java index 60b31a412..9916bc8fd 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_108.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/fallenRealms/Card20_108.java @@ -1,40 +1,49 @@ package com.gempukku.lotro.cards.set20.fallenRealms; import com.gempukku.lotro.cards.AbstractEvent; -import com.gempukku.lotro.cards.PlayConditions; import com.gempukku.lotro.cards.actions.PlayEventAction; +import com.gempukku.lotro.cards.effects.choose.ChooseAndAddUntilEOPStrengthBonusEffect; import com.gempukku.lotro.common.Culture; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.common.Side; +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.effects.DrawCardsEffect; +import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; +import com.gempukku.lotro.logic.modifiers.evaluator.Evaluator; /** - * 7 - * Called to Mordor - * Fallen Realms Event • Shadow - * Toil 2. - * Spot an Easterling to draw 3 cards. + * ❶ Called to Mordor [Fal] + * Event • Skirmish + * Make an Easterling strength +1 for each wound on each character in his skirmish. + * http://lotrtcg.org/coreset/fallenrealms/calledtomordor(r3).jpg */ public class Card20_108 extends AbstractEvent { public Card20_108() { - super(Side.SHADOW, 7, Culture.FALLEN_REALMS, "Called to Mordor", Phase.SHADOW); - addKeyword(Keyword.TOIL, 2); - } - - @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.canSpot(game, Keyword.EASTERLING); + super(Side.SHADOW, 1, Culture.FALLEN_REALMS, "Called to Mordor", Phase.SKIRMISH); } @Override public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier, boolean ignoreRoamingPenalty) { PlayEventAction action = new PlayEventAction(self); action.appendEffect( - new DrawCardsEffect(action, playerId, 3)); + new ChooseAndAddUntilEOPStrengthBonusEffect( + action, self, playerId, + new Evaluator() { + @Override + public int evaluateExpression(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard cardAffected) { + int wounds = 0; + if (Filters.inSkirmish.accepts(gameState, modifiersQuerying, cardAffected)) { + for (PhysicalCard physicalCard : Filters.filterActive(gameState, modifiersQuerying, Filters.character, Filters.inSkirmish, Filters.wounded)) { + wounds += gameState.getWounds(physicalCard); + } + } + return wounds; + + } + }, Keyword.EASTERLING)); return action; } }