Clarify one-stone rule and timings

[troll.git] / src / main / java / com / codingame / game / Referee.java

diff --git a/src/main/java/com/codingame/game/Referee.java b/src/main/java/com/codingame/game/Referee.java
index 7efe7b3..2a7afd9 100644 (file)
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -35,36 +35,36 @@ public class Referee extends AbstractReferee {
         random = new Random(gameManager.getSeed());
         switch (random.nextInt(4)) {
         case 0:
-            roadLength = 7;
+            roadLength = 6;
             initialStones = 15;
             break;
         case 1:
-            roadLength = 7;
+            roadLength = 6;
             initialStones = 30;
             break;
         case 2:
-            roadLength = 15;
+            roadLength = 14;
             initialStones = 30;
             break;
         case 3:
-            roadLength = 15;
+            roadLength = 14;
             initialStones = 50;
             break;
         }
 
-        trollPosition = (roadLength - 1) / 2;
+        trollPosition = roadLength / 2;
 
         p0 = gameManager.getPlayer(0);
         p0.setCastlePosition(0);
         p0.setMultiplier(1);
         p0.adjustScore(trollPosition);
-        p0.sendInputLine(String.format("%d %d", roadLength - 1, initialStones));
+        p0.sendInputLine(String.format("%d %d", roadLength, initialStones));
 
         p1 = gameManager.getPlayer(1);
         p1.setCastlePosition(roadLength-1);
         p1.setMultiplier(-1);
         p1.adjustScore(trollPosition);
-        p1.sendInputLine(String.format("%d %d", roadLength - 1, initialStones));
+        p1.sendInputLine(String.format("%d %d", roadLength, initialStones));
 
         drawBackground();
         drawPlayer();
@@ -184,13 +184,13 @@ public class Referee extends AbstractReferee {
         graphicEntityModule.commitEntityState(0.5, troll, trollPositionGauge);
         int x0 = p0.castle.getX(), x1 = p1.castle.getX();
         int y0 = p0.castle.getY(), y1 = p1.castle.getY();
-        troll.setX(x0 + trollPosition * (x1-x0) / (roadLength - 1),
+        troll.setX(x0 + trollPosition * (x1-x0) / roadLength,
                    Curve.ELASTIC);
-        troll.setY(y0 + trollPosition * (y1-y0) / (roadLength - 1),
+        troll.setY(y0 + trollPosition * (y1-y0) / roadLength,
                    Curve.ELASTIC);
 
         trollPositionGauge.setX((trollPositionGauge.getX() + troll.getX()) / 2);
-        int delta = trollPosition - (roadLength - 1) / 2;
+        int delta = trollPosition - roadLength / 2;
         if (delta < 0) {
             trollPositionGauge.setText("← " + Math.abs(delta));
         }