From 46ffc2414d95a3d6aeb294b681f5cccea0fdfa4b Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Sun, 18 Sep 2011 21:20:28 +0000 Subject: [PATCH] Playing site is a PlayCardEffect not a TriggeredEffect. --- ...yerPlaysNextSiteIfNotThereGameProcess.java | 22 ++++++++++++++----- gemp-lotr/todo.txt | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java index 80c8dfbeb..ae8ecc1fa 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/move/PlayerPlaysNextSiteIfNotThereGameProcess.java @@ -6,9 +6,10 @@ import com.gempukku.lotro.game.LotroCardBlueprint; 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.PlayCardEffect; +import com.gempukku.lotro.logic.timing.actions.SimpleEffectAction; 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; @@ -46,14 +47,25 @@ public class PlayerPlaysNextSiteIfNotThereGameProcess implements GameProcess { gameState.addCardToZone(nextSite, Zone.ADVENTURE_PATH); gameState.startAffecting(nextSite, _game.getModifiersEnvironment()); + final PhysicalCard site = nextSite; + _nextProcess = - new SimpleTriggeringGameProcess(_game, new PlayCardResult(nextSite), "Played next site", - new SimpleTriggeringGameProcess(_game, new WhenMoveFromResult(), "Fellowship moved from", + new GameProcess() { + @Override + public void process() { + _game.getActionsEnvironment().addActionToStack( + new SimpleEffectAction(new PlayCardEffect(site), "Plays next site")); + } + + @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))))); - + _afterMoveGameProcess)))); + } + }; } else { _nextProcess = new SimpleTriggeringGameProcess(_game, new WhenMoveFromResult(), "Fellowship moved from", diff --git a/gemp-lotr/todo.txt b/gemp-lotr/todo.txt index d2cfb0697..a90791064 100644 --- a/gemp-lotr/todo.txt +++ b/gemp-lotr/todo.txt @@ -48,3 +48,4 @@ with Filters.sameCard(...) filter. 32. Created tables do not disappear when the player closes the browser. 33. When a player stops responding during preparation time of the game, the game is not properly finished. 19. Add filtering cards to deck-builder. +