[version] up to 0.7.0

WORK.md

@@ -10,7 +10,7 @@
 
 * ui
   * auth frame 0%
-  * select game frame 30% (classic 1/2 player, dota singe/coop/vs)
+  * select game frame 100% (classic 1/2 player, dota singe/coop/vs)
   * select level frame 10%
   * game frame 50%
 
@@ -21,21 +21,29 @@
   * bullets 100%
   * boxes 100%
   * map changes 100%
-  * bonuses 0%
+  * bonuses 100%
   * eagle 100%
   
 * game
   * classic
     * state 50%
     * bot 50%
-    * player: 50%
+    * human 100%
   * dota
     * state 50%
     * bot 10%
-    * player 0%
+    * human 100%
+
+* bonus
+  * star 50%
+  * grenade 0%
+  * helm 0%
+  * clock 0%
+  * shovel 0%
     
 * state
   * score 0%
+  * human tank 0%
   * save/load 0%
   * export/import 0%
   
@@ -47,16 +55,19 @@
   * animations
     * tank spawn 0%
     * tank move 100%
-    * map water 0%
+    * map water 100%
     * bullet boom 90%
     * tank boom 90%
-  * bonuses 0%
+  * bonuses 100%
   * html5 50%
   
 * proto
   ...
   
 * editor
-  * open 0%
-  * edit 0%
-  * save 0%
+  * level
+    * open 100%
+    * edit 50%
+    * save 100%
+  * tank
+    * color 10%  

build/client.js

@@ -21,7 +21,7 @@ const generate = () => function generate() {
     ]);
 };
 
-const build = (platform) => function build() {
+const build = (platform, values) => function build() {
     const argv = yargs.argv;
     return gulp.src('.')
             .pipe(new Haxe().openfl({
@@ -29,6 +29,7 @@ const build = (platform) => function build() {
                 platform: platform,
                 version: version,
                 debug: argv.dev,
+                values: values
             }))
             .pipe(gulp.dest(`target/${platform}`));
 };
@@ -87,6 +88,7 @@ const buildDeb = gulp.series(
 exports['client:flash:html'] = gulp.parallel(flashIndex, flashJs);
 exports['client:flash'] = gulp.series(prepare(Haxe.ID), generate(), build('flash'), exports['client:flash:html']);
 exports['client:html5'] = gulp.series(prepare(Haxe.ID), generate(), build('html5'));
+exports['client:html5-dom'] = gulp.series(prepare(Haxe.ID), generate(), build('html5', {dom:true}));
 exports['client:linux'] = gulp.series(prepare(Haxe.ID), generate(), build('linux'));
 exports['client:webapp'] = webapp;
 exports['client:deb'] = buildDeb;
@@ -108,9 +110,9 @@ const testFlash = function() {
         .pipe(debug());
 };
 
-const testHtml5 = function() {
+const testHtml5 = (dom) => function() {
     return gulp.series(
-        build('html5'),
+        build('html5', {dom:dom}),
         () => gulp.src('target/html5').pipe(webserver({
             host: 'localhost', port: 3000,
             open: true,
@@ -130,7 +132,8 @@ const testLinux = gulp.series(
 
 
 exports['client:flash:test'] = gulp.series(prepare(Haxe.ID, FlashPlayer.ID), testFlash);
-exports['client:html5:test'] = gulp.series(prepare(Haxe.ID), testHtml5);
+exports['client:html5:test'] = gulp.series(prepare(Haxe.ID), testHtml5());
+exports['client:html5-dom:test'] = gulp.series(prepare(Haxe.ID), testHtml5(true));
 exports['client:linux:test'] = gulp.series(prepare(Haxe.ID), testLinux);
 exports['client:test'] = exports['client:flash:test'];
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tankz",
-  "version": "0.5.0",
+  "version": "0.7.0",
   "private": true,
   "devDependencies": {
     "ansi-colors": "^1.0.1",
@@ -37,6 +37,7 @@
     "protohx": "0.4.6",
     "yaml": "1.3.0",
     "haxework": "git@bitbucket.org:shmyga/haxework.git",
-    "orm": "2.1.0"
+    "orm": "2.1.0",
+    "yield": "1.1.2"
   }
 }

project.xml

@@ -12,13 +12,15 @@
     <haxelib name="protohx" version="0.4.6"/>
     <haxelib name="haxework" version="git"/>
     <haxelib name="yaml" version="1.3.0"/>
+    <haxelib name="yield" version="1.1.2"/>
     <window fps="30"/>
     <window width="1024" height="768" unless="html5"/>
     <haxeflag name="-D" value="swf-gpu"/>
     <haxeflag name="-D" value="native-trace"/>
     <!--<haxeflag name="-D" value="proto_debug"/>-->
     <haxeflag name="-dce" value="no"/>
-    <haxeflag name="-D" value="dom"/>
+    <!--<haxeflag name="-D" value="dom"/>-->
+    <haxeflag name="--macro" value="yield.parser.Parser.auto()"/>
     <!--<template path="src/client/webapp/index_template.html" rename="index.html"/>-->
 
     <section if="build_editor">

src/client/haxe/layout/frames/game.json

@@ -1,13 +0,0 @@
-{
-  "pWidth": 100, "pHeight": 100,
-  "views": [
-    {
-      "id": "state", "@type": "haxework.gui.LabelView", "@style": "label",
-      "pWidth": 100, "height": 20
-    },
-    {
-      "id": "render", "@type": "ru.m.tankz.render.Render",
-      "contentSize": true
-    }
-  ]
-}

src/client/haxe/layout/frames/level.json

@@ -1,21 +0,0 @@
-{
-    "pWidth": 100, "pHeight": 100,
-    "views": [
-        {
-            "id":"levels", "@type":"haxework.gui.list.VListView<Int>",
-            "factory": "@class:ru.m.tankz.view.frames.list.LevelView",
-            "pWidth":100,
-            "pHeight":100,
-            "paddings":10,
-            "scroll":{
-                "@type":"haxework.gui.list.VScrollView",
-                "width":10, "pHeight":100,
-                "skin":{"@type":"haxework.gui.list.VScrollSkin"}
-            },
-            "skin": {
-                "@type": "haxework.gui.skin.ColorSkin",
-                "color": "0x000000", "alpha": 0.0
-            }
-        }
-    ]
-}

src/client/haxe/layout/frames/start.json

@@ -1,52 +0,0 @@
-{
-    "pWidth": 100, "pHeight": 100,
-    "views": [
-        {
-            "@type": "haxework.gui.ImageView",
-            "image": "@asset:image:resources/images/logo/logo.png",
-            "contentSize": true, "bottomMargin": 15
-        },
-        {
-            "@type": "haxework.gui.LabelView", "@style": "label",
-            "fontSize": 20, "topMargin": 15,
-            "contentSize": true,
-            "text": "Classic"
-        },
-        {
-            "id": "classic_1p",
-            "@type": "haxework.gui.ButtonView",
-            "text": "1 Player",
-            "@style": "button"
-        },
-        {
-            "id": "classic_2p",
-            "@type": "haxework.gui.ButtonView",
-            "text": "2 Player",
-            "@style": "button"
-        },
-        {
-            "@type": "haxework.gui.LabelView", "@style": "label",
-            "fontSize": 20, "topMargin": 15,
-            "contentSize": true,
-            "text": "DotA"
-        },
-        {
-            "id": "dota_1p",
-            "@type": "haxework.gui.ButtonView",
-            "text": "1 Player",
-            "@style": "button"
-        },
-        {
-            "id": "dota_2p_coop",
-            "@type": "haxework.gui.ButtonView",
-            "text": "2 COOP",
-            "@style": "button"
-        },
-        {
-            "id": "dota_2p_vs",
-            "@type": "haxework.gui.ButtonView",
-            "text": "2 VS",
-            "@style": "button"
-        }
-    ]
-}

src/client/haxe/layout/main.json

@@ -1,38 +0,0 @@
-{
-  "@type": "haxework.gui.VGroupView",
-  "pWidth": 100, "pHeight": 100,
-  "views": [
-    {
-      "id": "switcher", "@type": "haxework.gui.frame.FrameSwitcher",
-      "pWidth": 100, "pHeight": 100,
-      "skin": {
-        "@type": "haxework.gui.skin.BitmapSkin",
-        "image": "@asset:image:resources/images/background.png",
-        "fillType": "REPEAT"
-      },
-      "views": [
-        {
-          "id": "start",
-          "@type": "ru.m.tankz.view.frames.StartFrame"
-        },
-        {
-          "id": "level",
-          "@type": "ru.m.tankz.view.frames.LevelFrame"
-        },
-        {
-          "id": "game",
-          "@type": "ru.m.tankz.view.frames.GameFrame"
-        }
-      ]
-    },
-    {
-      "@type": "haxework.gui.LabelView",
-      "inLayout": false,
-      "contentSize": true,
-      "vAlign": "BOTTOM",
-      "hAlign": "RIGHT",
-      "text": "@res:text:version",
-      "@style": "label"
-    }
-  ]
-}

src/client/haxe/layout/other.json

@@ -1,18 +0,0 @@
-{
-  "level": {
-    "width": 440, "height": 44,
-    "margins": 5,
-    "views": [
-      {
-        "id": "label",
-        "@type": "haxework.gui.LabelView",
-        "pWidth": 100, "pHeight": 100, "text": "",
-        "@style": "label"
-      }
-    ],
-    "skin": {
-      "@type": "haxework.gui.skin.ColorSkin",
-      "color": "0x000000", "alpha": 0.2
-    }
-  }
-}

src/client/haxe/layout/styles.json

@@ -1,33 +0,0 @@
-{
-  "button": {
-    "width":250, "height":60,
-    "skin": {
-      "@type": "haxework.gui.skin.ButtonBitmapSkin",
-      "upImage": "@asset:image:resources/images/control/button_normal.png",
-      "downImage": "@asset:image:resources/images/control/button_down.png",
-      "overImage": "@asset:image:resources/images/control/button_over.png",
-      "fillType": "NINEPATH"
-    },
-    "fontFamily":"@res:text:font", "fontEmbed":true, "fontColor":"0xE7E0BB", "fontSize":20
-  },
-
-  "label": {
-    "fontColor": "0xffffff",
-    "fontEmbed": false,
-    "fontFamily": "@res:text:fontName",
-    "fontSize": 16,
-    "shadowColor": "0x000000"
-  },
-
-  "input": {
-    "fontColor": "0xffffff",
-    "fontEmbed": false,
-    "fontFamily": "@res:text:fontName",
-    "fontSize": 16,
-    "shadowColor": "0x000000",
-    "skin": {
-      "@type": "haxework.gui.skin.ColorSkin",
-      "color": "0x000000"
-    }
-  }
-}

src/client/haxe/ru/m/animate/Animate.hx

@@ -6,6 +6,11 @@ import flash.display.Bitmap;
 import flash.display.BitmapData;
 
 
+typedef Frame = {
+    var image:BitmapData;
+    var length:Int;
+}
+
 class Animate extends Bitmap {
 
     private static var timer:Timer;
@@ -26,24 +31,30 @@ class Animate extends Bitmap {
         }
     }
 
-    private static var a = new BitmapData(1, 1);
-
     public var playing(default, set):Bool;
-    public var frames(default, set):Array<BitmapData>;
+    public var frames(default, set):Array<Frame>;
+
+    private var sequence:Array<BitmapData>;
     private var index:Int;
 
-    public function new(?frames:Array<BitmapData>) {
+    public function new(?frames:Array<Frame>) {
         super(null, PixelSnapping.AUTO, true);
         this.frames = frames == null ? [] : frames;
         init();
         instances.push(this);
     }
 
-    public function set_frames(value:Array<BitmapData>):Array<BitmapData> {
+    public function set_frames(value:Array<Frame>):Array<Frame> {
+        sequence = [];
+        index = 0;
         if (value != null) {
             frames = value;
-            bitmapData = frames[0];
-            index = 0;
+            for (frame in frames) {
+                sequence = sequence.concat([for (i in 0...frame.length) frame.image]);
+            }
+            bitmapData = sequence[0];
+        } else {
+            bitmapData = null;
         }
         return frames;
     }
@@ -56,10 +67,10 @@ class Animate extends Bitmap {
     }
 
     private function update():Void {
-        if (++index >= frames.length) {
+        if (++index >= sequence.length) {
             index = 0;
         }
-        var nextBitmapData = frames[index];
+        var nextBitmapData = sequence[index];
         x -= (nextBitmapData.width - bitmapData.width) / 2;
         y -= (nextBitmapData.height - bitmapData.height) / 2;
         bitmapData = nextBitmapData;

src/client/haxe/ru/m/animate/OnceAnimate.hx

@@ -1,7 +1,6 @@
 package ru.m.animate;
 
 import promhx.Deferred;
-import flash.display.BitmapData;
 import promhx.Promise;
 
 
@@ -9,10 +8,6 @@ class OnceAnimate extends Animate {
 
     private var deferred:Deferred<Animate>;
 
-    public function new(frames:Array<BitmapData>) {
-        super(frames);
-    }
-
     public function play():Promise<Animate> {
         deferred = new Deferred();
         playing = true;

src/client/haxe/ru/m/draw/BitmapUtil.hx

@@ -0,0 +1,17 @@
+package ru.m.draw;
+
+import flash.geom.ColorTransform;
+import flash.geom.Rectangle;
+import flash.display.BitmapData;
+
+
+class BitmapUtil {
+
+    public static function colorize(data: BitmapData, color: Color):BitmapData {
+        if (color.zero) return data;
+        var result = data.clone();
+        var transform = new ColorTransform(color.red / 255, color.green / 255, color.blue / 255, 1, 0, 0, 0, 0);
+        result.colorTransform(new Rectangle(0, 0, result.width, result.height), transform);
+        return result;
+    }
+}

src/client/haxe/ru/m/draw/Color.hx

@@ -0,0 +1,47 @@
+package ru.m.draw;
+
+abstract Color(Int) {
+    public var alpha(get, never):Int;
+    public var red(get, never):Int;
+    public var green(get, never):Int;
+    public var blue(get, never):Int;
+    public var zero(get, never):Bool;
+
+    public inline function new(value:Int) {
+        this = value;
+    }
+
+    private inline function get_alpha():Int {
+        return (this >> 24) & 255;
+    }
+
+    private inline function get_red():Int {
+        return (this >> 16) & 255;
+    }
+
+    private inline function get_green():Int {
+        return (this >> 8) & 255;
+    }
+
+    private inline function get_blue():Int {
+        return this & 255;
+    }
+
+    private inline function get_zero():Bool {
+        return this == 0;
+    }
+
+    @:from
+    static public inline function fromInt(value:Int):Color {
+        return new Color(value);
+    }
+
+    @:from
+    static public inline function fromString(value:String):Color {
+        return new Color(Std.parseInt('0x${value.split('#').pop()}'));
+    }
+
+    public function toString():String {
+        return 'Color(${red},${green},${blue})';
+    }
+}

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

@@ -1,34 +1,42 @@
 package ru.m.tankz;
 
+import flash.events.KeyboardEvent;
+import flash.text.Font;
+import flash.ui.Keyboard;
+import haxework.gui.ButtonView;
+import haxework.gui.frame.IFrameSwitcher;
+import haxework.gui.Root;
+import haxework.gui.VGroupView;
+import haxework.gui.ViewBuilder;
+import haxework.log.TraceLogger;
+import haxework.provider.Provider;
+import haxework.resources.IResources;
+import haxework.resources.Resources;
+import ru.m.connect.IConnection;
+import ru.m.tankz.bundle.ConfigBundle;
+import ru.m.tankz.bundle.IConfigBundle;
+import ru.m.tankz.bundle.ILevelBundle;
+import ru.m.tankz.bundle.LevelBundle;
+import ru.m.tankz.frame.StartFrame;
 import ru.m.tankz.game.ClassicGame;
 import ru.m.tankz.game.DotaGame;
 import ru.m.tankz.game.Game;
-import flash.ui.Keyboard;
-import flash.events.KeyboardEvent;
-import flash.text.Font;
-import ru.m.tankz.view.frames.StartFrame;
-import haxework.log.SocketLogger;
-import haxework.resources.Resources;
-import haxework.resources.IResources;
-import haxework.gui.VGroupView;
-import haxework.gui.ViewBuilder;
-import haxework.gui.ButtonView;
 import ru.m.tankz.PacketBuilder;
-import haxework.log.JSLogger;
-import haxework.gui.frame.IFrameSwitcher;
-import haxework.provider.Provider;
-import haxework.gui.frame.FrameSwitcher;
-import haxework.gui.Root;
-import openfl.Assets;
-import ru.m.connect.IConnection;
-import haxework.log.TraceLogger;
+import ru.m.tankz.storage.SaveStorage;
+#if flash import haxework.log.JSLogger; #end
+#if debug import haxework.log.SocketLogger; #end
 
-@:template("layout/main.json", "layout/styles.json")
-class MainView extends VGroupView implements ViewBuilder {}
+    
+interface ClientViewLayout {
+    var switcher(default, null):IFrameSwitcher;
+}
+
+@:template('ru/m/tankz/Client.yaml', 'ru/m/tankz/Style.yaml')
+class ClientView extends VGroupView implements ClientViewLayout implements ViewBuilder {}
 
 class Client implements IConnectionHandler {
 
-    private static inline var TAG = "Tankz";
+    private static inline var TAG = 'Tankz';
 
     public static function main() {
         L.push(new TraceLogger());
@@ -39,36 +47,35 @@ class Client implements IConnectionHandler {
         L.push(new SocketLogger());
         #end
         Const.init();
-        L.d(TAG, "Debug: " + Const.DEBUG);
-        L.i(TAG, "Version: " + Const.VERSION);
-        L.i(TAG, "Build: " + Const.BUILD);
+        L.d(TAG, 'Debug: ${Const.DEBUG}');
+        L.i(TAG, 'Version: ${Const.VERSION}');
+        L.i(TAG, 'Build: ${Const.BUILD}');
         new Client();
     }
 
 
-    private var view:MainView;
+    private var view:ClientView;
 
     public function new() {
         Provider.setFactory(IResources, Resources);
 
         var font:Font = Font.enumerateFonts()[0];
-        Provider.get(IResources).text.put("font", "Bookman Old Style");
-        Provider.get(IResources).text.put("version", 'v${Const.VERSION} b${Const.BUILD}');
+        Provider.get(IResources).text.put('font', 'Bookman Old Style');
+        Provider.get(IResources).text.put('version', 'v${Const.VERSION} b${Const.BUILD}');
 
         Provider.set(IPacketBuilder, new PacketBuilder());
         #if flash
-        Provider.set(IConnection, new ru.m.connect.flash.FlashConnection("localhost", 5001));
+        Provider.set(IConnection, new ru.m.connect.flash.FlashConnection('localhost', 5001));
         #elseif html5
-        Provider.set(IConnection, new ru.m.connect.js.JsConnection("localhost", 5001));
+        Provider.set(IConnection, new ru.m.connect.js.JsConnection('localhost', 5001));
         #end
 
         //Provider.get(IConnection).handler.addListener(this);
-        view = new MainView();
+        view = new ClientView();
         Provider.set(IFrameSwitcher, view.switcher);
         Root.bind(view);
         view.content.stage.stageFocusRect = false;
         //view.logout.onPress = this;
-        view.switcher.change(StartFrame.ID);
 
         view.content.stage.addEventListener(KeyboardEvent.KEY_UP, function(event:KeyboardEvent):Void {
             if (event.keyCode == Keyboard.ESCAPE) {
@@ -76,13 +83,18 @@ class Client implements IConnectionHandler {
             }
         });
 
+        Provider.setFactory(IConfigBundle, ConfigBundle);
+        Provider.setFactory(ILevelBundle, LevelBundle);
+        Provider.setFactory(SaveStorage, SaveStorage);
         Provider.setFactory(Game, ClassicGame, ClassicGame.TYPE);
         Provider.setFactory(Game, DotaGame, DotaGame.TYPE);
+
+        view.switcher.change(StartFrame.ID);
     }
 
     public function onPress(view:ButtonView):Void {
         switch (view.id) {
-            case "logout":
+            case 'logout':
                 Provider.get(IConnection).disconnect();
         }
     }
@@ -94,7 +106,7 @@ class Client implements IConnectionHandler {
     }
 
     public function onError(error:Dynamic):Void {
-        L.e(TAG, "", error);
+        L.e(TAG, '', error);
         //view.switcher.change(AuthFrame.ID);
     }
 }

src/client/haxe/ru/m/tankz/Client.yaml

@@ -0,0 +1,27 @@
+---
+$type: haxework.gui.VGroupView
+pWidth: 100
+pHeight: 100
+views:
+- id: switcher
+  $type: haxework.gui.frame.FrameSwitcher
+  pWidth: 100
+  pHeight: 100
+  skin:
+    $type: haxework.gui.skin.BitmapSkin
+    image: "@asset:image:resources/image/ui/background.png"
+    fillType: REPEAT
+  views:
+  - id: start
+    $type: ru.m.tankz.frame.StartFrame
+  - id: level
+    $type: ru.m.tankz.frame.LevelFrame
+  - id: game
+    $type: ru.m.tankz.frame.GameFrame
+- $type: haxework.gui.LabelView
+  $style: label
+  inLayout: false
+  contentSize: true
+  vAlign: BOTTOM
+  hAlign: RIGHT
+  text: "@res:text:version"

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

@@ -0,0 +1,21 @@
+---
+button:
+  width: 250
+  height: 60
+  skin:
+    $type: haxework.gui.skin.ButtonBitmapSkin
+    upImage: "@asset:image:resources/image/ui/button/normal.png"
+    downImage: "@asset:image:resources/image/ui/button/down.png"
+    overImage: "@asset:image:resources/image/ui/button/over.png"
+    fillType: NINEPATH
+  fontFamily: "@res:text:font"
+  fontEmbed: true
+  fontColor: "#E7E0BB"
+  fontSize: 20
+
+label:
+  fontColor: "#ffffff"
+  fontEmbed: false
+  fontFamily: Courirer New
+  fontSize: 16
+  shadowColor: 0x000000

src/client/haxe/ru/m/tankz/bundle/ConfigBundle.hx

@@ -0,0 +1,30 @@
+package ru.m.tankz.bundle;
+
+import openfl.Assets;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.Type;
+import yaml.Parser;
+import yaml.Yaml;
+
+
+typedef ConfigSource = {
+    var game:GameConfig;
+    var map: MapConfig;
+    var bricks: Array<BrickConfig>;
+    var presets: Array<GamePreset>;
+    var points: Array<SpawnPoint>;
+    var tanks: Array<TankConfig>;
+    var bonuses: Array<BonusConfig>;
+}
+
+class ConfigBundle implements IConfigBundle {
+
+    private static function convert(raw:Dynamic):ConfigSource {
+        return raw;
+    }
+
+    public function get(type:GameType):Config {
+        var source = convert(Yaml.parse(Assets.getText('resources/${type}/config.yaml'), Parser.options().useObjects()));
+        return new Config(type, source.game, source.map, source.bricks, source.presets, source.points, source.tanks, source.bonuses);
+    }
+}

src/client/haxe/ru/m/tankz/bundle/LevelBundle.hx

@@ -0,0 +1,15 @@
+package ru.m.tankz.bundle;
+
+import openfl.Assets;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.Type;
+import ru.m.tankz.util.LevelUtil;
+
+
+class LevelBundle implements ILevelBundle {
+
+    public function get(type:GameType, config:Config, level:Int):LevelConfig {
+        var data:String = Assets.getText('resources/${type}/levels/level${LevelUtil.formatLevel(level)}.txt');
+        return LevelUtil.loads(config, data);
+    }
+}

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;
@@ -44,7 +43,7 @@ class HumanControl extends Control {
             case _:
         }
         if (event.keyCode == Keyboard.U) {
-            action(TankAction.LEVEL_UP(1));
+            action(TankAction.UPGRADE);
         }
     }
 

src/client/haxe/ru/m/tankz/frame/GameFrame.hx

@@ -1,8 +1,7 @@
-package ru.m.tankz.view.frames;
+package ru.m.tankz.frame;
 
-import haxe.ds.Option;
-import haxe.ds.Option;
 import flash.events.Event;
+import haxe.ds.Option;
 import haxe.Timer;
 import haxework.gui.frame.IFrameSwitcher;
 import haxework.gui.LabelView;
@@ -12,9 +11,11 @@ import haxework.provider.Provider;
 import protohx.Message;
 import ru.m.connect.IConnection;
 import ru.m.tankz.game.Game;
+import ru.m.tankz.game.GameSave;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.proto.pack.GameUpdateResponse;
 import ru.m.tankz.render.Render;
+import ru.m.tankz.storage.SaveStorage;
 
 
 interface GameFrameLayout {
@@ -22,8 +23,7 @@ interface GameFrameLayout {
     var render(default, null):Render;
 }
 
-
-@:template("layout/frames/game.json", "layout/styles.json")
+@:template("ru/m/tankz/frame/GameFrame.yaml", "ru/m/tankz/Style.yaml")
 class GameFrame extends VGroupView implements ViewBuilder implements IPacketHandler implements GameFrameLayout {
 
     private static inline var TAG = "GameFrame";
@@ -36,22 +36,22 @@ class GameFrame extends VGroupView implements ViewBuilder implements IPacketHand
     public function init():Void {}
 
     public function onShow():Void {
-        start(Provider.get(GameState));
+        start(Provider.get(GameSave));
     }
 
-    private function start(s:GameState):Void {
-        game = Provider.build(Game, s.type);
+    private function start(save:GameSave):Void {
+        game = Provider.build(Game, save.state.type);
         if (game == null) {
-            throw 'Unsupported game type "${s.type}"';
+            throw 'Unsupported game type "${save.state.type}"';
         }
         game.engine.listeners.push(render);
-        game.start(s).then(onGameStateChange).endThen(onGameComplete);
+        game.start(save).then(onGameStateChange).endThen(onGameComplete);
         content.addEventListener(Event.ENTER_FRAME, redraw);
         //Provider.get(IConnection).packetHandler.addListener(this);
         render.draw(game.engine);
         timer = new Timer(10);
         timer.run = updateEngine;
-        state.text = stateString(s);
+        state.text = stateString(game);
     }
 
     private function stop():Void {
@@ -68,20 +68,21 @@ class GameFrame extends VGroupView implements ViewBuilder implements IPacketHand
         render.reset();
     }
 
-    private function stateString(state:GameState):String {
+    private function stateString(game:Game):String {
+        if (game.state == null) {
+            return '';
+        }
         var result:Array<String> = [];
-        result.push('Level: ${state.level}');
-        for (teamId in state.teams.keys()) {
-            var ts:TeamState = state.teams[teamId];
-            if (ts.lose) {
-                result.push('${teamId}: LOSE');
-            } else if (ts.life > -1) {
-                result.push('${teamId}: ${ts.life}');
+        result.push('Level: ${game.state.level}');
+        for (team in game.teams) {
+            if (game.state.loser == team.id) {
+                result.push('${team.id}: LOSE');
+            } else if (team.life > -1) {
+                result.push('${team.id}: ${team.life}');
             } else {
-                for (index in ts.players.keys()) {
-                    var ps:PlayerState = ts.players[index];
-                    if (ps.life > -1) {
-                        result.push('${teamId}${index}: ${ps.life}');
+                for (player in team.players) {
+                    if (player.life > -1) {
+                        result.push('${player.id.team}${player.id.index}: ${player.life}');
                     }
                 }
             }
@@ -90,20 +91,22 @@ class GameFrame extends VGroupView implements ViewBuilder implements IPacketHand
     }
 
     private function onGameStateChange(s:GameState):GameState {
-        state.text = stateString(s);
+        state.text = stateString(game);
         return s;
     }
 
     private function onGameComplete(result:Option<GameState>):Void {
         switch (result) {
             case Option.Some(s):
-                state.text = stateString(s);
+                state.text = stateString(game);
             case Option.None:
         }
         switch (game.next()) {
             case Option.Some(s):
+                var save = game.save();
+                Provider.get(SaveStorage).write(save);
                 stop();
-                start(s);
+                start(save);
             case Option.None:
                 Provider.get(IFrameSwitcher).change(StartFrame.ID);
         }

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

@@ -0,0 +1,12 @@
+---
+pWidth: 100
+pHeight: 100
+views:
+- id: state
+  $type: haxework.gui.LabelView
+  $style: label
+  pWidth: 100
+  height: 20
+- id: render
+  $type: ru.m.tankz.render.Render
+  contentSize: true

src/client/haxe/ru/m/tankz/frame/LevelFrame.hx

@@ -1,12 +1,13 @@
-package ru.m.tankz.view.frames;
+package ru.m.tankz.frame;
 
-import ru.m.tankz.config.ConfigBundle;
+import ru.m.tankz.game.GameSave;
 import haxework.gui.frame.IFrameSwitcher;
-import ru.m.tankz.game.GameState;
-import haxework.provider.Provider;
 import haxework.gui.list.ListView;
-import haxework.gui.ViewBuilder;
 import haxework.gui.VGroupView;
+import haxework.gui.ViewBuilder;
+import haxework.provider.Provider;
+import ru.m.tankz.bundle.IConfigBundle;
+import ru.m.tankz.game.GameState;
 
 
 interface LevelFrameLayout {
@@ -14,7 +15,7 @@ interface LevelFrameLayout {
 }
 
 
-@:template("layout/frames/level.json", "layout/styles.json")
+@:template("ru/m/tankz/frame/LevelFrame.yaml", "ru/m/tankz/Style.yaml")
 class LevelFrame extends VGroupView implements ViewBuilder implements LevelFrameLayout {
     public static inline var ID = "level";
 
@@ -23,13 +24,13 @@ class LevelFrame extends VGroupView implements ViewBuilder implements LevelFrame
     }
 
     public function onShow():Void {
-        var state = Provider.get(GameState);
-        var c = ConfigBundle.get(state.type).game.levels;
+        var state:GameState = Provider.get(GameSave).state;
+        var c = Provider.get(IConfigBundle).get(state.type).game.levels;
         levels.data = [for (i in 0...c) i];
     }
 
     public function onListItemClick(item:IListItemView<Int>):Void {
-        Provider.get(GameState).level = item.data;
+        Provider.get(GameSave).state.level = item.data;
         Provider.get(IFrameSwitcher).change(GameFrame.ID);
     }
 }

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

@@ -0,0 +1,20 @@
+---
+pWidth: 100
+pHeight: 100
+views:
+- id: levels
+  $type: haxework.gui.list.VListView<Int>
+  factory: "@class:ru.m.tankz.frame.level.LevelView"
+  pWidth: 100
+  pHeight: 100
+  paddings: 10
+  scroll:
+    $type: haxework.gui.list.VScrollView
+    width: 10
+    pHeight: 100
+    skin:
+      $type: haxework.gui.list.VScrollSkin
+  skin:
+    $type: haxework.gui.skin.ColorSkin
+    color: "#000000"
+    alpha: 0

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

@@ -1,44 +1,53 @@
-package ru.m.tankz.view.frames;
+package ru.m.tankz.frame;
 
-import ru.m.tankz.game.Game;
-import ru.m.tankz.game.GameState;
+import ru.m.tankz.storage.SaveStorage;
+import ru.m.tankz.game.GameSave;
+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 {
     var classic_1p(default, null):ButtonView;
     var classic_2p(default, null):ButtonView;
+    var classic_load(default, null):ButtonView;
     var dota_1p(default, null):ButtonView;
     var dota_2p_coop(default, null):ButtonView;
     var dota_2p_vs(default, null):ButtonView;
 }
 
-
-@:template("layout/frames/start.json", "layout/styles.json")
+@:template("ru/m/tankz/frame/StartFrame.yaml", "ru/m/tankz/Style.yaml")
 class StartFrame extends VGroupView implements ViewBuilder implements StartFrameLayout {
 
     public static inline var ID = "start";
 
-    public function init() {
+    public function init():Void {
         classic_1p.onPress = this;
         classic_2p.onPress = this;
+        classic_load.onPress = this;
         dota_1p.onPress = this;
         dota_2p_coop.onPress = this;
         dota_2p_vs.onPress = this;
     }
 
+    public function onShow():Void {
+        classic_load.visible = Provider.get(SaveStorage).read(ClassicGame.TYPE) != null;
+    }
+
     public function onPress(view:ButtonView):Void {
         switch (view.id) {
             case 'classic_1p':
                 startGame(ClassicGame.TYPE, ClassicGame.PLAYER1);
             case 'classic_2p':
                 startGame(ClassicGame.TYPE, ClassicGame.PLAYER2);
+            case 'classic_load':
+                loadGame(ClassicGame.TYPE);
             case 'dota_1p':
                 startGame(DotaGame.TYPE, DotaGame.PLAYER1);
             case 'dota_2p_coop':
@@ -48,14 +57,14 @@ class StartFrame extends VGroupView implements ViewBuilder implements StartFrame
         }
     }
 
-    private function startGame(type:GameType, mode:GameMode):Void {
-        switch (type) {
-            case ClassicGame.TYPE:
-                Provider.set(GameState, ClassicGame.buildState(0, mode));
-                Provider.get(IFrameSwitcher).change(LevelFrame.ID);
-            case DotaGame.TYPE:
-                Provider.set(GameState, DotaGame.buildState(0, mode));
+    private function startGame(type:GameType, presetId:PresetId):Void {
+        Provider.set(GameSave, new GameSave({type: type, presetId: presetId}));
         Provider.get(IFrameSwitcher).change(LevelFrame.ID);
     }
+
+    private function loadGame(type:GameType):Void {
+        var save:GameSave = Provider.get(SaveStorage).read(type);
+        Provider.set(GameSave, save);
+        Provider.get(IFrameSwitcher).change(GameFrame.ID);
     }
 }

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

@@ -0,0 +1,44 @@
+---
+pWidth: 100
+pHeight: 100
+views:
+- $type: haxework.gui.ImageView
+  image: "@asset:image:resources/image/ui/logo.png"
+  contentSize: true
+  bottomMargin: 15
+- $type: haxework.gui.LabelView
+  $style: label
+  fontSize: 20
+  topMargin: 15
+  contentSize: true
+  text: Classic
+- id: classic_1p
+  $type: haxework.gui.ButtonView
+  text: 1 Player
+  $style: button
+- id: classic_2p
+  $type: haxework.gui.ButtonView
+  text: 2 Player
+  $style: button
+- id: classic_load
+  $type: haxework.gui.ButtonView
+  text: Load
+  $style: button
+- $type: haxework.gui.LabelView
+  $style: label
+  fontSize: 20
+  topMargin: 15
+  contentSize: true
+  text: DotA
+- id: dota_1p
+  $type: haxework.gui.ButtonView
+  text: 1 Player
+  $style: button
+- id: dota_2p_coop
+  $type: haxework.gui.ButtonView
+  text: 2 COOP
+  $style: button
+- id: dota_2p_vs
+  $type: haxework.gui.ButtonView
+  text: 2 VS
+  $style: button

src/client/haxe/ru/m/tankz/frame/level/LevelView.hx

@@ -1,4 +1,4 @@
-package ru.m.tankz.view.frames.list;
+package ru.m.tankz.frame.level;
 
 import haxework.gui.ViewBuilder;
 import haxework.gui.HGroupView;
@@ -10,7 +10,7 @@ interface LevelViewLayout {
     var label(default, null):LabelView;
 }
 
-@:template("layout/other.json@level", "layout/styles.json")
+@:template("ru/m/tankz/frame/level/LevelView.yaml", "ru/m/tankz/Style.yaml")
 class LevelView extends HGroupView implements ViewBuilder implements IListItemView<Int> implements LevelViewLayout {
 
     public var item_index(default, default):Int;

src/client/haxe/ru/m/tankz/frame/level/LevelView.yaml

@@ -0,0 +1,15 @@
+---
+width: 440
+height: 44
+margins: 5
+views:
+- id: label
+  $type: haxework.gui.LabelView
+  $style: label
+  pWidth: 100
+  pHeight: 100
+  text: ""
+skin:
+  $type: haxework.gui.skin.ColorSkin
+  color: "#000000"
+  alpha: 0.2

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

@@ -0,0 +1,71 @@
+package ru.m.tankz.render;
+
+import ru.m.draw.BitmapUtil;
+import ru.m.draw.Color;
+import flash.display.BitmapData;
+import openfl.Assets;
+import ru.m.animate.Animate;
+import ru.m.animate.OnceAnimate;
+import ru.m.tankz.core.Tank;
+import ru.m.tankz.Type;
+
+
+class AnimateBundle {
+
+    private static function buildAnimate(name:String, sequence:Array<Int>):OnceAnimate {
+        var template:String = 'resources/image/animate/${name}/%index%.png';
+        var frames = [for (i in sequence) ({
+            image: Assets.getBitmapData(StringTools.replace(template, '%index%', Std.string(i))),
+            length: 1
+        })];
+        return new OnceAnimate(frames);
+    }
+
+    public static function tankSpawn():OnceAnimate {
+        return buildAnimate('appear', [
+            0, 1, 2, 3, 3, 4, 5, 5, 6
+        ]);
+    }
+
+    public static function tankBoom():OnceAnimate {
+        return buildAnimate('boom', [
+            0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9
+        ]);
+    }
+
+    public static function bulletBoom():OnceAnimate {
+        return buildAnimate('boom-sm', [
+            0, 1, 1, 0, 0, 1
+        ]);
+    }
+
+    public static function tankProtect():Animate {
+        return new Animate([for (i in 0...2) ({
+            image: Assets.getBitmapData('resources/image/animate/protect/${i}.png'),
+            length: 5
+        })]);
+    }
+
+    public static function tankFrames(tank:Tank):Array<Frame> {
+        var color:Color = switch (tank.hits) {
+            case 1: 0x869C43;
+            case 2: 0xDEAF80;
+            case 3: 0x5EA67A;
+            case _: tank.color;
+        }
+        var colors:Array<Color> = [color, color];
+        if (tank.bonus) {
+            colors[1] = 0xff00aa;
+        }
+        return [for (i in 0...2) ({
+            image: BitmapUtil.colorize(Assets.getBitmapData('resources/image/tank/${tank.config.skin}-${i}.png'), colors[i]),
+            length: 3
+        })];
+    }
+
+    public static function bonusFrames(type:BonusType):Array<Frame> {
+        var image =  Assets.getBitmapData('resources/image/bonus/${type}.png');
+        var empty = new BitmapData(image.width, image.height, true, 0x00000000);
+        return [{image: image, length: 15}, {image: empty, length: 15}];
+    }
+}

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

@@ -1,15 +1,15 @@
 package ru.m.tankz.render;
 
-import ru.m.geom.Point;
-import openfl.Assets;
-import ru.m.animate.OnceAnimate;
 import flash.display.DisplayObjectContainer;
-import ru.m.tankz.core.EntityType;
-import ru.m.tankz.render.RenderItem;
-import ru.m.tankz.engine.Engine;
-import flash.display.Sprite;
 import flash.display.Graphics;
+import flash.display.Sprite;
 import haxework.gui.SpriteView;
+import ru.m.animate.Animate;
+import ru.m.animate.OnceAnimate;
+import ru.m.geom.Point;
+import ru.m.tankz.core.EntityType;
+import ru.m.tankz.engine.Engine;
+import ru.m.tankz.render.RenderItem;
 
 
 class Render extends SpriteView implements EngineListener {
@@ -54,13 +54,21 @@ class Render extends SpriteView implements EngineListener {
     }
 
     public function draw(game:Engine):Void {
-        for (brick in game.map.bricks) if (brick.config.type > 0) {
+        for (brick in game.map.bricks) if (brick.config.index > 0) {
             if (!items.exists(brick.key)) {
-                items[brick.key] = new BrickItem(brick);
+                var item:RenderItem<Dynamic, Dynamic> = switch(brick.config.type) {
+                    case 'ace' | 'bush': new BrickItem(brick);
+                    case 'water': new BrickAnimateItem(brick);
+                    case 'armor' | 'brick': new BrickBreakingItem(brick);
+                    case x: null;
+                };
+                if (item != null) {
+                    items[brick.key] = item;
                     if (brick.config.layer > 2) {
-                    upLayer.addChild(items[brick.key].view);
+                        upLayer.addChild(item.view);
                     } else {
-                    groundLayer.addChild(items[brick.key].view);
+                        groundLayer.addChild(item.view);
+                    }
                 }
             }
         }
@@ -97,7 +105,7 @@ class Render extends SpriteView implements EngineListener {
                 items.set(tank.key, item);
                 entryLayer.addChild(item.view);
                 item.update();
-                playTankSpawn(tank.rect.center);
+                playAnimate(tank.rect.center, AnimateBundle.tankSpawn());
             case EntityType.BULLET(bullet):
                 var item = new BulletItem(bullet);
                 items.set(bullet.key, item);
@@ -108,78 +116,56 @@ class Render extends SpriteView implements EngineListener {
                 items.set(eagle.key, item);
                 entryLayer.addChild(item.view);
                 item.update();
+            case EntityType.BONUS(bonus):
+                var item = new BonusItem(bonus);
+                items.set(bonus.key, item);
+                upperLayer.addChild(item.view);
+                item.update();
             case _:
         }
     }
 
-    public function onCollision(entity:EntityType, with:EntityType):Void {
+    public function onChange(entity:EntityType, ?change:EntityChange):Void {}
 
+    public function onCollision(entity:EntityType, with:EntityType):Void {
+        switch [entity, with] {
+            case [EntityType.BULLET(_), EntityType.EAGLE(eagle)]:
+                if (eagle.death) {
+                    playAnimate(eagle.rect.center, AnimateBundle.tankBoom());
+                }
+            case _:
+        }
     }
 
     public function onDestroy(entity:EntityType):Void {
-        switch(entity) {
+        switch entity {
             case EntityType.TANK(tank):
                 if (items.exists(tank.key)) {
                     entryLayer.removeChild(items.get(tank.key).view);
                     items.remove(tank.key);
-                    playTankBoom(tank.rect.center);
+                    playAnimate(tank.rect.center, AnimateBundle.tankBoom());
                 }
             case EntityType.BULLET(bullet):
                 if (items.exists(bullet.key)) {
                     entryLayer.removeChild(items.get(bullet.key).view);
                     items.remove(bullet.key);
-                    playBulletBoom(bullet.rect.center.add(new Point(bullet.rect.width * bullet.rect.direction.x, bullet.rect.height * bullet.rect.direction.y)));
+                    var point = bullet.rect.center.add(new Point(bullet.rect.width * bullet.rect.direction.x, bullet.rect.height * bullet.rect.direction.y));
+                    playAnimate(point, AnimateBundle.bulletBoom());
                 }
-            case EntityType.EAGLE(eagle):
-                if (items.exists(eagle.key)) {
-                    cast(items.get(eagle.key), EagleItem).destoyed = true;
-                    items.get(eagle.key).redraw();
-                    playTankBoom(eagle.rect.center);
+            case EntityType.BONUS(bonus):
+                if (items.exists(bonus.key)) {
+                    upperLayer.removeChild(items.get(bonus.key).view);
+                    items.remove(bonus.key);
                 }
             case _:
         }
     }
 
-    private function playTankSpawn(point:Point):Void {
-        var arr = [
-            0, 1, 2, 3, 3, 4, 5, 5, 6
-        ];
-        var frames = [for (i in arr) Assets.getBitmapData('resources/images/tank/appear/appear-${i}.png')];
-        var animate = new OnceAnimate(frames);
+    private function playAnimate(point:Point, animate:OnceAnimate):Void {
         animate.x = point.x - animate.width / 2;
         animate.y = point.y - animate.height / 2;
         upperLayer.addChild(animate);
-        animate.play().then(function(animate) {
-            upperLayer.removeChild(animate);
-            animate.dispose();
-        });
-    }
-
-    private function playBulletBoom(point:Point):Void {
-        var arr = [
-            0, 1, 1, 0, 0, 1
-        ];
-        var frames = [for (i in arr) Assets.getBitmapData('resources/images/bullet/boom/boom-${i}.png')];
-        var animate = new OnceAnimate(frames);
-        animate.x = point.x - animate.width / 2;
-        animate.y = point.y - animate.height / 2;
-        upperLayer.addChild(animate);
-        animate.play().then(function(animate) {
-            upperLayer.removeChild(animate);
-            animate.dispose();
-        });
-    }
-
-    private function playTankBoom(point:Point):Void {
-        var arr = [
-            0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9
-        ];
-        var frames = [for (i in arr) Assets.getBitmapData('resources/images/tank/kaboom/kaboom-${i}.png')];
-        var animate = new OnceAnimate(frames);
-        animate.x = point.x - animate.width / 2;
-        animate.y = point.y - animate.height / 2;
-        upperLayer.addChild(animate);
-        animate.play().then(function(animate) {
+        animate.play().then(function(animate:Animate):Void {
             upperLayer.removeChild(animate);
             animate.dispose();
         });

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

@@ -1,25 +1,25 @@
 package ru.m.tankz.render;
 
-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.geom.Direction;
 import ru.m.geom.Rectangle;
+import ru.m.tankz.core.Bonus;
 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;
+import ru.m.tankz.Type.BrickType;
 
 
 typedef TRectangle = {
     var rect(default, null):Rectangle;
 }
 
-
 class RenderItem<T:TRectangle, D:DisplayObject> {
 
     public var value(default, null):T;
@@ -75,10 +75,50 @@ class BitmapItem<T:TRectangle> extends RenderItem<T, Bitmap> {
 }
 
 
-class BrickItem extends RenderItem<Brick, Shape> {
+class BrickItem extends BitmapItem<Brick> {
+    private var type:BrickType;
 
+    public function new(value:Brick) {
+        super(value);
+        redraw();
+    }
+
+    override public function update():Void {
+        super.update();
+        var t = value.config.type;
+        if (t != type) {
+            type = t;
+            view.visible = t != 'none';
+            redraw();
+        }
+    }
+
+    override private function getImage():String {
+        return 'resources/image/map/${value.config.type}.png';
+    }
+}
+
+
+class BrickAnimateItem extends AnimateItem<Brick> {
+
+    public function new(value:Brick) {
+        super(value);
+        redraw();
+    }
+
+    override public function redraw():Void {
+        view.frames = [for (i in 0...2) ({
+            image: Assets.getBitmapData('resources/image/map/${value.config.type}-${i}.png'),
+            length: 15
+        })];
+        view.playing = true;
+    }
+}
+
+
+class BrickBreakingItem extends RenderItem<Brick, Shape> {
     private var broken:Int;
-    private var type:Int;
+    private var type:BrickType;
 
     public function new(value:Brick) {
         super(value);
@@ -91,7 +131,7 @@ class BrickItem extends RenderItem<Brick, Shape> {
         var g = view.graphics;
         g.clear();
         if (value.destroyed) return;
-        if (value.config.type > 0) {
+        if (value.config.index > 0) {
             g.beginBitmapFill(image);
             g.drawRect(0, 0, value.rect.width, value.rect.height);
             for (c in value.cells) {
@@ -116,7 +156,20 @@ class BrickItem extends RenderItem<Brick, Shape> {
     }
 
     private function getImage():String {
-        return 'resources/images/map/map_${value.config.type}.png';
+        return 'resources/image/map/${value.config.type}.png';
+    }
+}
+
+
+class AnimateItem<T:TRectangle> extends RenderItem<T, Animate> {
+
+    public function new(value:T) {
+        super(value);
+        view = new Animate();
+    }
+
+    override public function dispose():Void {
+        view.dispose();
     }
 }
 
@@ -125,68 +178,56 @@ class TankItem extends RenderItem<Tank, Sprite> {
 
     private var type:String;
     private var hits:Int;
+    private var protected:Bool;
+    private var frozen:Bool;
 
     private var tankView:Animate;
+    private var protectView:Animate;
 
     public function new(value:Tank) {
         super(value);
         view = new Sprite();
-        if (value.playerId.type == Control.HUMAN) {
-            view.addChild(buildHumanMarkView(value));
-        }
         tankView = new Animate();
         view.addChild(tankView);
+        protectView = AnimateBundle.tankProtect();
+        protectView.visible = false;
+        view.addChild(protectView);
         redraw();
     }
 
-    private static function buildHumanMarkView(tank:Tank):DisplayObject {
-        var view = new Shape();
-        view.graphics.beginFill(0x00aa00);
-        view.graphics.lineStyle(2, 0x00ff00);
-        view.graphics.drawCircle(0, 0, 23);
-        view.graphics.endFill();
-        view.x = tank.rect.width / 2;
-        view.y = tank.rect.height / 2;
-        view.alpha = 0.2;
-        return view;
-    }
-
     override public function redraw():Void {
-        tankView.frames = getFrames().map(function(s) return Assets.getBitmapData(s));
+        tankView.frames = AnimateBundle.tankFrames(value);
+        if (value.protect.active) {
+            protectView.x = (tankView.frames[0].image.width - protectView.frames[0].image.width) / 2;
+            protectView.y = (tankView.frames[0].image.height - protectView.frames[0].image.height) / 2;
+            protectView.playing = true;
+            protectView.visible = true;
+        } else {
+            protectView.playing = false;
+            protectView.visible = false;
+        }
     }
 
     private function getFrames():Array<String> {
-        var team = value.playerId.team;
-        var group = value.config.group;
-        var index = value.playerId.index;
-        if (team == 'radiant') {
-            index = 0;
-        }
-        if (team == 'dire') {
-            index = 1;
-        }
-        if (team == 'human' || team == 'radiant' || team == 'dire') {
-            group = 'player';
-        }
-        if (team == 'bot') {
-            index = value.hits;
-        }
-        return [
-            'resources/images/tank/${group}/tank_${group.charAt(0)}${value.config.type}_${index}-0.png',
-            'resources/images/tank/${group}/tank_${group.charAt(0)}${value.config.type}_${index}-1.png',
-        ];
+        var frame0 = 'resources/image/tank/${value.config.skin}-0.png';
+        var frame1 = 'resources/image/tank/${value.config.skin}-1.png';
+        return [frame1, frame0];
     }
 
     override public function update():Void {
         super.update();
         var t = value.config.type;
         var h = value.hits;
-        if (t != this.type || h != this.hits) {
+        var p = value.protect.active;
+        var f = value.freezing.active;
+        if (t != type || h != hits || p != protected || f != frozen) {
             this.type = t;
             this.hits = h;
+            this.protected = p;
+            this.frozen = f;
             redraw();
         }
-        tankView.playing = (value.mx !=0 || value.my != 0);
+        tankView.playing = !value.freezing.active && (value.mx !=0 || value.my != 0);
     }
 
     override public function dispose():Void {
@@ -201,16 +242,46 @@ class TankItem extends RenderItem<Tank, Sprite> {
 class BulletItem extends BitmapItem<Bullet> {
 
     override private function getImage():String {
-        return 'resources/images/bullet/bullet_${value.config.piercing > 1 ? 1 : 0}.png';
+        var type:String = 'normal';
+        if (value.config.piercing > 0) type = 'piercing';
+        return 'resources/image/bullet/${type}.png';
     }
 }
 
 
 class EagleItem extends BitmapItem<Eagle> {
 
-    public var destoyed(default, default):Bool;
+    private var death:Bool;
+    private var protected:Bool;
+
+    override public function update():Void {
+        super.update();
+        var d = value.death;
+        var p = value.protect.active;
+        if (d != death || p != protected) {
+            death = d;
+            protected = p;
+            redraw();
+        }
+    }
 
     override private function getImage():String {
-        return 'resources/images/eagle/eagle-${destoyed ? 1 : 0}.png';
+        var suffix = value.death ? '-death' : value.protect.active ? '-protected' : '';
+        return 'resources/image/eagle/eagle${suffix}.png';
+    }
+}
+
+
+class BonusItem extends AnimateItem<Bonus> {
+
+    public function new(value:Bonus) {
+        super(value);
+        redraw();
+    }
+
+    override public function redraw():Void {
+        var image =  Assets.getBitmapData('resources/image/bonus/${value.config.type}.png');
+        view.frames = AnimateBundle.bonusFrames(value.config.type);
+        view.playing = true;
     }
 }

src/client/haxe/ru/m/tankz/storage/SaveStorage.hx

@@ -0,0 +1,33 @@
+package ru.m.tankz.storage;
+
+import flash.net.SharedObject;
+import ru.m.tankz.Type;
+import ru.m.tankz.game.GameSave;
+
+
+class SaveStorage {
+
+    private static var TAG(default, never):String = 'SaveStorage';
+
+    private var so:SharedObject;
+
+    public function new() {
+        so = SharedObject.getLocal('tankz');
+    }
+
+    public function read(type:GameType):Null<GameSave> {
+        var data:String = Reflect.getProperty(so.data, type);
+        L.d(TAG, 'read: ${data}');
+        if (data != null) {
+            return GameSave.fromYaml(data);
+        }
+        return null;
+    }
+
+    public function write(save:GameSave):Void {
+        var data:String = save.toYaml();
+        L.d(TAG, 'write: ${data}');
+        so.setProperty(save.state.type, data);
+        so.flush();
+    }
+}

src/client/resources/classic/config.yaml

@@ -9,34 +9,71 @@ map:
   gridHeight: 26
 
 bricks:
-  - {type: -1, layer: 2, armor: -1} # border
-  - {type: 0, layer: 0, armor: 0} # none
-  - {type: 1, layer: 0, armor: 0} # ace
-  - {type: 2, layer: 3, armor: 0} # bush
-  - {type: 3, layer: 1, armor: 0} # water
-  - {type: 4, layer: 2, armor: 2} # armor
-  - {type: 5, layer: 2, armor: 1} # brick
+  - {type: border, index: -1, layer: 2, armor: -1}
+  - {type: none,   index: 0,  layer: 0, armor: 0}
+  - {type: ace,    index: 1,  layer: 0, armor: 0}
+  - {type: bush,   index: 2,  layer: 3, armor: 0}
+  - {type: water,  index: 3,  layer: 1, armor: 0}
+  - {type: armor,  index: 4,  layer: 2, armor: 2}
+  - {type: brick,  index: 5,  layer: 2, armor: 1}
 
+player:
+  human: &human
+    control: human
+    life: 3
+    tanks:
+      - {type: human0, rate: 1, protect: 5}
+  bot: &bot
+    control: bot
+    color: 0xFFFFFF
+    life: -1
+    tanks:
+      - {type: bot0, rate: 0.25, bonus: 0.25}
+      - {type: bot1, rate: 0.25, bonus: 0.25}
+      - {type: bot2, rate: 0.25, bonus: 0.25}
+      - {type: bot3, rate: 0.25, bonus: 0.25}
+
+presets:
+  - id: player1
     teams:
     - id: human
-    spawnInterval: 0
-    tanks:
-      - {group: human, type: 0, rate: 1}
+      life: -1
+      players:
+        - {<<: *human, index: 0, color: 0xF5C040, life: 3}
     - 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}
+      life: 20
+      players:
+        - {<<: *bot, index: 0}
+        - {<<: *bot, index: 1}
+        - {<<: *bot, index: 2}
+        - {<<: *bot, index: 3}
+
+  - id: player2
+    teams:
+    - id: human
+      life: -1
+      players:
+        - {<<: *human, index: 0, color: 0xF5C040, life: 3}
+        - {<<: *human, index: 1, color: 0x15C040, life: 3}
+    - id: bot
+      spawnInterval: 3000
+      life: 20
+      players:
+        - {<<: *bot, index: 0}
+        - {<<: *bot, index: 1}
+        - {<<: *bot, index: 2}
+        - {<<: *bot, index: 3}
+        - {<<: *bot, index: 4}
+        - {<<: *bot, index: 5}
 
 points:
   - {team: human, type: eagle, index: -1, direction: right, x: 12, y: 24}
   - {team: human, type: tank, index: 0, direction: top, x: 8, y: 24}
   - {team: human, type: tank, index: 1, direction: top, x: 16, y: 24}
   - {team: bot, type: tank, index: -1, direction: bottom, x: 0, y: 0}
-  - {team: bot, type: tank, index: -1, direction: bottom, x: 12, y: 0}
-  - {team: bot, type: tank, index: -1, direction: bottom, x: 24, y: 0}
+  - {team: bot, type: tank, index: -2, direction: bottom, x: 12, y: 0}
+  - {team: bot, type: tank, index: -3, direction: bottom, x: 24, y: 0}
 
 bullet: &bullet
   width: 12
@@ -45,8 +82,8 @@ bullet: &bullet
   piercing: 1
 
 tanks:
-  human:
-    - type: 0
+  - type: human0
+    upgrade: human1
     width: 36
     height: 36
     speed: 2.5
@@ -54,8 +91,10 @@ tanks:
       <<: *bullet
       speed: 8.0
     bullets: 1
+    skin: pa
 
-    - type: 1
+  - type: human1
+    upgrade: human2
     width: 40
     height: 36
     speed: 3.0
@@ -63,8 +102,10 @@ tanks:
       <<: *bullet
       speed: 8.5
     bullets: 1
+    skin: pb
 
-    - type: 2
+  - type: human2
+    upgrade: human3
     width: 40
     height: 36
     speed: 3.0
@@ -72,8 +113,10 @@ tanks:
       <<: *bullet
       speed: 9.0
     bullets: 2
+    skin: pc
 
-    - type: 3
+  - type: human3
+    upgrade: human3
     width: 42
     height: 38
     speed: 2.9
@@ -82,9 +125,10 @@ tanks:
       speed: 9.0
       piercing: 3
     bullets: 2
+    hits: 1
+    skin: pd
 
-  bot:
-    - type: 0
+  - type: bot0
     width: 38
     height: 36
     speed: 2.0
@@ -93,8 +137,9 @@ tanks:
       speed: 7.0
     bullets: 1
     score: 100
+    skin: ba
 
-    - type: 1
+  - type: bot1
     width: 40
     height: 36
     speed: 4.0
@@ -103,8 +148,9 @@ tanks:
       speed: 7.0
     bullets: 1
     score: 200
+    skin: bb
 
-    - type: 2
+  - type: bot2
     width: 38
     height: 36
     speed: 2.0
@@ -113,8 +159,9 @@ tanks:
       speed: 9.0
     bullets: 1
     score: 300
+    skin: bc
 
-    - type: 3
+  - type: bot3
     width: 40
     height: 36
     speed: 1.8
@@ -124,3 +171,12 @@ tanks:
     bullets: 1
     score: 400
     hits: 3
+    skin: bd
+
+bonuses:
+  - {type: clock, duration: 10}
+  - {type: grenade}
+  - {type: helmet, duration: 20}
+  - {type: life}
+  - {type: shovel, duration: 10}
+  - {type: star}

src/client/resources/config/tank-z.ini

@@ -1,95 +0,0 @@
-[keyboard]
-reset		= 27		;Escape
-pause		= 80		;P
-
-[player0]
-key_left	= 37		;Left
-key_up		= 38		;Up
-key_right	= 39		;Rigth
-key_down	= 40		;Down
-key_shot	= 96		;Num0
-
-[player1]
-key_left	= 65		;A
-key_up		= 87		;W
-key_right	= 68		;D
-key_down	= 83		;S
-key_shot	= 32		;Space
-
-[bonus]
-score		= 500
-freeztime	= 10
-eagletime	= 20
-protecttime	= 15
-
-[bots]
-count		= 20		;количество ботов на уровне
-respawntime	= 2.5		;задержка между появлением ботов в секундах
-shotdelay	= 1.0		;задержка между выстрелами
-turndelay	= 0.3		;задержка перед поворотом при столкновении
-rndturndelay = 2.0		;задержка перед случайным поворотом
-turntoeagle	= 0.75		;вероятность поворота к Орлу
-bonus		= 0.25		;вероятность появления бонусного танка
-
-
-[tank_p0]
-movespeed	= 2.5		;скорость передвижения
-bulletspeed	= 8.0		;скорость полёта снаряда
-bullettype	= 0			;тип снаряда (0 - обычный, 1 - бронебойный)
-bulletcount	= 1			;количество снарядов
-hits		= 1			;количество хитпойнтов
-
-[tank_p1]
-movespeed	= 3.0
-bulletspeed	= 8.5
-bullettype	= 0
-bulletcount	= 1
-hits		= 1
-
-[tank_p2]
-movespeed 	= 3.0
-bulletspeed	= 9.0
-bullettype	= 0
-bulletcount	= 2
-hits		= 1
-
-[tank_p3]
-movespeed	= 2.9
-bulletspeed	= 9.0
-bullettype	= 1
-bulletcount	= 2
-hits		= 2
-
-
-
-[tank_b0]
-movespeed	= 2.0
-bulletspeed	= 7.0
-bullettype	= 0
-bulletcount	= 1
-hits		= 1
-score		= 100
-
-[tank_b1]
-movespeed	= 4.0
-bulletspeed	= 7.0
-bullettype	= 0
-bulletcount	= 1
-hits		= 1
-score		= 200
-
-[tank_b2]
-movespeed	= 2.0
-bulletspeed	= 9.0
-bullettype	= 0
-bulletcount	= 1
-hits		= 1
-score		= 300
-
-[tank_b3]
-movespeed	= 1.8
-bulletspeed	= 8.0
-bullettype	= 0
-bulletcount	= 1
-hits		= 4
-score		= 400

src/client/resources/dota/config.yaml

@@ -1,5 +1,5 @@
 game:
-  levels: 3
+  levels: 8
   friendlyFire: true
 
 map:
@@ -9,27 +9,90 @@ map:
   gridHeight: 30
 
 bricks:
-  - {type: -1, layer: 2, armor: -1} # border
-  - {type: 0, layer: 0, armor: 0} # none
-  - {type: 1, layer: 0, armor: 0} # ace
-  - {type: 2, layer: 3, armor: 0} # bush
-  - {type: 3, layer: 1, armor: 0} # water
-  - {type: 4, layer: 2, armor: 2} # armor
-  - {type: 5, layer: 2, armor: 1} # brick
+  - {type: border, index: -1, layer: 2, armor: -1}
+  - {type: none,   index: 0,  layer: 0, armor: 0}
+  - {type: ace,    index: 1,  layer: 0, armor: 0}
+  - {type: bush,   index: 2,  layer: 3, armor: 0}
+  - {type: water,  index: 3,  layer: 1, armor: 0}
+  - {type: armor,  index: 4,  layer: 2, armor: 2}
+  - {type: brick,  index: 5,  layer: 2, armor: 1}
 
-team_tanks: &team_tanks
-  tanks:
-    - {group: any, type: 0, rate: 0.25}
-    - {group: any, type: 1, rate: 0.25}
-    - {group: any, type: 2, rate: 0.25}
-
-teams:
-  - <<: *team_tanks
+team:
+  radiant: &radiant
     id: radiant
-    spawnInterval: 0
-  - <<: *team_tanks
+    color: 0xff4422
+    life: 20
+  dire: &dire
     id: dire
-    spawnInterval: 0
+    color: 0x2244ff
+    life: 20
+
+player: &player
+  life: -1
+  control: bot
+  tanks:
+    - {type: slow, rate: 0.5, protect: 3, bonus: 0}
+    - {type: fast, rate: 0.5, protect: 3, bonus: 0}
+
+human1: &human1
+  <<: *player
+  control: human
+  color: 0xf055a0
+
+human2: &human2
+  <<: *player
+  control: human
+  color: 0xa055f0
+
+presets:
+  - id: player1
+    teams:
+      - <<: *radiant
+        players:
+          - {<<: *human1, index: 0}
+          - {<<: *player, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
+      - <<: *dire
+        players:
+          - {<<: *player, index: 0}
+          - {<<: *player, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
+  - id: player2_coop
+    teams:
+      - <<: *radiant
+        players:
+          - {<<: *human1, index: 0}
+          - {<<: *human1, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
+      - <<: *dire
+        players:
+          - {<<: *player, index: 0}
+          - {<<: *player, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
+  - id: player2_vs
+    teams:
+      - <<: *radiant
+        players:
+          - {<<: *human1, index: 0}
+          - {<<: *player, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
+      - <<: *dire
+        players:
+          - {<<: *human2, index: 0}
+          - {<<: *player, index: 1}
+          - {<<: *player, index: 2}
+          - {<<: *player, index: 3}
+          - {<<: *player, index: 4}
 
 points:
   - {team: radiant, type: eagle, index: -1, direction: right, x: 0, y: 28}
@@ -52,40 +115,30 @@ bullet: &bullet
   piercing: 1
 
 tanks:
-  any:
-    - type: 0
-      width: 36
+  - type: slow
+    width: 38
     height: 36
-      speed: 2.5
+    speed: 2.3
+    bullet:
+      <<: *bullet
+      speed: 12.0
+    bullets: 1
+    skin: bc
+
+  - type: fast
+    width: 40
+    height: 36
+    speed: 4.0
     bullet:
       <<: *bullet
       speed: 8.0
     bullets: 1
+    skin: bb
 
-    - type: 1
-      width: 40
-      height: 36
-      speed: 3.0
-      bullet:
-        <<: *bullet
-        speed: 8.5
-      bullets: 1
-
-    - type: 2
-      width: 40
-      height: 36
-      speed: 3.0
-      bullet:
-        <<: *bullet
-        speed: 9.0
-      bullets: 2
-
-    - type: 3
-      width: 42
-      height: 38
-      speed: 2.9
-      bullet:
-        <<: *bullet
-        speed: 9.0
-        piercing: 3
-      bullets: 2
+bonuses:
+  - {type: clock, duration: 10}
+  - {type: grenade}
+  - {type: helmet, duration: 20}
+  - {type: life}
+  - {type: shovel, duration: 10}
+  - {type: star}

src/client/resources/dota/levels/level000.txt

@@ -1 +1,2 @@
-000044000000000000000000005500004400550000004400000000000000000000550000440055000000440000004400003333000055000044005555000044000000440000333300005500004400555500004422442244000000000000550000440000000000442244224400000000000055000044000000000000000000444444555544444400442200330000000000000044444455554444440044220033005555333333554422220000222244000022003300555533333355442222000022224400002200330000000000000044220000000022440000440033000000000000004422000000002244000044003300000000000000550000555500005500002200000000000000000055000055550000550000220000004444444400005500445555440055000044444444444444440000550044555544005500004444444400000022000055000055550000550000000000000000002200005500005555000055000000000000003300440000442200000000224400000000000000330044000044220000000022440000000000000033002200004422220000222244553333335555003300220000442222000022224455333333555500330022440044444455554444440000000000000033002244004444445555444444000000000000000000440000550000000000004422442244000000000044000055000000000000442244224400005555004400005500003333000044000000440000555500440000550000333300004400000044000000550044000055000000000000000000004400000055004400005500000000000000000000440000
+points: [{index: -1, team: radiant, x: 0, direction: right, type: eagle, y: 28}, {index: 0, team: radiant, x: 0, direction: right, type: tank, y: 0}, {index: 1, team: radiant, x: 6, direction: right, type: tank, y: 10}, {index: 2, team: radiant, x: 6, direction: right, type: tank, y: 16}, {index: 3, team: radiant, x: 6, direction: right, type: tank, y: 22}, {index: 4, team: radiant, x: 10, direction: right, type: tank, y: 28}, {index: -1, team: dire, x: 38, direction: right, type: eagle, y: 0}, {index: 0, team: dire, x: 38, direction: left, type: tank, y: 28}, {index: 1, team: dire, x: 32, direction: left, type: tank, y: 18}, {index: 2, team: dire, x: 32, direction: left, type: tank, y: 12}, {index: 3, team: dire, x: 32, direction: left, type: tank, y: 6}, {index: 4, team: dire, x: 28, direction: left, type: tank, y: 0}]
+data: "000044000000000000000000005500004400550000004400000000000000000000550000440055000000440000004400003333000055000044005555000044000000440000333300005500004400555500004422442244000000000000550000440000000000442244224400000000000055000044000000000000000000444444555544444400442200330000000000000044444455554444440044220033005555333333554422220000222244000022003300555533333355442222000022224400002200330000000000000044220000000022440000440033000000000000004422000000002244000044003300000000000000550000555500005500002200000000000000000055000055550000550000220000004444444400005500445555440055000044444444444444440000550044555544005500004444444400000022000055000055550000550000000000000000002200005500005555000055000000000000003300440000442200000000224400000000000000330044000044220000000022440000000000000033002200004422220000222244553333335555003300220000442222000022224455333333555500330022440044444455554444440000000000000033002244004444445555444444000000000000000000440000550000000000004422442244000000000044000055000000000000442244224400005555004400005500003333000044000000440000555500440000550000333300004400000044000000550044000055000000000000000000004400000055004400005500000000000000000000440000"

src/client/resources/dota/levels/level003.txt

@@ -0,0 +1,2 @@
+points: [{index: -1, direction: right, team: radiant, x: 24, type: eagle, y: 26}, {index: 0, direction: right, team: radiant, x: 14, type: tank, y: 26}, {index: 1, direction: right, team: radiant, x: 20, type: tank, y: 20}, {index: 2, direction: right, team: radiant, x: 26, type: tank, y: 20}, {index: 3, direction: right, team: radiant, x: 34, type: tank, y: 24}, {index: 4, direction: right, team: radiant, x: 38, type: tank, y: 22}, {index: -1, direction: right, team: dire, x: 22, type: eagle, y: 2}, {index: 0, direction: left, team: dire, x: 8, type: tank, y: 2}, {index: 1, direction: left, team: dire, x: 12, type: tank, y: 6}, {index: 2, direction: left, team: dire, x: 20, type: tank, y: 6}, {index: 3, direction: left, team: dire, x: 21, type: tank, y: 10}, {index: 4, direction: left, team: dire, x: 28, type: tank, y: 4}]
+data: "444444444400000000440000004444000000000044444444440000000044000000444400000000004444440000004444004400000044440033444400444444000000444400440000004444003344440000000000440000440044000000000000000000000000000044000044004400000000000000000000003344004400000000000044004444440000444400334400440000000000004400444444000044440000000000004400444444440033440000005544000000000000440044444444003344000000554444004433440044444400000000004400440000004400443344004444440000000000440044000000440000000000004444004444440044004444440044000000000000444400444444004400444444000000440055440044440044440000000055444400000044005544004444004444000000005544440000444400444400000000000000443300000000000044440044440000000000000044330000000000000044004444003300444444004444004433004400004400444400330044444400444400443300444400000000000033000000000000000044000000440000000000003300000000000000004400000044440044004444444400444444440000440044004444004400444444440044444444000044004400000000000000440000000000000000000000440000000000000044000000000000000000000044004455003344000000440044000000440033444400445500334400000044004400000044003344440044440000000044000000440000004400000000004444000000004400000044000000440000000000"

src/client/resources/dota/levels/level004.txt

@@ -0,0 +1,2 @@
+points: [{index: -1, direction: right, team: radiant, x: 12, type: eagle, y: 2}, {index: 0, direction: right, team: radiant, x: 6, type: tank, y: 6}, {index: 1, direction: right, team: radiant, x: 10, type: tank, y: 10}, {index: 2, direction: right, team: radiant, x: 14, type: tank, y: 10}, {index: 3, direction: right, team: radiant, x: 18, type: tank, y: 6}, {index: 4, direction: right, team: radiant, x: 20, type: tank, y: 2}, {index: -1, direction: right, team: dire, x: 22, type: eagle, y: 26}, {index: 0, direction: left, team: dire, x: 12, type: tank, y: 26}, {index: 1, direction: left, team: dire, x: 18, type: tank, y: 22}, {index: 2, direction: left, team: dire, x: 24, type: tank, y: 22}, {index: 3, direction: left, team: dire, x: 28, type: tank, y: 18}, {index: 4, direction: left, team: dire, x: 30, type: tank, y: 10}]
+data: "000000000033333300000000000000000000000000000000003333330000000000000000000000000000004400330033004400000000003300000044000000440033003300440000000000330000004400000000003333330000000044440000000000000000000000333333000000004444000000000000000000000000000000003300000000004444000000000000000000000000330000000000444400000044000000004400000000004400000044000000004400000000440000000000440000004400000000000033000000000000004444000000000000000000003300000000000000444400000000000000000000000000330000440000000033000000000000000000000033000044000000003300000000000000000000000000444400004400000000000000000000000000000044440000440000000000000000000000334444004444000000000044000000000000000033444400444400000000004400000000004400000044000000000000330000440000000000440000004400000000000033000044000000000000440000000000330000440000000000000033000044000000000033000044000000000000003300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044000000003333330000000033000000000000004400000000333333000000003300000000000000000000440033003300440000000000000000000000000044003300330044000000000000000000000000000000333333000000000000000000000000000000000033333300000000000000"

src/client/resources/dota/levels/level005.txt

@@ -0,0 +1,2 @@
+points: [{index: -1, direction: right, team: radiant, x: 19, type: eagle, y: 28}, {index: 0, direction: right, team: radiant, x: 0, type: tank, y: 28}, {index: 1, direction: right, team: radiant, x: 10, type: tank, y: 22}, {index: 2, direction: right, team: radiant, x: 19, type: tank, y: 18}, {index: 3, direction: right, team: radiant, x: 28, type: tank, y: 22}, {index: 4, direction: right, team: radiant, x: 38, type: tank, y: 28}, {index: -1, direction: right, team: dire, x: 19, type: eagle, y: 0}, {index: 0, direction: left, team: dire, x: 0, type: tank, y: 0}, {index: 1, direction: left, team: dire, x: 10, type: tank, y: 6}, {index: 2, direction: left, team: dire, x: 19, type: tank, y: 10}, {index: 3, direction: left, team: dire, x: 28, type: tank, y: 6}, {index: 4, direction: left, team: dire, x: 38, type: tank, y: 0}]
+data: "000000000000440000000000004400000000000000000000000044000000000000440000000000004400000000000000000440000000000000000044440000000000000000044000000000000000004400000000005555555555555555555500000000000000000000555555555555555555550000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000055000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004400000000000000000000440000000000000000440000000000000000000044000000005555555544333333333553333333334455555555555555554433333333355333333333445555555500000000440000000000000000000044000000000000000044000000000000000000004400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000550000000000000000000000000000000000000055000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055555555555555555555000000000000000000005555555555555555555500000000004400000000000000000440000000000000000044440000000000000000044000000000000000004400000000000044000000000000440000000000000000000000004400000000000044000000000000"

src/client/resources/dota/levels/level006.txt

@@ -0,0 +1,2 @@
+points: [{index: -1, direction: right, team: radiant, x: 19, type: eagle, y: 28}, {index: 0, direction: right, team: radiant, x: 2, type: tank, y: 22}, {index: 1, direction: right, team: radiant, x: 9, type: tank, y: 20}, {index: 2, direction: right, team: radiant, x: 19, type: tank, y: 24}, {index: 3, direction: right, team: radiant, x: 29, type: tank, y: 20}, {index: 4, direction: right, team: radiant, x: 36, type: tank, y: 22}, {index: -1, direction: right, team: dire, x: 19, type: eagle, y: 0}, {index: 0, direction: left, team: dire, x: 2, type: tank, y: 6}, {index: 1, direction: left, team: dire, x: 9, type: tank, y: 8}, {index: 2, direction: left, team: dire, x: 19, type: tank, y: 4}, {index: 3, direction: left, team: dire, x: 29, type: tank, y: 8}, {index: 4, direction: left, team: dire, x: 36, type: tank, y: 6}]
+data: "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005555555544444455555555000000000000000000555555554444445555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005500000000000000550000000000000000000000550000000000000055000000000000000000000055000000000000005500000000000000000000005500000000000000550000000000000000000000000044000000440000000000000000000000000000004400000044000000000000000333333333333333445500004433333333333333333333333333333344550000443333333333333333333333333333334400440044333333333333333333333333333333440044004433333333333333333333333333333344000055443333333333333333333333333333334400005544333333333333333000000000000000440000004400000000000000000000000000000044000000440000000000000000000000000055000000000000005500000000000000000000005500000000000000550000000000000000000000550000000000000055000000000000000000000055000000000000005500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005555555544444455555555000000000000000000555555554444445555555500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"

src/client/resources/dota/levels/level007.txt

@@ -0,0 +1,2 @@
+data: "444455555555555555555555555555555555444444445555555555555555555555555555555544440044004444444400444444440044444444004400004400444444440044444444004444444400440000220000000000000000000000000000000022000022000000000000000000000000000000002200004400444444442244444444224444444400440000440044444444224444444422444444440044000011000033550000000000000000553300001100001100003355000000000000000055330000110000110000444444004444444400444444440011000011000044444400444444440044444444001100004400000000000055333355000000000000440000440000000000005533335500000000000044000000442244444400443333440044444422440000000044224444440044333344004444442244000000440000000000005533335500000000000044000044000000000000553333550000000000004400001100444444440044444444004444444400110000110044444444004444444400444444440011000011000033550000000000000000553300001100001100003355000000000000000055330000110000440044444444224444444422444444440044000044004444444422444444442244444444004400002200000000000000000000000000000000220000220000000000000000000000000000000022000044004444444400444444440044444440004400004400444444440044444444004444444000440044445555555555555555555555555555555544444444555555555555555555555555555555554444"
+points: [{team: radiant, direction: right, x: 2, type: eagle, y: 14, index: -1}, {team: radiant, direction: right, x: 14, type: tank, y: 2, index: 0}, {team: radiant, direction: right, x: 6, type: tank, y: 8, index: 1}, {team: radiant, direction: right, x: 14, type: tank, y: 14, index: 2}, {team: radiant, direction: right, x: 6, type: tank, y: 20, index: 3}, {team: radiant, direction: right, x: 14, type: tank, y: 26, index: 4}, {team: dire, direction: right, x: 36, type: eagle, y: 14, index: -1}, {team: dire, direction: left, x: 24, type: tank, y: 2, index: 0}, {team: dire, direction: left, x: 32, type: tank, y: 8, index: 1}, {team: dire, direction: left, x: 24, type: tank, y: 14, index: 2}, {team: dire, direction: left, x: 32, type: tank, y: 20, index: 3}, {team: dire, direction: left, x: 24, type: tank, y: 26, index: 4}]