Fixing display of strength/vitality on opponent's turn.
This commit is contained in:
@@ -7,7 +7,7 @@ import com.gempukku.lotro.game.state.LotroGame;
|
|||||||
import com.gempukku.lotro.logic.PlayOrder;
|
import com.gempukku.lotro.logic.PlayOrder;
|
||||||
import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision;
|
import com.gempukku.lotro.logic.decisions.MultipleChoiceAwaitingDecision;
|
||||||
import com.gempukku.lotro.logic.timing.processes.GameProcess;
|
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.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@@ -47,7 +47,7 @@ public class MulliganProcess implements GameProcess {
|
|||||||
});
|
});
|
||||||
_nextProcess = new MulliganProcess(_playOrder);
|
_nextProcess = new MulliganProcess(_playOrder);
|
||||||
} else {
|
} else {
|
||||||
_nextProcess = new StartOfTurnGameProcess();
|
_nextProcess = new BetweenTurnsProcess();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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.GameState;
|
||||||
import com.gempukku.lotro.game.state.LotroGame;
|
import com.gempukku.lotro.game.state.LotroGame;
|
||||||
import com.gempukku.lotro.logic.timing.processes.GameProcess;
|
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 {
|
public class PlayersDrawEightCardsGameProcess implements GameProcess {
|
||||||
private String _firstPlayer;
|
private String _firstPlayer;
|
||||||
@@ -24,7 +24,7 @@ public class PlayersDrawEightCardsGameProcess implements GameProcess {
|
|||||||
if (game.getFormat().hasMulliganRule())
|
if (game.getFormat().hasMulliganRule())
|
||||||
_followingGameProcess = new MulliganProcess(game.getGameState().getPlayerOrder().getClockwisePlayOrder(_firstPlayer, false));
|
_followingGameProcess = new MulliganProcess(game.getGameState().getPlayerOrder().getClockwisePlayOrder(_firstPlayer, false));
|
||||||
else
|
else
|
||||||
_followingGameProcess = new StartOfTurnGameProcess();
|
_followingGameProcess = new BetweenTurnsProcess();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -2,13 +2,22 @@ package com.gempukku.lotro.logic.timing.processes.turn;
|
|||||||
|
|
||||||
import com.gempukku.lotro.common.Phase;
|
import com.gempukku.lotro.common.Phase;
|
||||||
import com.gempukku.lotro.game.state.LotroGame;
|
import com.gempukku.lotro.game.state.LotroGame;
|
||||||
|
import com.gempukku.lotro.logic.PlayOrder;
|
||||||
import com.gempukku.lotro.logic.timing.processes.GameProcess;
|
import com.gempukku.lotro.logic.timing.processes.GameProcess;
|
||||||
|
|
||||||
public class CleanupProcess implements GameProcess {
|
public class BetweenTurnsProcess implements GameProcess {
|
||||||
@Override
|
@Override
|
||||||
public void process(LotroGame game) {
|
public void process(LotroGame game) {
|
||||||
game.getGameState().stopAffectingCardsForCurrentPlayer();
|
game.getGameState().stopAffectingCardsForCurrentPlayer();
|
||||||
game.getGameState().setCurrentPhase(Phase.BETWEEN_TURNS);
|
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
|
@Override
|
||||||
@@ -43,6 +43,6 @@ public class EndOfTurnGameProcess implements GameProcess {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public GameProcess getNextProcess() {
|
public GameProcess getNextProcess() {
|
||||||
return new CleanupProcess();
|
return new BetweenTurnsProcess();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
package com.gempukku.lotro.logic.timing.processes.turn;
|
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.game.state.LotroGame;
|
||||||
import com.gempukku.lotro.logic.PlayOrder;
|
|
||||||
import com.gempukku.lotro.logic.actions.SystemQueueAction;
|
import com.gempukku.lotro.logic.actions.SystemQueueAction;
|
||||||
import com.gempukku.lotro.logic.effects.TriggeringResultEffect;
|
import com.gempukku.lotro.logic.effects.TriggeringResultEffect;
|
||||||
import com.gempukku.lotro.logic.timing.processes.GameProcess;
|
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 {
|
public class StartOfTurnGameProcess implements GameProcess {
|
||||||
@Override
|
@Override
|
||||||
public void process(LotroGame game) {
|
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();
|
SystemQueueAction action = new SystemQueueAction();
|
||||||
|
|
||||||
action.appendEffect(
|
action.appendEffect(
|
||||||
|
|||||||
Reference in New Issue
Block a user