Factor protocol and gameTurn() loop

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

diff --git a/src/main/java/com/codingame/game/View.java b/src/main/java/com/codingame/game/View.java
index cd67f86..b8d42c4 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);
 
-            stoneReminder.setAlpha(0);
-            graphicEntityModule.commitEntityState(0, stoneReminder);
             stoneReminder.setText(stonesString);
             graphicEntityModule.commitEntityState(0.25, stoneReminder);
             stoneReminder.setAlpha(1);
@@ -168,12 +166,19 @@ class View {
         }
 
         void destroy() {
-            avatar.setRotation(170*Math.PI/180, Curve.ELASTIC);
+            graphicEntityModule.commitEntityState(0.5, avatar);
+            int dir = random.nextInt(2) == 1 ? 1 : -1;
+            avatar.setRotation(dir * 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;
@@ -194,12 +199,18 @@ class View {
          */
         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();
     }
 
+    void startTurn() {
+        p0.startTurn();
+        p1.startTurn();
+    }
+
     private void drawBackground() {
         graphicEntityModule.createSprite()
                 .setImage("background.png")