github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add TurnId to GameState (for Final Fortune card)

Browse source
This commit is contained in:
Quercitron 2014-05-23 23:48:13 +04:00
parent 3417be4a78
commit d7489789d9
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -597,11 +597,16 @@ public abstract class GameImpl<T extends GameImpl<T>> implements Game, Serializa
state.setTurnNum(state.getTurnNum() + 1); state.setTurnNum(state.getTurnNum() + 1);
//20091005 - 500.7 //20091005 - 500.7
while (getState().getTurnMods().extraTurn(player.getId())) { UUID extraTurnId = getState().getTurnMods().getExtraTurn(player.getId());
while (extraTurnId != null) {
state.setExtraTurn(true); state.setExtraTurn(true);
state.setTurnId(extraTurnId);
playTurn(player); playTurn(player);
state.setTurnNum(state.getTurnNum() + 1); state.setTurnNum(state.getTurnNum() + 1);
extraTurnId = getState().getTurnMods().getExtraTurn(player.getId());
} }
state.setTurnId(null);
state.setExtraTurn(false); state.setExtraTurn(false);
player = players.getNext(this); player = players.getNext(this);
} }

9
Mage/src/mage/game/GameState.java
View file

@ -105,6 +105,7 @@ public class GameState implements Serializable, Copyable<GameState> {
private Exile exile; private Exile exile;
private Battlefield battlefield; private Battlefield battlefield;
private int turnNum = 1; private int turnNum = 1;
private UUID turnId = null;
private boolean extraTurn = false; private boolean extraTurn = false;
private boolean legendaryRuleActive = true; private boolean legendaryRuleActive = true;
private boolean gameOver; private boolean gameOver;
@ -358,6 +359,14 @@ public class GameState implements Serializable, Copyable<GameState> {
this.turnNum = turnNum; this.turnNum = turnNum;
} }
public UUID getTurnId() {
return this.turnId;
}
public void setTurnId(UUID turnId) {
this.turnId = turnId;
}
public boolean isExtraTurn() { public boolean isExtraTurn() {
return extraTurn; return extraTurn;
} }

6
Mage/src/mage/game/turn/TurnMods.java
View file

@ -49,16 +49,16 @@ public class TurnMods extends ArrayList<TurnMod> {
} }
} }
public boolean extraTurn(UUID playerId) { public UUID getExtraTurn(UUID playerId) {
ListIterator<TurnMod> it = this.listIterator(this.size()); ListIterator<TurnMod> it = this.listIterator(this.size());
while (it.hasPrevious()) { while (it.hasPrevious()) {
TurnMod turnMod = it.previous(); TurnMod turnMod = it.previous();
if (turnMod.isExtraTurn() == true && turnMod.getPlayerId().equals(playerId)) { if (turnMod.isExtraTurn() == true && turnMod.getPlayerId().equals(playerId)) {
it.remove(); it.remove();
return true; return turnMod.getId();
} }
} }
return false; return null;
} }
public boolean skipTurn(UUID playerId) { public boolean skipTurn(UUID playerId) {