[proto] add game event proto messages

.editorconfig

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

.env.default

@@ -1,24 +0,0 @@
-PROJECT=tankz
-SDK_PATH=$HOME/sdk
-PUBLISH_PATH=$HOME/public/$PROJECT
-BUILD_PATH=./build
-TARGET_PATH=./target
-KEY_STORE=<keystore.jks>
-KEY_PASS=<passphrase>
-REPO=https://git.shmyga.ru/api/packages/InfernalGames
-PUBLISH_USER=<username>
-PUBLISH_PASSWORD=<passphrase>
-
-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,4 +1,3 @@
-build/
 target/
 src-gen/
 out/
@@ -13,5 +12,3 @@ config.json
 /node_modules
 /log
 /ansible/*.retry
-.npmrc
-.env

CHANGELOG.md

@@ -1,44 +0,0 @@
-0.17.0
-------
-* Improved `ResultFrame`
-* Improved bonuses
-* Set `DeviceType.SCREEN` as default on mobile devices 
-
-0.16.0
-------
-* Added `GamepadView` for sensor control
-* Added `AppTheme`
-* Replace `LevelPopup` with `StartFrame`
-* Added `LevelPack`
-* Added scrolls to lists
-* Fixed `GameView` size for small screens
-
-0.15.0
-------
-* Added display tank player name in `Render`
-* Fixed join game after relogin
-* Updated `CreateGamePopup` for any screen sizes
-* Fixed tank destroy zero score label
-* Added custom size map support
-* Fixed clock bonus for spawned tanks
-
-0.14.0
-------
-* Added `CreateGamePopup`
-* Fixed null tank color
-* Updated `Ticker`
-
-0.13.0
-------
-* Added `Ticker`
-* Fixed `PacketQueue` stream reading
-* Added `PlayerControl` and `ControlPreset`
-* Added `BaseControlFactory`
-
-0.12.0
-------
-* Added `GameRoomFrame`
-* Improved websocket connection with using binary protocol instead of text
-* Added `GameListFrame`
-* Added `DesktopConnection` for linux client build
-* Updated `SoundManager`

Dockerfile

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

@@ -1,11 +0,0 @@
-# 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,20 +1,73 @@
-* death game bonus
+* build
-* tanks and bullets speed balancing
+  * gulp 100%
-* clean player state on lose in classic type
+  * linux 100%
-* network series
+  * deb-package 100%
-* bot upgrade
+  * windows 0%
-* game config validate
+  * exe-package 0% (inno setup)
-* mine z-order
+  
-* mine spawn position
+* deploy
-* mine spawn on other mine
+  * capistrano 100%
-* double rocket
+
-* display ammo count (panel)
+* ui
-* display ammo count (screen gamepad)
+  * auth frame 0%
-* bonus ammo
+  * select game frame 100% (classic 1/2 player, dota singe/coop/vs)
-* game panel rework
+  * select level frame 10%
-* game state: config, map, entities, players
+  * game frame 50%
-* game menu pack progress
+
-* game save
+* engine
-* balloons: change mute, network, pause
+  * config 100%
-* settings: mute, pause, reset device actions
+  * map 100%
-* game view: toggle panel on mobile
+  * tanks 100%
+  * bullets 100%
+  * boxes 100%
+  * map changes 100%
+  * bonuses 100%
+  * eagle 100%
+  
+* game
+  * classic
+    * state 50%
+    * bot 50%
+    * human 100%
+  * dota
+    * state 50%
+    * bot 10%
+    * human 100%
+
+* bonus
+  * star 50%
+  * grenade 0%
+  * helm 0%
+  * clock 0%
+  * shovel 0%
+    
+* state
+  * score 0%
+  * human tank 0%
+  * save/load 0%
+  * export/import 0%
+  
+* render
+  * map 100%
+  * tanks 100%
+  * bullet 100%
+  * calc redraw 50%
+  * animations
+    * tank spawn 0%
+    * tank move 100%
+    * map water 100%
+    * bullet boom 90%
+    * tank boom 90%
+  * bonuses 100%
+  * html5 50%
+  
+* proto
+  ...
+  
+* editor
+  * level
+    * open 100%
+    * edit 50%
+    * save 100%
+  * tank
+    * color 10%  

ansible/ansible.cfg

@@ -0,0 +1,11 @@
+[defaults]
+hash_behaviour = merge
+host_key_checking = False
+#callback_whitelist = profile_tasks
+display_skipped_hosts = False
+stdout_callback = yaml
+bin_ansible_callbacks = True
+
+[ssh_connection]
+pipelining = True
+ssh_args = -o ForwardAgent=yes

ansible/deploy.yml

@@ -0,0 +1,14 @@
+---
+- hosts: all
+  vars:
+    ansible_user: "{{ deploy_user }}"
+  roles:
+    - ansible-deploy
+    - build
+  post_tasks:
+    - include_role:
+        name: ansible-deploy
+        tasks_from: complete.yml
+    - include_role:
+        name: service
+        tasks_from: restart.yml

ansible/dev/inventory.yml

@@ -0,0 +1,2 @@
+all:
+  hosts: localhost

ansible/group_vars/all.yml

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

ansible/prod/inventory.yml

@@ -0,0 +1,4 @@
+all:
+  hosts: shmyga.ru
+  vars:
+    service_host: 172.31.1.100

ansible/requirements.yml

@@ -0,0 +1,7 @@
+---
+- name: ansible-deploy
+  src: git@bitbucket.org:shmyga/ansible-deploy.git
+  version: master
+  scm: git
+
+- name: geerlingguy.nodejs

ansible/roles/build/tasks/main.yml

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

ansible/roles/service/defaults/main.yml

@@ -0,0 +1,6 @@
+service_name: null
+service_description: "{{ service_name }} service"
+service_work_dir: null
+service_command: null
+service_user: null
+service_control_user: null

ansible/roles/service/tasks/main.yml

@@ -0,0 +1,21 @@
+---
+- name: "Install {{ service_name }} systemd unit file"
+  template:
+    src: "template/service.j2"
+    dest: "/etc/systemd/system/{{ service_name }}.service"
+
+- name: "Start {{ service_name }} service"
+  systemd:
+    enabled: yes
+    state: started
+    name: "{{ service_name }}"
+    daemon_reload: yes
+
+- name: "Add sudoers record for {{ service_name }} service"
+  lineinfile:
+    path: /etc/sudoers.d/{{ service_name }}
+    state: present
+    create: yes
+    regexp: "^{{ service_control_user }} ALL="
+    line: "{{ service_control_user }} ALL= NOPASSWD: /bin/systemctl * {{ service_name }}"
+    validate: "/usr/sbin/visudo -cf %s"

ansible/roles/service/tasks/restart.yml

@@ -0,0 +1,11 @@
+---
+# - name: "Restart {{ service_name }} service"
+#   systemd:
+#     enabled: yes
+#     state: restarted
+#     name: "{{ service_name }}"
+
+- name: "Restart {{ service_name }} service"
+  command: "sudo /bin/systemctl restart {{ service_name }}"
+  args:
+    warn: no

ansible/roles/service/template/service.j2

@@ -0,0 +1,15 @@
+[Unit]
+Description={{ service_description }}
+
+[Service]
+Type=simple
+PIDFile=/var/run/{{ service_name }}.pid
+WorkingDirectory={{ service_work_dir }}
+User={{ service_user }}
+Group={{ service_user }}
+ExecStart={{ service_command }}
+TimeoutSec=300
+Restart=always
+
+[Install]
+WantedBy=multi-user.target

ansible/roles/setup/tasks/apt.yml

@@ -0,0 +1,3 @@
+- name: "Install neko package"
+  apt:
+    name: neko

ansible/roles/setup/tasks/main.yml

@@ -0,0 +1,2 @@
+- import_tasks: apt.yml
+  when: ansible_distribution|lower == 'ubuntu'

ansible/roles/user/keys/shmyga.pub

@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCot1zSeqj7Tj5/7aNMzXAuXQPPxudYFV9z6M03dPijh2bXyHDcXk53xUO8XY5R4GyLhvAn98axbPM++urKY8BXuQqAG36soI7iZJ/KcPY1EKDwVBeZneFC/wMc8HMT0hj9+uHcGAMtmklIgPPkawzLxbEh6oAY4H8Vvz08qyco6suYB5NjkpFwVMf9Xa2Fj8rTodKpPRDBh/Xk+5bh11RKL6b9WcwuwpKU8zl2qZiqNfjr0H+sKEk7ohcYvzSCltLdKJcoKbiCcnrnBJT5/JpGWeAbA2MMmvmt/dJrHykd1CbmXW2DuG4tIlwMb5xU739PoKCePctK1retb8TrWOLT shmyga@shmyga-desktop

ansible/roles/user/tasks/main.yml

@@ -0,0 +1,40 @@
+# barin
+- name: Make barin group
+  group:
+    name: barin
+    state: present
+
+- name: Make barin user
+  user:
+    name: barin
+    group: barin
+    password: '$6$mbw5KZWwtrRUy$eFcMNTW.QzG1Em45r5hZf/qri4hKAHImozWuW4/pYnDK.tOrVKrXTKYfRDtYEFRgCgVVg0zuPvyq/xn0KiKlz0'
+    groups: www-data,sudo,adm
+
+- name: Set up authorized_keys for the barin user
+  authorized_key:
+    user: barin
+    key: '{{ item }}'
+  with_file:
+  - keys/shmyga.pub
+
+
+# holop
+- name: Make holop group
+  group:
+    name: holop
+    state: present
+
+- name: Make holop user
+  user:
+    name: holop
+    group: holop
+    password: '$6$B/7g0xlcXFCIHk$hzSjb8KLll7YrTsp3z640sxNixNAkLpm6UUdZgWPh0Ffy7Ue18AiXTzkDdGTaTH6Woz4kvgVDSggnKGTU6u03.'
+    groups: www-data
+
+- name: Set up authorized_keys for the holop user
+  authorized_key:
+    user: holop
+    key: '{{ item }}'
+  with_file:
+  - keys/shmyga.pub

ansible/roles/user/vars/main.yml

@@ -0,0 +1 @@
+ansible_become: yes

ansible/service.yml

@@ -0,0 +1,8 @@
+---
+- hosts: all
+  vars:
+    ansible_user: "{{ deploy_user }}"
+  tasks:
+    - include_role:
+        name: service
+        tasks_from: restart.yml

ansible/setup.yml

@@ -0,0 +1,16 @@
+---
+- hosts:
+    - all
+  pre_tasks:
+    - include_role:
+        name: ansible-deploy
+        tasks_from: facts.yml
+  roles:
+    - geerlingguy.nodejs
+    - setup
+    - service
+  vars:
+    nodejs_version: 9.x
+    nodejs_npm_global_packages: [gulp-cli]
+  vars_files:
+    - vars/barin.yml

ansible/user.yml

@@ -0,0 +1,4 @@
+- hosts: all
+  gather_facts: no
+  roles:
+    - user

ansible/vars/barin.yml

@@ -0,0 +1,4 @@
+---
+ansible_user: barin
+ansible_become_pass: 1234!QAZ
+ansible_become: yes

config.example.json

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

config.shmyga.ru.json

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

docker-compose.yaml

@@ -1,23 +0,0 @@
-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,195 +1,159 @@
-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 {Sdk, Haxe, Project, FlashPlayer} = 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");
-
-Project.useRuffle();
-
-if (packageInfo.haxe) {
-  Haxe.VERSION = packageInfo.haxe;
-}
 
+// ToDo: update default in gulp-haxetool
+FlashPlayer.VERSION = '32';
+//Haxe.VERSION = '4.0.0-rc.2';
 if (Config.SdkDir) {
-  Sdk.dir = Config.SdkDir;
+    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() {
+exports.generate = function generate()  {
-  const builder = Project.Builder.new(
+    return new Haxe().haxelib(['run', 'protohx', 'generate', 'protohx.json']).then(({stdout}) => {
-    client.config,
+        if (stdout.indexOf('FAIL') > -1) {
-    Project.Platform.ANDROID,
+            throw stdout;
-    client.buildSystem,
-  );
-  return builder.prepare();
-};
-
-exports.generate = function generate() {
-  return exports.setup().then(() =>
-    new Haxe()
-      .haxelib(["run", "protohx", "generate", "protohx.json"])
-      .then(({ stdout }) => {
-        if (stdout.indexOf("FAIL") > -1) {
-          throw stdout;
         }
-      }),
+    });
-  );
 };
 
 /**
- * base config
+ * ToDo:
+ * windows target
+ * window exe package (innosetup)
  */
 const config = new Project.Config({
-  meta: {
+    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 + (Config.Develop ? "-SNAPSHOT" : ""),
+        version: packageInfo.version,
-  },
+    },
-  key: Config.Key,
+    libs: packageInfo.haxeDependencies,
-  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"],
+    ],
-  macros: [
+    assets: [
-    `CompilationOption.set('build','${dateformat(new Date(), "yyyy-mm-dd HH:MM:ss")}')`,
+        'src/common/resources'
-  ],
+    ],
+    flags: [
+        //'proto_debug',
+    ],
+    macros: [
+        `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;
 
 /**
  * client
  */
 const client = new Project(
-  Project.BuildSystem.OPENFL,
+    Project.BuildSystem.OPENFL,
-  [
+    [
-    Project.Platform.FLASH,
+        Project.Platform.FLASH,
-    Project.Platform.HTML5,
+        Project.Platform.HTML5,
-    Project.Platform.LINUX,
+        Project.Platform.LINUX,
-    Project.Platform.WINDOWS,
+        Project.Platform.ANDROID,
-    Project.Platform.ANDROID,
-  ],
-  config.branch({
-    name: "client",
-    sources: ["src/client/haxe"],
-    main: "ru.m.tankz.Client",
-    preloader: "ru.m.tankz.Preloader",
-    assets: ["src/common/resources/level", "src/client/resources"],
-    meta: {
-      width: 1024,
-      height: 576,
-    },
-    flags: [
-      //'proto_debug',
-      //'dom',
-      //'dev_layout',
-      //'bitmap_text',
     ],
-    macros: [
+    config.branch({
-      `CompilationOption.set('host','${host}')`,
+        name: 'client',
-      `CompilationOption.set('port',${port})`,
+        sources: ['src/client/haxe'],
-    ],
+        main: 'ru.m.tankz.Client',
-  }),
+        preloader: 'ru.m.tankz.Preloader',
+        assets: [
+            'src/client/resources',
+        ],
+        meta: {
+            width: 1024,
+            height: 768,
+        },
+        flags: [
+            //'proto_debug',
+            //'dom',
+            //'dev_layout',
+            //'bitmap_text',
+        ],
+        macros: [
+            `CompilationOption.set('host','${host}')`,
+            `CompilationOption.set('port',${port})`,
+        ]
+    }),
+    module.exports.generate
 ).bind(module, gulp);
 
 /**
  * editor
  */
 const editor = new Project(
-  Project.BuildSystem.OPENFL,
+    Project.BuildSystem.OPENFL,
-  [Project.Platform.FLASH, Project.Platform.HTML5, Project.Platform.LINUX],
+    [
-  config.branch({
+        Project.Platform.FLASH,
-    name: "editor",
+        Project.Platform.HTML5,
-    sources: ["src/client/haxe", "src/editor/haxe"],
-    main: "ru.m.tankz.editor.Editor",
-    preloader: "ru.m.tankz.Preloader",
-    assets: ["src/client/resources", "src/editor/resources"],
-    meta: {
-      filename: "editor",
-      pack: "ru.m.tankz.editor",
-      width: 1024,
-      height: 768,
-    },
-    flags: [
-      //'dev_layout',
     ],
-  }),
+    config.branch({
+        name: 'editor',
+        sources: ['src/client/haxe', 'src/editor/haxe'],
+        main: 'ru.m.tankz.editor.Editor',
+        preloader: 'ru.m.tankz.Preloader',
+        assets: [
+            'src/client/resources',
+            'src/editor/resources',
+        ],
+        meta: {
+            filename: 'editor',
+            width: 1024,
+            height: 850,
+        },
+        flags: [
+            //'dev_layout',
+        ]
+    })
 ).bind(module, gulp);
 
 /**
  * server
  */
 const server = new Project(
-  Project.BuildSystem.HAXE,
+    Project.BuildSystem.HAXE,
-  Project.Platform.CPP,
+    Project.Platform.NEKO,
-  config.branch({
+    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"],
+    }),
-  }),
+    module.exports.generate
 ).bind(module, gulp);
 
-/**
- * publish
- */
-module.exports.publish = publish(
-  packageInfo.name,
-  packageInfo.version,
-  Config.PublishDir,
-  Config.PublishUrl,
-);
-
 /**
  * default
  */
-const defaultSeries = [
+module.exports.default = gulp.series(
-  exports.clean,
+    exports.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['client:linux:build'],
+    module.exports['client:linux:deb'],
+    //module.exports['client:android: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:cpp:build"],
+    module.exports['server:neko:build'],
-];
+);
-
-if (System.isLinux) {
-  defaultSeries.push(
-    module.exports["client:linux:build"],
-    module.exports["client:linux:archive"],
-    module.exports["client:linux:deb"],
-
-    module.exports["client:android:build"],
-  );
-}
-
-if (System.isWindows) {
-  defaultSeries.push(
-    module.exports["client:windows:build"],
-    module.exports["client:windows:archive"],
-    module.exports["client:windows:installer"],
-  );
-}
-
-defaultSeries.push(exports.publish);
-
-module.exports.default = gulp.series(defaultSeries);

hxformat.json

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

package.json

@@ -1,25 +1,26 @@
 {
-  "name": "tankz",
+    "name": "tankz",
-  "version": "0.18.0",
+    "version": "0.14.2",
-  "private": true,
+    "private": true,
-  "devDependencies": {
+    "devDependencies": {
-    "dateformat": "^3.0.3",
+        "dateformat": "^3.0.3",
-    "gulp": "^4.0.0",
+        "gulp": "^4.0.0",
-    "gulp-add": "0.0.2",
+        "gulp-add": "0.0.2",
-    "gulp-clean": "^0.4.0",
+        "gulp-clean": "^0.4.0",
-    "gulp-haxetool": "^0.2.1",
+        "gulp-haxetool": "^0.0.19",
-    "yargs": "^13.2.4"
+        "yargs": "^13.2.4"
-  },
+    },
-  "haxeDependencies": {
+    "haxeDependencies": {
-    "haxework": "2.1.1",
+        "haxework": "git@bitbucket.org:shmyga/haxework.git",
-    "lime": "8.0.0",
+        "lime": "7.5.0",
-    "openfl": "9.2.0",
+        "openfl": "8.9.1",
-    "hxcpp": "4.2.1",
+        "hxcpp": "4.0.8",
-    "protohx": "0.4.6",
+        "promhx": "1.1.0",
-    "orm": "2.1.0",
+        "protohx": "0.4.6",
-    "haxe-crypto": "0.0.8",
+        "yaml": "1.3.0",
-    "svg": "1.1.3",
+        "orm": "2.1.0",
-    "formatter": "1.16.0"
+        "yield": "2.0.0",
-  },
+        "haxe-crypto": "0.0.7",
-  "haxe": "4.2.5"
+        "svg": "1.1.2"
+    }
 }

scripts/build

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

scripts/docker-action

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

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

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

@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-set -e
-cd "$(dirname $(dirname "$0"))" || exit
-source .env
-
-VERSION=$(grep -m 1 'version' ./package.json | grep -oP '"version"\s*:\s*"\K\d+\.\d+\.\d+')
-
-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

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

sql/init.sql

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

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

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

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

@@ -1,55 +1,84 @@
 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;
+    var image:BitmapData;
-  var length:Int;
+    var length:Int;
 }
 
 class Animate extends Bitmap {
-  public var playing(default, default):Bool;
-  public var frames(default, set):Array<Frame>;
 
-  private var sequence:Array<BitmapData>;
+    private static var timer:Timer;
-  private var index:Int;
+    private static var instances:Array<Animate> = [];
 
-  @:provide private static var manager:AnimateManager;
+    private static function init():Void {
-
+        if (timer == null) {
-  public function new(?frames:Array<Frame>) {
+            timer = new Timer(30);
-    super(null, PixelSnapping.AUTO, true);
+            timer.run = updateAll;
-    this.frames = frames == null ? [] : frames;
+        }
-    manager.add(this);
-  }
-
-  public function set_frames(value:Array<Frame>):Array<Frame> {
-    sequence = [];
-    index = 0;
-    if (value != null) {
-      frames = value;
-      for (frame in frames) {
-        sequence = sequence.concat([for (i in 0...frame.length) frame.image]);
-      }
-      bitmapData = sequence[0];
-    } else {
-      bitmapData = null;
     }
-    return frames;
-  }
 
-  public function update():Void {
+    private static function updateAll():Void {
-    if (++index >= sequence.length) {
+        for (instance in instances) {
-      index = 0;
+            if (instance.playing) {
+                instance.update();
+            }
+        }
     }
-    var nextBitmapData = sequence[index];
-    x -= (nextBitmapData.width - bitmapData.width) / 2;
-    y -= (nextBitmapData.height - bitmapData.height) / 2;
-    bitmapData = nextBitmapData;
-  }
 
-  public function dispose():Void {
+    public var playing(default, set):Bool;
-    manager.remove(this);
+    public var frames(default, set):Array<Frame>;
-  }
+
+    private var sequence:Array<BitmapData>;
+    private var index:Int;
+
+    public function new(?frames:Array<Frame>) {
+        super(null, PixelSnapping.AUTO, true);
+        this.frames = frames == null ? [] : frames;
+        init();
+        instances.push(this);
+    }
+
+    public function set_frames(value:Array<Frame>):Array<Frame> {
+        sequence = [];
+        index = 0;
+        if (value != null) {
+            frames = value;
+            for (frame in frames) {
+                sequence = sequence.concat([for (i in 0...frame.length) frame.image]);
+            }
+            bitmapData = sequence[0];
+        } else {
+            bitmapData = null;
+        }
+        return frames;
+    }
+
+    public function set_playing(value:Bool):Bool {
+        if (playing != value) {
+            playing = value;
+        }
+        return playing;
+    }
+
+    private function update():Void {
+        if (++index >= sequence.length) {
+            index = 0;
+        }
+        var nextBitmapData = sequence[index];
+        x -= (nextBitmapData.width - bitmapData.width) / 2;
+        y -= (nextBitmapData.height - bitmapData.height) / 2;
+        bitmapData = nextBitmapData;
+    }
+
+    public function dispose():Void {
+        if (instances.indexOf(this) > -1) {
+            instances.remove(this);
+        }
+    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,78 +1,66 @@
 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.resources.IResources;
-import hw.storage.SharedObjectStorage;
+import haxework.resources.Resources;
-import hw.view.popup.PopupManager;
+import haxework.view.popup.PopupManager;
-import hw.view.theme.ITheme;
-import lime.ui.Gamepad;
-import lime.ui.Joystick;
 import ru.m.connect.IConnection;
-import ru.m.control.ControlBus;
-import ru.m.control.IControlBus;
-import ru.m.control.JoystickDevice;
-import ru.m.control.KeyboardDevice;
-import ru.m.tankz.bundle.CachedLevelBundle;
-import ru.m.tankz.bundle.ClientLevelSource;
 import ru.m.tankz.bundle.ConfigBundle;
 import ru.m.tankz.bundle.IConfigBundle;
 import ru.m.tankz.bundle.ILevelBundle;
+import ru.m.tankz.bundle.LevelBundle;
+import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.pack.Request;
 import ru.m.tankz.proto.pack.Response;
-import ru.m.update.Updater;
+import ru.m.tankz.sound.SoundManager;
+import ru.m.tankz.storage.GameStorage;
+import ru.m.tankz.storage.NetworkStorage;
+import ru.m.tankz.storage.RecordStorage;
+import ru.m.tankz.storage.SettingsStorage;
 
 class Init {
-  @:provide static var theme:ITheme;
-  @:provide static var levelBundle:ILevelBundle;
-  @:provide static var configBundle:IConfigBundle;
-  @:provide static var popupManager:PopupManager;
-  @:provide static var connection:IConnection<Request, Response>;
-  @:provide static var bus:IControlBus;
-  @:provide static var updater:Updater;
 
-  private static function buildConnection():IConnection<Request, Response> {
+    @:provide static var resources:IResources;
-    var host:String = CompilationOption.get("host");
+    @:provide static var levelBundle:ILevelBundle;
-    var port:Int = CompilationOption.get("port");
+    @:provide static var configBundle:IConfigBundle;
-    L.d("Init", 'connect to $host:$port');
+    @:provide static var settingsStorage:SettingsStorage;
-    #if flash
+    @:provide static var multiplayerStorage:NetworkStorage;
-    return new ru.m.connect.flash.FlashConnection<Request, Response>(host, port, Response);
+    @:provide static var gameStorage:GameStorage;
-    #elseif html5
+    @:provide static var recordStorage:RecordStorage;
-    return new ru.m.connect.js.JsConnection<Request, Response>(host,
+    @:provide static var soundManager:SoundManager;
-      port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
+    @:provide static var networkManager:NetworkManager;
-    #else
+    @:provide static var popupManager:PopupManager;
-    return new ru.m.connect.desktop.DesktopConnection<Request, Response>(host, port, Response);
+    @:provide static var connection:IConnection<Request, Response>;
-    #end
-  }
 
-  public static function init():Void {
+    private static function buildConnection():IConnection<Request, Response> {
-    theme = new AppTheme();
+        var host:String = CompilationOption.get("host");
-    levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage());
+        var port:Int = CompilationOption.get("port");
-    levelBundle.load();
+        L.d("Init", 'connect to $host:$port');
-    configBundle = new ConfigBundle();
+        #if flash
-
+        return new ru.m.connect.flash.FlashConnection<Request, Response>(host, port, Response);
-    popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v, 100);
+        #elseif html5
-    popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v, 100);
+        return new ru.m.connect.js.JsConnection<Request, Response>(host, port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
-
+        #else
-    connection = buildConnection();
+        return new ru.m.connect.desktop.DesktopConnection<Request, Response>(host, port, Response);
-
+        #end
-    bus = new ControlBus();
-    bus.connect(new KeyboardDevice(Lib.current.stage));
-
-    updater = new Updater(Const.VERSION, "https://shmyga.ru/repo/tankz/packages.json");
-
-    for (device in Gamepad.devices) {
-      trace('gamepad', device);
     }
-    Gamepad.onConnect.add(function(device) {
-      trace('connect gamepad', device);
-    });
 
-    for (device in Joystick.devices) {
+    public static function init():Void {
-      bus.connect(new JoystickDevice(device));
+        resources = new Resources();
+        levelBundle = new LevelBundle();
+        configBundle = new ConfigBundle();
+        settingsStorage = new SettingsStorage();
+        multiplayerStorage = new NetworkStorage();
+        gameStorage = new GameStorage();
+        recordStorage = new RecordStorage();
+        soundManager = new SoundManager();
+        popupManager = new PopupManager();
+
+        popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v, 100);
+        popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v, 100);
+
+        connection = buildConnection();
+        networkManager = new NetworkManager();
     }
-    Joystick.onConnect.add(function(device) {
-      bus.connect(new JoystickDevice(device));
-    });
-  }
 }

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

@@ -7,20 +7,21 @@ 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]);
-    matrix = matrix.concat([0, 1, 0, 0, 0]);
-    matrix = matrix.concat([1, 0, 0, 0, 0]);
-    matrix = matrix.concat([0, 0, 0, 1, 0]);
-    var cmf:ColorMatrixFilter = new ColorMatrixFilter(matrix);
-    var bitmap:BitmapData = bitmap.clone();
-    bitmap.applyFilter(bitmap, bitmap.rect, new Point(0, 0), cmf);
-    return bitmap;
-  }
 
-  public static function apply() {
+    private static function prepareIcon(bitmap:BitmapData):BitmapData {
-    var icon = Assets.getBitmapData("resources/icon.png");
+        var matrix:Array<Float> = [];
-    Lib.current.stage.window.setIcon(prepareIcon(icon).image);
+        matrix = matrix.concat([0, 0, 1, 0, 0]);
-  }
+        matrix = matrix.concat([0, 1, 0, 0, 0]);
+        matrix = matrix.concat([1, 0, 0, 0, 0]);
+        matrix = matrix.concat([0, 0, 0, 1, 0]);
+        var cmf:ColorMatrixFilter = new ColorMatrixFilter(matrix);
+        var bitmap:BitmapData = bitmap.clone();
+        bitmap.applyFilter(bitmap, bitmap.rect, new Point(0, 0), cmf);
+        return bitmap;
+    }
+
+    public static function apply() {
+        var icon = Assets.getBitmapData("resources/icon.png");
+        Lib.current.stage.window.setIcon(prepareIcon(icon).image);
+    }
 }

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

@@ -5,136 +5,137 @@ import flash.display.Sprite;
 import flash.events.Event;
 import flash.events.ProgressEvent;
 import flash.Lib;
-import hw.view.geometry.Size;
+import haxework.view.core.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;
-  public var size(default, set):Size = [0, 0];
-  public var radius(get, null):Float;
 
-  private var maskShape:Shape;
+    public var color(default, set):Int = 0;
-  private var toRedraw:Bool;
+    public var backColor(default, set):Int = 0;
+    public var progress(default, set):Float = 0;
+    public var size(default, set):Size = [0, 0];
+    public var radius(get, null):Float;
 
-  public function new() {
+    private var maskShape:Shape;
-    super();
+    private var toRedraw:Bool;
-    maskShape = new Shape();
-    addChild(maskShape);
-    mask = maskShape;
-  }
 
-  private inline function get_radius():Float {
+    public function new() {
-    return Math.min(size.width, size.height) / 2;
+        super();
-  }
+        maskShape = new Shape();
-
+        addChild(maskShape);
-  private function set_color(value:Int):Int {
+        mask = maskShape;
-    if (color != value) {
-      color = value;
-      toRedraw = true;
     }
-    return color;
-  }
 
-  private function set_backColor(value:Int):Int {
+    private inline function get_radius():Float {
-    if (backColor != value) {
+        return Math.min(size.width, size.height) / 2;
-      backColor = value;
-      toRedraw = true;
     }
-    return color;
-  }
 
-  private function set_progress(value:Float):Float {
+    private function set_color(value:Int):Int {
-    if (progress != value) {
+        if (color != value) {
-      progress = value;
+            color = value;
-      toRedraw = true;
+            toRedraw = true;
+        }
+        return color;
     }
-    return progress;
-  }
 
-  private function set_size(value:Size):Size {
+    private function set_backColor(value:Int):Int {
-    if (size != value) {
+        if (backColor != value) {
-      size = value;
+            backColor = value;
-      toRedraw = true;
+            toRedraw = true;
+        }
+        return color;
     }
-    return size;
-  }
 
-  public function update():Void {
+    private function set_progress(value:Float):Float {
-    if (toRedraw) {
+        if (progress != value) {
-      redraw();
+            progress = value;
-      redrawMask();
+            toRedraw = true;
-      toRedraw = false;
+        }
+        return progress;
     }
-  }
 
-  public function redraw():Void {
+    private function set_size(value:Size):Size {
-    graphics.clear();
+        if (size != value) {
-    graphics.beginFill(color);
+            size = value;
-    graphics.drawCircle(radius, radius, radius);
+            toRedraw = true;
-    graphics.beginFill(backColor);
+        }
-    graphics.drawCircle(radius, radius, radius / 2);
+        return size;
-    graphics.endFill();
+    }
-  }
 
-  public function redrawMask():Void {
+    public function update():Void {
-    maskShape.graphics.clear();
+        if (toRedraw) {
-    maskShape.graphics.beginFill(0x00ff00);
+            redraw();
-    maskShape.graphics.moveTo(radius, radius);
+            redrawMask();
-    var sides = 6;
+            toRedraw = false;
-    var rotation = (-(Math.PI) / 2);
+        }
-    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);
-    };
-    var sidesToDraw:Int = Math.floor(progress * sides);
-    for (i in 0...sidesToDraw + 1) {
-      lineToRadians((i / sides) * (Math.PI * 2) + rotation);
     }
-    if (progress * sides != sidesToDraw) {
+
-      lineToRadians(progress * (Math.PI * 2) + rotation);
+    public function redraw():Void {
+        graphics.clear();
+        graphics.beginFill(color);
+        graphics.drawCircle(radius, radius, radius);
+        graphics.beginFill(backColor);
+        graphics.drawCircle(radius, radius, radius / 2);
+        graphics.endFill();
+    }
+
+    public function redrawMask():Void {
+        maskShape.graphics.clear();
+        maskShape.graphics.beginFill(0x00ff00);
+        maskShape.graphics.moveTo(radius, radius);
+        var sides = 6;
+        var rotation = (-(Math.PI) / 2);
+        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);
+        };
+        var sidesToDraw:Int = Math.floor(progress * sides);
+        for (i in 0...sidesToDraw + 1) {
+            lineToRadians((i / sides) * (Math.PI * 2) + rotation);
+        }
+        if (progress * sides != sidesToDraw) {
+            lineToRadians(progress * (Math.PI * 2) + rotation);
+        }
+        maskShape.graphics.endFill();
     }
-    maskShape.graphics.endFill();
-  }
 }
 
 class Preloader extends Sprite {
-  private var progress:Progress;
 
-  public function new() {
+    private var progress:Progress;
-    super();
-    Lib.current.stage.color = AppTheme.COLORS.light;
-    progress = new Progress();
-    progress.color = AppTheme.COLORS.dark;
-    progress.backColor = AppTheme.COLORS.light;
-    progress.size = [200, 200];
-    addChild(progress);
-    onResize(null);
-    Lib.current.stage.addEventListener(Event.RESIZE, onResize);
-    Lib.current.stage.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-    Lib.current.stage.addEventListener(ProgressEvent.PROGRESS, onProgress);
-    addEventListener(Event.COMPLETE, onComplete);
-  }
 
-  private function onResize(event:Event):Void {
+    public function new() {
-    progress.x = (Lib.current.stage.stageWidth - progress.size.width) / 2;
+        super();
-    progress.y = (Lib.current.stage.stageHeight - progress.size.height) / 2;
+        Lib.current.stage.color = Style.lightColor;
-  }
+        progress = new Progress();
+        progress.color = Style.darkColor;
+        progress.backColor = Style.lightColor;
+        progress.size = [200, 200];
+        addChild(progress);
+        onResize(null);
+        Lib.current.stage.addEventListener(Event.RESIZE, onResize);
+        Lib.current.stage.addEventListener(Event.ENTER_FRAME, onEnterFrame);
+        Lib.current.stage.addEventListener(ProgressEvent.PROGRESS, onProgress);
+        addEventListener(Event.COMPLETE, onComplete);
+    }
 
-  private function onEnterFrame(event:Event):Void {
+    private function onResize(event:Event):Void {
-    progress.update();
+        progress.x = (Lib.current.stage.stageWidth - progress.size.width) / 2;
-  }
+        progress.y = (Lib.current.stage.stageHeight - progress.size.height) / 2;
+    }
 
-  private function onProgress(event:ProgressEvent):Void {
+    private function onEnterFrame(event:Event):Void {
-    progress.progress = event.bytesLoaded / event.bytesTotal;
+        progress.update();
-  }
+    }
 
-  private function onComplete(event:Event):Void {
+    private function onProgress(event:ProgressEvent):Void {
-    progress.update();
+        progress.progress = event.bytesLoaded / event.bytesTotal;
-    Lib.current.stage.removeEventListener(Event.RESIZE, onResize);
+    }
-    Lib.current.stage.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+
-    Lib.current.stage.removeEventListener(ProgressEvent.PROGRESS, onProgress);
+    private function onComplete(event:Event):Void {
-    removeEventListener(Event.COMPLETE, onComplete);
+        progress.update();
-  }
+        Lib.current.stage.removeEventListener(Event.RESIZE, onResize);
+        Lib.current.stage.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+        Lib.current.stage.removeEventListener(ProgressEvent.PROGRESS, onProgress);
+        removeEventListener(Event.COMPLETE, onComplete);
+    }
 }

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

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

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

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

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

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

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

@@ -0,0 +1,23 @@
+package ru.m.tankz.bundle;
+
+import openfl.Assets;
+import ru.m.tankz.config.Config;
+import ru.m.tankz.Type;
+import ru.m.tankz.util.LevelUtil;
+
+class LevelBundle implements ILevelBundle {
+
+    private var cache:Map<String, LevelConfig> = new Map();
+
+    public function new() {}
+
+    public function get(type:GameType, config:Config, levelId:LevelId):LevelConfig {
+        var key = '${type}:${levelId}';
+        if (!cache.exists(key)) {
+            var data:String = Assets.getText('resources/${type}/levels/level${LevelUtil.formatLevel(levelId)}.txt');
+            cache[key] = LevelUtil.loads(config, data);
+            cache[key].id = levelId;
+        }
+        return cache[key];
+    }
+}

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,8 @@ 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);
+    override private function buildHuman(id:PlayerId, index:Int):Control {
-  }
+        return new HumanControl(id, index);
+    }
 }

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

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

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

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

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

@@ -5,11 +5,12 @@ 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 {
+    @:provide private var network:NetworkManager;
-    if (tankId > -1) {
+
-      network.action(tankId, action);
+    override public function action(action:TankAction):Void {
+        if (tankId > -1) {
+            network.action(tankId, action);
+        }
     }
-  }
 }

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

@@ -5,11 +5,12 @@ 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);
-  }
 
-  override private function buildBot(id:PlayerId, type:String):Control {
+    override private function buildHuman(id:PlayerId, index:Int):Control {
-    return null;
+        return new NetworkControl(id, index);
-  }
+    }
+
+    override private function buildBot(id:PlayerId, type:String):Control {
+        return null;
+    }
 }

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

@@ -1,54 +1,54 @@
 package ru.m.tankz.network;
 
 import haxe.Unserializer;
-import ru.m.tankz.control.Controller;
 import ru.m.tankz.game.Game;
 import ru.m.tankz.game.GameEvent;
+import ru.m.tankz.game.GameState;
 import ru.m.tankz.network.NetworkControlFactory;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.room.RoomSlotProto;
 
 class NetworkGame extends Game {
-  private var network:NetworkManager;
 
-  public function new(network:NetworkManager) {
+    private var network:NetworkManager;
-    super(network.room.game.type);
-    this.network = network;
-    this.controlFactory = new NetworkControlFactory();
-    network.gameEventSignal.connect(onGameEventProto);
-    network.stateSignal.connect(onConnectionState);
-  }
 
-  private function onGameEventProto(game:GameEventResponse):Void {
+    public function new(network:NetworkManager) {
-    var time = game.event.time;
+        super(new GameState(network.room.game.type, 0, network.room.game.level));
-    var eventStr = game.event.event;
+        this.network = network;
-    var event:GameEvent = Unserializer.run(eventStr);
+        this.controlFactory = new NetworkControlFactory();
-    gameEventSignal.emit(event);
+        network.gameEventSignal.connect(onGameEventProto);
-  }
+        network.stateSignal.connect(onConnectionState);
+    }
 
-  private function onConnectionState(state:ConnectionState):Void {
+    private function onGameEventProto(game:GameEventResponse):Void {
-    switch state {
+        var time = game.event.time;
-      case ONLINE(user):
+        var eventStr = game.event.event;
-        if (network.room != null) {
+        var event:GameEvent = Unserializer.run(eventStr);
-          network.joinGame(network.room.game.id);
+        gameEventSignal.emit(event);
+    }
+
+    private function onConnectionState(state:ConnectionState):Void {
+        switch state {
+            case ONLINE(user):
+                if (network.room != null) {
+                    network.joinGame(network.room.game.id);
+                }
+            case _:
         }
-      case _:
     }
-  }
 
-  override private function onStart(start:Start):Void {
+    override public function start():Void {
-    var slot:RoomSlotProto = Lambda.find(network.room.slots,
+        var slot:RoomSlotProto = Lambda.find(network.room.slots, function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
-      function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
+        if (slot != null) {
-    if (slot != null) {
+            state.controls.push({playerId: [slot.slot.team, slot.slot.index], control: "human-0"});
-      start.state.controls.push({playerId: [slot.slot.team, slot.slot.index], controller: HUMAN(0)});
+        }
+        super.start();
     }
-    super.onStart(start);
-  }
 
-  override public function dispose():Void {
+    override public function dispose():Void {
-    super.dispose();
+        super.dispose();
-    network.gameEventSignal.disconnect(onGameEventProto);
+        network.gameEventSignal.disconnect(onGameEventProto);
-    network.stateSignal.disconnect(onConnectionState);
+        network.stateSignal.disconnect(onConnectionState);
-  }
+    }
 }

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

@@ -1,12 +1,14 @@
 package ru.m.tankz.network;
 
+import ru.m.tankz.proto.game.GameEventProto;
+import ru.m.tankz.proto.room.SlotProto;
+import ru.m.tankz.proto.room.SlotRequest;
 import haxe.Serializer;
-import hw.signal.Signal;
+import haxework.signal.Signal;
 import ru.m.connect.IConnection;
 import ru.m.tankz.control.Control;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.proto.core.UserProto;
-import ru.m.tankz.proto.game.GameEventProto;
 import ru.m.tankz.proto.pack.GameEventRequest;
 import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.pack.LoginRequest;
@@ -19,175 +21,153 @@ 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>;
 
 enum ConnectionState {
-  OFFLINE;
+    OFFLINE;
-  CONNECT;
+    CONNECT;
-  CONNECTED;
+    CONNECTED;
-  LOGIN;
+    LOGIN;
-  ONLINE(user:User);
+    ONLINE(user:User);
-  ERROR(error:Dynamic);
+    ERROR(error:Dynamic);
 }
 
-@:provide class NetworkManager {
+class NetworkManager {
-  private static inline var TAG = "NetworkManager";
 
-  public var state(default, null):ConnectionState;
+    public var state(default, null):ConnectionState;
-  public var room(default, null):RoomProto;
+    public var room(default, null):RoomProto;
-  public var user(default, null):UserProto;
+    public var user(default, null):UserProto;
 
-  public var stateSignal:Signal<ConnectionState>;
+    public var stateSignal:Signal<ConnectionState>;
-  public var listRoomSignal:Signal<Array<RoomProto>>;
+    public var listRoomSignal:Signal<Array<RoomProto>>;
-  public var roomSignal:Signal<RoomProto>;
+    public var roomSignal:Signal<RoomProto>;
-  public var gameEventSignal:Signal<GameEventResponse>;
+    public var gameEventSignal:Signal<GameEventResponse>;
 
-  @:provide private var connection:ClientConnection;
+    @:provide private var connection:ClientConnection;
-  @:provide private var storage:NetworkStorage;
+    @:provide private var storage:NetworkStorage;
-  @:provide private var settings:SettingsStorage;
 
-  private var reconnectTimer:Timer;
+    private var reconnectTimer:Timer;
-  private var reconnectDelay:Int;
+    private var reconnectDelay:Int;
 
-  public function new() {
+    public function new() {
-    reconnectDelay = 500;
-    stateSignal = new Signal();
-    listRoomSignal = new Signal();
-    roomSignal = new Signal();
-    gameEventSignal = new Signal();
-    updateState(OFFLINE);
-    connection.handler.connect(onConnectionEvent);
-    connection.receiveHandler.connect(onResponse);
-    if (settings.enableNetwork) {
-      connect();
-    }
-    settings.signal.connect(onSettingChange);
-  }
-
-  private function onSettingChange(setting:Setting):Void {
-    switch setting {
-      case ENABLE_NETWORK(value):
-        if (value) {
-          connect();
-        } else {
-          disconnect();
-        }
-      case _:
-    }
-  }
-
-  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(new LoginRequest().setUuid(uuid).setName(name)));
-  }
-
-  public function logout():Void {
-    connection.send(new Request().setLogout(new LogoutRequest()));
-  }
-
-  public function listGame(subscribe:Bool):Void {
-    connection.send(new Request().setRoomList(new RoomListRequest().setSubscribe(subscribe)));
-  }
-
-  public function createGame(type:String, level:Int):Void {
-    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))));
-  }
-
-  public function selectSlot(slot:SlotProto):Void {
-    connection.send(new Request().setRoom(new RoomRequest().setSlot(new SlotRequest().setSlot(slot))));
-  }
-
-  public function leaveGame():Void {
-    connection.send(new Request().setRoom(new RoomRequest().setLeave(new LeaveRequest())));
-  }
-
-  public function startGame():Void {
-    connection.send(new Request().setRoom(new RoomRequest().setStart(new StartRequest())));
-  }
-
-  public function action(tankId:Int, action:TankAction):Void {
-    connection.send(new Request().setGameEvent(new GameEventRequest().setEvent(new GameEventProto().setTime(0)
-      .setEvent(Serializer.run(GameEvent.ACTION(tankId, action))))));
-  }
-
-  private function connect():Void {
-    if (reconnectTimer != null) {
-      reconnectTimer.stop();
-      reconnectTimer = null;
-    }
-    reconnectTimer = null;
-    updateState(CONNECT);
-    connection.connect().catchError(function(error) {});
-  }
-
-  private function reconnect():Void {
-    reconnectDelay = Std.int(Math.min(reconnectDelay * 2, 10000));
-    if (reconnectTimer == null) {
-      reconnectTimer = Timer.delay(connect, reconnectDelay);
-    }
-  }
-
-  private function disconnect():Void {
-    connection.disconnect();
-  }
-
-  private function onConnectionEvent(event:ConnectionEvent):Void {
-    updateState(switch event {
-      case CONNECTED: CONNECTED;
-      case DISCONNECTED: OFFLINE;
-      case ERROR(error): ERROR(error);
-    });
-    switch event {
-      case CONNECTED:
         reconnectDelay = 500;
-        var user = storage.user;
+        stateSignal = new Signal();
-        if (user != null) {
+        listRoomSignal = new Signal();
-          login(user.name, user.uuid);
+        roomSignal = new Signal();
-        }
+        gameEventSignal = new Signal();
-      case DISCONNECTED | ERROR(_):
+        updateState(OFFLINE);
-        if (settings.enableNetwork) {
+        connection.handler.connect(onConnectionEvent);
-          reconnect();
+        connection.receiveHandler.connect(onResponse);
-        }
+        connect();
     }
-  }
 
-  private function onResponse(packet:Response):Void {
+    private function updateState(value:ConnectionState):Void {
-    if (packet.hasLogin()) {
+        state = value;
-      this.user = packet.login.user;
+        stateSignal.emit(value);
-      var user = {
+    }
-        uuid: this.user.uuid,
+
-        name: this.user.name,
+    public function login(name:String, uuid:String = null):Void {
-      };
+        updateState(LOGIN);
-      storage.user = user;
+        connection.send(new Request().setLogin(
-      updateState(ONLINE(user));
+            new LoginRequest()
-    } else if (packet.hasLogout()) {
+                .setUuid(uuid)
-      storage.user = null;
+                .setName(name)
-      updateState(CONNECTED);
+        ));
-    } else if (packet.hasRoomList()) {
+    }
-      listRoomSignal.emit(packet.roomList.rooms);
+
-    } else if (packet.hasRoom()) {
+    public function logout():Void {
-      room = packet.room.room;
+        connection.send(new Request().setLogout(new LogoutRequest()));
-      roomSignal.emit(room);
+    }
-    } else if (packet.hasGameEvent()) {
+
-      gameEventSignal.emit(packet.gameEvent);
+    public function listGame(subscribe:Bool):Void {
+        connection.send(new Request().setRoomList(new RoomListRequest().setSubscribe(subscribe)));
+    }
+
+    public function createGame(type:String, level:Int):Void {
+        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))));
+    }
+
+    public function selectSlot(slot:SlotProto):Void {
+        connection.send(new Request().setRoom(new RoomRequest().setSlot(new SlotRequest().setSlot(slot))));
+    }
+
+    public function leaveGame():Void {
+        connection.send(new Request().setRoom(new RoomRequest().setLeave(new LeaveRequest())));
+    }
+
+    public function startGame():Void {
+        connection.send(new Request().setRoom(new RoomRequest().setStart(new StartRequest())));
+    }
+
+    public function action(tankId:Int, action:TankAction):Void {
+        connection.send(new Request().setGameEvent(new GameEventRequest().setEvent(
+            new GameEventProto().setTime(0).setEvent(
+                Serializer.run(GameEvent.ACTION(tankId, action))
+            )))
+        );
+    }
+
+    private function connect():Void {
+        if (reconnectTimer != null) {
+            reconnectTimer.stop();
+            reconnectTimer = null;
+        }
+        reconnectTimer = null;
+        updateState(CONNECT);
+        connection.connect().catchError(function(error) {});
+    }
+
+    private function reconnect():Void {
+        reconnectDelay = Std.int(Math.min(reconnectDelay * 2, 10000));
+        if (reconnectTimer == null) {
+            reconnectTimer = Timer.delay(connect, reconnectDelay);
+        }
+    }
+
+    private function onConnectionEvent(event:ConnectionEvent):Void {
+        updateState(switch event {
+            case CONNECTED: CONNECTED;
+            case DISCONNECTED: OFFLINE;
+            case ERROR(error): ERROR(error);
+        });
+        switch event {
+            case CONNECTED:
+                reconnectDelay = 500;
+                var user = storage.user;
+                if (user != null) {
+                    login(user.name, user.uuid);
+                }
+            case DISCONNECTED | ERROR(_):
+                reconnect();
+        }
+    }
+
+    private function onResponse(packet:Response):Void {
+        if (packet.hasLogin()) {
+            this.user = packet.login.user;
+            var user = {
+                uuid: this.user.uuid,
+                name: this.user.name,
+            };
+            storage.user = user;
+            updateState(ONLINE(user));
+        } else if (packet.hasLogout()) {
+            storage.user = null;
+            updateState(CONNECTED);
+        } else if (packet.hasRoomList()) {
+            listRoomSignal.emit(packet.roomList.rooms);
+        } else if (packet.hasRoom()) {
+            room = packet.room.room;
+            roomSignal.emit(room);
+        } else if (packet.hasGameEvent()) {
+            gameEventSignal.emit(packet.gameEvent);
+        }
     }
-  }
 }

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

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

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

@@ -1,12 +1,11 @@
 package ru.m.tankz.render;
 
-import hw.view.IView;
+import haxework.view.IView;
 import ru.m.tankz.config.Config;
 import ru.m.tankz.game.IGame;
 
 interface IRender extends IView<Dynamic> extends GameListener {
-  public var config(default, set):Config;
+    public var config(default, set):Config;
-  public var gridSize(default, set):GridSize;
+    public function draw():Void;
-  public function draw():Void;
+    public function reset():Void;
-  public function reset():Void;
 }

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

@@ -1,16 +1,14 @@
 package ru.m.tankz.render;
 
-import hw.view.utils.DrawUtil;
 import flash.display.DisplayObjectContainer;
 import flash.display.Graphics;
 import flash.display.Sprite;
 import flash.events.Event;
 import haxe.Timer;
-import hw.view.form.LabelView;
+import haxework.view.LabelView;
-import hw.view.SpriteView;
+import haxework.view.SpriteView;
 import promhx.Promise;
 import ru.m.animate.Animate;
-import ru.m.animate.AnimateManager;
 import ru.m.animate.OnceAnimate;
 import ru.m.geom.Point;
 import ru.m.tankz.config.Config;
@@ -23,281 +21,238 @@ 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;
+    public var config(default, set):Config;
-  private var mapHeight(get, null):Float;
 
-  private var container:Sprite;
+    private var backgroundLayer:Sprite;
-  private var backgroundLayer:Sprite;
+    private var groundLayer:Sprite;
-  private var groundLayer:Sprite;
+    private var entryLayer:Sprite;
-  private var entryLayer:Sprite;
+    private var upLayer:Sprite;
-  private var upLayer:Sprite;
+    private var upperLayer:Sprite;
-  private var upperLayer:Sprite;
 
-  private var items:Map<Int, IRenderItem>;
+    private var items:Map<Int, IRenderItem>;
-  private var paused:Bool;
 
-  @:provide private static var animateManager:AnimateManager;
+    public function new() {
-
+        super();
-  public function new() {
+        items = new Map();
-    super();
+        backgroundLayer = new Sprite();
-    items = new Map();
+        groundLayer = new Sprite();
-    container = new Sprite();
+        entryLayer = new Sprite();
-    content.addChild(container);
+        upLayer = new Sprite();
-    backgroundLayer = new Sprite();
+        upperLayer = new Sprite();
-    groundLayer = new Sprite();
+        content.addChild(backgroundLayer);
-    entryLayer = new Sprite();
+        content.addChild(groundLayer);
-    upLayer = new Sprite();
+        content.addChild(entryLayer);
-    upperLayer = new Sprite();
+        content.addChild(upLayer);
-    container.addChild(backgroundLayer);
+        content.addChild(upperLayer);
-    container.addChild(groundLayer);
+        reset();
-    container.addChild(entryLayer);
-    container.addChild(upLayer);
-    container.addChild(upperLayer);
-    reset();
-  }
-
-  private function get_mapWidth():Float {
-    return config.map.cell.width * (gridSize != null ? gridSize.width : config.map.grid.width);
-  }
-
-  private function get_mapHeight():Float {
-    return config.map.cell.height * (gridSize != null ? gridSize.height : config.map.grid.height);
-  }
-
-  private function set_config(value:Config):Config {
-    config = value;
-    drawBackground();
-    toRedraw();
-    return config;
-  }
-
-  private function set_gridSize(value:GridSize):GridSize {
-    gridSize = value;
-    drawBackground();
-    toRedraw();
-    return gridSize;
-  }
-
-  private function drawBackground():Void {
-    var g:Graphics = backgroundLayer.graphics;
-    g.clear();
-    g.beginFill(0x000000);
-    g.lineStyle(2, 0xcccccc);
-    g.drawRect(0, 0, mapWidth, mapHeight);
-    g.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();
     }
-  }
 
-  private function onEnterFrame(event:Event):Void {
+    private function set_config(value:Config):Config {
-    if (!paused) {
+        config = value;
-      draw();
+        setContentSize(config.mapWidth, config.mapHeight);
-    }
-  }
-
-  private function clearLayer(layer:DisplayObjectContainer) {
-    while (layer.numChildren > 0) {
-      layer.removeChildAt(0);
-    }
-  }
-
-  public function reset():Void {
-    content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
-    for (item in items.iterator()) {
-      item.dispose();
-    }
-    items = new Map();
-    clearLayer(entryLayer);
-    clearLayer(groundLayer);
-    clearLayer(upLayer);
-    clearLayer(upperLayer);
-  }
-
-  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) {
+        return config;
-          var item:IRenderItem = new BrickRenderItem(brick.rect, brick.type);
-          var config = config.getBrick(brick.type);
-          items[brick.id] = item;
-          if (config.layer > 2) {
-            upLayer.addChild(item.view);
-          } else {
-            groundLayer.addChild(item.view);
-          }
-        }
-      case SPAWN(EAGLE(id, rect, teamId)):
-        var item = new EagleRenderItem(rect, config.getColor(new PlayerId(teamId, -1)));
-        items.set(id, item);
-        entryLayer.addChild(item.view);
-        item.update();
-      case SPAWN(TANK(id, rect, playerId, info)):
-        var item = new TankRenderItem(rect);
-        var tankConfig = config.getTank(info.type);
-        item.color = info.color;
-        item.skin = tankConfig.skin;
-        item.hits = info.hits;
-        item.bonus = info.bonus;
-        item.boat = info.boat;
-        item.name = info.name == null ? "" : info.name;
-        items.set(id, item);
-        entryLayer.addChild(item.view);
-        item.update();
-        playAnimate(item.rect.center, AnimateBundle.tankSpawn());
-      case SPAWN(BULLET(id, rect, playerId, skin, color)):
-        var item = new BulletRenderItem(rect);
-        item.color = color;
-        item.skin = skin;
-        items.set(id, item);
-        entryLayer.addChild(item.view);
-        item.update();
-      case SPAWN(BONUS(id, rect, type)):
-        var item = new BonusRenderItem(rect, type);
-        items.set(id, item);
-        upperLayer.addChild(item.view);
-        item.update();
-      case MOVE(EAGLE(id, position)):
-        if (items.exists(id)) {
-          var item = items[id];
-          item.move(position);
-        }
-      case MOVE(BULLET(id, position)):
-        if (items.exists(id)) {
-          var item = items[id];
-          item.move(position);
-        }
-      case MOVE(TANK(id, position)):
-        if (items.exists(id)) {
-          var item = items[id];
-          item.move(position);
-          cast(item, TankRenderItem).moves = true;
-        }
-      case STOP(TANK(id)):
-        if (items.exists(id)) {
-          var item = items[id];
-          cast(item, TankRenderItem).moves = false;
-        }
-      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)) {
-          var item:TankRenderItem = cast items[id];
-          item.protect = state;
-        }
-      case CHANGE(EAGLE_PROTECT(id, state)):
-        if (items.exists(id)) {
-          var item:EagleRenderItem = cast items[id];
-          item.protect = state;
-        }
-      case CHANGE(BRICK(id, type)):
-        if (items.exists(id)) {
-          var item:BrickRenderItem = cast items[id];
-          item.type = type;
-        }
-      case DESTROY(TANK(id, shot)):
-        if (items.exists(id)) {
-          var item = items[id];
-          entryLayer.removeChild(item.view);
-          playAnimate(item.rect.center, AnimateBundle.tankBoom());
-          showScore(item.rect.center, shot.score);
-          items.remove(id);
-        }
-      case DESTROY(BULLET(id)):
-        if (items.exists(id)) {
-          var item = items[id];
-          entryLayer.removeChild(item.view);
-          var rect = item.rect;
-          // move boom
-          var point = rect.center.add(new Point(rect.width * rect.direction.x, rect.height * rect.direction.y));
-          playAnimate(point, AnimateBundle.bulletBoom());
-          items.remove(id);
-        }
-      case DESTROY(EAGLE(id, shot)):
-        if (items.exists(id)) {
-          var item = items[id];
-          playAnimate(item.rect.center, AnimateBundle.tankBoom());
-          showScore(item.rect.center, shot.score);
-          cast(item, EagleRenderItem).death = true;
-        }
-      case DESTROY(BONUS(id, shot)):
-        if (items.exists(id)) {
-          var item = items[id];
-          upperLayer.removeChild(item.view);
-          showScore(item.rect.center, shot.score);
-          items.remove(id);
-        }
-      case DESTROY(CELL(id, x, y, shot)):
-        var item:BrickRenderItem = cast items.get(id);
-        item.destroyCell(x, y);
-      case DESTROY(BRICK(id, shot)):
-        var item:BrickRenderItem = cast items.get(id);
-        item.destroy();
-      case _:
     }
-    #if cpp
-    flash.Lib.current.stage.invalidate();
-    #end
-  }
 
-  private function playAnimate(point:Point, animate:OnceAnimate):Promise<Dynamic> {
+    private function drawBackground():Void {
-    animate.x = point.x - animate.width / 2;
+        var g:Graphics = backgroundLayer.graphics;
-    animate.y = point.y - animate.height / 2;
+        g.clear();
-    upperLayer.addChild(animate);
+        g.beginFill(0x000000);
-    return animate.play().then(function(animate:Animate):Void {
+        g.drawRect(0, 0, config.mapWidth, config.mapHeight);
-      // ToDo: clean animates on reset
+        g.endFill();
-      if (upperLayer.contains(animate)) {
+    }
-        upperLayer.removeChildSafety(animate);
+
-      }
+    public function draw():Void {
-      animate.dispose();
+        for (item in items) {
-    });
+            item.update();
-  }
+        }
-
+    }
-  private function showScore(point:Point, score:Null<Int>):Void {
+
-    if (score != null && score != 0) {
+    private function onEnterFrame(event:Event):Void {
-      var view:LabelView = new LabelView();
+        draw();
-      view.style = "text";
+    }
-      view.text = Std.string(score);
+
-      view.update();
+    private function clearLayer(layer:DisplayObjectContainer) {
-      view.redraw();
+        while (layer.numChildren > 0) layer.removeChildAt(0);
-      view.x = point.x - view.width / 2;
+    }
-      view.y = point.y - view.height / 2;
+
-      upperLayer.addChild(view.content);
+    public function reset():Void {
-      Timer.delay(function() upperLayer.removeChildSafety(view.content), 1000);
+        content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+        for (item in items.iterator()) {
+            item.dispose();
+        }
+        items = new Map();
+        clearLayer(entryLayer);
+        clearLayer(groundLayer);
+        clearLayer(upLayer);
+        clearLayer(upperLayer);
+    }
+
+    public function onGameEvent(event:GameEvent):Void {
+        switch event {
+            case START(_):
+                content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
+            case COMPLETE(_, _):
+                content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+            case SPAWN(BRICK(bricks)):
+                drawBackground();
+                for (brick in bricks) {
+                    var item:IRenderItem = new BrickRenderItem(brick.rect, brick.type);
+                    var config = config.getBrick(brick.type);
+                    items[brick.id] = item;
+                    if (config.layer > 2) {
+                        upLayer.addChild(item.view);
+                    } else {
+                        groundLayer.addChild(item.view);
+                    }
+                }
+            case SPAWN(EAGLE(id, rect, teamId)):
+                var item = new EagleRenderItem(rect, config.getColor(new PlayerId(teamId, -1)));
+                items.set(id, item);
+                entryLayer.addChild(item.view);
+                item.update();
+            case SPAWN(TANK(id, rect, playerId, info)):
+                var item = new TankRenderItem(rect);
+                var tankConfig = config.getTank(info.type);
+                item.color = info.color;
+                item.skin = tankConfig.skin;
+                item.hits = info.hits;
+                item.bonus = info.bonus;
+                item.name = info.name == null ? "" : info.name;
+                items.set(id, item);
+                entryLayer.addChild(item.view);
+                item.update();
+                playAnimate(item.rect.center, AnimateBundle.tankSpawn());
+            case SPAWN(BULLET(id, rect, playerId, piercing)):
+                var item = new BulletRenderItem(rect, piercing);
+                items.set(id, item);
+                entryLayer.addChild(item.view);
+                item.update();
+            case SPAWN(BONUS(id, rect, type)):
+                var item = new BonusRenderItem(rect, type);
+                items.set(id, item);
+                upperLayer.addChild(item.view);
+                item.update();
+            case MOVE(EAGLE(id, position)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    item.move(position);
+                }
+            case MOVE(BULLET(id, position)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    item.move(position);
+                }
+            case MOVE(TANK(id, position)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    item.move(position);
+                    cast(item, TankRenderItem).moves = true;
+                }
+            case STOP(TANK(id)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    cast(item, TankRenderItem).moves = false;
+                }
+            case CHANGE(TANK(id, type, hits, bonus)):
+                if (items.exists(id)) {
+                    var item:TankRenderItem = cast items[id];
+                    item.skin = config.getTank(type).skin;
+                    item.hits = hits;
+                    item.bonus = bonus;
+                }
+            case CHANGE(TANK_PROTECT(id, state)):
+                if (items.exists(id)) {
+                    var item:TankRenderItem = cast items[id];
+                    item.protect = state;
+                }
+            case CHANGE(EAGLE_PROTECT(id, state)):
+                if (items.exists(id)) {
+                    var item:EagleRenderItem = cast items[id];
+                    item.protect = state;
+                }
+            case CHANGE(BRICK(id, type)):
+                if (items.exists(id)) {
+                    var item:BrickRenderItem = cast items[id];
+                    item.type = type;
+                }
+            case DESTROY(TANK(id, shot)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    entryLayer.removeChild(item.view);
+                    playAnimate(item.rect.center, AnimateBundle.tankBoom());
+                    if (shot.score != 0) {
+                        showScore(item.rect.center, shot.score);
+                    }
+                    items.remove(id);
+                }
+            case DESTROY(BULLET(id)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    entryLayer.removeChild(item.view);
+                    var rect = item.rect;
+                    // move boom
+                    var point = rect.center.add(new Point(rect.width * rect.direction.x, rect.height * rect.direction.y));
+                    playAnimate(point, AnimateBundle.bulletBoom());
+                    items.remove(id);
+                }
+            case DESTROY(EAGLE(id, shot)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    playAnimate(item.rect.center, AnimateBundle.tankBoom());
+                    if (shot.score != 0) {
+                        showScore(item.rect.center, shot.score);
+                    }
+                    cast(item, EagleRenderItem).death = true;
+                }
+            case DESTROY(BONUS(id, shot)):
+                if (items.exists(id)) {
+                    var item = items[id];
+                    upperLayer.removeChild(item.view);
+                    if (shot.score != 0) {
+                        showScore(item.rect.center, shot.score);
+                    }
+                    items.remove(id);
+                }
+            case DESTROY(CELL(id, x, y, shot)):
+                var item:BrickRenderItem = cast items.get(id);
+                item.destroyCell(x, y);
+            case DESTROY(BRICK(id, shot)):
+                var item:BrickRenderItem = cast items.get(id);
+                item.destroy();
+            case _:
+        }
+        #if cpp
+        flash.Lib.current.stage.invalidate();
+        #end
+    }
+
+    private function playAnimate(point:Point, animate:OnceAnimate):Promise<Dynamic> {
+        animate.x = point.x - animate.width / 2;
+        animate.y = point.y - animate.height / 2;
+        upperLayer.addChild(animate);
+        return animate.play().then(function(animate:Animate):Void {
+            // ToDo: clean animates on reset
+            if (upperLayer.contains(animate)) {
+                upperLayer.removeChildSafety(animate);
+            }
+            animate.dispose();
+        });
+    }
+
+    private function showScore(point:Point, score:Int):Void {
+        var view:LabelView = new LabelView();
+        view.skinId = "text";
+        view.text = Std.string(score);
+        view.update();
+        view.redraw();
+        view.x = point.x - view.width / 2;
+        view.y = point.y - view.height / 2;
+        upperLayer.addChild(view.content);
+        Timer.delay(function() upperLayer.removeChildSafety(view.content), 1000);
     }
-  }
 }

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

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

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

@@ -4,29 +4,30 @@ import flash.display.Bitmap;
 import flash.display.BitmapData;
 import flash.display.DisplayObject;
 import flash.display.PixelSnapping;
+import openfl.Assets;
 import ru.m.geom.Rectangle;
 
 class BitmapRenderItem extends RenderItem {
-  public var image(default, set):BitmapData;
+    public var image(default, set):String;
 
-  private var bitmap:Bitmap;
+    private var bitmapData:BitmapData;
+    private var bitmap:Bitmap;
 
-  public function new(rect:Rectangle) {
+    public function new(rect:Rectangle) {
-    super(rect);
+        super(rect);
-    this.bitmap = new Bitmap(null, PixelSnapping.NEVER, false);
+        this.bitmap = new Bitmap(null, PixelSnapping.AUTO, true);
-  }
+    }
-
+
-  override private function get_view():DisplayObject {
+    override private function get_view():DisplayObject {
-    return bitmap;
+        return bitmap;
-  }
+    }
-
+
-  private function set_image(value:BitmapData):BitmapData {
+    private function set_image(value:String):String {
-    if (image != value) {
+        if (image != value) {
-      image = value;
+            image = value;
-      bitmap.bitmapData = image;
+            bitmapData = Assets.getBitmapData(image);
-      bitmap.width = rect.width;
+            bitmap.bitmapData = bitmapData;
-      bitmap.height = rect.height;
+        }
+        return image;
     }
-    return image;
-  }
 }

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

@@ -4,31 +4,31 @@ 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;
+    public var type(default, set):BonusType;
-  private var alpha = 1.0;
+    private var d = -0.05;
+    private var alpha = 1.0;
 
-  public function new(rect:Rectangle, type:BonusType) {
+    public function new(rect:Rectangle, type:BonusType) {
-    super(rect);
+        super(rect);
-    this.type = type;
+        this.type = type;
-    move(rect.position);
+        move(rect.position);
-  }
-
-  private function set_type(value:BonusType):BonusType {
-    if (type != value) {
-      type = value;
-      image = RenderUtil.bonusImage(type);
     }
-    return type;
-  }
 
-  override public function update():Void {
+    private function set_type(value:BonusType):BonusType {
-    super.update();
+        if (type != value) {
-    alpha += d;
+            type = value;
-    view.alpha = alpha;
+            image = 'resources/image/bonus/${type}.png';
-    if (alpha <= 0 || alpha >= 1.5) {
+        }
-      d = -d;
+        return type;
+    }
+
+    override public function update():Void {
+        super.update();
+        alpha += d;
+        view.alpha = alpha;
+        if (alpha <= 0 || alpha >= 1.5) {
+            d = -d;
+        }
     }
-  }
 }

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

@@ -1,113 +1,91 @@
 package ru.m.tankz.render.item;
 
 import flash.display.BitmapData;
+import flash.display.Shape;
 import openfl.Assets;
-import ru.m.geom.GridPoint;
+import openfl.display.DisplayObject;
+import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
-import ru.m.tankz.Type;
+import ru.m.tankz.Type.BrickType;
 
-class BrickBitmapBundle {
+enum BrickState {
-  private var data:Map<String, BitmapData>;
+    UNBROKEN;
-
+    BROKEN;
-  public function new() {
+    DESTROYED;
-    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 BitmapRenderItem {
+class BrickRenderItem extends RenderItem {
-  private static var bundle:BrickBitmapBundle = new BrickBitmapBundle();
 
-  public var type(default, set):BrickType;
+    public var type(default, set):BrickType;
+    public var state(get, never):BrickState;
 
-  private var cells:Array<GridPoint>;
+    private var image:BitmapData;
+    private var shape:Shape;
+    private var cells:Array<Point>;
 
-  private var frames:Int;
+    public function new(rect:Rectangle, type:BrickType) {
-  private var currentFrame:Int;
+        super(rect);
-  private var ticks:Int;
+        this.shape = new Shape();
-
+        cells = [
-  private static function buildCells():Array<GridPoint> {
+            new Point(0, 0),
-    return [
+            new Point(0, 1),
-      new GridPoint(0, 0),
+            new Point(1, 0),
-      new GridPoint(0, 1),
+            new Point(1, 1),
-      new GridPoint(1, 0),
+        ];
-      new GridPoint(1, 1),
+        this.type = type;
-    ];
+        move(rect.position);
-  }
-
-  public function new(rect:Rectangle, type:BrickType) {
-    super(rect);
-    cells = buildCells();
-    this.frames = 1;
-    this.currentFrame = 0;
-    this.ticks = 0;
-    this.type = type;
-    move(rect.position);
-  }
-
-  private function set_type(value:BrickType):BrickType {
-    if (type != value) {
-      type = value;
-      frames = switch type {
-        case "water": 2;
-        case _: 1;
-      }
-      cells = buildCells();
-      redraw();
     }
-    return type;
-  }
 
-  public function destroyCell(x:Int, y:Int):Void {
+    private function get_state():BrickState {
-    cells = cells.filter(function(point) return !(point.x == x && point.y == y));
+        return switch cells.length {
-    redraw();
+            case 0: DESTROYED;
-  }
+            case 4: UNBROKEN;
-
+            case _: BROKEN;
-  public function destroy():Void {
-    cells = [];
-    redraw();
-  }
-
-  public function redraw():Void {
-    image = bundle.get(type, cells, currentFrame);
-  }
-
-  override public function update():Void {
-    super.update();
-    if (frames > 1) {
-      if (++ticks >= 30) {
-        ticks = 0;
-        currentFrame++;
-        if (currentFrame >= frames) {
-          currentFrame = 0;
         }
+    }
+
+    override private function get_view():DisplayObject {
+        return shape;
+    }
+
+    private function set_type(value:BrickType):BrickType {
+        if (type != value) {
+            type = value;
+            image = Assets.getBitmapData('resources/image/map/${type}.png');
+            redraw();
+        }
+        return type;
+    }
+
+    public function destroyCell(x:Int, y:Int):Void {
+        cells = cells.filter(function(point) return !(point.x == x && point.y == y));
         redraw();
-      }
     }
-  }
+
+    public function destroy():Void {
+        cells = [];
+        redraw();
+    }
+
+    public function redraw():Void {
+        shape.graphics.clear();
+        if (type == "none") return;
+        switch state {
+            case UNBROKEN:
+                shape.graphics.beginBitmapFill(image);
+                shape.graphics.drawRect(0, 0, rect.width, rect.height);
+                shape.graphics.endFill();
+            case BROKEN:
+                shape.graphics.beginBitmapFill(image);
+                for (point in cells) {
+                    var x = point.x * (rect.width / 2);
+                    var y = point.y * (rect.width / 2);
+                    var width = rect.width / 2;
+                    var height = rect.height / 2;
+                    shape.graphics.drawRect(x, y, width, height);
+                }
+                shape.graphics.endFill();
+            case DESTROYED:
+        }
+    }
 }

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

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

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

@@ -2,56 +2,57 @@ package ru.m.tankz.render.item;
 
 import flash.display.DisplayObject;
 import flash.display.Sprite;
-import hw.color.Color;
+import haxework.color.Color;
-import hw.view.utils.BitmapUtil;
+import haxework.view.utils.BitmapUtil;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
 class EagleRenderItem extends BitmapRenderItem {
-  public var color(default, default):Color;
+    public var color(default, default):Color;
-  public var death(default, set):Bool = true;
+    public var death(default, set):Bool = true;
-  public var protect(default, set):Bool;
+    public var protect(default, set):Bool;
 
-  private var container:Sprite;
+    private var container:Sprite;
-  private var protectView:Animate;
+    private var protectView:Animate;
 
-  public function new(rect:Rectangle, color:Color) {
+    public function new(rect:Rectangle, color:Color) {
-    super(rect);
+        super(rect);
-    this.color = color;
+        this.color = color;
-    container = new Sprite();
+        container = new Sprite();
-    container.addChild(bitmap);
+        container.addChild(bitmap);
-    protectView = AnimateBundle.tankProtect();
+        protectView = AnimateBundle.tankProtect();
-    protectView.visible = false;
+        protectView.visible = false;
-    container.addChild(protectView);
+        container.addChild(protectView);
-    death = false;
+        death = false;
-    move(rect.position);
+        move(rect.position);
-  }
-
-  override private function get_view():DisplayObject {
-    return container;
-  }
-
-  private function set_protect(value:Bool):Bool {
-    if (protect != value) {
-      protect = value;
-      if (protect) {
-        protectView.x = (image.width - protectView.frames[0].image.width) / 2;
-        protectView.y = (image.height - protectView.frames[0].image.height) / 2;
-      }
-      protectView.visible = protect;
-      protectView.playing = protect;
     }
-    return protect;
-  }
 
-  private function set_death(value:Bool):Bool {
+    override private function get_view():DisplayObject {
-    if (death != value) {
+        return container;
-      death = value;
+    }
-      image = RenderUtil.eagleImage(death);
+
-      if (!color.zero) {
+    private function set_protect(value:Bool):Bool {
-        bitmap.bitmapData = image = BitmapUtil.colorize(image, color);
+        if (protect != value) {
-      }
+            protect = value;
+            if (protect) {
+                protectView.x = (bitmapData.width - protectView.frames[0].image.width) / 2;
+                protectView.y = (bitmapData.height - protectView.frames[0].image.height) / 2;
+            }
+            protectView.visible = protect;
+            protectView.playing = protect;
+        }
+        return protect;
+    }
+
+    private function set_death(value:Bool):Bool {
+        if (death != value) {
+            death = value;
+            var suffix = death ? '-death' : '';
+            image = 'resources/image/eagle/eagle${suffix}.png';
+            if (!color.zero) {
+                bitmap.bitmapData = bitmapData = BitmapUtil.colorize(bitmapData, color);
+            }
+        }
+        return death;
     }
-    return death;
-  }
 }

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

@@ -5,9 +5,9 @@ import ru.m.geom.Position;
 import ru.m.geom.Rectangle;
 
 interface IRenderItem {
-  public var view(get, null):DisplayObject;
+    public var view(get, null):DisplayObject;
-  public var rect(default, null):Rectangle;
+    public var rect(default, null):Rectangle;
-  public function move(position:Position):Void;
+    public function move(position:Position):Void;
-  public function update():Void;
+    public function update():Void;
-  public function dispose():Void;
+    public function dispose():Void;
 }

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

@@ -5,51 +5,42 @@ 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;
 
-  public var rect(default, null):Rectangle;
+    public var view(get, null):DisplayObject;
+    public var content(get, null):DisplayObject;
 
-  public function new(rect:Rectangle) {
+    public var rect(default, null):Rectangle;
-    this.rect = rect.clone();
-  }
 
-  private function get_view():DisplayObject {
+    public function new(rect:Rectangle) {
-    throw "Not Implemented";
+        this.rect = rect.clone();
-  }
-
-  private function get_content():DisplayObject {
-    return null;
-  }
-
-  public function move(position:Position):Void {
-    view.x = rect.x = position.x;
-    view.y = rect.y = position.y;
-    if (position.direction != null) {
-      rect.direction = position.direction;
-      if (content != null) {
-        content.rotation = rect.direction.angle;
-        content.x = -rect.width * (rect.direction.x + 1) / 2
-          + rect.width * (rect.direction.y + 1) / 2
-          + 0.5 * rect.width;
-        content.y = -rect.height * (rect.direction.x + 1) / 2
-          - rect.height * (rect.direction.y + 1) / 2
-          + 1.5 * rect.height;
-      } else {
-        view.rotation = rect.direction.angle;
-        view.x = rect.x
-          - rect.width * (rect.direction.x + 1) / 2
-          + rect.width * (rect.direction.y + 1) / 2
-          + 0.5 * rect.width;
-        view.y = rect.y
-          - rect.height * (rect.direction.x + 1) / 2
-          - rect.height * (rect.direction.y + 1) / 2
-          + 1.5 * rect.height;
-      }
     }
-  }
 
-  public function update():Void {}
+    private function get_view():DisplayObject {
+        throw "Not Implemented";
+    }
 
-  public function dispose():Void {}
+    private function get_content():DisplayObject {
+        return null;
+    }
+
+    public function move(position:Position):Void {
+        view.x = rect.x = position.x;
+        view.y = rect.y = position.y;
+        if (position.direction != null) {
+            rect.direction = position.direction;
+            if (content != null) {
+                content.rotation = rect.direction.angle;
+                content.x = - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
+                content.y = - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
+            } else {
+                view.rotation = rect.direction.angle;
+                view.x = rect.x - rect.width * (rect.direction.x + 1) / 2 + rect.width * (rect.direction.y + 1) / 2 + 0.5 * rect.width;
+                view.y = rect.y - rect.height * (rect.direction.x + 1) / 2 - rect.height * (rect.direction.y + 1) / 2 + 1.5 * rect.height;
+            }
+        }
+    }
+
+    public function update():Void {}
+
+    public function dispose():Void {}
 }

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

@@ -2,172 +2,149 @@ package ru.m.tankz.render.item;
 
 import flash.display.BitmapData;
 import flash.display.DisplayObject;
-import flash.display.Shape;
 import flash.display.Sprite;
 import flash.text.TextField;
 import flash.text.TextFieldAutoSize;
 import flash.text.TextFormat;
-import hw.color.Color;
+import haxework.color.Color;
-import hw.text.BitmapTextField;
+import haxework.text.BitmapTextField;
-import hw.view.theme.ITheme;
+import haxework.view.utils.BitmapUtil;
-import hw.view.utils.BitmapUtil;
+import openfl.Assets;
 import ru.m.animate.Animate;
 import ru.m.geom.Rectangle;
 
 class TankRenderItem extends BitmapRenderItem {
-  public var color(default, default):Color;
+    public var color(default, default):Color;
-  public var skin(default, set):String;
+    public var skin(default, set):String;
-  public var hits(default, set):Int;
+    public var hits(default, set):Int;
-  public var bonus(default, set):Bool;
+    public var bonus(default, set):Bool;
-  public var boat(default, set):Bool;
+    public var moves(default, set):Bool;
-  public var moves(default, set):Bool;
+    public var protect(default, set):Bool;
-  public var protect(default, set):Bool;
+    public var name(default, set):String;
-  public var name(default, set):String;
 
-  private var container:Sprite;
+    private var container:Sprite;
-  private var images:Array<BitmapData>;
+    private var images:Array<BitmapData>;
-  private var frame:Int;
+    private var frame:Int;
-  private var protectView:Animate;
+    private var protectView:Animate;
-  private var boatView:Shape;
+    private var nameView:TextField;
-  private var nameView:TextField;
 
-  @:provide static var theme:ITheme;
+    public function new(rect:Rectangle) {
-
+        super(rect);
-  public function new(rect:Rectangle) {
+        container = new Sprite();
-    super(rect);
+        container.addChild(bitmap);
-    container = new Sprite();
+        protectView = AnimateBundle.tankProtect();
-    container.addChild(bitmap);
+        protectView.visible = false;
-    protectView = AnimateBundle.tankProtect();
+        container.addChild(protectView);
-    protectView.visible = false;
+        nameView = buildNameView();
-    container.addChild(protectView);
+        container.addChild(nameView);
-    boatView = buildBoatView();
+        move(rect.position);
-    boatView.visible = false;
-    container.addChild(boatView);
-    nameView = buildNameView();
-    container.addChild(nameView);
-    move(rect.position);
-  }
-
-  private function buildNameView():TextField {
-    var result = new BitmapTextField();
-    result.defaultTextFormat = new TextFormat(theme.font.name, 10, 0xffffff);
-    result.embedFonts = theme.font.embed;
-    result.autoSize = TextFieldAutoSize.LEFT;
-    result.shadowColor = 0x000000;
-    result.stroke = true;
-    return result;
-  }
-
-  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;
-  }
-
-  override private function get_content():DisplayObject {
-    return bitmap;
-  }
-
-  private function redraw():Void {
-    var image1 = RenderUtil.tankImage(skin, 0);
-    var image2 = RenderUtil.tankImage(skin, 1);
-    var color1:Color = switch hits {
-      case 1: 0x869C43;
-      case 2: 0xDEAF80;
-      case 3: 0x5EA67A;
-      case _: color;
     }
-    var color2:Color = color1;
-    if (bonus) {
-      color1 = 0xff00aa;
-    }
-    if (!color1.zero) {
-      image1 = BitmapUtil.colorize(image1, color1);
-    }
-    if (!color1.zero) {
-      image2 = BitmapUtil.colorize(image2, color2);
-    }
-    images = [for (i in 0...6) image1].concat([for (i in 0...6) image2]);
-    frame = 0;
-    bitmap.bitmapData = images[frame];
-  }
 
-  private function set_skin(value:String):String {
+    private function buildNameView():TextField {
-    if (skin != value) {
+        var result = new BitmapTextField();
-      skin = value;
+        result.defaultTextFormat = new TextFormat(Style.fontFamily, 10, 0xffffff);
-      redraw();
+        result.embedFonts = Style.fontEmbed;
+        result.autoSize = TextFieldAutoSize.LEFT;
+        result.shadowColor = 0x000000;
+        result.stroke = true;
+        return result;
     }
-    return skin;
-  }
 
-  private function set_hits(value:Int):Int {
+    override private function get_view():DisplayObject {
-    if (hits != value) {
+        return container;
-      hits = value;
-      redraw();
     }
-    return hits;
-  }
 
-  private function set_bonus(value:Bool):Bool {
+    override private function get_content():DisplayObject {
-    if (bonus != value) {
+        return bitmap;
-      bonus = value;
-      redraw();
     }
-    return bonus;
-  }
 
-  private function set_boat(value:Bool):Bool {
+    private function redraw():Void {
-    if (boat != value) {
+        var image1 = Assets.getBitmapData('resources/image/tank/${skin}-0.png');
-      boat = value;
+        var image2 = Assets.getBitmapData('resources/image/tank/${skin}-1.png');
-      boatView.visible = boat;
+        var color1:Color = switch hits {
-    }
+            case 1: 0x869C43;
-    return boat;
+            case 2: 0xDEAF80;
-  }
+            case 3: 0x5EA67A;
-
+            case _: color;
-  private function set_protect(value:Bool):Bool {
+        }
-    if (protect != value) {
+        var color2:Color = color1;
-      protect = value;
+        if (bonus) {
-      if (protect) {
+            color1 = 0xff00aa;
-        protectView.x = (images[0].width - protectView.frames[0].image.width) / 2;
+        }
-        protectView.y = (images[0].height - protectView.frames[0].image.height) / 2;
+        if (!color1.zero) {
-      }
+            image1 = BitmapUtil.colorize(image1, color1);
-      protectView.visible = protect;
+        }
-      protectView.playing = protect;
+        if (!color1.zero) {
-    }
+            image2 = BitmapUtil.colorize(image2, color2);
-    return protect;
+        }
-  }
+        images = [for (i in 0...6) image1].concat([for (i in 0...6) image2]);
-
-  private function set_moves(value:Bool):Bool {
-    if (moves != value) {
-      moves = value;
-      bitmap.bitmapData = images[0];
-    }
-    return moves;
-  }
-
-  private function set_name(value:String):String {
-    if (name != value) {
-      name = value;
-      nameView.text = name;
-      nameView.x = (rect.width - nameView.width) / 2;
-      nameView.y = -nameView.height / 2; // (rect.height - nameView.height) / 2;
-    }
-    return name;
-  }
-
-  override public function update():Void {
-    super.update();
-    if (moves) {
-      frame++;
-      if (frame >= images.length) {
         frame = 0;
-      }
+        bitmap.bitmapData = images[frame];
-      bitmap.bitmapData = images[frame];
+    }
+
+    private function set_skin(value:String):String {
+        if (skin != value) {
+            skin = value;
+            redraw();
+        }
+        return skin;
+    }
+
+    private function set_hits(value:Int):Int {
+        if (hits != value) {
+            hits = value;
+            redraw();
+        }
+        return hits;
+    }
+
+    private function set_bonus(value:Bool):Bool {
+        if (bonus != value) {
+            bonus = value;
+            redraw();
+        }
+        return bonus;
+    }
+
+    private function set_protect(value:Bool):Bool {
+        if (protect != value) {
+            protect = value;
+            if (protect) {
+                protectView.x = (images[0].width - protectView.frames[0].image.width) / 2;
+                protectView.y = (images[0].height - protectView.frames[0].image.height) / 2;
+            }
+            protectView.visible = protect;
+            protectView.playing = protect;
+        }
+        return protect;
+    }
+
+    private function set_moves(value:Bool):Bool {
+        if (moves != value) {
+            moves = value;
+            bitmap.bitmapData = images[0];
+        }
+        return moves;
+    }
+
+    private function set_name(value:String):String {
+        if (name != value) {
+            name = value;
+            nameView.text = name;
+            nameView.x = (rect.width - nameView.width) / 2;
+            nameView.y = -nameView.height / 2; //(rect.height - nameView.height) / 2;
+        }
+        return name;
+    }
+
+    override public function update():Void {
+        super.update();
+        if (moves) {
+            frame++;
+            if (frame > images.length - 1) {
+                frame = 0;
+            }
+            bitmap.bitmapData = images[frame];
+        }
     }
-  }
 }

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

@@ -9,120 +9,120 @@ import ru.m.tankz.config.Config;
 import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.IGame;
 
-@:provide class SoundManager implements GameListener {
+class SoundManager implements GameListener {
-  private static var TAG(default, never):String = "SoundManager";
+    private static var TAG(default, never):String = "SoundManager";
 
-  #if flash
+    #if flash
-  private static var type:String = "mp3";
+    private static var type:String = "mp3";
-  #else
+    #else
-  private static var type:String = "ogg";
+    private static var type:String = "ogg";
-  #end
+    #end
 
-  public var config(default, default):Config;
+    public var config(default, default):Config;
-  public var volume(default, set):Float = 1;
+    public var volume(default, set):Float = 1;
-  public var mute(default, set):Bool = false;
+    public var mute(default, set):Bool = false;
 
-  private var channels:Array<SoundChannel>;
+    private var channels:Array<SoundChannel>;
-  private var transform:SoundTransform;
+    private var transform:SoundTransform;
 
-  private var humanTanks:Array<Int>;
+    private var humanTanks:Array<Int>;
-  private var humanBullets:Array<Int>;
+    private var humanBullets:Array<Int>;
-  private var liveBonuses:Array<Int>;
+    private var liveBonuses:Array<Int>;
 
-  public function new() {
+    public function new() {
-    channels = [];
+        channels = [];
-    updateSoundTransform();
+        updateSoundTransform();
-  }
-
-  private function updateSoundTransform():Void {
-    transform = new SoundTransform(mute ? 0 : volume);
-    for (channel in channels) {
-      channel.soundTransform = transform;
     }
-  }
 
-  private function set_volume(value:Float):Float {
+    private function updateSoundTransform():Void {
-    if (volume != value) {
+        transform = new SoundTransform(mute ? 0 : volume);
-      volume = value;
+        for (channel in channels) {
-      updateSoundTransform();
+            channel.soundTransform = transform;
-    }
-    return volume;
-  }
-
-  private function set_mute(value:Bool):Bool {
-    if (mute != value) {
-      mute = value;
-      updateSoundTransform();
-    }
-    return mute;
-  }
-
-  public function play(id:String):Void {
-    // L.d(TAG, 'play: ${id}');
-    var sound:Sound = Assets.getSound('resources/sounds/${id}.${type}');
-    if (sound != null) {
-      var channel = sound.play(0, 0, transform);
-      channel.addEventListener(Event.SOUND_COMPLETE, onSoundComplete);
-      channels.push(channel);
-    } else {
-      L.w(TAG, 'Sound "${id}" not found');
-    }
-  }
-
-  public function stopAll():Void {
-    for (channel in channels) {
-      channel.stop();
-    }
-    channels = [];
-  }
-
-  private function onSoundComplete(event:Event):Void {
-    channels.remove(event.currentTarget);
-  }
-
-  public function onGameEvent(event:GameEvent):Void {
-    switch event {
-      case START(_):
-        play("start");
-        humanTanks = [];
-        liveBonuses = [];
-        humanBullets = [];
-      case SPAWN(BULLET(id, _, playerId, _)):
-        if (config.isHuman(playerId)) {
-          play("shot");
-          humanBullets.push(id);
         }
-      case SPAWN(TANK(id, _, playerId, _)):
+    }
-        if (config.isHuman(playerId)) {
+
-          humanTanks.push(id);
+    private function set_volume(value:Float):Float {
+        if (volume != value) {
+            volume = value;
+            updateSoundTransform();
         }
-      case SPAWN(BONUS(id, _, type)):
+        return volume;
-        play("bonus_add");
+    }
-        if (type == "live") {
+
-          liveBonuses.push(id);
+    private function set_mute(value:Bool):Bool {
+        if (mute != value) {
+            mute = value;
+            updateSoundTransform();
         }
-      case HIT(TANK(_, _)):
+        return mute;
-        play("bullet_hit");
+    }
-      case HIT(CELL(_, _, shot)):
+
-        if (humanBullets.indexOf(shot.bulletId) > -1) {
+    public function play(id:String):Void {
-          // play("bullet_block");
+        //L.d(TAG, 'play: ${id}');
-        }
+        var sound:Sound = Assets.getSound('resources/sounds/${id}.${type}');
-      case DESTROY(TANK(id, _)):
+        if (sound != null) {
-        if (humanTanks.indexOf(id) > -1) {
+            var channel = sound.play(0, 0, transform);
-          play("boom_player");
+            channel.addEventListener(Event.SOUND_COMPLETE, onSoundComplete);
+            channels.push(channel);
         } else {
-          play("boom_bot");
+            L.w(TAG, 'Sound "${id}" not found');
+        }
+    }
+
+    public function stopAll():Void {
+        for (channel in channels) {
+            channel.stop();
+        }
+        channels = [];
+    }
+
+    private function onSoundComplete(event:Event):Void {
+        channels.remove(event.currentTarget);
+    }
+
+    public function onGameEvent(event:GameEvent):Void {
+        switch event {
+            case START(_):
+                play("start");
+                humanTanks = [];
+                liveBonuses = [];
+                humanBullets = [];
+            case SPAWN(BULLET(id, _, playerId, _)):
+                if (config.isHuman(playerId)) {
+                    play("shot");
+                    humanBullets.push(id);
+                }
+            case SPAWN(TANK(id, _, playerId, _)):
+                if (config.isHuman(playerId)) {
+                    humanTanks.push(id);
+                }
+            case SPAWN(BONUS(id, _, type)):
+                play("bonus_add");
+                if (type == "live") {
+                    liveBonuses.push(id);
+                }
+            case HIT(TANK(_, _)):
+                play("bullet_hit");
+            case HIT(CELL(_, _, shot)):
+                if (humanBullets.indexOf(shot.bulletId) > -1) {
+                    //play("bullet_block");
+                }
+            case DESTROY(TANK(id, _)):
+                if (humanTanks.indexOf(id) > -1) {
+                    play("boom_player");
+                } else {
+                    play("boom_bot");
+                }
+            case DESTROY(EAGLE(_, _)):
+                play("boom_player");
+            case DESTROY(BONUS(id, _)):
+                play("bonus_get");
+                if (liveBonuses.indexOf(id) > -1) {
+                    play("live");
+                } else {
+                    play("bonus_get");
+                }
+            case _:
         }
-      case DESTROY(EAGLE(_, _)):
-        play("boom_player");
-      case DESTROY(BONUS(id, _)):
-        // play("bonus_get");
-        if (liveBonuses.indexOf(id) > -1) {
-          play("live");
-        } else {
-          play("bonus_get");
-        }
-      case _:
     }
-  }
 }

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

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

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

@@ -1,20 +1,21 @@
 package ru.m.tankz.storage;
 
-import hw.storage.SharedObjectStorage;
+import haxework.storage.SharedObjectStorage;
 
-@:provide class NetworkStorage extends SharedObjectStorage {
+class NetworkStorage extends SharedObjectStorage {
-  public var user(get, set):User;
 
-  public function new() {
+    public var user(get, set):User;
-    super("network");
-  }
 
-  private inline function get_user():User {
+    public function new() {
-    return read("user");
+        super("network");
-  }
+    }
 
-  private inline function set_user(value:User):User {
+    private inline function get_user():User {
-    write("user", value);
+        return read("user");
-    return value;
+    }
-  }
+
+    private inline function set_user(value:User):User {
+        write("user", value);
+        return value;
+    }
 }

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

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

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

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

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

@@ -1,45 +1,85 @@
 package ru.m.tankz.view;
 
+import ru.m.tankz.game.IGame;
+import flash.events.KeyboardEvent;
 import flash.ui.Keyboard;
-import hw.resources.IResources;
+import haxework.resources.IResources;
-import hw.view.frame.FrameSwitcher;
+import haxework.view.ButtonView;
-import hw.view.group.VGroupView;
+import haxework.view.frame.FrameSwitcher;
-import ru.m.control.DeviceAction;
+import haxework.view.LabelView;
-import ru.m.control.DeviceType;
+import haxework.view.VGroupView;
-import ru.m.control.IControlBus;
 import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
+import ru.m.tankz.view.popup.LoginPopup;
 
 @:template class ClientView extends VGroupView {
-  @:view("switcher") var switcherView:FrameSwitcher;
+    @:view("switcher") var switcherView:FrameSwitcher;
+    @:view var username:LabelView;
+    @:view("login") var loginButton:ButtonView;
+    @:view("logout") var logoutButton:ButtonView;
 
-  @:provide var network:NetworkManager;
+    @:provide var network:NetworkManager;
-  @:provide var resources:IResources;
+    @:provide var resources:IResources;
-  @:provide var switcher:FrameSwitcher;
+    @:provide var switcher:FrameSwitcher;
-  @:provide var soundManager:SoundManager;
+    @:provide var soundManager:SoundManager;
+    @:provide var game:IGame;
 
-  @:provide static var bus:IControlBus;
+    public function init():Void {
-
+        resources.text.put('version', '${Const.VERSION}');
-  public function new():Void {
+        switcher = switcherView;
-    super();
+        network.stateSignal.connect(onConnectionState);
-    resources.text.put('version', '${Const.VERSION}');
+        onConnectionState(network.state);
-    resources.text.put('name', '${Const.NAME}');
+    }
-    switcher = switcherView;
+
-  }
+    public function launch():Void {
-
+        content.stage.stageFocusRect = false;
-  public function launch():Void {
+        content.stage.addEventListener(KeyboardEvent.KEY_UP, function(event:KeyboardEvent):Void {
-    content.stage.stageFocusRect = false;
+            switch event.keyCode {
-    bus.signal.connect(onDeviceAction);
+                case Keyboard.ESCAPE:
-    switcher.change(MenuFrame.ID);
+                    switcher.change(StartFrame.ID);
-  }
+                case Keyboard.M:
-
+                    soundManager.mute = !soundManager.mute;
-  private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
+                case Keyboard.P:
-    switch [type, action, state] {
+                    if (game != null) {
-      case [KEYBOARD, KEY(Keyboard.ESCAPE), true]:
+                        game.pause = !game.pause;
-        switcher.change(MenuFrame.ID);
+                    }
-      case [KEYBOARD, KEY(Keyboard.M), true]:
+            }
-        soundManager.mute = !soundManager.mute;
+        });
-      case _:
+        switcher.change(StartFrame.ID);
+    }
+
+    private function onConnectionState(state:ConnectionState):Void {
+        L.d("ClientView", 'onConnectionState: ${state}');
+        switch state {
+            case ONLINE(user):
+                username.text = user.name;
+                logoutButton.visible = true;
+                loginButton.visible = false;
+            case CONNECTED:
+                username.text = "";
+                logoutButton.visible = false;
+                loginButton.visible = true;
+            case ERROR(error):
+                //L.e("ClientView", 'onConnectionState: ERROR', error);
+                L.w("ClientView", 'onConnectionState: ERROR');
+            case _:
+                username.text = "";
+                logoutButton.visible = false;
+                loginButton.visible = false;
+        }
+    }
+
+    private function login():Void {
+        LoginPopup.instance.show().then(function(user:User):Void {
+            L.d("Login", 'user: $user');
+        });
+    }
+
+    private function logout():Void {
+        network.logout();
+    }
+
+    private function close():Void {
+        switcher.change(StartFrame.ID);
     }
-  }
 }

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

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

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

@@ -1,193 +1,94 @@
 package ru.m.tankz.view;
 
-import hw.view.text.TextView;
+import haxe.ds.Option;
-import ru.m.tankz.view.popup.PausePopup;
+import haxework.view.frame.FrameSwitcher;
-import flash.ui.Keyboard;
+import haxework.view.VGroupView;
-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;
-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;
-import ru.m.tankz.local.LocalGame;
+import ru.m.tankz.network.NetworkManager;
-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.Type;
-import ru.m.tankz.view.gamepad.GamepadView;
+import ru.m.tankz.view.game.GameView;
-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 VGroupView implements GameListener {
+    public static inline var ID = "game";
 
-@:template class GameFrame extends FrameView<GameInit> implements GameListener {
+    private static inline var TAG = "GameFrame";
-  public static inline var ID = "game";
 
-  private static inline var TAG = "GameFrame";
+    @:view("game") private var gameView(default, null):GameView;
 
-  @:provide static var soundManager:SoundManager;
+    @:provide var network:NetworkManager;
-  @:provide static var switcher:FrameSwitcher;
+    @:provide var soundManager:SoundManager;
-  @:provide static var gameStorage:GameStorage;
+    @:provide var state:GameState;
-  @:provide static var settings:SettingsStorage;
+    @:provide var record:GameRecord;
-  @:provide static var bus:IControlBus;
+    @:provide("next") var nextState:GameState;
+    @:provide var switcher:FrameSwitcher;
+    @:provide var gameStorage:GameStorage;
 
-  @:view private var render:IRender;
+    @:provide var game:IGame;
-  @:view private var teams:DataView<TeamState, TeamView>;
-  @:view private var level:TextView;
-  @:view private var gamepad(default, null):GamepadView;
 
-  private var gamepadPlayerId:PlayerId;
+    public function onShow():Void {
-
+        gameView.type = game.type;
-  private var game:IGame;
+        soundManager.config = game.config;
-  private var recorder:GameRecord;
+        gameView.render.config = game.config;
-
+        game.connect(gameView.render);
-  public function new() {
+        game.connect(soundManager);
-    super(id, new DefaultLayout());
+        if (gameView.panel != null) {
-    bus.connect(gamepad);
+            game.connect(gameView.panel);
-  }
+        }
-
+        game.connect(this);
-  override public function onShow(data:GameInit):Void {
+        game.start();
-    gamepad.visible = false;
-    game = switch data {
-      case LOCAL(start): new LocalGame(start);
-      case NETWORK(network): new NetworkGame(network);
-      case RECORD(record): new GamePlayer(record);
     }
-    soundManager.config = game.config;
-    render.config = game.config;
-    game.connect(render);
-    game.connect(soundManager);
-    game.connect(this);
-    game.start();
-    // TODO:
-    for (control in game.controls) {
-      if (Std.is(control, HumanControl)) {
-        if (cast(control, HumanControl).hasDevice(SCREEN)) {
-          gamepadPlayerId = control.playerId;
-          gamepad.visible = true;
-          break;
-        }
-      }
-    }
-    bus.signal.connect(onDeviceAction);
-  }
 
-  private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
+    private function stop():Void {
-    switch [type, action, state] {
+        if (game != null) {
-      case [KEYBOARD, KEY(Keyboard.P), true]:
+            game.dispose();
-        game.pause = !game.pause;
+            game = null;
-      case _:
+        }
+        gameView.render.reset();
     }
-  }
 
-  private function stop():Void {
+    public function onGameEvent(event:GameEvent):Void {
-    bus.signal.disconnect(onDeviceAction);
+        switch event {
-    if (game != null) {
+            case GameEvent.COMPLETE(state, winner):
-      game.dispose();
+                this.state = state;
-      game = null;
+                nextState = switch next(winner) {
+                    case Some(s):
+                        // ToDo:
+                        var progress = gameStorage.get(game.type);
+                        progress.completeLevel(state.levelId, state.presetId);
+                        gameStorage.set(progress);
+                        s;
+                    case None:
+                        null;
+                }
+                stop();
+                switcher.change(ResultFrame.ID);
+            case _:
+        }
     }
-    render.reset();
-  }
 
-  private function findTeamView(id:TeamId):Null<TeamView> {
+    // ToDo:
-    for (view in teams.dataViews) {
+    private function next(winner:TeamId):Option<GameState> {
-      if (view.teamId == id) {
+        for (rule in game.config.game.complete) {
-        return view;
+            if (rule.team != null && rule.team != winner) {
-      }
+                return Option.None;
-    }
-    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):
+        var level = state.levelId + 1;
-        stop();
+        if (level >= game.config.game.levels) level = 0;
-        switcher.change(ResultFrame.ID, result);
+        return Option.Some(new GameState(game.type, state.presetId, level, state));
-      case _:
     }
-  }
 
-  override public function onHide():Void {
+    public function onHide():Void {
-    stop();
+        stop();
-    soundManager.stopAll();
+        soundManager.stopAll();
-  }
+    }
+
+    public function close():Void {
+        switcher.change(LevelFrame.ID);
+    }
 }

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

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

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

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

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

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

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

@@ -1,94 +0,0 @@
-package ru.m.tankz.view;
-
-import hw.view.data.DataView;
-import hw.view.form.ButtonView;
-import hw.view.frame.FrameSwitcher;
-import hw.view.frame.FrameView;
-import ru.m.tankz.bundle.ILevelBundle;
-import ru.m.tankz.game.GameInit;
-import ru.m.tankz.game.GameState;
-import ru.m.tankz.network.NetworkManager;
-import ru.m.tankz.storage.SettingsStorage;
-import ru.m.tankz.Type;
-import ru.m.tankz.view.common.PackView;
-import ru.m.tankz.view.network.RoomFrame;
-import ru.m.tankz.view.network.RoomListFrame;
-import ru.m.tankz.view.popup.LoginPopup;
-import ru.m.update.Updater;
-
-using ru.m.tankz.view.ViewUtil;
-
-@:template class MenuFrame extends FrameView<Dynamic> {
-  public static var ID(default, never):String = "menu";
-
-  @:provide static var gameInit:GameInit;
-  @:provide static var switcher:FrameSwitcher;
-  @:provide static var network:NetworkManager;
-  @:provide static var appUpdater:Updater;
-  @:provide static var levelBundle:ILevelBundle;
-  @:provide static var settings:SettingsStorage;
-
-  @:view var packs:DataView<PackId, PackView>;
-  @:view("update") var updateButton:ButtonView;
-  @:view("network") var networkButton:ButtonView;
-
-  public function new() {
-    super(ID);
-  }
-
-  override public function onShow(data:Dynamic):Void {
-    super.onShow(data);
-    appUpdater.check().then(function(update:Bool) {
-      updateButton.visible = update;
-      if (update) {
-        updateButton.text = 'Update ${appUpdater.bundle.version}';
-      }
-    }).catchError(function(error) {});
-    var list = levelBundle.list();
-    list.sort(function(a:PackId, b:PackId) return a.toPackLabel() > b.toPackLabel() ? 1 : -1);
-    packs.data = list;
-    networkButton.visible = settings.enableNetwork;
-    settings.signal.connect(onSettingChange);
-  }
-
-  override public function onHide():Void {
-    super.onHide();
-    settings.signal.disconnect(onSettingChange);
-  }
-
-  private function onSettingChange(setting:Setting):Void {
-    switch setting {
-      case ENABLE_NETWORK(value):
-        networkButton.visible = value;
-      case _:
-    }
-  }
-
-  private function startGame(packId:PackId):Void {
-    gameInit = LOCAL({state: new GameState(packId.type), level: null});
-    switcher.change(LevelFrame.ID, packId);
-  }
-
-  private function startNetwork():Void {
-    switch network.state {
-      case ONLINE(user):
-        if (network.room != null) {
-          switcher.change(RoomFrame.ID, network.room);
-          network.joinGame(network.room.game.id, true);
-        } else {
-          switcher.change(RoomListFrame.ID);
-        }
-      case CONNECTED:
-        LoginPopup.instance.show().then(function(user):Void {
-          if (user != null) {
-            switcher.change(RoomListFrame.ID);
-          }
-        });
-      case _:
-    }
-  }
-
-  private function appUpdate():Void {
-    appUpdater.download();
-  }
-}