up version

.editorconfig

@@ -7,3 +7,6 @@ indent_style = space
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+[*.yaml]
+indent_size = 2

CHANGELOG.md

@@ -0,0 +1,44 @@
+0.17.0
+------
+* Improved `ResultFrame`
+* Improved bonuses
+* Set `DeviceType.SCREEN` as default on mobile devices 
+
+0.16.0
+------
+* Added `GamepadView` for sensor control
+* Added `AppTheme`
+* Replace `LevelPopup` with `StartFrame`
+* Added `LevelPack`
+* Added scrolls to lists
+* Fixed `GameView` size for small screens
+
+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,73 +1,22 @@
-* build
-  * gulp 100%
-  * linux 100%
-  * deb-package 100%
-  * windows 0%
-  * exe-package 0% (inno setup)
-  
-* deploy
-  * capistrano 100%
-
-* ui
-  * 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%  
+* bonuses
+    * death game bonuses
+    * boat bonus
+* tanks and bullets speed balancing
+* game series
+    * network series
+* map packs
+    * create in editor
+    * import in game
+    * save imported in local storage
+    * database
+    * cache
+* improve bots
+    * A star
+* game config validate
+* additional weapon
+    * mine
+    * display count
+    * bonus ammo
+    * screen gamepad (button enabled, count label)
+* ui:
+    * game frame layouts

ansible/group_vars/all.yml

@@ -5,7 +5,7 @@ project_user: holop
 deploy_user: "{{ project_user }}"
 deploy_project: "{{ project_name }}"
 deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
-deploy_repo_version: master
+deploy_repo_version: develop
 deploy_npm: yes
 
 service_name: "{{ project_name }}"

config.example.json

@@ -1,5 +1,7 @@
 {
     "SdkDir": "C:\\sdk",
+    "PublishDir": "",
+    "PublishUrl": "https://shmyga.ru/repo/tankz",
     "SSH": {
         "PrivateKey": null,
         "Passphrase": null

config.shmyga.ru.json

@@ -1,5 +1,7 @@
 {
     "SdkDir": "/home/holop/sdk",
+    "PublishDir": "/opt/repo/tankz",
+    "PublishUrl": "https://shmyga.ru/repo/tankz",
     "SSH": {
         "PrivateKey": null,
         "Passphrase": null

gulpfile.js

@@ -2,13 +2,11 @@ const gulp = require('gulp');
 const gulpClean = require('gulp-clean');
 const Config = require('./config.json');
 const packageInfo = require('./package.json');
-const {Sdk, Haxe, Project, FlashPlayer} = require('gulp-haxetool');
+const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
 const dateformat = require('dateformat');
 const argv = require('yargs').argv;
+const publish = require('./tasks/gulp-publish');
 
-// ToDo: update default in gulp-haxetool
-FlashPlayer.VERSION = '32';
-//Haxe.VERSION = '4.0.0-rc.2';
 if (Config.SdkDir) {
     Sdk.dir = Config.SdkDir;
 }
@@ -26,9 +24,7 @@ exports.generate = function generate()  {
 };
 
 /**
- * ToDo:
- * windows target
- * window exe package (innosetup)
+ * base config
  */
 const config = new Project.Config({
     meta: {
@@ -46,7 +42,7 @@ const config = new Project.Config({
         'src-gen/haxe',
     ],
     assets: [
-        'src/common/resources'
+        'src/common/resources',
     ],
     flags: [
         //'proto_debug',
@@ -68,11 +64,15 @@ const client = new Project(
         Project.Platform.FLASH,
         Project.Platform.HTML5,
         Project.Platform.LINUX,
+        Project.Platform.WINDOWS,
         Project.Platform.ANDROID,
     ],
     config.branch({
         name: 'client',
-        sources: ['src/client/haxe'],
+        sources: [
+            //'src/fixes/haxe',
+            'src/client/haxe',
+        ],
         main: 'ru.m.tankz.Client',
         preloader: 'ru.m.tankz.Preloader',
         assets: [
@@ -93,7 +93,6 @@ const client = new Project(
             `CompilationOption.set('port',${port})`,
         ]
     }),
-    module.exports.generate
 ).bind(module, gulp);
 
 /**
@@ -107,7 +106,11 @@ const editor = new Project(
     ],
     config.branch({
         name: 'editor',
-        sources: ['src/client/haxe', 'src/editor/haxe'],
+        sources: [
+            //'src/fixes/haxe',
+            'src/client/haxe',
+            'src/editor/haxe',
+        ],
         main: 'ru.m.tankz.editor.Editor',
         preloader: 'ru.m.tankz.Preloader',
         assets: [
@@ -117,7 +120,7 @@ const editor = new Project(
         meta: {
             filename: 'editor',
             width: 1024,
-            height: 850,
+            height: 768,
         },
         flags: [
             //'dev_layout',
@@ -136,24 +139,50 @@ const server = new Project(
         sources: ['src/server/haxe'],
         main: 'ru.m.tankz.server.Server',
     }),
-    module.exports.generate
 ).bind(module, gulp);
 
+/**
+ * publish
+ */
+module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
+
 /**
  * default
  */
-module.exports.default = gulp.series(
+const defaultSeries = [
     exports.clean,
+    exports.generate,
     module.exports['client:flash:build'],
     module.exports['client:flash:html'],
     module.exports['client:html5:build'],
-    module.exports['client:linux:build'],
-    module.exports['client:linux:deb'],
-    //module.exports['client:android:build'],
 
     module.exports['editor:flash:build'],
     module.exports['editor:flash:html'],
     module.exports['editor:html5:build'],
 
     module.exports['server:neko:build'],
+];
+
+if (System.isLinux) {
+    defaultSeries.push(
+        module.exports['client:linux:build'],
+        module.exports['client:linux:archive'],
+        module.exports['client:linux:deb'],
+
+        module.exports['client:android:build'],
+    );
+}
+
+if (System.isWindows) {
+    defaultSeries.push(
+        module.exports['client:windows:build'],
+        module.exports['client:windows:archive'],
+        module.exports['client:windows:installer'],
+    );
+}
+
+defaultSeries.push(
+    exports.publish,
 );
+
+module.exports.default = gulp.series(defaultSeries);

package.json

@@ -1,25 +1,24 @@
 {
     "name": "tankz",
-    "version": "0.14.0",
+    "version": "0.17.0",
     "private": true,
     "devDependencies": {
         "dateformat": "^3.0.3",
         "gulp": "^4.0.0",
         "gulp-add": "0.0.2",
         "gulp-clean": "^0.4.0",
-        "gulp-haxetool": "^0.0.19",
+        "gulp-haxetool": "0.1.0",
         "yargs": "^13.2.4"
     },
     "haxeDependencies": {
         "haxework": "git@bitbucket.org:shmyga/haxework.git",
         "lime": "7.5.0",
         "openfl": "8.9.1",
-        "hxcpp": "4.0.8",
+        "hxcpp": "4.0.52",
         "promhx": "1.1.0",
         "protohx": "0.4.6",
         "yaml": "1.3.0",
         "orm": "2.1.0",
-        "yield": "2.0.0",
         "haxe-crypto": "0.0.7",
         "svg": "1.1.2"
     }

sql/init.sql

@@ -1,31 +0,0 @@
--- mysql -u shmyga -pxkbp8jh9z2 armageddon --protocol TCP
-CREATE USER 'shmyga'@'localhost' IDENTIFIED BY 'xkbp8jh9z2';
-
-DROP DATABASE IF EXISTS armageddon;
-CREATE DATABASE IF NOT EXISTS armageddon;
-GRANT ALL ON armageddon.* TO 'shmyga'@'localhost' IDENTIFIED BY 'xkbp8jh9z2';
-
-
-DROP TABLE IF EXISTS armageddon.account;
-CREATE TABLE IF NOT EXISTS armageddon.account (
-  id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
-  login VARCHAR(255) UNIQUE,
-  password VARCHAR(32)
-);
-
-DROP TABLE IF EXISTS armageddon.person;
-CREATE TABLE IF NOT EXISTS armageddon.person (
-  id INT UNSIGNED PRIMARY KEY AUTO_INCREMENT,
-  account_id INT UNSIGNED NOT NULL,
-  name VARCHAR(255),
-
-  CONSTRAINT person_2_account FOREIGN KEY (account_id) REFERENCES armageddon.account(id)
-    MATCH SIMPLE ON DELETE CASCADE ON UPDATE NO ACTION
-);
-
-INSERT INTO armageddon.account (id,login,password) VALUES(1,'shmyga', 'd48cc4eb42c058869ae90daef9606e43');
-INSERT INTO armageddon.person (id,account_id,name) VALUES(1,1,'-=Shmyga=-');
-
-INSERT INTO armageddon.account (id,login,password) VALUES(2,'a', md5('a'));
-INSERT INTO armageddon.person (id,account_id,name) VALUES(2,2,'a');
-

src/client/haxe/ru/m/Device.hx

@@ -0,0 +1,42 @@
+package ru.m;
+
+@:enum abstract Platform(String) from String to String {
+    var ANDROID = "android";
+    var LINUX = "linux";
+    var WINDOWS = "windows";
+}
+
+class Device {
+
+    public static var platform(get, null):Platform;
+
+    private static function get_platform():Platform {
+        #if android
+        return ANDROID;
+        #elseif linux
+        return LINUX;
+        #elseif windows
+        return WINDOWS;
+        #else
+        return null;
+        #end
+    }
+
+    private static var MOBILES(default, never):Array<String> = [
+        "Android", "webOS", "iPhone", "iPad", "iPod", "BlackBerry", "Windows Phone",
+    ];
+
+    public static function isMobile():Bool {
+        #if android
+        return true;
+        #elseif js
+        var userAgent = js.Browser.navigator.userAgent;
+        for (mobile in MOBILES) {
+            if (userAgent.indexOf(mobile) > -1) {
+                return true;
+            }
+        }
+        #end
+        return false;
+    }
+}

src/client/haxe/ru/m/Updater.hx

@@ -0,0 +1,82 @@
+package ru.m;
+
+import haxework.net.JsonLoader;
+import openfl.Lib;
+import openfl.net.URLRequest;
+import promhx.Promise;
+import ru.m.Device;
+
+@:enum abstract PackageType(String) from String to String {
+    var APK = "apk";
+    var DEB = "deb";
+    var EXE = "exe";
+    var ARCHIVE = "archive";
+}
+
+typedef PackageInfo = {
+    var platform:Platform;
+    var type:PackageType;
+    var path:String;
+    var filename:String;
+    var url:String;
+}
+
+typedef PackagesBundle = {
+    var name:String;
+    var version:String;
+    var packages:Array<PackageInfo>;
+}
+
+class Updater {
+
+    private static inline var TAG = "Update";
+
+    public var type(get, null):PackageType;
+    public var bundle(default, null):PackagesBundle;
+
+    private var url:String;
+    private var version:String;
+
+    public function new(version:String, url:String) {
+        this.url = url;
+        this.version = version;
+    }
+
+    private function get_type():PackageType {
+        return switch Device.platform {
+            case ANDROID: APK;
+            case LINUX: DEB;
+            case WINDOWS: EXE;
+            case _: null;
+        }
+    }
+
+    private function resolveBundle():Promise<PackagesBundle> {
+        return bundle != null ? Promise.promise(bundle) : new JsonLoader().GET(url).then(function(bundle) {
+            this.bundle = bundle;
+            return this.bundle;
+        });
+    }
+
+    public function check():Promise<Bool> {
+        return resolveBundle().then(function(bundle:PackagesBundle):Bool {
+            this.bundle = bundle;
+            return bundle.version != version && Lambda.exists(bundle.packages, function(item) {
+                return item.platform == Device.platform && item.type == type;
+            });
+        });
+    }
+
+    public function download():Promise<Bool> {
+        return resolveBundle().then(function(bundle:PackagesBundle) {
+            for (item in bundle.packages) {
+                if (item.platform == Device.platform && item.type == type) {
+                    L.i(TAG, 'download: ${item.url}');
+                    Lib.getURL(new URLRequest(item.url));
+                    return true;
+                }
+            }
+            return false;
+        });
+    }
+}

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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,8 @@
+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

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

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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,10 @@
+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

@@ -0,0 +1,62 @@
+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

@@ -0,0 +1,38 @@
+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/display/DisplayObjectContainerExtender.hx

@@ -0,0 +1,22 @@
+package ru.m.display;
+
+import flash.display.DisplayObject;
+import flash.display.DisplayObjectContainer;
+
+class DisplayObjectContainerExtender {
+
+    public static function childrenIterator():Iterator<DisplayObject> {
+        throw "Not implemented";
+    }
+
+    public static function removeChildSafety(self:DisplayObjectContainer, child:DisplayObject):DisplayObject {
+        if (self.contains(child)) {
+            return self.removeChild(child);
+        }
+        return null;
+    }
+
+    public static function containsRecursivle(child:DisplayObject):Bool {
+        throw "Not implemented";
+    }
+}

src/client/haxe/ru/m/skin/ButtonSVGSkin.hx

@@ -2,33 +2,41 @@ package ru.m.skin;
 
 import format.SVG;
 import haxework.color.Color;
-import haxework.color.ColorUtil;
-import haxework.view.ButtonView;
+import haxework.view.form.ButtonView;
 import haxework.view.skin.ISkin;
 
-class ButtonSVGSkin implements ISkin<ButtonView> {
+using StringTools;
+using haxework.color.ColorUtil;
 
-    private var svg:String;
-    private var color:Color;
+@:style class ButtonSVGSkin implements ISkin<ButtonView> {
+
+    @:style(null) private var svg:String;
+    @:style(0) private var color:Null<Color>;
+    @:style(false) private var solid:Null<Bool>;
 
     private var svgs:Map<ButtonState, SVG>;
 
-    public function new(svg:String, color:Color) {
+    public function new(?svg:String, ?color:Color, ?solid:Bool) {
         this.svg = svg;
         this.color = color;
-        init();
+        this.solid = solid;
+        init(solid);
     }
 
     private inline function buildSVG(color:Color):SVG {
-        return new SVG(StringTools.replace(svg, "currentColor", '#${StringTools.hex(color)}'));
+        return new SVG(svg.replace("currentColor", '#${color}'));
     }
 
-    private function init():Void {
-        svgs = new Map<ButtonState, SVG>();
-        svgs.set(ButtonState.UP, buildSVG(color));
-        svgs.set(ButtonState.DOWN, buildSVG(ColorUtil.diff(color, -24)));
-        svgs.set(ButtonState.OVER, buildSVG(ColorUtil.diff(color, 24)));
-        svgs.set(ButtonState.DISABLED, buildSVG(ColorUtil.grey(color)));
+    private function init(solid:Bool):Void {
+        var color = color;
+        if (solid) {
+            color = color.multiply(1.5);
+        }
+        svgs = new Map();
+        svgs.set(UP, buildSVG(color));
+        svgs.set(DOWN, buildSVG(color.diff(-24)));
+        svgs.set(OVER, buildSVG(color.diff(24)));
+        svgs.set(DISABLED, buildSVG(color.grey()));
     }
 
     public function draw(view:ButtonView):Void {
@@ -37,7 +45,10 @@ class ButtonSVGSkin implements ISkin<ButtonView> {
         graphics.beginFill(0, 0);
         graphics.drawRect(0, 0, view.width, view.height);
         graphics.beginFill(color);
-        graphics.lineStyle(2, ColorUtil.multiply(color, 1.5));
+        if (!solid) {
+            graphics.lineStyle(2, color.multiply(1.5));
+        }
+        // ToDo: padding
         svg.render(graphics, 0, 0, Std.int(view.width * 0.8), Std.int(view.height * 0.8));
         graphics.lineStyle();
         graphics.endFill();

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

@@ -0,0 +1,162 @@
+package ru.m.tankz;
+
+import flash.text.TextFormatAlign;
+import haxework.color.Color;
+import haxework.view.geometry.Box;
+import haxework.view.geometry.HAlign;
+import haxework.view.geometry.SizeValue;
+import haxework.view.geometry.VAlign;
+import haxework.view.theme.ITheme;
+import haxework.view.theme.Theme;
+import haxework.view.utils.DrawUtil;
+import openfl.Assets;
+import ru.m.skin.ButtonSVGSkin;
+
+using haxework.color.ColorUtil;
+
+class AppTheme extends Theme {
+
+    public static var COLORS(default, never):ThemeColors = {
+        light: 0x95937D,
+        dark: 0x777564,
+        text: 0xE7E0BB,
+        active: 0xFFFF00,
+    }
+
+    public function new() {
+        super({embed: true}, COLORS);
+    }
+
+    override private function reload():Void {
+        super.reload();
+        register(new Style("light", [
+            "skin.background.color" => colors.light,
+        ]));
+
+        register(new Style("dark", [
+            "skin.background.color" => colors.dark,
+        ]));
+
+        register(new Style("font", [
+            "_" => null,
+        ], ["text"]));
+
+        register(new Style("text.header", [
+            "font.size" => fontSize.big,
+            "font.align" => TextFormatAlign.CENTER,
+            "skin.background.color" => Color.fromInt(0x000000),
+            "skin.background.alpha" => 0.1,
+            "skin.border.color" => colors.light,
+            "geometry.padding" => Box.fromArray([50, 8]),
+            "geometry.margin" => Box.fromArray([0, 0, 30, 30]),
+        ], ["text"]));
+
+        register(new Style("button.menu", [
+            "font.size" => fontSize.big,
+            "geometry.padding" => Box.fromFloat(0),
+            "geometry.width" => SizeValue.fromInt(250),
+            "geometry.height" => SizeValue.fromInt(50),
+        ], ["button"]));
+
+        register(new Style("text.box", [
+            "skin.background.color" => Color.fromInt(0x000000),
+            "skin.background.alpha" => 0.1,
+            "skin.border.color" => colors.light,
+            "geometry.padding" => Box.fromArray([15, 8]),
+        ], ["text"]));
+
+        register(new Style("text.box.active", [
+            "skin.background.color" => Color.fromInt(0x55aa55),
+            "skin.background.alpha" => 1,
+            "skin.border.color" => Color.fromInt(0x88dd88),
+        ], ["text.box"]));
+
+        register(new Style("button.level", [
+            "font.size" => fontSize.veryBig,
+            "geometry.width" => SizeValue.fromInt(64),
+            "geometry.height" => SizeValue.fromInt(64),
+            "geometry.padding" => Box.fromFloat(0),
+        ], ["button"]));
+
+        register(new Style("container", [
+            "geometry.width" => SizeValue.fromString("100%"),
+            "geometry.height" => SizeValue.fromString("100%"),
+            "layout.hAlign" => HAlign.CENTER,
+            "layout.vAlign" => VAlign.MIDDLE,
+        ], ["dark"]));
+
+        register(new Style("panel", [
+            "geometry.width" => SizeValue.fromString("100%"),
+            "geometry.padding" => Box.fromArray([10, 5]),
+            "layout.vAlign" => VAlign.MIDDLE,
+        ], ["light"]));
+
+        register(new Style("window", [
+            "geometry.padding" => Box.fromFloat(2),
+        ], ["dark", "border"]));
+
+        register(new Style("line", [
+            "geometry.width" => SizeValue.fromString("100%"),
+            "geometry.height" => SizeValue.fromInt(2),
+        ], ["border"]));
+
+        register(new Style("window.close", [
+            "skin" => function() return new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), colors.light),
+            "geometry.width" => SizeValue.fromInt(36),
+            "geometry.height" => SizeValue.fromInt(36),
+        ]));
+
+        register(new Style("icon.tank", [
+            "geometry.width" => SizeValue.fromInt(42),
+            "geometry.height" => SizeValue.fromInt(42),
+            "skin.fillType" => FillType.DEFAULT,
+        ]));
+
+        var green:Color = 0x00ff00;
+        var red:Color = 0xff0000;
+        register(new Style("result.winner", [
+            "skin.border.color" => green,
+        ], ["light"]));
+        register(new Style("result.loser", [
+            "skin.border.color" => red,
+        ], ["light"]));
+        register(new Style("player.winner", [
+            "skin.background.alpha" => 0.1,
+            "skin.background.color" => green,
+        ]));
+        register(new Style("player.loser", [
+            "skin.background.alpha" => 0.1,
+            "skin.background.color" => red,
+        ]));
+
+        registerButton("settings", "cog-solid.svg");
+        registerButton("close", "times-circle-solid.svg");
+        registerButton("next", "arrow-alt-circle-right-solid.svg");
+        registerButton("prev", "arrow-alt-circle-left-solid.svg");
+        registerButton("start", "play-circle-solid.svg");
+        registerButton("login", "sign-in-solid.svg");
+        registerButton("logout", "sign-out-solid.svg");
+
+        registerButton("keyboard", "keyboard-light.svg", true);
+        registerButton("backspace", "backspace-light.svg", true);
+        registerButton("tablet-android-alt", "tablet-android-alt-light.svg", true);
+
+        register(new Style("gamepad", [
+            "skin.color" => colors.active,
+        ]));
+    }
+
+    private function registerButton(name:String, resource:String, solid:Bool = false):Void {
+        register(new Style('button.$name', [
+            "geometry.width" => SizeValue.fromInt(42),
+            "geometry.height" => SizeValue.fromInt(42),
+            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
+        ]));
+        register(new Style('button.$name.small', [
+            "geometry.width" => SizeValue.fromInt(32),
+            "geometry.height" => SizeValue.fromInt(32),
+            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
+        ]));
+    }
+
+}

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

@@ -26,7 +26,6 @@ class Client {
         #if linux
         LinuxIcon.apply();
         #end
-        Style.register();
         var view:ClientView = new ClientView();
         Root.bind(view);
         view.launch();

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

@@ -1,11 +1,21 @@
 package ru.m.tankz;
 
+import flash.Lib;
 import haxework.animate.FadeAnimate;
 import haxework.animate.UnFadeAnimate;
+import haxework.net.manage.ILoaderManager;
+import haxework.net.manage.LoaderManager;
 import haxework.resources.IResources;
 import haxework.resources.Resources;
 import haxework.view.popup.PopupManager;
+import haxework.view.theme.ITheme;
+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;
@@ -15,23 +25,27 @@ import ru.m.tankz.proto.pack.Request;
 import ru.m.tankz.proto.pack.Response;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.storage.MultiplayerStorage;
+import ru.m.tankz.storage.NetworkStorage;
 import ru.m.tankz.storage.RecordStorage;
 import ru.m.tankz.storage.SettingsStorage;
 
 class Init {
 
+    @:provide static var theme:ITheme;
     @:provide static var resources:IResources;
     @:provide static var levelBundle:ILevelBundle;
     @:provide static var configBundle:IConfigBundle;
     @:provide static var settingsStorage:SettingsStorage;
-    @:provide static var multiplayerStorage:MultiplayerStorage;
+    @:provide static var multiplayerStorage:NetworkStorage;
     @:provide static var gameStorage:GameStorage;
     @:provide static var recordStorage:RecordStorage;
     @:provide static var soundManager:SoundManager;
     @:provide static var networkManager:NetworkManager;
     @:provide static var popupManager:PopupManager;
     @:provide static var connection:IConnection<Request, Response>;
+    @:provide static var bus:IControlBus;
+    @:provide static var loaderManager:ILoaderManager;
+    @:provide static var updater:Updater;
 
     private static function buildConnection():IConnection<Request, Response> {
         var host:String = CompilationOption.get("host");
@@ -47,11 +61,12 @@ class Init {
     }
 
     public static function init():Void {
+        theme = new AppTheme();
         resources = new Resources();
         levelBundle = new LevelBundle();
         configBundle = new ConfigBundle();
         settingsStorage = new SettingsStorage();
-        multiplayerStorage = new MultiplayerStorage();
+        multiplayerStorage = new NetworkStorage();
         gameStorage = new GameStorage();
         recordStorage = new RecordStorage();
         soundManager = new SoundManager();
@@ -62,5 +77,25 @@ class Init {
 
         connection = buildConnection();
         networkManager = new NetworkManager();
+
+        bus = new ControlBus();
+        bus.connect(new KeyboardDevice(Lib.current.stage));
+
+        loaderManager = new LoaderManager();
+        updater = new Updater(Const.VERSION, "https://shmyga.ru/repo/tankz/packages.json");
+
+        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/Preloader.hx

@@ -5,7 +5,8 @@ import flash.display.Sprite;
 import flash.events.Event;
 import flash.events.ProgressEvent;
 import flash.Lib;
-import haxework.view.core.Size;
+import haxework.view.geometry.Size;
+import ru.m.tankz.AppTheme;
 
 class Progress extends Sprite {
 
@@ -105,10 +106,10 @@ class Preloader extends Sprite {
 
     public function new() {
         super();
-        Lib.current.stage.color = Style.lightColor;
+        Lib.current.stage.color = AppTheme.COLORS.light;
         progress = new Progress();
-        progress.color = Style.darkColor;
-        progress.backColor = Style.lightColor;
+        progress.color = AppTheme.COLORS.dark;
+        progress.backColor = AppTheme.COLORS.light;
         progress.size = [200, 200];
         addChild(progress);
         onResize(null);

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

@@ -1,164 +0,0 @@
-package ru.m.tankz;
-
-import flash.text.Font;
-import flash.text.FontType;
-import haxework.color.ColorUtil;
-import haxework.resources.IResources;
-import haxework.view.core.Geometry;
-import haxework.view.core.HAlign;
-import haxework.view.core.VAlign;
-import haxework.view.ITextView;
-import haxework.view.layout.Layout;
-import haxework.view.skin.ISkin;
-import haxework.view.skin.Skin;
-import openfl.Assets;
-import ru.m.skin.ButtonSVGSkin;
-
-class Style {
-
-    @:provide private static var resources:IResources;
-
-    public static var lightColor = 0x95937D;
-    public static var darkColor = 0x777564;
-    public static var textColor = 0xE7E0BB;
-    public static var activeColor = 0xFFFF00;
-    public static var borderColor = ColorUtil.multiply(lightColor, 1.5);
-
-    public static var baseFontSize = 18;
-    public static var bigFontSize = 22;
-    public static var veryBigFontSize = 24;
-
-    public static var fontFamily = "Courirer New";
-    public static var fontEmbed = false;
-
-    public static function text(color):ISkin<ITextView> {
-        return Skin.text(color, baseFontSize, fontFamily, fontEmbed);
-    }
-
-    public static function registerButton(name:String, resource:String):Void {
-        resources.skin.put('button.$name', [
-            Skin.size(64, 64),
-            new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor),
-        ]);
-        resources.skin.put('button.$name.small', [
-            Skin.size(32, 32),
-            new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), lightColor),
-        ]);
-    }
-
-    public static function textBox(color:Int):SkinSet {
-        return [
-            Skin.color(0x000000, 0.1),
-            Skin.border(lightColor, 1, 2),
-            Skin.text(color, baseFontSize, fontFamily, fontEmbed),
-        ];
-    }
-
-    public static function register(font:Font = null):Void {
-        resources.color.put("light", lightColor);
-        resources.color.put("dark", darkColor);
-        if (font == null) {
-            font = Font.enumerateFonts()[0];
-        }
-        if (font == null) {
-            font = Font.enumerateFonts(true)[0];
-        }
-        fontFamily = font == null ? "Courirer New" : font.fontName;
-        fontEmbed = font == null ? false : switch font.fontType {
-            case DEVICE: false;
-            case _: true;
-        };
-        resources.skin.put("light", [
-            Skin.color(lightColor),
-        ]);
-        resources.skin.put("dark", [
-            Skin.color(darkColor),
-        ]);
-        resources.skin.put("font", [
-            Skin.text(textColor, 0, fontFamily, fontEmbed),
-        ]);
-        resources.skin.put("text", [
-            Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
-        ]);
-        resources.skin.put("scroll.vertical", [
-            haxework.view.skin.Skin.scrollVertical(lightColor, darkColor),
-        ]);
-        resources.skin.put("text.header", [
-            Skin.color(0x000000, 0.1),
-            Skin.border(lightColor, 1, 2),
-            Skin.text(textColor, bigFontSize, fontFamily, fontEmbed),
-            Skin.geometry(new Geometry().setPadding([50, 8]).setMargin([0, 0, 0, 30])),
-        ]);
-        resources.skin.put("button", [
-            Skin.buttonColor(lightColor),
-            Skin.text(textColor, bigFontSize, fontFamily, fontEmbed),
-            Skin.size(250, 50),
-        ]);
-        resources.skin.put("text.box", [
-            Skin.color(0x000000, 0.1),
-            Skin.border(lightColor, 1, 2),
-            Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
-        ]);
-        resources.skin.put("text.box.active", [
-            Skin.color(0x55aa55),
-            Skin.border(0x88dd88, 1, 2),
-            Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
-        ]);
-        resources.skin.put("button.simple", [
-            Skin.buttonColor(lightColor),
-            Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
-            Skin.geometry(new Geometry().setPadding([25, 8])),
-        ]);
-        resources.skin.put("button.simple.active", [
-            Skin.buttonColor(lightColor, activeColor),
-            Skin.text(activeColor, baseFontSize, fontFamily, fontEmbed),
-            Skin.geometry(new Geometry().setPadding([25, 8])),
-        ]);
-        resources.skin.put("button.tab", [
-            Skin.tabColor(lightColor),
-            Skin.text(textColor, baseFontSize, fontFamily, fontEmbed),
-            Skin.geometry(new Geometry().setPadding([25, 8])),
-        ]);
-        resources.skin.put("border", [
-            Skin.border(borderColor, 1, 2),
-        ]);
-        resources.skin.put("scroll", [
-            Skin.scrollVertical(lightColor, ColorUtil.diff(lightColor, 128)),
-        ]);
-        resources.skin.put("button.level", [
-            Skin.buttonColor(lightColor),
-            Skin.text(textColor, veryBigFontSize, fontFamily, fontEmbed),
-            Skin.size(64, 64),
-        ]);
-
-        resources.skin.put("container", [
-            Skin.geometry(new Geometry().setSize("100%", "100%")),
-            Skin.layout(new Layout().setAlign(CENTER, MIDDLE)),
-            Skin.color(darkColor),
-        ]);
-        resources.skin.put("panel", [
-            Skin.geometry(new Geometry().setSize("100%", -1).setPadding([20, 10])),
-            Skin.layout(new Layout().setAlign(NONE, MIDDLE)),
-            Skin.color(lightColor),
-        ]);
-        resources.skin.put("window", [
-            Skin.color(darkColor),
-            Skin.border(borderColor, 1, 2),
-            Skin.geometry(new Geometry().setPadding(2)),
-        ]);
-        resources.skin.put("window.close", [
-            Skin.size(36, 36),
-            new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), lightColor),
-        ]);
-        resources.skin.put("line", [
-            Skin.color(borderColor),
-        ]);
-
-        registerButton("settings", "cog-solid.svg");
-        registerButton("close", "times-circle-solid.svg");
-        registerButton("next", "arrow-alt-circle-right-solid.svg");
-        registerButton("start", "play-circle-solid.svg");
-        registerButton("login", "sign-in-solid.svg");
-        registerButton("logout", "sign-out-solid.svg");
-    }
-}

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/${type}/config.yaml'), Parser.options().useObjects());
+            var source:ConfigSource = Yaml.parse(Assets.getText('resources/config/${type}.yaml'), Parser.options().useObjects());
             _cache.set(type, Config.fromSource(type, source));
         }
         return _cache.get(type);

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

@@ -1,23 +1,42 @@
 package ru.m.tankz.bundle;
 
 import openfl.Assets;
+import openfl.utils.AssetType;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.Type;
 import ru.m.tankz.util.LevelUtil;
 
 class LevelBundle implements ILevelBundle {
 
-    private var cache:Map<String, LevelConfig> = new Map();
+    private var _cache:Map<String, LevelPack> = new Map();
 
     public function new() {}
 
-    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig {
-        var key = '${type}:${levelId}';
-        if (!cache.exists(key)) {
-            var data:String = Assets.getText('resources/${type}/levels/level${LevelUtil.formatLevel(levelId)}.txt');
-            cache[key] = LevelUtil.loads(config, data);
-            cache[key].id = levelId;
+    private function resolve(id:PackId):LevelPack {
+        var bytes = Assets.getBytes('resources/level/${id}.zip');
+        return {
+            id: id,
+            data: LevelUtil.unpack(bytes).map(function(level) {
+                level.packId = id;
+                return level;
+            }),
+        };
     }
-        return cache[key];
+
+    public function get(id:PackId):LevelPack {
+        if (!_cache.exists(id)) {
+            _cache.set(id, resolve(id));
+        }
+        return _cache.get(id);
+    }
+
+    public function list():Array<PackId> {
+        var result = [];
+        for (path in Assets.list(AssetType.BINARY)) {
+            if (StringTools.startsWith(path, "resources/level")) {
+                result.push(PackId.fromString(path.split("/").pop().split(".").shift()));
+            }
+        }
+        return result;
     }
 }

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

@@ -1,27 +0,0 @@
-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 Map<Int, TankAction>();
-        for (item in data) {
-            result[item.key] = item.action;
-        }
-        return result;
-    }
-}

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

@@ -0,0 +1,12 @@
+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,60 +1,98 @@
 package ru.m.tankz.control;
 
 import flash.events.FocusEvent;
-import flash.events.KeyboardEvent;
-import flash.Lib;
-import flash.ui.Keyboard;
 import haxe.Timer;
-import ru.m.tankz.control.ActionConfig;
+import ru.m.control.DeviceAction;
+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;
 
+using haxe.EnumTools.EnumValueTools;
+
 class HumanControl extends Control {
 
-    @:provide var storage:SettingsStorage;
+    @:provide static var storage:SettingsStorage;
+    @:provide static var bus:IControlBus;
 
-    private var keyBinding:KeyBinding;
-    private var moveQueue:Array<Int>;
-    private var shotTimer:Timer;
+    private var binding:Map<DeviceType, Map<DeviceAction, TankAction>>;
+
+    private var moveQueue:Array<Direction>;
+    private var shotTimers:Map<Int, Timer>;
 
     public function new(playerId:PlayerId, controlIndex:Int) {
         super(playerId);
-        this.keyBinding = storage.getActionConfig(controlIndex).asKeyBinding();
-        moveQueue = new Array<Int>();
-        Lib.current.stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-        Lib.current.stage.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
-        //Lib.current.stage.addEventListener(FocusEvent.FOCUS_OUT, onFocusOut);
+        var config = storage.getBinding(controlIndex);
+        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 = [];
+        shotTimers = new Map();
     }
 
-    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();
+    public function hasDevice(device:DeviceType):Bool {
+        for (d in binding.keys()) {
+            if (d.equals(device)) {
+                return true;
             }
-            case TankAction.SHOT:
-                if (shotTimer == null) {
-                    shotTimer = new Timer(300);
-                    shotTimer.run = shot;
-                    shot();
         }
-            case _:
+        return false;
+    }
+
+    private function onDeviceAction(device:DeviceType, action:DeviceAction, on:Bool):Void {
+        if (binding.exists(device) && binding[device].exists(action)) {
+            toggleAction(binding[device][action], on);
         }
     }
 
-    private function onKeyUp(event:KeyboardEvent):Void {
-        if (keyBinding.exists(event.keyCode)) switch (keyBinding.get(event.keyCode)) {
-            case TankAction.MOVE(direction):
-                moveQueue.remove(event.keyCode);
-                updateMove();
-            case TankAction.SHOT:
-                if (shotTimer != null) {
-                    shotTimer.stop();
-                    shotTimer = null;
+    override public function start():Void {
+        super.start();
+        bus.signal.connect(onDeviceAction);
     }
-            case _:
+
+    override public function stop():Void {
+        super.stop();
+        bus.signal.disconnect(onDeviceAction);
+        moveQueue = [];
+        for (timer in shotTimers) {
+            timer.stop();
+        }
+        shotTimers = new Map();
+    }
+
+    public function toggleAction(action:TankAction, on:Bool):Void {
+        switch action {
+            case TankAction.MOVE(direction):
+                if (on) {
+                    if (moveQueue.indexOf(direction) == -1) {
+                        moveQueue.unshift(direction);
+                    }
+                } else {
+                    moveQueue.remove(direction);
+                }
+                updateMove();
+            case TankAction.SHOT(weapon):
+                if (on) {
+                    if (!shotTimers.exists(weapon)) {
+                        var timer = new Timer(300);
+                        timer.run = shooter(weapon);
+                        timer.run();
+                        shotTimers.set(weapon, timer);
+                    }
+                } else {
+                    if (shotTimers.exists(weapon)) {
+                        shotTimers.get(weapon).stop();
+                        shotTimers.remove(weapon);
+                    }
+                }
+            case TankAction.STOP:
         }
     }
 
@@ -65,17 +103,15 @@ class HumanControl extends Control {
 
     private function updateMove():Void {
         if (moveQueue.length == 0) {
-            action(TankAction.STOP);
+            action(STOP);
         } else {
-            switch (keyBinding.get(moveQueue[0])) {
-                case TankAction.MOVE(direction):
-                    action(TankAction.MOVE(direction));
-                case _:
-            }
+            action(MOVE(moveQueue[0]));
         }
     }
 
-    private function shot():Void {
-        action(TankAction.SHOT);
+    private function shooter(weapon:Int):Void -> Void {
+        return function():Void {
+            action(SHOT(weapon));
+        }
     }
 }

src/client/haxe/ru/m/tankz/game/GameInit.hx

@@ -0,0 +1,11 @@
+package ru.m.tankz.game;
+
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.record.GameRecord;
+import ru.m.tankz.network.NetworkManager;
+
+enum GameInit {
+    LOCAL(start:Start);
+    NETWORK(network:NetworkManager);
+    RECORD(record:GameRecord);
+}

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

@@ -1,29 +0,0 @@
-package ru.m.tankz.game;
-
-import ru.m.tankz.control.LocalControlFactory;
-import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.record.GameRecorder;
-import ru.m.tankz.storage.RecordStorage;
-
-class LocalGame extends GameRunner {
-    @:provide var recordStorage:RecordStorage;
-    private var recorder:GameRecorder;
-
-    public function new(state:GameState) {
-        super(state);
-        controlFactory = new LocalControlFactory();
-        recorder = new GameRecorder();
-        connect(recorder);
-    }
-
-    override public function onGameEvent(event:GameEvent):Void {
-        super.onGameEvent(event);
-        switch event {
-            case GameEvent.COMPLETE(_, _):
-                disconnect(recorder);
-                recorder.onGameEvent(event); //ToDo:
-                recordStorage.save(recorder.record);
-            case _:
-        }
-    }
-}

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

@@ -1,5 +1,8 @@
-package ru.m.tankz.control;
+package ru.m.tankz.local;
 
+import ru.m.tankz.control.BaseControlFactory;
+import ru.m.tankz.control.Control;
+import ru.m.tankz.control.HumanControl;
 import ru.m.tankz.Type;
 
 class LocalControlFactory extends BaseControlFactory {

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

@@ -0,0 +1,41 @@
+package ru.m.tankz.local;
+
+import ru.m.tankz.control.HumanControl;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameRunner;
+import ru.m.tankz.local.LocalControlFactory;
+import ru.m.tankz.storage.GameStorage;
+import ru.m.tankz.Type;
+
+class LocalGame extends GameRunner {
+
+    @:provide static var gameStorage:GameStorage;
+
+    public function new(start:Start) {
+        super(start);
+        controlFactory = new LocalControlFactory();
+    }
+
+    override public function onGameEvent(event:GameEvent):Void {
+        super.onGameEvent(event);
+        switch event {
+            case COMPLETE(result): updateProgress(result);
+            case _:
+        }
+    }
+
+    private function updateProgress(result:Result):Void {
+        var complete = false;
+        var humansTeams:Array<TeamId> = [];
+        for (control in controls) {
+            if (Std.is(control, HumanControl) && humansTeams.indexOf(control.playerId.team) == -1) {
+                humansTeams.push(control.playerId.team);
+            }
+        }
+        if (humansTeams.length == 1 && result.winner == humansTeams[0]) {
+            var progress = gameStorage.get(result.level.packId);
+            progress.completeLevel(result.level.id, result.state.presetId);
+            gameStorage.set(progress);
+        }
+    }
+}

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

@@ -1,5 +1,6 @@
-package ru.m.tankz.control;
+package ru.m.tankz.network;
 
+import ru.m.tankz.control.HumanControl;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.control.Control;
 

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

@@ -1,5 +1,7 @@
-package ru.m.tankz.control;
+package ru.m.tankz.network;
 
+import ru.m.tankz.control.BaseControlFactory;
+import ru.m.tankz.control.Control;
 import ru.m.tankz.Type;
 
 class NetworkControlFactory extends BaseControlFactory {
@@ -7,4 +9,8 @@ class NetworkControlFactory extends BaseControlFactory {
     override private function buildHuman(id:PlayerId, index:Int):Control {
         return new NetworkControl(id, index);
     }
+
+    override private function buildBot(id:PlayerId, type:String):Control {
+        return null;
+    }
 }

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

@@ -1,10 +1,10 @@
-package ru.m.tankz.game;
+package ru.m.tankz.network;
 
 import haxe.Unserializer;
-import ru.m.tankz.control.NetworkControlFactory;
+import ru.m.tankz.control.Controller;
 import ru.m.tankz.game.Game;
 import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameState;
+import ru.m.tankz.network.NetworkControlFactory;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.room.RoomSlotProto;
@@ -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, network.room.game.level));
+        super(network.room.game.type);
         this.network = network;
         this.controlFactory = new NetworkControlFactory();
         network.gameEventSignal.connect(onGameEventProto);
@@ -22,8 +22,8 @@ class NetworkGame extends Game {
     }
 
     private function onGameEventProto(game:GameEventResponse):Void {
-        var time = game.time;
-        var eventStr = game.event;
+        var time = game.event.time;
+        var eventStr = game.event.event;
         var event:GameEvent = Unserializer.run(eventStr);
         gameEventSignal.emit(event);
     }
@@ -38,12 +38,12 @@ class NetworkGame extends Game {
         }
     }
 
-    override public function start():Void {
+    override private function onStart(start:Start):Void {
         var slot:RoomSlotProto = Lambda.find(network.room.slots, function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
         if (slot != null) {
-            state.controls.push({playerId: [slot.slot.team, slot.slot.index], control: "human-0"});
+            start.state.controls.push({playerId: [slot.slot.team, slot.slot.index], controller: HUMAN(0)});
         }
-        super.start();
+        super.onStart(start);
     }
 
     override public function dispose():Void {

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

@@ -1,5 +1,6 @@
 package ru.m.tankz.network;
 
+import ru.m.tankz.proto.game.GameEventProto;
 import ru.m.tankz.proto.room.SlotProto;
 import ru.m.tankz.proto.room.SlotRequest;
 import haxe.Serializer;
@@ -21,7 +22,7 @@ import ru.m.tankz.proto.room.RoomListRequest;
 import ru.m.tankz.proto.room.RoomProto;
 import ru.m.tankz.proto.room.RoomRequest;
 import ru.m.tankz.proto.room.StartRequest;
-import ru.m.tankz.storage.MultiplayerStorage;
+import ru.m.tankz.storage.NetworkStorage;
 
 typedef ClientConnection = IConnection<Request, Response>;
 
@@ -46,7 +47,7 @@ class NetworkManager {
     public var gameEventSignal:Signal<GameEventResponse>;
 
     @:provide private var connection:ClientConnection;
-    @:provide private var storage:MultiplayerStorage;
+    @:provide private var storage:NetworkStorage;
 
     private var reconnectTimer:Timer;
     private var reconnectDelay:Int;
@@ -60,7 +61,7 @@ class NetworkManager {
         updateState(OFFLINE);
         connection.handler.connect(onConnectionEvent);
         connection.receiveHandler.connect(onResponse);
-        connect();
+        //connect();  // ToDo: disable network
     }
 
     private function updateState(value:ConnectionState):Void {
@@ -106,9 +107,11 @@ class NetworkManager {
     }
 
     public function action(tankId:Int, action:TankAction):Void {
-        connection.send(new Request().setGameEvent(new GameEventRequest().setTime(0).setEvent(
+        connection.send(new Request().setGameEvent(new GameEventRequest().setEvent(
+            new GameEventProto().setTime(0).setEvent(
                 Serializer.run(GameEvent.ACTION(tankId, action))
-        )));
+            )))
+        );
     }
 
     private function connect():Void {

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

@@ -6,6 +6,7 @@ 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

@@ -5,7 +5,7 @@ import flash.display.Graphics;
 import flash.display.Sprite;
 import flash.events.Event;
 import haxe.Timer;
-import haxework.view.LabelView;
+import haxework.view.form.LabelView;
 import haxework.view.SpriteView;
 import promhx.Promise;
 import ru.m.animate.Animate;
@@ -21,10 +21,15 @@ import ru.m.tankz.render.item.EagleRenderItem;
 import ru.m.tankz.render.item.IRenderItem;
 import ru.m.tankz.render.item.TankRenderItem;
 import ru.m.tankz.Type;
+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;
@@ -50,19 +55,34 @@ 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 {
-        return config = value;
+        config = value;
+        setSize(mapWidth, mapHeight, "render");
+        drawBackground();
+        return config;
+    }
+
+    private function set_gridSize(value:GridSize):GridSize {
+        gridSize = value;
+        setSize(mapWidth, mapHeight, "render");
+        drawBackground();
+        return gridSize;
     }
 
     private function drawBackground():Void {
-        var width = config.map.cellWidth * config.map.gridWidth;
-        var height = config.map.cellHeight * config.map.gridHeight;
         var g:Graphics = backgroundLayer.graphics;
         g.clear();
         g.beginFill(0x000000);
-        g.drawRect(0, 0, width, height);
+        g.drawRect(0, 0, mapWidth, mapHeight);
         g.endFill();
-        setContentSize(width, height);
     }
 
     public function draw():Void {
@@ -76,7 +96,9 @@ class Render extends SpriteView implements IRender {
     }
 
     private function clearLayer(layer:DisplayObjectContainer) {
-        while (layer.numChildren > 0) layer.removeChildAt(0);
+        while (layer.numChildren > 0) {
+            layer.removeChildAt(0);
+        }
     }
 
     public function reset():Void {
@@ -93,9 +115,10 @@ class Render extends SpriteView implements IRender {
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(_):
+            case START(start):
+                gridSize = start.level.size;
                 content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-            case COMPLETE(_, _):
+            case COMPLETE(_):
                 content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
             case SPAWN(BRICK(bricks)):
                 drawBackground();
@@ -121,12 +144,13 @@ class Render extends SpriteView implements IRender {
                 item.skin = tankConfig.skin;
                 item.hits = info.hits;
                 item.bonus = info.bonus;
+                item.name = info.name == null ? "" : info.name;
                 items.set(id, item);
                 entryLayer.addChild(item.view);
                 item.update();
                 playAnimate(item.rect.center, AnimateBundle.tankSpawn());
-            case SPAWN(BULLET(id, rect, playerId, piercing)):
-                var item = new BulletRenderItem(rect, piercing);
+            case SPAWN(BULLET(id, rect, playerId, skin)):
+                var item = new BulletRenderItem(rect, skin);
                 items.set(id, item);
                 entryLayer.addChild(item.view);
                 item.update();
@@ -183,9 +207,7 @@ class Render extends SpriteView implements IRender {
                     var item = items[id];
                     entryLayer.removeChild(item.view);
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    if (shot.score != 0) {
                     showScore(item.rect.center, shot.score);
-                    }
                     items.remove(id);
                 }
             case DESTROY(BULLET(id)):
@@ -202,18 +224,14 @@ class Render extends SpriteView implements IRender {
                 if (items.exists(id)) {
                     var item = items[id];
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    if (shot.score != 0) {
                     showScore(item.rect.center, shot.score);
-                    }
                     cast(item, EagleRenderItem).death = true;
                 }
             case DESTROY(BONUS(id, shot)):
                 if (items.exists(id)) {
                     var item = items[id];
                     upperLayer.removeChild(item.view);
-                    if (shot.score != 0) {
                     showScore(item.rect.center, shot.score);
-                    }
                     items.remove(id);
                 }
             case DESTROY(CELL(id, x, y, shot)):
@@ -236,21 +254,23 @@ class Render extends SpriteView implements IRender {
         return animate.play().then(function(animate:Animate):Void {
             // ToDo: clean animates on reset
             if (upperLayer.contains(animate)) {
-                upperLayer.removeChild(animate);
+                upperLayer.removeChildSafety(animate);
             }
             animate.dispose();
         });
     }
 
-    private function showScore(point:Point, score:Int):Void {
+    private function showScore(point:Point, score:Null<Int>):Void {
+        if (score != null && score != 0) {
             var view:LabelView = new LabelView();
-        view.skinId = "text";
+            view.style = "text";
             view.text = Std.string(score);
             view.update();
             view.redraw();
             view.x = point.x - view.width / 2;
             view.y = point.y - view.height / 2;
             upperLayer.addChild(view.content);
-        Timer.delay(function() upperLayer.removeChild(view.content), 1000);
+            Timer.delay(function() upperLayer.removeChildSafety(view.content), 1000);
+        }
     }
 }

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

@@ -0,0 +1,25 @@
+package ru.m.tankz.render;
+
+import flash.display.BitmapData;
+import openfl.Assets;
+import ru.m.tankz.Type;
+
+class RenderUtil {
+
+    public static function eagleImage(death:Bool = false):BitmapData {
+        var suffix = death ? '-death' : '';
+        return Assets.getBitmapData('resources/image/eagle/eagle${suffix}.png');
+    }
+
+    public static function tankImage(skin:String, frame:Int = 0):BitmapData {
+        return Assets.getBitmapData('resources/image/tank/${skin}-${frame}.png');
+    }
+
+    public static function bonusImage(type:BonusType):BitmapData {
+        return Assets.getBitmapData('resources/image/bonus/${type}.png');
+    }
+
+    public static function bulletImage(skin:String):BitmapData {
+        return Assets.getBitmapData('resources/image/bullet/${skin}.png');
+    }
+}

src/client/haxe/ru/m/tankz/render/item/BitmapRenderItem.hx

@@ -4,13 +4,11 @@ import flash.display.Bitmap;
 import flash.display.BitmapData;
 import flash.display.DisplayObject;
 import flash.display.PixelSnapping;
-import openfl.Assets;
 import ru.m.geom.Rectangle;
 
 class BitmapRenderItem extends RenderItem {
-    public var image(default, set):String;
+    public var image(default, set):BitmapData;
 
-    private var bitmapData:BitmapData;
     private var bitmap:Bitmap;
 
     public function new(rect:Rectangle) {
@@ -22,11 +20,12 @@ class BitmapRenderItem extends RenderItem {
         return bitmap;
     }
 
-    private function set_image(value:String):String {
+    private function set_image(value:BitmapData):BitmapData {
         if (image != value) {
             image = value;
-            bitmapData = Assets.getBitmapData(image);
-            bitmap.bitmapData = bitmapData;
+            bitmap.bitmapData = image;
+            bitmap.width = rect.width;
+            bitmap.height = rect.height;
         }
         return image;
     }

src/client/haxe/ru/m/tankz/render/item/BonusRenderItem.hx

@@ -18,7 +18,7 @@ class BonusRenderItem extends BitmapRenderItem {
     private function set_type(value:BonusType):BonusType {
         if (type != value) {
             type = value;
-            image = 'resources/image/bonus/${type}.png';
+            image = RenderUtil.bonusImage(type);
         }
         return type;
     }

src/client/haxe/ru/m/tankz/render/item/BrickRenderItem.hx

@@ -23,15 +23,19 @@ class BrickRenderItem extends RenderItem {
     private var shape:Shape;
     private var cells:Array<Point>;
 
-    public function new(rect:Rectangle, type:BrickType) {
-        super(rect);
-        this.shape = new Shape();
-        cells = [
+    private static function buildCells():Array<Point> {
+        return [
             new Point(0, 0),
             new Point(0, 1),
             new Point(1, 0),
             new Point(1, 1),
         ];
+    }
+
+    public function new(rect:Rectangle, type:BrickType) {
+        super(rect);
+        this.shape = new Shape();
+        cells = buildCells();
         this.type = type;
         move(rect.position);
     }
@@ -51,6 +55,7 @@ class BrickRenderItem extends RenderItem {
     private function set_type(value:BrickType):BrickType {
         if (type != value) {
             type = value;
+            cells = buildCells();
             image = Assets.getBitmapData('resources/image/map/${type}.png');
             redraw();
         }

src/client/haxe/ru/m/tankz/render/item/BulletRenderItem.hx

@@ -3,20 +3,19 @@ package ru.m.tankz.render.item;
 import ru.m.geom.Rectangle;
 
 class BulletRenderItem extends BitmapRenderItem {
-    public var piercing(default, set):Int = -1;
+    public var skin(default, set):String;
 
-    public function new(rect:Rectangle, piercing:Int) {
+    public function new(rect:Rectangle, skin:String) {
         super(rect);
-        this.piercing = piercing;
+        this.skin = skin;
         move(rect.position);
     }
 
-    private function set_piercing(value:Int):Int {
-        if (piercing != value) {
-            piercing = value;
-            var type = piercing > 0 ? 'piercing' : 'normal';
-            image = 'resources/image/bullet/${type}.png';
+    private function set_skin(value:String):String {
+        if (skin != value) {
+            skin = value;
+            image = RenderUtil.bulletImage(skin);
         }
-        return piercing;
+        return skin;
     }
 }

src/client/haxe/ru/m/tankz/render/item/EagleRenderItem.hx

@@ -35,8 +35,8 @@ class EagleRenderItem extends BitmapRenderItem {
         if (protect != value) {
             protect = value;
             if (protect) {
-                protectView.x = (bitmapData.width - protectView.frames[0].image.width) / 2;
-                protectView.y = (bitmapData.height - protectView.frames[0].image.height) / 2;
+                protectView.x = (image.width - protectView.frames[0].image.width) / 2;
+                protectView.y = (image.height - protectView.frames[0].image.height) / 2;
             }
             protectView.visible = protect;
             protectView.playing = protect;
@@ -47,10 +47,9 @@ class EagleRenderItem extends BitmapRenderItem {
     private function set_death(value:Bool):Bool {
         if (death != value) {
             death = value;
-            var suffix = death ? '-death' : '';
-            image = 'resources/image/eagle/eagle${suffix}.png';
+            image = RenderUtil.eagleImage(death);
             if (!color.zero) {
-                bitmap.bitmapData = bitmapData = BitmapUtil.colorize(bitmapData, color);
+                bitmap.bitmapData = image = BitmapUtil.colorize(image, color);
             }
         }
         return death;

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

@@ -7,6 +7,7 @@ import ru.m.geom.Rectangle;
 class RenderItem implements IRenderItem {
 
     public var view(get, null):DisplayObject;
+    public var content(get, null):DisplayObject;
 
     public var rect(default, null):Rectangle;
 
@@ -18,16 +19,26 @@ class RenderItem implements IRenderItem {
         throw "Not Implemented";
     }
 
+    private function get_content():DisplayObject {
+        return null;
+    }
+
     public function move(position:Position):Void {
         view.x = rect.x = position.x;
         view.y = rect.y = position.y;
         if (position.direction != null) {
             rect.direction = position.direction;
+            if (content != null) {
+                content.rotation = rect.direction.angle;
+                content.x = - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
+                content.y = - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
+            } else {
                 view.rotation = rect.direction.angle;
                 view.x = rect.x - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
                 view.y = rect.y - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
             }
         }
+    }
 
     public function update():Void {}
 

src/client/haxe/ru/m/tankz/render/item/TankRenderItem.hx

@@ -1,11 +1,15 @@
 package ru.m.tankz.render.item;
 
+import flash.display.BitmapData;
 import flash.display.DisplayObject;
 import flash.display.Sprite;
-import flash.display.BitmapData;
+import flash.text.TextField;
+import flash.text.TextFieldAutoSize;
+import flash.text.TextFormat;
 import haxework.color.Color;
+import haxework.text.BitmapTextField;
+import haxework.view.theme.ITheme;
 import haxework.view.utils.BitmapUtil;
-import openfl.Assets;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
@@ -16,11 +20,15 @@ class TankRenderItem extends BitmapRenderItem {
     public var bonus(default, set):Bool;
     public var moves(default, set):Bool;
     public var protect(default, set):Bool;
+    public var name(default, set):String;
 
     private var container:Sprite;
     private var images:Array<BitmapData>;
     private var frame:Int;
     private var protectView:Animate;
+    private var nameView:TextField;
+
+    @:provide static var theme:ITheme;
 
     public function new(rect:Rectangle) {
         super(rect);
@@ -29,16 +37,32 @@ class TankRenderItem extends BitmapRenderItem {
         protectView = AnimateBundle.tankProtect();
         protectView.visible = false;
         container.addChild(protectView);
+        nameView = buildNameView();
+        container.addChild(nameView);
         move(rect.position);
     }
 
+    private function buildNameView():TextField {
+        var result = new BitmapTextField();
+        result.defaultTextFormat = new TextFormat(theme.font.name, 10, 0xffffff);
+        result.embedFonts = theme.font.embed;
+        result.autoSize = TextFieldAutoSize.LEFT;
+        result.shadowColor = 0x000000;
+        result.stroke = true;
+        return result;
+    }
+
     override private function get_view():DisplayObject {
         return container;
     }
 
+    override private function get_content():DisplayObject {
+        return bitmap;
+    }
+
     private function redraw():Void {
-        var image1 = Assets.getBitmapData('resources/image/tank/${skin}-0.png');
-        var image2 = Assets.getBitmapData('resources/image/tank/${skin}-1.png');
+        var image1 = RenderUtil.tankImage(skin, 0);
+        var image2 = RenderUtil.tankImage(skin, 1);
         var color1:Color = switch hits {
             case 1: 0x869C43;
             case 2: 0xDEAF80;
@@ -105,6 +129,16 @@ class TankRenderItem extends BitmapRenderItem {
         return moves;
     }
 
+    private function set_name(value:String):String {
+        if (name != value) {
+            name = value;
+            nameView.text = name;
+            nameView.x = (rect.width - nameView.width) / 2;
+            nameView.y = -nameView.height / 2; //(rect.height - nameView.height) / 2;
+        }
+        return name;
+    }
+
     override public function update():Void {
         super.update();
         if (moves) {

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.GameProgress;
-import ru.m.tankz.Type.GameType;
+import ru.m.tankz.game.PackProgress;
+import ru.m.tankz.Type;
 
 class GameStorage extends SharedObjectStorage  {
 
@@ -12,11 +12,11 @@ class GameStorage extends SharedObjectStorage  {
         super('game_${VERSION}');
     }
 
-    public function get(type:GameType):GameProgress {
-        return exists(type) ? read(type) : new GameProgress(type);
+    public function get(id:PackId):PackProgress {
+        return exists(id) ? read(id) : new PackProgress(id);
     }
 
-    public function set(progress:GameProgress):Void {
-        write(progress.type, progress);
+    public function set(progress:PackProgress):Void {
+        write(progress.id, progress);
     }
 }

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

@@ -2,12 +2,12 @@ package ru.m.tankz.storage;
 
 import haxework.storage.SharedObjectStorage;
 
-class MultiplayerStorage extends SharedObjectStorage {
+class NetworkStorage extends SharedObjectStorage {
 
     public var user(get, set):User;
 
     public function new() {
-        super("multiplayer");
+        super("network");
     }
 
     private inline function get_user():User {

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

@@ -4,7 +4,7 @@ import haxe.DynamicAccess;
 import haxework.storage.SharedObjectStorage;
 import ru.m.tankz.game.record.GameRecord;
 
-@:yield class RecordStorage extends SharedObjectStorage  {
+class RecordStorage extends SharedObjectStorage  {
 
     private static inline var VERSION = 1;
 
@@ -23,17 +23,19 @@ import ru.m.tankz.game.record.GameRecord;
         super.delete('${id}.info');
     }
 
-    public function iterator():Iterator<GameRecordInfo> {
+    public function list():Array<GameRecordInfo> {
+        var result = [];
         var data:DynamicAccess<String> = so.data;
         for (id in data.keys()) {
             try {
                 if (StringTools.endsWith(id, '.info')) {
-                    @yield return read(id);
+                    result.push(read(id));
                 }
             } catch (error:Dynamic) {
                 L.w("RecordStorage", 'read ', error);
                 delete(id);
             }
         }
+        return result;
     }
 }

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

@@ -3,50 +3,79 @@ 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.ActionConfig;
-import ru.m.tankz.control.Control.TankAction;
+import ru.m.tankz.control.Binding;
+import ru.m.tankz.control.Control;
 
 class SettingsStorage extends SharedObjectStorage {
 
+    private static inline var VERSION = 4.1;
+
     public function new() {
-        super("settings");
+        super('settings_${VERSION}');
     }
 
-    public function getActionConfig(index:Int):ActionConfig {
-        return exists('action:$index') ? read('action:$index') : getDefaultActionConfig(index);
+    public function getBinding(index:Int):Binding {
+        return exists('action:$index') ? read('action:$index') : getDefaultBinding(index);
     }
 
-    public function setActionConffig(index:Int, value:ActionConfig) {
+    public function saveBinding(index:Int, value:Binding) {
         write('action:$index', value);
     }
 
-    public static function getDefaultActionConfig(index:Int):ActionConfig {
-        return ObjectUtil.clone(defaults.exists(index) ? defaults.get(index) : empty);
+    public static function getDefaultBinding(index:Int):Binding {
+        var binding = (Device.isMobile() ? mobileDefaults : defaults).get(index);
+        return binding != null ? ObjectUtil.clone(binding) : buildEmpty();
     }
 
-    private static var defaults:Map<Int, ActionConfig> = [
-        0 => new ActionConfig([
-            {action:TankAction.MOVE(Direction.TOP), key:Keyboard.W},
-            {action:TankAction.MOVE(Direction.LEFT), key:Keyboard.A},
-            {action:TankAction.MOVE(Direction.BOTTOM), key:Keyboard.S},
-            {action:TankAction.MOVE(Direction.RIGHT), key:Keyboard.D},
-            {action:TankAction.SHOT, key:Keyboard.SPACE},
-        ]),
-        1 => new ActionConfig([
-            {action:TankAction.MOVE(Direction.TOP), key:Keyboard.UP},
-            {action:TankAction.MOVE(Direction.LEFT), key:Keyboard.LEFT},
-            {action:TankAction.MOVE(Direction.BOTTOM), key:Keyboard.DOWN},
-            {action:TankAction.MOVE(Direction.RIGHT), key:Keyboard.RIGHT},
-            {action:TankAction.SHOT, key:Keyboard.NUMPAD_0},
-        ]),
+    public static function buildDeviceBinding(device:DeviceType):Binding {
+        return [
+            MOVE(Direction.TOP) => {device: device, action: DIRECTION(Direction.TOP)},
+            MOVE(Direction.LEFT) => {device: device, action: DIRECTION(Direction.LEFT)},
+            MOVE(Direction.BOTTOM) => {device: device, action: DIRECTION(Direction.BOTTOM)},
+            MOVE(Direction.RIGHT) => {device: device, action: DIRECTION(Direction.RIGHT)},
+            SHOT(0) => {device: device, action: KEY(0)},
+            SHOT(1) => {device: device, action: KEY(1)},
+            SHOT(2) => {device: device, action: KEY(2)},
+        ];
+    }
+
+    public static function buildEmpty():Binding {
+        return [
+            MOVE(Direction.TOP) => null,
+            MOVE(Direction.LEFT) => null,
+            MOVE(Direction.BOTTOM) => null,
+            MOVE(Direction.RIGHT) => null,
+            SHOT(0) => null,
+            SHOT(1) => null,
+            SHOT(2) => null,
+        ];
+    }
+
+    private static var mobileDefaults:Map<Int, Binding> = [
+        0 => buildDeviceBinding(SCREEN),
     ];
 
-    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},
-    ]);
+    private static var defaults:Map<Int, Binding> = [
+        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(0) => {device: KEYBOARD, action: KEY(Keyboard.SPACE)},
+            SHOT(1) => {device: KEYBOARD, action: KEY(Keyboard.Q)},
+            SHOT(2) => {device: KEYBOARD, action: KEY(Keyboard.E)},
+        ],
+        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(0) => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_0)},
+            SHOT(1) => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_1)},
+            SHOT(2) => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_2)},
+        ],
+    ];
 }

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

@@ -1,22 +1,16 @@
 package ru.m.tankz.view;
 
-import ru.m.tankz.game.IGame;
 import flash.events.KeyboardEvent;
 import flash.ui.Keyboard;
 import haxework.resources.IResources;
-import haxework.view.ButtonView;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.LabelView;
-import haxework.view.VGroupView;
+import haxework.view.group.VGroupView;
+import ru.m.tankz.game.IGame;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
-import ru.m.tankz.view.popup.LoginPopup;
 
 @:template class ClientView extends VGroupView {
     @:view("switcher") var switcherView:FrameSwitcher;
-    @:view var username:LabelView;
-    @:view("login") var loginButton:ButtonView;
-    @:view("logout") var logoutButton:ButtonView;
 
     @:provide var network:NetworkManager;
     @:provide var resources:IResources;
@@ -27,8 +21,6 @@ import ru.m.tankz.view.popup.LoginPopup;
     public function init():Void {
         resources.text.put('version', '${Const.VERSION}');
         switcher = switcherView;
-        network.stateSignal.connect(onConnectionState);
-        onConnectionState(network.state);
     }
 
     public function launch():Void {
@@ -36,7 +28,7 @@ import ru.m.tankz.view.popup.LoginPopup;
         content.stage.addEventListener(KeyboardEvent.KEY_UP, function(event:KeyboardEvent):Void {
             switch event.keyCode {
                 case Keyboard.ESCAPE:
-                    switcher.change(StartFrame.ID);
+                    switcher.change(MenuFrame.ID);
                 case Keyboard.M:
                     soundManager.mute = !soundManager.mute;
                 case Keyboard.P:
@@ -45,41 +37,6 @@ import ru.m.tankz.view.popup.LoginPopup;
                     }
             }
         });
-        switcher.change(StartFrame.ID);
-    }
-
-    private function onConnectionState(state:ConnectionState):Void {
-        L.d("ClientView", 'onConnectionState: ${state}');
-        switch state {
-            case ONLINE(user):
-                username.text = user.name;
-                logoutButton.visible = true;
-                loginButton.visible = false;
-            case CONNECTED:
-                username.text = "";
-                logoutButton.visible = false;
-                loginButton.visible = true;
-            case ERROR(error):
-                //L.e("ClientView", 'onConnectionState: ERROR', error);
-                L.w("ClientView", 'onConnectionState: ERROR');
-            case _:
-                username.text = "";
-                logoutButton.visible = false;
-                loginButton.visible = false;
-        }
-    }
-
-    private function login():Void {
-        LoginPopup.instance.show().then(function(user:User):Void {
-            L.d("Login", 'user: $user');
-        });
-    }
-
-    private function logout():Void {
-        network.logout();
-    }
-
-    private function close():Void {
-        switcher.change(StartFrame.ID);
+        switcher.change(MenuFrame.ID);
     }
 }

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

@@ -1,53 +1,16 @@
 ---
-layout.overflow: true
 views:
   - $type: haxework.view.frame.FrameSwitcher
     id: switcher
-    geometry.size.stretch: true
-    layout.overflow: true
-    skinId: dark
-    views:
-      - id: start
-        $type: ru.m.tankz.view.StartFrame
-      - id: level
-        $type: ru.m.tankz.view.LevelFrame
-      - id: game
-        $type: ru.m.tankz.view.GameFrame
-      - id: result
-        $type: ru.m.tankz.view.ResultFrame
-      - id: settings
-        $type: ru.m.tankz.view.SettingsFrame
-      - id: record
-        $type: ru.m.tankz.view.RecordFrame
-      - id: room_list
-        $type: ru.m.tankz.view.network.RoomListFrame
-      - id: room
-        $type: ru.m.tankz.view.network.RoomFrame
-  - $type: haxework.view.HGroupView
-    skinId: panel
-    layout.margin: 10
-    views:
-      - id: settings
-        $type: haxework.view.ButtonView
-        skinId: button.settings
-        +onPress: $code:switcher.change('settings')
-      - $type: haxework.view.SpriteView
-        geometry.size.width: 50%
-      - id: username
-        $type: haxework.view.LabelView
-        skinId: text
-      - id: login
-        $type: haxework.view.ButtonView
-        skinId: button.login
-        +onPress: $code:login()
-      - id: logout
-        $type: haxework.view.ButtonView
-        skinId: button.logout
-        +onPress: $code:logout()
-        visible: false
-      - $type: haxework.view.SpriteView
-        geometry.size.width: 50%
-      - id: close
-        $type: haxework.view.ButtonView
-        skinId: button.close
-        +onPress: $code:close()
+    geometry.stretch: true
+    style: dark
+    factory:
+        _menu_: {$class: ru.m.tankz.view.MenuFrame}
+        _level_: {$class: ru.m.tankz.view.LevelFrame}
+        _start_: {$class: ru.m.tankz.view.StartFrame}
+        _game_: {$class: ru.m.tankz.view.GameFrame}
+        _result_: {$class: ru.m.tankz.view.ResultFrame}
+        _settings_: {$class: ru.m.tankz.view.SettingsFrame}
+        _record_: {$class: ru.m.tankz.view.RecordFrame}
+        _room_list_: {$class: ru.m.tankz.view.network.RoomListFrame}
+        _room_: {$class: ru.m.tankz.view.network.RoomFrame}

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

@@ -1,46 +1,82 @@
 package ru.m.tankz.view;
 
-import haxe.ds.Option;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.VGroupView;
+import haxework.view.frame.FrameView;
+import haxework.view.group.GroupView;
+import haxework.view.layout.DefaultLayout;
+import ru.m.control.DeviceType;
+import ru.m.control.IControlBus;
+import ru.m.tankz.control.HumanControl;
 import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameState;
+import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.IGame;
+import ru.m.tankz.game.record.GamePlayer;
 import ru.m.tankz.game.record.GameRecord;
-import ru.m.tankz.network.NetworkManager;
+import ru.m.tankz.local.LocalGame;
+import ru.m.tankz.network.NetworkGame;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type;
-import ru.m.tankz.view.game.GameView;
+import ru.m.tankz.storage.SettingsStorage;
+import ru.m.tankz.view.game.GameViewA;
+import ru.m.tankz.view.game.GameViewB;
+import ru.m.tankz.view.game.IGameView;
+import ru.m.tankz.view.gamepad.GamepadView;
 
-@:template class GameFrame extends VGroupView implements GameListener {
+@:template class GameFrame extends FrameView<GameInit> implements GameListener {
     public static inline var ID = "game";
 
     private static inline var TAG = "GameFrame";
 
-    @:view("game") private var gameView(default, null):GameView;
+    @:provide static var soundManager:SoundManager;
+    @:provide static var switcher:FrameSwitcher;
+    @:provide static var gameStorage:GameStorage;
+    @:provide static var settings:SettingsStorage;
+    @:provide static var bus:IControlBus;
 
-    @: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 var gameStorage:GameStorage;
+    @:view("game") private var gameViewContainer(default, null):GroupView;
+    @:view private var gamepad(default, null):GamepadView;
 
-    @:provide var game:IGame;
+    private var gameView:IGameView;
 
-    public function onShow():Void {
-        gameView.type = game.type;
+    private var game:IGame;
+    private var recorder:GameRecord;
+
+    public function new() {
+        super(id, new DefaultLayout());
+    }
+
+    public function init():Void {
+        bus.connect(gamepad);
+    }
+
+    override public function onShow(data:GameInit):Void {
+        gamepad.visible = false;
+        game = switch data {
+            case LOCAL(start): new LocalGame(start);
+            case NETWORK(network): new NetworkGame(network);
+            case RECORD(record): new GamePlayer(record);
+        }
+        gameView = switch game.type {
+            case "dota": GameViewB.factory(game.config);
+            case _: GameViewA.factory(game.config);
+        };
+        gameViewContainer.addView(gameView);
         soundManager.config = game.config;
         gameView.render.config = game.config;
         game.connect(gameView.render);
         game.connect(soundManager);
-        if (gameView.panel != null) {
-            game.connect(gameView.panel);
-        }
+        game.connect(gameView);
         game.connect(this);
         game.start();
+        // ToDo:
+        for (control in game.controls) {
+            if (Std.is(control, HumanControl)) {
+                if (cast(control, HumanControl).hasDevice(SCREEN)) {
+                    gamepad.visible = true;
+                    break;
+                }
+            }
+        }
     }
 
     private function stop():Void {
@@ -48,47 +84,30 @@ import ru.m.tankz.view.game.GameView;
             game.dispose();
             game = null;
         }
+        if (gameView != null) {
             gameView.render.reset();
         }
+    }
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case GameEvent.COMPLETE(state, winner):
-                this.state = state;
-                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;
-                }
+            case COMPLETE(result):
                 stop();
-                switcher.change(ResultFrame.ID);
+                switcher.change(ResultFrame.ID, result);
             case _:
         }
     }
 
-    // ToDo:
-    private function next(winner:TeamId):Option<GameState> {
-        for (rule in game.config.game.complete) {
-            if (rule.team != null && rule.team != winner) {
-                return Option.None;
-            }
-        }
-        var level = state.levelId + 1;
-        if (level >= game.config.game.levels) level = 0;
-        return Option.Some(new GameState(game.type, state.presetId, level, state));
-    }
-
-    public function onHide():Void {
+    override public function onHide():Void {
         stop();
         soundManager.stopAll();
+        if (gameView != null) {
+            gameViewContainer.removeView(gameView);
+            gameView = null;
+        }
     }
 
     public function close():Void {
-        switcher.change(LevelFrame.ID);
+        switcher.change(LevelFrame.ID, game.level.packId);
     }
 }

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

@@ -1,7 +1,21 @@
 ---
+style: container
+overflow.x: crop
+overflow.y: crop
 views:
-  - $type: haxework.view.VGroupView
-    skinId: container
-    views:
   - id: game
-        $type: ru.m.tankz.view.game.GameView
+    $type: ru.m.tankz.view.game.GameViewContainer
+    layout.hAlign: center
+    layout.vAlign: middle
+  - id: gamepad
+    $type: ru.m.tankz.view.gamepad.GamepadView
+    geometry.position: absolute
+    geometry.stretch: true
+    visible: false
+  - $type: haxework.view.form.ButtonView
+    style: button.close
+    geometry.position: absolute
+    geometry.hAlign: left
+    geometry.vAlign: top
+    geometry.margin: 10
+    +onPress: ~close()

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

@@ -1,70 +1,63 @@
 package ru.m.tankz.view;
 
-import haxework.view.ButtonView;
-import haxework.view.DataView;
+import haxework.view.data.DataView;
+import haxework.view.form.ButtonView;
+import haxework.view.form.LabelView;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.LabelView;
-import haxework.view.VGroupView;
+import haxework.view.frame.FrameView;
+import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.GameState;
-import ru.m.tankz.game.IGame;
-import ru.m.tankz.game.LocalGame;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type;
-import ru.m.tankz.view.popup.LevelPopup;
+import ru.m.tankz.Type.PackId;
 
-@:template class LevelFrame extends VGroupView {
+using ru.m.tankz.view.ViewUtil;
+
+@:template class LevelFrame extends FrameView<PackId> {
     public static inline var ID = "level";
 
+    @:provide static var switcher:FrameSwitcher;
+    @:provide static var storage:GameStorage;
+    @:provide static var configBundle:IConfigBundle;
+    @:provide static var levelBundle:ILevelBundle;
+
     @:view var header:LabelView;
-    @:view var levels:DataView<LevelId, ButtonView>;
+    @:view var levels:DataView<LevelConfig, ButtonView>;
 
-    @:provide var state:GameState;
-    @:provide var game:IGame;
-    @:provide var switcher:FrameSwitcher;
-    @:provide var levelBundle:ILevelBundle;
-    @:provide var storage:GameStorage;
+    private var pack:LevelPack;
+    private var config(get, never):Config;
 
-    private var levelPopup:LevelPopup;
-
-    public function onShow():Void {
-        header.text = state.type;
-        levels.data = [for (i in 0...state.config.game.levels) i];
+    public function new() {
+        super(ID);
     }
 
-    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);
-        switcher.change(GameFrame.ID);
+    private function get_config():Config {
+        return configBundle.get(pack.id.type);
     }
 
-    private function levelViewFactory(index:Int, levelId:LevelId):ButtonView {
-        var progress = storage.get(state.type);
+    override public function onShow(data:PackId):Void {
+        header.text = data.toPackLabel();
+        pack = levelBundle.get(data);
+        levels.data = pack.data;
+    }
+
+    private function levelViewFactory(index:Int, level:LevelConfig):ButtonView {
+        var progress = storage.get(pack.id);
         var result = new ButtonView();
-        result.skinId = "button.level";
-        var presetsLine = [for (p in state.config.presets) progress.isPresetCompleted(levelId, p.id) ? '*' : '_'].join('');
-        result.text = '${levelId}\n${presetsLine}';
-        result.disabled = !progress.isLevelAvailable(levelId);
+        result.style = "button.level";
+        var presetsLine = [for (p in config.presets) progress.isPresetCompleted(level.id, p.id) ? '*' : '_'].join('');
+        result.text = '${level.id}\n${presetsLine}';
+        result.disabled = !progress.isLevelAvailable(level.id);
         return result;
     }
 
-    private function onLevelSelect(index:Int, levelId:LevelId, view:ButtonView):Void {
-        if (!storage.get(state.type).isLevelAvailable(levelId)) {
-            return;
+    private function onLevelSelect(index:Int, level:LevelConfig, view:ButtonView):Void {
+        if (storage.get(pack.id).isLevelAvailable(level.id)) {
+            switcher.change(StartFrame.ID, {
+                state: new GameState(pack.id.type),
+                level: level,
+            });
         }
-        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(state.type)
-        );
-        levelPopup.show().then(function(result) result != null ? start(level, result.preset, result.control) : {});
     }
 }

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

@@ -1,18 +1,29 @@
 ---
 views:
-  - $type: haxework.view.VGroupView
-    skinId: container
+  - $type: haxework.view.group.VGroupView
+    style: container
     views:
       - id: header
-        $type: haxework.view.LabelView
-        skinId: text.header
+        $type: haxework.view.form.LabelView
+        style: text.header
       - id: levels
-        $type: haxework.view.DataView
-        geometry.size.width: 100%
+        $type: haxework.view.data.DataView
+        geometry.width: 100%
+        geometry.height: 100%
+        overflow.y: scroll
         layout:
           $type: haxework.view.layout.TailLayout
           rowSize: 10
           margin: 5
-        factory: $this:levelViewFactory
-        +onItemSelect: $this:onLevelSelect
+        factory: ~levelViewFactory
+        +onItemSelect: ~onLevelSelect
         geometry.padding: 10
+  - $type: haxework.view.group.HGroupView
+    style: panel
+    layout.margin: 10
+    views:
+      - $type: haxework.view.SpriteView
+        geometry.width: 100%
+      - $type: haxework.view.form.ButtonView
+        style: button.prev
+        +onPress: ~switcher.change("menu")

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

@@ -0,0 +1,124 @@
+package ru.m.tankz.view;
+
+import haxework.view.data.DataView;
+import haxework.view.form.ButtonView;
+import haxework.view.form.LabelView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.frame.FrameView;
+import ru.m.tankz.bundle.ILevelBundle;
+import ru.m.tankz.game.GameInit;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.network.NetworkManager;
+import ru.m.tankz.Type;
+import ru.m.tankz.view.network.RoomFrame;
+import ru.m.tankz.view.network.RoomListFrame;
+import ru.m.tankz.view.popup.LoginPopup;
+
+using ru.m.tankz.view.ViewUtil;
+
+@:template class MenuFrame extends FrameView<Dynamic> {
+
+    public static var ID(default, never):String = "menu";
+
+    @:provide static var gameInit:GameInit;
+    @:provide static var switcher:FrameSwitcher;
+    @:provide static var network:NetworkManager;
+    @:provide static var appUpdater:Updater;
+    @:provide static var levelBundle:ILevelBundle;
+
+    @:view var packs:DataView<PackId, ButtonView>;
+    @:view var username:LabelView;
+    @:view("login") var loginButton:ButtonView;
+    @:view("logout") var logoutButton:ButtonView;
+    @:view("update") var updateButton:ButtonView;
+
+    public function new() {
+        super(ID);
+    }
+
+    override public function onShow(data:Dynamic):Void {
+        super.onShow(data);
+        network.stateSignal.connect(onConnectionState);
+        onConnectionState(network.state);
+        appUpdater.check().then(function(update:Bool) {
+            updateButton.visible = update;
+           if (update) {
+               updateButton.text = 'Update ${appUpdater.bundle.version}';
+           }
+        });
+        var list = levelBundle.list();
+        list.sort(function(a:PackId, b:PackId) return a.toPackLabel() > b.toPackLabel() ? 1 : -1);
+        packs.data = list;
+    }
+
+    override public function onHide():Void {
+        super.onHide();
+        network.stateSignal.disconnect(onConnectionState);
+    }
+
+    private function packButtonFactory(index:Int, packId:PackId):ButtonView {
+        var result = new ButtonView();
+        result.style = "button.menu";
+        result.text = packId.toPackLabel();
+        return result;
+    }
+
+    private function startGame(packId:PackId):Void {
+        gameInit = LOCAL({state: new GameState(packId.type), level: null});
+        switcher.change(LevelFrame.ID, packId);
+    }
+
+    private function startNetwork():Void {
+        switch network.state {
+            case ONLINE(user):
+                if (network.room != null) {
+                    switcher.change(RoomFrame.ID, network.room);
+                    network.joinGame(network.room.game.id, true);
+                } else {
+                    switcher.change(RoomListFrame.ID);
+                }
+            case CONNECTED:
+                LoginPopup.instance.show().then(function(user):Void {
+                    if (user != null) {
+                        switcher.change(RoomListFrame.ID);
+                    }
+                });
+            case _:
+        }
+    }
+
+    private function onConnectionState(state:ConnectionState):Void {
+        L.d("ClientView", 'onConnectionState: ${state}');
+        switch state {
+            case ONLINE(user):
+                username.text = user.name;
+                logoutButton.visible = true;
+                loginButton.visible = false;
+            case CONNECTED:
+                username.text = "";
+                logoutButton.visible = false;
+                loginButton.visible = true;
+            case ERROR(error):
+                //L.e("ClientView", 'onConnectionState: ERROR', error);
+                L.w("ClientView", 'onConnectionState: ERROR');
+            case _:
+                username.text = "";
+                logoutButton.visible = false;
+                loginButton.visible = false;
+        }
+    }
+
+    private function login():Void {
+        LoginPopup.instance.show().then(function(user:User):Void {
+            L.d("Login", 'user: $user');
+        });
+    }
+
+    private function logout():Void {
+        network.logout();
+    }
+
+    private function appUpdate():Void {
+        appUpdater.download();
+    }
+}

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

@@ -0,0 +1,74 @@
+---
+views:
+  - $type: haxework.view.group.VGroupView
+    style: container
+    overflow.y: scroll
+    views:
+      - $type: haxework.view.group.VGroupView
+        layout.margin: 10
+        layout.hAlign: center
+        views:
+          - $type: haxework.view.form.LabelView
+            text: Tank'z
+            style: font
+            font.size: 100
+            geometry.margin.bottom: 30
+          - id: packs
+            $type: haxework.view.data.DataView
+            layout:
+              $type: haxework.view.layout.VerticalLayout
+              margin: 10
+            factory: ~packButtonFactory
+            +onDataSelect: ~startGame
+          - $type: haxework.view.SpriteView
+            style: line
+            geometry.width: 250
+            geometry.margin: [0, 10]
+            visible: false
+          - $type: haxework.view.form.ButtonView
+            style: button.menu
+            +onPress: ~switcher.change('record')
+            text: Records
+            visible: false
+          - id: network
+            $type: haxework.view.form.ButtonView
+            style: button.menu
+            +onPress: ~startNetwork()
+            text: Network
+            visible: false
+  - $type: haxework.view.form.LabelView
+    geometry.hAlign: right
+    geometry.vAlign: top
+    geometry.position: absolute
+    geometry.margin: [0, 20, 20, 0]
+    style: text.box
+    text: $r:text:version
+  - $type: haxework.view.group.HGroupView
+    style: panel
+    layout.margin: 10
+    views:
+      - id: settings
+        $type: haxework.view.form.ButtonView
+        style: button.settings
+        +onPress: ~switcher.change('settings')
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%
+      - id: username
+        $type: haxework.view.form.LabelView
+        style: text
+      - id: login
+        $type: haxework.view.form.ButtonView
+        style: button.login
+        +onPress: ~login()
+      - id: logout
+        $type: haxework.view.form.ButtonView
+        style: button.logout
+        +onPress: ~logout()
+        visible: false
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%
+      - id: update
+        $type: haxework.view.form.ButtonView
+        style: button.active
+        +onPress: ~appUpdate()
+        visible: false

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

@@ -1,28 +1,27 @@
 package ru.m.tankz.view;
 
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.list.ListView;
+import haxework.view.frame.FrameView;
 import haxework.view.list.VListView;
-import haxework.view.VGroupView;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
-@:template class RecordFrame extends VGroupView {
+@:template class RecordFrame extends FrameView<Dynamic> {
+
     public static var ID(default, never):String = "record";
 
+    @:provide static var switcher:FrameSwitcher;
+    @:provide static var recordStorage:RecordStorage;
+
     @:view var data:VListView<GameRecordInfo>;
 
-    @:provide var recordStorage:RecordStorage;
-    @:provide var switcher:FrameSwitcher;
-    @:provide var record:GameRecord;
+    public function new() {
+        super(ID);
+    }
 
-    public function onShow():Void {
-        var data = Lambda.array(recordStorage);
+    override public function onShow(_:Dynamic):Void {
+        var data = recordStorage.list();
         data.sort(function(a:GameRecordInfo, b:GameRecordInfo) return Std.int(b.date.getTime() - a.date.getTime()));
         this.data.data = data;
     }
-
-    private function onRecordSelect(item:IListItemView<GameRecordInfo>):Void {
-
-    }
 }

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

@@ -1,18 +1,24 @@
 ---
 views:
-  - $type: haxework.view.VGroupView
-    skinId: container
-    geometry.padding: 20
+  - $type: haxework.view.group.VGroupView
+    style: container
     views:
-      - $type: haxework.view.LabelView
-        skinId: text.header
+      - $type: haxework.view.form.LabelView
+        style: text.header
         text: Records
       - id: data
         $type: haxework.view.list.VListView
-        factory: $code:function() return new ru.m.tankz.view.common.RecordView()
-        +onItemSelect: $this:onRecordSelect
+        factory: ~function() return new ru.m.tankz.view.common.RecordView()
         geometry.margin.top: 20
-        geometry.size.stretch: true
+        geometry.stretch: true
         scroll:
           $type: haxework.view.list.VScrollBarView
-            skinId: scroll
+  - $type: haxework.view.group.HGroupView
+    style: panel
+    layout.margin: 10
+    views:
+      - $type: haxework.view.SpriteView
+        geometry.width: 100%
+      - $type: haxework.view.form.ButtonView
+        style: button.prev
+        +onPress: ~switcher.change("menu")

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

@@ -1,51 +1,65 @@
 package ru.m.tankz.view;
 
-import haxework.view.ButtonView;
-import haxework.view.DataView;
+import haxework.view.data.DataView;
+import haxework.view.form.ButtonView;
+import haxework.view.form.LabelView;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.LabelView;
-import haxework.view.VGroupView;
-import ru.m.tankz.game.GameRunner;
+import haxework.view.frame.FrameView;
+import ru.m.tankz.bundle.ILevelBundle;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.GameState;
-import ru.m.tankz.game.IGame;
-import ru.m.tankz.view.common.LifeView;
+import ru.m.tankz.storage.GameStorage;
+import ru.m.tankz.view.result.ResultPlayerView;
 
-@:template class ResultFrame extends VGroupView {
+using ru.m.tankz.view.ViewUtil;
+
+@:template class ResultFrame extends FrameView<Result> {
     public static var ID(default, never):String = "result";
 
-    @:view("result") var resultView:DataView<PlayerState, LifeView>;
+    @:view("result") var resultView:DataView<PlayerState, ResultPlayerView>;
     @:view("level") var levelLabel:LabelView;
+    @:view("next") var nextButton:ButtonView;
 
     @:provide var frames:FrameSwitcher;
-    @:provide var state:GameState;
-    @:provide("next") var nextState:GameState;
-    @:provide var game:IGame;
+    @:provide static var levelBundle:ILevelBundle;
+    @:provide static var gameStorage:GameStorage;
 
-    private function playerViewFactory(index:Int, player:PlayerState) {
-        var view = new LifeView();
-        var playerConfig = state.config.getPlayer(player.id);
-        var tankType = playerConfig.tanks[0].type;
-        var tankConfig = state.config.getTank(tankType);
-        view.tank = tankConfig == null ? 'ba' : tankConfig.skin;
-        view.color = state.getPlayerColor(player.id);
-        view.life = player.frags;
-        view.score = player.score;
-        return view;
+    private var result:Result;
+
+    public function new() {
+        super(ID);
     }
 
-    public function onShow() {
-        resultView.data =  Lambda.array(state.players);
-        levelLabel.text = 'Level ${state.levelId}';
+    override public function onShow(data:Result):Void {
+        result = data;
+        resultView.data = result.state.humans;
+        for (view in resultView.dataViews) {
+            view.winner = view.data.id.team == data.winner;
+        }
+        levelLabel.text = data.level.toLevelLabel();
+        nextButton.disabled = !gameStorage.get(result.level.packId).isPresetAvailable(result.level.id + 1, result.state.presetId);
+        nextButton.text = 'Next #${result.level.id + 1}';
     }
 
-    private function next() {
-        if (nextState != null) {
-            game = new GameRunner(nextState);
-            frames.change(GameFrame.ID);
-        }
+    private function levels():Void {
+        frames.change(LevelFrame.ID, result.level.packId);
     }
 
-    private function close() {
-        frames.change(LevelFrame.ID);
+    private function restart():Void {
+        result.state.clean();
+        frames.change(GameFrame.ID, LOCAL({state: result.state, level: result.level}));
+    }
+
+    private function next():Void {
+        var pack = levelBundle.get(result.level.packId);
+        if (pack.data.length > result.level.id + 1) {
+            var level = pack.data[result.level.id + 1];
+            var progress = gameStorage.get(pack.id);
+            if (progress.isPresetAvailable(level.id, result.state.presetId)) {
+                result.state.clean();
+                frames.change(GameFrame.ID, LOCAL({state: result.state, level: level}));
+            }
+        }
     }
 }

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

@@ -1,16 +1,40 @@
 ---
 views:
-  - $type: haxework.view.VGroupView
-    skinId: container
+  - $type: haxework.view.group.VGroupView
+    style: container
     views:
       - id: level
-        $type: haxework.view.LabelView
-        skinId: text.header
+        $type: haxework.view.form.LabelView
+        style: text.header
+        font.align: center
       - id: result
-        $type: haxework.view.DataView
-        factory: $this:playerViewFactory
-        geometry.margin.top: 20
+        $type: haxework.view.data.DataView
         layout:
-          $type: haxework.view.layout.VerticalLayout
-          hAlign: right
-          margin: 10
+          $type: haxework.view.layout.TailLayout
+        factory: ~ru.m.tankz.view.result.ResultPlayerView.factory
+        geometry.width: 100%
+        geometry.height: 100%
+        overflow.y: scroll
+        geometry.margin.top: 20
+        layout.margin: 5
+        layout.hAlign: center
+  - $type: haxework.view.group.HGroupView
+    style: panel
+    layout.margin: 10
+    views:
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%
+      - id: levels
+        $type: haxework.view.form.ButtonView
+        text: Levels
+        +onPress: ~levels()
+      - id: restart
+        $type: haxework.view.form.ButtonView
+        text: Restart
+        +onPress: ~restart()
+      - id: next
+        $type: haxework.view.form.ButtonView
+        text: Next
+        +onPress: ~next()
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%

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

@@ -1,7 +1,14 @@
 package ru.m.tankz.view;
 
-import haxework.view.VGroupView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.frame.FrameView;
 
-@:template class SettingsFrame extends VGroupView {
+@:template class SettingsFrame extends FrameView<Dynamic> {
     public static var ID(default, never):String = "settings";
+
+    @:provide static var switcher:FrameSwitcher;
+
+    public function new() {
+        super(ID);
+    }
 }

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

@@ -1,15 +1,32 @@
 ---
 views:
-  - $type: haxework.view.VGroupView
-    skinId: container
+  - $type: haxework.view.group.VGroupView
+    style: container
     views:
-      - $type: haxework.view.LabelView
-        skinId: text.header
+      - $type: haxework.view.form.LabelView
+        style: text.header
         text: Settings
-      - $type: haxework.view.HGroupView
-        layout.margin: 20
+      - $type: haxework.view.group.GroupView
+        geometry.width: 100%
+        geometry.height: 100%
+        overflow.y: scroll
+        layout:
+          $type: haxework.view.layout.TailLayout
+          vAlign: top
+          margin: 20
         views:
-          - $type: ru.m.tankz.view.settings.SettingsEditor
+          - id: settings0
+            $type: ru.m.tankz.view.settings.SettingsEditor
             controlIndex: 0
-          - $type: ru.m.tankz.view.settings.SettingsEditor
+          - id: settings1
+            $type: ru.m.tankz.view.settings.SettingsEditor
             controlIndex: 1
+  - $type: haxework.view.group.HGroupView
+    style: panel
+    layout.margin: 10
+    views:
+      - $type: haxework.view.SpriteView
+        geometry.width: 100%
+      - $type: haxework.view.form.ButtonView
+        style: button.prev
+        +onPress: ~switcher.change("menu")

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

@@ -1,56 +1,133 @@
 package ru.m.tankz.view;
 
+import haxework.view.data.DataView;
+import haxework.view.form.ButtonView;
+import haxework.view.form.LabelView;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.VGroupView;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.network.NetworkManager;
-import ru.m.tankz.Type.GameType;
-import ru.m.tankz.view.network.RoomListFrame;
-import ru.m.tankz.view.network.RoomFrame;
-import ru.m.tankz.view.popup.FontPopup;
-import ru.m.tankz.view.popup.LoginPopup;
+import haxework.view.frame.FrameView;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.control.Controller;
+import ru.m.tankz.control.PlayerControl;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameInit;
+import ru.m.tankz.game.PackProgress;
+import ru.m.tankz.storage.GameStorage;
+import ru.m.tankz.Type;
+import ru.m.tankz.view.common.SlotView;
 
-@:template class StartFrame extends VGroupView {
+using haxe.EnumTools.EnumValueTools;
+using ru.m.tankz.view.ViewUtil;
+
+@:template class StartFrame extends FrameView<Start> {
 
     public static var ID(default, never):String = "start";
 
-    @:provide var state:GameState;
-    @:provide var switcher:FrameSwitcher;
-    @:provide var network:NetworkManager;
+    @:provide static var switcher:FrameSwitcher;
+    @:provide static var storage:GameStorage;
 
-    private var fontPopup:FontPopup;
+    private var progress:PackProgress;
 
-    private function startGame(type:GameType):Void {
-        state = new GameState(type);
-        switcher.change(LevelFrame.ID);
+    @:view var header:LabelView;
+    @:view("presets") var presetsView:DataView<GamePreset, ButtonView>;
+    @:view("teams") var teamsView:DataView<Array<PlayerControl>, DataView<PlayerControl, SlotView>>;
+
+    private var humanIndex:Int = 0;
+    private var humanTotal:Int = 2;
+
+    private var start:Start;
+
+    public function new() {
+        super(ID);
     }
 
-    private function startNetwork():Void {
-        switch network.state {
-            case ONLINE(user):
-                if (network.room != null) {
-                    switcher.change(RoomFrame.ID);
-                    network.joinGame(network.room.game.id, true);
-                } else {
-                    switcher.change(RoomListFrame.ID);
+    override public function onShow(data:Start):Void {
+        super.onShow(data);
+        start = data;
+        this.progress = storage.get(start.level.packId);
+        header.text = start.level.toLevelLabel();
+        presetsView.data = start.state.config.presets;
+        teamsView.data = defaultControls(start.state.config);
     }
-            case CONNECTED:
-                LoginPopup.instance.show().then(function(user):Void {
-                    if (user != null) {
-                        switcher.change(RoomListFrame.ID);
+
+    private static function defaultControls(config:Config):Array<Array<PlayerControl>> {
+        var result:Array<Array<PlayerControl>> = [];
+        var preset = config.getPreset(0);
+        var human = false;
+        for (team in preset.teams) {
+            if (team.id != "bot") {  // ToDo:
+                var controls:Array<PlayerControl> = [];
+                for (player in team.players) {
+                    var playerId = new PlayerId(team.id, player.index);
+                    var control:PlayerControl = {
+                        playerId: playerId,
+                        color: config.getColor(playerId),
+                        controller: NONE,
                     }
-                });
+                    if (!human) {
+                        control.controller = HUMAN(0);
+                        control.name = ControllerParser.defaultName(control.controller);
+                        human = true;
+                    }
+                    controls.push(control);
+                }
+                result.push(controls);
+            }
+        }
+        return result;
+    }
+
+    private function teamViewFactory(index:Int, value:Array<PlayerControl>):DataView<PlayerControl, SlotView> {
+        var result = new DataView();
+        result.style = "light";
+        result.geometry.padding = 5;
+        result.factory = slotViewFactory;
+        result.data = value;
+        return result;
+    }
+
+    private function slotViewFactory(index:Int, value:PlayerControl):SlotView {
+        var result = new SlotView();
+        result.select.onSelect.connect(function(controller:Controller) setController(value, controller));
+        result.control = value;
+        result.tank = start.state.config.getPlayerTank(value.playerId).skin;
+        return result;
+    }
+
+    private function setController(value:PlayerControl, controller:Controller):Void {
+        switch controller {
+            case NONE:
             case _:
+                for (teamView in teamsView.dataViews) {
+                    for (view in teamView.dataViews) {
+                        if (view.control.controller.equals(controller)) {
+                            view.control.controller = NONE;
+                            view.select.selected = NONE;
+                            view.control.name = null;
                         }
                     }
+                }
+        }
+        value.controller = controller;
+        value.name = ControllerParser.defaultName(controller);
+    }
 
-    private function choiceFont():Void {
-        if (fontPopup == null) {
-            fontPopup = new FontPopup();
+    private function presetViewFactory(index:Int, value:GamePreset):ButtonView {
+        var result = new ButtonView();
+        result.style = 'button${!progress.isPresetCompleted(start.level.id, value.id) ? ".active" : ""}';
+        result.text = value.name;
+        result.disabled = !progress.isPresetAvailable(start.level.id, value.id);
+        return result;
+    }
+
+    private function onPresetSelect(value:GamePreset):Void {
+        if (progress.isPresetAvailable(start.level.id, value.id)) {
+            start.state.presetId = value.id;
+            var controls = [];
+            for (item in teamsView.data) {
+                controls = controls.concat(item);
+            }
+            start.state.controls = controls;
+            switcher.change(GameFrame.ID, LOCAL(start));
         }
-        fontPopup
-        .show()
-        .then(function(font) Style.register(font))
-        .catchError(function(e) {});
     }
 }

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

@@ -1,41 +1,39 @@
 ---
 views:
-    - $type: haxework.view.VGroupView
-      skinId: container
+  - $type: haxework.view.group.VGroupView
+    style: container
+    views:
+      - id: header
+        $type: haxework.view.form.LabelView
+        style: text.header
+      - id: teams
+        $type: haxework.view.data.DataView
+        geometry.padding: 10
+        geometry.width: 100%
+        geometry.height: 100%
+        layout.hAlign: center
+        overflow.y: scroll
+        factory: ~teamViewFactory
+        layout:
+          $type: haxework.view.layout.TailLayout
+          margin: 5
+          rowSize: 2
+  - $type: haxework.view.group.HGroupView
+    style: panel
     layout.margin: 10
     views:
-          - $type: haxework.view.LabelView
-            text: Tank'z
-            skinId: font
-            fontSize: 100
-            geometry.margin.bottom: 30
-          - $type: haxework.view.ButtonView
-            skinId: button
-            +onPress: $code:startGame('classic')
-            text: Classic
-          - $type: haxework.view.ButtonView
-            skinId: button
-            +onPress: $code:startGame('dota')
-            text: DotA
-          - $type: haxework.view.ButtonView
-            skinId: button
-            +onPress: $code:startGame('death')
-            text: DeathMatch
-          - $type: haxework.view.ButtonView
-            skinId: button
-            +onPress: $code:switcher.change('record')
-            text: Records
-          - id: network
-            $type: haxework.view.ButtonView
-            skinId: button
-            +onPress: $code:startNetwork()
-            text: Network
-            #disabled: true
-    - $type: haxework.view.LabelView
-      geometry.hAlign: right
-      geometry.vAlign: top
-      geometry.padding: [20, 5]
-      geometry.position: absolute
-      geometry.margin: [0, 20, 20, 0]
-      skinId: text.box
-      text: $r:text:version
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%
+      - id: presets
+        $type: haxework.view.data.DataView
+        factory: ~presetViewFactory
+        +onDataSelect: ~onPresetSelect
+        layout:
+          $type: haxework.view.layout.HorizontalLayout
+          hAlign: center
+          margin: 5
+      - $type: haxework.view.SpriteView
+        geometry.width: 50%
+      - $type: haxework.view.form.ButtonView
+        style: button.prev
+        +onPress: ~switcher.change("level", start.level.packId)

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

@@ -0,0 +1,62 @@
+package ru.m.tankz.view;
+
+import ru.m.tankz.Type.PackId;
+import openfl.Assets;
+import ru.m.control.DeviceAction;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.control.Binding;
+import ru.m.tankz.control.Control;
+
+class KeyboardMap {
+
+    private var data:Map<Int, String>;
+
+    public function new() {
+        this.data = new Map();
+        var data = Assets.getText("resources/keyboard.txt");
+        for (line in data.split("\n")) {
+            var arr = line.split("\t");
+            if (arr.length == 2) {
+                this.data.set(Std.parseInt(arr[1]), arr[0]);
+            }
+        }
+
+    }
+
+    private static var instance:KeyboardMap;
+
+    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);
+    }
+}
+
+class ViewUtil {
+
+    public static function toLevelLabel(level:LevelConfig, oneline:Bool = false):String {
+        var result:Array<String> = ['${level.packId.type} #${level.id}'];
+        if (level.name != null) {
+            result.push(level.name);
+        }
+        return result.join(oneline ? " " : "\n");
+    }
+
+    public static function toPackLabel(packId:PackId):String {
+        return packId.name != PackId.DEFAULT ? '${packId.type} #${packId.name}' : packId.type;
+    }
+
+    public static function toActionLabel(action:TankAction):String {
+        return switch (action) {
+            case MOVE(d): 'MOVE_$d';
+            case SHOT(w): 'SHOT_$w';
+            case x: '$x';
+        }
+    }
+
+    public static function toBindLabel(bind:BindAction):String {
+        return bind == null ? "(NONE)" : Std.string(bind.device) + " " + switch bind.action {
+            case KEY(code): KeyboardMap.getName(code);
+            case DIRECTION(direction): Std.string(direction);
+        };
+    }
+}

src/client/haxe/ru/m/tankz/view/common/LifeView.hx

@@ -1,67 +0,0 @@
-package ru.m.tankz.view.common;
-
-import haxework.view.HGroupView;
-import haxework.view.ImageView;
-import haxework.view.LabelView;
-import openfl.Assets;
-import ru.m.tankz.game.GameState;
-
-@:template class LifeView extends HGroupView {
-    @:provide static var currentState:GameState;
-
-    @:view("tank") public var tankImage:ImageView;
-    @:view("life") public var lifeLabel:LabelView;
-    @:view("score") public var scoreLabel:LabelView;
-
-    public var state(null, set):PlayerState;
-    public var tank(null, set):String;
-    public var color(null, set):Int;
-    public var life(null, set):Int;
-    public var score(null, set):Int;
-
-    private inline function set_state(value:PlayerState):PlayerState {
-        state = value;
-        toUpdate();
-        return state;
-    }
-
-    private inline function set_tank(value:String):String {
-        if (value != null && value != tank) {
-            tank = value;
-            tankImage.image = Assets.getBitmapData('resources/image/tank/${tank}-0.png');
-        }
-        return tank;
-    }
-
-    private inline function set_color(value:Int):Int {
-        tankImage.color = value;
-        return value;
-    }
-
-    private inline function set_life(value:Int):Int {
-        lifeLabel.text = '${value}';
-        return value;
-    }
-
-    private inline function set_score(value:Int):Int {
-        scoreLabel.text = '${value}$';
-        return value;
-    }
-
-    override public function update():Void {
-        super.update();
-        if (state != null && currentState != null) {
-            var tankConfig = currentState.config.getTank(state.tank);
-            tank = tankConfig == null ? 'ba' : tankConfig.skin;
-            color = currentState.config.getColor(state.id);
-            life = state.life;
-            score = state.score;
-        }
-    }
-
-    public static inline function factory(index:Int, data:PlayerState):LifeView {
-        var result = new LifeView();
-        result.state = data;
-        return result;
-    }
-}

src/client/haxe/ru/m/tankz/view/common/LifeView.yaml

@@ -1,13 +0,0 @@
----
-layout.margin: 5
-views:
-  - id: tank
-    $type: haxework.view.ImageView
-  - id: life
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [50, 38]
-  - id: score
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [100, 38]

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

@@ -1,119 +0,0 @@
-package ru.m.tankz.view.common;
-
-import haxework.resources.IResources;
-import haxework.color.ColorUtil;
-import haxework.view.DataView;
-import haxework.view.HGroupView;
-import haxework.view.LabelView;
-import haxework.view.skin.ISkin;
-import haxework.view.ToggleButtonView;
-import ru.m.tankz.control.Control;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.Type.TeamId;
-
-class TeamButton extends ToggleButtonView {
-    public var team(default, set):TeamId;
-
-    private function set_team(value:TeamId):TeamId {
-        if (team != value) {
-            team = value;
-            text = team.substr(0, 1).toUpperCase() + team.substr(1);
-        }
-        return team;
-    }
-}
-
-class TeamSkin implements ISkin<TeamButton> {
-
-    @:provide private static var resources:IResources;
-
-    public var color(default, default):Int;
-
-    public function new(color:Int) {
-        this.color = color;
-    }
-
-    public function draw(view:TeamButton):Void {
-        view.fontColor = view.on ? 0xffffff : resources.color.get("dark");
-        var graphics = view.content.graphics;
-        graphics.beginFill(view.on ? color : resources.color.get("light"));
-        graphics.lineStyle(2, color, 0.5);
-        graphics.drawRoundRect(0, 0, view.width, view.height, 5, 5);
-        graphics.endFill();
-        graphics.lineStyle();
-    }
-}
-
-@:template class PlayerView extends HGroupView {
-    private static inline var TEAM_NONE:TeamId = "none";
-
-    public var item_index(default, set):Int;
-    public var data(default, set):Array<PlayerState>;
-    public var colorize:Bool;
-
-    @:view var label(default, null):LabelView;
-    @:view var teams(default, null):DataView<TeamId, ToggleButtonView>;
-
-    @:provide var state:GameState;
-
-    private var player:PlayerState;
-
-    private function teamViewFactory(index:Int, team:TeamId) {
-        var view = new TeamButton();
-        var color = getTeamColor(team);
-        view.skin = [Style.text(color), new TeamSkin(color)];
-        view.geometry.padding = [10, 5];
-        view.team = team;
-        view.on = team == TEAM_NONE;
-        return view;
-    }
-
-    private function set_data(value:Array<PlayerState>):Array<PlayerState> {
-        data = value;
-        teams.data = [TEAM_NONE].concat([for (team in state.preset.teams) team.id]);
-        return data;
-    }
-
-    private function getTeamColor(teamId:TeamId):Int {
-        var color = 0xaaaaaa;
-        for (team in state.preset.teams) {
-            if (team.id == teamId) {
-                if (!team.color.zero) color = team.color;
-                break;
-            }
-        }
-        return color;
-    }
-
-    private function set_item_index(value:Int):Int {
-        item_index = value;
-        label.text = 'Player ${item_index+1}';
-        return item_index;
-    }
-
-    private function onTeamSelect(team:TeamId) {
-        if (player != null) {
-            player.controller = NONE;
-            player.color = 0;
-            player = null;
-        }
-        for (p in data) {
-            if (p.id.team == team) {
-                switch (p.controller) {
-                    case NONE:
-                        player = p;
-                        player.controller = HUMAN(item_index);
-                        if (colorize) {
-                            player.color = ColorUtil.multiply(state.config.getTeam(team).color, 1.7);
-                        }
-                        break;
-                    case _:
-                }
-            }
-        }
-        for (view in teams.views) {
-            var button = cast(view, TeamButton);
-            button.on = team == button.team;
-        }
-    }
-}

src/client/haxe/ru/m/tankz/view/common/PlayerView.yaml

@@ -1,16 +0,0 @@
----
-geometry.margin: 5
-layout.margin: 10
-layout.vAlign: middle
-views:
-  - id: label
-    $type: haxework.view.LabelView
-    skinId: text
-  - id: teams
-    $type: haxework.view.DataView
-    factory: $this:teamViewFactory
-    layout:
-      $type: haxework.view.layout.TailLayout
-      rowSize: 5
-      margin: 3
-    +onDataSelect: $this:onTeamSelect

src/client/haxe/ru/m/tankz/view/common/RecordView.hx

@@ -1,11 +1,10 @@
 package ru.m.tankz.view.common;
 
-import ru.m.tankz.game.record.GamePlayer;
-import ru.m.tankz.game.IGame;
 import haxework.view.frame.FrameSwitcher;
-import haxework.view.HGroupView;
-import haxework.view.LabelView;
+import haxework.view.group.HGroupView;
+import haxework.view.form.LabelView;
 import haxework.view.list.ListView;
+import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
@@ -20,7 +19,6 @@ import ru.m.tankz.storage.RecordStorage;
 
     @:provide var recordStorage:RecordStorage;
     @:provide var switcher:FrameSwitcher;
-    @:provide var game:IGame;
 
     private function set_data(value:GameRecordInfo):GameRecordInfo {
         if (data != value) {
@@ -35,8 +33,7 @@ import ru.m.tankz.storage.RecordStorage;
 
     private function play():Void {
         var record = recordStorage.read(data.id);
-        game = new GamePlayer(record);
-        switcher.change(GameFrame.ID);
+        switcher.change(GameFrame.ID, RECORD(record));
     }
 
     private function delete():Void {

src/client/haxe/ru/m/tankz/view/common/RecordView.yaml

@@ -1,29 +1,29 @@
 ---
-geometry.size.height: 38
+geometry.height: 38
 layout.margin: 5
 layout.vAlign: middle
 views:
   - id: play
-    $type: haxework.view.ButtonView
-    skinId: button.start.small
-    +onPress: $code:play()
+    $type: haxework.view.form.ButtonView
+    style: button.start.small
+    +onPress: ~play()
   - id: date
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [250, 38]
+    $type: haxework.view.form.LabelView
+    style: text.box
+    geometry.width: 200
   - id: type
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [250, 38]
+    $type: haxework.view.form.LabelView
+    style: text.box
+    geometry.width: 200
   - id: level
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [50, 38]
+    $type: haxework.view.form.LabelView
+    style: text.box
+    geometry.width: 100
   - id: preset
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.fixed: [50, 38]
+    $type: haxework.view.form.LabelView
+    style: text.box
+    geometry.width: 100
   - id: delete
-    $type: haxework.view.ButtonView
-    skinId: button.close.small
-    +onPress: $code:delete()
+    $type: haxework.view.form.ButtonView
+    style: button.close.small
+    +onPress: ~delete()

src/client/haxe/ru/m/tankz/view/common/SlotView.hx

@@ -0,0 +1,48 @@
+package ru.m.tankz.view.common;
+
+import openfl.Assets;
+import haxework.view.ImageView;
+import haxework.view.form.LabelView;
+import haxework.view.form.SelectView;
+import haxework.view.group.HGroupView;
+import haxework.view.skin.SpriteSkin;
+import ru.m.tankz.control.Controller;
+import ru.m.tankz.control.PlayerControl;
+
+@:template class SlotView extends HGroupView {
+
+    @:view("tank") public var tankView:ImageView;
+    @:view("slot") public var slotLabel:LabelView;
+    @:view("select") public var select:SelectView<Controller>;
+
+    public var control(default, set):PlayerControl;
+    public var tank(default, set):String;
+
+    private function set_control(value:PlayerControl):PlayerControl {
+        control = value;
+        slotLabel.text = '${control.playerId.team} #${control.playerId.index}';
+        var skin:SpriteSkin = cast slotLabel.skin;
+        skin.border.color = value.color;
+        skin.border.alpha = 0.8;
+        skin.background.color = value.color;
+        skin.background.alpha = 0.2;
+        select.selected = control.controller;
+        tankView.color = value.color;
+        return control;
+    }
+
+    private function set_tank(value:String):String {
+        if (tank != value) {
+            tank = value;
+            tankView.image = Assets.getBitmapData('resources/image/tank/${tank}-0.png');
+        }
+        return tank;
+    }
+
+    private function onControllerSelect(value:Controller):Void {
+        select.currentView.style = switch value {
+            case HUMAN(_): "button.active";
+            case _: "button";
+        }
+    }
+}

src/client/haxe/ru/m/tankz/view/common/SlotView.yaml

@@ -0,0 +1,26 @@
+---
+geometry.padding: 2
+layout.margin: 10
+layout.vAlign: middle
+views:
+  - id: tank
+    $type: haxework.view.ImageView
+    style: icon.tank
+  - id: slot
+    $type: haxework.view.form.LabelView
+    style: text.box
+    geometry.width: 150
+  - id: select
+    $type: haxework.view.form.SelectView<ru.m.tankz.control.Controller>
+    geometry.width: 150
+    labelBuilder: |
+      ~function(controller) {
+          var result = ControllerParser.defaultName(controller);
+          return result == null ? "None" : result;
+      }
+    data:
+        - ~ru.m.tankz.control.Controller.NONE
+        - ~ru.m.tankz.control.Controller.HUMAN(0)
+        - ~ru.m.tankz.control.Controller.HUMAN(1)
+    selected: ~ru.m.tankz.control.Controller.NONE
+    +onSelect: ~onControllerSelect

src/client/haxe/ru/m/tankz/view/common/TankView.hx

@@ -0,0 +1,23 @@
+package ru.m.tankz.view.common;
+
+import haxework.view.ImageView;
+import ru.m.tankz.render.RenderUtil;
+import ru.m.tankz.Type.TankInfo;
+
+class TankView extends ImageView {
+
+    public var tank(null, set):TankInfo;
+
+    public function new() {
+        super();
+        style = "icon.tank";
+    }
+
+    private function set_tank(value:TankInfo):TankInfo {
+        if (value != null) {
+            color = value.color;
+            image = RenderUtil.tankImage(value.skin);
+        }
+        return value;
+    }
+}

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

@@ -1,60 +0,0 @@
-package ru.m.tankz.view.game;
-
-import haxework.view.LabelView;
-import haxework.view.VGroupView;
-import ru.m.geom.Direction;
-import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.preset.ClassicGame;
-import ru.m.tankz.Type.PlayerId;
-import ru.m.tankz.view.common.LifeView;
-
-@:template class ClassicGamePanel extends VGroupView implements IGamePanel {
-    public var position(default, null):Direction = Direction.RIGHT;
-
-    @:view var bot:LifeView;
-    @:view var player1:LifeView;
-    @:view var player2:LifeView;
-    @:view var level:LabelView;
-
-    private var player1Id:PlayerId = new PlayerId(ClassicGame.HUMAN, 0);
-    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);
-        if (state.getPlayerLife(player2Id) > 0) {
-            player2.visible = true;
-            player2.life = state.getPlayerLife(player2Id);
-            player2.score = state.getPlayerScore(player2Id);
-        } else {
-            player2.visible = false;
-        }
-    }
-
-    public function onGameEvent(event:GameEvent):Void {
-        switch event {
-            case START(state):
-                refresh(state);
-            case CHANGE(TEAM_LIFE(teamId, life)):
-                if (teamId == ClassicGame.BOT) {
-                    bot.life = life;
-                }
-            case CHANGE(PLAYER_LIFE(playerId, life)):
-                if (playerId == player1Id) {
-                    player1.life = life;
-                } else if (playerId == player2Id) {
-                    player2.life = life;
-                }
-            case CHANGE(PLAYER_SCORE(playerId, score)):
-                if (playerId == player1Id) {
-                    player1.score = score;
-                } else if (playerId == player2Id) {
-                    player2.score = score;
-                }
-            case _:
-        }
-    }
-}

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

@@ -1,25 +0,0 @@
----
-geometry.padding: 5
-geometry.size.height: 100%
-layout.margin: 5
-layout.hAlign: right
-views:
-  - id: level
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.height: 38
-    geometry.size.width: 100%
-  - $type: haxework.view.SpriteView
-    geometry.size.height: 50%
-  - id: bot
-    $type: ru.m.tankz.view.common.LifeView
-    tank: ba
-    scoreLabel.visible: false
-  - id: player1
-    $type: ru.m.tankz.view.common.LifeView
-    tank: pa
-    color: 0xFFFF00
-  - id: player2
-    $type: ru.m.tankz.view.common.LifeView
-    tank: pa
-    color: 0x15C040

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

@@ -1,28 +0,0 @@
-package ru.m.tankz.view.game;
-
-import haxework.view.DataView;
-import haxework.view.LabelView;
-import haxework.view.VGroupView;
-import ru.m.geom.Direction;
-import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.view.common.LifeView;
-
-@:template class DeathGamePanel extends VGroupView implements IGamePanel {
-    public var position(default, null):Direction = Direction.RIGHT;
-
-    @:view var level:LabelView;
-    @:view var players:DataView<PlayerState, LifeView>;
-
-    public function onGameEvent(event:GameEvent):Void {
-        switch event {
-            case START(state):
-                level.text = 'Level ${state.levelId}';
-                players.data = Lambda.array(state.players);
-            case _:
-                for (view in players.views) {
-                    view.toUpdate();
-                }
-        }
-    }
-}

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

@@ -1,18 +0,0 @@
----
-geometry.padding: 5
-geometry.size.height: 100%
-layout.margin: 5
-layout.hAlign: right
-views:
-  - id: level
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.height: 38
-    geometry.size.width: 100%
-  - $type: haxework.view.SpriteView
-    geometry.size.height: 50%
-  - id: players
-    $type: haxework.view.DataView
-    layout:
-      $type: haxework.view.layout.VerticalLayout
-    factory: $code:ru.m.tankz.view.common.LifeView.factory

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

@@ -1,46 +0,0 @@
-package ru.m.tankz.view.game;
-
-import haxework.view.HGroupView;
-import haxework.view.LabelView;
-import ru.m.geom.Direction;
-import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.preset.DotaGame;
-import ru.m.tankz.Type.TeamId;
-import ru.m.tankz.view.common.LifeView;
-
-@:template class DotaGamePanel extends HGroupView implements IGamePanel {
-    public var position(default, null):Direction = Direction.TOP;
-
-    @:view var radiant:LifeView;
-    @:view var dire: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);
-        dire.score = state.getTeamScore(DotaGame.DIRE);
-    }
-
-    private inline function getLifeView(teamId:TeamId):LifeView {
-        return switch teamId {
-            case DotaGame.RADIANT: radiant;
-            case DotaGame.DIRE: dire;
-            case _: null;
-        }
-    }
-
-    public function onGameEvent(event:GameEvent):Void {
-        switch event {
-            case START(state):
-                refresh(state);
-            case CHANGE(TEAM_LIFE(teamId, life)):
-                getLifeView(teamId).life = life;
-            case CHANGE(TEAM_SCORE(teamId, score)):
-                getLifeView(teamId).score = score;
-            case _:
-        }
-    }
-}

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

@@ -1,21 +0,0 @@
----
-geometry.size.width: 100%
-layout.margin: 20
-views:
-  - id: radiant
-    $type: ru.m.tankz.view.common.LifeView
-    tank: bc
-    color: 0xff4422
-  - $type: haxework.view.SpriteView
-    geometry.size.width: 25%
-  - id: level
-    $type: haxework.view.LabelView
-    skinId: text.box
-    geometry.size.height: 38
-    geometry.size.width: 50%
-  - $type: haxework.view.SpriteView
-    geometry.size.width: 25%
-  - id: dire
-    $type: ru.m.tankz.view.common.LifeView
-    tank: bc
-    color: 0x3284ff

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

@@ -1,53 +0,0 @@
-package ru.m.tankz.view.game;
-
-import haxework.view.IGroupView;
-import haxework.view.VGroupView;
-import ru.m.geom.Direction;
-import ru.m.tankz.preset.ClassicGame;
-import ru.m.tankz.preset.DeathGame;
-import ru.m.tankz.preset.DotaGame;
-import ru.m.tankz.render.IRender;
-import ru.m.tankz.Type;
-
-@:template class GameView extends VGroupView {
-
-    @:view public var render(default, null):IRender;
-    public var panel(default, null):IGamePanel;
-    public var type(default, set):GameType;
-
-    @:view public var top(default, null):IGroupView;
-    @:view public var bottom(default, null):IGroupView;
-    @:view public var left(default, null):IGroupView;
-    @:view public var right(default, null):IGroupView;
-
-    private function set_type(value:GameType):GameType {
-        if (type != value) {
-            type = value;
-            if (panel != null) {
-                panel.remove();
-            }
-            panel = buildPanel(type);
-            getContainer(panel.position).addView(panel);
-        }
-        return type;
-    }
-
-    private function buildPanel(type:GameType):IGamePanel {
-        return switch type {
-            case ClassicGame.TYPE: new ClassicGamePanel();
-            case DotaGame.TYPE: new DotaGamePanel();
-            case DeathGame.TYPE: new DeathGamePanel();
-            case _: throw 'Unsupported type: ${type}';
-        }
-    }
-
-    private function getContainer(position:Direction):IGroupView {
-        return switch position.toString() {
-            case "RIGHT": right;
-            case "LEFT": left;
-            case "TOP": top;
-            case "BOTTOM": bottom;
-            case _: throw 'Unsupported position: ${position}';
-        }
-    }
-}

src/client/haxe/ru/m/tankz/view/game/GameView.yaml

@@ -1,22 +0,0 @@
----
-views:
-  - id: top
-    $type: haxework.view.GroupView
-    layout.hAlign: center
-    geometry.size.width: 100%
-  - $type: haxework.view.HGroupView
-    views:
-      - id: left
-        $type: haxework.view.GroupView
-        layout.vAlign: middle
-        geometry.size.height: 100%
-      - id: render
-        $type: ru.m.tankz.render.Render
-      - id: right
-        $type: haxework.view.GroupView
-        layout.vAlign: middle
-        geometry.size.height: 100%
-  - id: bottom
-    $type: haxework.view.GroupView
-    layout.hAlign: center
-    geometry.size.width: 100%

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

@@ -0,0 +1,27 @@
+package ru.m.tankz.view.game;
+
+import haxework.view.data.DataView;
+import haxework.view.form.LabelView;
+import haxework.view.group.HGroupView;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.render.IRender;
+
+@:template class GameViewA extends HGroupView implements IGameView {
+    @:view public var render:IRender;
+    @:view public var teams:DataView<TeamState, TeamView>;
+    @:view public var level:LabelView;
+
+    private var helper:GameViewHelper;
+
+    public function onGameEvent(event:GameEvent):Void {
+        helper.onGameEvent(event);
+    }
+
+    public static function factory(config:Config):GameViewA {
+        var result = new GameViewA();
+        result.helper = new GameViewHelper(result, config);
+        return result;
+    }
+}

src/client/haxe/ru/m/tankz/view/game/GameViewA.yaml

@@ -0,0 +1,27 @@
+---
+views:
+  - id: left
+    $type: haxework.view.group.GroupView
+    layout.vAlign: middle
+    geometry.height: 100%
+    geometry.width: 50%
+  - id: render
+    $type: ru.m.tankz.render.Render
+  - id: right
+    $type: haxework.view.group.VGroupView
+    geometry.height: 100%
+    geometry.width: 50%
+    geometry.padding: 5
+    layout.vAlign: top
+    layout.margin: 5
+    views:
+      - id: level
+        $type: haxework.view.form.LabelView
+        style: text.box
+        geometry.width: 100%
+      - $type: haxework.view.SpriteView
+        geometry.height: 30%
+      - id: teams
+        $type: haxework.view.data.DataView
+        layout.margin: 3
+        factory: ~TeamView.viewFactory

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

@@ -0,0 +1,27 @@
+package ru.m.tankz.view.game;
+
+import haxework.view.data.DataView;
+import haxework.view.form.LabelView;
+import haxework.view.group.VGroupView;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.render.IRender;
+
+@:template class GameViewB extends VGroupView implements IGameView {
+    @:view public var render:IRender;
+    @:view public var teams:DataView<TeamState, TeamView>;
+    @:view public var level:LabelView;
+
+    private var helper:GameViewHelper;
+
+    public function onGameEvent(event:GameEvent):Void {
+        helper.onGameEvent(event);
+    }
+
+    public static function factory(config:Config):GameViewB {
+        var result = new GameViewB();
+        result.helper = new GameViewHelper(result, config, true);
+        return result;
+    }
+}

src/client/haxe/ru/m/tankz/view/game/GameViewB.yaml

@@ -0,0 +1,20 @@
+---
+views:
+  - id: top
+    $type: haxework.view.group.HGroupView
+    layout.vAlign: middle
+    geometry.width: 100%
+    views:
+      - id: level
+        $type: haxework.view.form.LabelView
+        style: text.box
+      - $type: haxework.view.SpriteView
+        geometry.width: 100%
+      - id: teams
+        $type: haxework.view.data.DataView
+        layout:
+          $type: haxework.view.layout.HorizontalLayout
+          margin: 5
+        factory: ~TeamView.viewFactory
+  - id: render
+    $type: ru.m.tankz.render.Render

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

@@ -0,0 +1,30 @@
+package ru.m.tankz.view.game;
+
+import haxework.view.geometry.HAlign;
+import haxework.view.geometry.VAlign;
+import haxework.view.group.GroupView;
+
+class GameViewContainer extends GroupView {
+
+    override public function update():Void {
+        super.update();
+        if (parent != null) {
+            var s = Math.min(parent.width / width, parent.height / height);
+            if (s < 1) {
+                content.scaleX = content.scaleY = s;
+                content.x = switch layout.hAlign {
+                    case LEFT | NONE: 0;
+                    case CENTER: (parent.width - width * s) / 2;
+                    case RIGHT: (parent.width - width * s);
+                }
+                content.y = switch layout.vAlign {
+                    case TOP | NONE: 0;
+                    case MIDDLE: (parent.height - height * s) / 2;
+                    case BOTTOM: (parent.height - height * s);
+                }
+            } else {
+                content.scaleX = content.scaleY = 1;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,83 @@
+package ru.m.tankz.view.game;
+
+import ru.m.tankz.config.Config;
+import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.Type;
+
+using ru.m.tankz.view.ViewUtil;
+
+class GameViewHelper {
+
+    private var view:IGameView;
+    private var config:Config;
+    private var onelinelevel:Bool;
+
+    public function new(view:IGameView, config:Config, onelinelevel:Bool = false) {
+        this.view = view;
+        this.config = config;
+        this.onelinelevel = onelinelevel;
+    }
+
+    private function findTeamView(id:TeamId):Null<TeamView> {
+        for (view in view.teams.dataViews) {
+            if (view.teamId == id) {
+                return view;
+            }
+        }
+        return null;
+    }
+
+    private function findPlayerView(id:PlayerId):Null<PlayerView> {
+        var teamView = findTeamView(id.team);
+        if (teamView != null) {
+            for (view in teamView.dataViews) {
+                if (view.playerId == id) {
+                    return view;
+                }
+            }
+        }
+        return null;
+    }
+
+    public function onGameEvent(event:GameEvent):Void {
+        switch event {
+            case START(start):
+                view.level.text = start.level.toLevelLabel(onelinelevel);
+                view.teams.data = [for (team in start.state.teams) team];
+                // ToDo: PlayerState default tank?
+                for (teamView in view.teams.dataViews) {
+                    for (playerView in teamView.dataViews) {
+                        var tank = config.getPlayerTank(playerView.playerId);
+                        playerView.tank = {
+                            type: tank.type,
+                            skin: tank.skin,
+                            hits: 0,
+                            bonus: false,
+                            color: config.getColor(playerView.playerId),
+                        };
+                    }
+                }
+            case CHANGE(TEAM_LIFE(teamId, life)):
+                var view = findPlayerView([teamId, -1]);
+                if (view != null) {
+                    view.life = life;
+                }
+            case CHANGE(TEAM_SCORE(teamId, score)):
+                var view = findPlayerView([teamId, -1]);
+                if (view != null) {
+                    view.score = score;
+                }
+            case CHANGE(PLAYER_LIFE(playerId, life)):
+                var view = findPlayerView(playerId);
+                if (view != null) {
+                    view.life = life;
+                }
+            case CHANGE(PLAYER_SCORE(playerId, score)):
+                var view = findPlayerView(playerId);
+                if (view != null) {
+                    view.score = score;
+                }
+            case _:
+        }
+    }
+}

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

@@ -1,9 +0,0 @@
-package ru.m.tankz.view.game;
-
-import haxework.view.IView;
-import ru.m.geom.Direction;
-import ru.m.tankz.game.IGame;
-
-interface IGamePanel extends IView<Dynamic> extends GameListener {
-    public var position(default, null):Direction;
-}

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

@@ -0,0 +1,14 @@
+package ru.m.tankz.view.game;
+
+import ru.m.tankz.render.IRender;
+import haxework.view.data.DataView;
+import haxework.view.form.LabelView;
+import haxework.view.IView;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.game.IGame;
+
+interface IGameView extends IView<Dynamic> extends GameListener {
+    public var render(default, null):IRender;
+    public var teams(default, null):DataView<TeamState, TeamView>;
+    public var level(default, null):LabelView;
+}

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

@@ -0,0 +1,52 @@
+package ru.m.tankz.view.game;
+
+import haxework.view.form.LabelView;
+import haxework.view.group.VGroupView;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.Type;
+import ru.m.tankz.view.common.TankView;
+
+@:template class PlayerView extends VGroupView {
+
+    @:view("title") public var titleView:LabelView;
+    @:view("tank") public var tankView:TankView;
+    @:view("life") public var lifeLabel:LabelView;
+    @:view("score") public var scoreLabel:LabelView;
+
+    public var playerId(default, default):PlayerId;
+    public var state(null, set):PlayerState;
+    public var tank(null, set):TankInfo;
+    public var life(null, set):Int;
+    public var score(null, set):Int;
+
+    private function set_state(value:PlayerState):PlayerState {
+        playerId = value.id;
+        titleView.text = value.name != null ? value.name : playerId.format();
+        life = value.life;
+        score = value.score;
+        tank = value.tank;
+        return state;
+    }
+
+    private function set_tank(value:TankInfo):TankInfo {
+        tank = value;
+        tankView.tank = tank;
+        return tank;
+    }
+
+    private function set_life(value:Int):Int {
+        lifeLabel.text = '${value}';
+        return value;
+    }
+
+    private function set_score(value:Int):Int {
+        scoreLabel.text = '${value}$';
+        return value;
+    }
+
+    public static function factory(index:Int, data:PlayerState):PlayerView {
+        var result = new PlayerView();
+        result.state = data;
+        return result;
+    }
+}

src/client/haxe/ru/m/tankz/view/game/PlayerView.yaml

@@ -0,0 +1,19 @@
+---
+views:
+  - id: title
+    $type: haxework.view.form.LabelView
+    visible: false
+  - $type: haxework.view.group.HGroupView
+    layout.margin: 5
+    layout.vAlign: middle
+    views:
+      - id: tank
+        $type: ru.m.tankz.view.common.TankView
+      - id: life
+        $type: haxework.view.form.LabelView
+        style: text.box
+        geometry.width: 55
+      - id: score
+        $type: haxework.view.form.LabelView
+        style: text.box
+        geometry.width: 100

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

@@ -0,0 +1,35 @@
+package ru.m.tankz.view.game;
+
+import haxework.view.data.DataView;
+import ru.m.tankz.game.GameState;
+import ru.m.tankz.Type;
+
+class TeamView extends DataView<PlayerState, PlayerView> {
+
+    public var teamId(default, default):TeamId;
+    public var state(default, set):TeamState;
+
+    private function new():Void {
+        super();
+        factory = PlayerView.factory;
+        layout.margin = 5;
+    }
+
+    private function set_state(value:TeamState):TeamState {
+        teamId = value.id;
+        var players = [for (player in value.players) player].filter(function(player) return player.life > 0);
+        if (value.life > 0) {
+            var teamState = new PlayerState([value.id, -1]);
+            teamState.life = value.life;
+            players.unshift(teamState);
+        }
+        data = players;
+        return value;
+    }
+
+    public static inline function viewFactory(index:Int, data:TeamState):TeamView {
+        var result = new TeamView();
+        result.state = data;
+        return result;
+    }
+}

src/client/haxe/ru/m/tankz/view/gamepad/CircleActionArea.hx

@@ -0,0 +1,24 @@
+package ru.m.tankz.view.gamepad;
+
+import flash.display.Graphics;
+import ru.m.control.DeviceAction;
+import ru.m.geom.Circle;
+import ru.m.geom.Point;
+
+class CircleActionArea implements IActionArea {
+    public var action(default, null):DeviceAction;
+    public var circle(default, null):Circle;
+
+    public function new(action:DeviceAction, circle:Circle) {
+        this.action = action;
+        this.circle = circle;
+    }
+
+    public function contain(point:Point):Bool {
+        return circle.contain(point);
+    }
+
+    public function draw(graphics:Graphics):Void {
+        graphics.drawCircle(circle.x, circle.y, circle.radius);
+    }
+}

src/client/haxe/ru/m/tankz/view/gamepad/DefaultActionAreaBuilder.hx

@@ -0,0 +1,42 @@
+package ru.m.tankz.view.gamepad;
+
+import ru.m.control.DeviceAction;
+import ru.m.geom.Direction;
+import ru.m.geom.Rectangle;
+
+class DefaultActionAreaBuilder implements IActionAreaBuilder {
+    public function new() {
+    }
+
+    public function build(width:Float, height:Float):Array<IActionArea> {
+        var areas:Array<IActionArea> = [];
+        var size = Math.min(width, height) / 7;
+        var padding = size / 2;
+        // top
+        areas.push(new RectangleActionArea(
+        DIRECTION(Direction.TOP),
+        new Rectangle(padding + size, height - size * 3 - padding, size, size)
+        ));
+        // left
+        areas.push(new RectangleActionArea(
+        DIRECTION(Direction.LEFT),
+        new Rectangle(padding, height - size * 2 - padding, size, size)
+        ));
+        // bottom
+        areas.push(new RectangleActionArea(
+        DIRECTION(Direction.BOTTOM),
+        new Rectangle(padding + size, height - size - padding, size, size)
+        ));
+        // right
+        areas.push(new RectangleActionArea(
+        DIRECTION(Direction.RIGHT),
+        new Rectangle(padding + size * 2, height - size * 2 - padding, size, size)
+        ));
+        // button
+        areas.push(new RectangleActionArea(
+        KEY(0),
+        new Rectangle(width - size * 1.5 - padding, height - size * 2 - padding, size, size)
+        ));
+        return areas;
+    }
+}