[proto] add game event proto messages

.editorconfig

@@ -4,9 +4,6 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 2
+indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
-
-[*.yaml]
-indent_size = 2

.env.default

@@ -1,10 +0,0 @@
-PROJECT=tankz
-SDK_PATH=$HOME/sdk
-PUBLISH_PATH=$HOME/public/$PROJECT
-BUILD_PATH=./build
-TARGET_PATH=./target
-KEY_STORE=<keystore.jks>
-KEY_PASS=<passphrase>
-REPO=https://git.shmyga.ru/api/packages/InfernalGames
-PUBLISH_USER=<username>
-PUBLISH_PASSWORD=<passphrase>

.gitignore

@@ -1,4 +1,3 @@
-build/
 target/
 src-gen/
 out/
@@ -13,5 +12,3 @@ config.json
 /node_modules
 /log
 /ansible/*.retry
-.npmrc
-.env

CHANGELOG.md

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

Dockerfile

@@ -1,28 +0,0 @@
-FROM ubuntu:noble AS base
-RUN apt update && apt install -y \
-    nodejs \
-    npm \
-    openjdk-11-jre \
-    protobuf-compiler \
-    jq
-RUN node -v
-RUN npm -v
-
-FROM base AS builder
-ENV GRADLE_USER_HOME=/sdk/gradle
-WORKDIR /app
-COPY package.json package-lock.json ./
-RUN npm ci
-COPY gulpfile.js protohx.json ./
-COPY tasks ./tasks
-COPY config.example.json ./config.example.json
-RUN --mount=type=secret,id=KEY_STORE \
-    cat /run/secrets/KEY_STORE > ./key.jks
-RUN --mount=type=secret,id=KEY_PASS,env=KEY_PASS \
-    jq --arg key_pass "$KEY_PASS" \
-    '.SdkDir = "/sdk" | .PublishDir = "/app/publish" | .Key.store = "key.jks" | .Key.pass = $key_pass' \
-    config.example.json > config.json
-COPY src ./src
-#COPY dependencies ./dependencies
-VOLUME ["/sdk", "/app/build", "/app/target", "/app/publish", "/app/src-gen"]
-CMD ["npx", "gulp", "default"]

README.md

@@ -1,9 +0,0 @@
-# Tankz
-
-## Play
-
-https://shmyga.ru/tankz/html5/index.html
-
-## Packages
-
-https://git.shmyga.ru/InfernalGames/-/packages/generic/tankz

WORK.md

@@ -1,20 +1,73 @@
-* death game bonus
-* tanks and bullets speed balancing
-* clean player state on lose in classic type
-* network series
-* bot upgrade
-* game config validate
-* mine z-order
-* mine spawn position
-* mine spawn on other mine
-* double rocket
-* display ammo count (panel)
-* display ammo count (screen gamepad)
-* bonus ammo
-* game panel rework
-* game state: config, map, entities, players
-* game menu pack progress
-* game save
-* balloons: change mute, network, pause
-* settings: mute, pause, reset device actions
-* game view: toggle panel on mobile
+* 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%  

ansible/group_vars/all.yml

@@ -5,11 +5,11 @@ project_user: holop
 deploy_user: "{{ project_user }}"
 deploy_project: "{{ project_name }}"
 deploy_repo_url: "git@bitbucket.org:infernalgames/{{ project_name }}.git"
-deploy_repo_version: develop
+deploy_repo_version: master
 deploy_npm: yes
 
 service_name: "{{ project_name }}"
-service_work_dir: "{{ deploy_current_dir }}/target/server/cpp"
-service_command: "{{ service_work_dir }}/{{ project_name }} {{ service_host }}"
+service_work_dir: "{{ deploy_current_dir }}/target/server/neko"
+service_command: "/usr/bin/neko {{ service_work_dir }}/{{ project_name }}.n {{ service_host }}"
 service_user: www-data
 service_control_user: "{{ project_user }}"

ansible/prod/inventory.yml

@@ -1,5 +1,4 @@
 all:
   hosts: shmyga.ru
   vars:
-    service_host: 213.139.208.180
-    config_src: "/home/holop/tankz/config.json"
+    service_host: 172.31.1.100

ansible/roles/build/defaults/main.yml

@@ -1,2 +0,0 @@
-config_src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
-config_dest: "{{ deploy_release_dir }}/config.json"

ansible/roles/build/tasks/main.yml

@@ -1,11 +1,11 @@
 ---
 - name: "Copy config"
   copy:
-    src: "{{ config_src }}"
-    dest: "{{ config_dest }}"
+    src: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
+    dest: "{{ deploy_release_dir }}/config.json"
     remote_src: true
 
 - name: "Gulp build"
-  command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default --host shmyga.ru"
+  command: "/usr/local/lib/npm/bin/gulp default --host shmyga.ru"
   args:
     chdir: "{{ deploy_release_dir }}"

config.example.json

@@ -1,11 +1,7 @@
 {
-    "SdkDir": "C:\\sdk",
-    "BuildDir": null,
-    "PublishDir": "",
-    "PublishUrl": "https://shmyga.ru/repo/tankz",
-    "Develop": false,
-    "Key": {
-        "store": "keystore.jks",
-        "pass": null
-    }
+  "SdkDir": "C:\\sdk",
+  "SSH": {
+    "PrivateKey": null,
+    "Passphrase": null
+  }
 }

config.shmyga.ru.json

@@ -0,0 +1,7 @@
+{
+  "SdkDir": "/home/holop/sdk",
+  "SSH": {
+    "PrivateKey": null,
+    "Passphrase": null
+  }
+}

docker-compose.yaml

@@ -1,22 +0,0 @@
-name: $PROJECT
-services:
-  builder:
-    container_name: $PROJECT-builder
-    image: infernal-games/$PROJECT-builder
-    build:
-      context: .
-      secrets:
-        - KEY_STORE
-        - KEY_PASS
-    volumes:
-      - ${SDK_PATH}:/sdk
-      - ${BUILD_PATH}:/app/build
-      - ${TARGET_PATH}:/app/target
-      - ${PUBLISH_PATH}:/app/publish
-      - ./src-gen:/app/src-gen
-
-secrets:
-  KEY_STORE:
-    file: $KEY_STORE
-  KEY_PASS:
-    environment: KEY_PASS

gulpfile.js

@@ -2,50 +2,33 @@ const gulp = require('gulp');
 const gulpClean = require('gulp-clean');
 const Config = require('./config.json');
 const packageInfo = require('./package.json');
-const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
+const {Sdk, Haxe, Project, FlashPlayer} = require('gulp-haxetool');
 const dateformat = require('dateformat');
 const argv = require('yargs').argv;
-const publish = require('./tasks/gulp-publish');
-
-if (packageInfo.haxe) {
-    Haxe.VERSION = packageInfo.haxe;
-}
 
+// ToDo: update default in gulp-haxetool
+FlashPlayer.VERSION = '32';
+//Haxe.VERSION = '4.0.0-rc.2';
 if (Config.SdkDir) {
     Sdk.dir = Config.SdkDir;
 }
 
-if (Config.BuildDir) {
-    Haxe.buildDir = Config.BuildDir;
-}
-
 exports.clean = function clean() {
     return gulp.src('target/*', {read: false}).pipe(gulpClean());
 };
 
-exports.setup = function setup() {
-  const builder = Project.Builder.new(
-    client.config,
-    Project.Platform.ANDROID,
-    client.buildSystem,
-  );
-  return builder.prepare();
-};
-
-exports.generate = function generate() {
-  return exports.setup().then(() =>
-    new Haxe()
-      .haxelib(["run", "protohx", "generate", "protohx.json"])
-      .then(({ stdout }) => {
-        if (stdout.indexOf("FAIL") > -1) {
-          throw stdout;
+exports.generate = function generate()  {
+    return new Haxe().haxelib(['run', 'protohx', 'generate', 'protohx.json']).then(({stdout}) => {
+        if (stdout.indexOf('FAIL') > -1) {
+            throw stdout;
         }
-      }),
-  );
+    });
 };
 
 /**
- * base config
+ * ToDo:
+ * windows target
+ * window exe package (innosetup)
  */
 const config = new Project.Config({
     meta: {
@@ -55,19 +38,18 @@ const config = new Project.Config({
         pack: 'ru.m.tankz',
         author: 'shmyga <shmyga.z@gmail.com>',
         company: 'MegaLoMania',
-        version: packageInfo.version + (Config.Develop ? '-SNAPSHOT' : ''),
+        version: packageInfo.version,
     },
-    key: Config.Key,
     libs: packageInfo.haxeDependencies,
     sources: [
         'src/common/haxe',
         'src-gen/haxe',
     ],
     assets: [
-        'src/common/resources/config',
+        'src/common/resources'
     ],
     flags: [
-        'proto_debug',
+        //'proto_debug',
     ],
     macros: [
         `CompilationOption.set('build','${dateformat(new Date(), 'yyyy-mm-dd HH:MM:ss')}')`,
@@ -86,23 +68,19 @@ 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/client/haxe'],
         main: 'ru.m.tankz.Client',
         preloader: 'ru.m.tankz.Preloader',
         assets: [
-            'src/common/resources/level',
             'src/client/resources',
         ],
         meta: {
             width: 1024,
-            height: 576,
+            height: 768,
         },
         flags: [
             //'proto_debug',
@@ -115,6 +93,7 @@ const client = new Project(
             `CompilationOption.set('port',${port})`,
         ]
     }),
+    module.exports.generate
 ).bind(module, gulp);
 
 /**
@@ -125,14 +104,10 @@ const editor = new Project(
     [
         Project.Platform.FLASH,
         Project.Platform.HTML5,
-        Project.Platform.LINUX,
     ],
     config.branch({
         name: 'editor',
-        sources: [
-            'src/client/haxe',
-            'src/editor/haxe',
-        ],
+        sources: ['src/client/haxe', 'src/editor/haxe'],
         main: 'ru.m.tankz.editor.Editor',
         preloader: 'ru.m.tankz.Preloader',
         assets: [
@@ -141,9 +116,8 @@ const editor = new Project(
         ],
         meta: {
             filename: 'editor',
-            pack: 'ru.m.tankz.editor',
             width: 1024,
-            height: 768,
+            height: 850,
         },
         flags: [
             //'dev_layout',
@@ -156,59 +130,30 @@ const editor = new Project(
  */
 const server = new Project(
     Project.BuildSystem.HAXE,
-    Project.Platform.CPP,
+    Project.Platform.NEKO,
     config.branch({
         name: 'server',
         sources: ['src/server/haxe'],
         main: 'ru.m.tankz.server.Server',
-        assets: [
-            'src/common/resources/level',
-        ]
     }),
+    module.exports.generate
 ).bind(module, gulp);
 
-/**
- * publish
- */
-module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
-
 /**
  * default
  */
-const defaultSeries = [
+module.exports.default = gulp.series(
     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:cpp: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['server:neko:build'],
 );
-
-module.exports.default = gulp.series(defaultSeries);

hxformat.json

@@ -1,5 +0,0 @@
-{
-  "indentation": {
-    "character": "  "
-  }
-}

package.json

@@ -1,25 +1,26 @@
 {
-  "name": "tankz",
-  "version": "0.18.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.1.9",
-    "yargs": "^13.2.4"
-  },
-  "haxeDependencies": {
-    "haxework": "2.1.0",
-    "lime": "8.0.0",
-    "openfl": "9.2.0",
-    "hxcpp": "4.2.1",
-    "protohx": "0.4.6",
-    "orm": "2.1.0",
-    "haxe-crypto": "0.0.8",
-    "svg": "1.1.3",
-    "formatter": "1.16.0"
-  },
-  "haxe": "4.2.5"
+    "name": "tankz",
+    "version": "0.14.2",
+    "private": true,
+    "devDependencies": {
+        "dateformat": "^3.0.3",
+        "gulp": "^4.0.0",
+        "gulp-add": "0.0.2",
+        "gulp-clean": "^0.4.0",
+        "gulp-haxetool": "^0.0.19",
+        "yargs": "^13.2.4"
+    },
+    "haxeDependencies": {
+        "haxework": "git@bitbucket.org:shmyga/haxework.git",
+        "lime": "7.5.0",
+        "openfl": "8.9.1",
+        "hxcpp": "4.0.8",
+        "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"
+    }
 }

scripts/build

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-
-source .env
-mkdir -p "$SDK_PATH" "$PUBLISH_PATH" "$BUILD_PATH" "$TARGET_PATH" "src-gen"
-docker compose run --rm --user $(id -u):$(id -g) --build --remove-orphans builder

scripts/format

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-
-source $NEKO_SDK/activate
-source $HAXE_SDK/activate
-haxelib install formatter
-haxelib run formatter \
-    -s ./src/common/haxe \
-    -s ./src/client/haxe \
-    -s ./src/server/haxe \
-    -s ./src/editor/haxe

scripts/lint

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-
-source $NEKO_SDK/activate
-source $HAXE_SDK/activate
-haxelib install formatter
-haxelib run formatter \
-    --check \
-    -s ./src/common/haxe \
-    -s ./src/client/haxe \
-    -s ./src/server/haxe \
-    -s ./src/editor/haxe

scripts/publish

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-source .env
-
-VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+\.\d+')
-
-curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
-     "${REPO}/generic/${PROJECT}/${VERSION}"
-
-PACKAGES=(
-     "android/${PROJECT}_${VERSION}.apk"
-     "debian/${PROJECT}_${VERSION}_all.deb"
-     "archive/${PROJECT}_${VERSION}_linux.tar.gz"
-)
-
-for PACKAGE in "${PACKAGES[@]}"
-do
-     PACKAGE_NAME=$(basename "$PACKAGE")
-     echo "publish: $PACKAGE"
-     curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
-          --upload-file "${PUBLISH_PATH}/${PACKAGE}" \
-          "${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
-
-     if [[ "$PACKAGE" == *.deb ]]; then
-          curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
-               "${REPO}/debian/pool/noble/main/${PROJECT}/${VERSION}/all"
-          curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" \
-               --upload-file "${PUBLISH_PATH}/${PACKAGE}" \
-               "${REPO}/debian/pool/noble/main/upload"
-     fi
-done

scripts/setup

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-
-npm ci

sql/init.sql

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

@@ -1,44 +0,0 @@
-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;
-            }
-        }
-        return false;
-        #else
-        return false;
-        #end
-    }
-}

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

@@ -1,8 +1,10 @@
 package ru.m.animate;
 
+import flash.display.PixelSnapping;
+import haxe.Timer;
 import flash.display.Bitmap;
 import flash.display.BitmapData;
-import flash.display.PixelSnapping;
+
 
 typedef Frame = {
     var image:BitmapData;
@@ -11,18 +13,35 @@ typedef Frame = {
 
 class Animate extends Bitmap {
 
-    public var playing(default, default):Bool;
+    private static var timer:Timer;
+    private static var instances:Array<Animate> = [];
+
+    private static function init():Void {
+        if (timer == null) {
+            timer = new Timer(30);
+            timer.run = updateAll;
+        }
+    }
+
+    private static function updateAll():Void {
+        for (instance in instances) {
+            if (instance.playing) {
+                instance.update();
+            }
+        }
+    }
+
+    public var playing(default, set):Bool;
     public var frames(default, set):Array<Frame>;
 
     private var sequence:Array<BitmapData>;
     private var index:Int;
 
-    @:provide private static var manager:AnimateManager;
-
     public function new(?frames:Array<Frame>) {
         super(null, PixelSnapping.AUTO, true);
         this.frames = frames == null ? [] : frames;
-        manager.add(this);
+        init();
+        instances.push(this);
     }
 
     public function set_frames(value:Array<Frame>):Array<Frame> {
@@ -40,7 +59,14 @@ class Animate extends Bitmap {
         return frames;
     }
 
-    public function update():Void {
+    public function set_playing(value:Bool):Bool {
+        if (playing != value) {
+            playing = value;
+        }
+        return playing;
+    }
+
+    private function update():Void {
         if (++index >= sequence.length) {
             index = 0;
         }
@@ -51,6 +77,8 @@ class Animate extends Bitmap {
     }
 
     public function dispose():Void {
-        manager.remove(this);
+        if (instances.indexOf(this) > -1) {
+            instances.remove(this);
+        }
     }
 }

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

@@ -1,34 +0,0 @@
-package ru.m.animate;
-
-@:provide class AnimateManager {
-    public var playing(default, default):Bool;
-
-    private var timer:Timer;
-    private var animations:Array<Animate>;
-
-    public function new() {
-        animations = [];
-        timer = new Timer(30);
-        timer.run = update;
-    }
-
-    public function update():Void {
-        if (playing) {
-            for (animation in animations) {
-                if (animation.playing) {
-                    animation.update();
-                }
-            }
-        }
-    }
-
-    public function add(animate:Animate):Void {
-        animations.push(animate);
-    }
-
-    public function remove(animate:Animate):Void {
-        if (animations.indexOf(animate) > -1) {
-            animations.remove(animate);
-        }
-    }
-}

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

@@ -3,6 +3,7 @@ package ru.m.animate;
 import promhx.Deferred;
 import promhx.Promise;
 
+
 class OnceAnimate extends Animate {
 
     private var deferred:Deferred<Animate>;
@@ -13,14 +14,13 @@ class OnceAnimate extends Animate {
         return deferred.promise();
     }
 
-    override public function update():Void {
+    override private function update():Void {
         super.update();
         if (index == 0) {
             playing = false;
             if (deferred != null) {
                 deferred.resolve(this);
             }
-            dispose();
         }
     }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,38 +0,0 @@
-package ru.m.control;
-
-import flash.display.Stage;
-import flash.events.KeyboardEvent;
-import hw.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

@@ -5,18 +5,10 @@ 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

@@ -1,42 +1,34 @@
 package ru.m.skin;
 
 import format.SVG;
-import hw.color.Color;
-import hw.view.form.ButtonView;
-import hw.view.skin.ISkin;
+import haxework.color.Color;
+import haxework.color.ColorUtil;
+import haxework.view.ButtonView;
+import haxework.view.skin.ISkin;
 
-using StringTools;
-using hw.color.ColorUtil;
+class ButtonSVGSkin implements ISkin<ButtonView> {
 
-@: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 svg:String;
+    private var color:Color;
 
     private var svgs:Map<ButtonState, SVG>;
 
-    public function new(?svg:String, ?color:Color, ?solid:Bool) {
+    public function new(svg:String, color:Color) {
         this.svg = svg;
         this.color = color;
-        this.solid = solid;
-        init(solid);
+        init();
     }
 
     private inline function buildSVG(color:Color):SVG {
-        return new SVG(svg.replace("currentColor", '#${color}'));
+        return new SVG(StringTools.replace(svg, "currentColor", '#${StringTools.hex(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()));
+    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)));
     }
 
     public function draw(view:ButtonView):Void {
@@ -45,10 +37,7 @@ using hw.color.ColorUtil;
         graphics.beginFill(0, 0);
         graphics.drawRect(0, 0, view.width, view.height);
         graphics.beginFill(color);
-        if (!solid) {
-            graphics.lineStyle(2, color.multiply(1.5));
-        }
-        // ToDo: padding
+        graphics.lineStyle(2, ColorUtil.multiply(color, 1.5));
         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

@@ -1,200 +0,0 @@
-package ru.m.tankz;
-
-import flash.text.TextFormatAlign;
-import hw.color.Color;
-import hw.view.geometry.Box;
-import hw.view.geometry.HAlign;
-import hw.view.geometry.SizeValue;
-import hw.view.geometry.VAlign;
-import hw.view.theme.ITheme;
-import hw.view.theme.Theme;
-import hw.view.utils.DrawUtil;
-import openfl.Assets;
-import ru.m.skin.ButtonSVGSkin;
-
-using hw.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, {base: "3h", big: "4h", veryBig: "4.5h"});
-    }
-
-    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("button.small", [
-            "font.size" => SizeValue.fromString("3h"),
-            "geometry.padding" => Box.fromArray([8, 2]),
-            "skin.round" => 5,
-        ], ["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.big,
-            "geometry.width" => SizeValue.fromString("12h"),
-            "geometry.height" => SizeValue.fromString("12h"),
-            "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([20, 10]),
-            "layout.vAlign" => VAlign.MIDDLE,
-        ], ["light"]));
-
-        register(new Style("panel_button", [
-            "font.size" => fontSize.big,
-            "geometry.height" => SizeValue.fromString("100%"),
-        ], ["button"]));
-
-        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.fromString("8h"),
-            "geometry.height" => SizeValue.fromString("8h"),
-        ]));
-
-        register(new Style("icon.tank", [
-            "geometry.width" => SizeValue.fromString("6h"),
-            "geometry.height" => SizeValue.fromString("6h"),
-            "skin.fillType" => FillType.CONTAIN,
-        ]));
-
-        var green:Color = 0x00ff00;
-        var red:Color = 0xff0000;
-        register(new Style("result.winner", [
-            "skin.border.color" => green,
-            "skin.border.alpha" => 0.5,
-            "skin.border.thickness" => 5,
-            "skin.round" => 10,
-        ], ["light"]));
-        register(new Style("result.loser", [
-            "skin.border.color" => red,
-            "skin.border.alpha" => 0.5,
-            "skin.border.thickness" => 5,
-            "skin.round" => 10,
-        ], ["light"]));
-        register(new Style("player.winner", [
-            "skin.background.alpha" => 0.2,
-            "skin.background.color" => green,
-        ]));
-        register(new Style("player.loser", [
-            "skin.background.alpha" => 0.2,
-            "skin.background.color" => red,
-        ]));
-
-        register(new Style("button.pack", [
-            "geometry.width" => SizeValue.fromString("35h"),
-            "geometry.height" => SizeValue.fromString("20h"),
-            "geometry.padding" => Box.fromFloat(5),
-            "layout.hAlign" => HAlign.CENTER,
-            "layout.vAlign" => VAlign.MIDDLE,
-            "content.buttonMode" => true,
-            "content.mouseChildren" => false,
-            "skin.round" => 15,
-        ], ["border", "light"]));
-
-        register(new Style("button.menu", [
-            "geometry.padding" => Box.fromArray([20, 10]),
-        ]));
-
-        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("bars", "bars-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.text,
-            "skin.activeColor" => colors.active,
-        ]));
-
-        register(new Style("render", [
-            "skin.background.color" => colors.dark,
-        ]));
-    }
-
-    private function registerButton(name:String, resource:String, solid:Bool = false):Void {
-        register(new Style('button.$name', [
-            "geometry.width" => SizeValue.fromString("10h"),
-            "geometry.height" => SizeValue.fromString("10h"),
-            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
-        ]));
-        register(new Style('button.$name.small', [
-            "geometry.width" => SizeValue.fromString("7h"),
-            "geometry.height" => SizeValue.fromString("7h"),
-            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
-        ]));
-    }
-
-}

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

@@ -1,60 +1,39 @@
 package ru.m.tankz;
 
-import ru.m.animate.AnimateManager;
 import flash.Lib;
-import hw.animate.Animate;
-import hw.log.TraceLogger;
-import hw.net.manage.LoaderManager;
-import hw.view.Root;
-import hw.view.popup.PopupManager;
-import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.storage.SettingsStorage;
+import haxework.animate.Animate;
+import haxework.log.TraceLogger;
+import haxework.view.Root;
 import ru.m.tankz.view.ClientView;
 
 class Client {
     private static inline var TAG = "Tankz";
 
-    @:provide private static var settings:SettingsStorage;
-
     public static function main() {
         L.push(new TraceLogger());
         #if flash
-        L.push(new hw.log.JSLogger());
+        L.push(new haxework.log.JSLogger());
         #end
         #if debug
-        //L.push(new hw.log.SocketLogger());
+        //L.push(new haxework.log.SocketLogger());
         #end
-        // ToDo: fix @:provide macro
-        PopupManager;
-        LoaderManager;
-        GameStorage;
-        AnimateManager;
-        //
         Const.init();
         Init.init();
-        // TODO:
-        // Animate.bind(Lib.current.stage);
+        Animate.bind(Lib.current.stage);
         L.d(TAG, 'Debug: ${Const.DEBUG}');
         L.i(TAG, 'Version: ${Const.VERSION}');
         L.i(TAG, 'Build: ${Const.BUILD}');
-        L.i(TAG, 'Mobile: ${Device.isMobile()}');
         #if linux
         LinuxIcon.apply();
         #end
+        Style.register();
         var view:ClientView = new ClientView();
         Root.bind(view);
         view.launch();
 
+        #if debug
         var fps = new openfl.display.FPS(0, 0, 0x00ff00);
-        fps.visible = settings.displayFPS;
         Lib.current.addChild(fps);
-
-        settings.signal.connect(function(setting) {
-           switch setting {
-               case DISPLAY_FPS(value):
-                   fps.visible = value;
-               case _:
-           }
-        });
+        #end
     }
 }

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

@@ -7,14 +7,12 @@ class Const {
     public static var FPS:Int;
     public static var BUILD:String;
     public static var VERSION:String;
-    public static var NAME:String;
     public static var DEBUG:Bool;
 
     public static function init():Void {
         FPS = Std.parseInt(Lib.current.stage.application.meta.get("fps"));
         BUILD = CompilationOption.get("build");
         VERSION = Lib.current.stage.application.meta.get("version");
-        NAME = Lib.current.stage.application.meta.get("name");
         DEBUG = Capabilities.isDebugger;
     }
 }

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

@@ -1,36 +1,37 @@
 package ru.m.tankz;
 
-import flash.Lib;
-import hw.animate.FadeAnimate;
-import hw.animate.UnFadeAnimate;
-import hw.storage.SharedObjectStorage;
-import hw.view.popup.PopupManager;
-import hw.view.theme.ITheme;
-import lime.ui.Gamepad;
-import lime.ui.Joystick;
+import haxework.animate.FadeAnimate;
+import haxework.animate.UnFadeAnimate;
+import haxework.resources.IResources;
+import haxework.resources.Resources;
+import haxework.view.popup.PopupManager;
 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.CachedLevelBundle;
-import ru.m.tankz.bundle.ClientLevelSource;
 import ru.m.tankz.bundle.ConfigBundle;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
+import ru.m.tankz.bundle.LevelBundle;
+import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.pack.Request;
 import ru.m.tankz.proto.pack.Response;
-import ru.m.update.Updater;
+import ru.m.tankz.sound.SoundManager;
+import ru.m.tankz.storage.GameStorage;
+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: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 updater:Updater;
 
     private static function buildConnection():IConnection<Request, Response> {
         var host:String = CompilationOption.get("host");
@@ -46,33 +47,20 @@ class Init {
     }
 
     public static function init():Void {
-        theme = new AppTheme();
-        levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage());
-        levelBundle.load();
+        resources = new Resources();
+        levelBundle = new LevelBundle();
         configBundle = new ConfigBundle();
+        settingsStorage = new SettingsStorage();
+        multiplayerStorage = new NetworkStorage();
+        gameStorage = new GameStorage();
+        recordStorage = new RecordStorage();
+        soundManager = new SoundManager();
+        popupManager = new PopupManager();
 
         popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v, 100);
         popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v, 100);
 
         connection = buildConnection();
-
-        bus = new ControlBus();
-        bus.connect(new KeyboardDevice(Lib.current.stage));
-
-        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));
-        });
+        networkManager = new NetworkManager();
     }
 }

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

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

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

@@ -0,0 +1,164 @@
+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/ClientLevelSource.hx

@@ -1,33 +0,0 @@
-package ru.m.tankz.bundle;
-
-import openfl.Assets;
-import openfl.utils.AssetType;
-import ru.m.tankz.bundle.ILevelBundle;
-import ru.m.tankz.config.Config;
-import ru.m.tankz.Type;
-import ru.m.tankz.util.LevelUtil;
-
-class ClientLevelSource implements ILevelSource {
-
-    public function new() {}
-
-    public function resolveMeta(id:PackId):LevelPackMeta {
-        var bytes = Assets.getBytes('level/${id}.zip');
-        return LevelUtil.getMeta(bytes);
-    }
-
-    public function resolve(id:PackId):LevelPack {
-        var bytes = Assets.getBytes('level/${id}.zip');
-        return LevelUtil.unpack(bytes);
-    }
-
-    public function list():Array<PackId> {
-        var result = [];
-        for (path in Assets.list(AssetType.BINARY)) {
-            if (StringTools.startsWith(path, "level")) {
-                result.push(PackId.fromString(path.split("/").pop().split(".").shift()));
-            }
-        }
-        return result;
-    }
-}

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

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

@@ -0,0 +1,23 @@
+package ru.m.tankz.bundle;
+
+import openfl.Assets;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.Type;
+import ru.m.tankz.util.LevelUtil;
+
+class LevelBundle implements ILevelBundle {
+
+    private var cache:Map<String, LevelConfig> = 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;
+        }
+        return cache[key];
+    }
+}

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

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

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

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

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

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

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

@@ -1,11 +0,0 @@
-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/local/LocalGame.hx

@@ -1,42 +1,31 @@
 package ru.m.tankz.local;
 
-import ru.m.tankz.control.HumanControl;
+import ru.m.tankz.local.LocalControlFactory;
 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;
+import ru.m.tankz.game.GameState;
+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;
 
-    @:provide static var gameStorage:GameStorage;
-
-    public function new(start:Start) {
-        super(start);
+    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 COMPLETE(result):
-                updateProgress(result);
+            case GameEvent.COMPLETE(_, _):
+                disconnect(recorder);
+                recorder.onGameEvent(event); //ToDo:
+                recordStorage.save(recorder.record);
             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/local/StageCaller.hx

@@ -1,31 +0,0 @@
-package ru.m.tankz.local;
-
-import flash.display.Stage;
-import flash.events.Event;
-import ru.m.tankz.engine.ICaller;
-
-class StageCaller implements ICaller {
-
-    private var stage:Stage;
-    private var event:String;
-    private var calback:Void -> Void;
-
-    public function new(stage:Stage, ?event:String) {
-        this.stage = stage;
-        this.event = event != null ? event : Event.ENTER_FRAME;
-    }
-
-    private function onEvent(_):Void {
-        calback();
-    }
-
-    public function start(calback:Void -> Void):Void {
-        this.calback = calback;
-        stage.addEventListener(event, onEvent);
-    }
-
-    public function stop():Void {
-        stage.removeEventListener(event, onEvent);
-        calback = null;
-    }
-}

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

@@ -1,9 +1,9 @@
 package ru.m.tankz.network;
 
 import haxe.Unserializer;
-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;
@@ -14,7 +14,7 @@ class NetworkGame extends Game {
     private var network:NetworkManager;
 
     public function new(network:NetworkManager) {
-        super(network.room.game.type);
+        super(new GameState(network.room.game.type, 0, network.room.game.level));
         this.network = network;
         this.controlFactory = new NetworkControlFactory();
         network.gameEventSignal.connect(onGameEventProto);
@@ -38,12 +38,12 @@ class NetworkGame extends Game {
         }
     }
 
-    override private function onStart(start:Start):Void {
+    override public function 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) {
-            start.state.controls.push({playerId: [slot.slot.team, slot.slot.index], controller: HUMAN(0)});
+            state.controls.push({playerId: [slot.slot.team, slot.slot.index], control: "human-0"});
         }
-        super.onStart(start);
+        super.start();
     }
 
     override public function dispose():Void {

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

@@ -1,12 +1,14 @@
 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;
-import hw.signal.Signal;
+import haxework.signal.Signal;
 import ru.m.connect.IConnection;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.proto.core.UserProto;
-import ru.m.tankz.proto.game.GameEventProto;
 import ru.m.tankz.proto.pack.GameEventRequest;
 import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.pack.LoginRequest;
@@ -19,11 +21,8 @@ import ru.m.tankz.proto.room.LeaveRequest;
 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.SlotProto;
-import ru.m.tankz.proto.room.SlotRequest;
 import ru.m.tankz.proto.room.StartRequest;
 import ru.m.tankz.storage.NetworkStorage;
-import ru.m.tankz.storage.SettingsStorage;
 
 typedef ClientConnection = IConnection<Request, Response>;
 
@@ -36,9 +35,7 @@ enum ConnectionState {
     ERROR(error:Dynamic);
 }
 
-@:provide class NetworkManager {
-
-    private static inline var TAG = "NetworkManager";
+class NetworkManager {
 
     public var state(default, null):ConnectionState;
     public var room(default, null):RoomProto;
@@ -51,7 +48,6 @@ enum ConnectionState {
 
     @:provide private var connection:ClientConnection;
     @:provide private var storage:NetworkStorage;
-    @:provide private var settings:SettingsStorage;
 
     private var reconnectTimer:Timer;
     private var reconnectDelay:Int;
@@ -65,26 +61,10 @@ enum ConnectionState {
         updateState(OFFLINE);
         connection.handler.connect(onConnectionEvent);
         connection.receiveHandler.connect(onResponse);
-        if (settings.enableNetwork) {
-            connect();
-        }
-        settings.signal.connect(onSettingChange);
-    }
-
-    private function onSettingChange(setting:Setting):Void {
-        switch setting {
-            case ENABLE_NETWORK(value):
-                if (value) {
-                    connect();
-                } else {
-                    disconnect();
-                }
-            case _:
-        }
+        connect();
     }
 
     private function updateState(value:ConnectionState):Void {
-        L.d(TAG, 'State: ${value}');
         state = value;
         stateSignal.emit(value);
     }
@@ -151,10 +131,6 @@ enum ConnectionState {
         }
     }
 
-    private function disconnect():Void {
-        connection.disconnect();
-    }
-
     private function onConnectionEvent(event:ConnectionEvent):Void {
         updateState(switch event {
             case CONNECTED: CONNECTED;
@@ -169,9 +145,7 @@ enum ConnectionState {
                     login(user.name, user.uuid);
                 }
             case DISCONNECTED | ERROR(_):
-                if (settings.enableNetwork) {
-                    reconnect();
-                }
+                reconnect();
         }
     }
 

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

@@ -1,12 +1,11 @@
 package ru.m.tankz.render;
 
-import hw.view.IView;
+import haxework.view.IView;
 import ru.m.tankz.config.Config;
 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

@@ -1,16 +1,14 @@
 package ru.m.tankz.render;
 
-import hw.view.utils.DrawUtil;
 import flash.display.DisplayObjectContainer;
 import flash.display.Graphics;
 import flash.display.Sprite;
 import flash.events.Event;
 import haxe.Timer;
-import hw.view.form.LabelView;
-import hw.view.SpriteView;
+import haxework.view.LabelView;
+import haxework.view.SpriteView;
 import promhx.Promise;
 import ru.m.animate.Animate;
-import ru.m.animate.AnimateManager;
 import ru.m.animate.OnceAnimate;
 import ru.m.geom.Point;
 import ru.m.tankz.config.Config;
@@ -28,12 +26,7 @@ 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 container:Sprite;
     private var backgroundLayer:Sprite;
     private var groundLayer:Sprite;
     private var entryLayer:Sprite;
@@ -41,67 +34,38 @@ class Render extends SpriteView implements IRender {
     private var upperLayer:Sprite;
 
     private var items:Map<Int, IRenderItem>;
-    private var paused:Bool;
-
-    @:provide private static var animateManager:AnimateManager;
 
     public function new() {
         super();
         items = new Map();
-        container = new Sprite();
-        content.addChild(container);
         backgroundLayer = new Sprite();
         groundLayer = new Sprite();
         entryLayer = new Sprite();
         upLayer = new Sprite();
         upperLayer = new Sprite();
-        container.addChild(backgroundLayer);
-        container.addChild(groundLayer);
-        container.addChild(entryLayer);
-        container.addChild(upLayer);
-        container.addChild(upperLayer);
+        content.addChild(backgroundLayer);
+        content.addChild(groundLayer);
+        content.addChild(entryLayer);
+        content.addChild(upLayer);
+        content.addChild(upperLayer);
         reset();
     }
 
-    private function get_mapWidth():Float {
-        return config.map.cell.width * (gridSize != null ? gridSize.width : config.map.grid.width);
-    }
-
-    private function get_mapHeight():Float {
-        return config.map.cell.height * (gridSize != null ? gridSize.height : config.map.grid.height);
-    }
-
     private function set_config(value:Config):Config {
         config = value;
+        setContentSize(config.mapWidth, config.mapHeight);
         drawBackground();
-        toRedraw();
         return config;
     }
 
-    private function set_gridSize(value:GridSize):GridSize {
-        gridSize = value;
-        drawBackground();
-        toRedraw();
-        return gridSize;
-    }
-
     private function drawBackground():Void {
         var g:Graphics = backgroundLayer.graphics;
         g.clear();
         g.beginFill(0x000000);
-        g.lineStyle(2, 0xcccccc);
-        g.drawRect(0, 0, mapWidth, mapHeight);
+        g.drawRect(0, 0, config.mapWidth, config.mapHeight);
         g.endFill();
     }
 
-    override public function redraw():Void {
-        super.redraw();
-        var scale = Math.min(width / mapWidth, height / mapHeight);
-        container.scaleX = container.scaleY = scale;
-        container.x = (width - (mapWidth * scale)) / 2;
-        container.y = (height - (mapHeight * scale)) / 2;
-    }
-
     public function draw():Void {
         for (item in items) {
             item.update();
@@ -109,15 +73,11 @@ class Render extends SpriteView implements IRender {
     }
 
     private function onEnterFrame(event:Event):Void {
-        if (!paused) {
-            draw();
-        }
+        draw();
     }
 
     private function clearLayer(layer:DisplayObjectContainer) {
-        while (layer.numChildren > 0) {
-            layer.removeChildAt(0);
-        }
+        while (layer.numChildren > 0) layer.removeChildAt(0);
     }
 
     public function reset():Void {
@@ -134,15 +94,10 @@ class Render extends SpriteView implements IRender {
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(start):
-                animateManager.playing = true;
-                gridSize = start.level.size;
+            case START(_):
                 content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-            case COMPLETE(_):
+            case COMPLETE(_, _):
                 content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
-            case PAUSE(paused):
-                this.paused = paused;
-                animateManager.playing = !paused;
             case SPAWN(BRICK(bricks)):
                 drawBackground();
                 for (brick in bricks) {
@@ -167,16 +122,13 @@ class Render extends SpriteView implements IRender {
                 item.skin = tankConfig.skin;
                 item.hits = info.hits;
                 item.bonus = info.bonus;
-                item.boat = info.boat;
                 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, skin, color)):
-                var item = new BulletRenderItem(rect);
-                item.color = color;
-                item.skin = skin;
+            case SPAWN(BULLET(id, rect, playerId, piercing)):
+                var item = new BulletRenderItem(rect, piercing);
                 items.set(id, item);
                 entryLayer.addChild(item.view);
                 item.update();
@@ -206,13 +158,12 @@ class Render extends SpriteView implements IRender {
                     var item = items[id];
                     cast(item, TankRenderItem).moves = false;
                 }
-            case CHANGE(TANK(id, type, hits, bonus, boat)):
+            case CHANGE(TANK(id, type, hits, bonus)):
                 if (items.exists(id)) {
                     var item:TankRenderItem = cast items[id];
                     item.skin = config.getTank(type).skin;
                     item.hits = hits;
                     item.bonus = bonus;
-                    item.boat = boat;
                 }
             case CHANGE(TANK_PROTECT(id, state)):
                 if (items.exists(id)) {
@@ -234,7 +185,9 @@ class Render extends SpriteView implements IRender {
                     var item = items[id];
                     entryLayer.removeChild(item.view);
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    showScore(item.rect.center, shot.score);
+                    if (shot.score != 0) {
+                        showScore(item.rect.center, shot.score);
+                    }
                     items.remove(id);
                 }
             case DESTROY(BULLET(id)):
@@ -251,14 +204,18 @@ class Render extends SpriteView implements IRender {
                 if (items.exists(id)) {
                     var item = items[id];
                     playAnimate(item.rect.center, AnimateBundle.tankBoom());
-                    showScore(item.rect.center, shot.score);
+                    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);
-                    showScore(item.rect.center, shot.score);
+                    if (shot.score != 0) {
+                        showScore(item.rect.center, shot.score);
+                    }
                     items.remove(id);
                 }
             case DESTROY(CELL(id, x, y, shot)):
@@ -287,17 +244,15 @@ class Render extends SpriteView implements IRender {
         });
     }
 
-    private function showScore(point:Point, score:Null<Int>):Void {
-        if (score != null && score != 0) {
-            var view:LabelView = new LabelView();
-            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.removeChildSafety(view.content), 1000);
-        }
+    private function showScore(point:Point, score:Int):Void {
+        var view:LabelView = new LabelView();
+        view.skinId = "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.removeChildSafety(view.content), 1000);
     }
 }

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

@@ -1,29 +0,0 @@
-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');
-    }
-
-    public static function brickImage(type:BrickType, frame:Int = 0):BitmapData {
-        return Assets.getBitmapData('resources/image/map/${type}${frame > 0 ? ("-" + frame) : ""}.png');
-    }
-}

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

@@ -4,28 +4,29 @@ 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):BitmapData;
+    public var image(default, set):String;
 
+    private var bitmapData:BitmapData;
     private var bitmap:Bitmap;
 
     public function new(rect:Rectangle) {
         super(rect);
-        this.bitmap = new Bitmap(null, PixelSnapping.NEVER, false);
+        this.bitmap = new Bitmap(null, PixelSnapping.AUTO, true);
     }
 
     override private function get_view():DisplayObject {
         return bitmap;
     }
 
-    private function set_image(value:BitmapData):BitmapData {
+    private function set_image(value:String):String {
         if (image != value) {
             image = value;
-            bitmap.bitmapData = image;
-            bitmap.width = rect.width;
-            bitmap.height = rect.height;
+            bitmapData = Assets.getBitmapData(image);
+            bitmap.bitmapData = bitmapData;
         }
         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 = RenderUtil.bonusImage(type);
+            image = 'resources/image/bonus/${type}.png';
         }
         return type;
     }

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

@@ -1,88 +1,57 @@
 package ru.m.tankz.render.item;
 
 import flash.display.BitmapData;
+import flash.display.Shape;
 import openfl.Assets;
-import ru.m.geom.GridPoint;
+import openfl.display.DisplayObject;
+import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
-import ru.m.tankz.Type;
+import ru.m.tankz.Type.BrickType;
 
-class BrickBitmapBundle {
-
-    private var data:Map<String, BitmapData>;
-
-    public function new() {
-        data = new Map();
-    }
-
-    private function resolve(type:BrickType, cells:Array<GridPoint>, frame:Int):BitmapData {
-        return switch cells.length {
-            case 0:
-                null;
-            case 4:
-                type == "none" ? null : RenderUtil.brickImage(type, frame);
-            case _:
-                var image = RenderUtil.brickImage(type, frame);
-                var result = new BitmapData(image.width, image.height, true, 0x00000000);
-                for (point in cells) {
-                    var rect = new flash.geom.Rectangle(
-                    point.x * image.width / 2,
-                    point.y * image.height / 2,
-                    image.width / 2,
-                    image.height / 2);
-                    result.draw(image, null, null, null, rect);
-                }
-                return result;
-        }
-    }
-
-    public function get(type:BrickType, cells:Array<GridPoint>, frame:Int = 0):BitmapData {
-        var key:String = '${type}_${cells.map(function(point) return point.toString()).join(",")}_${frame}';
-        if (!data.exists(key)) {
-            data.set(key, resolve(type, cells, frame));
-        }
-        return data.get(key);
-    }
+enum BrickState {
+    UNBROKEN;
+    BROKEN;
+    DESTROYED;
 }
 
-class BrickRenderItem extends BitmapRenderItem {
-
-    private static var bundle:BrickBitmapBundle = new BrickBitmapBundle();
+class BrickRenderItem extends RenderItem {
 
     public var type(default, set):BrickType;
+    public var state(get, never):BrickState;
 
-    private var cells:Array<GridPoint>;
-
-    private var frames:Int;
-    private var currentFrame:Int;
-    private var ticks:Int;
-
-    private static function buildCells():Array<GridPoint> {
-        return [
-            new GridPoint(0, 0),
-            new GridPoint(0, 1),
-            new GridPoint(1, 0),
-            new GridPoint(1, 1),
-        ];
-    }
+    private var image:BitmapData;
+    private var shape:Shape;
+    private var cells:Array<Point>;
 
     public function new(rect:Rectangle, type:BrickType) {
         super(rect);
-        cells = buildCells();
-        this.frames = 1;
-        this.currentFrame = 0;
-        this.ticks = 0;
+        this.shape = new Shape();
+        cells = [
+            new Point(0, 0),
+            new Point(0, 1),
+            new Point(1, 0),
+            new Point(1, 1),
+        ];
         this.type = type;
         move(rect.position);
     }
 
+    private function get_state():BrickState {
+        return switch cells.length {
+            case 0: DESTROYED;
+            case 4: UNBROKEN;
+            case _: BROKEN;
+        }
+    }
+
+    override private function get_view():DisplayObject {
+        return shape;
+    }
+
     private function set_type(value:BrickType):BrickType {
         if (type != value) {
             type = value;
-            frames = switch type {
-                case "water": 2;
-                case _: 1;
-            }
-            cells = buildCells();
+            image = Assets.getBitmapData('resources/image/map/${type}.png');
             redraw();
         }
         return type;
@@ -99,20 +68,24 @@ class BrickRenderItem extends BitmapRenderItem {
     }
 
     public function redraw():Void {
-        image = bundle.get(type, cells, currentFrame);
-    }
-
-    override public function update():Void {
-        super.update();
-        if (frames > 1) {
-            if (++ticks >= 30) {
-                ticks = 0;
-                currentFrame++;
-                if (currentFrame >= frames) {
-                    currentFrame = 0;
+        shape.graphics.clear();
+        if (type == "none") return;
+        switch state {
+            case UNBROKEN:
+                shape.graphics.beginBitmapFill(image);
+                shape.graphics.drawRect(0, 0, rect.width, rect.height);
+                shape.graphics.endFill();
+            case BROKEN:
+                shape.graphics.beginBitmapFill(image);
+                for (point in cells) {
+                    var x = point.x * (rect.width / 2);
+                    var y = point.y * (rect.width / 2);
+                    var width = rect.width / 2;
+                    var height = rect.height / 2;
+                    shape.graphics.drawRect(x, y, width, height);
                 }
-                redraw();
-            }
+                shape.graphics.endFill();
+            case DESTROYED:
         }
     }
 }

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

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

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

@@ -2,8 +2,8 @@ package ru.m.tankz.render.item;
 
 import flash.display.DisplayObject;
 import flash.display.Sprite;
-import hw.color.Color;
-import hw.view.utils.BitmapUtil;
+import haxework.color.Color;
+import haxework.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
@@ -35,8 +35,8 @@ class EagleRenderItem extends BitmapRenderItem {
         if (protect != value) {
             protect = value;
             if (protect) {
-                protectView.x = (image.width - protectView.frames[0].image.width) / 2;
-                protectView.y = (image.height - protectView.frames[0].image.height) / 2;
+                protectView.x = (bitmapData.width - protectView.frames[0].image.width) / 2;
+                protectView.y = (bitmapData.height - protectView.frames[0].image.height) / 2;
             }
             protectView.visible = protect;
             protectView.playing = protect;
@@ -47,9 +47,10 @@ class EagleRenderItem extends BitmapRenderItem {
     private function set_death(value:Bool):Bool {
         if (death != value) {
             death = value;
-            image = RenderUtil.eagleImage(death);
+            var suffix = death ? '-death' : '';
+            image = 'resources/image/eagle/eagle${suffix}.png';
             if (!color.zero) {
-                bitmap.bitmapData = image = BitmapUtil.colorize(image, color);
+                bitmap.bitmapData = bitmapData = BitmapUtil.colorize(bitmapData, color);
             }
         }
         return death;

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

@@ -2,15 +2,14 @@ package ru.m.tankz.render.item;
 
 import flash.display.BitmapData;
 import flash.display.DisplayObject;
-import flash.display.Shape;
 import flash.display.Sprite;
 import flash.text.TextField;
 import flash.text.TextFieldAutoSize;
 import flash.text.TextFormat;
-import hw.color.Color;
-import hw.text.BitmapTextField;
-import hw.view.theme.ITheme;
-import hw.view.utils.BitmapUtil;
+import haxework.color.Color;
+import haxework.text.BitmapTextField;
+import haxework.view.utils.BitmapUtil;
+import openfl.Assets;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
@@ -19,7 +18,6 @@ class TankRenderItem extends BitmapRenderItem {
     public var skin(default, set):String;
     public var hits(default, set):Int;
     public var bonus(default, set):Bool;
-    public var boat(default, set):Bool;
     public var moves(default, set):Bool;
     public var protect(default, set):Bool;
     public var name(default, set):String;
@@ -28,11 +26,8 @@ class TankRenderItem extends BitmapRenderItem {
     private var images:Array<BitmapData>;
     private var frame:Int;
     private var protectView:Animate;
-    private var boatView:Shape;
     private var nameView:TextField;
 
-    @:provide static var theme:ITheme;
-
     public function new(rect:Rectangle) {
         super(rect);
         container = new Sprite();
@@ -40,9 +35,6 @@ class TankRenderItem extends BitmapRenderItem {
         protectView = AnimateBundle.tankProtect();
         protectView.visible = false;
         container.addChild(protectView);
-        boatView = buildBoatView();
-        boatView.visible = false;
-        container.addChild(boatView);
         nameView = buildNameView();
         container.addChild(nameView);
         move(rect.position);
@@ -50,21 +42,14 @@ class TankRenderItem extends BitmapRenderItem {
 
     private function buildNameView():TextField {
         var result = new BitmapTextField();
-        result.defaultTextFormat = new TextFormat(theme.font.name, 10, 0xffffff);
-        result.embedFonts = theme.font.embed;
+        result.defaultTextFormat = new TextFormat(Style.fontFamily, 10, 0xffffff);
+        result.embedFonts = Style.fontEmbed;
         result.autoSize = TextFieldAutoSize.LEFT;
         result.shadowColor = 0x000000;
         result.stroke = true;
         return result;
     }
 
-    private function buildBoatView():Shape {
-        var result = new Shape();
-        result.graphics.lineStyle(4, Color.fromString("green"), 0.8);
-        result.graphics.drawRoundRect(-1, -1, rect.width + 2, rect.height + 2, 10, 10);
-        return result;
-    }
-
     override private function get_view():DisplayObject {
         return container;
     }
@@ -74,8 +59,8 @@ class TankRenderItem extends BitmapRenderItem {
     }
 
     private function redraw():Void {
-        var image1 = RenderUtil.tankImage(skin, 0);
-        var image2 = RenderUtil.tankImage(skin, 1);
+        var image1 = Assets.getBitmapData('resources/image/tank/${skin}-0.png');
+        var image2 = Assets.getBitmapData('resources/image/tank/${skin}-1.png');
         var color1:Color = switch hits {
             case 1: 0x869C43;
             case 2: 0xDEAF80;
@@ -121,14 +106,6 @@ class TankRenderItem extends BitmapRenderItem {
         return bonus;
     }
 
-    private function set_boat(value:Bool):Bool {
-        if (boat != value) {
-            boat = value;
-            boatView.visible = boat;
-        }
-        return boat;
-    }
-
     private function set_protect(value:Bool):Bool {
         if (protect != value) {
             protect = value;
@@ -164,7 +141,7 @@ class TankRenderItem extends BitmapRenderItem {
         super.update();
         if (moves) {
             frame++;
-            if (frame >= images.length) {
+            if (frame > images.length - 1) {
                 frame = 0;
             }
             bitmap.bitmapData = images[frame];

src/client/haxe/ru/m/tankz/sound/SoundManager.hx

@@ -9,7 +9,7 @@ import ru.m.tankz.config.Config;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.IGame;
 
-@:provide class SoundManager implements GameListener {
+class SoundManager implements GameListener {
     private static var TAG(default, never):String = "SoundManager";
 
     #if flash

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

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

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

@@ -1,8 +1,8 @@
 package ru.m.tankz.storage;
 
-import hw.storage.SharedObjectStorage;
+import haxework.storage.SharedObjectStorage;
 
-@:provide class NetworkStorage extends SharedObjectStorage {
+class NetworkStorage extends SharedObjectStorage {
 
     public var user(get, set):User;
 

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

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

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

@@ -1,115 +1,52 @@
 package ru.m.tankz.storage;
 
 import flash.ui.Keyboard;
-import hw.signal.Signal;
-import hw.storage.SharedObjectStorage;
-import hw.utils.ObjectUtil;
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
+import haxework.storage.SharedObjectStorage;
+import haxework.utils.ObjectUtil;
 import ru.m.geom.Direction;
-import ru.m.tankz.control.Binding;
-import ru.m.tankz.control.Control;
+import ru.m.tankz.control.ActionConfig;
+import ru.m.tankz.control.Control.TankAction;
 
-enum Setting {
-    CONTROL(index:Int, value:Binding);
-    DISPLAY_FPS(value:Bool);
-    ENABLE_NETWORK(value:Bool);
-}
-
-@:provide class SettingsStorage extends SharedObjectStorage {
-
-    private static inline var VERSION = 4.1;
-
-    public var signal(default, null):Signal<Setting> =  new Signal();
-
-    public var displayFPS(get, set):Bool;
-
-    private function get_displayFPS():Bool {
-        return read("setting:display_fps");
-    }
-
-    private function set_displayFPS(value:Bool):Bool {
-        write("setting:display_fps", value);
-        signal.emit(DISPLAY_FPS(value));
-        return get_displayFPS();
-    }
-
-    public var enableNetwork(get, set):Bool;
-
-    private function get_enableNetwork():Bool {
-        return read("setting:enable_network");
-    }
-
-    private function set_enableNetwork(value:Bool):Bool {
-        write("setting:enable_network", value);
-        signal.emit(ENABLE_NETWORK(value));
-        return get_enableNetwork();
-    }
+class SettingsStorage extends SharedObjectStorage {
 
     public function new() {
-        super('settings_${VERSION}');
+        super("settings");
     }
 
-    public function getBinding(index:Int):Binding {
-        return exists('action:$index') ? read('action:$index') : getDefaultBinding(index);
+    public function getActionConfig(index:Int):ActionConfig {
+        return exists('action:$index') ? read('action:$index') : getDefaultActionConfig(index);
     }
 
-    public function saveBinding(index:Int, value:Binding) {
+    public function setActionConffig(index:Int, value:ActionConfig) {
         write('action:$index', value);
-        signal.emit(CONTROL(index, value));
     }
 
-    public static function getDefaultBinding(index:Int):Binding {
-        var binding = (Device.isMobile() ? mobileDefaults : defaults).get(index);
-        return binding != null ? ObjectUtil.clone(binding) : buildEmpty();
+    public static function getDefaultActionConfig(index:Int):ActionConfig {
+        return ObjectUtil.clone(defaults.exists(index) ? defaults.get(index) : empty);
     }
 
-    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 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},
+        ]),
     ];
 
-    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)},
-        ],
-    ];
+    private static var empty:ActionConfig = new ActionConfig([
+        {action:TankAction.MOVE(Direction.TOP), key:-1},
+        {action:TankAction.MOVE(Direction.LEFT), key:-1},
+        {action:TankAction.MOVE(Direction.BOTTOM), key:-1},
+        {action:TankAction.MOVE(Direction.RIGHT), key:-1},
+        {action:TankAction.SHOT, key:-1},
+    ]);
 }

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

@@ -1,44 +1,85 @@
 package ru.m.tankz.view;
 
+import ru.m.tankz.game.IGame;
+import flash.events.KeyboardEvent;
 import flash.ui.Keyboard;
-import hw.resources.IResources;
-import hw.view.frame.FrameSwitcher;
-import hw.view.group.VGroupView;
-import ru.m.control.DeviceAction;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlBus;
+import haxework.resources.IResources;
+import haxework.view.ButtonView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.LabelView;
+import haxework.view.VGroupView;
 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;
     @:provide var switcher:FrameSwitcher;
     @:provide var soundManager:SoundManager;
-    @:provide static var bus:IControlBus;
+    @:provide var game:IGame;
 
-    public function new():Void {
-        super();
+    public function init():Void {
         resources.text.put('version', '${Const.VERSION}');
-        resources.text.put('name', '${Const.NAME}');
         switcher = switcherView;
+        network.stateSignal.connect(onConnectionState);
+        onConnectionState(network.state);
     }
 
     public function launch():Void {
         content.stage.stageFocusRect = false;
-        bus.signal.connect(onDeviceAction);
-        switcher.change(MenuFrame.ID);
+        content.stage.addEventListener(KeyboardEvent.KEY_UP, function(event:KeyboardEvent):Void {
+            switch event.keyCode {
+                case Keyboard.ESCAPE:
+                    switcher.change(StartFrame.ID);
+                case Keyboard.M:
+                    soundManager.mute = !soundManager.mute;
+                case Keyboard.P:
+                    if (game != null) {
+                        game.pause = !game.pause;
+                    }
+            }
+        });
+        switcher.change(StartFrame.ID);
     }
 
-    private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
-        switch [type, action, state] {
-            case [KEYBOARD, KEY(Keyboard.ESCAPE), true]:
-                switcher.change(MenuFrame.ID);
-            case [KEYBOARD, KEY(Keyboard.M), true]:
-                soundManager.mute = !soundManager.mute;
+    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);
+    }
 }

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

@@ -1,20 +1,51 @@
 ---
 views:
-  - $type: hw.view.frame.FrameSwitcher
+  - $type: haxework.view.frame.FrameSwitcher
     id: switcher
-    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}
-  - $type: ru.m.tankz.view.common.NetworkStateView
-    geometry.position: absolute
-    geometry.hAlign: center
-    geometry.margin.top: 2
+    geometry.size.stretch: 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()

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

@@ -1,193 +1,94 @@
 package ru.m.tankz.view;
 
-import hw.view.text.TextView;
-import ru.m.tankz.view.popup.PausePopup;
-import flash.ui.Keyboard;
-import ru.m.control.DeviceAction;
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import hw.view.group.GroupView;
-import hw.view.layout.DefaultLayout;
-import hw.view.data.DataView;
-import hw.view.form.LabelView;
-import ru.m.control.DeviceType;
-import ru.m.control.IControlBus;
-import ru.m.tankz.control.HumanControl;
+import haxe.ds.Option;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.VGroupView;
 import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameInit;
-import ru.m.tankz.game.GameState.TeamState;
+import ru.m.tankz.game.GameState;
 import ru.m.tankz.game.IGame;
-import ru.m.tankz.game.record.GamePlayer;
 import ru.m.tankz.game.record.GameRecord;
-import ru.m.tankz.local.LocalGame;
-import ru.m.tankz.network.NetworkGame;
+import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.storage.SettingsStorage;
 import ru.m.tankz.Type;
-import ru.m.tankz.view.gamepad.GamepadView;
-import ru.m.tankz.view.game.TeamView;
-import ru.m.tankz.view.game.PlayerView;
-import ru.m.tankz.render.IRender;
+import ru.m.tankz.view.game.GameView;
 
-using ru.m.tankz.view.ViewUtil;
-
-@:template class GameFrame extends FrameView<GameInit> implements GameListener {
+@:template class GameFrame extends VGroupView implements GameListener {
     public static inline var ID = "game";
 
     private static inline var TAG = "GameFrame";
 
-    @: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;
+    @:view("game") private var gameView(default, null):GameView;
 
-    @:view private var render:IRender;
-    @:view private var teams:DataView<TeamState, TeamView>;
-    @:view private var level:TextView;
-    @:view private var gamepad(default, null):GamepadView;
+    @:provide var network:NetworkManager;
+    @:provide var soundManager:SoundManager;
+    @:provide var state:GameState;
+    @:provide var record:GameRecord;
+    @:provide("next") var nextState:GameState;
+    @:provide var switcher:FrameSwitcher;
+    @:provide var gameStorage:GameStorage;
 
-    private var gamepadPlayerId:PlayerId;
+    @:provide var game:IGame;
 
-    private var game:IGame;
-    private var recorder:GameRecord;
-
-    public function new() {
-        super(id, new DefaultLayout());
-        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);
-        }
+    public function onShow():Void {
+        gameView.type = game.type;
         soundManager.config = game.config;
-        render.config = game.config;
-        game.connect(render);
+        gameView.render.config = game.config;
+        game.connect(gameView.render);
         game.connect(soundManager);
+        if (gameView.panel != null) {
+            game.connect(gameView.panel);
+        }
         game.connect(this);
         game.start();
-        // TODO:
-        for (control in game.controls) {
-            if (Std.is(control, HumanControl)) {
-                if (cast(control, HumanControl).hasDevice(SCREEN)) {
-                    gamepadPlayerId = control.playerId;
-                    gamepad.visible = true;
-                    break;
-                }
-            }
-        }
-        bus.signal.connect(onDeviceAction);
-    }
-
-    private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
-        switch [type, action, state] {
-            case [KEYBOARD, KEY(Keyboard.P), true]:
-                game.pause = !game.pause;
-            case _:
-        }
     }
 
     private function stop():Void {
-        bus.signal.disconnect(onDeviceAction);
         if (game != null) {
             game.dispose();
             game = null;
         }
-        render.reset();
-    }
-
-    private function findTeamView(id:TeamId):Null<TeamView> {
-        for (view in 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;
+        gameView.render.reset();
     }
 
     public function onGameEvent(event:GameEvent):Void {
         switch event {
-            case START(start):
-                level.text = start.level.toLevelLabel();
-                teams.data = [for (team in start.state.teams) team];
-                // TODO: PlayerState default tank?
-                for (teamView in teams.dataViews) {
-                    for (playerView in teamView.dataViews) {
-                        var tank = game.config.getPlayerTank(playerView.playerId);
-                        playerView.tank = {
-                            type: tank.type,
-                            skin: tank.skin,
-                            hits: 0,
-                            bonus: false,
-                            boat: false,
-                            color: game.config.getColor(playerView.playerId),
-                        };
-                    }
+            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 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 SPAWN(TANK(id, rect, playerId, info)):
-                if (gamepadPlayerId != null && playerId == gamepadPlayerId) {
-                    var tankConfig = game.config.getTank(info.type);
-                    gamepad.weapons = tankConfig.weapons;
-                }
-            case PAUSE(paused):
-                if (paused) {
-                    PausePopup.instance.show().then(function(action) {
-                        switch action {
-                            case EXIT:
-                                switcher.change(LevelFrame.ID, game.level.packId);
-                            case RESUME | null:
-                                game.pause = false;
-                        }
-                    });
-                } else {
-                    PausePopup.instance.close(null);
-                }
-            case COMPLETE(result):
                 stop();
-                switcher.change(ResultFrame.ID, result);
+                switcher.change(ResultFrame.ID);
             case _:
         }
     }
 
-    override public function onHide():Void {
+    // 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 {
         stop();
         soundManager.stopAll();
     }
+
+    public function close():Void {
+        switcher.change(LevelFrame.ID);
+    }
 }

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

@@ -1,48 +1,7 @@
 ---
-style: container
 views:
-  - id: game
-    $type: hw.view.group.HGroupView
-    geometry.stretch: true
+  - $type: haxework.view.VGroupView
+    skinId: container
     views:
-      - id: left
-        $type: hw.view.group.GroupView
-        layout.vAlign: middle
-        geometry.height: 100%
-        geometry.width: 15%
-      - id: render
-        $type: ru.m.tankz.render.Render
-        style: render
-        geometry.height: 100%
-        geometry.width: 70%
-      - id: right
-        $type: hw.view.group.VGroupView
-        geometry.height: 100%
-        geometry.width: 15%
-        geometry.padding: 5
-        layout.vAlign: top
-        layout.margin: 5
-        views:
-          - id: level
-            $type: hw.view.text.TextView
-            style: text.box
-            geometry.width: 100%
-          - $type: hw.view.SpriteView
-            geometry.height: 30%
-          - id: teams
-            $type: hw.view.data.DataView
-            layout.margin: 3
-            geometry.width: 100%
-            factory: ~TeamView.viewFactory
-  - id: gamepad
-    $type: ru.m.tankz.view.gamepad.GamepadView
-    geometry.position: absolute
-    geometry.stretch: true
-    visible: false
-  - $type: hw.view.form.ButtonView
-    style: button.bars
-    geometry.position: absolute
-    geometry.hAlign: left
-    geometry.vAlign: top
-    geometry.margin: 10
-    +onPress: ~function(_) game.pause = true
+      - id: game
+        $type: ru.m.tankz.view.game.GameView

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

@@ -1,63 +1,70 @@
 package ru.m.tankz.view;
 
-import hw.view.data.DataView;
-import hw.view.form.ButtonView;
-import hw.view.form.LabelView;
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import ru.m.tankz.bundle.IConfigBundle;
+import haxework.view.ButtonView;
+import haxework.view.DataView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.LabelView;
+import haxework.view.VGroupView;
 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.local.LocalGame;
 import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type.PackId;
+import ru.m.tankz.Type;
+import ru.m.tankz.view.popup.LevelPopup;
 
-using ru.m.tankz.view.ViewUtil;
-
-@:template class LevelFrame extends FrameView<PackId> {
+@:template class LevelFrame extends VGroupView {
     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<LevelConfig, ButtonView>;
+    @:view var levels:DataView<LevelId, ButtonView>;
 
-    private var pack:LevelPack;
-    private var config(get, never):Config;
+    @:provide var state:GameState;
+    @:provide var game:IGame;
+    @:provide var switcher:FrameSwitcher;
+    @:provide var levelBundle:ILevelBundle;
+    @:provide var storage:GameStorage;
 
-    public function new() {
-        super(ID);
+    private var levelPopup:LevelPopup;
+
+    public function onShow():Void {
+        header.text = state.type;
+        levels.data = [for (i in 0...state.config.game.levels) i];
     }
 
-    private function get_config():Config {
-        return configBundle.get(pack.id.type);
+    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);
     }
 
-    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);
+    private function levelViewFactory(index:Int, levelId:LevelId):ButtonView {
+        var progress = storage.get(state.type);
         var result = new ButtonView();
-        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);
+        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);
         return result;
     }
 
-    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,
-            });
+    private function onLevelSelect(index:Int, levelId:LevelId, view:ButtonView):Void {
+        if (!storage.get(state.type).isLevelAvailable(levelId)) {
+            return;
         }
+        if (levelPopup == null) {
+            levelPopup = new LevelPopup();
+        }
+        var level = levelBundle.get(state.type, state.config, levelId);
+        levelPopup.setData(
+            level,
+            state.config.presets,
+            state.config.controls,
+            storage.get(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,29 +1,18 @@
 ---
 views:
-  - $type: hw.view.group.VGroupView
-    style: container
+  - $type: haxework.view.VGroupView
+    skinId: container
     views:
       - id: header
-        $type: hw.view.form.LabelView
-        style: text.header
+        $type: haxework.view.LabelView
+        skinId: text.header
       - id: levels
-        $type: hw.view.data.DataView
-        geometry.width: 100%
-        geometry.height: 100%
-        overflow.y: scroll
+        $type: haxework.view.DataView
+        geometry.size.width: 100%
         layout:
-          $type: hw.view.layout.TailLayout
+          $type: haxework.view.layout.TailLayout
           rowSize: 10
           margin: 5
-        factory: ~levelViewFactory
-        +onItemSelect: ~onLevelSelect
+        factory: $this:levelViewFactory
+        +onItemSelect: $this:onLevelSelect
         geometry.padding: 10
-  - $type: hw.view.group.HGroupView
-    style: panel
-    layout.margin: 10
-    views:
-      - $type: hw.view.SpriteView
-        geometry.width: 100%
-      - $type: hw.view.form.ButtonView
-        style: button.prev
-        +onPress: ~switcher.change("menu")

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

@@ -1,94 +0,0 @@
-package ru.m.tankz.view;
-
-import hw.view.data.DataView;
-import hw.view.form.ButtonView;
-import hw.view.frame.FrameSwitcher;
-import hw.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.storage.SettingsStorage;
-import ru.m.tankz.Type;
-import ru.m.tankz.view.common.PackView;
-import ru.m.tankz.view.network.RoomFrame;
-import ru.m.tankz.view.network.RoomListFrame;
-import ru.m.tankz.view.popup.LoginPopup;
-import ru.m.update.Updater;
-
-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;
-    @:provide static var settings:SettingsStorage;
-
-    @:view var packs:DataView<PackId, PackView>;
-    @:view("update") var updateButton:ButtonView;
-    @:view("network") var networkButton:ButtonView;
-
-    public function new() {
-        super(ID);
-    }
-
-    override public function onShow(data:Dynamic):Void {
-        super.onShow(data);
-        appUpdater.check().then(function(update:Bool) {
-            updateButton.visible = update;
-            if (update) {
-                updateButton.text = 'Update ${appUpdater.bundle.version}';
-            }
-        }).catchError(function(error) {});
-        var list = levelBundle.list();
-        list.sort(function(a:PackId, b:PackId) return a.toPackLabel() > b.toPackLabel() ? 1 : -1);
-        packs.data = list;
-        networkButton.visible = settings.enableNetwork;
-        settings.signal.connect(onSettingChange);
-    }
-
-    override public function onHide():Void {
-        super.onHide();
-        settings.signal.disconnect(onSettingChange);
-    }
-
-    private function onSettingChange(setting:Setting):Void {
-        switch setting {
-            case ENABLE_NETWORK(value): networkButton.visible = value;
-            case _:
-        }
-    }
-
-    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 appUpdate():Void {
-        appUpdater.download();
-    }
-}

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

@@ -1,61 +0,0 @@
----
-views:
-  - $type: hw.view.group.VGroupView
-    style: container
-    overflow.y: scroll
-    views:
-      - $type: hw.view.group.VGroupView
-        geometry.width: 100%
-        layout.margin: 10
-        layout.hAlign: center
-        views:
-          - $type: hw.view.form.LabelView
-            text: $r:text:name
-            style: font
-            font.size: 100
-            geometry.margin.bottom: 30
-          - id: packs
-            $type: hw.view.data.DataView
-            geometry.width: 100%
-            layout:
-              $type: hw.view.layout.TailLayout
-              rowSize: 2
-              margin: 10
-            factory: ~ru.m.tankz.view.common.PackView.factory
-            +onDataSelect: ~startGame
-          - $type: hw.view.SpriteView
-            style: line
-            geometry.width: 250
-            geometry.margin: [0, 10]
-            visible: false
-          - $type: hw.view.form.ButtonView
-            +onPress: ~switcher.change('record')
-            text: Records
-            visible: false
-          - id: network
-            $type: hw.view.form.ButtonView
-            +onPress: ~startNetwork()
-            text: Network (alpha)
-            visible: false
-  - $type: hw.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: hw.view.group.HGroupView
-    style: panel
-    layout.margin: 10
-    views:
-      - id: settings
-        $type: hw.view.form.ButtonView
-        style: button.settings
-        +onPress: ~switcher.change('settings')
-      - $type: hw.view.SpriteView
-        geometry.width: 100%
-      - id: update
-        $type: hw.view.form.ButtonView
-        style: button.active
-        +onPress: ~appUpdate()
-        visible: false

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

@@ -1,27 +1,28 @@
 package ru.m.tankz.view;
 
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import hw.view.list.VListView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.list.ListView;
+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 FrameView<Dynamic> {
-
+@:template class RecordFrame extends VGroupView {
     public static var ID(default, never):String = "record";
 
-    @:provide static var switcher:FrameSwitcher;
-    @:provide static var recordStorage:RecordStorage;
-
     @:view var data:VListView<GameRecordInfo>;
 
-    public function new() {
-        super(ID);
-    }
+    @:provide var recordStorage:RecordStorage;
+    @:provide var switcher:FrameSwitcher;
+    @:provide var record:GameRecord;
 
-    override public function onShow(_:Dynamic):Void {
-        var data = recordStorage.list();
+    public function onShow():Void {
+        var data = Lambda.array(recordStorage);
         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,24 +1,18 @@
 ---
 views:
-  - $type: hw.view.group.VGroupView
-    style: container
+  - $type: haxework.view.VGroupView
+    skinId: container
+    geometry.padding: 20
     views:
-      - $type: hw.view.form.LabelView
-        style: text.header
+      - $type: haxework.view.LabelView
+        skinId: text.header
         text: Records
       - id: data
-        $type: hw.view.list.VListView
-        factory: ~function() return new ru.m.tankz.view.common.RecordView()
+        $type: haxework.view.list.VListView
+        factory: $code:function() return new ru.m.tankz.view.common.RecordView()
+        +onItemSelect: $this:onRecordSelect
         geometry.margin.top: 20
-        geometry.stretch: true
+        geometry.size.stretch: true
         scroll:
-          $type: hw.view.list.VScrollBarView
-  - $type: hw.view.group.HGroupView
-    style: panel
-    layout.margin: 10
-    views:
-      - $type: hw.view.SpriteView
-        geometry.width: 100%
-      - $type: hw.view.form.ButtonView
-        style: button.prev
-        +onPress: ~switcher.change("menu")
+            $type: haxework.view.list.VScrollBarView
+            skinId: scroll

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

@@ -1,65 +1,51 @@
 package ru.m.tankz.view;
 
-import hw.view.data.DataView;
-import hw.view.form.ButtonView;
-import hw.view.form.LabelView;
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import ru.m.tankz.bundle.ILevelBundle;
-import ru.m.tankz.game.GameEvent;
-import ru.m.tankz.game.GameInit;
+import haxework.view.ButtonView;
+import haxework.view.DataView;
+import haxework.view.frame.FrameSwitcher;
+import haxework.view.LabelView;
+import haxework.view.VGroupView;
+import ru.m.tankz.game.GameRunner;
 import ru.m.tankz.game.GameState;
-import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.view.result.ResultPlayerView;
+import ru.m.tankz.game.IGame;
+import ru.m.tankz.view.common.LifeView;
 
-using ru.m.tankz.view.ViewUtil;
-
-@:template class ResultFrame extends FrameView<Result> {
+@:template class ResultFrame extends VGroupView {
     public static var ID(default, never):String = "result";
 
-    @:view("result") var resultView:DataView<PlayerState, ResultPlayerView>;
+    @:view("result") var resultView:DataView<PlayerState, LifeView>;
     @:view("level") var levelLabel:LabelView;
-    @:view("next") var nextButton:ButtonView;
 
     @:provide var frames:FrameSwitcher;
-    @:provide static var levelBundle:ILevelBundle;
-    @:provide static var gameStorage:GameStorage;
+    @:provide var state:GameState;
+    @:provide("next") var nextState:GameState;
+    @:provide var game:IGame;
 
-    private var result:Result;
-
-    public function new() {
-        super(ID);
+    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;
     }
 
-    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;
+    public function onShow() {
+        resultView.data =  Lambda.array(state.players);
+        levelLabel.text = 'Level ${state.levelId}';
+    }
+
+    private function next() {
+        if (nextState != null) {
+            game = new GameRunner(nextState);
+            frames.change(GameFrame.ID);
         }
-        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 levels():Void {
-        frames.change(LevelFrame.ID, result.level.packId);
-    }
-
-    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}));
-            }
-        }
+    private function close() {
+        frames.change(LevelFrame.ID);
     }
 }

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

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

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

@@ -1,39 +1,7 @@
 package ru.m.tankz.view;
 
-import hw.view.form.ToggleButtonView;
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import ru.m.tankz.storage.SettingsStorage;
+import haxework.view.VGroupView;
 
-@:template class SettingsFrame extends FrameView<Dynamic> {
+@:template class SettingsFrame extends VGroupView {
     public static var ID(default, never):String = "settings";
-
-    @:view("fps") var fpsButton:ToggleButtonView;
-    @:view("network") var networkButton:ToggleButtonView;
-
-    @:provide static var switcher:FrameSwitcher;
-    @:provide static var settings:SettingsStorage;
-
-    public function new() {
-        super(ID);
-    }
-
-    override public function onShow(data:Dynamic):Void {
-        super.onShow(data);
-        fpsButton.on = settings.displayFPS;
-        networkButton.on = settings.enableNetwork;
-        settings.signal.connect(onSettingChange);
-    }
-
-    override public function onHide():Void {
-        settings.signal.disconnect(onSettingChange);
-    }
-
-    private function onSettingChange(setting:Setting):Void {
-        switch setting {
-            case DISPLAY_FPS(value): fpsButton.on = value;
-            case ENABLE_NETWORK(value): networkButton.on = value;
-            case _:
-        }
-    }
 }

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

@@ -1,52 +1,15 @@
 ---
 views:
-  - $type: hw.view.group.VGroupView
-    style: container
+  - $type: haxework.view.VGroupView
+    skinId: container
     views:
-      - $type: hw.view.form.LabelView
-        style: text.header
+      - $type: haxework.view.LabelView
+        skinId: text.header
         text: Settings
-      - $type: hw.view.group.VGroupView
-        geometry.stretch: true
-        layout.hAlign: center
-        overflow.y: scroll
+      - $type: haxework.view.HGroupView
+        layout.margin: 20
         views:
-          - $type: hw.view.group.GroupView
-            geometry.width: 100%
-            layout:
-              $type: hw.view.layout.TailLayout
-              vAlign: top
-              margin: 20
-            views:
-              - id: settings0
-                $type: ru.m.tankz.view.settings.SettingsEditor
-                controlIndex: 0
-              - id: settings1
-                $type: ru.m.tankz.view.settings.SettingsEditor
-                controlIndex: 1
-          - $type: hw.view.group.GroupView
-            geometry.width: 100%
-            geometry.margin.top: 20
-            layout:
-              $type: hw.view.layout.TailLayout
-              hAlign: center
-              margin: 20
-            views:
-              - id: fps
-                $type: hw.view.form.ToggleButtonView
-                text: Display FPS
-                +onPress: ~function(button) settings.displayFPS = !cast(button,ToggleButtonView).on
-              - id: network
-                $type: hw.view.form.ToggleButtonView
-                geometry.margin.top: 20
-                text: Enable Network
-                +onPress: ~function(button) settings.enableNetwork = !cast(button,ToggleButtonView).on
-  - $type: hw.view.group.HGroupView
-    style: panel
-    layout.margin: 10
-    views:
-      - $type: hw.view.SpriteView
-        geometry.width: 100%
-      - $type: hw.view.form.ButtonView
-        style: button.prev
-        +onPress: ~switcher.change("menu")
+          - $type: ru.m.tankz.view.settings.SettingsEditor
+            controlIndex: 0
+          - $type: ru.m.tankz.view.settings.SettingsEditor
+            controlIndex: 1

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

@@ -1,134 +1,56 @@
 package ru.m.tankz.view;
 
-import hw.view.data.DataView;
-import hw.view.form.ButtonView;
-import hw.view.form.LabelView;
-import hw.view.frame.FrameSwitcher;
-import hw.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;
+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;
 
-using haxe.EnumTools.EnumValueTools;
-using ru.m.tankz.view.ViewUtil;
-
-@:template class StartFrame extends FrameView<Start> {
+@:template class StartFrame extends VGroupView {
 
     public static var ID(default, never):String = "start";
 
-    @:provide static var switcher:FrameSwitcher;
-    @:provide static var storage:GameStorage;
+    @:provide var state:GameState;
+    @:provide var switcher:FrameSwitcher;
+    @:provide var network:NetworkManager;
 
-    private var progress:PackProgress;
+    private var fontPopup:FontPopup;
 
-    @: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 startGame(type:GameType):Void {
+        state = new GameState(type);
+        switcher.change(LevelFrame.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);
-    }
-
-    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);
+    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);
                 }
-                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 CONNECTED:
+                LoginPopup.instance.show().then(function(user):Void {
+                    if (user != null) {
+                        switcher.change(RoomListFrame.ID);
+                    }
+                });
             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 presetViewFactory(index:Int, value:GamePreset):ButtonView {
-        var result = new ButtonView();
-        result.style = 'button${!progress.isPresetCompleted(start.level.id, value.id) ? ".active" : ""}';
-        result.geometry.height = "100%";
-        result.text = value.name == "default" ? "start" : 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));
+    private function choiceFont():Void {
+        if (fontPopup == null) {
+            fontPopup = new FontPopup();
         }
+        fontPopup
+        .show()
+        .then(function(font) Style.register(font))
+        .catchError(function(e) {});
     }
 }

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

@@ -1,40 +1,41 @@
 ---
 views:
-  - $type: hw.view.group.VGroupView
-    style: container
-    views:
-      - id: header
-        $type: hw.view.form.LabelView
-        style: text.header
-      - id: teams
-        $type: hw.view.data.DataView
-        geometry.padding: 10
-        geometry.width: 100%
-        geometry.height: 100%
-        layout.hAlign: center
-        overflow.y: scroll
-        factory: ~teamViewFactory
-        layout:
-          $type: hw.view.layout.TailLayout
-          margin: 5
-          rowSize: 2
-  - $type: hw.view.group.HGroupView
-    style: panel
-    layout.margin: 10
-    views:
-      - $type: hw.view.SpriteView
-        geometry.width: 50%
-      - id: presets
-        $type: hw.view.data.DataView
-        factory: ~presetViewFactory
-        +onDataSelect: ~onPresetSelect
-        geometry.height: 100%
-        layout:
-          $type: hw.view.layout.HorizontalLayout
-          hAlign: center
-          margin: 5
-      - $type: hw.view.SpriteView
-        geometry.width: 50%
-      - $type: hw.view.form.ButtonView
-        style: button.prev
-        +onPress: ~switcher.change("level", start.level.packId)
+    - $type: haxework.view.VGroupView
+      skinId: container
+      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

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

@@ -1,62 +0,0 @@
-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, separator=" #"):String {
-        return packId.name != PackId.DEFAULT ? '${packId.type}${separator}${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

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

@@ -0,0 +1,13 @@
+---
+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/NetworkStateView.hx

@@ -1,64 +0,0 @@
-package ru.m.tankz.view.common;
-
-import hw.view.form.ButtonView;
-import hw.view.form.LabelView;
-import hw.view.group.HGroupView;
-import hw.view.skin.SpriteSkin;
-import hw.view.SpriteView;
-import ru.m.tankz.network.NetworkManager;
-import ru.m.tankz.view.popup.LoginPopup;
-
-@:template class NetworkStateView extends HGroupView {
-
-    @:view("state") var stateView:SpriteView;
-    @:view("user") var userLabel:LabelView;
-    @:view("login") var loginButton:ButtonView;
-    @:view("logout") var logoutButton:ButtonView;
-
-    @:provide static var network:NetworkManager;
-
-    public function new():Void {
-        super();
-        network.stateSignal.connect(onConnectionChange);
-    }
-
-    private function onConnectionChange(state:ConnectionState):Void {
-        visible = true;
-        stateView.visible = true;
-        userLabel.text = "";
-        loginButton.visible = false;
-        logoutButton.visible = false;
-        var skin:SpriteSkin = cast stateView.skin;
-        switch state {
-            case OFFLINE:
-                skin.background.color = "black";
-                stateView.visible = false;
-                visible = false;
-            case CONNECT:
-                skin.background.color = "yellow";
-            case CONNECTED:
-                skin.background.color = "gray";
-                loginButton.visible = true;
-            case LOGIN:
-                skin.background.color = "yellow";
-            case ONLINE(user):
-                skin.background.color = "green";
-                userLabel.text = user.name;
-                logoutButton.visible = true;
-            case ERROR(error):
-                skin.background.color = "red";
-                userLabel.text = Std.string(error).substr(0, 10);
-        }
-        stateView.toRedraw();
-    }
-
-    private function login():Void {
-        LoginPopup.instance.show().then(function(user:User):Void {
-            L.d("Login", 'user: $user');
-        });
-    }
-
-    private function logout():Void {
-        network.logout();
-    }
-}

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

@@ -1,34 +0,0 @@
----
-geometry.padding: [5, 2]
-layout.vAlign: middle
-visible: false
-skin:
-  $type: hw.view.skin.SpriteSkin
-  border.color: 0x95937D
-  round: 10
-views:
-  - id: state
-    $type: hw.view.SpriteView
-    geometry.width: 20
-    geometry.height: 20
-    visible: false
-    skin:
-      $type: hw.view.skin.SpriteSkin
-      background.color: black
-      border.color: 0xE7E0BB
-      round: 20
-  - id: user
-    $type: hw.view.form.LabelView
-    font.size: 14
-  - id: login
-    $type: hw.view.form.ButtonView
-    style: button.small
-    text: login
-    +onPress: ~login()
-    visible: false
-  - id: logout
-    $type: hw.view.form.ButtonView
-    style: button.small
-    text: logout
-    +onPress: ~logout()
-    visible: false

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

@@ -1,37 +0,0 @@
-package ru.m.tankz.view.common;
-
-import hw.view.form.LabelView;
-import hw.view.group.VGroupView;
-import ru.m.tankz.bundle.ILevelBundle;
-import ru.m.tankz.storage.GameStorage;
-import ru.m.tankz.Type;
-
-using ru.m.tankz.view.ViewUtil;
-
-@:template class PackView extends VGroupView {
-
-    public var data(default, set):PackId;
-
-    @:view var label:LabelView;
-    @:view var state:LabelView;
-
-    @:provide static var gameStorage:GameStorage;
-    @:provide static var levelBundle:ILevelBundle;
-
-    private function set_data(value:PackId):PackId {
-        if (data != value) {
-            data = value;
-            label.text = data.toPackLabel("\n");
-            var progress = gameStorage.get(data).progress;
-            var total = levelBundle.get(data).data.length;
-            state.text = '${progress}/${total}';
-        }
-        return data;
-    }
-
-    public static function factory(index:Int, value:PackId):PackView {
-        var result = new PackView();
-        result.data = value;
-        return result;
-    }
-}

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

@@ -1,9 +0,0 @@
----
-style: button.pack
-views:
-  - id: label
-    $type: hw.view.form.LabelView
-    font.size: 4h
-  - id: state
-    $type: hw.view.form.LabelView
-    font.size: 3.5h

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

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

@@ -0,0 +1,16 @@
+---
+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,10 +1,11 @@
 package ru.m.tankz.view.common;
 
-import hw.view.frame.FrameSwitcher;
-import hw.view.group.HGroupView;
-import hw.view.form.LabelView;
-import hw.view.list.ListView;
-import ru.m.tankz.game.GameInit;
+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.list.ListView;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
@@ -19,6 +20,7 @@ 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) {
@@ -33,7 +35,8 @@ import ru.m.tankz.storage.RecordStorage;
 
     private function play():Void {
         var record = recordStorage.read(data.id);
-        switcher.change(GameFrame.ID, RECORD(record));
+        game = new GamePlayer(record);
+        switcher.change(GameFrame.ID);
     }
 
     private function delete():Void {

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

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

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

@@ -1,48 +0,0 @@
-package ru.m.tankz.view.common;
-
-import openfl.Assets;
-import hw.view.ImageView;
-import hw.view.form.LabelView;
-import hw.view.form.SelectView;
-import hw.view.group.HGroupView;
-import hw.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

@@ -1,26 +0,0 @@
----
-geometry.padding: 2
-layout.margin: 10
-layout.vAlign: middle
-views:
-  - id: tank
-    $type: hw.view.ImageView
-    style: icon.tank
-  - id: slot
-    $type: hw.view.form.LabelView
-    style: text.box
-    geometry.width: 150
-  - id: select
-    $type: hw.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

@@ -1,25 +0,0 @@
-package ru.m.tankz.view.common;
-
-import hw.view.utils.DrawUtil.FillType;
-import hw.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";
-        fillType = FillType.CONTAIN;
-    }
-
-    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

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

@@ -0,0 +1,25 @@
+---
+geometry.padding: 5
+geometry.size.height: 100%
+layout.margin: 5
+layout.hAlign: left
+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