diff --git a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java index ee85b331d..3cd29e0d7 100644 --- a/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java +++ b/gemp-lotr/gemp-lotr-common/src/main/java/com/gempukku/lotro/common/Phase.java @@ -1,5 +1,5 @@ package com.gempukku.lotro.common; public enum Phase { - GAME_SETUP, FELLOWSHIP, SHADOW, MANEUVER, ARCHERY, ASSIGNMENT, SKIRMISH, REGROUP + GAME_SETUP, FELLOWSHIP, SHADOW, MANEUVER, ARCHERY, ASSIGNMENT, SKIRMISH, REGROUP, BETWEEN_TURNS } diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java index 4c7b2ddfa..5c2241839 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/TurnProcedure.java @@ -75,6 +75,11 @@ public class TurnProcedure { _effect = effect; } + @Override + public String getText() { + return _effect.getText(); + } + @Override public Effect nextEffect() { if (_effect.isCancelled()) 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 052167e1d..2a39d3337 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 @@ -1,5 +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.effects.TriggeringEffect; import com.gempukku.lotro.logic.timing.actions.SimpleEffectAction; @@ -17,6 +18,7 @@ public class EndOfTurnGameProcess implements GameProcess { public void process() { _game.getActionsEnvironment().addActionToStack(new SimpleEffectAction(new TriggeringEffect(new EndOfTurnResult()), "End of turn")); _game.getGameState().stopAffectingCardsForCurrentPlayer(); + _game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS); } @Override