[config] config.yaml

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

@@ -19,13 +19,13 @@ interface IState<T> {
 }
 
 class BrickState implements IState<Brick> {
-    private var type:BrickType;
+    private var type:Int;
 
     public function new() {}
 
     public function update(object:Brick):Bool {
-        if (type != object.type) {
-            type = object.type;
+        if (type != object.config.type) {
+            type = object.config.type;
             return true;
         }
         return false;
@@ -59,14 +59,6 @@ class EntityState implements IState<Entity> {
 
 class Render extends SpriteView implements IRender {
 
-    private static var GROUND_BRICKS:Array<BrickType> = [
-        BrickType.BRICK, BrickType.ARMOR, BrickType.WATER, BrickType.ACE
-    ];
-
-    private static var UP_BRICKS:Array<BrickType> = [
-        BrickType.BUSH
-    ];
-
     private var backgroundLayer:Sprite;
     private var groundLayer:Sprite;
     private var entryLayer:Sprite;
@@ -139,14 +131,14 @@ class Render extends SpriteView implements IRender {
             upLayer.graphics.clear();
             for (brick in game.map.bricks) {
                 var g:Graphics = null;
-                if (GROUND_BRICKS.indexOf(brick.type) > -1) {
+                if (brick.config.layer < 3) {
                     g = groundLayer.graphics;
-                } else if (UP_BRICKS.indexOf(brick.type) > -1) {
+                } else if (brick.config.layer >= 3) {
                     g = upLayer.graphics;
                 }
                 if (g != null) {
                     g.beginFill(0x00ff00);
-                    g.beginBitmapFill(Assets.getBitmapData('resources/images/map/map_${brick.type}.png'));
+                    g.beginBitmapFill(Assets.getBitmapData('resources/images/map/map_${brick.config.type}.png'));
                     g.drawRect(
                         brick.cellX * game.map.cellWidth,
                         brick.cellY * game.map.cellHeight,
@@ -172,7 +164,7 @@ class Render extends SpriteView implements IRender {
                     image = 'resources/images/tank/player/tank_p${tank.config.level}_${tank.index}-0.png';
                 } else if (Std.is(ent, Bullet)) {
                     var bullet:Bullet = cast ent;
-                    image = 'resources/images/bullet/bullet_${bullet.config.type}.png';
+                    image = 'resources/images/bullet/bullet_${bullet.config.piercing-1}.png';
                 } else {
                     image = 'ERROR'; // ToDo:
                 }

src/client/resources/config/config.yaml

@@ -0,0 +1,93 @@
+map:
+  cellWidth: 22
+  cellHeight: 22
+  gridWidth: 26
+  gridHeight: 26
+  bricks: null
+  points:
+    - type: player
+      index: 0
+      x: 8
+      y: 24
+      direction: top
+    - type: player
+      index: 1
+      x: 16
+      y: 24
+      direction: top
+
+bricks:
+  -1: &brick-boder
+    type: -1
+    layer: 2
+    armor: 3
+  0: &brick-none
+    type: 0
+    layer: 0
+    armor: 0
+  1: &brick-ace
+    type: 1
+    layer: 0
+    armor: 0
+  2: &brick-bush
+    type: 2
+    layer: 3
+    armor: 0
+  3: &brick-water
+    type: 3
+    layer: 1
+    armor: 0
+  4: &brick-armor
+    type: 4
+    layer: 2
+    armor: 2
+  5: &brick-brick
+    type: 5
+    layer: 2
+    armor: 1
+
+bullet: &bullet
+  width: 12
+  height: 12
+  speed: 0
+  piercing: 1
+
+tanks:
+  player:
+    0:
+      level: 0
+      width: 36
+      height: 36
+      speed: 2.5
+      bullet:
+        <<: *bullet
+        speed: 8.0
+      bullets: 1
+    1:
+      level: 1
+      width: 40
+      height: 36
+      speed: 3.0
+      bullet:
+        <<: *bullet
+        speed: 8.5
+      bullets: 1
+    2:
+      level: 2
+      width: 40
+      height: 36
+      speed: 3.0
+      bullet:
+        <<: *bullet
+        speed: 9.0
+      bullets: 2
+    3:
+      level: 3
+      width: 42
+      height: 38
+      speed: 2.9
+      bullet:
+        <<: *bullet
+        speed: 9.0
+        piercing: 2
+      bullets: 2