Battle,Ctrl: simplify turn end and change

2 files changed, 26 insertions, 10 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index 10534c8..b1c5192 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -71,21 +71,31 @@ public abstract class BattleCommon implements Battle
     }
 
     @Override
-    public Player getPlayer()
+    public boolean turnDone()
     {
-        return currentPlayer;
+        map.turnDone();
+        currentPlayer.turnEnd();
+        Player winner = getVictor();
+        if (winner != null) {
+            currentPlayer = winner;
+            return true;
+        } else {
+            currentPlayer = getOpponent();
+            currentPlayer.turnStart();
+            return false;
+        }
     }
 
     @Override
-    public Player getOpponent()
+    public Player getPlayer()
     {
-        return ((currentPlayer == usPlayer) ? gePlayer : usPlayer);
+        return currentPlayer;
     }
 
     @Override
-    public void changePlayer()
+    public Player getOpponent()
     {
-        currentPlayer = getOpponent();
+        return ((currentPlayer == usPlayer) ? gePlayer : usPlayer);
     }
 
     @Override
diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
index b9b6333..f161a36 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleTest.java
@@ -27,6 +27,16 @@ public class BattleTest extends BattleCommon
     }
 
     @Override
+    public void start()
+    {
+        map.actionDone();
+        map.turnDone();
+        usPlayer.turnEnd();
+        gePlayer.turnEnd();
+        currentPlayer = gePlayer;
+    }
+
+    @Override
     public Player getVictor()
     {
         if (usPlayer.getTurnDone() > 2)
@@ -93,10 +103,6 @@ public class BattleTest extends BattleCommon
         setUnit(map, usPlayer, UnitId.US_PERSHING, 6, 5, Orientation.SOUTH, usExit);
         setUnit(map, usPlayer, UnitId.US_INFANTRY, 5, 3, Orientation.NORTH_EAST, usExit);
         setUnit(map, usPlayer, UnitId.US_AT_GUN, 6, 1, Orientation.SOUTH, usExit);
-        usPlayer.turnEnd();
-        map.init();
-        map.turnDone();
-        currentPlayer = gePlayer;
 
         return this.map;
     }