[proto] add game event proto messages

CHANGELOG.md

@@ -1,29 +0,0 @@
-0.15.0
-------
-* Added display tank player name in `Render`
-* Fixed join game after relogin
-* Updated `CreateGamePopup` for any screen sizes
-* Fixed tank destroy zero score label
-* Added custom size map support
-* Fixed clock bonus for spawned tanks
-
-0.14.0
-------
-* Added `CreateGamePopup`
-* Fixed null tank color
-* Updated `Ticker`
-
-0.13.0
-------
-* Added `Ticker`
-* Fixed `PacketQueue` stream reading
-* Added `PlayerControl` and `ControlPreset`
-* Added `BaseControlFactory`
-
-0.12.0
-------
-* Added `GameRoomFrame`
-* Improved websocket connection with using binary protocol instead of text
-* Added `GameListFrame`
-* Added `DesktopConnection` for linux client build
-* Updated `SoundManager`

WORK.md

@@ -1,12 +1,73 @@
-* **shovel** bonus with armor bricks
+* build
-* bonuses in dota/death mod
+  * gulp 100%
-* tanks and bullets speed balancing
+  * linux 100%
-* result frame update (next game select, only human player info)
+  * deb-package 100%
-* network game series
+  * windows 0%
-* map packs (create in editor, import in game, save imported in local storage)
+  * exe-package 0% (inno setup)
-* update bots
+  
-* improve bonuses system
+* deploy
-* gamepad support
+  * capistrano 100%
-* screen gamepad on mobiles
+
-* resize render on mobiles
+* ui
-* [bug] game progress broken
+  * auth frame 0%
+  * select game frame 100% (classic 1/2 player, dota singe/coop/vs)
+  * select level frame 10%
+  * game frame 50%
+
+* engine
+  * config 100%
+  * map 100%
+  * tanks 100%
+  * bullets 100%
+  * boxes 100%
+  * map changes 100%
+  * bonuses 100%
+  * eagle 100%
+  
+* game
+  * classic
+    * state 50%
+    * bot 50%
+    * human 100%
+  * dota
+    * state 50%
+    * bot 10%
+    * 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%
+  
+* render
+  * map 100%
+  * tanks 100%
+  * bullet 100%
+  * calc redraw 50%
+  * animations
+    * tank spawn 0%
+    * tank move 100%
+    * map water 100%
+    * bullet boom 90%
+    * tank boom 90%
+  * bonuses 100%
+  * html5 50%
+  
+* proto
+  ...
+  
+* editor
+  * level
+    * open 100%
+    * edit 50%
+    * save 100%
+  * tank
+    * color 10%  

gulpfile.js

@@ -1,6 +1,4 @@
 const gulp = require('gulp');
-const zip = require('gulp-zip');
-const foreach = require('gulp-foreach');
 const gulpClean = require('gulp-clean');
 const Config = require('./config.json');
 const packageInfo = require('./package.json');
@@ -27,19 +25,6 @@ exports.generate = function generate()  {
     });
 };
 
-exports.levels = function () {
-    return gulp.src("./src/common/level/*").pipe(foreach(function (stream, file) {
-        const type = file.path.substr(file.path.lastIndexOf("/") + 1);
-        gulp.src("./src/common/level/" + type + "/*").pipe(foreach(function (stream, file) {
-            const name = file.path.substr(file.path.lastIndexOf("/") + 1);
-            gulp.src("./src/common/level/" + type + "/" + name + "/*")
-                .pipe(zip(`${type}_${name}.zip`))
-                .pipe(gulp.dest("./target/levels"));
-        }));
-        return stream;
-    }));
-};
-
 /**
  * ToDo:
  * windows target
@@ -61,8 +46,7 @@ const config = new Project.Config({
         'src-gen/haxe',
     ],
     assets: [
-        'src/common/resources',
+        'src/common/resources'
-        'target/levels'
     ],
     flags: [
         //'proto_debug',
@@ -160,7 +144,6 @@ const server = new Project(
  */
 module.exports.default = gulp.series(
     exports.clean,
-    exports.levels,
     module.exports['client:flash:build'],
     module.exports['client:flash:html'],
     module.exports['client:html5:build'],

package.json

@@ -1,15 +1,13 @@
 {
     "name": "tankz",
-    "version": "0.15.0",
+    "version": "0.14.2",
     "private": true,
     "devDependencies": {
         "dateformat": "^3.0.3",
         "gulp": "^4.0.0",
         "gulp-add": "0.0.2",
         "gulp-clean": "^0.4.0",
-        "gulp-foreach": "^0.1.0",
         "gulp-haxetool": "^0.0.19",
-        "gulp-zip": "^5.0.0",
         "yargs": "^13.2.4"
     },
     "haxeDependencies": {

src/client/haxe/ru/m/control/ControlBus.hx

@@ -1,43 +0,0 @@
-package ru.m.control;
-
-import haxework.signal.Signal;
-import ru.m.control.IControlBus;
-
-class ControlBus implements IControlBus {
-
-    private static inline var TAG = "control";
-
-    public var devices(default, null):Array<IControlDevice>;
-
-    public var signal(default, null):Signal3<DeviceType, DeviceAction, Bool>;
-    public var devicesSignal(default, null):Signal<Array<IControlDevice>>;
-
-    private var connections:Map<DeviceType, DeviceAction->Bool->Void>;
-
-    public function new() {
-        devices = [];
-        signal = new Signal3();
-        devicesSignal = new Signal();
-        connections = new Map();
-    }
-
-    public function connect(device:IControlDevice):Void {
-        var connector = function(action:DeviceAction, on:Bool):Void {
-            //L.d("TAG", '${device.type}, ${action}, ${on}');
-            signal.emit(device.type, action, on);
-        }
-        connections.set(device.type, connector);
-        device.signal.connect(connector);
-        devices.push(device);
-        devicesSignal.emit(devices);
-    }
-
-    public function disconnect(device:IControlDevice):Void {
-        if (connections.exists(device.type)) {
-            device.signal.disconnect(connections.get(device.type));
-            connections.remove(device.type);
-            devices.remove(device);
-            devicesSignal.emit(devices);
-        }
-    }
-}

src/client/haxe/ru/m/control/DeviceAction.hx

@@ -1,8 +0,0 @@
-package ru.m.control;
-
-import ru.m.geom.Direction;
-
-enum DeviceAction {
-    DIRECTION(direction:Direction);
-    KEY(code:Int);
-}

src/client/haxe/ru/m/control/DeviceType.hx

@@ -1,7 +0,0 @@
-package ru.m.control;
-
-enum DeviceType {
-    NONE;
-    KEYBOARD;
-    GAMEPAD(id:Int);
-}

src/client/haxe/ru/m/control/IControlBus.hx

@@ -1,13 +0,0 @@
-package ru.m.control;
-
-import haxework.signal.Signal;
-
-interface IControlBus {
-    public var devices(default, null):Array<IControlDevice>;
-
-    public var signal(default, null):Signal3<DeviceType, DeviceAction, Bool>;
-    public var devicesSignal(default, null):Signal<Array<IControlDevice>>;
-
-    public function connect(device:IControlDevice):Void;
-    public function disconnect(device:IControlDevice):Void;
-}

src/client/haxe/ru/m/control/IControlDevice.hx

@@ -1,10 +0,0 @@
-package ru.m.control;
-
-import haxework.signal.Signal;
-
-interface IControlDevice {
-    public var type(default, null):DeviceType;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
-
-    public function dispose():Void;
-}

src/client/haxe/ru/m/control/JoystickDevice.hx

@@ -1,62 +0,0 @@
-package ru.m.control;
-
-import haxework.signal.Signal;
-import lime.ui.Joystick;
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
-import ru.m.geom.Direction;
-
-class JoystickDevice implements IControlDevice {
-
-    public var type(default, null):DeviceType;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
-
-    private var joystick:Joystick;
-    private var axisState:Map<Int, Direction>;
-
-    public function new(joystick:Joystick) {
-        this.joystick = joystick;
-        type = GAMEPAD(joystick.id);
-        signal = new Signal2();
-        axisState = new Map();
-        joystick.onButtonDown.add(onButtonDown);
-        joystick.onButtonUp.add(onButtonUp);
-        joystick.onAxisMove.add(onAxisMove);
-    }
-
-    private function onButtonDown(code:Int):Void {
-        signal.emit(KEY(code), true);
-    }
-
-    private function onButtonUp(code:Int):Void {
-        signal.emit(KEY(code), false);
-    }
-
-    private function onAxisMove(axis:Int, position:Float):Void {
-        var direction:Direction = switch [axis, position] {
-            case [0, 1]: Direction.RIGHT;
-            case [0, -1]: Direction.LEFT;
-            case [1, 1]: Direction.BOTTOM;
-            case [1, -1]: Direction.TOP;
-            case _: null;
-        }
-        if (direction != null) {
-            axisState.set(axis, direction);
-            signal.emit(DIRECTION(direction), true);
-        } else if (position == 0) {
-            if (axisState.exists(axis)) {
-                signal.emit(DIRECTION(axisState.get(axis)), false);
-                axisState.remove(axis);
-            }
-        }
-    }
-
-    public function dispose():Void {
-        if (joystick != null) {
-            joystick.onButtonDown.remove(onButtonDown);
-            joystick.onButtonUp.remove(onButtonUp);
-            joystick.onAxisMove.remove(onAxisMove);
-            joystick = null;
-        }
-    }
-}

src/client/haxe/ru/m/control/KeyboardDevice.hx

@@ -1,38 +0,0 @@
-package ru.m.control;
-
-import flash.display.Stage;
-import flash.events.KeyboardEvent;
-import haxework.signal.Signal;
-import ru.m.control.DeviceAction;
-
-class KeyboardDevice implements IControlDevice {
-
-    public var type(default, null):DeviceType;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
-
-    private var stage:Stage;
-
-    public function new(stage:Stage) {
-        this.stage = stage;
-        type = DeviceType.KEYBOARD;
-        signal = new Signal2();
-        stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-        stage.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
-    }
-
-    private function onKeyDown(event:KeyboardEvent):Void {
-        signal.emit(KEY(event.keyCode), true);
-    }
-
-    private function onKeyUp(event:KeyboardEvent):Void {
-        signal.emit(KEY(event.keyCode), false);
-    }
-
-    public function dispose():Void {
-        if (stage != null) {
-            stage.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-            stage.removeEventListener(KeyboardEvent.KEY_UP, onKeyUp);
-            stage = null;
-        }
-    }
-}

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

@@ -1,18 +1,11 @@
 package ru.m.tankz;
 
-import flash.Lib;
 import haxework.animate.FadeAnimate;
 import haxework.animate.UnFadeAnimate;
 import haxework.resources.IResources;
 import haxework.resources.Resources;
 import haxework.view.popup.PopupManager;
-import lime.ui.Gamepad;
-import lime.ui.Joystick;
 import ru.m.connect.IConnection;
-import ru.m.control.ControlBus;
-import ru.m.control.IControlBus;
-import ru.m.control.JoystickDevice;
-import ru.m.control.KeyboardDevice;
 import ru.m.tankz.bundle.ConfigBundle;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
@@ -39,7 +32,6 @@ class Init {
     @:provide static var networkManager:NetworkManager;
     @:provide static var popupManager:PopupManager;
     @:provide static var connection:IConnection<Request, Response>;
-    @:provide static var bus:IControlBus;
 
     private static function buildConnection():IConnection<Request, Response> {
         var host:String = CompilationOption.get("host");
@@ -70,22 +62,5 @@ class Init {
 
         connection = buildConnection();
         networkManager = new NetworkManager();
-
-        bus = new ControlBus();
-        bus.connect(new KeyboardDevice(Lib.current.stage));
-
-        for (device in Gamepad.devices) {
-            trace('gamepad', device);
-        }
-        Gamepad.onConnect.add(function(device) {
-            trace('connect gamepad', device);
-        });
-
-        for (device in Joystick.devices) {
-            bus.connect(new JoystickDevice(device));
-        }
-        Joystick.onConnect.add(function(device) {
-            bus.connect(new JoystickDevice(device));
-        });
     }
 }

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

@@ -37,7 +37,7 @@ class Style {
 
     public static function registerButton(name:String, resource:String):Void {
         resources.skin.put('button.$name', [
-            Skin.size(42, 42),
+            Skin.size(64, 64),
             new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor),
         ]);
         resources.skin.put('button.$name.small', [
@@ -137,7 +137,7 @@ class Style {
             Skin.color(darkColor),
         ]);
         resources.skin.put("panel", [
-            Skin.geometry(new Geometry().setSize("100%", -1).setPadding([10, 5])),
+            Skin.geometry(new Geometry().setSize("100%", -1).setPadding([20, 10])),
             Skin.layout(new Layout().setAlign(NONE, MIDDLE)),
             Skin.color(lightColor),
         ]);

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

@@ -15,7 +15,7 @@ class ConfigBundle implements IConfigBundle {
 
     public function get(type:GameType):Config {
         if (!_cache.exists(type)) {
-            var source:ConfigSource = Yaml.parse(Assets.getText('resources/config/${type}.yaml'), Parser.options().useObjects());
+            var source:ConfigSource = Yaml.parse(Assets.getText('resources/${type}/config.yaml'), Parser.options().useObjects());
             _cache.set(type, Config.fromSource(type, source));
         }
         return _cache.get(type);

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

@@ -7,13 +7,17 @@ import ru.m.tankz.util.LevelUtil;
 
 class LevelBundle implements ILevelBundle {
 
+    private var cache:Map<String, LevelConfig> = new Map();
+
     public function new() {}
 
-    public function get(id:PackId):LevelPack {
+    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig {
-        var bytes = Assets.getBytes('levels/${id}.zip');
+        var key = '${type}:${levelId}';
-        return {
+        if (!cache.exists(key)) {
-            id: id,
+            var data:String = Assets.getText('resources/${type}/levels/level${LevelUtil.formatLevel(levelId)}.txt');
-            data: LevelUtil.unpack(bytes),
+            cache[key] = LevelUtil.loads(config, data);
-        };
+            cache[key].id = levelId;
+        }
+        return cache[key];
     }
 }

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

@@ -0,0 +1,27 @@
+package ru.m.tankz.control;
+
+import ru.m.tankz.control.Control.TankAction;
+
+typedef ActionItem = {
+    public var action:TankAction;
+    public var key:Int;
+}
+
+typedef KeyBinding = Map<Int, TankAction>;
+
+class ActionConfig {
+
+    public var data(default, null):Array<ActionItem>;
+
+    public function new(data:Array<ActionItem>) {
+        this.data = data;
+    }
+
+    public function asKeyBinding():KeyBinding {
+        var result = new KeyBinding();
+        for (item in data) {
+            result[item.key] = item.action;
+        }
+        return result;
+    }
+}

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

@@ -1,12 +0,0 @@
-package ru.m.tankz.control;
-
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
-import ru.m.tankz.control.Control;
-
-typedef BindAction = {
-    var device:DeviceType;
-    var action:DeviceAction;
-}
-
-typedef Binding = Map<TankAction, BindAction>;

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

@@ -1,85 +1,69 @@
 package ru.m.tankz.control;
 
 import flash.events.FocusEvent;
+import flash.events.KeyboardEvent;
+import flash.Lib;
 import haxe.Timer;
-import ru.m.control.DeviceAction;
+import ru.m.tankz.control.ActionConfig;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlBus;
-import ru.m.geom.Direction;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.storage.SettingsStorage;
 import ru.m.tankz.Type;
 
 class HumanControl extends Control {
 
-    @:provide static var storage:SettingsStorage;
+    @:provide var storage:SettingsStorage;
-    @:provide static var bus:IControlBus;
 
-    private var binding:Map<DeviceType, Map<DeviceAction, TankAction>>;
+    private var keyBinding:KeyBinding;
-
+    private var moveQueue:Array<Int>;
-    private var moveQueue:Array<Direction>;
     private var shotTimer:Timer;
 
     public function new(playerId:PlayerId, controlIndex:Int) {
         super(playerId);
-        var config = storage.getBinding(controlIndex);
+        this.keyBinding = storage.getActionConfig(controlIndex).asKeyBinding();
-        binding = new Map();
-        for (action in config.keys()) {
-            var bind = config.get(action);
-            if (!binding.exists(bind.device)) {
-                binding.set(bind.device, new Map());
-            }
-            binding.get(bind.device).set(bind.action, action);
-        }
         moveQueue = [];
     }
 
-    private function onDeviceAction(device:DeviceType, action:DeviceAction, on:Bool):Void {
-        if (binding.exists(device) && binding[device].exists(action)) {
-            toggleAction(binding[device][action], on);
-        }
-    }
-
     override public function start():Void {
         super.start();
-        bus.signal.connect(onDeviceAction);
+        Lib.current.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
+        Lib.current.stage.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
     }
 
     override public function stop():Void {
         super.stop();
-        bus.signal.disconnect(onDeviceAction);
+        Lib.current.stage.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
+        Lib.current.stage.removeEventListener(KeyboardEvent.KEY_UP, onKeyUp);
         moveQueue = [];
-        if (shotTimer != null) {
+    }
-            shotTimer.stop();
+
-            shotTimer = null;
+    private function onKeyDown(event:KeyboardEvent):Void {
+        if (keyBinding.exists(event.keyCode)) switch (keyBinding.get(event.keyCode)) {
+            case TankAction.MOVE(direction):
+                if (moveQueue.indexOf(event.keyCode) == -1) {
+                    moveQueue.unshift(event.keyCode);
+                    updateMove();
+                }
+            case TankAction.SHOT:
+                if (shotTimer == null) {
+                    shotTimer = new Timer(300);
+                    shotTimer.run = shot;
+                    shot();
+                }
+            case _:
         }
     }
 
-    public function toggleAction(action:TankAction, on:Bool):Void {
+    private function onKeyUp(event:KeyboardEvent):Void {
-        switch action {
+        if (keyBinding.exists(event.keyCode)) switch (keyBinding.get(event.keyCode)) {
             case TankAction.MOVE(direction):
-                if (on) {
+                moveQueue.remove(event.keyCode);
-                    if (moveQueue.indexOf(direction) == -1) {
-                        moveQueue.unshift(direction);
-                    }
-                } else {
-                    moveQueue.remove(direction);
-                }
                 updateMove();
             case TankAction.SHOT:
-                if (on) {
+                if (shotTimer != null) {
-                    if (shotTimer == null) {
+                    shotTimer.stop();
-                        shotTimer = new Timer(300);
+                    shotTimer = null;
-                        shotTimer.run = shot;
-                        shot();
-                    }
-                } else {
-                    if (shotTimer != null) {
-                        shotTimer.stop();
-                        shotTimer = null;
-                    }
                 }
-            case TankAction.STOP:
+            case _:
         }
     }
 
@@ -90,13 +74,17 @@ class HumanControl extends Control {
 
     private function updateMove():Void {
         if (moveQueue.length == 0) {
-            action(STOP);
+            action(TankAction.STOP);
         } else {
-            action(MOVE(moveQueue[0]));
+            switch (keyBinding.get(moveQueue[0])) {
+                case TankAction.MOVE(direction):
+                    action(TankAction.MOVE(direction));
+                case _:
+            }
         }
     }
 
     private function shot():Void {
-        action(SHOT);
+        action(TankAction.SHOT);
     }
 }

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

@@ -1,19 +1,18 @@
 package ru.m.tankz.local;
 
-import ru.m.tankz.config.Config;
+import ru.m.tankz.local.LocalControlFactory;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameRunner;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.game.record.GameRecorder;
-import ru.m.tankz.local.LocalControlFactory;
 import ru.m.tankz.storage.RecordStorage;
 
 class LocalGame extends GameRunner {
     @:provide var recordStorage:RecordStorage;
     private var recorder:GameRecorder;
 
-    public function new(state:GameState, level:LevelConfig) {
+    public function new(state:GameState) {
-        super(state, level);
+        super(state);
         controlFactory = new LocalControlFactory();
         recorder = new GameRecorder();
         connect(recorder);

src/client/haxe/ru/m/tankz/network/NetworkGame.hx

@@ -14,7 +14,7 @@ class NetworkGame extends Game {
     private var network:NetworkManager;
 
     public function new(network:NetworkManager) {
-        super(new GameState(network.room.game.type, 0), null);
+        super(new GameState(network.room.game.type, 0, network.room.game.level));
         this.network = network;
         this.controlFactory = new NetworkControlFactory();
         network.gameEventSignal.connect(onGameEventProto);

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

@@ -6,7 +6,6 @@ import ru.m.tankz.game.IGame;
 
 interface IRender extends IView<Dynamic> extends GameListener {
     public var config(default, set):Config;
-    public var gridSize(default, set):GridSize;
     public function draw():Void;
     public function reset():Void;
 }

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

@@ -26,10 +26,6 @@ using ru.m.display.DisplayObjectContainerExtender;
 class Render extends SpriteView implements IRender {
 
     public var config(default, set):Config;
-    public var gridSize(default, set):GridSize;
-
-    private var mapWidth(get, null):Float;
-    private var mapHeight(get, null):Float;
 
     private var backgroundLayer:Sprite;
     private var groundLayer:Sprite;
@@ -55,33 +51,18 @@ class Render extends SpriteView implements IRender {
         reset();
     }
 
-    private function get_mapWidth():Float {
-        return config.map.cell.width * (gridSize != null ? gridSize.width : config.map.grid.width);
-    }
-
-    private function get_mapHeight():Float {
-        return config.map.cell.height * (gridSize != null ? gridSize.height : config.map.grid.height);
-    }
-
     private function set_config(value:Config):Config {
         config = value;
-        setContentSize(mapWidth, mapHeight, "render");
+        setContentSize(config.mapWidth, config.mapHeight);
         drawBackground();
         return config;
     }
 
-    private function set_gridSize(value:GridSize):GridSize {
-        gridSize = value;
-        setContentSize(mapWidth, mapHeight, "render");
-        drawBackground();
-        return gridSize;
-    }
-
     private function drawBackground():Void {
         var g:Graphics = backgroundLayer.graphics;
         g.clear();
         g.beginFill(0x000000);
-        g.drawRect(0, 0, mapWidth, mapHeight);
+        g.drawRect(0, 0, config.mapWidth, config.mapHeight);
         g.endFill();
     }
 
@@ -96,9 +77,7 @@ class Render extends SpriteView implements IRender {
     }
 
     private function clearLayer(layer:DisplayObjectContainer) {
-        while (layer.numChildren > 0) {
+        while (layer.numChildren > 0) layer.removeChildAt(0);
-            layer.removeChildAt(0);
-        }
     }
 
     public function reset():Void {
@@ -115,8 +94,7 @@ class Render extends SpriteView implements IRender {
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(_, level):
+            case START(_):
-                gridSize = level.size;
                 content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
             case COMPLETE(_, _):
                 content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
@@ -207,7 +185,7 @@ class Render extends SpriteView implements IRender {
                     var item = items[id];
                     entryLayer.removeChild(item.view);
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    if (shot.score != null) {
+                    if (shot.score != 0) {
                         showScore(item.rect.center, shot.score);
                     }
                     items.remove(id);
@@ -226,7 +204,7 @@ class Render extends SpriteView implements IRender {
                 if (items.exists(id)) {
                     var item = items[id];
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    if (shot.score != null) {
+                    if (shot.score != 0) {
                         showScore(item.rect.center, shot.score);
                     }
                     cast(item, EagleRenderItem).death = true;
@@ -235,7 +213,7 @@ class Render extends SpriteView implements IRender {
                 if (items.exists(id)) {
                     var item = items[id];
                     upperLayer.removeChild(item.view);
-                    if (shot.score != null) {
+                    if (shot.score != 0) {
                         showScore(item.rect.center, shot.score);
                     }
                     items.remove(id);

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

@@ -1,8 +1,8 @@
 package ru.m.tankz.storage;
 
 import haxework.storage.SharedObjectStorage;
-import ru.m.tankz.game.PackProgress;
+import ru.m.tankz.game.GameProgress;
-import ru.m.tankz.Type;
+import ru.m.tankz.Type.GameType;
 
 class GameStorage extends SharedObjectStorage  {
 
@@ -12,11 +12,11 @@ class GameStorage extends SharedObjectStorage  {
         super('game_${VERSION}');
     }
 
-    public function get(id:PackId):PackProgress {
+    public function get(type:GameType):GameProgress {
-        return exists(id) ? read(id) : new PackProgress(id);
+        return exists(type) ? read(type) : new GameProgress(type);
     }
 
-    public function set(progress:PackProgress):Void {
+    public function set(progress:GameProgress):Void {
-        write(progress.id, progress);
+        write(progress.type, progress);
     }
 }

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

@@ -3,64 +3,50 @@ package ru.m.tankz.storage;
 import flash.ui.Keyboard;
 import haxework.storage.SharedObjectStorage;
 import haxework.utils.ObjectUtil;
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
 import ru.m.geom.Direction;
-import ru.m.tankz.control.Binding;
+import ru.m.tankz.control.ActionConfig;
-import ru.m.tankz.control.Control;
+import ru.m.tankz.control.Control.TankAction;
 
 class SettingsStorage extends SharedObjectStorage {
 
-    private static inline var VERSION = 3;
-
     public function new() {
-        super('settings_${VERSION}');
+        super("settings");
     }
 
-    public function getBinding(index:Int):Binding {
+    public function getActionConfig(index:Int):ActionConfig {
-        return exists('action:$index') ? read('action:$index') : getDefaultBinding(index);
+        return exists('action:$index') ? read('action:$index') : getDefaultActionConfig(index);
     }
 
-    public function saveBinding(index:Int, value:Binding) {
+    public function setActionConffig(index:Int, value:ActionConfig) {
         write('action:$index', value);
     }
 
-    public static function getDefaultBinding(index:Int):Binding {
+    public static function getDefaultActionConfig(index:Int):ActionConfig {
-        return ObjectUtil.clone(defaults.exists(index) ? defaults.get(index) : defaults.get(-1));
+        return ObjectUtil.clone(defaults.exists(index) ? defaults.get(index) : empty);
     }
 
-    public static function buildGamepadBinding(id:Int):Binding {
+    private static var defaults:Map<Int, ActionConfig> = [
-        var device = GAMEPAD(id);
+        0 => new ActionConfig([
-        return [
+            {action:TankAction.MOVE(Direction.TOP), key:Keyboard.W},
-            MOVE(Direction.TOP) => {device: device, action: DIRECTION(Direction.TOP)},
+            {action:TankAction.MOVE(Direction.LEFT), key:Keyboard.A},
-            MOVE(Direction.LEFT) => {device: device, action: DIRECTION(Direction.LEFT)},
+            {action:TankAction.MOVE(Direction.BOTTOM), key:Keyboard.S},
-            MOVE(Direction.BOTTOM) => {device: device, action: DIRECTION(Direction.BOTTOM)},
+            {action:TankAction.MOVE(Direction.RIGHT), key:Keyboard.D},
-            MOVE(Direction.RIGHT) => {device: device, action: DIRECTION(Direction.RIGHT)},
+            {action:TankAction.SHOT, key:Keyboard.SPACE},
-            SHOT => {device: device, action: KEY(0)},
+        ]),
-        ];
+        1 => new ActionConfig([
-    }
+            {action:TankAction.MOVE(Direction.TOP), key:Keyboard.UP},
-
+            {action:TankAction.MOVE(Direction.LEFT), key:Keyboard.LEFT},
-    private static var defaults:Map<Int, Binding> = [
+            {action:TankAction.MOVE(Direction.BOTTOM), key:Keyboard.DOWN},
-        -1 => [
+            {action:TankAction.MOVE(Direction.RIGHT), key:Keyboard.RIGHT},
-            MOVE(Direction.TOP) => null,
+            {action:TankAction.SHOT, key:Keyboard.NUMPAD_0},
-            MOVE(Direction.LEFT) => null,
+        ]),
-            MOVE(Direction.BOTTOM) => null,
-            MOVE(Direction.RIGHT) => null,
-            SHOT => null,
-        ],
-        0 => [
-            MOVE(Direction.TOP) => {device: KEYBOARD, action: KEY(Keyboard.W)},
-            MOVE(Direction.LEFT) => {device: KEYBOARD, action: KEY(Keyboard.A)},
-            MOVE(Direction.BOTTOM) => {device: KEYBOARD, action: KEY(Keyboard.S)},
-            MOVE(Direction.RIGHT) => {device: KEYBOARD, action: KEY(Keyboard.D)},
-            SHOT => {device: KEYBOARD, action: KEY(Keyboard.SPACE)},
-        ],
-        1 => [
-            MOVE(Direction.TOP) => {device: KEYBOARD, action: KEY(Keyboard.UP)},
-            MOVE(Direction.LEFT) => {device: KEYBOARD, action: KEY(Keyboard.LEFT)},
-            MOVE(Direction.BOTTOM) => {device: KEYBOARD, action: KEY(Keyboard.DOWN)},
-            MOVE(Direction.RIGHT) => {device: KEYBOARD, action: KEY(Keyboard.RIGHT)},
-            SHOT => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_0)},
-        ],
     ];
+
+    private static var empty:ActionConfig = new ActionConfig([
+        {action:TankAction.MOVE(Direction.TOP), key:-1},
+        {action:TankAction.MOVE(Direction.LEFT), key:-1},
+        {action:TankAction.MOVE(Direction.BOTTOM), key:-1},
+        {action:TankAction.MOVE(Direction.RIGHT), key:-1},
+        {action:TankAction.SHOT, key:-1},
+    ]);
 }

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

@@ -1,9 +1,8 @@
 package ru.m.tankz.view;
 
+import haxe.ds.Option;
 import haxework.view.frame.FrameSwitcher;
 import haxework.view.VGroupView;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlBus;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.game.IGame;
@@ -11,10 +10,8 @@ import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.storage.SettingsStorage;
 import ru.m.tankz.Type;
 import ru.m.tankz.view.game.GameView;
-import ru.m.tankz.view.GamepadView;
 
 @:template class GameFrame extends VGroupView implements GameListener {
     public static inline var ID = "game";
@@ -22,36 +19,18 @@ import ru.m.tankz.view.GamepadView;
     private static inline var TAG = "GameFrame";
 
     @:view("game") private var gameView(default, null):GameView;
-    @:view private var gamepad(default, null):GamepadView;
 
     @:provide var network:NetworkManager;
     @:provide var soundManager:SoundManager;
     @:provide var state:GameState;
     @:provide var record:GameRecord;
+    @:provide("next") var nextState:GameState;
     @:provide var switcher:FrameSwitcher;
-    @:provide static var gameStorage:GameStorage;
+    @:provide var gameStorage:GameStorage;
-    @:provide static var settings:SettingsStorage;
 
     @:provide var game:IGame;
-    @:provide static var bus:IControlBus;
-
-    public function init():Void {
-        bus.connect(gamepad);
-    }
 
     public function onShow():Void {
-        gamepad.visible = false;
-        // ToDo:
-        for (i in 0...1) {
-            for (bind in settings.getBinding(i)) {
-                switch bind.device {
-                    case GAMEPAD(GamepadView.ID):
-                        gamepad.visible = true;
-                        break;
-                    case _:
-                }
-            }
-        }
         gameView.type = game.type;
         soundManager.config = game.config;
         gameView.render.config = game.config;
@@ -74,9 +53,18 @@ import ru.m.tankz.view.GamepadView;
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case COMPLETE(state, winner):
+            case GameEvent.COMPLETE(state, winner):
                 this.state = state;
-                updateProgress(game, winner);
+                nextState = switch next(winner) {
+                    case Some(s):
+                        // ToDo:
+                        var progress = gameStorage.get(game.type);
+                        progress.completeLevel(state.levelId, state.presetId);
+                        gameStorage.set(progress);
+                        s;
+                    case None:
+                        null;
+                }
                 stop();
                 switcher.change(ResultFrame.ID);
             case _:
@@ -84,18 +72,15 @@ import ru.m.tankz.view.GamepadView;
     }
 
     // ToDo:
-    private static function updateProgress(game:IGame, winner:TeamId):Void {
+    private function next(winner:TeamId):Option<GameState> {
-        var complete = true;
         for (rule in game.config.game.complete) {
             if (rule.team != null && rule.team != winner) {
-                complete = false;
+                return Option.None;
             }
         }
-        if (complete) {
+        var level = state.levelId + 1;
-            var progress = gameStorage.get(new PackId(game.state.type));
+        if (level >= game.config.game.levels) level = 0;
-            progress.completeLevel(game.level.id, game.state.presetId);
+        return Option.Some(new GameState(game.type, state.presetId, level, state));
-            gameStorage.set(progress);
-        }
     }
 
     public function onHide():Void {

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

@@ -2,12 +2,6 @@
 views:
   - $type: haxework.view.VGroupView
     skinId: container
-    layout.overflow: true
     views:
       - id: game
         $type: ru.m.tankz.view.game.GameView
-  - id: gamepad
-    $type: ru.m.tankz.view.GamepadView
-    geometry.position: absolute
-    geometry.size.stretch: true
-    visible: false

src/client/haxe/ru/m/tankz/view/GamepadView.hx

@@ -1,159 +0,0 @@
-package ru.m.tankz.view;
-
-import flash.display.Graphics;
-import flash.display.Stage;
-import flash.events.MouseEvent;
-import flash.events.TouchEvent;
-import haxework.signal.Signal;
-import haxework.view.skin.ISkin;
-import haxework.view.SpriteView;
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlDevice;
-import ru.m.geom.Direction;
-import ru.m.geom.Point;
-import ru.m.geom.Rectangle;
-
-typedef ActionArea = {
-    var action:DeviceAction;
-    var rect:Rectangle;
-}
-
-class GamepadSkin implements ISkin<GamepadView> {
-
-    public var color(default, default):Int;
-
-    public function new(color:Int = 0) {
-        this.color = color;
-    }
-
-    public function draw(view:GamepadView):Void {
-        var graphics:Graphics = view.content.graphics;
-        graphics.clear();
-        graphics.beginFill(0, 0.0);
-        graphics.drawRect(0, 0, view.width, view.height);
-        graphics.endFill();
-        graphics.lineStyle(2, color);
-        graphics.beginFill(color, 0.2);
-        for (area in view.areas) {
-            graphics.drawRect(area.rect.x, area.rect.y, area.rect.width, area.rect.height);
-        }
-        graphics.lineStyle();
-    }
-}
-
-class GamepadView extends SpriteView implements IControlDevice {
-    public static var ID(default, never):Int = -128;
-
-    public var type(default, null):DeviceType;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
-
-    public var areas(default, null):Array<ActionArea>;
-    public var currentAreas(default, null):Map<Int, ActionArea>;
-
-    private var stage:Stage;
-
-    public function new() {
-        super();
-        type = GAMEPAD(ID);
-        signal = new Signal2();
-        areas = [];
-        currentAreas = new Map();
-        skin = [new GamepadSkin(0x00ff00)];
-        content.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-        content.addEventListener(TouchEvent.TOUCH_BEGIN, onTouchBegin);
-    }
-
-    private function onMouseDown(event:MouseEvent):Void {
-        onMouseMove(event);
-        stage = content.stage;
-        stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-        stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    }
-
-    private function onMouseMove(event:MouseEvent):Void {
-        var point = new Point(event.localX, event.localY);
-        updateTouch(-1, point);
-    }
-
-    private function onMouseUp(event:MouseEvent):Void {
-        endTouch(-1);
-        stage.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-        stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    }
-
-    private function onTouchBegin(event:TouchEvent):Void {
-        onTouchMove(event);
-        stage = content.stage;
-        stage.addEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
-        stage.addEventListener(TouchEvent.TOUCH_END, onTouchEnd);
-    }
-
-    private function onTouchMove(event:TouchEvent):Void {
-        var point = new Point(event.localX, event.localY);
-        updateTouch(event.touchPointID, point);
-    }
-
-    private function onTouchEnd(event:TouchEvent):Void {
-        endTouch(event.touchPointID);
-        if (Lambda.count(currentAreas) == 0) {
-            stage.removeEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
-            stage.removeEventListener(TouchEvent.TOUCH_END, onTouchEnd);
-        }
-    }
-
-    private function updateTouch(pointID:Int, point:Point):Void {
-        if (currentAreas.exists(pointID)) {
-            var area = currentAreas[pointID];
-            if (!area.rect.contain(point)) {
-                currentAreas.remove(pointID);
-                signal.emit(area.action, false);
-            }
-        }
-        for (area in areas) {
-            if (area.rect.contain(point)) {
-                currentAreas[pointID] = area;
-                signal.emit(area.action, true);
-                break;
-            }
-        }
-    }
-
-    private function endTouch(pointID:Int):Void {
-        if (currentAreas.exists(pointID)) {
-            signal.emit(currentAreas[pointID].action, false);
-            currentAreas.remove(pointID);
-        }
-    }
-
-    override public function update():Void {
-        super.update();
-        areas = [];
-        var size = Math.min(width, height) / 7;
-        var padding = size / 2;
-        areas.push({
-            action: DIRECTION(Direction.TOP),
-            rect: new Rectangle(padding + size, height - size * 3 - padding, size, size)
-        });
-        areas.push({
-            action: DIRECTION(Direction.LEFT),
-            rect: new Rectangle(padding, height - size * 2 - padding, size, size)
-        });
-        areas.push({
-            action: DIRECTION(Direction.BOTTOM),
-            rect: new Rectangle(padding + size, height - size - padding, size, size)
-        });
-        areas.push({
-            action: DIRECTION(Direction.RIGHT),
-            rect: new Rectangle(padding + size * 2, height - size * 2 - padding, size, size)
-        });
-        areas.push({
-            action: KEY(0),
-            rect: new Rectangle(width - size * 1.5 - padding, height - size * 2 - padding, size, size)
-        });
-    }
-
-    public function dispose():Void {
-        stage = null;
-    }
-}

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

@@ -18,7 +18,7 @@ import ru.m.tankz.view.popup.LevelPopup;
     public static inline var ID = "level";
 
     @:view var header:LabelView;
-    @:view var levels:DataView<LevelConfig, ButtonView>;
+    @:view var levels:DataView<LevelId, ButtonView>;
 
     @:provide var state:GameState;
     @:provide var game:IGame;
@@ -26,44 +26,44 @@ import ru.m.tankz.view.popup.LevelPopup;
     @:provide var levelBundle:ILevelBundle;
     @:provide var storage:GameStorage;
 
-    private var pack:LevelPack;
     private var levelPopup:LevelPopup;
 
     public function onShow():Void {
         header.text = state.type;
-        pack = levelBundle.get(new PackId(state.type));
+        levels.data = [for (i in 0...state.config.game.levels) i];
-        levels.data = pack.data;
     }
 
     private function start(level:LevelConfig, preset:GamePreset, control:ControlPreset):Void {
+        state.levelId = level.id;
         state.presetId = preset.id;
         state.controls = control.values;
-        game = new LocalGame(state, level);
+        game = new LocalGame(state);
         switcher.change(GameFrame.ID);
     }
 
-    private function levelViewFactory(index:Int, level:LevelConfig):ButtonView {
+    private function levelViewFactory(index:Int, levelId:LevelId):ButtonView {
-        var progress = storage.get(pack.id);
+        var progress = storage.get(state.type);
         var result = new ButtonView();
         result.skinId = "button.level";
-        var presetsLine = [for (p in state.config.presets) progress.isPresetCompleted(level.id, p.id) ? '*' : '_'].join('');
+        var presetsLine = [for (p in state.config.presets) progress.isPresetCompleted(levelId, p.id) ? '*' : '_'].join('');
-        result.text = '${level.id}\n${presetsLine}';
+        result.text = '${levelId}\n${presetsLine}';
-        result.disabled = !progress.isLevelAvailable(level.id);
+        result.disabled = !progress.isLevelAvailable(levelId);
         return result;
     }
 
-    private function onLevelSelect(index:Int, level:LevelConfig, view:ButtonView):Void {
+    private function onLevelSelect(index:Int, levelId:LevelId, view:ButtonView):Void {
-        if (!storage.get(pack.id).isLevelAvailable(level.id)) {
+        if (!storage.get(state.type).isLevelAvailable(levelId)) {
             return;
         }
         if (levelPopup == null) {
             levelPopup = new LevelPopup();
         }
+        var level = levelBundle.get(state.type, state.config, levelId);
         levelPopup.setData(
             level,
             state.config.presets,
             state.config.controls,
-            storage.get(pack.id)
+            storage.get(state.type)
         );
         levelPopup.show().then(function(result) result != null ? start(level, result.preset, result.control) : {});
     }

src/client/haxe/ru/m/tankz/view/ResultFrame.hx

@@ -1,5 +1,6 @@
 package ru.m.tankz.view;
 
+import haxework.view.ButtonView;
 import haxework.view.DataView;
 import haxework.view.frame.FrameSwitcher;
 import haxework.view.LabelView;
@@ -17,6 +18,7 @@ import ru.m.tankz.view.common.LifeView;
 
     @:provide var frames:FrameSwitcher;
     @:provide var state:GameState;
+    @:provide("next") var nextState:GameState;
     @:provide var game:IGame;
 
     private function playerViewFactory(index:Int, player:PlayerState) {
@@ -33,11 +35,14 @@ import ru.m.tankz.view.common.LifeView;
 
     public function onShow() {
         resultView.data =  Lambda.array(state.players);
-        //levelLabel.text = 'Level ${state.levelId}'; // ToDo: level?
+        levelLabel.text = 'Level ${state.levelId}';
     }
 
     private function next() {
-        //ToDo: next level?
+        if (nextState != null) {
+            game = new GameRunner(nextState);
+            frames.change(GameFrame.ID);
+        }
     }
 
     private function close() {

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

@@ -2,28 +2,14 @@
 views:
   - $type: haxework.view.VGroupView
     skinId: container
-    geometry.padding: 20
     views:
       - $type: haxework.view.LabelView
         skinId: text.header
         text: Settings
-      - $type: haxework.view.ScrollView
+      - $type: haxework.view.HGroupView
-        geometry.size.stretch: true
+        layout.margin: 20
-        scroll:
+        views:
-          $type: haxework.view.list.VScrollBarView
+          - $type: ru.m.tankz.view.settings.SettingsEditor
-          skinId: scroll.vertical
+            controlIndex: 0
-        view:
+          - $type: ru.m.tankz.view.settings.SettingsEditor
-          $type: haxework.view.GroupView
+            controlIndex: 1
-          geometry.size.stretch: true
-          layout:
-            $type: haxework.view.layout.TailLayout
-            vAlign: top
-            margin: 20
-            overflow: true
-          views:
-            - id: settings0
-              $type: ru.m.tankz.view.settings.SettingsEditor
-              controlIndex: 0
-            - id: settings1
-              $type: ru.m.tankz.view.settings.SettingsEditor
-              controlIndex: 1

src/client/haxe/ru/m/tankz/view/game/ClassicGamePanel.hx

@@ -21,6 +21,7 @@ import ru.m.tankz.view.common.LifeView;
     private var player2Id:PlayerId = new PlayerId(ClassicGame.HUMAN, 1);
 
     public function refresh(state:GameState):Void {
+        level.text = 'Level ${state.levelId}';
         bot.life = state.getTeamLife(ClassicGame.BOT);
         player1.life = state.getPlayerLife(player1Id);
         player1.score = state.getPlayerScore(player1Id);
@@ -35,8 +36,7 @@ import ru.m.tankz.view.common.LifeView;
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(state, level):
+            case START(state):
-                this.level.text = 'Level ${level.id}';
                 refresh(state);
             case CHANGE(TEAM_LIFE(teamId, life)):
                 if (teamId == ClassicGame.BOT) {

src/client/haxe/ru/m/tankz/view/game/DeathGamePanel.hx

@@ -16,8 +16,8 @@ import ru.m.tankz.view.common.LifeView;
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(state, level):
+            case START(state):
-                this.level.text = 'Level ${level.id}';
+                level.text = 'Level ${state.levelId}';
                 players.data = Lambda.array(state.players);
             case _:
                 for (view in players.views) {

src/client/haxe/ru/m/tankz/view/game/DotaGamePanel.hx

@@ -17,6 +17,7 @@ import ru.m.tankz.view.common.LifeView;
     @:view var level:LabelView;
 
     public function refresh(state:GameState):Void {
+        level.text = 'Level ${state.levelId}';
         radiant.life = state.getTeamLife(DotaGame.RADIANT);
         radiant.score = state.getTeamScore(DotaGame.RADIANT);
         dire.life = state.getTeamLife(DotaGame.DIRE);
@@ -33,8 +34,7 @@ import ru.m.tankz.view.common.LifeView;
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(state, level):
+            case START(state):
-                this.level.text = 'Level ${level.id}';
                 refresh(state);
             case CHANGE(TEAM_LIFE(teamId, life)):
                 getLifeView(teamId).life = life;

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

@@ -30,7 +30,7 @@ import ru.m.tankz.view.popup.CreateGamePopup;
     private function create():Void {
         CreateGamePopup.instance.show().then(function(result) {
             if (result != null) {
-                network.createGame(result.type, result.level.id);
+                network.createGame(result.type, result.level);
             }
         });
     }

src/client/haxe/ru/m/tankz/view/popup/CreateGamePopup.hx

@@ -4,25 +4,22 @@ import haxework.view.DataView;
 import haxework.view.popup.PopupView;
 import haxework.view.ToggleButtonView;
 import ru.m.tankz.bundle.IConfigBundle;
-import ru.m.tankz.bundle.ILevelBundle;
-import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
 
 private typedef Result = {
     var type:GameType;
-    var level:LevelConfig;
+    var level:LevelId;
 }
 
 @:template class CreateGamePopup extends PopupView<Result> {
 
     @:view("type") var typeView:DataView<GameType, ToggleButtonView>;
-    @:view("level") var levelView:DataView<LevelConfig, ToggleButtonView>;
+    @:view("level") var levelView:DataView<LevelId, ToggleButtonView>;
 
-    @:provide static var configBundle:IConfigBundle;
+    @:provide var configBundle:IConfigBundle;
-    @:provide static var levelBundle:ILevelBundle;
 
     private var type:GameType;
-    private var level:LevelConfig;
+    private var level:LevelId;
 
     override private function onShow():Void {
         super.onShow();
@@ -46,18 +43,18 @@ private typedef Result = {
         for (v in typeView.dataViews) {
             v.on = v == view;
         }
-        levelView.data = levelBundle.get(new PackId(value)).data;
+        levelView.data = [for (i in 0...configBundle.get(type).game.levels) i];
-        onLevelSelect(0, levelView.data[0], levelView.dataViews[0]);
+        onLevelSelect(0, 0, levelView.dataViews[0]);
     }
 
-    private function levelViewFactory(index:Int, value:LevelConfig):ToggleButtonView {
+    private function levelViewFactory(index:Int, value:LevelId):ToggleButtonView {
         var result = new ToggleButtonView();
         result.skinId = "button.level";
-        result.text = Std.string(value.id);
+        result.text = Std.string(value);
         return result;
     }
 
-    private function onLevelSelect(index:Int, level:LevelConfig, view:ToggleButtonView):Void {
+    private function onLevelSelect(index:Int, level:LevelId, view:ToggleButtonView):Void {
         this.level = level;
         for (v in levelView.dataViews) {
             v.on = v == view;

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

@@ -4,8 +4,7 @@ layout.vAlign: middle
 view:
   $type: haxework.view.VGroupView
   layout.hAlign: center
-  geometry.size.stretch: true
+  geometry.size.width: 600
-  geometry.margin: 10
   skinId: window
   views:
     - $type: haxework.view.HGroupView
@@ -24,8 +23,8 @@ view:
           skinId: window.close
           +onPress: $code:reject('close')
     - $type: haxework.view.VGroupView
-      geometry.size.stretch: true
+      geometry.size.width: 100%
-      geometry.padding: [5, 20]
+      geometry.padding: 20
       layout.margin: 5
       layout.hAlign: center
       views:
@@ -35,9 +34,8 @@ view:
             text: Type
           - id: type
             $type: haxework.view.DataView
-            geometry.size.width: 100%
             layout:
-              $type: haxework.view.layout.TailLayout
+              $type: haxework.view.layout.HorizontalLayout
               margin: 10
             factory: $this:gameTypeViewFactory
             +onItemSelect: $this:onGameTypeSelect
@@ -49,22 +47,16 @@ view:
             geometry.size.width: 100%
             skinId: text
             text: Level
-          - $type: haxework.view.ScrollView
+          - id: level
-            geometry.size.stretch: true
+            $type: haxework.view.DataView
-            scroll:
+            geometry.size.width: 100%
-                $type: haxework.view.list.VScrollBarView
+            layout:
-                skinId: scroll.vertical
+              $type: haxework.view.layout.TailLayout
-            view:
+              rowSize: 10
-                id: level
+              margin: 5
-                $type: haxework.view.DataView
+            factory: $this:levelViewFactory
-                geometry.size.width: 100%
+            +onItemSelect: $this:onLevelSelect
-                layout:
+            geometry.padding: 10
-                  $type: haxework.view.layout.TailLayout
-                  rowSize: 10
-                  margin: 5
-                factory: $this:levelViewFactory
-                +onItemSelect: $this:onLevelSelect
-                geometry.padding: 10
     - $type: haxework.view.HGroupView
       layout.hAlign: center
       layout.margin: 5

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

@@ -1,12 +1,12 @@
 package ru.m.tankz.view.popup;
 
+import haxework.view.ToggleButtonView;
 import haxework.view.ButtonView;
 import haxework.view.DataView;
 import haxework.view.LabelView;
 import haxework.view.popup.PopupView;
-import haxework.view.ToggleButtonView;
 import ru.m.tankz.config.Config;
-import ru.m.tankz.game.PackProgress;
+import ru.m.tankz.game.GameProgress;
 
 private typedef Result = {
     var control:ControlPreset;
@@ -16,14 +16,14 @@ private typedef Result = {
 @:template class LevelPopup extends PopupView<Result> {
 
     private var level:LevelConfig;
-    private var progress:PackProgress;
+    private var progress:GameProgress;
 
     @:view var name:LabelView;
     @:view("presets") var presetsView:DataView<GamePreset, ButtonView>;
     @:view("controls") var controlsView:DataView<ControlPreset, ToggleButtonView>;
     private var control:ControlPreset;
 
-    public function setData(level:LevelConfig, presets:Array<GamePreset>, controls:Array<ControlPreset>, progress:PackProgress):Void {
+    public function setData(level:LevelConfig, presets:Array<GamePreset>, controls:Array<ControlPreset>, progress:GameProgress):Void {
         this.level = level;
         this.progress = progress;
         name.text = '${level.id}. ${level.name != null ? level.name : "#"}';

src/client/haxe/ru/m/tankz/view/settings/ActionView.hx

@@ -2,17 +2,14 @@ package ru.m.tankz.view.settings;
 
 import haxework.view.HGroupView;
 import haxework.view.LabelView;
-import haxework.view.list.ListView;
+import haxework.view.list.ListView.IListItemView;
 import openfl.Assets;
-import ru.m.control.DeviceAction;
+import openfl.events.KeyboardEvent;
-import ru.m.tankz.control.Binding;
+import promhx.Deferred;
+import promhx.Promise;
+import ru.m.tankz.control.ActionConfig;
 import ru.m.tankz.control.Control;
 
-typedef ActionItem = {
-    var action:TankAction;
-    var bind:BindAction;
-}
-
 class KeyboardMap {
 
     private var data:Map<Int, String>;
@@ -29,9 +26,9 @@ class KeyboardMap {
 
     }
 
-    private static var instance:KeyboardMap;
+    private static var instance: KeyboardMap;
 
-    public static function getName(key:Int):String {
+    public static function getName(key: Int): String {
         if (instance == null) instance = new KeyboardMap();
         return key == -1 ? "(NONE)" : instance.data.exists(key) ? instance.data.get(key) : Std.string(key);
     }
@@ -42,12 +39,12 @@ class KeyboardMap {
     public var item_index(default, default):Int;
     public var data(default, set):ActionItem;
 
-    public var edit(default, set):Bool;
-
     @:view var action(default, null):LabelView;
     @:view var key(default, null):LabelView;
 
-    private static function actionLabel(action:TankAction):String {
+    private var editDeferred: Deferred<Int>;
+
+    private static function actionLabel(action: TankAction): String {
         return switch (action) {
             case TankAction.SHOT: "SHOT";
             case TankAction.MOVE(d): 'MOVE_$d';
@@ -55,25 +52,32 @@ class KeyboardMap {
         }
     }
 
-    private static function bindLabel(bind:BindAction):String {
+    private static function keyLabel(key: Int): String {
-        return bind == null ? "(NONE)" : Std.string(bind.device) + " " + switch bind.action {
+        return KeyboardMap.getName(key);
-            case KEY(code): KeyboardMap.getName(code);
-            case DIRECTION(direction): Std.string(direction);
-        };
     }
 
     private function set_data(value:ActionItem):ActionItem {
         data = value;
         action.text = actionLabel(data.action);
-        key.text = bindLabel(data.bind);
+        key.text = keyLabel(data.key);
         return data;
     }
 
-    private function set_edit(value:Bool):Bool {
+    public function edit():Promise<Int> {
-        if (edit != value) {
+        action.skinId = key.skinId = "text.box.active";
-            edit = value;
+        toRedraw();
-            action.skinId = key.skinId = edit ? "text.box.active" : "text.box";
+        editDeferred = new Deferred();
-        }
+        content.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-        return edit;
+        return editDeferred.promise();
+    }
+
+    private function onKeyDown(event: KeyboardEvent):Void {
+        content.stage.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
+        action.skinId = key.skinId = "text.box";
+        toRedraw();
+        data.key = event.keyCode;
+        key.text = keyLabel(data.key);
+        editDeferred.resolve(data.key);
+        editDeferred = null;
     }
 }

src/client/haxe/ru/m/tankz/view/settings/ActionView.yaml

@@ -4,9 +4,9 @@ layout.margin: 5
 views:
   - id: action
     $type: haxework.view.LabelView
-    geometry.size.fixed: [180, 38]
+    geometry.size.fixed: [200, 38]
     skinId: text.box
   - id: key
     $type: haxework.view.LabelView
-    geometry.size.fixed: [250, 38]
+    geometry.size.fixed: [200, 38]
     skinId: text.box

src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.hx

@@ -1,66 +1,11 @@
 package ru.m.tankz.view.settings;
 
 import haxework.view.DataView;
-import haxework.view.GroupView;
 import haxework.view.LabelView;
 import haxework.view.VGroupView;
-import promhx.Deferred;
 import promhx.Promise;
-import ru.m.control.DeviceAction;
+import ru.m.tankz.control.ActionConfig;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlBus;
-import ru.m.tankz.control.Binding;
 import ru.m.tankz.storage.SettingsStorage;
-import ru.m.tankz.view.settings.ActionView;
-
-class BindEditor {
-
-    private var editViews:Array<ActionView>;
-
-    @:provide static var bus:IControlBus;
-
-    private var def:Deferred<Bool>;
-
-    public function new() {
-        editViews = [];
-        bus.signal.connect(onBusAction);
-    }
-
-    private function onBusAction(device:DeviceType, action:DeviceAction, on:Bool):Void {
-        if (on && editViews.length > 0) {
-            var view = editViews.shift();
-            view.edit = false;
-            view.data.bind = {device: device, action: action};
-            view.data = view.data;
-            if (editViews.length > 0) {
-                editViews[0].edit = true;
-            } else {
-                def.resolve(true);
-            }
-        }
-    }
-
-    public function push(views:Array<ActionView>):Promise<Bool> {
-        for (view in editViews) {
-            view.edit = false;
-        }
-        editViews = views.slice(0);
-        if (editViews.length > 0) {
-            editViews[0].edit = true;
-        }
-        def = new Deferred();
-        return def.promise();
-    }
-
-    public static var i(get, null):BindEditor;
-
-    private static function get_i():BindEditor {
-        if (i == null) {
-            i = new BindEditor();
-        }
-        return i;
-    }
-}
 
 @:template class SettingsEditor extends VGroupView {
 
@@ -68,20 +13,13 @@ class BindEditor {
 
     @:view var label:LabelView;
     @:view var list:DataView<ActionItem, ActionView>;
-    @:view var panel:GroupView;
 
-    @:provide static var storage:SettingsStorage;
+    @:provide var storage:SettingsStorage;
-    @:provide static var bus:IControlBus;
-
-    private function refresh():Void {
-        label.text = 'Player ${controlIndex+1}';
-        var binding = storage.getBinding(controlIndex);
-        list.data = bindingToArray(binding);
-    }
 
     private function set_controlIndex(value: Int): Int {
         this.controlIndex = value;
-        refresh();
+        label.text = 'Player ${controlIndex+1}';
+        list.data = storage.getActionConfig(controlIndex).data;
         return this.controlIndex;
     }
 
@@ -93,48 +31,34 @@ class BindEditor {
     }
 
     private function onItemSelect(index:Int, value:ActionItem, view:ActionView):Void {
-        BindEditor.i.push([view]).then(function(_) save());
+        view.edit();
-    }
-
-    private function screen():Void {
-        list.data = bindingToArray(SettingsStorage.buildGamepadBinding(GamepadView.ID));
-        list.toUpdate();
-        save();
     }
 
     private function change():Void {
-        BindEditor.i.push(list.dataViews).then(function(_) save());
+        var p: Promise<Int> = Promise.promise(0);
+        for (view in list.views) {
+            var v: ActionView = cast view;
+            p = p.pipe(function(_):Promise<Int> return v.edit());
+        }
+        p.then(function(_) save());
     }
 
     private function clear():Void {
-        list.data = bindingToArray(SettingsStorage.getDefaultBinding(-1));
+        for (item in list.data) {
+            item.key = -1;
+        }
+        list.data = list.data;
         list.toUpdate();
         save();
     }
 
-    private function default_():Void {
+    private function reset():Void {
-        list.data = bindingToArray(SettingsStorage.getDefaultBinding(controlIndex));
+        list.data = SettingsStorage.getDefaultActionConfig(controlIndex).data;
         list.toUpdate();
         save();
     }
 
     private function save():Void {
-        storage.saveBinding(controlIndex, arrayToBinding(list.data));
+        storage.setActionConffig(controlIndex, new ActionConfig(list.data));
-    }
-
-    private static function bindingToArray(binding:Binding):Array<ActionItem> {
-        var result:Array<ActionItem> = [];
-        for (action in binding.keys()) {
-            result.push({action: action, bind: binding.get(action)});
-        }
-        return result;
-    }
-
-    private static function arrayToBinding(array:Array<ActionItem>):Binding {
-        var result = new Binding();
-        for (item in array) {
-            result.set(item.action, item.bind);
-        }
-        return result;
     }
 }

src/client/haxe/ru/m/tankz/view/settings/SettingsEditor.yaml

@@ -1,34 +1,27 @@
 layout.margin: 10
 layout.hAlign: center
-geometry.size.width: 400
 views:
   - id: label
     $type: haxework.view.LabelView
     skinId: text
-  - id: panel
+  - $type: haxework.view.HGroupView
-    $type: haxework.view.GroupView
+    layout.margin: 10
-    layout:
-        $type: haxework.view.layout.TailLayout
-        rowSize: 2
-        margin: 10
-    geometry.size.width: 100%
     views:
-      - $type: haxework.view.ButtonView
+      - id: change
-        +onPress: $code:screen()
+        $type: haxework.view.ButtonView
-        skinId: button.simple
-        text: Screen
-      - $type: haxework.view.ButtonView
         +onPress: $code:change()
         skinId: button.simple
         text: Change
-      - $type: haxework.view.ButtonView
+      - id: clear
+        $type: haxework.view.ButtonView
         +onPress: $code:clear()
         skinId: button.simple
         text: Clear
-      - $type: haxework.view.ButtonView
+      - id: reset
-        +onPress: $code:default_()
+        $type: haxework.view.ButtonView
+        +onPress: $code:reset()
         skinId: button.simple
-        text: Default
+        text: Reset
   - id: list
     $type: haxework.view.DataView
     layout:

src/common/haxe/ru/m/tankz/Type.hx

@@ -8,8 +8,6 @@ typedef TeamId = String;
 
 typedef BrickType = String;
 
-typedef BrickIndex = Int;
-
 typedef TankType = String;
 
 typedef BonusType = String;
@@ -39,33 +37,5 @@ abstract PlayerId(Array<Dynamic>) {
     }
 }
 
-abstract PackId(Array<Dynamic>) {
-    public static inline var DEFAULT = "standard";
-
-    public var type(get, never):GameType;
-    public var name(get, never):String;
-
-    public function new(type:GameType, name:String = DEFAULT) {
-        this = [type, name];
-    }
-
-    private inline function get_type():GameType return this[0];
-
-    private inline function get_name():String return this[1];
-
-    @:from static public inline function fromArray(value:Array<Dynamic>):PackId {
-        return new PackId(value[0], value[1]);
-    }
-
-    @:to public inline function toString():String {
-        return '${type}_${name}';
-    }
-
-    @:op(X == Y) static public inline function equals(x:PackId, y:PackId):Bool {
-        return x.type == y.type && x.name == y.name;
-    }
-}
-
 typedef LevelId = Int;
-
 typedef PresetId = Int;

src/common/haxe/ru/m/tankz/bundle/ILevelBundle.hx

@@ -4,5 +4,5 @@ import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
 
 interface ILevelBundle {
-    public function get(id:PackId):LevelPack;
+    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig;
 }

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

@@ -23,26 +23,18 @@ typedef SpawnPoint = {
     var direction:String;
 }
 
-typedef CellSize = {
-    var width:Float;
-    var height:Float;
-}
-
-typedef GridSize = {
-    var width:Int;
-    var height:Int;
-}
-
 typedef MapConfig = {
-    var cell:CellSize;
+    var cellWidth:Float;
-    var grid:GridSize;
+    var cellHeight:Float;
+    var gridWidth:Int;
+    var gridHeight:Int;
 }
 
 typedef BrickConfig = {
     var type:BrickType;
     var index:Int;
     var layer:Int;
-    var armor:Float;
+    var armor:Int;
 }
 
 typedef BulletConfig = {
@@ -63,13 +55,13 @@ typedef TankConfig = {
     @:optinal var hits:Int;
     @:optinal var upgrade:TankType;
     @:optinal var downgrade:TankType;
-    @:optinal var score:Null<Int>;
+    @:optinal var score:Int;
 }
 
 typedef BonusConfig = {
     var type:BonusType;
-    @:optional var duration:Null<Int>;
+    @:optional var duration:Int;
-    @:optinal var score:Null<Int>;
+    @:optinal var score:Int;
 }
 
 typedef TankSpawn = {
@@ -88,7 +80,7 @@ typedef PlayerConfig = {
 }
 
 typedef EagleConfig = {
-    @:optional var score:Null<Int>;
+    @:optional var score:Int;
 }
 
 typedef TeamConfig = {
@@ -108,15 +100,9 @@ typedef GamePreset = {
 
 typedef LevelConfig = {
     @:optional var id:LevelId;
-    var data:Array<BrickIndex>;
+    var data:Array<BrickConfig>;
     @:optional var name:String;
     @:optional var points:Array<SpawnPoint>;
-    @:optional var size:{width:Int, height:Int};
-}
-
-typedef LevelPack = {
-    var id:PackId;
-    var data:Array<LevelConfig>;
 }
 
 typedef PlayerControl = {
@@ -153,6 +139,8 @@ class Config {
     public var controls(default, null):Array<ControlPreset>;
     public var points(default, null):Array<SpawnPoint>;
     public var bonuses(default, null):Array<BonusConfig>;
+    public var mapWidth(get, null):Float;
+    public var mapHeight(get, null):Float;
 
     private var brickMap:Map<BrickType, BrickConfig>;
     private var brickMapByIndex:Map<Int, BrickConfig>;
@@ -220,6 +208,14 @@ class Config {
         }
     }
 
+    private function get_mapWidth():Float {
+        return map.cellWidth * map.gridWidth;
+    }
+
+    private function get_mapHeight():Float {
+        return map.cellHeight * map.gridHeight;
+    }
+
     public function getBrick(type:BrickType):BrickConfig {
         return brickMap.get(type);
     }

src/common/haxe/ru/m/tankz/control/Control.hx

@@ -14,6 +14,7 @@ enum TankAction {
 }
 
 class Control {
+    public var type:String;
     public var playerId(default, null):PlayerId;
     public var tankId(default, default):Int;
     private var handler:IGame;

src/common/haxe/ru/m/tankz/engine/Engine.hx

@@ -21,9 +21,9 @@ import ru.m.tankz.map.LevelMap;
 
     public var allEntities(default, null):Map<Int, Entity>;
 
-    public function new(config:Config, size:GridSize = null) {
+    public function new(config:Config) {
         this.config = config;
-        map = new LevelMap(config.map, size);
+        map = new LevelMap(config.map);
         allEntities = new Map();
         entities = new Map();
         ticker = new Ticker();
@@ -112,7 +112,6 @@ import ru.m.tankz.map.LevelMap;
                             break;
                         }
                     }
-                    if (withCollision != null) break;
 
                     for (other in entities.iterator()) {
                         if (other != ent && other != null) {
@@ -121,6 +120,7 @@ import ru.m.tankz.map.LevelMap;
                             }
                         }
                     }
+
                     if (withCollision != null) break;
                 }
 

src/common/haxe/ru/m/tankz/engine/Ticker.hx

@@ -1,7 +1,6 @@
 package ru.m.tankz.engine;
 
 typedef Action = {
-    var id:Int;
     var time:Int;
     var action:Void->Void;
 }
@@ -13,7 +12,6 @@ class Ticker implements ITicker {
     private var passed:Int;
     private var last_tick:Int;
     private var actions:Array<Action>;
-    private var actionId = 0;
 
     private static var TIME = Timer.stamp();
 
@@ -60,23 +58,17 @@ class Ticker implements ITicker {
         var action = it.next();
         var i = 0;
         while (action != null && time >= action.time) {
+            action.action();
             i++;
             action = it.next();
         }
         if (i > 0) {
-            var timeActions = actions.slice(0, i);
             actions = actions.slice(i);
-            for (action in timeActions) {
-                //L.d("Ticker", 'action: ${action.id} ${action.time} on ${time}');
-                action.action();
-            }
         }
     }
 
-    public function emit(fun:Void->Void, delay:Int):Void {
+    public function emit(action:Void->Void, delay:Int):Void {
-        var action:Action = {action:fun, time:time+delay, id:++actionId};
+        actions.push({action:action, time:time+delay});
-        //L.d("Ticker", 'emit: ${action.id} ${action.time}');
-        actions.push(action);
         actions.sort(function(a, b) return a.time - b.time);
     }
 }

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

@@ -29,8 +29,8 @@ class EntityBuilder {
 
     public function buildRect(point:EntityPoint, width:Float, height:Float):Rectangle {
         return new Rectangle(
-            (point.x + 1) * config.map.cell.width - width / 2,
+            (point.x + 1) * config.map.cellWidth - width / 2,
-            (point.y + 1) * config.map.cell.height - height / 2,
+            (point.y + 1) * config.map.cellHeight - height / 2,
             width,
             height,
             Direction.fromString(point.direction)
@@ -39,7 +39,7 @@ class EntityBuilder {
 
     public function buildEagle(point:EntityPoint, teamId:TeamId):Eagle {
         var eageleConfig = config.getTeam(teamId).eagle;
-        var eagle = new Eagle(++entityId, buildRect(point, config.map.cell.width * 2, config.map.cell.height * 2), teamId, eageleConfig);
+        var eagle = new Eagle(++entityId, buildRect(point, config.map.cellWidth * 2, config.map.cellHeight * 2), teamId, eageleConfig);
         eagle.color = config.getColor(new PlayerId(teamId, -1));
         return eagle;
     }
@@ -65,7 +65,7 @@ class EntityBuilder {
 
     public function buildBonus(point:EntityPoint, type:BonusType):Bonus {
         var bonusConfig = config.getBonus(type);
-        var bonus = new Bonus(++entityId, buildRect(point, config.map.cell.width * 2, config.map.cell.height * 2), bonusConfig);
+        var bonus = new Bonus(++entityId, buildRect(point, config.map.cellWidth * 2, config.map.cellHeight * 2), bonusConfig);
         return bonus;
     }
 }

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

@@ -25,18 +25,17 @@ import ru.m.tankz.Type;
     public var config(default, null):Config;
     public var winner(default, null):Null<TeamId>;
     public var state(default, null):GameState;
-    public var level(default, null):LevelConfig;
     public var engine(default, null):IEngine;
     public var controlFactory(default, null):IControlFactory;
     public var pause(default, set):Bool;
-    public var controls(default, null):Map<String, Control>;
+
+    private var controls:Map<String, Control>;
 
     @:provide var configBundle:IConfigBundle;
 
-    public function new(state:GameState, level:LevelConfig) {
+    public function new(state:GameState) {
         this.type = state.type;
         this.state = state;
-        this.level = level;
         this.teams = new Map();
         this.config = configBundle.get(type);
         this.controlFactory = new NoneControlFactory();
@@ -72,9 +71,8 @@ import ru.m.tankz.Type;
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(state, level):
+            case START(state):
                 this.state = state;
-                this.level = level;
             case COMPLETE(state, winnerId):
                 this.state = state;
                 this.winner = winnerId;
@@ -100,8 +98,8 @@ import ru.m.tankz.Type;
     }
 
     public function start():Void {
-        // ToDo: Spawner not in Team?
+        var level:LevelConfig = state.level;
-        var points:Array<SpawnPoint> = level != null && level.points != null ? level.points : config.points;
+        var points:Array<SpawnPoint> = level.points != null ? level.points : config.points;
         for (teamConfig in state.preset.teams) {
             var teamPoints = points.filter(function(p:SpawnPoint) return p.team == teamConfig.id);
             var team:Team = new Team(teamConfig, teamPoints, state.teams[teamConfig.id]);

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

@@ -1,6 +1,5 @@
 package ru.m.tankz.game;
 
-import ru.m.tankz.config.Config.LevelConfig;
 import haxework.color.Color;
 import ru.m.geom.Position;
 import ru.m.geom.Rectangle;
@@ -33,8 +32,8 @@ enum SpawnEvent {
 
 typedef Shot = {
     var tankId:Int;
-    @:optional var bulletId:Null<Int>;
+    @:optional var bulletId:Int;
-    @:optional var score:Null<Int>;
+    @:optional var score:Int;
 }
 
 enum HitEvent {
@@ -74,7 +73,7 @@ enum ChangeEvent {
 }
 
 enum GameEvent {
-    START(state:GameState, level:LevelConfig);
+    START(state:GameState);
     SPAWN(event:SpawnEvent);
     MOVE(event:MoveEvent);
     STOP(event:StopEvent);

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

@@ -11,14 +11,13 @@ typedef LevelProgress = {
     var presets:Map<Int, LevelResult>;
 }
 
-class PackProgress {
+class GameProgress {
-
-    public var id(default, null):PackId;
 
+    public var type(default, null):GameType;
     private var completed(default, null):Map<Int, LevelProgress>;
 
-    public function new(id:PackId) {
+    public function new(type:GameType) {
-        this.id = id;
+        this.type = type;
         this.completed = new Map();
     }
 

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

@@ -1,6 +1,5 @@
 package ru.m.tankz.game;
 
-import ru.m.tankz.config.Config.LevelConfig;
 import ru.m.geom.Line;
 import ru.m.geom.Point;
 import ru.m.tankz.control.Control;
@@ -20,10 +19,10 @@ class GameRunner extends Game implements EngineListener {
     private var timer:Timer;
     private var builder:EntityBuilder;
 
-    public function new(state:GameState, level:LevelConfig) {
+    public function new(state:GameState) {
-        super(state, level);
+        super(state);
         this.builder = new EntityBuilder(config);
-        this.engine = new Engine(config, level.size);
+        this.engine = new Engine(config);
         this.engine.connect(this);
     }
 
@@ -52,8 +51,7 @@ class GameRunner extends Game implements EngineListener {
 
     override public function start():Void {
         super.start();
-        var mapData = level.data.map(function(index:BrickIndex) return config.getBrickByIndex(index));
+        engine.map.setData(state.level.data);
-        engine.map.setData(mapData);
         for (team in teams.iterator()) {
             team.spawner.runner = spawn;
             for (player in team.players.iterator()) {
@@ -69,16 +67,13 @@ class GameRunner extends Game implements EngineListener {
             }
         }
         gameEventSignal.emit(EventUtil.buildBricksSpawn(engine.map));
-        gameEventSignal.emit(START(state, level));
+        gameEventSignal.emit(START(state));
         //for (i in 0...10) spawnBonus();
     }
 
     private function spawn(task:SpawnTask):Void {
         var player = getPlayer(task.playerId);
         var tank = builder.buildTank(task.point, task.playerId, task.tankType, player.state.color, player.state.name);
-        if (getTeam(player.id.team).freezing) {
-            tank.freezing = true;
-        }
         engine.spawn(tank);
         gameEventSignal.emit(EventUtil.buildTankSpawn(tank));
         if (player.config.protect > 0) {
@@ -106,8 +101,6 @@ class GameRunner extends Game implements EngineListener {
 
     private function freezeTank(tank:Tank, duration:Float):Void {
         tank.freezing = true;
-        tank.stop();
-        gameEventSignal.emit(STOP(TANK(tank.id)));
         gameEventSignal.emit(CHANGE(TANK_FREEZE(tank.id, tank.freezing)));
         engine.ticker.emit(function() {
             tank.freezing = false;
@@ -115,30 +108,12 @@ class GameRunner extends Game implements EngineListener {
         }, Std.int(duration * 1000));
     }
 
-    private function freezeTeam(teamId:TeamId, duration:Float):Void {
-        getTeam(teamId).freezing = true;
-        for (tank in engine.iterTanks(teamTank(teamId))) {
-            tank.freezing = true;
-            tank.stop();
-            gameEventSignal.emit(STOP(TANK(tank.id)));
-            gameEventSignal.emit(CHANGE(TANK_FREEZE(tank.id, tank.freezing)));
-        }
-        engine.ticker.emit(function() {
-            getTeam(teamId).freezing = false;
-            for (tank in engine.iterTanks(teamTank(teamId))) {
-                tank.freezing = false;
-                gameEventSignal.emit(CHANGE(TANK_FREEZE(tank.id, tank.freezing)));
-            }
-        }, Std.int(duration * 1000));
-    }
-
     private function checkComplete():Void {
         var actives:Array<TeamId> = [];
         for (team in teams.iterator()) {
             if (team.isAlive) {
                 if (team.eagleId > -1) {
-                    var eagle:Eagle = engine.getEntity(team.eagleId);
+                    if (!cast(engine.entities[team.eagleId], Eagle).death) {
-                    if (!eagle.death) {
                         actives.push(team.id);
                     }
                 } else {
@@ -146,10 +121,11 @@ class GameRunner extends Game implements EngineListener {
                 }
             }
         }
-        switch actives {
+        if (actives.length == 1) {
-            case [winner]: complete(winner);
+            complete(actives[0]);
-            case []: complete(null);
+        }
-            case _:
+        if (actives.length == 0) {
+            complete(null);
         }
     }
 
@@ -162,7 +138,7 @@ class GameRunner extends Game implements EngineListener {
     public function onSpawn(entity:EntityType):Void {
     }
 
-    private static function buildShot(bullet:Bullet, score:Null<Int> = null):Shot {
+    private static function buildShot(bullet:Bullet, score:Int = 0):Shot {
         return {
             tankId: bullet.tank.id,
             bulletId: bullet.id,
@@ -224,7 +200,7 @@ class GameRunner extends Game implements EngineListener {
                             emitTankChange(tank);
                         } else {
                             var score = tank.config.score;
-                            if (score != null && tank.playerId.team == bullet.playerId.team) {
+                            if (tank.playerId.team == bullet.playerId.team) {
                                 score = Math.round(score * -0.5);
                             }
                             gameEventSignal.emit(DESTROY(TANK(tank.id, buildShot(bullet, score))));
@@ -254,10 +230,8 @@ class GameRunner extends Game implements EngineListener {
     public function onDestroy(entity:EntityType):Void {
     }
 
-    private function spawnBonus(type:BonusType = null):Void {
+    private function spawnBonus():Void {
-        if (type == null) {
+        var type = config.bonuses[Math.floor(Math.random() * config.bonuses.length)].type;
-            type = config.bonuses[Math.floor(Math.random() * config.bonuses.length)].type;
-        }
         var point = {
             x: Math.floor(Math.random() * (engine.map.gridWidth - 1)),
             y: Math.floor(Math.random() * (engine.map.gridHeight - 1)),
@@ -268,10 +242,6 @@ class GameRunner extends Game implements EngineListener {
         gameEventSignal.emit(EventUtil.buildBonusSpawn(bonus));
     }
 
-    private inline function teamTank(team:TeamId):Tank->Bool {
-        return function(tank:Tank):Bool return team == tank.playerId.team;
-    }
-
     private inline function alienTank(team:TeamId):Tank->Bool {
         return function(tank:Tank):Bool return team != tank.playerId.team;
     }
@@ -289,14 +259,11 @@ class GameRunner extends Game implements EngineListener {
             case "helmet":
                 protectTank(tank, bonus.config.duration);
             case "clock":
-                for (team in teams) {
+                for (t in engine.iterTanks(alienTank(tank.playerId.team))) {
-                    if (team.id != tank.playerId.team) {
-                        freezeTeam(team.id, bonus.config.duration);
-                    }
-                }
-                /*for (t in engine.iterTanks(alienTank(tank.playerId.team))) {
                     freezeTank(t, bonus.config.duration);
-                }*/
+                    t.stop();
+                    gameEventSignal.emit(STOP(TANK(t.id)));
+                }
             case "shovel":
                 // ToDo: protect eagle/area
                 var team:Team = teams[tank.playerId.team];
@@ -383,7 +350,7 @@ class GameRunner extends Game implements EngineListener {
             case DESTROY(EAGLE(id, shot)):
                 var eagle:Eagle = engine.getEntity(id);
                 eagle.death = true;
-                if (shot.score != null) {
+                if (shot.score != 0) {
                     var tank:Tank = engine.getEntity(shot.tankId);
                     changeScore(tank.playerId, shot.score);
                 }
@@ -409,7 +376,7 @@ class GameRunner extends Game implements EngineListener {
                 if (tank.bonus && shot.bulletId != null) {
                     spawnBonus();
                 }
-                if (shot.score != null) {
+                if (shot.score != 0) {
                     var shooterTank:Tank = engine.getEntity(shot.tankId);
                     changeScore(shooterTank.playerId, shot.score);
                 }
@@ -418,7 +385,7 @@ class GameRunner extends Game implements EngineListener {
                 var bonus:Bonus = engine.getEntity(id);
                 var tank:Tank = engine.getEntity(shot.tankId);
                 applyBonus(tank, bonus);
-                if (shot.score != null) {
+                if (shot.score != 0) {
                     changeScore(tank.playerId, shot.score);
                 }
                 engine.destroy(id);

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

@@ -2,6 +2,7 @@ package ru.m.tankz.game;
 
 import haxework.color.Color;
 import ru.m.tankz.bundle.IConfigBundle;
+import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
 
@@ -71,17 +72,21 @@ class GameState {
 
     public var type:GameType;
     public var presetId:PresetId;
+    public var levelId:LevelId;
     public var controls:Array<PlayerControl>;
     public var players:Map<String, PlayerState>;
     public var teams:Map<TeamId, TeamState>;
     public var preset(get, null):GamePreset;
     public var config(get, null):Config;
+    public var level(get, null):LevelConfig;
 
     @:provide static private var configBundle:IConfigBundle;
+    @:provide static private var levelBundle:ILevelBundle;
 
-    public function new(type:GameType, presetId:PresetId = 0, state:GameState = null, controls:Array<PlayerControl> = null) {
+    public function new(type:GameType, presetId:PresetId = 0, levelId:Int = 0, state:GameState = null, controls:Array<PlayerControl> = null) {
         this.type = type;
         this.presetId = presetId;
+        this.levelId = levelId;
         //this.controls = controls == null ? config.controls[0].values : controls;
         this.controls = controls == null ? [] : controls;
         if (state == null) {
@@ -113,6 +118,10 @@ class GameState {
         return configBundle.get(type);
     }
 
+    private function get_level():LevelConfig {
+        return levelBundle.get(type, config, levelId);
+    }
+
     public function getTeamLife(id:TeamId):Int {
         if (teams.exists(id)) {
             return teams[id].life + Lambda.fold(teams[id].players, function(p, c) return c + p.life, 0);

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

@@ -2,7 +2,6 @@ package ru.m.tankz.game;
 
 import haxework.signal.Signal;
 import ru.m.tankz.config.Config;
-import ru.m.tankz.control.Control;
 import ru.m.tankz.control.IControlFactory;
 import ru.m.tankz.Type;
 
@@ -12,10 +11,8 @@ interface IGame extends GameListener {
     public var config(default, null):Config;
     public var winner(default, null):Null<TeamId>;
     public var state(default, null):GameState;
-    public var level(default, null):LevelConfig;
     public var controlFactory(default, null):IControlFactory;
     public var pause(default, set):Bool;
-    public var controls(default, null):Map<String, Control>;
 
     public var gameEventSignal(default, null):Signal<GameEvent>;
 

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

@@ -1,8 +1,8 @@
 package ru.m.tankz.game;
 
-import ru.m.tankz.config.Config;
+import ru.m.tankz.game.GameState.TeamState;
-import ru.m.tankz.game.GameState;
 import ru.m.tankz.Type;
+import ru.m.tankz.config.Config;
 
 class Team {
 
@@ -15,7 +15,6 @@ class Team {
     public var eagleId(default, default):Int;
     private var active(default, default):Int;
     public var state(default, default):TeamState;
-    public var freezing(default, default):Bool;
 
     public function new(config:TeamConfig, points:Array<SpawnPoint>, state:TeamState = null) {
         this.id = config.id;

src/common/haxe/ru/m/tankz/game/record/GamePlayer.hx

@@ -12,7 +12,7 @@ class GamePlayer extends Game {
     private var ticker:Ticker;
 
     public function new(record:GameRecord) {
-        super(record.state, null);
+        super(record.state);
         this.record = record;
         this.data = null;
         this.ticker = new Ticker();
@@ -26,12 +26,10 @@ class GamePlayer extends Game {
     }
 
     public function stop():Void {
-        ticker.stop();
         Lib.current.stage.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
     }
 
     private function onEnterFrame(event:Event):Void {
-        ticker.tick();
         var events = 0;
         for (event in data) {
             if (event.time <= ticker.time) {

src/common/haxe/ru/m/tankz/game/record/GameRecord.hx

@@ -32,7 +32,7 @@ class GameRecord {
     }
 
     private inline function get_state():GameState {
-        return new GameState(info.type, info.presetId);
+        return new GameState(info.type, info.presetId, info.levelId);
     }
 
     public function toString():String {

src/common/haxe/ru/m/tankz/game/record/GameRecorder.hx

@@ -17,11 +17,11 @@ class GameRecorder implements GameListener {
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case GameEvent.START(state, level):
+            case GameEvent.START(state):
                 ticker.start();
                 record.info.type = state.type;
                 record.info.presetId = state.presetId;
-                record.info.levelId = level.id;
+                record.info.levelId = state.levelId;
                 record.info.date = Date.now();
             case GameEvent.COMPLETE(_, _):
                 ticker.stop();

src/common/haxe/ru/m/tankz/map/Brick.hx

@@ -27,10 +27,10 @@ class Brick {
         this.mapConfig = mapConfig;
         this.config = config;
         this.rect = new Rectangle(
-            cellX * mapConfig.cell.width,
+            cellX * mapConfig.cellWidth,
-            cellY * mapConfig.cell.height,
+            cellY * mapConfig.cellHeight,
-            mapConfig.cell.width,
+            mapConfig.cellWidth,
-            mapConfig.cell.height
+            mapConfig.cellHeight
         );
     }
 

src/common/haxe/ru/m/tankz/map/Grid.hx

@@ -1,7 +1,5 @@
 package ru.m.tankz.map;
 
-import ru.m.tankz.config.Config.GridSize;
-import ru.m.tankz.config.Config.CellSize;
 import ru.m.geom.Line;
 import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
@@ -15,10 +13,10 @@ class GridCell {
     public var position(default, null):Point;
     public var rect(default, null):Rectangle;
     public var layer:Int;
-    public var armor:Float;
+    public var armor:Int;
     public var destroyed(default, set):Bool;
 
-    public function new(cellX:Int, cellY:Int, width:Int, height:Int, layer:Int, armor:Float) {
+    public function new(cellX:Int, cellY:Int, width:Int, height:Int, layer:Int, armor:Int) {
         this.cellX = cellX;
         this.cellY = cellY;
         this.position = new Point(cellX, cellY);

src/common/haxe/ru/m/tankz/map/LevelMap.hx

@@ -1,6 +1,5 @@
 package ru.m.tankz.map;
 
-import ru.m.tankz.Type.BrickType;
 import haxe.ds.HashMap;
 import ru.m.tankz.map.Grid;
 import ru.m.geom.Point;
@@ -25,12 +24,12 @@ class LevelMap {
 
     private var bricksMap(default, null):HashMap<Point, Brick>;
 
-    public function new(config:MapConfig, size:GridSize = null) {
+    public function new(config:MapConfig) {
         this.config = config;
-        cellWidth = config.cell.width;
+        cellWidth = config.cellWidth;
-        cellHeight = config.cell.width;
+        cellHeight = config.cellHeight;
-        gridWidth = size != null ? size.width : config.grid.width;
+        gridWidth = config.gridWidth;
-        gridHeight = size != null ? size.height : config.grid.width;
+        gridHeight = config.gridHeight;
         bricksMap = new HashMap();
         bricks = [];
         grid = new Grid(
@@ -68,16 +67,16 @@ class LevelMap {
     }
 
     public function getPointBrick(point:Point):Brick {
-        var cellX:Int = Math.floor(point.x / cellWidth);
+        var cellX:Int = Math.floor(point.x / config.cellWidth);
-        var cellY:Int = Math.floor(point.y / cellHeight);
+        var cellY:Int = Math.floor(point.y / config.cellHeight);
-        return bricks[cellX + cellY * gridWidth];
+        return bricks[cellX + cellY * config.gridWidth];
     }
 
     private inline function get_width():Float {
-        return cellWidth * gridWidth;
+        return config.cellWidth * config.gridWidth;
     }
 
     private inline function get_height():Float {
-        return cellHeight * gridHeight;
+        return config.cellHeight * config.gridHeight;
     }
 }

src/common/haxe/ru/m/tankz/util/LevelUtil.hx

@@ -1,11 +1,6 @@
 package ru.m.tankz.util;
 
-import haxe.io.Bytes;
-import haxe.io.BytesInput;
-import haxe.zip.Entry;
-import haxe.zip.Reader;
 import ru.m.tankz.config.Config;
-import ru.m.tankz.Type;
 import yaml.Parser;
 import yaml.Renderer;
 import yaml.Yaml;
@@ -14,7 +9,6 @@ typedef LevelSource = {
     var data:String;
     @:optional var name:String;
     @:optional var points:Array<SpawnPoint>;
-    @:optional var size:GridSize;
 }
 
 class LevelUtil {
@@ -25,12 +19,12 @@ class LevelUtil {
         return result;
     }
 
-    public static function loadsOld(data:String):LevelConfig {
+    public static function loadsOld(config:Config, data:String):LevelConfig {
-        var bricks:Array<BrickIndex> = [];
+        var bricks:Array<BrickConfig> = [];
         for (line in ~/\s+/g.split(data)) {
             for (c in line.split('')) {
                 if (c.length > 0) {
-                    bricks.push(Std.parseInt(c));
+                    bricks.push(config.getBrickByIndex(Std.parseInt(c)));
                 }
             }
         }
@@ -39,56 +33,31 @@ class LevelUtil {
         }
     }
 
-    public static function loads(data:String):LevelConfig {
+    public static function loads(config:Config, data:String):LevelConfig {
-        // If first char is digit load as old format
+        if (config.type == 'classic') {
-        if (Std.parseInt(data.charAt(0)) != null) {
+            return loadsOld(config, data);
-            return loadsOld(data);
         } else {
             var obj:LevelSource = Yaml.parse(data, Parser.options().useObjects());
             return {
-                data: obj.data.split('').map(function(c) return Std.parseInt(c)),
+                data: obj.data.split('').map(function(c) return config.getBrickByIndex(Std.parseInt(c))),
                 points: obj.points,
                 name: obj.name,
-                size: obj.size,
             }
         }
     }
 
     public static function dumps(config:Config, level:LevelConfig):String {
-        var bricksStr = level.data.join('');
+        var bricksStr = level.data.map(function(brick:BrickConfig) return Std.string(brick.index)).join('');
         return Yaml.render({
             data: bricksStr,
             points: level.points,
             name: level.name,
-            size: level.size,
         }, Renderer.options().setFlowLevel(1));
     }
 
-    public static function empty(size:GridSize, filler:BrickIndex):LevelConfig {
+    public static function empty(config:Config):LevelConfig {
         return {
-            data: [for (i in 0...size.width * size.height) filler],
+            data: [for (i in 0...config.map.gridWidth * config.map.gridHeight) config.bricks[1]]
-            size: size,
         }
     }
-
-    private static function extract(entry:Entry):LevelConfig {
-        var bytes:Bytes = entry.data;
-        if (entry.compressed) {
-            #if ((flash || html5) && lime)
-            bytes = cast(bytes, lime.utils.Bytes).decompress(lime.utils.CompressionAlgorithm.DEFLATE);
-            #else
-            bytes = haxe.zip.Reader.unzip(entry);
-            #end
-        }
-        var level = LevelUtil.loads(bytes.toString());
-        if (level.id == null) {
-            level.id = Std.parseInt(entry.fileName.split("level").pop());
-        }
-        return level;
-    }
-
-    public static function unpack(bytes:Bytes):Array<LevelConfig> {
-        var files = Reader.readZip(new BytesInput(bytes));
-        return Lambda.array(files.map(extract));
-    }
 }

src/common/level/death/standard/level001.txt

@@ -1,4 +0,0 @@
-name: garages
-points: [{direction: right, x: 0, team: alpha, type: tank, y: 0, index: 0}, {direction: right, x: 9, team: beta, type: tank, y: 0, index: 0}, {direction: right, x: 19, team: gamma, type: tank, y: 0, index: 0}, {direction: right, x: 28, team: delta, type: tank, y: 0, index: 0}, {direction: right, x: 0, team: epsilon, type: tank, y: 13, index: 0}, {direction: right, x: 9, team: zeta, type: tank, y: 13, index: 0}, {direction: right, x: 19, team: eta, type: tank, y: 13, index: 0}, {direction: right, x: 28, team: theta, type: tank, y: 13, index: 0}]
-size: {width: 30, height: 15}
-data: "002555520000255552000025555200002555520000255552000025555200002255220000225522000022552200000055000000005500000000550000111155111111115511111111551111111155111111115511111111551111555533555555553355555555335555555444455555544445555554444555555533555555553355555555335555111155111111115511111111551111111155111111115511111111551111000055000000005500000000550000002255220000225522000022552200002555520000255552000025555200002555520000255552000025555200"

src/common/level/death/standard/level002.txt

@@ -1,4 +0,0 @@
-data: "440022002200001100002200220044440022002200001100002200220044000000000000554455000000000000000000000000554455000000000000220044005544001100445500440022220044005544001100445500440022000000440000001100000044000000000000440000001100000044000000220055000000554455000000550022220055000000554455000000550022000044000044001100440000440000000044000044001100440000440000005500005500001100005500005500005500005500001100005500005500114411114411114411114411114411114411114411114411114411114411005500005500001100005500005500005500005500001100005500005500000044000044001100440000440000000044000044001100440000440000220055000000554455000000550022220055000000554455000000550022000000440000001100000044000000000000440000001100000044000000220044005544001100445500440022220044005544001100445500440022000000000000554455000000000000000000000000554455000000000000440022002200001100002200220044440022002200001100002200220044"
-points: [{index: 0, direction: right, y: 2, x: 2, team: alpha, type: tank}, {index: 0, direction: right, y: 8, x: 8, team: beta, type: tank}, {index: 0, direction: right, y: 8, x: 20, team: gamma, type: tank}, {index: 0, direction: right, y: 2, x: 26, team: delta, type: tank}, {index: 0, direction: right, y: 26, x: 2, team: epsilon, type: tank}, {index: 0, direction: right, y: 20, x: 8, team: zeta, type: tank}, {index: 0, direction: right, y: 20, x: 20, team: eta, type: tank}, {index: 0, direction: right, y: 26, x: 26, team: theta, type: tank}]
-name: target
-size: {width: 30, height: 30}

src/common/level/death/standard/level003.txt

@@ -1,4 +0,0 @@
-name: ""
-points: [{x: 2, y: 8, direction: right, index: 0, team: alpha, type: tank}, {x: 8, y: 2, direction: right, index: 0, team: beta, type: tank}, {x: 20, y: 2, direction: right, index: 0, team: gamma, type: tank}, {x: 26, y: 8, direction: right, index: 0, team: delta, type: tank}, {x: 26, y: 20, direction: right, index: 0, team: epsilon, type: tank}, {x: 20, y: 26, direction: right, index: 0, team: zeta, type: tank}, {x: 8, y: 26, direction: right, index: 0, team: eta, type: tank}, {x: 2, y: 20, direction: right, index: 0, team: theta, type: tank}]
-size: {width: 30, height: 30}
-data: "222222666666222222666666222222222222666666222222666666222222220000660066000000660066000022220000660066000000660066000022220000666666000000666666000022220000666666000000666666000022666666333333555555333333666666666666333333555555333333666666660066330000000000000033660066660066330000000000000033660066666666330000000000000033666666666666330000000000000033666666220000550000333333000055000022220000550000333333000055000022220000550000330033000055000022220000550000330033000055000022220000550000333333000055000022220000550000333333000055000022666666330000000000000033666666666666330000000000000033666666660066330000000000000033660066660066330000000000000033660066666666333333555555333333666666666666333333555555333333666666220000666666000000666666000022220000666666000000666666000022220000660066000000660066000022220000660066000000660066000022222222666666222222666666222222222222666666222222666666222222"

src/common/proto/game.proto

@@ -2,7 +2,116 @@ syntax = "proto3";
 
 package ru.m.tankz.proto.game;
 
+message PositionProto {
+    float x = 1;
+    float y = 2;
+}
+
+message RectangleProto {
+    float x = 1;
+    float y = 2;
+    float width = 3;
+    float height = 4;
+}
+
+message ShotProto {
+    int32 tankId = 1;
+    int32 bulletId = 2;
+    int32 score = 3;
+}
+
+message BrickProto {
+    int32 gridX = 1;
+    int32 gridY = 2;
+    string type = 3;
+}
+
+message EagleProto {
+    string team = 1;
+}
+
+message TankProto {
+    string team = 1;
+    int32 index = 2;
+    string type = 3;
+    int32 hits = 4;
+    bool bonus = 5;
+    int32 color = 6;
+    string name = 7;
+}
+
+message BulletProto {
+    string team = 1;
+    int32 index = 2;
+    int32 piercing = 3;
+}
+
+message BonusProto {
+    string type = 1;
+}
+
+message GameStateProto {
+    string state = 1;
+}
+
+message GameEventStartProto {
+    GameStateProto state = 1;
+}
+
+message GameEventCompleteProto {
+    GameStateProto state = 1;
+}
+
+message GameEventSpawnProto {
+    int32 entityId = 1;
+    RectangleProto rectangle = 2;
+    oneof entity {
+        EagleProto eagle = 3;
+        TankProto tank = 4;
+        BulletProto bullet = 5;
+        BonusProto bonus = 6;
+        BrickProto bricks = 7;
+    }
+}
+
+message GameEventMoveProto {
+    int32 entityId = 1;
+    PositionProto position = 2;
+}
+
+message GameEventStopProto {
+    int32 entityId = 1;
+}
+
+message GameEventHitProto {
+    int32 entityId = 1;
+    ShotProto shot = 2;
+}
+
+message GameEventDestroyProto {
+    int32 entityId = 1;
+    ShotProto shot = 2;
+}
+
+message GameEventActionProto {
+    int32 entityId = 1;
+    oneof action {
+        PositionProto move = 2;
+        bool stop = 3;
+        bool shot = 4;
+    }
+}
+
 message GameEventProto {
     int32 time = 1;
-    string event = 2;
+    oneof event {
+        GameEventStartProto start = 2;
+        GameEventCompleteProto complete = 3;
+        GameEventSpawnProto spawn = 4;
+        GameEventMoveProto move = 5;
+        GameEventStopProto stop = 6;
+        GameEventHitProto hit = 7;
+        GameEventDestroyProto destroy = 8;
+        GameEventActionProto action = 9;
+    }
 }

src/common/resources/classic/config.yaml

@@ -1,15 +1,14 @@
 game:
+  levels: 36
   friendlyFire: false
   complete:
     - team: human
 
 map:
-  cell:
+  cellWidth: 22
-    width: 22
+  cellHeight: 22
-    height: 22
+  gridWidth: 26
-  grid:
+  gridHeight: 26
-    width: 26
-    height: 26
 
 bricks:
   - {type: border, index: -1, layer: 2, armor: -1}
@@ -41,7 +40,8 @@ team:
     players:
       - {<<: *human, index: 0, color: 0xFFFF00, control: 'null'}
       - {<<: *human, index: 1, color: 0x15C040, control: 'null'}
-    eagle: {}
+    eagle:
+      score: 0
 
 points:
   - {team: human, type: eagle, index: -1, direction: right, x: 12, y: 24}