From: JBM <jbm@codingame.com>
Date: Fri, 22 May 2020 20:13:15 +0000 (+0200)
Subject: Break stone counter. FIX AVATAR DEFEAT ANIMATION AT LAST!!!cos0!!
X-Git-Url: https://troll.desast.re/troll.git/commitdiff_plain/9b7567a9665ab65123d5463c8a288eda917b1117

Break stone counter. FIX AVATAR DEFEAT ANIMATION AT LAST!!!cos0!!
---

diff --git a/src/main/java/com/codingame/game/View.java b/src/main/java/com/codingame/game/View.java
index 65bacea..dd350fe 100644
--- a/src/main/java/com/codingame/game/View.java
+++ b/src/main/java/com/codingame/game/View.java
@@ -37,34 +37,34 @@ class View {
             int x = p0 ? 280 : 1920 - 280;
             int y = 220;
 
-            Rectangle border1 = graphicEntityModule
-                    .createRectangle()
-                    .setWidth(140)
-                    .setHeight(140)
-                    .setX(x - 70)
-                    .setY(y - 70)
-                    .setLineWidth(0)
-                    .setFillColor(colorToken);
-
-            Rectangle border2 = graphicEntityModule
-                    .createRectangle()
-                    .setWidth(120)
-                    .setHeight(120)
-                    .setX(x - 60)
-                    .setY(y - 60)
-                    .setLineWidth(0)
-                    .setFillColor(0xffffff);
+            Sprite border1 = graphicEntityModule.createSprite()
+            //    .setX(x)
+            //    .setY(y)
+                .setImage("frame.png")
+                .setAnchor(0.5)
+                .setScale(p0 ? -1 : 1)
+                .setZIndex(22)
+                .setTint(colorToken);
+
+            Sprite border2 = graphicEntityModule.createSprite()
+            //    .setX(x)
+            //    .setY(y)
+                .setImage("frame_bg.png")
+                .setAnchor(0.5)
+                .setZIndex(20);
 
             Sprite avatarSprite = graphicEntityModule.createSprite()
-                    .setX(x)
-                    .setY(y)
-                    .setZIndex(20)
-                    .setImage(avatarToken)
-                    .setAnchor(0.5)
-                    .setBaseHeight(116)
-                    .setBaseWidth(116);
+            //    .setX(x)
+            //    .setY(y)
+                .setZIndex(21)
+                .setImage(avatarToken)
+                .setAnchor(0.5)
+                .setBaseHeight(116)
+                .setBaseWidth(116);
 
-            avatar = graphicEntityModule.createGroup(border1, border2, avatarSprite);
+            avatar = graphicEntityModule
+                .createGroup(border1, border2, avatarSprite)
+                .setX(x).setY(y);
 
             Text text = graphicEntityModule.createText(nicknameToken)
                     .setX(x)
@@ -113,7 +113,7 @@ class View {
         void setStone() {
             int stones = model.getStones();
             if (stones <= 0) {
-                stoneCounter.setText("No stones!");
+                stoneCounter.setText("Out of stones!");
                 stoneCounter.setFillColor(0xff7777);
             }
             else if (stones == 1) {
@@ -124,6 +124,7 @@ class View {
                 stoneCounter.setText(stones + " stones");
             }
         }
+
         void animateStones(int stones) {
             stone.setX(castle.getX());
             stone.setY(castle.getY() - 100);
@@ -144,18 +145,19 @@ class View {
             stone.setAlpha(0, Curve.EASE_IN);
             graphicEntityModule.commitEntityState(0.5, stone);
         }
+
         void displayMessage(String msg) {
             message.setText(msg);
             graphicEntityModule.commitEntityState(0, message);
         }
 
         void destroy() {
-        avatar.setRotation(170*Math.PI/180, Curve.ELASTIC);
+            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);
-    }
+            graphicEntityModule.commitEntityState(0.5, castle);
+            castle.setX(castle.getX(), Curve.ELASTIC);
+            castle.setScaleY(-0.2, Curve.EASE_IN);
+        }
     }
 
     Model model;
@@ -166,10 +168,11 @@ class View {
 
     void init(Model m) {
         model = m;
+        drawBackground();
+
         p0.init(gameManager.getPlayer(0));
         p1.init(gameManager.getPlayer(1));
 
-        drawBackground();
         drawTroll();
     }
 
diff --git a/src/main/resources/view/assets/frame.png b/src/main/resources/view/assets/frame.png
new file mode 100644
index 0000000..5f81588
Binary files /dev/null and b/src/main/resources/view/assets/frame.png differ
diff --git a/src/main/resources/view/assets/frame_bg.png b/src/main/resources/view/assets/frame_bg.png
new file mode 100644
index 0000000..7792c00
Binary files /dev/null and b/src/main/resources/view/assets/frame_bg.png differ