From 603dd777e0f36f317b0df0b0a781c0582bb4fea2 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Tue, 12 Mar 2013 11:19:21 +0000 Subject: [PATCH] - "Moria Caverns" now allows to play a Goblin from discard for discarding two cards, instead of forcing FP player to perform a next move (per card text). --- .../src/main/web/includes/changeLog.html | 2 ++ .../lotro/cards/set20/site/Card20_437.java | 17 +++++++---------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index d05b294f1..3c46fa592 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -7,6 +7,8 @@ - "Saruman, Tribal Instigator" is now a Wizard (not Man). - "Eomer, Eored Captain" now correctly gets +2 strength for each wound, instead of +1. - "The Long Dark of Moria" is now unique (per card text). +- "Moria Caverns" now allows to play a Goblin from discard for discarding two cards, instead of forcing FP player to +perform a next move (per card text). 11 Mar. 2013 - Second Edition is playable now. diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java index 8e01e5069..357c0df09 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set20/site/Card20_437.java @@ -2,8 +2,7 @@ package com.gempukku.lotro.cards.set20.site; import com.gempukku.lotro.cards.AbstractSite; import com.gempukku.lotro.cards.PlayConditions; -import com.gempukku.lotro.cards.effects.AddUntilEndOfPhaseModifierEffect; -import com.gempukku.lotro.cards.effects.choose.ChooseAndExertCharactersEffect; +import com.gempukku.lotro.cards.effects.choose.ChooseAndPlayCardFromDiscardEffect; import com.gempukku.lotro.common.Block; import com.gempukku.lotro.common.Keyword; import com.gempukku.lotro.common.Phase; @@ -12,8 +11,7 @@ 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.modifiers.ModifierFlag; -import com.gempukku.lotro.logic.modifiers.SpecialFlagModifier; +import com.gempukku.lotro.logic.effects.ChooseAndDiscardCardsFromHandEffect; import com.gempukku.lotro.logic.timing.Action; import java.util.Collections; @@ -33,15 +31,14 @@ public class Card20_437 extends AbstractSite { @Override public List getPhaseActions(String playerId, LotroGame game, PhysicalCard self) { - if (PlayConditions.canUseSiteDuringPhase(game, Phase.REGROUP, self) - && PlayConditions.canExert(self, game, Filters.owner(playerId), Race.GOBLIN) - && PlayConditions.canSpot(game, Filters.unboundCompanion, Race.HOBBIT)) { + if (PlayConditions.canUseSiteDuringPhase(game, Phase.SHADOW, self) + && PlayConditions.canDiscardFromHand(game, playerId, 2, Filters.any) + && PlayConditions.canPlayFromDiscard(playerId, game, Race.GOBLIN)) { ActivateCardAction action = new ActivateCardAction(self); action.appendCost( - new ChooseAndExertCharactersEffect(action, playerId, 1, 1, Filters.owner(playerId), Race.GOBLIN)); + new ChooseAndDiscardCardsFromHandEffect(action, playerId, false, 2)); action.appendEffect( - new AddUntilEndOfPhaseModifierEffect( - new SpecialFlagModifier(self, ModifierFlag.HAS_TO_MOVE_IF_POSSIBLE))); + new ChooseAndPlayCardFromDiscardEffect(playerId, game, Race.GOBLIN)); return Collections.singletonList(action); } return null;