From 83e787c822e290285dcdb9ac330f391d67db8752 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 29 Aug 2011 16:51:45 +0000 Subject: [PATCH] Playing site trigger added. --- ...yerPlaysNextSiteIfNotThereGameProcess.java | 26 +++++++++++++++---- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java b/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java index 0d0a976ef..80c8dfbeb 100644 --- a/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java +++ b/gemp-lotr/lotro-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java @@ -8,6 +8,7 @@ import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.timing.processes.GameProcess; import com.gempukku.lotro.logic.timing.processes.turn.general.SimpleTriggeringGameProcess; +import com.gempukku.lotro.logic.timing.results.PlayCardResult; import com.gempukku.lotro.logic.timing.results.WhenMoveFromResult; import com.gempukku.lotro.logic.timing.results.WhenMoveToResult; import com.gempukku.lotro.logic.timing.results.WhenMovesResult; @@ -16,6 +17,8 @@ public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess { private LotroGame _game; private GameProcess _afterMoveGameProcess; + private GameProcess _nextProcess; + public PlayerPlaysNextSiteIfNotThereGameProcess(LotroGame game, GameProcess afterMoveGameProcess) { _game = game; _afterMoveGameProcess = afterMoveGameProcess; @@ -42,15 +45,28 @@ public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess { gameState.removeCardFromZone(nextSite); gameState.addCardToZone(nextSite, Zone.ADVENTURE_PATH); gameState.startAffecting(nextSite, _game.getModifiersEnvironment()); + + _nextProcess = + new SimpleTriggeringGameProcess(_game, new PlayCardResult(nextSite), "Played next site", + new SimpleTriggeringGameProcess(_game, new WhenMoveFromResult(), "Fellowship moved from", + new SimpleTriggeringGameProcess(_game, new WhenMovesResult(), "Fellowship moves", + new MovePlayerTokenToNextSiteGameProcess(_game, + new SimpleTriggeringGameProcess(_game, new WhenMoveToResult(), "Fellowship moved to", + _afterMoveGameProcess))))); + + } else { + _nextProcess = + new SimpleTriggeringGameProcess(_game, new WhenMoveFromResult(), "Fellowship moved from", + new SimpleTriggeringGameProcess(_game, new WhenMovesResult(), "Fellowship moves", + new MovePlayerTokenToNextSiteGameProcess(_game, + new SimpleTriggeringGameProcess(_game, new WhenMoveToResult(), "Fellowship moved to", + _afterMoveGameProcess)))); + } } @Override public GameProcess getNextProcess() { - return new SimpleTriggeringGameProcess(_game, new WhenMoveFromResult(), "Fellowship moved from", - new SimpleTriggeringGameProcess(_game, new WhenMovesResult(), "Fellowship moves", - new MovePlayerTokenToNextSiteGameProcess(_game, - new SimpleTriggeringGameProcess(_game, new WhenMoveToResult(), "Fellowship moved to", - _afterMoveGameProcess)))); + return _nextProcess; } }