[client] small fixes

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tankz",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "private": true,
   "devDependencies": {
     "dateformat": "^3.0.3",

src/client/haxe/ru/m/tankz/Style.hx

@@ -16,10 +16,20 @@ class Style {
     private static var fontFamily = "Courirer New";
 
     public static function register() {
-        resources.skin.put("light", [Skin.color(lightColor)]);
+        resources.skin.put("light", [
-        resources.skin.put("dark", [Skin.color(darkColor)]);
+            Skin.color(lightColor),
-        resources.skin.put("text", [Skin.text(textColor, 16, fontFamily)]);
+        ]);
-        resources.skin.put("text.header", [Skin.text(textColor, 22, fontFamily)]);
+        resources.skin.put("dark", [
+            Skin.color(darkColor),
+        ]);
+        resources.skin.put("text", [
+            Skin.text(textColor, 16, fontFamily),
+        ]);
+        resources.skin.put("text.header", [
+            Skin.color(lightColor),
+            Skin.text(textColor, 22, fontFamily),
+            Skin.size(200, 38),
+        ]);
         resources.skin.put("button", [
             Skin.buttonColor(lightColor),
             Skin.text(textColor, 18, fontFamily),

src/client/haxe/ru/m/tankz/frame/SettingsFrame.yaml

@@ -18,7 +18,6 @@ views:
     skinId: button.close
     +onPress: $this:onPress
     geometry.position: absolute
-    geometry.margin.left: 10
+    geometry.margin: 10
-    geometry.margin.bottom: 10
     geometry.vAlign: bottom
     geometry.hAlign: left

src/client/haxe/ru/m/tankz/frame/StartFrame.yaml

@@ -29,16 +29,14 @@ views:
   - $type: haxework.gui.LabelView
     skinId: text
     geometry.position: absolute
-    geometry.margin.right: 10
+    geometry.margin: 10
-    geometry.margin.bottom: 10
     geometry.vAlign: bottom
     geometry.hAlign: right
     text: $r:text:version
   - id: settings
     $type: haxework.gui.ButtonView
     geometry.position: absolute
-    geometry.margin.left: 10
+    geometry.margin: 10
-    geometry.margin.bottom: 10
     geometry.vAlign: bottom
     geometry.hAlign: left
     skinId: button.settings

src/client/haxe/ru/m/tankz/frame/common/PlayerView.hx

@@ -44,7 +44,7 @@ class TeamSkin implements ISkin<TeamButton> {
     private static inline var NONE:TeamId = "none";
 
     public var item_index(default, set):Int;
-    public var data(default, set):PlayerStart;
+    public var data(default, set):PlayerType;
 
     @:view var label(default, null):LabelView;
     @:view var teams(default, null):DataView<TeamId, ToggleButtonView>;
@@ -60,7 +60,7 @@ class TeamSkin implements ISkin<TeamButton> {
         return view;
     }
 
-    private function set_data(value:PlayerStart):PlayerStart {
+    private function set_data(value:PlayerType):PlayerType {
         data = value;
         teams.data = [NONE].concat([for (team in start.preset.teams) team.id]);
         return data;

src/client/haxe/ru/m/tankz/frame/dota/DotaLevelFrame.hx

@@ -6,14 +6,14 @@ import haxework.gui.frame.FrameSwitcher;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.frame.common.LevelFrame;
 import ru.m.tankz.frame.common.PlayerView;
-import ru.m.tankz.game.GameStart.PlayerStart;
+import ru.m.tankz.game.GameStart.PlayerType;
 import ru.m.tankz.preset.DotaGame;
 
 @:template class DotaLevelFrame extends LevelFrame {
     public static inline var ID = "dota.level";
 
     @:view var levels(default, null):DataView<Int, ButtonView>;
-    @:view var players(default, null):DataView<PlayerStart, PlayerView>;
+    @:view var players(default, null):DataView<PlayerType, PlayerView>;
 
     @:provide var frames:FrameSwitcher;
 
@@ -31,7 +31,7 @@ import ru.m.tankz.preset.DotaGame;
         players.data = data;
     }
 
-    private function playerViewFactory(index:Int, player:PlayerStart):PlayerView {
+    private function playerViewFactory(index:Int, player:PlayerType):PlayerView {
         var view = new PlayerView();
         view.item_index = index;
         view.data = player;

src/common/haxe/ru/m/tankz/game/Game.hx

@@ -27,7 +27,7 @@ class Game {
 
     public var type(default, null):GameType;
     public var level(default, null):Int;
-    public var players(default, null):Array<PlayerStart>;
+    public var players(default, null):Array<PlayerType>;
     public var preset(default, null):GamePreset;
     public var teams(default, null):Map<TeamId, Team>;
     public var config(default, null):Config;
@@ -133,7 +133,7 @@ class Game {
     }
 
     private function spawn(task:SpawnTask):Void {
-        L.d(TAG, 'spawn(${task}');
+        L.d(TAG, 'spawn(${task})');
         var team = getTeam(task.playerId.team);
         var player = getPlayer(task.playerId);
         player.tankId = 0;

src/common/haxe/ru/m/tankz/game/GameStart.hx

@@ -4,7 +4,7 @@ import ru.m.tankz.config.Config;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.Type;
 
-typedef PlayerStart = {
+typedef PlayerType = {
     var playerId: PlayerId;
     var control:ControlType;
 }
@@ -15,11 +15,11 @@ class GameStart {
     public var type(default, default):GameType;
     public var presetId(default, default):PresetId;
     public var level(default, default):Int;
-    public var players(default, default):Array<PlayerStart>;
+    public var players(default, default):Array<PlayerType>;
 
     public var preset(get, null):GamePreset;
 
-    public function new(type:GameType, presetId:PresetId, level:Int = 0, players:Array<PlayerStart> = null) {
+    public function new(type:GameType, presetId:PresetId, level:Int = 0, players:Array<PlayerType> = null) {
         this.type = type;
         this.presetId = presetId;
         this.level = level;