From b390d04bcc48cc7172bfa0c3504f0d0550a6dbb3 Mon Sep 17 00:00:00 2001 From: PhallenCassidy Date: Tue, 14 Nov 2017 12:00:02 -0500 Subject: [PATCH] Fixed "Emeralds of Girion" Also cleaned up formatting a bit --- .../lotro/cards/set31/dwarven/Card31_003.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java index d7e40b099..4046e6d9b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set31/dwarven/Card31_003.java @@ -38,19 +38,20 @@ public class Card31_003 extends AbstractPermanent { @Override protected List getExtraPhaseActions(String playerId, LotroGame game, final PhysicalCard self) { if (PlayConditions.canUseFPCardDuringPhase(game, Phase.FELLOWSHIP, self)) { - final ActivateCardAction action = new ActivateCardAction(self); + final ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF)); - action.appendEffect( - new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN)); - return Collections.singletonList(action); - } - if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self)) { - final ActivateCardAction action = new ActivateCardAction(self); - action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.MAN)); - action.appendCost( - new SelfDiscardEffect(self)); + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.ELF)); + action.appendEffect( + new ChooseAndHealCharactersEffect(action, playerId, 1, 1, Race.MAN)); + return Collections.singletonList(action); + } + if (PlayConditions.canUseFPCardDuringPhase(game, Phase.REGROUP, self) + && PlayConditions.canExert(self, game, Race.MAN)) { + final ActivateCardAction action = new ActivateCardAction(self); + action.appendCost( + new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Race.MAN)); + action.appendCost( + new SelfDiscardEffect(self)); List possibleEffects = new LinkedList(); possibleEffects.add( new ChooseAndPlayCardFromDeckEffect(playerId, Race.ELF) { @@ -70,8 +71,8 @@ public class Card31_003 extends AbstractPermanent { } action.appendEffect( new ChoiceEffect(action, playerId, possibleEffects)); - return Collections.singletonList(action); + return Collections.singletonList(action); } return null; } -} \ No newline at end of file +}