diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantReplaceSiteModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantReplaceSiteModifier.java index 33240f312..e93e9ee2d 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantReplaceSiteModifier.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantReplaceSiteModifier.java @@ -15,6 +15,6 @@ public class CantReplaceSiteModifier extends AbstractModifier { @Override public boolean isSiteReplaceable(GameState gameState, ModifiersQuerying modifiersQuerying, String playerId) { - return true; + return false; } } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java index a149cfd19..537ac602a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/TriggersAtTest.java @@ -11,6 +11,7 @@ import com.gempukku.lotro.logic.modifiers.KeywordModifier; import org.junit.Test; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -158,8 +159,7 @@ public class TriggersAtTest extends AbstractAtTest { @Test public void userOfMusterDisablesUseOfOtherOptionalStartOfRegroupTrigger() throws DecisionResultInvalidException { - Map> extraCards = new HashMap>(); - initializeSimplestGame(extraCards); + initializeSimplestGame(); PhysicalCardImpl dervorin = new PhysicalCardImpl(100, "7_88", P1, _library.getLotroCardBlueprint("7_88")); PhysicalCardImpl boromir = new PhysicalCardImpl(101, "1_96", P1, _library.getLotroCardBlueprint("1_96")); @@ -199,4 +199,38 @@ public class TriggersAtTest extends AbstractAtTest { assertEquals(Phase.REGROUP, _game.getGameState().getCurrentPhase()); } + + @Test + public void replaceSiteNotPossibleWithMountDoom() throws DecisionResultInvalidException { + initializeSimplestGame(); + + PhysicalCardImpl gandalf = new PhysicalCardImpl(100, "1_72", P1, _library.getLotroCardBlueprint("1_72")); + PhysicalCardImpl traveledLeader = new PhysicalCardImpl(101, "12_34", P1, _library.getLotroCardBlueprint("12_34")); + PhysicalCardImpl mountDoom = new PhysicalCardImpl(102, "15_193", P2, _library.getLotroCardBlueprint("15_193")); + + skipMulligans(); + + _game.getGameState().addCardToZone(_game, traveledLeader, Zone.HAND); + _game.getGameState().addCardToZone(_game, gandalf, Zone.FREE_CHARACTERS); + + // End fellowship phase + playerDecided(P1, ""); + + _game.getGameState().removeCardsFromZone(P2, Collections.singleton(_game.getGameState().getSite(2))); + mountDoom.setSiteNumber(2); + _game.getGameState().addCardToZone(_game, mountDoom, Zone.ADVENTURE_PATH); + + // End shadow phase + playerDecided(P2, ""); + + final AwaitingDecision regroupActionDecision = _userFeedback.getAwaitingDecision(P1); + assertEquals(AwaitingDecisionType.CARD_ACTION_CHOICE, regroupActionDecision.getDecisionType()); + validateContents(new String[]{"" + traveledLeader.getCardId()}, (String[]) regroupActionDecision.getDecisionParameters().get("cardId")); + + playerDecided(P1, "0"); + + playerDecided(P1, "" + mountDoom.getCardId()); + + assertEquals(mountDoom, _game.getGameState().getSite(2)); + } } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index be1014ea5..d73c080ff 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,7 @@
+15 Mar. 2012
+- "Mount Doom" should finally work.
+
 14 Mar. 2012
 - "White Hand Destroyer" no longer has "Hunter 0" when you control no sites.
 - "Into the Caves" now can be used only when card is in play.