From 089fbf15b1472cf3a9c568b3f03e78bc36c64824 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Thu, 3 Oct 2013 22:40:14 +0200 Subject: [PATCH] Some additions to game log. --- Mage/src/mage/game/GameImpl.java | 38 ++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/Mage/src/mage/game/GameImpl.java b/Mage/src/mage/game/GameImpl.java index fee60b49e7d..4f3581f719e 100644 --- a/Mage/src/mage/game/GameImpl.java +++ b/Mage/src/mage/game/GameImpl.java @@ -572,23 +572,7 @@ public abstract class GameImpl> implements Game, Serializa } private boolean playTurn(Player player) { - StringBuilder sb = new StringBuilder("Turn "); - sb.append(state.getTurnNum()).append(" ("); - int delimiter = this.getPlayers().size() - 1; - for (Player gamePlayer : this.getPlayers().values()) { - sb.append(gamePlayer.getLife()); - int poison = gamePlayer.getCounters().getCount(CounterType.POISON); - if (poison > 0) { - sb.append("[P:").append(poison).append("]"); - } - if (delimiter > 0) { - sb.append(" - "); - delimiter--; - } - } - sb.append(")"); - fireStatusEvent(sb.toString(), true); - + this.logStartOfTurn(player); if (checkStopOnTurnOption()) { return false; } @@ -604,6 +588,26 @@ public abstract class GameImpl> implements Game, Serializa } + private void logStartOfTurn(Player player) { + StringBuilder sb = new StringBuilder("Turn ").append(state.getTurnNum()).append(" "); + sb.append(player.getName()); + sb.append(" ("); + int delimiter = this.getPlayers().size() - 1; + for (Player gamePlayer : this.getPlayers().values()) { + sb.append(gamePlayer.getLife()); + int poison = gamePlayer.getCounters().getCount(CounterType.POISON); + if (poison > 0) { + sb.append("[P:").append(poison).append("]"); + } + if (delimiter > 0) { + sb.append(" - "); + delimiter--; + } + } + sb.append(")"); + fireStatusEvent(sb.toString(), true); + } + private boolean checkStopOnTurnOption() { if (gameOptions.stopOnTurn != null && gameOptions.stopAtStep == PhaseStep.UNTAP) { if (gameOptions.stopOnTurn.equals(state.getTurnNum())) {