Player,BattleCommon: AP computation goes into Battle

1 files changed, 17 insertions, 1 deletions

diff --git a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
index e84961f..0cd753e 100644
--- a/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
+++ b/core/src/ch/asynk/rustanddust/game/battles/BattleCommon.java
@@ -33,6 +33,22 @@ public abstract class BattleCommon implements Battle
 
     public abstract Player getWinner();
 
+    private int d6()
+    {
+        return random.nextInt(6) + 1;
+    }
+
+    protected int getActionPoints()
+    {
+        int aps = 2;
+        if (d6() > 2) {
+            aps += 1;
+            if (d6() > 3)
+                aps += 1;
+        }
+        return aps;
+    }
+
     public BattleCommon(Factory factory)
     {
         this.factory = factory;
@@ -93,7 +109,7 @@ public abstract class BattleCommon implements Battle
             return true;
         } else {
             currentPlayer = getNextPlayer();
-            currentPlayer.turnStart();
+            currentPlayer.turnStart(getActionPoints());
             return false;
         }
     }