Cleanup and meta updates

[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 dd350fe..b8d42c4 100644 (file)
--- a/src/main/java/com/codingame/game/View.java
+++ b/src/main/java/com/codingame/game/View.java
@@ -17,15 +17,19 @@ class View {
 
     class Player {
         Model.Player model;
 
     class Player {
         Model.Player model;

+

         int colorToken;
         String nicknameToken;
         String avatarToken;
 
         int colorToken;
         String nicknameToken;
         String avatarToken;
 

+        double frameRot;
+

         Group avatar;
         Text stoneCounter;
         Text message;
         Sprite castle;
         Text stone;
         Group avatar;
         Text stoneCounter;
         Text message;
         Sprite castle;
         Text stone;

+        Text stoneReminder;

 
         void init(com.codingame.game.Player p) {
             model = p.model;
 
         void init(com.codingame.game.Player p) {
             model = p.model;


@@ -37,25 +41,20 @@ class View {
             int x = p0 ? 280 : 1920 - 280;
             int y = 220;
 
             int x = p0 ? 280 : 1920 - 280;
             int y = 220;
 

-            Sprite border1 = graphicEntityModule.createSprite()
-            //    .setX(x)
-            //    .setY(y)
+            Sprite frame = graphicEntityModule.createSprite()

                 .setImage("frame.png")
                 .setAnchor(0.5)
                 .setImage("frame.png")
                 .setAnchor(0.5)

-                .setScale(p0 ? -1 : 1)
+                .setRotation(frameRot)

                 .setZIndex(22)
                 .setTint(colorToken);
 
                 .setZIndex(22)
                 .setTint(colorToken);
 

-            Sprite border2 = graphicEntityModule.createSprite()
-            //    .setX(x)
-            //    .setY(y)
+            Sprite frameBg = graphicEntityModule.createSprite()

                 .setImage("frame_bg.png")
                 .setAnchor(0.5)
                 .setImage("frame_bg.png")
                 .setAnchor(0.5)

+                .setRotation(frameRot)

                 .setZIndex(20);
 
             Sprite avatarSprite = graphicEntityModule.createSprite()
                 .setZIndex(20);
 
             Sprite avatarSprite = graphicEntityModule.createSprite()

-            //    .setX(x)
-            //    .setY(y)

                 .setZIndex(21)
                 .setImage(avatarToken)
                 .setAnchor(0.5)
                 .setZIndex(21)
                 .setImage(avatarToken)
                 .setAnchor(0.5)


@@ -63,7 +62,7 @@ class View {
                 .setBaseWidth(116);
 
             avatar = graphicEntityModule
                 .setBaseWidth(116);
 
             avatar = graphicEntityModule

-                .createGroup(border1, border2, avatarSprite)
+                .createGroup(frame, frameBg, avatarSprite)

                 .setX(x).setY(y);
 
             Text text = graphicEntityModule.createText(nicknameToken)
                 .setX(x).setY(y);
 
             Text text = graphicEntityModule.createText(nicknameToken)


@@ -74,20 +73,20 @@ class View {
                     .setFillColor(0x7f3f00)
                     .setAnchor(0.5);
 
                     .setFillColor(0x7f3f00)
                     .setAnchor(0.5);
 

-            stoneCounter = graphicEntityModule.createText("S")
+            stoneCounter = graphicEntityModule.createText()

                 .setX(x)
                 .setY(y+200)
                 .setZIndex(20)
                 .setFontSize(40)
                 .setFillColor(0x7f3f00)
                 .setAnchor(0.5);
                 .setX(x)
                 .setY(y+200)
                 .setZIndex(20)
                 .setFontSize(40)
                 .setFillColor(0x7f3f00)
                 .setAnchor(0.5);

+            updateStoneCounter();

 
             message = graphicEntityModule.createText()
                 .setX(p0 ? 15 : 1920-15)
                 .setY(680)
                 .setZIndex(1)
                 .setFontSize(40)
 
             message = graphicEntityModule.createText()
                 .setX(p0 ? 15 : 1920-15)
                 .setY(680)
                 .setZIndex(1)
                 .setFontSize(40)

-                .setStrokeColor(0x000000)

                 .setFillColor(0xffbf7f)
                 .setAnchorX(p0 ? 0 : 1)
                 .setAnchorY(1);
                 .setFillColor(0xffbf7f)
                 .setAnchorX(p0 ? 0 : 1)
                 .setAnchorY(1);


@@ -108,9 +107,18 @@ class View {
                 .setFillColor(0x12322a)
                 .setAnchor(0.5)
                 .setAlpha(0);
                 .setFillColor(0x12322a)
                 .setAnchor(0.5)
                 .setAlpha(0);

+
+            stoneReminder = graphicEntityModule.createText()
+                .setX(p0 ? x + 100 : x - 100)
+                .setY(y)
+                .setZIndex(20)
+                .setFontSize(75)
+                .setFillColor(0x3f3f3f)
+                .setAnchorX(p0 ? 0 : 1)
+                .setAnchorY(0.5);

         }
 
         }
 

-        void setStone() {
+        void updateStoneCounter() {

             int stones = model.getStones();
             if (stones <= 0) {
                 stoneCounter.setText("Out of stones!");
             int stones = model.getStones();
             if (stones <= 0) {
                 stoneCounter.setText("Out of stones!");


@@ -126,9 +134,10 @@ class View {
         }
 
         void animateStones(int stones) {
         }
 
         void animateStones(int stones) {

+            String stonesString = new Integer(stones).toString();

             stone.setX(castle.getX());
             stone.setY(castle.getY() - 100);
             stone.setX(castle.getX());
             stone.setY(castle.getY() - 100);

-            stone.setText(new Integer(stones).toString());
+            stone.setText(stonesString);

             stone.setAlpha(1);
             graphicEntityModule.commitEntityState(0, stone);
     
             stone.setAlpha(1);
             graphicEntityModule.commitEntityState(0, stone);
     


@@ -144,6 +153,11 @@ class View {
             stone.setY(troll.getY() - 50, Curve.EASE_IN);
             stone.setAlpha(0, Curve.EASE_IN);
             graphicEntityModule.commitEntityState(0.5, stone);
             stone.setY(troll.getY() - 50, Curve.EASE_IN);
             stone.setAlpha(0, Curve.EASE_IN);
             graphicEntityModule.commitEntityState(0.5, stone);

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

         }
 
         void displayMessage(String msg) {
         }
 
         void displayMessage(String msg) {


@@ -152,12 +166,19 @@ class View {
         }
 
         void destroy() {
         }
 
         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);
         }
 
             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;


@@ -170,12 +191,26 @@ class View {
         model = m;
         drawBackground();
 
         model = m;
         drawBackground();
 

+        /*
+         * Random π/2-grained rotation of the avatar frames.  Avoid
+         * having them π/2 apart, though, as one of them is likely
+         * going to end upside-down and the trick would be revealed.
+         * And I'd have to "draw" a new frame. Ewww.
+         */
+        p0.frameRot = random.nextInt(4) * Math.PI / 2;

         p0.init(gameManager.getPlayer(0));
         p0.init(gameManager.getPlayer(0));

+        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")


@@ -197,6 +232,8 @@ class View {
             .setX(1980/2)
             .setY(980)
             .setFillColor(0xffffff);
             .setX(1980/2)
             .setY(980)
             .setFillColor(0xffffff);

+
+        moveTroll();

     }
 
     void moveTroll() {
     }
 
     void moveTroll() {