From 96e8d97bb9c1ab67cddea140a0056a60fbb47843 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 6 Dec 2011 19:31:49 +0000 Subject: [PATCH] Fixing display of strength/vitality on opponent's turn. --- .../timing/processes/pregame/MulliganProcess.java | 4 ++-- .../pregame/PlayersDrawEightCardsGameProcess.java | 4 ++-- .../{CleanupProcess.java => BetweenTurnsProcess.java} | 11 ++++++++++- .../timing/processes/turn/EndOfTurnGameProcess.java | 2 +- .../timing/processes/turn/StartOfTurnGameProcess.java | 10 ---------- 5 files changed, 15 insertions(+), 16 deletions(-) rename gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/{CleanupProcess.java => BetweenTurnsProcess.java} (51%) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/MulliganProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/MulliganProcess.java index 95e39c945..c49cede45 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/MulliganProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/MulliganProcess.java @@ -7,7 +7,7 @@ import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision; import com.gempukku.lotro.logic.timing.processes.GameProcess; -import com.gempukku.lotro.logic.timing.processes.turn.StartOfTurnGameProcess; +import com.gempukku.lotro.logic.timing.processes.turn.BetweenTurnsProcess; import java.util.HashSet; import java.util.Set; @@ -47,7 +47,7 @@ public class MulliganProcess implements GameProcess { }); _nextProcess = new MulliganProcess(_playOrder); } else { - _nextProcess = new StartOfTurnGameProcess(); + _nextProcess = new BetweenTurnsProcess(); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java index 46273e385..468915981 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java @@ -3,7 +3,7 @@ package com.gempukku.lotro.logic.timing.processes.pregame; 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.StartOfTurnGameProcess; +import com.gempukku.lotro.logic.timing.processes.turn.BetweenTurnsProcess; public class PlayersDrawEightCardsGameProcess implements GameProcess { private String _firstPlayer; @@ -24,7 +24,7 @@ public class PlayersDrawEightCardsGameProcess implements GameProcess { if (game.getFormat().hasMulliganRule()) _followingGameProcess = new MulliganProcess(game.getGameState().getPlayerOrder().getClockwisePlayOrder(_firstPlayer, false)); else - _followingGameProcess = new StartOfTurnGameProcess(); + _followingGameProcess = new BetweenTurnsProcess(); } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/CleanupProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java similarity index 51% rename from gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/CleanupProcess.java rename to gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java index d9039e8ef..152e66623 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/CleanupProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java @@ -2,13 +2,22 @@ package com.gempukku.lotro.logic.timing.processes.turn; import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; +import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.timing.processes.GameProcess; -public class CleanupProcess implements GameProcess { +public class BetweenTurnsProcess implements GameProcess { @Override public void process(LotroGame game) { game.getGameState().stopAffectingCardsForCurrentPlayer(); game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); + + PlayOrder playOrder = game.getGameState().getPlayerOrder().getClockwisePlayOrder(game.getGameState().getCurrentPlayerId(), false); + playOrder.getNextPlayer(); + + String nextPlayer = playOrder.getNextPlayer(); + game.getGameState().startPlayerTurn(nextPlayer); + game.getGameState().startAffectingCardsForCurrentPlayer(game); + } @Override diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java index b8d4894e6..41c048d19 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java @@ -43,6 +43,6 @@ public class EndOfTurnGameProcess implements GameProcess { @Override public GameProcess getNextProcess() { - return new CleanupProcess(); + return new BetweenTurnsProcess(); } } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java index c779e2f60..0a8d746b8 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java @@ -1,8 +1,6 @@ package com.gempukku.lotro.logic.timing.processes.turn; -import com.gempukku.lotro.common.Phase; import com.gempukku.lotro.game.state.LotroGame; -import com.gempukku.lotro.logic.PlayOrder; import com.gempukku.lotro.logic.actions.SystemQueueAction; import com.gempukku.lotro.logic.effects.TriggeringResultEffect; import com.gempukku.lotro.logic.timing.processes.GameProcess; @@ -11,14 +9,6 @@ import com.gempukku.lotro.logic.timing.results.StartOfTurnResult; public class StartOfTurnGameProcess implements GameProcess { @Override public void process(LotroGame game) { - PlayOrder playOrder = game.getGameState().getPlayerOrder().getClockwisePlayOrder(game.getGameState().getCurrentPlayerId(), false); - playOrder.getNextPlayer(); - - String nextPlayer = playOrder.getNextPlayer(); - game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); - game.getGameState().startPlayerTurn(nextPlayer); - game.getGameState().startAffectingCardsForCurrentPlayer(game); - SystemQueueAction action = new SystemQueueAction(); action.appendEffect(