From d2f23e77771b02e63ebcc1a9673fedde898942d7 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Tue, 26 Mar 2019 21:34:59 +0300
Subject: [PATCH] up version

---
 package.json                                  | 46 +++++++++----------
 .../haxe/ru/m/tankz/view/ResultFrame.hx       |  2 +-
 .../haxe/ru/m/tankz/view/common/GameFrame.hx  |  2 +-
 src/common/haxe/ru/m/tankz/game/Game.hx       | 15 +-----
 src/common/haxe/ru/m/tankz/game/GameState.hx  |  7 ++-
 5 files changed, 32 insertions(+), 40 deletions(-)

diff --git a/package.json b/package.json
index 9e5fa00..56a66c1 100755
--- a/package.json
+++ b/package.json
@@ -1,25 +1,25 @@
 {
-  "name": "tankz",
-  "version": "0.8.7",
-  "private": true,
-  "devDependencies": {
-    "dateformat": "^3.0.3",
-    "gulp": "^4.0.0",
-    "gulp-add": "0.0.2",
-    "gulp-clean": "^0.4.0",
-    "gulp-haxetool": "^0.0.16"
-  },
-  "haxeDependencies": {
-    "haxework": "git@bitbucket.org:shmyga/haxework.git",
-    "lime": "7.2.1",
-    "openfl": "8.8.0",
-    "hxcpp": "4.0.8",
-    "promhx": "1.1.0",
-    "protohx": "0.4.6",
-    "yaml": "1.3.0",
-    "orm": "2.1.0",
-    "yield": "2.0.0",
-    "haxe-crypto": "0.0.7",
-    "svg": "1.1.2"
-  }
+    "name": "tankz",
+    "version": "0.8.8",
+    "private": true,
+    "devDependencies": {
+        "dateformat": "^3.0.3",
+        "gulp": "^4.0.0",
+        "gulp-add": "0.0.2",
+        "gulp-clean": "^0.4.0",
+        "gulp-haxetool": "^0.0.16"
+    },
+    "haxeDependencies": {
+        "haxework": "git@bitbucket.org:shmyga/haxework.git",
+        "lime": "7.2.1",
+        "openfl": "8.8.0",
+        "hxcpp": "4.0.8",
+        "promhx": "1.1.0",
+        "protohx": "0.4.6",
+        "yaml": "1.3.0",
+        "orm": "2.1.0",
+        "yield": "2.0.0",
+        "haxe-crypto": "0.0.7",
+        "svg": "1.1.2"
+    }
 }
diff --git a/src/client/haxe/ru/m/tankz/view/ResultFrame.hx b/src/client/haxe/ru/m/tankz/view/ResultFrame.hx
index 798fba8..2dba4ec 100644
--- a/src/client/haxe/ru/m/tankz/view/ResultFrame.hx
+++ b/src/client/haxe/ru/m/tankz/view/ResultFrame.hx
@@ -30,7 +30,7 @@ import ru.m.tankz.preset.DotaGame;
         var tankType = playerConfig.tanks[0].type;
         var tankConfig = resultState.config.getTank(tankType);
         view.tank = tankConfig == null ? 'ba' : tankConfig.skin;
-        view.color = resultState.config.getColor(player.id);
+        view.color = resultState.getPlayerColor(player.id);
         view.life = player.frags;
         view.score = player.score;
         return view;
diff --git a/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx b/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx
index 59f409d..59637ab 100644
--- a/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx
+++ b/src/client/haxe/ru/m/tankz/view/common/GameFrame.hx
@@ -75,7 +75,7 @@ class GameFrame extends GroupView {
 
     public function onGameComplete(state:GameState):Void {
         result = state;
-        state = switch game.next() {
+        this.state = switch game.next() {
             case Some(s): s;
             case None: null;
         }
diff --git a/src/common/haxe/ru/m/tankz/game/Game.hx b/src/common/haxe/ru/m/tankz/game/Game.hx
index 20eef9b..64f1c88 100644
--- a/src/common/haxe/ru/m/tankz/game/Game.hx
+++ b/src/common/haxe/ru/m/tankz/game/Game.hx
@@ -82,19 +82,6 @@ class Game extends GameDispatcher {
         return teams[playerId.team].players[playerId.index];
     }
 
-    public function getPlayerColor(playerId:PlayerId):Color {
-        var player = getPlayer(playerId);
-        var team = getTeam(playerId.team);
-        var color = team.config.color;
-        if (!player.config.color.zero) {
-            color = player.config.color;
-        }
-        if (!player.state.color.zero) {
-            color = player.state.color;
-        }
-        return color;
-    }
-
     private function buildTank(task:SpawnTask):Tank {
         var player = getPlayer(task.playerId);
         var tankType:TankType = if (task.tankType != null) {
@@ -106,7 +93,7 @@ class Game extends GameDispatcher {
         }
         var tankConfig:TankConfig = config.getTank(tankType);
         var tank = new Tank(task.playerId, tankConfig);
-        tank.color = getPlayerColor(player.id);
+        tank.color = state.getPlayerColor(player.id);
         tank.bonus = Math.random() < player.config.bonus;
         applyPoint(tank, task.point);
         if (player.config.protect > 0) {
diff --git a/src/common/haxe/ru/m/tankz/game/GameState.hx b/src/common/haxe/ru/m/tankz/game/GameState.hx
index a88c9e9..675d562 100644
--- a/src/common/haxe/ru/m/tankz/game/GameState.hx
+++ b/src/common/haxe/ru/m/tankz/game/GameState.hx
@@ -53,7 +53,7 @@ class GameState {
 
     @:provide private var configBundle:IConfigBundle;
 
-    public function new(type:GameType, presetId:PresetId, level:Int = 1, state:GameState = null) {
+    public function new(type:GameType, presetId:PresetId, level:Int = 0, state:GameState = null) {
         this.type = type;
         this.presetId = presetId;
         this.level = level;
@@ -114,4 +114,9 @@ class GameState {
         }
         return 0;
     }
+
+    public function getPlayerColor(id:PlayerId):Color {
+        var playerState = players[id];
+        return playerState == null || playerState.color.zero ? config.getColor(id) : playerState.color;
+    }
 }