[common] added Type bundle

src/client/haxe/ru/m/tankz/control/HumanControl.hx

@@ -1,18 +1,17 @@
 package ru.m.tankz.control;
 
-import ru.m.tankz.game.Game;
-import ru.m.tankz.control.Control;
-import haxe.Timer;
-import ru.m.geom.Direction;
 import flash.events.FocusEvent;
-import flash.ui.Keyboard;
 import flash.events.KeyboardEvent;
 import flash.Lib;
+import flash.ui.Keyboard;
+import haxe.Timer;
+import ru.m.geom.Direction;
+import ru.m.tankz.control.Control;
+import ru.m.tankz.Type;
 
 
 typedef KeyBinding = Map<Int, TankAction>;
 
-
 class HumanControl extends Control {
 
     private var keyBinding:KeyBinding;

src/client/haxe/ru/m/tankz/render/RenderItem.hx

@@ -1,28 +1,25 @@
 package ru.m.tankz.render;
 
-import ru.m.draw.BitmapUtil;
-import ru.m.tankz.game.Game.TeamId;
-import ru.m.tankz.config.Config.TankType;
-import ru.m.tankz.control.Control;
-import flash.display.Sprite;
-import ru.m.animate.Animate;
-import ru.m.tankz.core.Eagle;
+import flash.display.Bitmap;
 import flash.display.DisplayObject;
 import flash.display.Shape;
+import flash.display.Sprite;
+import openfl.Assets;
+import ru.m.animate.Animate;
+import ru.m.draw.BitmapUtil;
 import ru.m.geom.Direction;
 import ru.m.geom.Rectangle;
+import ru.m.tankz.control.Control;
 import ru.m.tankz.core.Bullet;
-import ru.m.tankz.map.Brick;
-import openfl.Assets;
+import ru.m.tankz.core.Eagle;
 import ru.m.tankz.core.Tank;
-import flash.display.Bitmap;
+import ru.m.tankz.map.Brick;
 
 
 typedef TRectangle = {
     var rect(default, null):Rectangle;
 }
 
-
 class RenderItem<T:TRectangle, D:DisplayObject> {
 
     public var value(default, null):T;

src/client/haxe/ru/m/tankz/view/frames/StartFrame.hx

@@ -1,14 +1,14 @@
 package ru.m.tankz.view.frames;
 
-import ru.m.tankz.game.Game;
-import ru.m.tankz.game.GameState;
+import haxework.gui.ButtonView;
+import haxework.gui.frame.IFrameSwitcher;
+import haxework.gui.VGroupView;
+import haxework.gui.ViewBuilder;
+import haxework.provider.Provider;
 import ru.m.tankz.game.ClassicGame;
 import ru.m.tankz.game.DotaGame;
-import haxework.gui.frame.IFrameSwitcher;
-import haxework.provider.Provider;
-import haxework.gui.ButtonView;
-import haxework.gui.ViewBuilder;
-import haxework.gui.VGroupView;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.Type;
 
 
 interface StartFrameLayout {
@@ -19,7 +19,6 @@ interface StartFrameLayout {
     var dota_2p_vs(default, null):ButtonView;
 }
 
-
 @:template("layout/frames/start.json", "layout/styles.json")
 class StartFrame extends VGroupView implements ViewBuilder implements StartFrameLayout {
 

src/client/resources/classic/config.yaml

@@ -20,14 +20,14 @@ bricks:
 teams:
   - id: human
     tanks:
-      - {group: human, type: 0, rate: 1}
+      - {type: human0, rate: 1}
   - id: bot
     spawnInterval: 3000
     tanks:
-      - {group: bot, type: 0, rate: 0.5}
-      - {group: bot, type: 1, rate: 0.5}
-      - {group: bot, type: 2, rate: 0.5}
-      - {group: bot, type: 3, rate: 0.5}
+      - {type: bot0, rate: 0.5}
+      - {type: bot1, rate: 0.5}
+      - {type: bot2, rate: 0.5}
+      - {type: bot3, rate: 0.5}
 
 points:
   - {team: human, type: eagle, index: -1, direction: right, x: 12, y: 24}
@@ -44,91 +44,89 @@ bullet: &bullet
   piercing: 1
 
 tanks:
-  human:
-    - type: 0
-      width: 36
-      height: 36
-      speed: 2.5
-      bullet:
-        <<: *bullet
-        speed: 8.0
-      bullets: 1
-      skin: pa
+  - type: human0
+    width: 36
+    height: 36
+    speed: 2.5
+    bullet:
+      <<: *bullet
+      speed: 8.0
+    bullets: 1
+    skin: pa
 
-    - type: 1
-      width: 40
-      height: 36
-      speed: 3.0
-      bullet:
-        <<: *bullet
-        speed: 8.5
-      bullets: 1
-      skin: pb
+  - type: human1
+    width: 40
+    height: 36
+    speed: 3.0
+    bullet:
+      <<: *bullet
+      speed: 8.5
+    bullets: 1
+    skin: pb
 
-    - type: 2
-      width: 40
-      height: 36
-      speed: 3.0
-      bullet:
-        <<: *bullet
-        speed: 9.0
-      bullets: 2
-      skin: pc
+  - type: human2
+    width: 40
+    height: 36
+    speed: 3.0
+    bullet:
+      <<: *bullet
+      speed: 9.0
+    bullets: 2
+    skin: pc
 
-    - type: 3
-      width: 42
-      height: 38
-      speed: 2.9
-      bullet:
-        <<: *bullet
-        speed: 9.0
-        piercing: 3
-      bullets: 2
-      hits: 1
-      skin: pd
+  - type: human3
+    width: 42
+    height: 38
+    speed: 2.9
+    bullet:
+      <<: *bullet
+      speed: 9.0
+      piercing: 3
+    bullets: 2
+    hits: 1
+    skin: pd
 
-  bot:
-    - type: 0
-      width: 38
-      height: 36
-      speed: 2.0
-      bullet:
-        <<: *bullet
-        speed: 7.0
-      bullets: 1
-      score: 100
-      skin: ba
+  - type: bot0
+    width: 38
+    height: 36
+    speed: 2.0
+    bullet:
+      <<: *bullet
+      speed: 7.0
+    bullets: 1
+    score: 100
+    skin: ba
 
-    - type: 1
-      width: 40
-      height: 36
-      speed: 4.0
-      bullet:
-        <<: *bullet
-        speed: 7.0
-      bullets: 1
-      score: 200
-      skin: bb
+  - type: bot1
+    width: 40
+    height: 36
+    speed: 4.0
+    bullet:
+      <<: *bullet
+      speed: 7.0
+    bullets: 1
+    score: 200
+    skin: bb
 
-    - type: 2
-      width: 38
-      height: 36
-      speed: 2.0
-      bullet:
-        <<: *bullet
-        speed: 9.0
-      bullets: 1
-      score: 300
-      skin: bc
+  - type: bot2
+    width: 38
+    height: 36
+    speed: 2.0
+    bullet:
+      <<: *bullet
+      speed: 9.0
+    bullets: 1
+    score: 300
+    skin: bc
 
-    - type: 3
-      width: 40
-      height: 36
-      speed: 1.8
-      bullet:
-        <<: *bullet
-        speed: 8.0
-      bullets: 1
-      score: 400
-      hits: 3
-      skin: bd
+  - type: bot3
+    width: 40
+    height: 36
+    speed: 1.8
+    bullet:
+      <<: *bullet
+      speed: 8.0
+    bullets: 1
+    score: 400
+    hits: 3
+    skin: bd

src/client/resources/dota/config.yaml

@@ -19,8 +19,8 @@ bricks:
 
 team_tanks: &team_tanks
   tanks:
-    - {group: any, type: 0, rate: 0.5}
-    - {group: any, type: 1, rate: 0.5}
+    - {type: slow, rate: 0.5}
+    - {type: fast, rate: 0.5}
 
 teams:
   - <<: *team_tanks
@@ -51,23 +51,22 @@ bullet: &bullet
   piercing: 1
 
 tanks:
-  any:
-    - type: 0
-      width: 38
-      height: 36
-      speed: 2.0
-      bullet:
-        <<: *bullet
-        speed: 10.0
-      bullets: 1
-      skin: bc
+  - type: slow
+    width: 38
+    height: 36
+    speed: 2.0
+    bullet:
+      <<: *bullet
+      speed: 10.0
+    bullets: 1
+    skin: bc
 
-    - type: 1
-      width: 40
-      height: 36
-      speed: 4.0
-      bullet:
-        <<: *bullet
-        speed: 7.0
-      bullets: 1
-      skin: bb
+  - type: fast
+    width: 40
+    height: 36
+    speed: 4.0
+    bullet:
+      <<: *bullet
+      speed: 7.0
+    bullets: 1
+    skin: bb