style: format code

[client] add active style to gamepad buttons

.editorconfig

@@ -4,9 +4,10 @@ root = true
 [*]
 charset = utf-8
 indent_style = space
-indent_size = 4
+indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.yaml]
+[*.md]
-indent_size = 2
+max_line_length = off
+trim_trailing_whitespace = false

.env.default

@@ -0,0 +1,24 @@
+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>
+
+DOCKER_REPO=git.shmyga.ru
+DOCKER_GROUP=infernalgames
+DOCKER_ROOT="$DOCKER_REPO/$DOCKER_GROUP"
+VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+.\d+')
+DOCKER_PROJECTS=(
+    "$PROJECT-web:web"
+)
+DOCKER_ARGS=(
+    "PROJECT_NAME=$PROJECT"
+)
+
+NEKO_SDK="$SDK_PATH/neko/2.2.0"
+HAXE_SDK="$SDK_PATH/haxe/4.2.5"

.gitignore

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

Dockerfile

@@ -0,0 +1,35 @@
+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"]
+
+FROM hello-world AS web
+ARG PROJECT_NAME
+VOLUME ["/app/${PROJECT_NAME}"]
+COPY ./target/client/html5 /app/${PROJECT_NAME}/html5
+COPY ./target/client/flash /app/${PROJECT_NAME}/flash
+CMD ["/hello"]

README.md

@@ -0,0 +1,11 @@
+# Tank'z
+
+![Tank'z](docs/Screenshot_2026-05-04_16-22-53.png "Tank'z")
+
+## Play
+
+https://shmyga.ru/tankz/html5/index.html
+
+## Releases
+
+https://git.shmyga.ru/InfernalGames/tankz/releases

WORK.md

@@ -1,22 +1,20 @@
-* bonuses
+* death game bonus
-    * death game bonuses
-    * boat bonus
 * tanks and bullets speed balancing
-* game series
+* clean player state on lose in classic type
-    * network series
+* network series
-* map packs
+* bot upgrade
-    * create in editor
-    * import in game
-    * save imported in local storage
-    * database
-    * cache
-* improve bots
-    * A star
 * game config validate
-* additional weapon
+* mine z-order
-    * mine
+* mine spawn position
-    * display count
+* mine spawn on other mine
-    * bonus ammo
+* double rocket
-    * screen gamepad (button enabled, count label)
+* display ammo count (panel)
-* ui:
+* display ammo count (screen gamepad)
-    * game frame layouts
+* 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

ansible/group_vars/all.yml

@@ -9,7 +9,7 @@ deploy_repo_version: develop
 deploy_npm: yes
 
 service_name: "{{ project_name }}"
-service_work_dir: "{{ deploy_current_dir }}/target/server/neko"
+service_work_dir: "{{ deploy_current_dir }}/target/server/cpp"
-service_command: "/usr/bin/neko {{ service_work_dir }}/{{ project_name }}.n {{ service_host }}"
+service_command: "{{ service_work_dir }}/{{ project_name }} {{ service_host }}"
 service_user: www-data
 service_control_user: "{{ project_user }}"

ansible/prod/inventory.yml

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

ansible/roles/build/defaults/main.yml

@@ -0,0 +1,2 @@
+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: "{{ deploy_release_dir }}/config.{{ inventory_hostname }}.json"
+    src: "{{ config_src }}"
-    dest: "{{ deploy_release_dir }}/config.json"
+    dest: "{{ config_dest }}"
     remote_src: true
 
 - name: "Gulp build"
-  command: "/usr/local/lib/npm/bin/gulp default --host shmyga.ru"
+  command: "{{ deploy_release_dir }}/node_modules/.bin/gulp default --host shmyga.ru"
   args:
     chdir: "{{ deploy_release_dir }}"

config.example.json

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

config.shmyga.ru.json

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

docker-compose.yaml

@@ -0,0 +1,23 @@
+name: $PROJECT
+services:
+  builder:
+    container_name: $PROJECT-builder
+    image: infernal-games/$PROJECT-builder
+    build:
+      context: .
+      target: builder
+      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

@@ -1,26 +1,49 @@
-const gulp = require('gulp');
+const gulp = require("gulp");
-const gulpClean = require('gulp-clean');
+const gulpClean = require("gulp-clean");
-const Config = require('./config.json');
+const Config = require("./config.json");
-const packageInfo = require('./package.json');
+const packageInfo = require("./package.json");
-const {System, Sdk, Haxe, Project} = require('gulp-haxetool');
+const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
-const dateformat = require('dateformat');
+const dateformat = require("dateformat");
-const argv = require('yargs').argv;
+const argv = require("yargs").argv;
-const publish = require('./tasks/gulp-publish');
+const publish = require("./tasks/gulp-publish");
+
+Project.useRuffle();
+
+if (packageInfo.haxe) {
+  Haxe.VERSION = packageInfo.haxe;
+}
 
 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());
+  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 new Haxe().haxelib(['run', 'protohx', 'generate', 'protohx.json']).then(({stdout}) => {
+  return exports.setup().then(() =>
-        if (stdout.indexOf('FAIL') > -1) {
+    new Haxe()
+      .haxelib(["run", "protohx", "generate", "protohx.json"])
+      .then(({ stdout }) => {
+        if (stdout.indexOf("FAIL") > -1) {
           throw stdout;
         }
-    });
+      }),
+  );
 };
 
 /**
@@ -28,31 +51,25 @@ exports.generate = function generate()  {
  */
 const config = new Project.Config({
   meta: {
-        title: 'Tank\'z',
+    title: "Tank'z",
-        filename: 'tankz',
+    filename: "tankz",
-        icon: 'src/client/resources/icon.png',
+    icon: "src/client/resources/icon.png",
-        pack: 'ru.m.tankz',
+    pack: "ru.m.tankz",
-        author: 'shmyga <shmyga.z@gmail.com>',
+    author: "shmyga <shmyga.z@gmail.com>",
-        company: 'MegaLoMania',
+    company: "MegaLoMania",
-        version: packageInfo.version,
+    version: packageInfo.version + (Config.Develop ? "-SNAPSHOT" : ""),
   },
+  key: Config.Key,
   libs: packageInfo.haxeDependencies,
-    sources: [
+  sources: ["src/common/haxe", "src-gen/haxe"],
-        'src/common/haxe',
+  assets: ["src/common/resources/config"],
-        'src-gen/haxe',
+  flags: ["proto_debug"],
-    ],
-    assets: [
-        'src/common/resources',
-    ],
-    flags: [
-        //'proto_debug',
-    ],
   macros: [
-        `CompilationOption.set('build','${dateformat(new Date(), 'yyyy-mm-dd HH:MM:ss')}')`,
+    `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`,
-    ]
+  ],
 });
 
-const host = argv.host || 'localhost';
+const host = argv.host || "localhost";
 const port = argv.port || 5000;
 
 /**
@@ -68,19 +85,14 @@ const client = new Project(
     Project.Platform.ANDROID,
   ],
   config.branch({
-        name: 'client',
+    name: "client",
-        sources: [
+    sources: ["src/client/haxe"],
-            //'src/fixes/haxe',
+    main: "ru.m.tankz.Client",
-            'src/client/haxe',
+    preloader: "ru.m.tankz.Preloader",
-        ],
+    assets: ["src/common/resources/level", "src/client/resources"],
-        main: 'ru.m.tankz.Client',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/client/resources',
-        ],
     meta: {
       width: 1024,
-            height: 768,
+      height: 576,
     },
     flags: [
       //'proto_debug',
@@ -91,7 +103,7 @@ const client = new Project(
     macros: [
       `CompilationOption.set('host','${host}')`,
       `CompilationOption.set('port',${port})`,
-        ]
+    ],
   }),
 ).bind(module, gulp);
 
@@ -100,32 +112,23 @@ const client = new Project(
  */
 const editor = new Project(
   Project.BuildSystem.OPENFL,
-    [
+  [Project.Platform.FLASH, Project.Platform.HTML5, Project.Platform.LINUX],
-        Project.Platform.FLASH,
-        Project.Platform.HTML5,
-    ],
   config.branch({
-        name: 'editor',
+    name: "editor",
-        sources: [
+    sources: ["src/client/haxe", "src/editor/haxe"],
-            //'src/fixes/haxe',
+    main: "ru.m.tankz.editor.Editor",
-            'src/client/haxe',
+    preloader: "ru.m.tankz.Preloader",
-            'src/editor/haxe',
+    assets: ["src/client/resources", "src/editor/resources"],
-        ],
-        main: 'ru.m.tankz.editor.Editor',
-        preloader: 'ru.m.tankz.Preloader',
-        assets: [
-            'src/client/resources',
-            'src/editor/resources',
-        ],
     meta: {
-            filename: 'editor',
+      filename: "editor",
+      pack: "ru.m.tankz.editor",
       width: 1024,
       height: 768,
     },
     flags: [
       //'dev_layout',
-        ]
+    ],
-    })
+  }),
 ).bind(module, gulp);
 
 /**
@@ -133,18 +136,24 @@ const editor = new Project(
  */
 const server = new Project(
   Project.BuildSystem.HAXE,
-    Project.Platform.NEKO,
+  Project.Platform.CPP,
   config.branch({
-        name: 'server',
+    name: "server",
-        sources: ['src/server/haxe'],
+    sources: ["src/server/haxe"],
-        main: 'ru.m.tankz.server.Server',
+    main: "ru.m.tankz.server.Server",
+    assets: ["src/common/resources/level"],
   }),
 ).bind(module, gulp);
 
 /**
  * publish
  */
-module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.PublishDir, Config.PublishUrl);
+module.exports.publish = publish(
+  packageInfo.name,
+  packageInfo.version,
+  Config.PublishDir,
+  Config.PublishUrl,
+);
 
 /**
  * default
@@ -152,37 +161,35 @@ module.exports.publish = publish(packageInfo.name, packageInfo.version, Config.P
 const defaultSeries = [
   exports.clean,
   exports.generate,
-    module.exports['client:flash:build'],
+  module.exports["client:flash:build"],
-    module.exports['client:flash:html'],
+  module.exports["client:flash:html"],
-    module.exports['client:html5:build'],
+  module.exports["client:html5:build"],
 
-    module.exports['editor:flash:build'],
+  module.exports["editor:flash:build"],
-    module.exports['editor:flash:html'],
+  module.exports["editor:flash:html"],
-    module.exports['editor:html5:build'],
+  module.exports["editor:html5:build"],
 
-    module.exports['server:neko:build'],
+  module.exports["server:cpp:build"],
 ];
 
 if (System.isLinux) {
   defaultSeries.push(
-        module.exports['client:linux:build'],
+    module.exports["client:linux:build"],
-        module.exports['client:linux:archive'],
+    module.exports["client:linux:archive"],
-        module.exports['client:linux:deb'],
+    module.exports["client:linux:deb"],
 
-        module.exports['client:android:build'],
+    module.exports["client:android:build"],
   );
 }
 
 if (System.isWindows) {
   defaultSeries.push(
-        module.exports['client:windows:build'],
+    module.exports["client:windows:build"],
-        module.exports['client:windows:archive'],
+    module.exports["client:windows:archive"],
-        module.exports['client:windows:installer'],
+    module.exports["client:windows:installer"],
   );
 }
 
-defaultSeries.push(
+defaultSeries.push(exports.publish);
-    exports.publish,
-);
 
 module.exports.default = gulp.series(defaultSeries);

hxformat.json

@@ -0,0 +1,8 @@
+{
+  "indentation": {
+    "character": "  "
+  },
+  "wrapping": {
+    "maxLineLength": 120
+  }
+}

package.json

@@ -1,25 +1,25 @@
 {
   "name": "tankz",
-    "version": "0.17.0",
+  "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.0",
+    "gulp-haxetool": "^0.2.1",
     "yargs": "^13.2.4"
   },
   "haxeDependencies": {
-        "haxework": "git@bitbucket.org:shmyga/haxework.git",
+    "haxework": "2.1.0",
-        "lime": "7.5.0",
+    "lime": "8.0.0",
-        "openfl": "8.9.1",
+    "openfl": "9.2.0",
-        "hxcpp": "4.0.52",
+    "hxcpp": "4.2.1",
-        "promhx": "1.1.0",
     "protohx": "0.4.6",
-        "yaml": "1.3.0",
     "orm": "2.1.0",
-        "haxe-crypto": "0.0.7",
+    "haxe-crypto": "0.0.8",
-        "svg": "1.1.2"
+    "svg": "1.1.3",
-    }
+    "formatter": "1.16.0"
+  },
+  "haxe": "4.2.5"
 }

scripts/build

@@ -0,0 +1,7 @@
+#!/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/docker-action

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname $(dirname "$0"))" || exit
+
+. .env
+
+build () {
+  echo "build: $1"
+  . "$1/.env"
+  for PROJECT in "${DOCKER_PROJECTS[@]}"; do
+    IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
+    ARGS=("build")
+    for ARG in ${DOCKER_ARGS[@]}; do
+      ARGS+=("--build-arg" "$ARG")
+    done
+    if [ -n "$PROJECT_TARGET" ]; then
+      ARGS+=("--target" "$PROJECT_TARGET")
+    fi
+    ARGS+=("-t" "$DOCKER_GROUP/$PROJECT_NAME" ".")
+    ARGS+=("-f" "$1/Dockerfile")
+    echo "${ARGS[@]}"
+    docker "${ARGS[@]}"
+  done
+}
+
+publish () {
+  echo "publish: $1"
+  . "$1/.env"
+  for PROJECT in "${DOCKER_PROJECTS[@]}"; do
+    IFS=: read -r PROJECT_NAME PROJECT_TARGET <<< "$PROJECT"
+    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:$VERSION
+    docker tag $DOCKER_GROUP/$PROJECT_NAME $DOCKER_ROOT/$PROJECT_NAME:latest
+    docker push $DOCKER_ROOT/$PROJECT_NAME:$VERSION
+    docker push $DOCKER_ROOT/$PROJECT_NAME:latest
+  done
+}
+
+DEFAULT_TARGETS="."
+TARGETS="${@-$DEFAULT_TARGETS}"
+
+DOCKER_ACTION="${DOCKER_ACTION-build}"
+
+for TARGET in $TARGETS; do
+  $DOCKER_ACTION "$TARGET"
+done

scripts/format

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname $(dirname "$0"))" || exit
+
+source .env
+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

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -e
+cd "$(dirname $(dirname "$0"))" || exit
+
+source .env
+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

@@ -0,0 +1,35 @@
+#!/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+')
+
+PACKAGES=(
+     "android/${PROJECT}_${VERSION}.apk"
+     "debian/${PROJECT}_${VERSION}_all.deb"
+     "archive/${PROJECT}_${VERSION}_linux.tar.gz"
+     "archive/${PROJECT}_${VERSION}_win.zip"
+     "installer/${PROJECT}_${VERSION}.exe"
+)
+
+for PACKAGE in "${PACKAGES[@]}"
+do
+     if [ -f "${PUBLISH_PATH}/${PACKAGE}" ]; then
+          PACKAGE_NAME=$(basename "$PACKAGE")
+          echo "publish: $PACKAGE"
+          curl --user "${PUBLISH_USER}:${PUBLISH_PASSWORD}" -X DELETE \
+               "${REPO}/generic/${PROJECT}/${VERSION}/${PACKAGE_NAME}"
+          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
+     fi
+done

scripts/setup

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

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

@@ -7,7 +7,6 @@ package ru.m;
 }
 
 class Device {
-
   public static var platform(get, null):Platform;
 
   private static function get_platform():Platform {
@@ -22,9 +21,8 @@ class Device {
     #end
   }
 
-    private static var MOBILES(default, never):Array<String> = [
+  private static var MOBILES(default,
-        "Android", "webOS", "iPhone", "iPad", "iPod", "BlackBerry", "Windows Phone",
+    never):Array<String> = ["Android", "webOS", "iPhone", "iPad", "iPod", "BlackBerry", "Windows Phone",];
-    ];
 
   public static function isMobile():Bool {
     #if android
@@ -36,7 +34,9 @@ class Device {
         return true;
       }
     }
-        #end
     return false;
+    #else
+    return false;
+    #end
   }
 }

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

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

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

@@ -1,10 +1,8 @@
 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;
@@ -12,36 +10,18 @@ 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;
-        init();
+    manager.add(this);
-        instances.push(this);
   }
 
   public function set_frames(value:Array<Frame>):Array<Frame> {
@@ -59,14 +39,7 @@ class Animate extends Bitmap {
     return frames;
   }
 
-    public function set_playing(value:Bool):Bool {
+  public function update():Void {
-        if (playing != value) {
-            playing = value;
-        }
-        return playing;
-    }
-
-    private function update():Void {
     if (++index >= sequence.length) {
       index = 0;
     }
@@ -77,8 +50,6 @@ class Animate extends Bitmap {
   }
 
   public function dispose():Void {
-        if (instances.indexOf(this) > -1) {
+    manager.remove(this);
-            instances.remove(this);
-        }
   }
 }

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

@@ -0,0 +1,34 @@
+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,9 +3,7 @@ package ru.m.animate;
 import promhx.Deferred;
 import promhx.Promise;
 
-
 class OnceAnimate extends Animate {
-
   private var deferred:Deferred<Animate>;
 
   public function play():Promise<Animate> {
@@ -14,13 +12,14 @@ class OnceAnimate extends Animate {
     return deferred.promise();
   }
 
-    override private function update():Void {
+  override public 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,10 +1,9 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+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>;
@@ -23,7 +22,7 @@ class ControlBus implements IControlBus {
 
   public function connect(device:IControlDevice):Void {
     var connector = function(action:DeviceAction, on:Bool):Void {
-            //L.d("TAG", '${device.type}, ${action}, ${on}');
+      // L.d("TAG", '${device.type}, ${action}, ${on}');
       signal.emit(device.type, action, on);
     }
     connections.set(device.type, connector);

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

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 
 interface IControlBus {
   public var devices(default, null):Array<IControlDevice>;

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

@@ -1,6 +1,6 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+import hw.signal.Signal;
 
 interface IControlDevice {
   public var type(default, null):DeviceType;

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

@@ -1,13 +1,12 @@
 package ru.m.control;
 
-import haxework.signal.Signal;
+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>;
 

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

@@ -2,11 +2,10 @@ package ru.m.control;
 
 import flash.display.Stage;
 import flash.events.KeyboardEvent;
-import haxework.signal.Signal;
+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>;
 

src/client/haxe/ru/m/display/DisplayObjectContainerExtender.hx

@@ -4,7 +4,6 @@ import flash.display.DisplayObject;
 import flash.display.DisplayObjectContainer;
 
 class DisplayObjectContainerExtender {
-
   public static function childrenIterator():Iterator<DisplayObject> {
     throw "Not implemented";
   }

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

@@ -1,15 +1,14 @@
 package ru.m.skin;
 
 import format.SVG;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.skin.ISkin;
+import hw.view.skin.ISkin;
 
 using StringTools;
-using haxework.color.ColorUtil;
+using hw.color.ColorUtil;
 
 @: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>;

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

@@ -1,21 +1,20 @@
 package ru.m.tankz;
 
 import flash.text.TextFormatAlign;
-import haxework.color.Color;
+import hw.color.Color;
-import haxework.view.geometry.Box;
+import hw.view.geometry.Box;
-import haxework.view.geometry.HAlign;
+import hw.view.geometry.HAlign;
-import haxework.view.geometry.SizeValue;
+import hw.view.geometry.SizeValue;
-import haxework.view.geometry.VAlign;
+import hw.view.geometry.VAlign;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
-import haxework.view.theme.Theme;
+import hw.view.theme.Theme;
-import haxework.view.utils.DrawUtil;
+import hw.view.utils.DrawUtil;
 import openfl.Assets;
 import ru.m.skin.ButtonSVGSkin;
 
-using haxework.color.ColorUtil;
+using hw.color.ColorUtil;
 
 class AppTheme extends Theme {
-
   public static var COLORS(default, never):ThemeColors = {
     light: 0x95937D,
     dark: 0x777564,
@@ -24,22 +23,16 @@ class AppTheme extends Theme {
   }
 
   public function new() {
-        super({embed: true}, COLORS);
+    super({embed: true}, COLORS, {base: "3h", big: "4h", veryBig: "4.5h"});
   }
 
   override private function reload():Void {
     super.reload();
-        register(new Style("light", [
+    register(new Style("light", ["skin.background.color" => colors.light,]));
-            "skin.background.color" => colors.light,
-        ]));
 
-        register(new Style("dark", [
+    register(new Style("dark", ["skin.background.color" => colors.dark,]));
-            "skin.background.color" => colors.dark,
-        ]));
 
-        register(new Style("font", [
+    register(new Style("font", ["_" => null,], ["text"]));
-            "_" => null,
-        ], ["text"]));
 
     register(new Style("text.header", [
       "font.size" => fontSize.big,
@@ -58,6 +51,12 @@ class AppTheme extends Theme {
       "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,
@@ -72,9 +71,9 @@ class AppTheme extends Theme {
     ], ["text.box"]));
 
     register(new Style("button.level", [
-            "font.size" => fontSize.veryBig,
+      "font.size" => fontSize.big,
-            "geometry.width" => SizeValue.fromInt(64),
+      "geometry.width" => SizeValue.fromString("12h"),
-            "geometry.height" => SizeValue.fromInt(64),
+      "geometry.height" => SizeValue.fromString("12h"),
       "geometry.padding" => Box.fromFloat(0),
     ], ["button"]));
 
@@ -87,13 +86,14 @@ class AppTheme extends Theme {
 
     register(new Style("panel", [
       "geometry.width" => SizeValue.fromString("100%"),
-            "geometry.padding" => Box.fromArray([10, 5]),
+      "geometry.padding" => Box.fromArray([20, 10]),
       "layout.vAlign" => VAlign.MIDDLE,
     ], ["light"]));
 
-        register(new Style("window", [
+    register(new Style("panel_button",
-            "geometry.padding" => Box.fromFloat(2),
+      ["font.size" => fontSize.big, "geometry.height" => SizeValue.fromString("100%"),], ["button"]));
-        ], ["dark", "border"]));
+
+    register(new Style("window", ["geometry.padding" => Box.fromFloat(2),], ["dark", "border"]));
 
     register(new Style("line", [
       "geometry.width" => SizeValue.fromString("100%"),
@@ -101,33 +101,47 @@ class AppTheme extends Theme {
     ], ["border"]));
 
     register(new Style("window.close", [
-            "skin" => function() return new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), colors.light),
+      "skin" => function() return new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"),
-            "geometry.width" => SizeValue.fromInt(36),
+        colors.light),
-            "geometry.height" => SizeValue.fromInt(36),
+      "geometry.width" => SizeValue.fromString("8h"),
+      "geometry.height" => SizeValue.fromString("8h"),
     ]));
 
     register(new Style("icon.tank", [
-            "geometry.width" => SizeValue.fromInt(42),
+      "geometry.width" => SizeValue.fromString("6h"),
-            "geometry.height" => SizeValue.fromInt(42),
+      "geometry.height" => SizeValue.fromString("6h"),
-            "skin.fillType" => FillType.DEFAULT,
+      "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", [
+    register(new Style("player.winner", ["skin.background.alpha" => 0.2, "skin.background.color" => green,]));
-            "skin.background.alpha" => 0.1,
+    register(new Style("player.loser", ["skin.background.alpha" => 0.2, "skin.background.color" => red,]));
-            "skin.background.color" => green,
+
-        ]));
+    register(new Style("button.pack", [
-        register(new Style("player.loser", [
+      "geometry.width" => SizeValue.fromString("35h"),
-            "skin.background.alpha" => 0.1,
+      "geometry.height" => SizeValue.fromString("20h"),
-            "skin.background.color" => red,
+      "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");
@@ -136,27 +150,29 @@ class AppTheme extends Theme {
     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", [
+    register(new Style("gamepad", ["skin.color" => colors.text, "skin.activeColor" => colors.active,]));
-            "skin.color" => 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.fromInt(42),
+      "geometry.width" => SizeValue.fromString("10h"),
-            "geometry.height" => SizeValue.fromInt(42),
+      "geometry.height" => SizeValue.fromString("10h"),
-            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
+      "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light,
+        solid),
     ]));
     register(new Style('button.$name.small', [
-            "geometry.width" => SizeValue.fromInt(32),
+      "geometry.width" => SizeValue.fromString("7h"),
-            "geometry.height" => SizeValue.fromInt(32),
+      "geometry.height" => SizeValue.fromString("7h"),
-            "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light, solid),
+      "skin" => function() return new ButtonSVGSkin(Assets.getText('resources/image/icon/$resource'), colors.light,
+        solid),
     ]));
   }
-
 }

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

@@ -1,28 +1,43 @@
 package ru.m.tankz;
 
+import ru.m.animate.AnimateManager;
 import flash.Lib;
-import haxework.animate.Animate;
+import hw.animate.Animate;
-import haxework.log.TraceLogger;
+import hw.log.TraceLogger;
-import haxework.view.Root;
+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 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 haxework.log.JSLogger());
+    L.push(new hw.log.JSLogger());
     #end
     #if debug
-        //L.push(new haxework.log.SocketLogger());
+    // L.push(new hw.log.SocketLogger());
     #end
+    // ToDo: fix @:provide macro
+    PopupManager;
+    LoaderManager;
+    GameStorage;
+    AnimateManager;
+    //
     Const.init();
     Init.init();
-        Animate.bind(Lib.current.stage);
+    // TODO:
+    // 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
@@ -30,9 +45,16 @@ class Client {
     Root.bind(view);
     view.launch();
 
-        #if debug
     var fps = new openfl.display.FPS(0, 0, 0x00ff00);
+    fps.visible = settings.displayFPS;
     Lib.current.addChild(fps);
-        #end
+
+    settings.signal.connect(function(setting) {
+      switch setting {
+        case DISPLAY_FPS(value):
+          fps.visible = value;
+        case _:
+      }
+    });
   }
 }

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

@@ -7,12 +7,14 @@ 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,14 +1,11 @@
 package ru.m.tankz;
 
 import flash.Lib;
-import haxework.animate.FadeAnimate;
+import hw.animate.FadeAnimate;
-import haxework.animate.UnFadeAnimate;
+import hw.animate.UnFadeAnimate;
-import haxework.net.manage.ILoaderManager;
+import hw.storage.SharedObjectStorage;
-import haxework.net.manage.LoaderManager;
+import hw.view.popup.PopupManager;
-import haxework.resources.IResources;
+import hw.view.theme.ITheme;
-import haxework.resources.Resources;
-import haxework.view.popup.PopupManager;
-import haxework.view.theme.ITheme;
 import lime.ui.Gamepad;
 import lime.ui.Joystick;
 import ru.m.connect.IConnection;
@@ -16,35 +13,22 @@ 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.tankz.sound.SoundManager;
+import ru.m.update.Updater;
-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 loaderManager:ILoaderManager;
   @:provide static var updater:Updater;
 
   private static function buildConnection():IConnection<Request, Response> {
@@ -54,7 +38,8 @@ class Init {
     #if flash
     return new ru.m.connect.flash.FlashConnection<Request, Response>(host, port, Response);
     #elseif html5
-        return new ru.m.connect.js.JsConnection<Request, Response>(host, port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
+    return new ru.m.connect.js.JsConnection<Request, Response>(host,
+      port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
     #else
     return new ru.m.connect.desktop.DesktopConnection<Request, Response>(host, port, Response);
     #end
@@ -62,26 +47,18 @@ class Init {
 
   public static function init():Void {
     theme = new AppTheme();
-        resources = new Resources();
+    levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage());
-        levelBundle = new LevelBundle();
+    levelBundle.load();
     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();
-        networkManager = new NetworkManager();
 
     bus = new ControlBus();
     bus.connect(new KeyboardDevice(Lib.current.stage));
 
-        loaderManager = new LoaderManager();
     updater = new Updater(Const.VERSION, "https://shmyga.ru/repo/tankz/packages.json");
 
     for (device in Gamepad.devices) {

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

@@ -7,7 +7,6 @@ import flash.Lib;
 import openfl.Assets;
 
 class LinuxIcon {
-
   private static function prepareIcon(bitmap:BitmapData):BitmapData {
     var matrix:Array<Float> = [];
     matrix = matrix.concat([0, 0, 1, 0, 0]);

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

@@ -5,11 +5,10 @@ import flash.display.Sprite;
 import flash.events.Event;
 import flash.events.ProgressEvent;
 import flash.Lib;
-import haxework.view.geometry.Size;
+import hw.view.geometry.Size;
 import ru.m.tankz.AppTheme;
 
 class Progress extends Sprite {
-
   public var color(default, set):Int = 0;
   public var backColor(default, set):Int = 0;
   public var progress(default, set):Float = 0;
@@ -85,7 +84,7 @@ class Progress extends Sprite {
     maskShape.graphics.moveTo(radius, radius);
     var sides = 6;
     var rotation = (-(Math.PI) / 2);
-        var r = radius / Math.cos(1/sides * Math.PI);
+    var r = radius / Math.cos(1 / sides * Math.PI);
     var lineToRadians = function(rads:Float):Void {
       maskShape.graphics.lineTo(Math.cos(rads) * r + radius, Math.sin(rads) * r + radius);
     };
@@ -101,7 +100,6 @@ class Progress extends Sprite {
 }
 
 class Preloader extends Sprite {
-
   private var progress:Progress;
 
   public function new() {

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

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

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

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

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

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

@@ -13,7 +13,6 @@ import ru.m.tankz.Type;
 using haxe.EnumTools.EnumValueTools;
 
 class HumanControl extends Control {
-
   @:provide static var storage:SettingsStorage;
   @:provide static var bus:IControlBus;
 
@@ -81,7 +80,8 @@ class HumanControl extends Control {
       case TankAction.SHOT(weapon):
         if (on) {
           if (!shotTimers.exists(weapon)) {
-                        var timer = new Timer(300);
+            // ToDo: weapon.config.delay
+            var timer = new Timer(350);
             timer.run = shooter(weapon);
             timer.run();
             shotTimers.set(weapon, timer);
@@ -109,7 +109,7 @@ class HumanControl extends Control {
     }
   }
 
-    private function shooter(weapon:Int):Void -> Void {
+  private function shooter(weapon:Int):Void->Void {
     return function():Void {
       action(SHOT(weapon));
     }

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

@@ -6,7 +6,6 @@ import ru.m.tankz.control.HumanControl;
 import ru.m.tankz.Type;
 
 class LocalControlFactory extends BaseControlFactory {
-
   override private function buildHuman(id:PlayerId, index:Int):Control {
     return new HumanControl(id, index);
   }

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

@@ -8,7 +8,6 @@ import ru.m.tankz.storage.GameStorage;
 import ru.m.tankz.Type;
 
 class LocalGame extends GameRunner {
-
   @:provide static var gameStorage:GameStorage;
 
   public function new(start:Start) {
@@ -19,7 +18,8 @@ class LocalGame extends GameRunner {
   override public function onGameEvent(event:GameEvent):Void {
     super.onGameEvent(event);
     switch event {
-            case COMPLETE(result): updateProgress(result);
+      case COMPLETE(result):
+        updateProgress(result);
       case _:
     }
   }
@@ -34,7 +34,7 @@ class LocalGame extends GameRunner {
     }
     if (humansTeams.length == 1 && result.winner == humansTeams[0]) {
       var progress = gameStorage.get(result.level.packId);
-            progress.completeLevel(result.level.id, result.state.presetId);
+      progress.completeLevel(result.level.id, result.state.presetId, {});
       gameStorage.set(progress);
     }
   }

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

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

@@ -5,7 +5,6 @@ import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.control.Control;
 
 class NetworkControl extends HumanControl {
-
   @:provide private var network:NetworkManager;
 
   override public function action(action:TankAction):Void {

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

@@ -5,7 +5,6 @@ import ru.m.tankz.control.Control;
 import ru.m.tankz.Type;
 
 class NetworkControlFactory extends BaseControlFactory {
-
   override private function buildHuman(id:PlayerId, index:Int):Control {
     return new NetworkControl(id, index);
   }

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

@@ -10,7 +10,6 @@ import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.room.RoomSlotProto;
 
 class NetworkGame extends Game {
-
   private var network:NetworkManager;
 
   public function new(network:NetworkManager) {
@@ -39,7 +38,8 @@ class NetworkGame extends Game {
   }
 
   override private function onStart(start:Start):Void {
-        var slot:RoomSlotProto = Lambda.find(network.room.slots, function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
+    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)});
     }

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

@@ -1,14 +1,12 @@
 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 haxework.signal.Signal;
+import hw.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;
@@ -21,8 +19,11 @@ 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>;
 
@@ -35,7 +36,8 @@ enum ConnectionState {
   ERROR(error:Dynamic);
 }
 
-class NetworkManager {
+@:provide class NetworkManager {
+  private static inline var TAG = "NetworkManager";
 
   public var state(default, null):ConnectionState;
   public var room(default, null):RoomProto;
@@ -48,6 +50,7 @@ class NetworkManager {
 
   @:provide private var connection:ClientConnection;
   @:provide private var storage:NetworkStorage;
+  @:provide private var settings:SettingsStorage;
 
   private var reconnectTimer:Timer;
   private var reconnectDelay:Int;
@@ -61,21 +64,33 @@ class NetworkManager {
     updateState(OFFLINE);
     connection.handler.connect(onConnectionEvent);
     connection.receiveHandler.connect(onResponse);
-        //connect();  // ToDo: disable network
+    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 _:
+    }
   }
 
   private function updateState(value:ConnectionState):Void {
+    L.d(TAG, 'State: ${value}');
     state = value;
     stateSignal.emit(value);
   }
 
   public function login(name:String, uuid:String = null):Void {
     updateState(LOGIN);
-        connection.send(new Request().setLogin(
+    connection.send(new Request().setLogin(new LoginRequest().setUuid(uuid).setName(name)));
-            new LoginRequest()
-                .setUuid(uuid)
-                .setName(name)
-        ));
   }
 
   public function logout():Void {
@@ -87,11 +102,13 @@ class NetworkManager {
   }
 
   public function createGame(type:String, level:Int):Void {
-        connection.send(new Request().setRoom(new RoomRequest().setCreate(new CreateRequest().setType(type).setLevel(level))));
+    connection.send(new Request().setRoom(new RoomRequest().setCreate(new CreateRequest().setType(type)
+      .setLevel(level))));
   }
 
   public function joinGame(gameId:Int, restore:Bool = false):Void {
-        connection.send(new Request().setRoom(new RoomRequest().setJoin(new JoinRequest().setGameId(gameId).setRestore(restore))));
+    connection.send(new Request().setRoom(new RoomRequest().setJoin(new JoinRequest().setGameId(gameId)
+      .setRestore(restore))));
   }
 
   public function selectSlot(slot:SlotProto):Void {
@@ -107,11 +124,8 @@ class NetworkManager {
   }
 
   public function action(tankId:Int, action:TankAction):Void {
-        connection.send(new Request().setGameEvent(new GameEventRequest().setEvent(
+    connection.send(new Request().setGameEvent(new GameEventRequest().setEvent(new GameEventProto().setTime(0)
-            new GameEventProto().setTime(0).setEvent(
+      .setEvent(Serializer.run(GameEvent.ACTION(tankId, action))))));
-                Serializer.run(GameEvent.ACTION(tankId, action))
-            )))
-        );
   }
 
   private function connect():Void {
@@ -131,6 +145,10 @@ class NetworkManager {
     }
   }
 
+  private function disconnect():Void {
+    connection.disconnect();
+  }
+
   private function onConnectionEvent(event:ConnectionEvent):Void {
     updateState(switch event {
       case CONNECTED: CONNECTED;
@@ -145,9 +163,11 @@ class NetworkManager {
           login(user.name, user.uuid);
         }
       case DISCONNECTED | ERROR(_):
+        if (settings.enableNetwork) {
           reconnect();
         }
     }
+  }
 
   private function onResponse(packet:Response):Void {
     if (packet.hasLogin()) {

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

@@ -5,38 +5,35 @@ import ru.m.animate.Animate;
 import ru.m.animate.OnceAnimate;
 
 class AnimateBundle {
-
   private static function buildAnimate(name:String, sequence:Array<Int>):OnceAnimate {
     var template:String = 'resources/image/animate/${name}/%index%.png';
-        var frames = [for (i in sequence) ({
+    var frames = [
-            image: Assets.getBitmapData(StringTools.replace(template, '%index%', Std.string(i))),
+      for (i in sequence)
-            length: 1
+        ({
-        })];
+          image:Assets.getBitmapData(StringTools.replace(template, '%index%', Std.string(i))), length:1
+        })
+    ];
     return new OnceAnimate(frames);
   }
 
   public static function tankSpawn():OnceAnimate {
-        return buildAnimate('appear', [
+    return buildAnimate('appear', [0, 1, 2, 3, 3, 4, 5, 5, 6]);
-            0, 1, 2, 3, 3, 4, 5, 5, 6
-        ]);
   }
 
   public static function tankBoom():OnceAnimate {
-        return buildAnimate('boom', [
+    return buildAnimate('boom', [0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9]);
-            0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9
-        ]);
   }
 
   public static function bulletBoom():OnceAnimate {
-        return buildAnimate('boom-sm', [
+    return buildAnimate('boom-sm', [0, 1, 1, 0, 0, 1]);
-            0, 1, 1, 0, 0, 1
-        ]);
   }
 
   public static function tankProtect():Animate {
-        return new Animate([for (i in 0...2) ({
+    return new Animate([
-            image: Assets.getBitmapData('resources/image/animate/protect/${i}.png'),
+      for (i in 0...2)
-            length: 5
+        ({
-        })]);
+          image:Assets.getBitmapData('resources/image/animate/protect/${i}.png'), length:5
+        })
+    ]);
   }
 }

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

@@ -1,6 +1,6 @@
 package ru.m.tankz.render;
 
-import haxework.view.IView;
+import hw.view.IView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.IGame;
 

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

@@ -1,14 +1,16 @@
 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 haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.SpriteView;
+import hw.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;
@@ -21,16 +23,17 @@ import ru.m.tankz.render.item.EagleRenderItem;
 import ru.m.tankz.render.item.IRenderItem;
 import ru.m.tankz.render.item.TankRenderItem;
 import ru.m.tankz.Type;
+
 using ru.m.display.DisplayObjectContainerExtender;
 
 class Render extends SpriteView implements IRender {
-
   public var config(default, set):Config;
   public var gridSize(default, set):GridSize;
 
   private var mapWidth(get, null):Float;
   private var mapHeight(get, null):Float;
 
+  private var container:Sprite;
   private var backgroundLayer:Sprite;
   private var groundLayer:Sprite;
   private var entryLayer:Sprite;
@@ -38,20 +41,25 @@ 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();
-        content.addChild(backgroundLayer);
+    container.addChild(backgroundLayer);
-        content.addChild(groundLayer);
+    container.addChild(groundLayer);
-        content.addChild(entryLayer);
+    container.addChild(entryLayer);
-        content.addChild(upLayer);
+    container.addChild(upLayer);
-        content.addChild(upperLayer);
+    container.addChild(upperLayer);
     reset();
   }
 
@@ -65,15 +73,15 @@ class Render extends SpriteView implements IRender {
 
   private function set_config(value:Config):Config {
     config = value;
-        setSize(mapWidth, mapHeight, "render");
     drawBackground();
+    toRedraw();
     return config;
   }
 
   private function set_gridSize(value:GridSize):GridSize {
     gridSize = value;
-        setSize(mapWidth, mapHeight, "render");
     drawBackground();
+    toRedraw();
     return gridSize;
   }
 
@@ -81,10 +89,19 @@ class Render extends SpriteView implements IRender {
     var g:Graphics = backgroundLayer.graphics;
     g.clear();
     g.beginFill(0x000000);
+    g.lineStyle(2, 0xcccccc);
     g.drawRect(0, 0, mapWidth, 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();
@@ -92,8 +109,10 @@ class Render extends SpriteView implements IRender {
   }
 
   private function onEnterFrame(event:Event):Void {
+    if (!paused) {
       draw();
     }
+  }
 
   private function clearLayer(layer:DisplayObjectContainer) {
     while (layer.numChildren > 0) {
@@ -116,10 +135,14 @@ class Render extends SpriteView implements IRender {
   public function onGameEvent(event:GameEvent):Void {
     switch event {
       case START(start):
+        animateManager.playing = true;
         gridSize = start.level.size;
         content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
       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) {
@@ -144,13 +167,16 @@ 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)):
+      case SPAWN(BULLET(id, rect, playerId, skin, color)):
-                var item = new BulletRenderItem(rect, skin);
+        var item = new BulletRenderItem(rect);
+        item.color = color;
+        item.skin = skin;
         items.set(id, item);
         entryLayer.addChild(item.view);
         item.update();
@@ -180,12 +206,13 @@ class Render extends SpriteView implements IRender {
           var item = items[id];
           cast(item, TankRenderItem).moves = false;
         }
-            case CHANGE(TANK(id, type, hits, bonus)):
+      case CHANGE(TANK(id, type, hits, bonus, boat)):
         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)) {

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

@@ -5,7 +5,6 @@ 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');
@@ -22,4 +21,8 @@ class RenderUtil {
   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

@@ -13,7 +13,7 @@ class BitmapRenderItem extends RenderItem {
 
   public function new(rect:Rectangle) {
     super(rect);
-        this.bitmap = new Bitmap(null, PixelSnapping.AUTO, true);
+    this.bitmap = new Bitmap(null, PixelSnapping.NEVER, false);
   }
 
   override private function get_view():DisplayObject {

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

@@ -4,8 +4,8 @@ import ru.m.geom.Rectangle;
 import ru.m.tankz.Type;
 
 class BonusRenderItem extends BitmapRenderItem {
-
   public var type(default, set):BonusType;
+
   private var d = -0.05;
   private var alpha = 1.0;
 

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

@@ -1,62 +1,83 @@
 package ru.m.tankz.render.item;
 
 import flash.display.BitmapData;
-import flash.display.Shape;
 import openfl.Assets;
-import openfl.display.DisplayObject;
+import ru.m.geom.GridPoint;
-import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
-import ru.m.tankz.Type.BrickType;
+import ru.m.tankz.Type;
 
-enum BrickState {
+class BrickBitmapBundle {
-    UNBROKEN;
+  private var data:Map<String, BitmapData>;
-    BROKEN;
+
-    DESTROYED;
+  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);
+  }
 }
 
-class BrickRenderItem extends RenderItem {
+class BrickRenderItem extends BitmapRenderItem {
+  private static var bundle:BrickBitmapBundle = new BrickBitmapBundle();
 
   public var type(default, set):BrickType;
-    public var state(get, never):BrickState;
 
-    private var image:BitmapData;
+  private var cells:Array<GridPoint>;
-    private var shape:Shape;
-    private var cells:Array<Point>;
 
-    private static function buildCells():Array<Point> {
+  private var frames:Int;
+  private var currentFrame:Int;
+  private var ticks:Int;
+
+  private static function buildCells():Array<GridPoint> {
     return [
-            new Point(0, 0),
+      new GridPoint(0, 0),
-            new Point(0, 1),
+      new GridPoint(0, 1),
-            new Point(1, 0),
+      new GridPoint(1, 0),
-            new Point(1, 1),
+      new GridPoint(1, 1),
     ];
   }
 
   public function new(rect:Rectangle, type:BrickType) {
     super(rect);
-        this.shape = new Shape();
     cells = buildCells();
+    this.frames = 1;
+    this.currentFrame = 0;
+    this.ticks = 0;
     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;
@@ -73,24 +94,20 @@ class BrickRenderItem extends RenderItem {
   }
 
   public function redraw():Void {
-        shape.graphics.clear();
+    image = bundle.get(type, cells, currentFrame);
-        if (type == "none") return;
+  }
-        switch state {
+
-            case UNBROKEN:
+  override public function update():Void {
-                shape.graphics.beginBitmapFill(image);
+    super.update();
-                shape.graphics.drawRect(0, 0, rect.width, rect.height);
+    if (frames > 1) {
-                shape.graphics.endFill();
+      if (++ticks >= 30) {
-            case BROKEN:
+        ticks = 0;
-                shape.graphics.beginBitmapFill(image);
+        currentFrame++;
-                for (point in cells) {
+        if (currentFrame >= frames) {
-                    var x = point.x * (rect.width / 2);
+          currentFrame = 0;
-                    var y = point.y * (rect.width / 2);
+        }
-                    var width = rect.width / 2;
+        redraw();
-                    var height = rect.height / 2;
-                    shape.graphics.drawRect(x, y, width, height);
       }
-                shape.graphics.endFill();
-            case DESTROYED:
     }
   }
 }

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

@@ -1,20 +1,26 @@
 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 function new(rect:Rectangle, skin:String) {
+  public function new(rect:Rectangle) {
     super(rect);
-        this.skin = skin;
     move(rect.position);
   }
 
   private function set_skin(value:String):String {
     if (skin != value) {
       skin = value;
-            image = RenderUtil.bulletImage(skin);
+      var image = RenderUtil.bulletImage(skin);
+      if (color != null) {
+        image = BitmapUtil.colorize(image, color);
+      }
+      this.image = image;
     }
     return skin;
   }

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 haxework.color.Color;
+import hw.color.Color;
-import haxework.view.utils.BitmapUtil;
+import hw.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 

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

@@ -5,7 +5,6 @@ import ru.m.geom.Position;
 import ru.m.geom.Rectangle;
 
 class RenderItem implements IRenderItem {
-
   public var view(get, null):DisplayObject;
   public var content(get, null):DisplayObject;
 
@@ -30,12 +29,22 @@ class RenderItem implements IRenderItem {
       rect.direction = position.direction;
       if (content != null) {
         content.rotation = rect.direction.angle;
-                content.x = - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
+        content.x = -rect.width * (rect.direction.x + 1) / 2
-                content.y = - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
+          + rect.width * (rect.direction.y + 1) / 2
+          + 0.5 * rect.width;
+        content.y = -rect.height * (rect.direction.x + 1) / 2
+          - rect.height * (rect.direction.y + 1) / 2
+          + 1.5 * rect.height;
       } else {
         view.rotation = rect.direction.angle;
-                view.x = rect.x - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
+        view.x = rect.x
-                view.y = rect.y - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
+          - rect.width * (rect.direction.x + 1) / 2
+          + rect.width * (rect.direction.y + 1) / 2
+          + 0.5 * rect.width;
+        view.y = rect.y
+          - rect.height * (rect.direction.x + 1) / 2
+          - rect.height * (rect.direction.y + 1) / 2
+          + 1.5 * rect.height;
       }
     }
   }

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

@@ -2,14 +2,15 @@ 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 haxework.color.Color;
+import hw.color.Color;
-import haxework.text.BitmapTextField;
+import hw.text.BitmapTextField;
-import haxework.view.theme.ITheme;
+import hw.view.theme.ITheme;
-import haxework.view.utils.BitmapUtil;
+import hw.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
@@ -18,6 +19,7 @@ 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;
@@ -26,6 +28,7 @@ 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;
@@ -37,6 +40,9 @@ 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);
@@ -52,6 +58,13 @@ class TankRenderItem extends BitmapRenderItem {
     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;
   }
@@ -108,6 +121,14 @@ 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;
@@ -134,7 +155,7 @@ class TankRenderItem extends BitmapRenderItem {
       name = value;
       nameView.text = name;
       nameView.x = (rect.width - nameView.width) / 2;
-            nameView.y = -nameView.height / 2; //(rect.height - nameView.height) / 2;
+      nameView.y = -nameView.height / 2; // (rect.height - nameView.height) / 2;
     }
     return name;
   }
@@ -143,7 +164,7 @@ class TankRenderItem extends BitmapRenderItem {
     super.update();
     if (moves) {
       frame++;
-            if (frame > images.length - 1) {
+      if (frame >= images.length) {
         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;
 
-class SoundManager implements GameListener {
+@:provide class SoundManager implements GameListener {
   private static var TAG(default, never):String = "SoundManager";
 
   #if flash
@@ -58,7 +58,7 @@ class SoundManager implements GameListener {
   }
 
   public function play(id:String):Void {
-        //L.d(TAG, 'play: ${id}');
+    // L.d(TAG, 'play: ${id}');
     var sound:Sound = Assets.getSound('resources/sounds/${id}.${type}');
     if (sound != null) {
       var channel = sound.play(0, 0, transform);
@@ -105,7 +105,7 @@ class SoundManager implements GameListener {
         play("bullet_hit");
       case HIT(CELL(_, _, shot)):
         if (humanBullets.indexOf(shot.bulletId) > -1) {
-                    //play("bullet_block");
+          // play("bullet_block");
         }
       case DESTROY(TANK(id, _)):
         if (humanTanks.indexOf(id) > -1) {
@@ -116,7 +116,7 @@ class SoundManager implements GameListener {
       case DESTROY(EAGLE(_, _)):
         play("boom_player");
       case DESTROY(BONUS(id, _)):
-                play("bonus_get");
+        // play("bonus_get");
         if (liveBonuses.indexOf(id) > -1) {
           play("live");
         } else {

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

@@ -1,11 +1,10 @@
 package ru.m.tankz.storage;
 
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 import ru.m.tankz.game.PackProgress;
 import ru.m.tankz.Type;
 
-class GameStorage extends SharedObjectStorage  {
+@:provide class GameStorage extends SharedObjectStorage {
-
   private static inline var VERSION = 1;
 
   public function new() {

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

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

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

@@ -1,11 +1,10 @@
 package ru.m.tankz.storage;
 
 import haxe.DynamicAccess;
-import haxework.storage.SharedObjectStorage;
+import hw.storage.SharedObjectStorage;
 import ru.m.tankz.game.record.GameRecord;
 
-class RecordStorage extends SharedObjectStorage  {
+@:provide class RecordStorage extends SharedObjectStorage {
-
   private static inline var VERSION = 1;
 
   public function new() {

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

@@ -1,18 +1,50 @@
 package ru.m.tankz.storage;
 
 import flash.ui.Keyboard;
-import haxework.storage.SharedObjectStorage;
+import hw.signal.Signal;
-import haxework.utils.ObjectUtil;
+import hw.storage.SharedObjectStorage;
+import hw.utils.ObjectUtil;
 import ru.m.control.DeviceAction;
 import ru.m.control.DeviceType;
 import ru.m.geom.Direction;
 import ru.m.tankz.control.Binding;
 import ru.m.tankz.control.Control;
 
-class SettingsStorage extends SharedObjectStorage {
+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();
+  }
+
   public function new() {
     super('settings_${VERSION}');
   }
@@ -23,6 +55,7 @@ class SettingsStorage extends SharedObjectStorage {
 
   public function saveBinding(index:Int, value:Binding) {
     write('action:$index', value);
+    signal.emit(CONTROL(index, value));
   }
 
   public static function getDefaultBinding(index:Int):Binding {
@@ -54,9 +87,7 @@ class SettingsStorage extends SharedObjectStorage {
     ];
   }
 
-    private static var mobileDefaults:Map<Int, Binding> = [
+  private static var mobileDefaults:Map<Int, Binding> = [0 => buildDeviceBinding(SCREEN),];
-        0 => buildDeviceBinding(SCREEN),
-    ];
 
   private static var defaults:Map<Int, Binding> = [
     0 => [

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

@@ -1,11 +1,12 @@
 package ru.m.tankz.view;
 
-import flash.events.KeyboardEvent;
 import flash.ui.Keyboard;
-import haxework.resources.IResources;
+import hw.resources.IResources;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.group.VGroupView;
+import hw.view.group.VGroupView;
-import ru.m.tankz.game.IGame;
+import ru.m.control.DeviceAction;
+import ru.m.control.DeviceType;
+import ru.m.control.IControlBus;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
 
@@ -16,27 +17,29 @@ import ru.m.tankz.sound.SoundManager;
   @:provide var resources:IResources;
   @:provide var switcher:FrameSwitcher;
   @:provide var soundManager:SoundManager;
-    @:provide var game:IGame;
 
-    public function init():Void {
+  @:provide static var bus:IControlBus;
+
+  public function new():Void {
+    super();
     resources.text.put('version', '${Const.VERSION}');
+    resources.text.put('name', '${Const.NAME}');
     switcher = switcherView;
   }
 
   public function launch():Void {
     content.stage.stageFocusRect = false;
-        content.stage.addEventListener(KeyboardEvent.KEY_UP, function(event:KeyboardEvent):Void {
+    bus.signal.connect(onDeviceAction);
-            switch event.keyCode {
-                case Keyboard.ESCAPE:
     switcher.change(MenuFrame.ID);
-                case Keyboard.M:
+  }
+
+  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;
-                case Keyboard.P:
+      case _:
-                    if (game != null) {
-                        game.pause = !game.pause;
     }
   }
-        });
-        switcher.change(MenuFrame.ID);
-    }
 }

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

@@ -1,6 +1,6 @@
 ---
 views:
-  - $type: haxework.view.frame.FrameSwitcher
+  - $type: hw.view.frame.FrameSwitcher
     id: switcher
     geometry.stretch: true
     style: dark
@@ -14,3 +14,7 @@ views:
         _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

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

@@ -1,14 +1,21 @@
 package ru.m.tankz.view;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.text.TextView;
-import haxework.view.frame.FrameView;
+import ru.m.tankz.view.popup.PausePopup;
-import haxework.view.group.GroupView;
+import flash.ui.Keyboard;
-import haxework.view.layout.DefaultLayout;
+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 ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameInit;
+import ru.m.tankz.game.GameState.TeamState;
 import ru.m.tankz.game.IGame;
 import ru.m.tankz.game.record.GamePlayer;
 import ru.m.tankz.game.record.GameRecord;
@@ -17,10 +24,13 @@ import ru.m.tankz.network.NetworkGame;
 import ru.m.tankz.sound.SoundManager;
 import ru.m.tankz.storage.GameStorage;
 import ru.m.tankz.storage.SettingsStorage;
-import ru.m.tankz.view.game.GameViewA;
+import ru.m.tankz.Type;
-import ru.m.tankz.view.game.GameViewB;
-import ru.m.tankz.view.game.IGameView;
 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;
+
+using ru.m.tankz.view.ViewUtil;
 
 @:template class GameFrame extends FrameView<GameInit> implements GameListener {
   public static inline var ID = "game";
@@ -33,19 +43,18 @@ import ru.m.tankz.view.gamepad.GamepadView;
   @:provide static var settings:SettingsStorage;
   @:provide static var bus:IControlBus;
 
-    @:view("game") private var gameViewContainer(default, null):GroupView;
+  @:view private var render:IRender;
+  @:view private var teams:DataView<TeamState, TeamView>;
+  @:view private var level:TextView;
   @:view private var gamepad(default, null):GamepadView;
 
-    private var gameView:IGameView;
+  private var gamepadPlayerId:PlayerId;
 
   private var game:IGame;
   private var recorder:GameRecord;
 
   public function new() {
     super(id, new DefaultLayout());
-    }
-
-    public function init():Void {
     bus.connect(gamepad);
   }
 
@@ -56,41 +65,120 @@ import ru.m.tankz.view.gamepad.GamepadView;
       case NETWORK(network): new NetworkGame(network);
       case RECORD(record): new GamePlayer(record);
     }
-        gameView = switch game.type {
-            case "dota": GameViewB.factory(game.config);
-            case _: GameViewA.factory(game.config);
-        };
-        gameViewContainer.addView(gameView);
     soundManager.config = game.config;
-        gameView.render.config = game.config;
+    render.config = game.config;
-        game.connect(gameView.render);
+    game.connect(render);
     game.connect(soundManager);
-        game.connect(gameView);
     game.connect(this);
     game.start();
-        // ToDo:
+    // 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;
     }
-        if (gameView != null) {
+    render.reset();
-            gameView.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;
   }
 
   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 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);
@@ -101,13 +189,5 @@ import ru.m.tankz.view.gamepad.GamepadView;
   override public function onHide():Void {
     stop();
     soundManager.stopAll();
-        if (gameView != null) {
-            gameViewContainer.removeView(gameView);
-            gameView = null;
-        }
-    }
-
-    public function close():Void {
-        switcher.change(LevelFrame.ID, game.level.packId);
   }
 }

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

@@ -1,21 +1,48 @@
 ---
 style: container
-overflow.x: crop
-overflow.y: crop
 views:
   - id: game
-    $type: ru.m.tankz.view.game.GameViewContainer
+    $type: hw.view.group.HGroupView
-    layout.hAlign: center
+    geometry.stretch: true
+    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: haxework.view.form.ButtonView
+  - $type: hw.view.form.ButtonView
-    style: button.close
+    style: button.bars
     geometry.position: absolute
     geometry.hAlign: left
     geometry.vAlign: top
     geometry.margin: 10
-    +onPress: ~close()
+    +onPress: ~function(_) game.pause = true

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

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.config.Config;

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

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

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

@@ -1,23 +1,24 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameView;
-import haxework.view.frame.FrameView;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.GameState;
 import ru.m.tankz.network.NetworkManager;
+import ru.m.tankz.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;
@@ -25,12 +26,11 @@ using ru.m.tankz.view.ViewUtil;
   @: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, ButtonView>;
+  @:view var packs:DataView<PackId, PackView>;
-    @:view var username:LabelView;
-    @:view("login") var loginButton:ButtonView;
-    @:view("logout") var logoutButton:ButtonView;
   @:view("update") var updateButton:ButtonView;
+  @:view("network") var networkButton:ButtonView;
 
   public function new() {
     super(ID);
@@ -38,29 +38,30 @@ using ru.m.tankz.view.ViewUtil;
 
   override public function onShow(data:Dynamic):Void {
     super.onShow(data);
-        network.stateSignal.connect(onConnectionState);
-        onConnectionState(network.state);
     appUpdater.check().then(function(update:Bool) {
       updateButton.visible = update;
       if (update) {
         updateButton.text = 'Update ${appUpdater.bundle.version}';
       }
-        });
+    }).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();
-        network.stateSignal.disconnect(onConnectionState);
+    settings.signal.disconnect(onSettingChange);
   }
 
-    private function packButtonFactory(index:Int, packId:PackId):ButtonView {
+  private function onSettingChange(setting:Setting):Void {
-        var result = new ButtonView();
+    switch setting {
-        result.style = "button.menu";
+      case ENABLE_NETWORK(value):
-        result.text = packId.toPackLabel();
+        networkButton.visible = value;
-        return result;
+      case _:
+    }
   }
 
   private function startGame(packId:PackId):Void {
@@ -87,37 +88,6 @@ using ru.m.tankz.view.ViewUtil;
     }
   }
 
-    private function onConnectionState(state:ConnectionState):Void {
-        L.d("ClientView", 'onConnectionState: ${state}');
-        switch state {
-            case ONLINE(user):
-                username.text = user.name;
-                logoutButton.visible = true;
-                loginButton.visible = false;
-            case CONNECTED:
-                username.text = "";
-                logoutButton.visible = false;
-                loginButton.visible = true;
-            case ERROR(error):
-                //L.e("ClientView", 'onConnectionState: ERROR', error);
-                L.w("ClientView", 'onConnectionState: ERROR');
-            case _:
-                username.text = "";
-                logoutButton.visible = false;
-                loginButton.visible = false;
-        }
-    }
-
-    private function login():Void {
-        LoginPopup.instance.show().then(function(user:User):Void {
-            L.d("Login", 'user: $user');
-        });
-    }
-
-    private function logout():Void {
-        network.logout();
-    }
-
   private function appUpdate():Void {
     appUpdater.download();
   }

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

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

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

@@ -1,13 +1,12 @@
 package ru.m.tankz.view;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
-import haxework.view.list.VListView;
+import hw.view.list.VListView;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
 @:template class RecordFrame extends FrameView<Dynamic> {
-
   public static var ID(default, never):String = "record";
 
   @:provide static var switcher:FrameSwitcher;

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

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

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

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.bundle.ILevelBundle;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.GameInit;
@@ -22,6 +22,7 @@ using ru.m.tankz.view.ViewUtil;
   @:view("next") var nextButton:ButtonView;
 
   @:provide var frames:FrameSwitcher;
+
   @:provide static var levelBundle:ILevelBundle;
   @:provide static var gameStorage:GameStorage;
 
@@ -38,7 +39,8 @@ using ru.m.tankz.view.ViewUtil;
       view.winner = view.data.id.team == data.winner;
     }
     levelLabel.text = data.level.toLevelLabel();
-        nextButton.disabled = !gameStorage.get(result.level.packId).isPresetAvailable(result.level.id + 1, result.state.presetId);
+    nextButton.disabled = !gameStorage.get(result.level.packId)
+      .isPresetAvailable(result.level.id + 1, result.state.presetId);
     nextButton.text = 'Next #${result.level.id + 1}';
   }
 

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

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

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

@@ -1,14 +1,41 @@
 package ru.m.tankz.view;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.form.ToggleButtonView;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameSwitcher;
+import hw.view.frame.FrameView;
+import ru.m.tankz.storage.SettingsStorage;
 
 @:template class SettingsFrame extends FrameView<Dynamic> {
   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,17 +1,20 @@
 ---
 views:
-  - $type: haxework.view.group.VGroupView
+  - $type: hw.view.group.VGroupView
     style: container
     views:
-      - $type: haxework.view.form.LabelView
+      - $type: hw.view.form.LabelView
         style: text.header
         text: Settings
-      - $type: haxework.view.group.GroupView
+      - $type: hw.view.group.VGroupView
-        geometry.width: 100%
+        geometry.stretch: true
-        geometry.height: 100%
+        layout.hAlign: center
         overflow.y: scroll
+        views:
+          - $type: hw.view.group.GroupView
+            geometry.width: 100%
             layout:
-          $type: haxework.view.layout.TailLayout
+              $type: hw.view.layout.TailLayout
               vAlign: top
               margin: 20
             views:
@@ -21,12 +24,29 @@ views:
               - id: settings1
                 $type: ru.m.tankz.view.settings.SettingsEditor
                 controlIndex: 1
-  - $type: haxework.view.group.HGroupView
+          - $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: haxework.view.SpriteView
+      - $type: hw.view.SpriteView
         geometry.width: 100%
-      - $type: haxework.view.form.ButtonView
+      - $type: hw.view.form.ButtonView
         style: button.prev
         +onPress: ~switcher.change("menu")

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

@@ -1,10 +1,10 @@
 package ru.m.tankz.view;
 
-import haxework.view.data.DataView;
+import hw.view.data.DataView;
-import haxework.view.form.ButtonView;
+import hw.view.form.ButtonView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.frame.FrameView;
+import hw.view.frame.FrameView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.control.Controller;
 import ru.m.tankz.control.PlayerControl;
@@ -19,7 +19,6 @@ using haxe.EnumTools.EnumValueTools;
 using ru.m.tankz.view.ViewUtil;
 
 @:template class StartFrame extends FrameView<Start> {
-
   public static var ID(default, never):String = "start";
 
   @:provide static var switcher:FrameSwitcher;
@@ -114,7 +113,8 @@ using ru.m.tankz.view.ViewUtil;
   private function presetViewFactory(index:Int, value:GamePreset):ButtonView {
     var result = new ButtonView();
     result.style = 'button${!progress.isPresetCompleted(start.level.id, value.id) ? ".active" : ""}';
-        result.text = value.name;
+    result.geometry.height = "100%";
+    result.text = value.name == "default" ? "start" : value.name;
     result.disabled = !progress.isPresetAvailable(start.level.id, value.id);
     return result;
   }

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

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

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

@@ -8,7 +8,6 @@ import ru.m.tankz.control.Binding;
 import ru.m.tankz.control.Control;
 
 class KeyboardMap {
-
   private var data:Map<Int, String>;
 
   public function new() {
@@ -20,19 +19,18 @@ class KeyboardMap {
         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();
+    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) {
@@ -41,8 +39,8 @@ class ViewUtil {
     return result.join(oneline ? " " : "\n");
   }
 
-    public static function toPackLabel(packId:PackId):String {
+  public static function toPackLabel(packId:PackId, separator = " #"):String {
-        return packId.name != PackId.DEFAULT ? '${packId.type} #${packId.name}' : packId.type;
+    return packId.name != PackId.DEFAULT ? '${packId.type}${separator}${packId.name}' : packId.type;
   }
 
   public static function toActionLabel(action:TankAction):String {

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

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

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

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

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

@@ -1,9 +1,9 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.frame.FrameSwitcher;
+import hw.view.frame.FrameSwitcher;
-import haxework.view.group.HGroupView;
+import hw.view.group.HGroupView;
-import haxework.view.form.LabelView;
+import hw.view.form.LabelView;
-import haxework.view.list.ListView;
+import hw.view.list.ListView;
 import ru.m.tankz.game.GameInit;
 import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;

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

@@ -4,26 +4,26 @@ layout.margin: 5
 layout.vAlign: middle
 views:
   - id: play
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.start.small
     +onPress: ~play()
   - id: date
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 200
   - id: type
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 200
   - id: level
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 100
   - id: preset
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 100
   - id: delete
-    $type: haxework.view.form.ButtonView
+    $type: hw.view.form.ButtonView
     style: button.close.small
     +onPress: ~delete()

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

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

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

@@ -4,14 +4,14 @@ layout.margin: 10
 layout.vAlign: middle
 views:
   - id: tank
-    $type: haxework.view.ImageView
+    $type: hw.view.ImageView
     style: icon.tank
   - id: slot
-    $type: haxework.view.form.LabelView
+    $type: hw.view.form.LabelView
     style: text.box
     geometry.width: 150
   - id: select
-    $type: haxework.view.form.SelectView<ru.m.tankz.control.Controller>
+    $type: hw.view.form.SelectView<ru.m.tankz.control.Controller>
     geometry.width: 150
     labelBuilder: |
       ~function(controller) {

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

@@ -1,16 +1,17 @@
 package ru.m.tankz.view.common;
 
-import haxework.view.ImageView;
+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 {

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

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

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

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

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

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

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

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

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

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