github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-04-13 09:11:06 -09:00
Code Issues Projects Releases Packages Wiki Activity

Added two new events and replacement calls - PLAY_TURN and EXTRA_TURN.

Browse source
This commit is contained in:
LevelX2 2014-09-11 17:00:21 +02:00
parent 86abd6a2e5
commit 0ffa27e777
2 changed files with 38 additions and 12 deletions
Mage/src/mage/game
GameImpl.java
events
GameEvent.java

49
Mage/src/mage/game/GameImpl.java
View file

@ -604,22 +604,25 @@ public abstract class GameImpl implements Game, Serializable {
PlayerList players = state.getPlayerList(nextPlayerId);
Player player = getPlayer(players.get());
while (!isPaused() && !gameOver(null)) {
if (!playTurn(player)) {
break;
GameEvent event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, player.getId());
if (!replaceEvent(event)) {
if (!playTurn(player)) {
break;
}
state.setTurnNum(state.getTurnNum() + 1);
}
state.setTurnNum(state.getTurnNum() + 1);
//20091005 - 500.7
UUID extraTurnId = getState().getTurnMods().getExtraTurn(player.getId());
UUID extraTurnId = getNextExtraTurn(player.getId());
while (extraTurnId != null) {
state.setExtraTurn(true);
state.setTurnId(extraTurnId);
playTurn(player);
state.setTurnNum(state.getTurnNum() + 1);
extraTurnId = getState().getTurnMods().getExtraTurn(player.getId());
event = new GameEvent(GameEvent.EventType.PLAY_TURN, null, null, player.getId());
if (!replaceEvent(event)) {
state.setExtraTurn(true);
state.setTurnId(extraTurnId);
playTurn(player);
state.setTurnNum(state.getTurnNum() + 1);
}
extraTurnId = getNextExtraTurn(player.getId());
}
state.setTurnId(null);
state.setExtraTurn(false);
@ -632,6 +635,28 @@ public abstract class GameImpl implements Game, Serializable {
}
}
private UUID getNextExtraTurn(UUID playerId) {
Player player = this.getPlayer(playerId);
if (player != null) {
boolean checkForExtraTurn = true;
while(checkForExtraTurn) {
UUID extraTurnId = getState().getTurnMods().getExtraTurn(playerId);
if (extraTurnId != null) {
GameEvent event = new GameEvent(GameEvent.EventType.EXTRA_TURN, extraTurnId, null, playerId);
if (!replaceEvent(event)) {
return extraTurnId;
}
} else {
checkForExtraTurn = false;
}
if (!player.isInGame()) {
return null;
}
}
}
return null;
}
private boolean playTurn(Player player) {
this.logStartOfTurn(player);
if (checkStopOnTurnOption()) {

1
Mage/src/mage/game/events/GameEvent.java
View file

@ -55,6 +55,7 @@ public class GameEvent {
PREVENT_DAMAGE, PREVENTED_DAMAGE,
//Turn-based events
PLAY_TURN, EXTRA_TURN,
CHANGE_PHASE, PHASE_CHANGED,
CHANGE_STEP, STEP_CHANGED,
BEGINNING_PHASE, BEGINNING_PHASE_PRE, BEGINNING_PHASE_POST,