ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing display of strength/vitality on opponent's turn.

Browse Source
This commit is contained in:
marcins78@gmail.com
2011-12-06 19:31:49 +00:00
parent 9828ed404c
commit 96e8d97bb9
5 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/MulliganProcess.java
View File

@@ -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();
}
}

4
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/pregame/PlayersDrawEightCardsGameProcess.java
View File

@@ -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

11
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/CleanupProcess.java → gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/BetweenTurnsProcess.java
View File

@@ -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

2
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/EndOfTurnGameProcess.java
View File

@@ -43,6 +43,6 @@ public class EndOfTurnGameProcess implements GameProcess {
@Override
public GameProcess getNextProcess() {
return new CleanupProcess();
return new BetweenTurnsProcess();
}
}

10
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/StartOfTurnGameProcess.java
View File

@@ -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(