[client] fixes

src/client/haxe/ru/m/tankz/local/LocalGame.hx

@@ -1,5 +1,6 @@
 package ru.m.tankz.local;
 
+import ru.m.tankz.control.HumanControl;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameRunner;
 import ru.m.tankz.local.LocalControlFactory;
@@ -18,20 +19,20 @@ class LocalGame extends GameRunner {
     override public function onGameEvent(event:GameEvent):Void {
         super.onGameEvent(event);
         switch event {
-            case COMPLETE(result):
+            case COMPLETE(result): updateProgress(result);
-                updateProgress(result);
             case _:
         }
     }
 
-    private static function updateProgress(result:Result):Void {
+    private function updateProgress(result:Result):Void {
-        var complete = true;
+        var complete = false;
-        for (rule in result.state.config.game.complete) {
+        var humansTeams:Array<TeamId> = [];
-            if (rule.team != null && rule.team != result.winner) {
+        for (control in controls) {
-                complete = false;
+            if (Std.is(HumanControl, control) && humansTeams.indexOf(control.playerId.team) == -1) {
+                humansTeams.push(control.playerId.team);
             }
         }
-        if (complete) {
+        if (humansTeams.length == 1 && result.winner == humansTeams[0]) {
             var progress = gameStorage.get(new PackId(result.state.type));
             progress.completeLevel(result.level.id, result.state.presetId);
             gameStorage.set(progress);

src/client/haxe/ru/m/tankz/view/common/SlotView.hx

@@ -16,10 +16,15 @@ import ru.m.tankz.control.PlayerControl;
     private function set_control(value:PlayerControl):PlayerControl {
         control = value;
         slotLabel.text = '${control.playerId.team}(${control.playerId.index})';
-        // ToDo: style
+        slotLabel.font.color = value.color;
-        //slotLabel.skin = theme.textBox(value.color != null ? value.color : theme.colors.text);
         select.selected = control.controller;
         return control;
     }
 
+    private function onControllerSelect(value:Controller):Void {
+        select.currentView.style = switch value {
+            case HUMAN(_): "button.active";
+            case _: "button";
+        }
+    }
 }

src/client/haxe/ru/m/tankz/view/common/SlotView.yaml

@@ -10,6 +10,7 @@ views:
     geometry.width: 150
   - id: select
     $type: haxework.view.form.SelectView<ru.m.tankz.control.Controller>
+    geometry.width: 150
     labelBuilder: |
       ~function(controller) {
           var result = ControllerParser.defaultName(controller);
@@ -20,3 +21,4 @@ views:
         - ~ru.m.tankz.control.Controller.HUMAN(0)
         - ~ru.m.tankz.control.Controller.HUMAN(1)
     selected: ~ru.m.tankz.control.Controller.NONE
+    +onSelect: ~onControllerSelect

src/client/haxe/ru/m/tankz/view/network/SlotItemView.hx

@@ -29,10 +29,7 @@ import ru.m.tankz.proto.room.RoomSlotProto;
         userView.style = (value.hasUser() && value.user.uuid == network.user.uuid) ? "text.box.active" : "text.box";
         var config = configBundle.get(network.room.game.type);
         var color = config.getColor([value.slot.team, value.slot.index]);
-        if (color != null) {
+        typeView.font.color = color;
-            // ToDo: style
-            //typeView.skin = theme.textBox(color);
-        }
         return data;
     }
 

src/client/haxe/ru/m/tankz/view/popup/LevelPopup.yaml

@@ -4,8 +4,10 @@ layout.vAlign: middle
 view:
   $type: haxework.view.group.VGroupView
   layout.hAlign: center
-  geometry.width: 400
+  geometry.width: 100%
-  geometry.height: 400
+  geometry.height: 100%
+  # geometry.width: 400
+  # geometry.height: 400
   geometry.margin: 10
   style: window
   views:
@@ -30,6 +32,8 @@ view:
         id: slots
         $type: haxework.view.data.DataView
         geometry.padding: 10
+        geometry.width: 100%
+        layout.hAlign: center
         factory: ~slotViewFactory
         layout:
           $type: haxework.view.layout.VerticalLayout

src/common/haxe/ru/m/tankz/config/Config.hx

@@ -4,14 +4,9 @@ import haxework.color.Color;
 import ru.m.tankz.control.Controller;
 import ru.m.tankz.Type;
 
-typedef CompleteRule = {
-    @:optional var team:TeamId;
-}
-
 typedef GameConfig = {
     var levels: Int;
     var friendlyFire:Bool;
-    var complete:Array<CompleteRule>;
 }
 
 typedef SpawnPoint = {

src/common/resources/config/classic.yaml

@@ -1,7 +1,5 @@
 game:
   friendlyFire: false
-  complete:
-    - team: human
 
 map:
   cell:

src/common/resources/config/death.yaml

@@ -1,7 +1,5 @@
 game:
   friendlyFire: true
-  complete:
-    - team: alpha
 
 map:
   cell:

src/common/resources/config/dota.yaml

@@ -1,7 +1,5 @@
 game:
   friendlyFire: true
-  complete:
-    - team: radiant
 
 map:
   cell: