Don't keep last stone throw count up after the fact

diff --git a/PLAN.org b/PLAN.org
index bcc68a1..8872d2f 100644 (file)
--- a/PLAN.org
+++ b/PLAN.org
@@ -1,11 +1,11 @@
 * DONE links to contrib and forum
 * DONE document maps
 * DONE document length/distance thingy
 * DONE links to contrib and forum
 * DONE document maps
 * DONE document length/distance thingy

-* TODO debug rotating avatar
+* DONE debug rotating avatar

 * DONE easter egg for YannT
 * DONE messages
 * TODO referee cleanup
 * DONE easter egg for YannT
 * DONE messages
 * TODO referee cleanup

-* TODO left win bias bug
+* DONE left win bias bug

 * DONE upgrade deps
 * DONE Timings
 * TODO Protocol
 * DONE upgrade deps
 * DONE Timings
 * TODO Protocol

diff --git a/src/main/java/com/codingame/game/Referee.java b/src/main/java/com/codingame/game/Referee.java
index e6c941f..166344b 100644 (file)
--- a/src/main/java/com/codingame/game/Referee.java
+++ b/src/main/java/com/codingame/game/Referee.java
@@ -46,6 +46,8 @@ public class Referee extends AbstractReferee {
     public void gameTurn(int turn) {
         // System.err.println("Starting turn " + turn);
 
     public void gameTurn(int turn) {
         // System.err.println("Starting turn " + turn);
 

+        view.startTurn();
+

         boolean disqual = false;
         boolean victory = false;
         boolean exhausted = false;
         boolean disqual = false;
         boolean victory = false;
         boolean exhausted = false;

diff --git a/src/main/java/com/codingame/game/View.java b/src/main/java/com/codingame/game/View.java
index cd67f86..db7584c 100644 (file)
--- a/src/main/java/com/codingame/game/View.java
+++ b/src/main/java/com/codingame/game/View.java
@@ -154,8 +154,6 @@ class View {
             stone.setAlpha(0, Curve.EASE_IN);
             graphicEntityModule.commitEntityState(0.5, stone);
 
             stone.setAlpha(0, Curve.EASE_IN);
             graphicEntityModule.commitEntityState(0.5, stone);
 

-            stoneReminder.setAlpha(0);
-            graphicEntityModule.commitEntityState(0, stoneReminder);

             stoneReminder.setText(stonesString);
             graphicEntityModule.commitEntityState(0.25, stoneReminder);
             stoneReminder.setAlpha(1);
             stoneReminder.setText(stonesString);
             graphicEntityModule.commitEntityState(0.25, stoneReminder);
             stoneReminder.setAlpha(1);


@@ -168,12 +166,18 @@ class View {
         }
 
         void destroy() {
         }
 
         void destroy() {

+            graphicEntityModule.commitEntityState(0.5, avatar);

             avatar.setRotation(170*Math.PI/180, Curve.ELASTIC);
 
             graphicEntityModule.commitEntityState(0.5, castle);
             castle.setX(castle.getX(), Curve.ELASTIC);
             castle.setScaleY(-0.2, Curve.EASE_IN);
         }
             avatar.setRotation(170*Math.PI/180, Curve.ELASTIC);
 
             graphicEntityModule.commitEntityState(0.5, castle);
             castle.setX(castle.getX(), Curve.ELASTIC);
             castle.setScaleY(-0.2, Curve.EASE_IN);
         }

+
+        void startTurn() {
+            stoneReminder.setAlpha(0);
+            graphicEntityModule.commitEntityState(0, stoneReminder);
+        }

     }
 
     Model model;
     }
 
     Model model;


@@ -194,12 +198,18 @@ class View {
          */
         p0.frameRot = random.nextInt(4) * Math.PI / 2;
         p0.init(gameManager.getPlayer(0));
          */
         p0.frameRot = random.nextInt(4) * Math.PI / 2;
         p0.init(gameManager.getPlayer(0));

-        p1.frameRot = p1.frameRot + (random.nextInt(2) == 1 ? 1 : -1) * Math.PI / 2;
+        p1.frameRot = p1.frameRot +
+            (random.nextInt(2) == 1 ? 1 : -1) * Math.PI / 2;

         p1.init(gameManager.getPlayer(1));
 
         drawTroll();
     }
 
         p1.init(gameManager.getPlayer(1));
 
         drawTroll();
     }
 

+    void startTurn() {
+        p0.startTurn();
+        p1.startTurn();
+    }
+

     private void drawBackground() {
         graphicEntityModule.createSprite()
                 .setImage("background.png")
     private void drawBackground() {
         graphicEntityModule.createSprite()
                 .setImage("background.png")