build(ansible): remove ansible

.editorconfig

@@ -8,5 +8,6 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[*.yaml]
+[*.md]
-indent_size = 2
+max_line_length = off
+trim_trailing_whitespace = false

.env.default

@@ -19,3 +19,6 @@ DOCKER_PROJECTS=(
 DOCKER_ARGS=(
     "PROJECT_NAME=$PROJECT"
 )
+
+NEKO_SDK="$SDK_PATH/neko/2.2.0"
+HAXE_SDK="$SDK_PATH/haxe/4.2.5"

ansible/ansible.cfg

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

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

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

ansible/group_vars/all.yml

@@ -1,15 +0,0 @@
----
-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: develop
-deploy_npm: yes
-
-service_name: "{{ project_name }}"
-service_work_dir: "{{ deploy_current_dir }}/target/server/cpp"
-service_command: "{{ service_work_dir }}/{{ project_name }} {{ service_host }}"
-service_user: www-data
-service_control_user: "{{ project_user }}"

ansible/prod/inventory.yml

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

ansible/requirements.yml

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

ansible/roles/build/defaults/main.yml

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

ansible/roles/build/tasks/main.yml

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

ansible/roles/service/defaults/main.yml

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

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

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

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

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

ansible/roles/setup/tasks/main.yml

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

ansible/roles/user/keys/shmyga.pub

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

ansible/roles/user/tasks/main.yml

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

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

ansible/service.yml

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

ansible/setup.yml

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

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

ansible/vars/barin.yml

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

hxformat.json

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

package.json

@@ -11,7 +11,7 @@
     "yargs": "^13.2.4"
   },
   "haxeDependencies": {
-    "haxework": "2.1.0",
+    "haxework": "2.1.1",
     "lime": "8.0.0",
     "openfl": "9.2.0",
     "hxcpp": "4.2.1",

scripts/format

@@ -2,6 +2,7 @@
 set -e
 cd "$(dirname $(dirname "$0"))" || exit
 
+source .env
 source $NEKO_SDK/activate
 source $HAXE_SDK/activate
 haxelib install formatter

scripts/lint

@@ -2,6 +2,7 @@
 set -e
 cd "$(dirname $(dirname "$0"))" || exit
 
+source .env
 source $NEKO_SDK/activate
 source $HAXE_SDK/activate
 haxelib install formatter

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

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

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

@@ -5,52 +5,51 @@ 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>;
 
-    public var playing(default, default):Bool;
+  private var sequence:Array<BitmapData>;
-    public var frames(default, set):Array<Frame>;
+  private var index:Int;
 
-    private var sequence:Array<BitmapData>;
+  @:provide private static var manager:AnimateManager;
-    private var index:Int;
 
-    @:provide private static var manager:AnimateManager;
+  public function new(?frames:Array<Frame>) {
+    super(null, PixelSnapping.AUTO, true);
+    this.frames = frames == null ? [] : frames;
+    manager.add(this);
+  }
 
-    public function new(?frames:Array<Frame>) {
+  public function set_frames(value:Array<Frame>):Array<Frame> {
-        super(null, PixelSnapping.AUTO, true);
+    sequence = [];
-        this.frames = frames == null ? [] : frames;
+    index = 0;
-        manager.add(this);
+    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_frames(value:Array<Frame>):Array<Frame> {
+  public function update():Void {
-        sequence = [];
+    if (++index >= sequence.length) {
-        index = 0;
+      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;
     }
+    var nextBitmapData = sequence[index];
+    x -= (nextBitmapData.width - bitmapData.width) / 2;
+    y -= (nextBitmapData.height - bitmapData.height) / 2;
+    bitmapData = nextBitmapData;
+  }
 
-    public function update():Void {
+  public function dispose():Void {
-        if (++index >= sequence.length) {
+    manager.remove(this);
-            index = 0;
+  }
-        }
-        var nextBitmapData = sequence[index];
-        x -= (nextBitmapData.width - bitmapData.width) / 2;
-        y -= (nextBitmapData.height - bitmapData.height) / 2;
-        bitmapData = nextBitmapData;
-    }
-
-    public function dispose():Void {
-        manager.remove(this);
-    }
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,56 +7,55 @@ 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>;
 
-    public var type(default, null):DeviceType;
+  private var joystick:Joystick;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
+  private var axisState:Map<Int, Direction>;
 
-    private var joystick:Joystick;
+  public function new(joystick:Joystick) {
-    private var axisState:Map<Int, Direction>;
+    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);
+  }
 
-    public function new(joystick:Joystick) {
+  private function onButtonDown(code:Int):Void {
-        this.joystick = joystick;
+    signal.emit(KEY(code), true);
-        type = GAMEPAD(joystick.id);
+  }
-        signal = new Signal2();
+
-        axisState = new Map();
+  private function onButtonUp(code:Int):Void {
-        joystick.onButtonDown.add(onButtonDown);
+    signal.emit(KEY(code), false);
-        joystick.onButtonUp.add(onButtonUp);
+  }
-        joystick.onAxisMove.add(onAxisMove);
+
+  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) {
-    private function onButtonDown(code:Int):Void {
+      axisState.set(axis, direction);
-        signal.emit(KEY(code), true);
+      signal.emit(DIRECTION(direction), true);
+    } else if (position == 0) {
+      if (axisState.exists(axis)) {
+        signal.emit(DIRECTION(axisState.get(axis)), false);
+        axisState.remove(axis);
+      }
     }
+  }
 
-    private function onButtonUp(code:Int):Void {
+  public function dispose():Void {
-        signal.emit(KEY(code), false);
+    if (joystick != null) {
-    }
+      joystick.onButtonDown.remove(onButtonDown);
-
+      joystick.onButtonUp.remove(onButtonUp);
-    private function onAxisMove(axis:Int, position:Float):Void {
+      joystick.onAxisMove.remove(onAxisMove);
-        var direction:Direction = switch [axis, position] {
+      joystick = null;
-            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

@@ -6,33 +6,32 @@ 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>;
 
-    public var type(default, null):DeviceType;
+  private var stage:Stage;
-    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);
+  }
 
-    public function new(stage:Stage) {
+  private function onKeyDown(event:KeyboardEvent):Void {
-        this.stage = stage;
+    signal.emit(KEY(event.keyCode), true);
-        type = DeviceType.KEYBOARD;
+  }
-        signal = new Signal2();
+
-        stage.addEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
+  private function onKeyUp(event:KeyboardEvent):Void {
-        stage.addEventListener(KeyboardEvent.KEY_UP, onKeyUp);
+    signal.emit(KEY(event.keyCode), false);
-    }
+  }
-
+
-    private function onKeyDown(event:KeyboardEvent):Void {
+  public function dispose():Void {
-        signal.emit(KEY(event.keyCode), true);
+    if (stage != null) {
-    }
+      stage.removeEventListener(KeyboardEvent.KEY_DOWN, onKeyDown);
-
+      stage.removeEventListener(KeyboardEvent.KEY_UP, onKeyUp);
-    private function onKeyUp(event:KeyboardEvent):Void {
+      stage = null;
-        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,19 +4,18 @@ import flash.display.DisplayObject;
 import flash.display.DisplayObjectContainer;
 
 class DisplayObjectContainerExtender {
+  public static function childrenIterator():Iterator<DisplayObject> {
+    throw "Not implemented";
+  }
 
-    public static function childrenIterator():Iterator<DisplayObject> {
+  public static function removeChildSafety(self:DisplayObjectContainer, child:DisplayObject):DisplayObject {
-        throw "Not implemented";
+    if (self.contains(child)) {
+      return self.removeChild(child);
     }
+    return null;
+  }
 
-    public static function removeChildSafety(self:DisplayObjectContainer, child:DisplayObject):DisplayObject {
+  public static function containsRecursivle(child:DisplayObject):Bool {
-        if (self.contains(child)) {
+    throw "Not implemented";
-            return self.removeChild(child);
+  }
-        }
-        return null;
-    }
-
-    public static function containsRecursivle(child:DisplayObject):Bool {
-        throw "Not implemented";
-    }
 }

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

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

@@ -15,186 +15,164 @@ 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 static var COLORS(default, never):ThemeColors = {
+  public function new() {
-        light: 0x95937D,
+    super({embed: true}, COLORS, {base: "3h", big: "4h", veryBig: "4.5h"});
-        dark: 0x777564,
+  }
-        text: 0xE7E0BB,
-        active: 0xFFFF00,
-    }
 
-    public function new() {
+  override private function reload():Void {
-        super({embed: true}, COLORS, {base: "3h", big: "4h", veryBig: "4.5h"});
+    super.reload();
-    }
+    register(new Style("light", ["skin.background.color" => colors.light,]));
 
-    override private function reload():Void {
+    register(new Style("dark", ["skin.background.color" => colors.dark,]));
-        super.reload();
-        register(new Style("light", [
-            "skin.background.color" => colors.light,
-        ]));
 
-        register(new Style("dark", [
+    register(new Style("font", ["_" => null,], ["text"]));
-            "skin.background.color" => colors.dark,
-        ]));
 
-        register(new Style("font", [
+    register(new Style("text.header", [
-            "_" => null,
+      "font.size" => fontSize.big,
-        ], ["text"]));
+      "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("text.header", [
+    register(new Style("button.menu", [
-            "font.size" => fontSize.big,
+      "font.size" => fontSize.big,
-            "font.align" => TextFormatAlign.CENTER,
+      "geometry.padding" => Box.fromFloat(0),
-            "skin.background.color" => Color.fromInt(0x000000),
+      "geometry.width" => SizeValue.fromInt(250),
-            "skin.background.alpha" => 0.1,
+      "geometry.height" => SizeValue.fromInt(50),
-            "skin.border.color" => colors.light,
+    ], ["button"]));
-            "geometry.padding" => Box.fromArray([50, 8]),
-            "geometry.margin" => Box.fromArray([0, 0, 30, 30]),
-        ], ["text"]));
 
-        register(new Style("button.menu", [
+    register(new Style("button.small", [
-            "font.size" => fontSize.big,
+      "font.size" => SizeValue.fromString("3h"),
-            "geometry.padding" => Box.fromFloat(0),
+      "geometry.padding" => Box.fromArray([8, 2]),
-            "geometry.width" => SizeValue.fromInt(250),
+      "skin.round" => 5,
-            "geometry.height" => SizeValue.fromInt(50),
+    ], ["button"]));
-        ], ["button"]));
 
-        register(new Style("button.small", [
+    register(new Style("text.box", [
-            "font.size" => SizeValue.fromString("3h"),
+      "skin.background.color" => Color.fromInt(0x000000),
-            "geometry.padding" => Box.fromArray([8, 2]),
+      "skin.background.alpha" => 0.1,
-            "skin.round" => 5,
+      "skin.border.color" => colors.light,
-        ], ["button"]));
+      "geometry.padding" => Box.fromArray([15, 8]),
+    ], ["text"]));
 
-        register(new Style("text.box", [
+    register(new Style("text.box.active", [
-            "skin.background.color" => Color.fromInt(0x000000),
+      "skin.background.color" => Color.fromInt(0x55aa55),
-            "skin.background.alpha" => 0.1,
+      "skin.background.alpha" => 1,
-            "skin.border.color" => colors.light,
+      "skin.border.color" => Color.fromInt(0x88dd88),
-            "geometry.padding" => Box.fromArray([15, 8]),
+    ], ["text.box"]));
-        ], ["text"]));
 
-        register(new Style("text.box.active", [
+    register(new Style("button.level", [
-            "skin.background.color" => Color.fromInt(0x55aa55),
+      "font.size" => fontSize.big,
-            "skin.background.alpha" => 1,
+      "geometry.width" => SizeValue.fromString("12h"),
-            "skin.border.color" => Color.fromInt(0x88dd88),
+      "geometry.height" => SizeValue.fromString("12h"),
-        ], ["text.box"]));
+      "geometry.padding" => Box.fromFloat(0),
+    ], ["button"]));
 
-        register(new Style("button.level", [
+    register(new Style("container", [
-            "font.size" => fontSize.big,
+      "geometry.width" => SizeValue.fromString("100%"),
-            "geometry.width" => SizeValue.fromString("12h"),
+      "geometry.height" => SizeValue.fromString("100%"),
-            "geometry.height" => SizeValue.fromString("12h"),
+      "layout.hAlign" => HAlign.CENTER,
-            "geometry.padding" => Box.fromFloat(0),
+      "layout.vAlign" => VAlign.MIDDLE,
-        ], ["button"]));
+    ], ["dark"]));
 
-        register(new Style("container", [
+    register(new Style("panel", [
-            "geometry.width" => SizeValue.fromString("100%"),
+      "geometry.width" => SizeValue.fromString("100%"),
-            "geometry.height" => SizeValue.fromString("100%"),
+      "geometry.padding" => Box.fromArray([20, 10]),
-            "layout.hAlign" => HAlign.CENTER,
+      "layout.vAlign" => VAlign.MIDDLE,
-            "layout.vAlign" => VAlign.MIDDLE,
+    ], ["light"]));
-        ], ["dark"]));
 
-        register(new Style("panel", [
+    register(new Style("panel_button",
-            "geometry.width" => SizeValue.fromString("100%"),
+      ["font.size" => fontSize.big, "geometry.height" => SizeValue.fromString("100%"),], ["button"]));
-            "geometry.padding" => Box.fromArray([20, 10]),
-            "layout.vAlign" => VAlign.MIDDLE,
-        ], ["light"]));
 
-        register(new Style("panel_button", [
+    register(new Style("window", ["geometry.padding" => Box.fromFloat(2),], ["dark", "border"]));
-            "font.size" => fontSize.big,
-            "geometry.height" => SizeValue.fromString("100%"),
-        ], ["button"]));
 
-        register(new Style("window", [
+    register(new Style("line", [
-            "geometry.padding" => Box.fromFloat(2),
+      "geometry.width" => SizeValue.fromString("100%"),
-        ], ["dark", "border"]));
+      "geometry.height" => SizeValue.fromInt(2),
+    ], ["border"]));
 
-        register(new Style("line", [
+    register(new Style("window.close", [
-            "geometry.width" => SizeValue.fromString("100%"),
+      "skin" => function() return new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"),
-            "geometry.height" => SizeValue.fromInt(2),
+        colors.light),
-        ], ["border"]));
+      "geometry.width" => SizeValue.fromString("8h"),
+      "geometry.height" => SizeValue.fromString("8h"),
+    ]));
 
-        register(new Style("window.close", [
+    register(new Style("icon.tank", [
-            "skin" => function() return new ButtonSVGSkin(Assets.getText("resources/image/icon/window-close-solid.svg"), colors.light),
+      "geometry.width" => SizeValue.fromString("6h"),
-            "geometry.width" => SizeValue.fromString("8h"),
+      "geometry.height" => SizeValue.fromString("6h"),
-            "geometry.height" => SizeValue.fromString("8h"),
+      "skin.fillType" => FillType.CONTAIN,
-        ]));
+    ]));
 
-        register(new Style("icon.tank", [
+    var green:Color = 0x00ff00;
-            "geometry.width" => SizeValue.fromString("6h"),
+    var red:Color = 0xff0000;
-            "geometry.height" => SizeValue.fromString("6h"),
+    register(new Style("result.winner", [
-            "skin.fillType" => FillType.CONTAIN,
+      "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,]));
 
-        var green:Color = 0x00ff00;
+    register(new Style("button.pack", [
-        var red:Color = 0xff0000;
+      "geometry.width" => SizeValue.fromString("35h"),
-        register(new Style("result.winner", [
+      "geometry.height" => SizeValue.fromString("20h"),
-            "skin.border.color" => green,
+      "geometry.padding" => Box.fromFloat(5),
-            "skin.border.alpha" => 0.5,
+      "layout.hAlign" => HAlign.CENTER,
-            "skin.border.thickness" => 5,
+      "layout.vAlign" => VAlign.MIDDLE,
-            "skin.round" => 10,
+      "content.buttonMode" => true,
-        ], ["light"]));
+      "content.mouseChildren" => false,
-        register(new Style("result.loser", [
+      "skin.round" => 15,
-            "skin.border.color" => red,
+    ], ["border", "light"]));
-            "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", [
+    register(new Style("button.menu", ["geometry.padding" => Box.fromArray([20, 10]),]));
-            "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", [
+    registerButton("settings", "cog-solid.svg");
-            "geometry.padding" => Box.fromArray([20, 10]),
+    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("settings", "cog-solid.svg");
+    registerButton("keyboard", "keyboard-light.svg", true);
-        registerButton("close", "times-circle-solid.svg");
+    registerButton("backspace", "backspace-light.svg", true);
-        registerButton("next", "arrow-alt-circle-right-solid.svg");
+    registerButton("tablet-android-alt", "tablet-android-alt-light.svg", true);
-        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);
+    register(new Style("gamepad", ["skin.color" => colors.text, "skin.activeColor" => colors.active,]));
-        registerButton("backspace", "backspace-light.svg", true);
-        registerButton("tablet-android-alt", "tablet-android-alt-light.svg", true);
 
-        register(new Style("gamepad", [
+    register(new Style("render", ["skin.background.color" => colors.dark,]));
-            "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),
-        ]));
-    }
 
+  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

@@ -12,49 +12,49 @@ 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;
+  @:provide private static var settings:SettingsStorage;
 
-    public static function main() {
+  public static function main() {
-        L.push(new TraceLogger());
+    L.push(new TraceLogger());
-        #if flash
+    #if flash
-        L.push(new hw.log.JSLogger());
+    L.push(new hw.log.JSLogger());
-        #end
+    #end
-        #if debug
+    #if debug
-        //L.push(new hw.log.SocketLogger());
+    // L.push(new hw.log.SocketLogger());
-        #end
+    #end
-        // ToDo: fix @:provide macro
+    // ToDo: fix @:provide macro
-        PopupManager;
+    PopupManager;
-        LoaderManager;
+    LoaderManager;
-        GameStorage;
+    GameStorage;
-        AnimateManager;
+    AnimateManager;
-        //
+    //
-        Const.init();
+    Const.init();
-        Init.init();
+    Init.init();
-        // TODO:
+    // TODO:
-        // Animate.bind(Lib.current.stage);
+    // Animate.bind(Lib.current.stage);
-        L.d(TAG, 'Debug: ${Const.DEBUG}');
+    L.d(TAG, 'Debug: ${Const.DEBUG}');
-        L.i(TAG, 'Version: ${Const.VERSION}');
+    L.i(TAG, 'Version: ${Const.VERSION}');
-        L.i(TAG, 'Build: ${Const.BUILD}');
+    L.i(TAG, 'Build: ${Const.BUILD}');
-        L.i(TAG, 'Mobile: ${Device.isMobile()}');
+    L.i(TAG, 'Mobile: ${Device.isMobile()}');
-        #if linux
+    #if linux
-        LinuxIcon.apply();
+    LinuxIcon.apply();
-        #end
+    #end
-        var view:ClientView = new ClientView();
+    var view:ClientView = new ClientView();
-        Root.bind(view);
+    Root.bind(view);
-        view.launch();
+    view.launch();
 
-        var fps = new openfl.display.FPS(0, 0, 0x00ff00);
+    var fps = new openfl.display.FPS(0, 0, 0x00ff00);
-        fps.visible = settings.displayFPS;
+    fps.visible = settings.displayFPS;
-        Lib.current.addChild(fps);
+    Lib.current.addChild(fps);
 
-        settings.signal.connect(function(setting) {
+    settings.signal.connect(function(setting) {
-           switch setting {
+      switch setting {
-               case DISPLAY_FPS(value):
+        case DISPLAY_FPS(value):
-                   fps.visible = value;
+          fps.visible = value;
-               case _:
+        case _:
-           }
+      }
-        });
+    });
-    }
+  }
 }

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

@@ -4,17 +4,17 @@ 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 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");
+    NAME = Lib.current.stage.application.meta.get("name");
-        DEBUG = Capabilities.isDebugger;
+    DEBUG = Capabilities.isDebugger;
-    }
+  }
 }

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

@@ -23,56 +23,56 @@ import ru.m.tankz.proto.pack.Response;
 import ru.m.update.Updater;
 
 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;
 
-    @:provide static var theme:ITheme;
+  private static function buildConnection():IConnection<Request, Response> {
-    @:provide static var levelBundle:ILevelBundle;
+    var host:String = CompilationOption.get("host");
-    @:provide static var configBundle:IConfigBundle;
+    var port:Int = CompilationOption.get("port");
-    @:provide static var popupManager:PopupManager;
+    L.d("Init", 'connect to $host:$port');
-    @:provide static var connection:IConnection<Request, Response>;
+    #if flash
-    @:provide static var bus:IControlBus;
+    return new ru.m.connect.flash.FlashConnection<Request, Response>(host, port, Response);
-    @:provide static var updater:Updater;
+    #elseif html5
+    return new ru.m.connect.js.JsConnection<Request, Response>(host,
+      port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
+    #else
+    return new ru.m.connect.desktop.DesktopConnection<Request, Response>(host, port, Response);
+    #end
+  }
 
-    private static function buildConnection():IConnection<Request, Response> {
+  public static function init():Void {
-        var host:String = CompilationOption.get("host");
+    theme = new AppTheme();
-        var port:Int = CompilationOption.get("port");
+    levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage());
-        L.d("Init", 'connect to $host:$port');
+    levelBundle.load();
-        #if flash
+    configBundle = new ConfigBundle();
-        return new ru.m.connect.flash.FlashConnection<Request, Response>(host, port, Response);
+
-        #elseif html5
+    popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v, 100);
-        return new ru.m.connect.js.JsConnection<Request, Response>(host, port + (ru.m.connect.js.JsConnection.isSecured() ? 1 : 0), Response);
+    popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v, 100);
-        #else
+
-        return new ru.m.connect.desktop.DesktopConnection<Request, Response>(host, port, Response);
+    connection = buildConnection();
-        #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);
+    });
 
-    public static function init():Void {
+    for (device in Joystick.devices) {
-        theme = new AppTheme();
+      bus.connect(new JoystickDevice(device));
-        levelBundle = new CachedLevelBundle(new ClientLevelSource(), new SharedObjectStorage());
-        levelBundle.load();
-        configBundle = new ConfigBundle();
-
-        popupManager.showAnimateFactory = function(v) return new UnFadeAnimate(v, 100);
-        popupManager.closeAnimateFactory = function(v) return new FadeAnimate(v, 100);
-
-        connection = buildConnection();
-
-        bus = new ControlBus();
-        bus.connect(new KeyboardDevice(Lib.current.stage));
-
-        updater = new Updater(Const.VERSION, "https://shmyga.ru/repo/tankz/packages.json");
-
-        for (device in Gamepad.devices) {
-            trace('gamepad', device);
-        }
-        Gamepad.onConnect.add(function(device) {
-            trace('connect gamepad', device);
-        });
-
-        for (device in Joystick.devices) {
-            bus.connect(new JoystickDevice(device));
-        }
-        Joystick.onConnect.add(function(device) {
-            bus.connect(new JoystickDevice(device));
-        });
     }
+    Joystick.onConnect.add(function(device) {
+      bus.connect(new JoystickDevice(device));
+    });
+  }
 }

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

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

@@ -9,134 +9,132 @@ import hw.view.geometry.Size;
 import ru.m.tankz.AppTheme;
 
 class Progress extends Sprite {
+  public var color(default, set):Int = 0;
+  public var backColor(default, set):Int = 0;
+  public var progress(default, set):Float = 0;
+  public var size(default, set):Size = [0, 0];
+  public var radius(get, null):Float;
 
-    public var color(default, set):Int = 0;
+  private var maskShape:Shape;
-    public var backColor(default, set):Int = 0;
+  private var toRedraw:Bool;
-    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 function new() {
-    private var toRedraw:Bool;
+    super();
+    maskShape = new Shape();
+    addChild(maskShape);
+    mask = maskShape;
+  }
 
-    public function new() {
+  private inline function get_radius():Float {
-        super();
+    return Math.min(size.width, size.height) / 2;
-        maskShape = new Shape();
+  }
-        addChild(maskShape);
+
-        mask = maskShape;
+  private function set_color(value:Int):Int {
+    if (color != value) {
+      color = value;
+      toRedraw = true;
     }
+    return color;
+  }
 
-    private inline function get_radius():Float {
+  private function set_backColor(value:Int):Int {
-        return Math.min(size.width, size.height) / 2;
+    if (backColor != value) {
+      backColor = value;
+      toRedraw = true;
     }
+    return color;
+  }
 
-    private function set_color(value:Int):Int {
+  private function set_progress(value:Float):Float {
-        if (color != value) {
+    if (progress != value) {
-            color = value;
+      progress = value;
-            toRedraw = true;
+      toRedraw = true;
-        }
-        return color;
     }
+    return progress;
+  }
 
-    private function set_backColor(value:Int):Int {
+  private function set_size(value:Size):Size {
-        if (backColor != value) {
+    if (size != value) {
-            backColor = value;
+      size = value;
-            toRedraw = true;
+      toRedraw = true;
-        }
-        return color;
     }
+    return size;
+  }
 
-    private function set_progress(value:Float):Float {
+  public function update():Void {
-        if (progress != value) {
+    if (toRedraw) {
-            progress = value;
+      redraw();
-            toRedraw = true;
+      redrawMask();
-        }
+      toRedraw = false;
-        return progress;
     }
+  }
 
-    private function set_size(value:Size):Size {
+  public function redraw():Void {
-        if (size != value) {
+    graphics.clear();
-            size = value;
+    graphics.beginFill(color);
-            toRedraw = true;
+    graphics.drawCircle(radius, radius, radius);
-        }
+    graphics.beginFill(backColor);
-        return size;
+    graphics.drawCircle(radius, radius, radius / 2);
-    }
+    graphics.endFill();
+  }
 
-    public function update():Void {
+  public function redrawMask():Void {
-        if (toRedraw) {
+    maskShape.graphics.clear();
-            redraw();
+    maskShape.graphics.beginFill(0x00ff00);
-            redrawMask();
+    maskShape.graphics.moveTo(radius, radius);
-            toRedraw = false;
+    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) {
-    public function redraw():Void {
+      lineToRadians(progress * (Math.PI * 2) + rotation);
-        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;
 
-    private var progress:Progress;
+  public function new() {
+    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);
+  }
 
-    public function new() {
+  private function onResize(event:Event):Void {
-        super();
+    progress.x = (Lib.current.stage.stageWidth - progress.size.width) / 2;
-        Lib.current.stage.color = AppTheme.COLORS.light;
+    progress.y = (Lib.current.stage.stageHeight - progress.size.height) / 2;
-        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 {
+  private function onEnterFrame(event:Event):Void {
-        progress.x = (Lib.current.stage.stageWidth - progress.size.width) / 2;
+    progress.update();
-        progress.y = (Lib.current.stage.stageHeight - progress.size.height) / 2;
+  }
-    }
 
-    private function onEnterFrame(event:Event):Void {
+  private function onProgress(event:ProgressEvent):Void {
-        progress.update();
+    progress.progress = event.bytesLoaded / event.bytesTotal;
-    }
+  }
 
-    private function onProgress(event:ProgressEvent):Void {
+  private function onComplete(event:Event):Void {
-        progress.progress = event.bytesLoaded / event.bytesTotal;
+    progress.update();
-    }
+    Lib.current.stage.removeEventListener(Event.RESIZE, onResize);
-
+    Lib.current.stage.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
-    private function onComplete(event:Event):Void {
+    Lib.current.stage.removeEventListener(ProgressEvent.PROGRESS, onProgress);
-        progress.update();
+    removeEventListener(Event.COMPLETE, onComplete);
-        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/bundle/ClientLevelSource.hx

@@ -8,26 +8,25 @@ import ru.m.tankz.Type;
 import ru.m.tankz.util.LevelUtil;
 
 class ClientLevelSource implements ILevelSource {
+  public function new() {}
 
-    public function new() {}
+  public function resolveMeta(id:PackId):LevelPackMeta {
+    var bytes = Assets.getBytes('level/${id}.zip');
+    return LevelUtil.getMeta(bytes);
+  }
 
-    public function resolveMeta(id:PackId):LevelPackMeta {
+  public function resolve(id:PackId):LevelPack {
-        var bytes = Assets.getBytes('level/${id}.zip');
+    var bytes = Assets.getBytes('level/${id}.zip');
-        return LevelUtil.getMeta(bytes);
+    return LevelUtil.unpack(bytes);
-    }
+  }
-
+
-    public function resolve(id:PackId):LevelPack {
+  public function list():Array<PackId> {
-        var bytes = Assets.getBytes('level/${id}.zip');
+    var result = [];
-        return LevelUtil.unpack(bytes);
+    for (path in Assets.list(AssetType.BINARY)) {
-    }
+      if (StringTools.startsWith(path, "level")) {
-
+        result.push(PackId.fromString(path.split("/").pop().split(".").shift()));
-    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;
     }
+    return result;
+  }
 }

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

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

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

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

@@ -13,106 +13,105 @@ import ru.m.tankz.Type;
 using haxe.EnumTools.EnumValueTools;
 
 class HumanControl extends Control {
+  @:provide static var storage:SettingsStorage;
+  @:provide static var bus:IControlBus;
 
-    @:provide static var storage:SettingsStorage;
+  private var binding:Map<DeviceType, Map<DeviceAction, TankAction>>;
-    @:provide static var bus:IControlBus;
 
-    private var binding:Map<DeviceType, Map<DeviceAction, TankAction>>;
+  private var moveQueue:Array<Direction>;
+  private var shotTimers:Map<Int, Timer>;
 
-    private var moveQueue:Array<Direction>;
+  public function new(playerId:PlayerId, controlIndex:Int) {
-    private var shotTimers:Map<Int, Timer>;
+    super(playerId);
-
+    var config = storage.getBinding(controlIndex);
-    public function new(playerId:PlayerId, controlIndex:Int) {
+    binding = new Map();
-        super(playerId);
+    for (action in config.keys()) {
-        var config = storage.getBinding(controlIndex);
+      var bind = config.get(action);
-        binding = new Map();
+      if (!binding.exists(bind.device)) {
-        for (action in config.keys()) {
+        binding.set(bind.device, new Map());
-            var bind = config.get(action);
+      }
-            if (!binding.exists(bind.device)) {
+      binding.get(bind.device).set(bind.action, action);
-                binding.set(bind.device, new Map());
-            }
-            binding.get(bind.device).set(bind.action, action);
-        }
-        moveQueue = [];
-        shotTimers = new Map();
     }
+    moveQueue = [];
+    shotTimers = new Map();
+  }
 
-    public function hasDevice(device:DeviceType):Bool {
+  public function hasDevice(device:DeviceType):Bool {
-        for (d in binding.keys()) {
+    for (d in binding.keys()) {
-            if (d.equals(device)) {
+      if (d.equals(device)) {
-                return true;
+        return true;
-            }
+      }
-        }
-        return false;
     }
+    return false;
+  }
 
-    private function onDeviceAction(device:DeviceType, action:DeviceAction, on:Bool):Void {
+  private function onDeviceAction(device:DeviceType, action:DeviceAction, on:Bool):Void {
-        if (binding.exists(device) && binding[device].exists(action)) {
+    if (binding.exists(device) && binding[device].exists(action)) {
-            toggleAction(binding[device][action], on);
+      toggleAction(binding[device][action], on);
-        }
     }
+  }
 
-    override public function start():Void {
+  override public function start():Void {
-        super.start();
+    super.start();
-        bus.signal.connect(onDeviceAction);
+    bus.signal.connect(onDeviceAction);
+  }
+
+  override public function stop():Void {
+    super.stop();
+    bus.signal.disconnect(onDeviceAction);
+    moveQueue = [];
+    for (timer in shotTimers) {
+      timer.stop();
     }
+    shotTimers = new Map();
+  }
 
-    override public function stop():Void {
+  public function toggleAction(action:TankAction, on:Bool):Void {
-        super.stop();
+    switch action {
-        bus.signal.disconnect(onDeviceAction);
+      case TankAction.MOVE(direction):
-        moveQueue = [];
+        if (on) {
-        for (timer in shotTimers) {
+          if (moveQueue.indexOf(direction) == -1) {
-            timer.stop();
+            moveQueue.unshift(direction);
-        }
+          }
-        shotTimers = new Map();
-    }
-
-    public function toggleAction(action:TankAction, on:Bool):Void {
-        switch action {
-            case TankAction.MOVE(direction):
-                if (on) {
-                    if (moveQueue.indexOf(direction) == -1) {
-                        moveQueue.unshift(direction);
-                    }
-                } else {
-                    moveQueue.remove(direction);
-                }
-                updateMove();
-            case TankAction.SHOT(weapon):
-                if (on) {
-                    if (!shotTimers.exists(weapon)) {
-                        // ToDo: weapon.config.delay
-                        var timer = new Timer(350);
-                        timer.run = shooter(weapon);
-                        timer.run();
-                        shotTimers.set(weapon, timer);
-                    }
-                } else {
-                    if (shotTimers.exists(weapon)) {
-                        shotTimers.get(weapon).stop();
-                        shotTimers.remove(weapon);
-                    }
-                }
-            case TankAction.STOP:
-        }
-    }
-
-    private function onFocusOut(event:FocusEvent):Void {
-        moveQueue = [];
-        updateMove();
-    }
-
-    private function updateMove():Void {
-        if (moveQueue.length == 0) {
-            action(STOP);
         } else {
-            action(MOVE(moveQueue[0]));
+          moveQueue.remove(direction);
         }
+        updateMove();
+      case TankAction.SHOT(weapon):
+        if (on) {
+          if (!shotTimers.exists(weapon)) {
+            // ToDo: weapon.config.delay
+            var timer = new Timer(350);
+            timer.run = shooter(weapon);
+            timer.run();
+            shotTimers.set(weapon, timer);
+          }
+        } else {
+          if (shotTimers.exists(weapon)) {
+            shotTimers.get(weapon).stop();
+            shotTimers.remove(weapon);
+          }
+        }
+      case TankAction.STOP:
     }
+  }
 
-    private function shooter(weapon:Int):Void -> Void {
+  private function onFocusOut(event:FocusEvent):Void {
-        return function():Void {
+    moveQueue = [];
-            action(SHOT(weapon));
+    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

@@ -5,7 +5,7 @@ import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.network.NetworkManager;
 
 enum GameInit {
-    LOCAL(start:Start);
+  LOCAL(start:Start);
-    NETWORK(network:NetworkManager);
+  NETWORK(network:NetworkManager);
-    RECORD(record:GameRecord);
+  RECORD(record:GameRecord);
 }

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

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

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

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

@@ -5,27 +5,26 @@ 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;
 
-    private var stage:Stage;
+  public function new(stage:Stage, ?event:String) {
-    private var event:String;
+    this.stage = stage;
-    private var calback:Void -> Void;
+    this.event = event != null ? event : Event.ENTER_FRAME;
+  }
 
-    public function new(stage:Stage, ?event:String) {
+  private function onEvent(_):Void {
-        this.stage = stage;
+    calback();
-        this.event = event != null ? event : Event.ENTER_FRAME;
+  }
-    }
 
-    private function onEvent(_):Void {
+  public function start(calback:Void->Void):Void {
-        calback();
+    this.calback = calback;
-    }
+    stage.addEventListener(event, onEvent);
+  }
 
-    public function start(calback:Void -> Void):Void {
+  public function stop():Void {
-        this.calback = calback;
+    stage.removeEventListener(event, onEvent);
-        stage.addEventListener(event, onEvent);
+    calback = null;
-    }
+  }
-
-    public function stop():Void {
-        stage.removeEventListener(event, onEvent);
-        calback = null;
-    }
 }

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

@@ -5,12 +5,11 @@ import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.control.Control;
 
 class NetworkControl extends HumanControl {
+  @:provide private var network:NetworkManager;
 
-    @:provide private var network:NetworkManager;
+  override public function action(action:TankAction):Void {
-
+    if (tankId > -1) {
-    override public function action(action:TankAction):Void {
+      network.action(tankId, action);
-        if (tankId > -1) {
-            network.action(tankId, action);
-        }
     }
+  }
 }

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

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

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

@@ -10,45 +10,45 @@ import ru.m.tankz.proto.pack.GameEventResponse;
 import ru.m.tankz.proto.room.RoomSlotProto;
 
 class NetworkGame extends Game {
+  private var network:NetworkManager;
 
-    private var network:NetworkManager;
+  public function new(network:NetworkManager) {
+    super(network.room.game.type);
+    this.network = network;
+    this.controlFactory = new NetworkControlFactory();
+    network.gameEventSignal.connect(onGameEventProto);
+    network.stateSignal.connect(onConnectionState);
+  }
 
-    public function new(network:NetworkManager) {
+  private function onGameEventProto(game:GameEventResponse):Void {
-        super(network.room.game.type);
+    var time = game.event.time;
-        this.network = network;
+    var eventStr = game.event.event;
-        this.controlFactory = new NetworkControlFactory();
+    var event:GameEvent = Unserializer.run(eventStr);
-        network.gameEventSignal.connect(onGameEventProto);
+    gameEventSignal.emit(event);
-        network.stateSignal.connect(onConnectionState);
+  }
-    }
 
-    private function onGameEventProto(game:GameEventResponse):Void {
+  private function onConnectionState(state:ConnectionState):Void {
-        var time = game.event.time;
+    switch state {
-        var eventStr = game.event.event;
+      case ONLINE(user):
-        var event:GameEvent = Unserializer.run(eventStr);
+        if (network.room != null) {
-        gameEventSignal.emit(event);
+          network.joinGame(network.room.game.id);
-    }
-
-    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 private function onStart(start:Start):Void {
-        var slot:RoomSlotProto = Lambda.find(network.room.slots, function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
+    var slot:RoomSlotProto = Lambda.find(network.room.slots,
-        if (slot != null) {
+      function(slot:RoomSlotProto) return slot.hasUser() && slot.user.uuid == network.user.uuid);
-            start.state.controls.push({playerId: [slot.slot.team, slot.slot.index], controller: HUMAN(0)});
+    if (slot != null) {
-        }
+      start.state.controls.push({playerId: [slot.slot.team, slot.slot.index], controller: HUMAN(0)});
-        super.onStart(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

@@ -28,172 +28,166 @@ 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 {
+  private static inline var TAG = "NetworkManager";
 
-    private static inline var TAG = "NetworkManager";
+  public var state(default, null):ConnectionState;
+  public var room(default, null):RoomProto;
+  public var user(default, null):UserProto;
 
-    public var state(default, null):ConnectionState;
+  public var stateSignal:Signal<ConnectionState>;
-    public var room(default, null):RoomProto;
+  public var listRoomSignal:Signal<Array<RoomProto>>;
-    public var user(default, null):UserProto;
+  public var roomSignal:Signal<RoomProto>;
+  public var gameEventSignal:Signal<GameEventResponse>;
 
-    public var stateSignal:Signal<ConnectionState>;
+  @:provide private var connection:ClientConnection;
-    public var listRoomSignal:Signal<Array<RoomProto>>;
+  @:provide private var storage:NetworkStorage;
-    public var roomSignal:Signal<RoomProto>;
+  @:provide private var settings:SettingsStorage;
-    public var gameEventSignal:Signal<GameEventResponse>;
 
-    @:provide private var connection:ClientConnection;
+  private var reconnectTimer:Timer;
-    @:provide private var storage:NetworkStorage;
+  private var reconnectDelay:Int;
-    @:provide private var settings:SettingsStorage;
 
-    private var reconnectTimer:Timer;
+  public function new() {
-    private var reconnectDelay:Int;
+    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);
+  }
 
-    public function new() {
+  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;
-        stateSignal = new Signal();
+        var user = storage.user;
-        listRoomSignal = new Signal();
+        if (user != null) {
-        roomSignal = new Signal();
+          login(user.name, user.uuid);
-        gameEventSignal = new Signal();
+        }
-        updateState(OFFLINE);
+      case DISCONNECTED | ERROR(_):
-        connection.handler.connect(onConnectionEvent);
-        connection.receiveHandler.connect(onResponse);
         if (settings.enableNetwork) {
-            connect();
+          reconnect();
-        }
-        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 {
+  private function onResponse(packet:Response):Void {
-        L.d(TAG, 'State: ${value}');
+    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 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;
-                if (user != null) {
-                    login(user.name, user.uuid);
-                }
-            case DISCONNECTED | ERROR(_):
-                if (settings.enableNetwork) {
-                    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,38 +5,35 @@ import ru.m.animate.Animate;
 import ru.m.animate.OnceAnimate;
 
 class AnimateBundle {
+  private static function buildAnimate(name:String, sequence:Array<Int>):OnceAnimate {
+    var template:String = 'resources/image/animate/${name}/%index%.png';
+    var frames = [
+      for (i in sequence)
+        ({
+          image:Assets.getBitmapData(StringTools.replace(template, '%index%', Std.string(i))), length:1
+        })
+    ];
+    return new OnceAnimate(frames);
+  }
 
-    private static function buildAnimate(name:String, sequence:Array<Int>):OnceAnimate {
+  public static function tankSpawn():OnceAnimate {
-        var template:String = 'resources/image/animate/${name}/%index%.png';
+    return buildAnimate('appear', [0, 1, 2, 3, 3, 4, 5, 5, 6]);
-        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 {
+  public static function tankBoom():OnceAnimate {
-        return buildAnimate('appear', [
+    return buildAnimate('boom', [0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9]);
-            0, 1, 2, 3, 3, 4, 5, 5, 6
+  }
-        ]);
-    }
 
-    public static function tankBoom():OnceAnimate {
+  public static function bulletBoom():OnceAnimate {
-        return buildAnimate('boom', [
+    return buildAnimate('boom-sm', [0, 1, 1, 0, 0, 1]);
-            0, 1, 2, 3, 4, 4, 4, 1, 4, 4, 7, 7, 8, 9, 9
+  }
-        ]);
-    }
 
-    public static function bulletBoom():OnceAnimate {
+  public static function tankProtect():Animate {
-        return buildAnimate('boom-sm', [
+    return new Animate([
-            0, 1, 1, 0, 0, 1
+      for (i in 0...2)
-        ]);
+        ({
-    }
+          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

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

@@ -23,281 +23,281 @@ 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;
 
-    public var config(default, set):Config;
+  private var mapWidth(get, null):Float;
-    public var gridSize(default, set):GridSize;
+  private var mapHeight(get, null):Float;
 
-    private var mapWidth(get, null):Float;
+  private var container:Sprite;
-    private var mapHeight(get, null):Float;
+  private var backgroundLayer:Sprite;
+  private var groundLayer:Sprite;
+  private var entryLayer:Sprite;
+  private var upLayer:Sprite;
+  private var upperLayer:Sprite;
 
-    private var container:Sprite;
+  private var items:Map<Int, IRenderItem>;
-    private var backgroundLayer:Sprite;
+  private var paused:Bool;
-    private var groundLayer:Sprite;
-    private var entryLayer:Sprite;
-    private var upLayer:Sprite;
-    private var upperLayer:Sprite;
 
-    private var items:Map<Int, IRenderItem>;
+  @:provide private static var animateManager:AnimateManager;
-    private var paused:Bool;
 
-    @:provide private static var animateManager:AnimateManager;
+  public function new() {
+    super();
+    items = new Map();
+    container = new Sprite();
+    content.addChild(container);
+    backgroundLayer = new Sprite();
+    groundLayer = new Sprite();
+    entryLayer = new Sprite();
+    upLayer = new Sprite();
+    upperLayer = new Sprite();
+    container.addChild(backgroundLayer);
+    container.addChild(groundLayer);
+    container.addChild(entryLayer);
+    container.addChild(upLayer);
+    container.addChild(upperLayer);
+    reset();
+  }
 
-    public function new() {
+  private function get_mapWidth():Float {
-        super();
+    return config.map.cell.width * (gridSize != null ? gridSize.width : config.map.grid.width);
-        items = new Map();
+  }
-        container = new Sprite();
+
-        content.addChild(container);
+  private function get_mapHeight():Float {
-        backgroundLayer = new Sprite();
+    return config.map.cell.height * (gridSize != null ? gridSize.height : config.map.grid.height);
-        groundLayer = new Sprite();
+  }
-        entryLayer = new Sprite();
+
-        upLayer = new Sprite();
+  private function set_config(value:Config):Config {
-        upperLayer = new Sprite();
+    config = value;
-        container.addChild(backgroundLayer);
+    drawBackground();
-        container.addChild(groundLayer);
+    toRedraw();
-        container.addChild(entryLayer);
+    return config;
-        container.addChild(upLayer);
+  }
-        container.addChild(upperLayer);
+
-        reset();
+  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 get_mapWidth():Float {
+  private function onEnterFrame(event:Event):Void {
-        return config.map.cell.width * (gridSize != null ? gridSize.width : config.map.grid.width);
+    if (!paused) {
+      draw();
     }
+  }
 
-    private function get_mapHeight():Float {
+  private function clearLayer(layer:DisplayObjectContainer) {
-        return config.map.cell.height * (gridSize != null ? gridSize.height : config.map.grid.height);
+    while (layer.numChildren > 0) {
+      layer.removeChildAt(0);
     }
+  }
 
-    private function set_config(value:Config):Config {
+  public function reset():Void {
-        config = value;
+    content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
-        drawBackground();
+    for (item in items.iterator()) {
-        toRedraw();
+      item.dispose();
-        return config;
     }
+    items = new Map();
+    clearLayer(entryLayer);
+    clearLayer(groundLayer);
+    clearLayer(upLayer);
+    clearLayer(upperLayer);
+  }
 
-    private function set_gridSize(value:GridSize):GridSize {
+  public function onGameEvent(event:GameEvent):Void {
-        gridSize = value;
+    switch event {
-        drawBackground();
+      case START(start):
-        toRedraw();
+        animateManager.playing = true;
-        return gridSize;
+        gridSize = start.level.size;
-    }
+        content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
-
+      case COMPLETE(_):
-    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 {
-        if (!paused) {
-            draw();
-        }
-    }
-
-    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()) {
+      case PAUSE(paused):
-            item.dispose();
+        this.paused = paused;
+        animateManager.playing = !paused;
+      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);
+          }
         }
-        items = new Map();
+      case SPAWN(EAGLE(id, rect, teamId)):
-        clearLayer(entryLayer);
+        var item = new EagleRenderItem(rect, config.getColor(new PlayerId(teamId, -1)));
-        clearLayer(groundLayer);
+        items.set(id, item);
-        clearLayer(upLayer);
+        entryLayer.addChild(item.view);
-        clearLayer(upperLayer);
+        item.update();
-    }
+      case SPAWN(TANK(id, rect, playerId, info)):
-
+        var item = new TankRenderItem(rect);
-    public function onGameEvent(event:GameEvent):Void {
+        var tankConfig = config.getTank(info.type);
-        switch event {
+        item.color = info.color;
-            case START(start):
+        item.skin = tankConfig.skin;
-                animateManager.playing = true;
+        item.hits = info.hits;
-                gridSize = start.level.size;
+        item.bonus = info.bonus;
-                content.addEventListener(Event.ENTER_FRAME, onEnterFrame);
+        item.boat = info.boat;
-            case COMPLETE(_):
+        item.name = info.name == null ? "" : info.name;
-                content.removeEventListener(Event.ENTER_FRAME, onEnterFrame);
+        items.set(id, item);
-            case PAUSE(paused):
+        entryLayer.addChild(item.view);
-                this.paused = paused;
+        item.update();
-                animateManager.playing = !paused;
+        playAnimate(item.rect.center, AnimateBundle.tankSpawn());
-            case SPAWN(BRICK(bricks)):
+      case SPAWN(BULLET(id, rect, playerId, skin, color)):
-                drawBackground();
+        var item = new BulletRenderItem(rect);
-                for (brick in bricks) {
+        item.color = color;
-                    var item:IRenderItem = new BrickRenderItem(brick.rect, brick.type);
+        item.skin = skin;
-                    var config = config.getBrick(brick.type);
+        items.set(id, item);
-                    items[brick.id] = item;
+        entryLayer.addChild(item.view);
-                    if (config.layer > 2) {
+        item.update();
-                        upLayer.addChild(item.view);
+      case SPAWN(BONUS(id, rect, type)):
-                    } else {
+        var item = new BonusRenderItem(rect, type);
-                        groundLayer.addChild(item.view);
+        items.set(id, item);
-                    }
+        upperLayer.addChild(item.view);
-                }
+        item.update();
-            case SPAWN(EAGLE(id, rect, teamId)):
+      case MOVE(EAGLE(id, position)):
-                var item = new EagleRenderItem(rect, config.getColor(new PlayerId(teamId, -1)));
+        if (items.exists(id)) {
-                items.set(id, item);
+          var item = items[id];
-                entryLayer.addChild(item.view);
+          item.move(position);
-                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
+      case MOVE(BULLET(id, position)):
-        flash.Lib.current.stage.invalidate();
+        if (items.exists(id)) {
-        #end
+          var item = items[id];
-    }
+          item.move(position);
-
-    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:Null<Int>):Void {
-        if (score != null && score != 0) {
-            var view:LabelView = new LabelView();
-            view.style = "text";
-            view.text = Std.string(score);
-            view.update();
-            view.redraw();
-            view.x = point.x - view.width / 2;
-            view.y = point.y - view.height / 2;
-            upperLayer.addChild(view.content);
-            Timer.delay(function() upperLayer.removeChildSafety(view.content), 1000);
         }
+      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> {
+    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:Null<Int>):Void {
+    if (score != null && score != 0) {
+      var view:LabelView = new LabelView();
+      view.style = "text";
+      view.text = Std.string(score);
+      view.update();
+      view.redraw();
+      view.x = point.x - view.width / 2;
+      view.y = point.y - view.height / 2;
+      upperLayer.addChild(view.content);
+      Timer.delay(function() upperLayer.removeChildSafety(view.content), 1000);
+    }
+  }
 }

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

@@ -5,25 +5,24 @@ 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 eagleImage(death:Bool = false):BitmapData {
+  public static function tankImage(skin:String, frame:Int = 0):BitmapData {
-        var suffix = death ? '-death' : '';
+    return Assets.getBitmapData('resources/image/tank/${skin}-${frame}.png');
-        return Assets.getBitmapData('resources/image/eagle/eagle${suffix}.png');
+  }
-    }
 
-    public static function tankImage(skin:String, frame:Int = 0):BitmapData {
+  public static function bonusImage(type:BonusType):BitmapData {
-        return Assets.getBitmapData('resources/image/tank/${skin}-${frame}.png');
+    return Assets.getBitmapData('resources/image/bonus/${type}.png');
-    }
+  }
 
-    public static function bonusImage(type:BonusType):BitmapData {
+  public static function bulletImage(skin:String):BitmapData {
-        return Assets.getBitmapData('resources/image/bonus/${type}.png');
+    return Assets.getBitmapData('resources/image/bullet/${skin}.png');
-    }
+  }
 
-    public static function bulletImage(skin:String):BitmapData {
+  public static function brickImage(type:BrickType, frame:Int = 0):BitmapData {
-        return Assets.getBitmapData('resources/image/bullet/${skin}.png');
+    return Assets.getBitmapData('resources/image/map/${type}${frame > 0 ? ("-" + frame) : ""}.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

@@ -7,26 +7,26 @@ import flash.display.PixelSnapping;
 import ru.m.geom.Rectangle;
 
 class BitmapRenderItem extends RenderItem {
-    public var image(default, set):BitmapData;
+  public var image(default, set):BitmapData;
 
-    private var bitmap:Bitmap;
+  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.NEVER, false);
-    }
+  }
-
+
-    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:BitmapData):BitmapData {
-        if (image != value) {
+    if (image != value) {
-            image = value;
+      image = value;
-            bitmap.bitmapData = image;
+      bitmap.bitmapData = image;
-            bitmap.width = rect.width;
+      bitmap.width = rect.width;
-            bitmap.height = rect.height;
+      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;
 
-    public var type(default, set):BonusType;
+  private var d = -0.05;
-    private var d = -0.05;
+  private var alpha = 1.0;
-    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;
+  }
 
-    private function set_type(value:BonusType):BonusType {
+  override public function update():Void {
-        if (type != value) {
+    super.update();
-            type = value;
+    alpha += d;
-            image = RenderUtil.bonusImage(type);
+    view.alpha = alpha;
-        }
+    if (alpha <= 0 || alpha >= 1.5) {
-        return type;
+      d = -d;
-    }
-
-    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

@@ -7,112 +7,107 @@ import ru.m.geom.Rectangle;
 import ru.m.tankz.Type;
 
 class BrickBitmapBundle {
+  private var data:Map<String, BitmapData>;
 
-    private var data:Map<String, BitmapData>;
+  public function new() {
+    data = new Map();
+  }
 
-    public function new() {
+  private function resolve(type:BrickType, cells:Array<GridPoint>, frame:Int):BitmapData {
-        data = new Map();
+    return switch cells.length {
-    }
+      case 0:
-
+        null;
-    private function resolve(type:BrickType, cells:Array<GridPoint>, frame:Int):BitmapData {
+      case 4:
-        return switch cells.length {
+        type == "none" ? null : RenderUtil.brickImage(type, frame);
-            case 0:
+      case _:
-                null;
+        var image = RenderUtil.brickImage(type, frame);
-            case 4:
+        var result = new BitmapData(image.width, image.height, true, 0x00000000);
-                type == "none" ? null : RenderUtil.brickImage(type, frame);
+        for (point in cells) {
-            case _:
+          var rect = new flash.geom.Rectangle(point.x * image.width / 2, point.y * image.height / 2, image.width / 2,
-                var image = RenderUtil.brickImage(type, frame);
+            image.height / 2);
-                var result = new BitmapData(image.width, image.height, true, 0x00000000);
+          result.draw(image, null, null, null, rect);
-                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;
         }
+        return result;
     }
+  }
 
-    public function get(type:BrickType, cells:Array<GridPoint>, frame:Int = 0):BitmapData {
+  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}';
+    var key:String = '${type}_${cells.map(function(point) return point.toString()).join(",")}_${frame}';
-        if (!data.exists(key)) {
+    if (!data.exists(key)) {
-            data.set(key, resolve(type, cells, frame));
+      data.set(key, resolve(type, cells, frame));
-        }
-        return data.get(key);
     }
+    return data.get(key);
+  }
 }
 
 class BrickRenderItem extends BitmapRenderItem {
+  private static var bundle:BrickBitmapBundle = new BrickBitmapBundle();
 
-    private static var bundle:BrickBitmapBundle = new BrickBitmapBundle();
+  public var type(default, set):BrickType;
 
-    public var type(default, set):BrickType;
+  private var cells:Array<GridPoint>;
 
-    private var cells:Array<GridPoint>;
+  private var frames:Int;
+  private var currentFrame:Int;
+  private var ticks:Int;
 
-    private var frames:Int;
+  private static function buildCells():Array<GridPoint> {
-    private var currentFrame:Int;
+    return [
-    private var ticks:Int;
+      new GridPoint(0, 0),
+      new GridPoint(0, 1),
+      new GridPoint(1, 0),
+      new GridPoint(1, 1),
+    ];
+  }
 
-    private static function buildCells():Array<GridPoint> {
+  public function new(rect:Rectangle, type:BrickType) {
-        return [
+    super(rect);
-            new GridPoint(0, 0),
+    cells = buildCells();
-            new GridPoint(0, 1),
+    this.frames = 1;
-            new GridPoint(1, 0),
+    this.currentFrame = 0;
-            new GridPoint(1, 1),
+    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 new(rect:Rectangle, type:BrickType) {
+  public function destroyCell(x:Int, y:Int):Void {
-        super(rect);
+    cells = cells.filter(function(point) return !(point.x == x && point.y == y));
-        cells = buildCells();
+    redraw();
-        this.frames = 1;
+  }
-        this.currentFrame = 0;
-        this.ticks = 0;
-        this.type = type;
-        move(rect.position);
-    }
 
-    private function set_type(value:BrickType):BrickType {
+  public function destroy():Void {
-        if (type != value) {
+    cells = [];
-            type = value;
+    redraw();
-            frames = switch type {
+  }
-                case "water": 2;
+
-                case _: 1;
+  public function redraw():Void {
-            }
+    image = bundle.get(type, cells, currentFrame);
-            cells = buildCells();
+  }
-            redraw();
+
+  override public function update():Void {
+    super.update();
+    if (frames > 1) {
+      if (++ticks >= 30) {
+        ticks = 0;
+        currentFrame++;
+        if (currentFrame >= frames) {
+          currentFrame = 0;
         }
-        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 {
-        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;
-                }
-                redraw();
-            }
-        }
-    }
 }

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

@@ -5,23 +5,23 @@ import hw.view.utils.BitmapUtil;
 import ru.m.geom.Rectangle;
 
 class BulletRenderItem extends BitmapRenderItem {
-    public var color(default, default):Null<Color>;
+  public var color(default, default):Null<Color>;
-    public var skin(default, set):String;
+  public var skin(default, set):String;
 
-    public function new(rect:Rectangle) {
+  public function new(rect:Rectangle) {
-        super(rect);
+    super(rect);
-        move(rect.position);
+    move(rect.position);
-    }
+  }
 
-    private function set_skin(value:String):String {
+  private function set_skin(value:String):String {
-        if (skin != value) {
+    if (skin != value) {
-            skin = value;
+      skin = value;
-            var image = RenderUtil.bulletImage(skin);
+      var image = RenderUtil.bulletImage(skin);
-            if (color != null) {
+      if (color != null) {
-                image = BitmapUtil.colorize(image, color);
+        image = BitmapUtil.colorize(image, color);
-            }
+      }
-            this.image = image;
+      this.image = image;
-        }
-        return skin;
     }
+    return skin;
+  }
 }

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

@@ -8,50 +8,50 @@ 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;
+  }
 
-    override private function get_view():DisplayObject {
+  private function set_death(value:Bool):Bool {
-        return container;
+    if (death != value) {
-    }
+      death = value;
-
+      image = RenderUtil.eagleImage(death);
-    private function set_protect(value:Bool):Bool {
+      if (!color.zero) {
-        if (protect != value) {
+        bitmap.bitmapData = image = BitmapUtil.colorize(image, color);
-            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 {
-        if (death != value) {
-            death = value;
-            image = RenderUtil.eagleImage(death);
-            if (!color.zero) {
-                bitmap.bitmapData = image = BitmapUtil.colorize(image, 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,42 +5,51 @@ 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 view(get, null):DisplayObject;
+  public var rect(default, null):Rectangle;
-    public var content(get, null):DisplayObject;
 
-    public var rect(default, null):Rectangle;
+  public function new(rect:Rectangle) {
+    this.rect = rect.clone();
+  }
 
-    public function new(rect:Rectangle) {
+  private function get_view():DisplayObject {
-        this.rect = rect.clone();
+    throw "Not Implemented";
+  }
+
+  private function get_content():DisplayObject {
+    return null;
+  }
+
+  public function move(position:Position):Void {
+    view.x = rect.x = position.x;
+    view.y = rect.y = position.y;
+    if (position.direction != null) {
+      rect.direction = position.direction;
+      if (content != null) {
+        content.rotation = rect.direction.angle;
+        content.x = -rect.width * (rect.direction.x + 1) / 2
+          + rect.width * (rect.direction.y + 1) / 2
+          + 0.5 * rect.width;
+        content.y = -rect.height * (rect.direction.x + 1) / 2
+          - rect.height * (rect.direction.y + 1) / 2
+          + 1.5 * rect.height;
+      } else {
+        view.rotation = rect.direction.angle;
+        view.x = rect.x
+          - rect.width * (rect.direction.x + 1) / 2
+          + rect.width * (rect.direction.y + 1) / 2
+          + 0.5 * rect.width;
+        view.y = rect.y
+          - rect.height * (rect.direction.x + 1) / 2
+          - rect.height * (rect.direction.y + 1) / 2
+          + 1.5 * rect.height;
+      }
     }
+  }
 
-    private function get_view():DisplayObject {
+  public function update():Void {}
-        throw "Not Implemented";
-    }
 
-    private function get_content():DisplayObject {
+  public function dispose():Void {}
-        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

@@ -15,159 +15,159 @@ 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 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 boatView:Shape;
-    private var nameView:TextField;
+  private var nameView:TextField;
 
-    @:provide static var theme:ITheme;
+  @:provide static var theme:ITheme;
 
-    public function new(rect:Rectangle) {
+  public function new(rect:Rectangle) {
-        super(rect);
+    super(rect);
-        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);
-        boatView = buildBoatView();
+    boatView = buildBoatView();
-        boatView.visible = false;
+    boatView.visible = false;
-        container.addChild(boatView);
+    container.addChild(boatView);
-        nameView = buildNameView();
+    nameView = buildNameView();
-        container.addChild(nameView);
+    container.addChild(nameView);
-        move(rect.position);
+    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;
-    private function buildNameView():TextField {
+    if (bonus) {
-        var result = new BitmapTextField();
+      color1 = 0xff00aa;
-        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;
     }
-
+    if (!color1.zero) {
-    private function buildBoatView():Shape {
+      image1 = BitmapUtil.colorize(image1, color1);
-        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;
     }
-
+    if (!color1.zero) {
-    override private function get_view():DisplayObject {
+      image2 = BitmapUtil.colorize(image2, color2);
-        return container;
     }
+    images = [for (i in 0...6) image1].concat([for (i in 0...6) image2]);
+    frame = 0;
+    bitmap.bitmapData = images[frame];
+  }
 
-    override private function get_content():DisplayObject {
+  private function set_skin(value:String):String {
-        return bitmap;
+    if (skin != value) {
+      skin = value;
+      redraw();
     }
+    return skin;
+  }
 
-    private function redraw():Void {
+  private function set_hits(value:Int):Int {
-        var image1 = RenderUtil.tankImage(skin, 0);
+    if (hits != value) {
-        var image2 = RenderUtil.tankImage(skin, 1);
+      hits = value;
-        var color1:Color = switch hits {
+      redraw();
-            case 1: 0x869C43;
+    }
-            case 2: 0xDEAF80;
+    return hits;
-            case 3: 0x5EA67A;
+  }
-            case _: color;
+
-        }
+  private function set_bonus(value:Bool):Bool {
-        var color2:Color = color1;
+    if (bonus != value) {
-        if (bonus) {
+      bonus = value;
-            color1 = 0xff00aa;
+      redraw();
-        }
+    }
-        if (!color1.zero) {
+    return bonus;
-            image1 = BitmapUtil.colorize(image1, color1);
+  }
-        }
+
-        if (!color1.zero) {
+  private function set_boat(value:Bool):Bool {
-            image2 = BitmapUtil.colorize(image2, color2);
+    if (boat != value) {
-        }
+      boat = value;
-        images = [for (i in 0...6) image1].concat([for (i in 0...6) image2]);
+      boatView.visible = boat;
+    }
+    return boat;
+  }
+
+  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) {
         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_boat(value:Bool):Bool {
-        if (boat != value) {
-            boat = value;
-            boatView.visible = boat;
-        }
-        return boat;
-    }
-
-    private function set_protect(value:Bool):Bool {
-        if (protect != value) {
-            protect = value;
-            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) {
-                frame = 0;
-            }
-            bitmap.bitmapData = images[frame];
-        }
     }
+  }
 }

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

@@ -10,119 +10,119 @@ import ru.m.tankz.game.GameEvent;
 import ru.m.tankz.game.IGame;
 
 @:provide 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 updateSoundTransform():Void {
+  private function set_volume(value:Float):Float {
-        transform = new SoundTransform(mute ? 0 : volume);
+    if (volume != value) {
-        for (channel in channels) {
+      volume = value;
-            channel.soundTransform = transform;
+      updateSoundTransform();
+    }
+    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)) {
-    private function set_volume(value:Float):Float {
+          humanTanks.push(id);
-        if (volume != value) {
-            volume = value;
-            updateSoundTransform();
         }
-        return volume;
+      case SPAWN(BONUS(id, _, type)):
-    }
+        play("bonus_add");
-
+        if (type == "live") {
-    private function set_mute(value:Bool):Bool {
+          liveBonuses.push(id);
-        if (mute != value) {
-            mute = value;
-            updateSoundTransform();
         }
-        return mute;
+      case HIT(TANK(_, _)):
-    }
+        play("bullet_hit");
-
+      case HIT(CELL(_, _, shot)):
-    public function play(id:String):Void {
+        if (humanBullets.indexOf(shot.bulletId) > -1) {
-        //L.d(TAG, 'play: ${id}');
+          // play("bullet_block");
-        var sound:Sound = Assets.getSound('resources/sounds/${id}.${type}');
+        }
-        if (sound != null) {
+      case DESTROY(TANK(id, _)):
-            var channel = sound.play(0, 0, transform);
+        if (humanTanks.indexOf(id) > -1) {
-            channel.addEventListener(Event.SOUND_COMPLETE, onSoundComplete);
+          play("boom_player");
-            channels.push(channel);
         } else {
-            L.w(TAG, 'Sound "${id}" not found');
+          play("boom_bot");
         }
-    }
+      case DESTROY(EAGLE(_, _)):
-
+        play("boom_player");
-    public function stopAll():Void {
+      case DESTROY(BONUS(id, _)):
-        for (channel in channels) {
+        // play("bonus_get");
-            channel.stop();
+        if (liveBonuses.indexOf(id) > -1) {
-        }
+          play("live");
-        channels = [];
+        } else {
-    }
+          play("bonus_get");
-
-    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 _:
     }
+  }
 }

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

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

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

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

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

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

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

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

@@ -11,34 +11,35 @@ import ru.m.tankz.network.NetworkManager;
 import ru.m.tankz.sound.SoundManager;
 
 @:template class ClientView extends VGroupView {
-    @:view("switcher") var switcherView:FrameSwitcher;
+  @:view("switcher") var switcherView:FrameSwitcher;
 
-    @: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 static var bus:IControlBus;
 
-    public function new():Void {
+  @:provide static var bus:IControlBus;
-        super();
-        resources.text.put('version', '${Const.VERSION}');
-        resources.text.put('name', '${Const.NAME}');
-        switcher = switcherView;
-    }
 
-    public function launch():Void {
+  public function new():Void {
-        content.stage.stageFocusRect = false;
+    super();
-        bus.signal.connect(onDeviceAction);
+    resources.text.put('version', '${Const.VERSION}');
+    resources.text.put('name', '${Const.NAME}');
+    switcher = switcherView;
+  }
+
+  public function launch():Void {
+    content.stage.stageFocusRect = false;
+    bus.signal.connect(onDeviceAction);
+    switcher.change(MenuFrame.ID);
+  }
+
+  private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
+    switch [type, action, state] {
+      case [KEYBOARD, KEY(Keyboard.ESCAPE), true]:
         switcher.change(MenuFrame.ID);
+      case [KEYBOARD, KEY(Keyboard.M), true]:
+        soundManager.mute = !soundManager.mute;
+      case _:
     }
-
+  }
-    private function onDeviceAction(type:DeviceType, action:DeviceAction, state:Bool):Void {
-        switch [type, action, state] {
-            case [KEYBOARD, KEY(Keyboard.ESCAPE), true]:
-                switcher.change(MenuFrame.ID);
-            case [KEYBOARD, KEY(Keyboard.M), true]:
-                soundManager.mute = !soundManager.mute;
-            case _:
-        }
-    }
 }

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

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

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

@@ -15,49 +15,49 @@ import ru.m.tankz.Type.PackId;
 using ru.m.tankz.view.ViewUtil;
 
 @:template class LevelFrame extends FrameView<PackId> {
-    public static inline var ID = "level";
+  public static inline var ID = "level";
 
-    @:provide static var switcher:FrameSwitcher;
+  @:provide static var switcher:FrameSwitcher;
-    @:provide static var storage:GameStorage;
+  @:provide static var storage:GameStorage;
-    @:provide static var configBundle:IConfigBundle;
+  @:provide static var configBundle:IConfigBundle;
-    @:provide static var levelBundle:ILevelBundle;
+  @:provide static var levelBundle:ILevelBundle;
 
-    @:view var header:LabelView;
+  @:view var header:LabelView;
-    @:view var levels:DataView<LevelConfig, ButtonView>;
+  @:view var levels:DataView<LevelConfig, ButtonView>;
 
-    private var pack:LevelPack;
+  private var pack:LevelPack;
-    private var config(get, never):Config;
+  private var config(get, never):Config;
 
-    public function new() {
+  public function new() {
-        super(ID);
+    super(ID);
-    }
+  }
-
+
-    private function get_config():Config {
+  private function get_config():Config {
-        return configBundle.get(pack.id.type);
+    return configBundle.get(pack.id.type);
-    }
+  }
-
+
-    override public function onShow(data:PackId):Void {
+  override public function onShow(data:PackId):Void {
-        header.text = data.toPackLabel();
+    header.text = data.toPackLabel();
-        pack = levelBundle.get(data);
+    pack = levelBundle.get(data);
-        levels.data = pack.data;
+    levels.data = pack.data;
-    }
+  }
-
+
-    private function levelViewFactory(index:Int, level:LevelConfig):ButtonView {
+  private function levelViewFactory(index:Int, level:LevelConfig):ButtonView {
-        var progress = storage.get(pack.id);
+    var progress = storage.get(pack.id);
-        var result = new ButtonView();
+    var result = new ButtonView();
-        result.style = "button.level";
+    result.style = "button.level";
-        var presetsLine = [for (p in config.presets) progress.isPresetCompleted(level.id, p.id) ? '*' : '_'].join('');
+    var presetsLine = [for (p in config.presets) progress.isPresetCompleted(level.id, p.id) ? '*' : '_'].join('');
-        result.text = '${level.id}\n${presetsLine}';
+    result.text = '${level.id}\n${presetsLine}';
-        result.disabled = !progress.isLevelAvailable(level.id);
+    result.disabled = !progress.isLevelAvailable(level.id);
-        return result;
+    return result;
-    }
+  }
-
+
-    private function onLevelSelect(index:Int, level:LevelConfig, view:ButtonView):Void {
+  private function onLevelSelect(index:Int, level:LevelConfig, view:ButtonView):Void {
-        if (storage.get(pack.id).isLevelAvailable(level.id)) {
+    if (storage.get(pack.id).isLevelAvailable(level.id)) {
-            switcher.change(StartFrame.ID, {
+      switcher.change(StartFrame.ID, {
-                state: new GameState(pack.id.type),
+        state: new GameState(pack.id.type),
-                level: level,
+        level: level,
-            });
+      });
-        }
     }
+  }
 }

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

@@ -19,76 +19,76 @@ 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";
 
-    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;
 
-    @:provide static var gameInit:GameInit;
+  @:view var packs:DataView<PackId, PackView>;
-    @:provide static var switcher:FrameSwitcher;
+  @:view("update") var updateButton:ButtonView;
-    @:provide static var network:NetworkManager;
+  @:view("network") var networkButton:ButtonView;
-    @:provide static var appUpdater:Updater;
-    @:provide static var levelBundle:ILevelBundle;
-    @:provide static var settings:SettingsStorage;
 
-    @:view var packs:DataView<PackId, PackView>;
+  public function new() {
-    @:view("update") var updateButton:ButtonView;
+    super(ID);
-    @:view("network") var networkButton:ButtonView;
+  }
 
-    public function new() {
+  override public function onShow(data:Dynamic):Void {
-        super(ID);
+    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 _:
     }
+  }
 
-    override public function onShow(data:Dynamic):Void {
+  private function startGame(packId:PackId):Void {
-        super.onShow(data);
+    gameInit = LOCAL({state: new GameState(packId.type), level: null});
-        appUpdater.check().then(function(update:Bool) {
+    switcher.change(LevelFrame.ID, packId);
-            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 {
+  private function startNetwork():Void {
-        super.onHide();
+    switch network.state {
-        settings.signal.disconnect(onSettingChange);
+      case ONLINE(user):
-    }
+        if (network.room != null) {
-
+          switcher.change(RoomFrame.ID, network.room);
-    private function onSettingChange(setting:Setting):Void {
+          network.joinGame(network.room.game.id, true);
-        switch setting {
+        } else {
-            case ENABLE_NETWORK(value): networkButton.visible = value;
+          switcher.change(RoomListFrame.ID);
-            case _:
         }
+      case CONNECTED:
+        LoginPopup.instance.show().then(function(user):Void {
+          if (user != null) {
+            switcher.change(RoomListFrame.ID);
+          }
+        });
+      case _:
     }
+  }
 
-    private function startGame(packId:PackId):Void {
+  private function appUpdate():Void {
-        gameInit = LOCAL({state: new GameState(packId.type), level: null});
+    appUpdater.download();
-        switcher.change(LevelFrame.ID, packId);
+  }
-    }
-
-    private function startNetwork():Void {
-        switch network.state {
-            case ONLINE(user):
-                if (network.room != null) {
-                    switcher.change(RoomFrame.ID, network.room);
-                    network.joinGame(network.room.game.id, true);
-                } else {
-                    switcher.change(RoomListFrame.ID);
-                }
-            case CONNECTED:
-                LoginPopup.instance.show().then(function(user):Void {
-                    if (user != null) {
-                        switcher.change(RoomListFrame.ID);
-                    }
-                });
-            case _:
-        }
-    }
-
-    private function appUpdate():Void {
-        appUpdater.download();
-    }
 }

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

@@ -7,21 +7,20 @@ import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
 @:template class RecordFrame extends FrameView<Dynamic> {
+  public static var ID(default, never):String = "record";
 
-    public static var ID(default, never):String = "record";
+  @:provide static var switcher:FrameSwitcher;
+  @:provide static var recordStorage:RecordStorage;
 
-    @:provide static var switcher:FrameSwitcher;
+  @:view var data:VListView<GameRecordInfo>;
-    @:provide static var recordStorage:RecordStorage;
 
-    @:view var data:VListView<GameRecordInfo>;
+  public function new() {
+    super(ID);
+  }
 
-    public function new() {
+  override public function onShow(_:Dynamic):Void {
-        super(ID);
+    var data = recordStorage.list();
-    }
+    data.sort(function(a:GameRecordInfo, b:GameRecordInfo) return Std.int(b.date.getTime() - a.date.getTime()));
-
+    this.data.data = data;
-    override public function onShow(_:Dynamic):Void {
+  }
-        var data = recordStorage.list();
-        data.sort(function(a:GameRecordInfo, b:GameRecordInfo) return Std.int(b.date.getTime() - a.date.getTime()));
-        this.data.data = data;
-    }
 }

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

@@ -15,51 +15,53 @@ import ru.m.tankz.view.result.ResultPlayerView;
 using ru.m.tankz.view.ViewUtil;
 
 @:template class ResultFrame extends FrameView<Result> {
-    public static var ID(default, never):String = "result";
+  public static var ID(default, never):String = "result";
 
-    @:view("result") var resultView:DataView<PlayerState, ResultPlayerView>;
+  @:view("result") var resultView:DataView<PlayerState, ResultPlayerView>;
-    @:view("level") var levelLabel:LabelView;
+  @:view("level") var levelLabel:LabelView;
-    @:view("next") var nextButton:ButtonView;
+  @:view("next") var nextButton:ButtonView;
 
-    @:provide var frames:FrameSwitcher;
+  @:provide var frames:FrameSwitcher;
-    @:provide static var levelBundle:ILevelBundle;
-    @:provide static var gameStorage:GameStorage;
 
-    private var result:Result;
+  @:provide static var levelBundle:ILevelBundle;
+  @:provide static var gameStorage:GameStorage;
 
-    public function new() {
+  private var result:Result;
-        super(ID);
+
+  public function new() {
+    super(ID);
+  }
+
+  override public function onShow(data:Result):Void {
+    result = data;
+    resultView.data = result.state.humans;
+    for (view in resultView.dataViews) {
+      view.winner = view.data.id.team == data.winner;
     }
+    levelLabel.text = data.level.toLevelLabel();
+    nextButton.disabled = !gameStorage.get(result.level.packId)
+      .isPresetAvailable(result.level.id + 1, result.state.presetId);
+    nextButton.text = 'Next #${result.level.id + 1}';
+  }
 
-    override public function onShow(data:Result):Void {
+  private function levels():Void {
-        result = data;
+    frames.change(LevelFrame.ID, result.level.packId);
-        resultView.data = result.state.humans;
+  }
-        for (view in resultView.dataViews) {
-            view.winner = view.data.id.team == data.winner;
-        }
-        levelLabel.text = data.level.toLevelLabel();
-        nextButton.disabled = !gameStorage.get(result.level.packId).isPresetAvailable(result.level.id + 1, result.state.presetId);
-        nextButton.text = 'Next #${result.level.id + 1}';
-    }
 
-    private function levels():Void {
+  private function restart():Void {
-        frames.change(LevelFrame.ID, result.level.packId);
+    result.state.clean();
-    }
+    frames.change(GameFrame.ID, LOCAL({state: result.state, level: result.level}));
+  }
 
-    private function restart():Void {
+  private function next():Void {
+    var pack = levelBundle.get(result.level.packId);
+    if (pack.data.length > result.level.id + 1) {
+      var level = pack.data[result.level.id + 1];
+      var progress = gameStorage.get(pack.id);
+      if (progress.isPresetAvailable(level.id, result.state.presetId)) {
         result.state.clean();
-        frames.change(GameFrame.ID, LOCAL({state: result.state, level: result.level}));
+        frames.change(GameFrame.ID, LOCAL({state: result.state, level: level}));
-    }
+      }
-
-    private function next():Void {
-        var pack = levelBundle.get(result.level.packId);
-        if (pack.data.length > result.level.id + 1) {
-            var level = pack.data[result.level.id + 1];
-            var progress = gameStorage.get(pack.id);
-            if (progress.isPresetAvailable(level.id, result.state.presetId)) {
-                result.state.clean();
-                frames.change(GameFrame.ID, LOCAL({state: result.state, level: level}));
-            }
-        }
     }
+  }
 }

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

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

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

@@ -19,116 +19,115 @@ using haxe.EnumTools.EnumValueTools;
 using ru.m.tankz.view.ViewUtil;
 
 @:template class StartFrame extends FrameView<Start> {
+  public static var ID(default, never):String = "start";
 
-    public static var ID(default, never):String = "start";
+  @:provide static var switcher:FrameSwitcher;
+  @:provide static var storage:GameStorage;
 
-    @:provide static var switcher:FrameSwitcher;
+  private var progress:PackProgress;
-    @:provide static var storage:GameStorage;
 
-    private var progress:PackProgress;
+  @:view var header:LabelView;
+  @:view("presets") var presetsView:DataView<GamePreset, ButtonView>;
+  @:view("teams") var teamsView:DataView<Array<PlayerControl>, DataView<PlayerControl, SlotView>>;
 
-    @:view var header:LabelView;
+  private var humanIndex:Int = 0;
-    @:view("presets") var presetsView:DataView<GamePreset, ButtonView>;
+  private var humanTotal:Int = 2;
-    @:view("teams") var teamsView:DataView<Array<PlayerControl>, DataView<PlayerControl, SlotView>>;
 
-    private var humanIndex:Int = 0;
+  private var start:Start;
-    private var humanTotal:Int = 2;
 
-    private var start:Start;
+  public function new() {
+    super(ID);
+  }
 
-    public function new() {
+  override public function onShow(data:Start):Void {
-        super(ID);
+    super.onShow(data);
+    start = data;
+    this.progress = storage.get(start.level.packId);
+    header.text = start.level.toLevelLabel();
+    presetsView.data = start.state.config.presets;
+    teamsView.data = defaultControls(start.state.config);
+  }
+
+  private static function defaultControls(config:Config):Array<Array<PlayerControl>> {
+    var result:Array<Array<PlayerControl>> = [];
+    var preset = config.getPreset(0);
+    var human = false;
+    for (team in preset.teams) {
+      if (team.id != "bot") { // ToDo:
+        var controls:Array<PlayerControl> = [];
+        for (player in team.players) {
+          var playerId = new PlayerId(team.id, player.index);
+          var control:PlayerControl = {
+            playerId: playerId,
+            color: config.getColor(playerId),
+            controller: NONE,
+          }
+          if (!human) {
+            control.controller = HUMAN(0);
+            control.name = ControllerParser.defaultName(control.controller);
+            human = true;
+          }
+          controls.push(control);
+        }
+        result.push(controls);
+      }
     }
+    return result;
+  }
 
-    override public function onShow(data:Start):Void {
+  private function teamViewFactory(index:Int, value:Array<PlayerControl>):DataView<PlayerControl, SlotView> {
-        super.onShow(data);
+    var result = new DataView();
-        start = data;
+    result.style = "light";
-        this.progress = storage.get(start.level.packId);
+    result.geometry.padding = 5;
-        header.text = start.level.toLevelLabel();
+    result.factory = slotViewFactory;
-        presetsView.data = start.state.config.presets;
+    result.data = value;
-        teamsView.data = defaultControls(start.state.config);
+    return result;
-    }
+  }
 
-    private static function defaultControls(config:Config):Array<Array<PlayerControl>> {
+  private function slotViewFactory(index:Int, value:PlayerControl):SlotView {
-        var result:Array<Array<PlayerControl>> = [];
+    var result = new SlotView();
-        var preset = config.getPreset(0);
+    result.select.onSelect.connect(function(controller:Controller) setController(value, controller));
-        var human = false;
+    result.control = value;
-        for (team in preset.teams) {
+    result.tank = start.state.config.getPlayerTank(value.playerId).skin;
-            if (team.id != "bot") {  // ToDo:
+    return result;
-                var controls:Array<PlayerControl> = [];
+  }
-                for (player in team.players) {
+
-                    var playerId = new PlayerId(team.id, player.index);
+  private function setController(value:PlayerControl, controller:Controller):Void {
-                    var control:PlayerControl = {
+    switch controller {
-                        playerId: playerId,
+      case NONE:
-                        color: config.getColor(playerId),
+      case _:
-                        controller: NONE,
+        for (teamView in teamsView.dataViews) {
-                    }
+          for (view in teamView.dataViews) {
-                    if (!human) {
+            if (view.control.controller.equals(controller)) {
-                        control.controller = HUMAN(0);
+              view.control.controller = NONE;
-                        control.name = ControllerParser.defaultName(control.controller);
+              view.select.selected = NONE;
-                        human = true;
+              view.control.name = null;
-                    }
-                    controls.push(control);
-                }
-                result.push(controls);
             }
-        }
+          }
-        return result;
-    }
-
-    private function teamViewFactory(index:Int, value:Array<PlayerControl>):DataView<PlayerControl, SlotView> {
-        var result = new DataView();
-        result.style = "light";
-        result.geometry.padding = 5;
-        result.factory = slotViewFactory;
-        result.data = value;
-        return result;
-    }
-
-    private function slotViewFactory(index:Int, value:PlayerControl):SlotView {
-        var result = new SlotView();
-        result.select.onSelect.connect(function(controller:Controller) setController(value, controller));
-        result.control = value;
-        result.tank = start.state.config.getPlayerTank(value.playerId).skin;
-        return result;
-    }
-
-    private function setController(value:PlayerControl, controller:Controller):Void {
-        switch controller {
-            case NONE:
-            case _:
-                for (teamView in teamsView.dataViews) {
-                    for (view in teamView.dataViews) {
-                        if (view.control.controller.equals(controller)) {
-                            view.control.controller = NONE;
-                            view.select.selected = NONE;
-                            view.control.name = null;
-                        }
-                    }
-                }
-        }
-        value.controller = controller;
-        value.name = ControllerParser.defaultName(controller);
-    }
-
-    private function presetViewFactory(index:Int, value:GamePreset):ButtonView {
-        var result = new ButtonView();
-        result.style = 'button${!progress.isPresetCompleted(start.level.id, value.id) ? ".active" : ""}';
-        result.geometry.height = "100%";
-        result.text = value.name == "default" ? "start" : value.name;
-        result.disabled = !progress.isPresetAvailable(start.level.id, value.id);
-        return result;
-    }
-
-    private function onPresetSelect(value:GamePreset):Void {
-        if (progress.isPresetAvailable(start.level.id, value.id)) {
-            start.state.presetId = value.id;
-            var controls = [];
-            for (item in teamsView.data) {
-                controls = controls.concat(item);
-            }
-            start.state.controls = controls;
-            switcher.change(GameFrame.ID, LOCAL(start));
         }
     }
+    value.controller = controller;
+    value.name = ControllerParser.defaultName(controller);
+  }
+
+  private function presetViewFactory(index:Int, value:GamePreset):ButtonView {
+    var result = new ButtonView();
+    result.style = 'button${!progress.isPresetCompleted(start.level.id, value.id) ? ".active" : ""}';
+    result.geometry.height = "100%";
+    result.text = value.name == "default" ? "start" : value.name;
+    result.disabled = !progress.isPresetAvailable(start.level.id, value.id);
+    return result;
+  }
+
+  private function onPresetSelect(value:GamePreset):Void {
+    if (progress.isPresetAvailable(start.level.id, value.id)) {
+      start.state.presetId = value.id;
+      var controls = [];
+      for (item in teamsView.data) {
+        controls = controls.concat(item);
+      }
+      start.state.controls = controls;
+      switcher.change(GameFrame.ID, LOCAL(start));
+    }
+  }
 }

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

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

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

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

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

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

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

@@ -9,38 +9,38 @@ import ru.m.tankz.game.record.GameRecord;
 import ru.m.tankz.storage.RecordStorage;
 
 @:template class RecordView extends HGroupView implements IListItemView<GameRecordInfo> {
-    @:view var date:LabelView;
+  @:view var date:LabelView;
-    @:view var type:LabelView;
+  @:view var type:LabelView;
-    @:view var level:LabelView;
+  @:view var level:LabelView;
-    @:view var preset:LabelView;
+  @:view var preset:LabelView;
 
-    public var item_index(default, default):Int;
+  public var item_index(default, default):Int;
-    public var data(default, set):GameRecordInfo;
+  public var data(default, set):GameRecordInfo;
 
-    @:provide var recordStorage:RecordStorage;
+  @:provide var recordStorage:RecordStorage;
-    @:provide var switcher:FrameSwitcher;
+  @:provide var switcher:FrameSwitcher;
 
-    private function set_data(value:GameRecordInfo):GameRecordInfo {
+  private function set_data(value:GameRecordInfo):GameRecordInfo {
-        if (data != value) {
+    if (data != value) {
-            data = value;
+      data = value;
-            date.text = data.date.toString();
+      date.text = data.date.toString();
-            type.text = data.type;
+      type.text = data.type;
-            level.text = Std.string(data.levelId);
+      level.text = Std.string(data.levelId);
-            preset.text = Std.string(data.presetId);
+      preset.text = Std.string(data.presetId);
-        }
-        return data;
     }
+    return data;
+  }
 
-    private function play():Void {
+  private function play():Void {
-        var record = recordStorage.read(data.id);
+    var record = recordStorage.read(data.id);
-        switcher.change(GameFrame.ID, RECORD(record));
+    switcher.change(GameFrame.ID, RECORD(record));
-    }
+  }
 
-    private function delete():Void {
+  private function delete():Void {
-        recordStorage.delete(data.id);
+    recordStorage.delete(data.id);
-        // ToDo:
+    // ToDo:
-        var list = cast(parent.parent.parent, ListView<Dynamic>);
+    var list = cast(parent.parent.parent, ListView<Dynamic>);
-        list.data.splice(item_index, 1);
+    list.data.splice(item_index, 1);
-        list.toUpdate();
+    list.toUpdate();
-    }
+  }
 }

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

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

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

@@ -6,20 +6,19 @@ import ru.m.tankz.render.RenderUtil;
 import ru.m.tankz.Type.TankInfo;
 
 class TankView extends ImageView {
+  public var tank(null, set):TankInfo;
 
-    public var tank(null, set):TankInfo;
+  public function new() {
+    super();
+    style = "icon.tank";
+    fillType = FillType.CONTAIN;
+  }
 
-    public function new() {
+  private function set_tank(value:TankInfo):TankInfo {
-        super();
+    if (value != null) {
-        style = "icon.tank";
+      color = value.color;
-        fillType = FillType.CONTAIN;
+      image = RenderUtil.tankImage(value.skin);
-    }
-
-    private function set_tank(value:TankInfo):TankInfo {
-        if (value != null) {
-            color = value.color;
-            image = RenderUtil.tankImage(value.skin);
-        }
-        return value;
     }
+    return value;
+  }
 }

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

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

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

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

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

@@ -6,19 +6,19 @@ import ru.m.geom.Circle;
 import ru.m.geom.Point;
 
 class CircleActionArea implements IActionArea {
-    public var action(default, null):DeviceAction;
+  public var action(default, null):DeviceAction;
-    public var circle(default, null):Circle;
+  public var circle(default, null):Circle;
 
-    public function new(action:DeviceAction, circle:Circle) {
+  public function new(action:DeviceAction, circle:Circle) {
-        this.action = action;
+    this.action = action;
-        this.circle = circle;
+    this.circle = circle;
-    }
+  }
 
-    public function contain(point:Point):Bool {
+  public function contain(point:Point):Bool {
-        return circle.contain(point);
+    return circle.contain(point);
-    }
+  }
 
-    public function draw(graphics:Graphics):Void {
+  public function draw(graphics:Graphics):Void {
-        graphics.drawCircle(circle.x, circle.y, circle.radius);
+    graphics.drawCircle(circle.x, circle.y, circle.radius);
-    }
+  }
 }

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

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

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

@@ -6,32 +6,31 @@ import hw.view.skin.ISkin;
 import ru.m.control.DeviceAction;
 
 @:style class GamepadSkin implements ISkin<GamepadView> {
+  @:style(0xffffff) public var color(default, default):Null<Color>;
+  @:style(0x00ff00) public var activeColor(default, default):Null<Color>;
 
-    @:style(0xffffff) public var color(default, default):Null<Color>;
+  public function new(?color:Color) {
-    @:style(0x00ff00) public var activeColor(default, default):Null<Color>;
+    this.color = color;
+  }
 
-    public function new(?color:Color) {
+  public function draw(view:GamepadView):Void {
-        this.color = color;
+    var actives = [for (item in view.activeAreas.iterator()) item];
-    }
+    var graphics:Graphics = view.content.graphics;
-
+    graphics.clear();
-    public function draw(view:GamepadView):Void {
+    for (area in view.areas) {
-        var actives = [for (item in view.activeAreas.iterator()) item];
+      switch area.action {
-        var graphics:Graphics = view.content.graphics;
+        case KEY(code):
-        graphics.clear();
+          if (view.weapons.length < code + 1) {
-        for (area in view.areas) {
+            continue;
-            switch area.action {
+          }
-                case KEY(code):
+        case _:
-                    if (view.weapons.length < code + 1) {
+      }
-                        continue;
+      var color = actives.indexOf(area) > -1 ? activeColor : color;
-                    }
+      graphics.lineStyle(2, color);
-                case _:
+      graphics.beginFill(color, 0.2);
-            }
+      area.draw(graphics);
-            var color = actives.indexOf(area) > -1 ? activeColor : color;
-            graphics.lineStyle(2, color);
-            graphics.beginFill(color, 0.2);
-            area.draw(graphics);
-        }
-        graphics.lineStyle();
-        graphics.endFill();
     }
+    graphics.lineStyle();
+    graphics.endFill();
+  }
 }

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

@@ -12,117 +12,116 @@ import ru.m.geom.Point;
 import ru.m.tankz.config.Config;
 
 class GamepadView extends SpriteView implements IControlDevice {
+  public var type(default, null):DeviceType;
+  public var signal(default, null):Signal2<DeviceAction, Bool>;
 
-    public var type(default, null):DeviceType;
+  public var areas(default, null):Array<IActionArea>;
-    public var signal(default, null):Signal2<DeviceAction, Bool>;
+  public var activeAreas(default, null):Map<Int, IActionArea>;
 
-    public var areas(default, null):Array<IActionArea>;
+  public var weapons(default, set):Array<WeaponConfig>;
-    public var activeAreas(default, null):Map<Int, IActionArea>;
 
-    public var weapons(default, set):Array<WeaponConfig>;
+  private function set_weapons(value:Array<WeaponConfig>):Array<WeaponConfig> {
+    weapons = value;
+    toRedraw();
+    return weapons;
+  }
 
-    private function set_weapons(value:Array<WeaponConfig>):Array<WeaponConfig> {
+  private var builder:IActionAreaBuilder;
-        weapons = value;
+
+  private var actionLayer:Sprite;
+
+  public function new() {
+    super();
+    style = "gamepad";
+    type = SCREEN;
+    builder = new SmartActionAreaBuilder();
+    signal = new Signal2();
+    areas = [];
+    weapons = [];
+    activeAreas = new Map();
+    skin = new GamepadSkin();
+    actionLayer = new Sprite();
+    actionLayer.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
+    actionLayer.addEventListener(TouchEvent.TOUCH_BEGIN, onTouchBegin);
+    content.addChild(actionLayer);
+  }
+
+  private function onMouseDown(event:MouseEvent):Void {
+    onMouseMove(event);
+    stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
+    stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
+  }
+
+  private function onMouseMove(event:MouseEvent):Void {
+    var point = new Point(event.localX, event.localY);
+    updateTouch(-1, point);
+  }
+
+  private function onMouseUp(event:MouseEvent):Void {
+    endTouch(-1);
+    stage.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
+    stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
+  }
+
+  private function onTouchBegin(event:TouchEvent):Void {
+    onTouchMove(event);
+    stage.addEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
+    stage.addEventListener(TouchEvent.TOUCH_END, onTouchEnd);
+  }
+
+  private function onTouchMove(event:TouchEvent):Void {
+    var point = new Point(event.localX, event.localY);
+    updateTouch(event.touchPointID, point);
+  }
+
+  private function onTouchEnd(event:TouchEvent):Void {
+    endTouch(event.touchPointID);
+    if (Lambda.count(activeAreas) == 0) {
+      stage.removeEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
+      stage.removeEventListener(TouchEvent.TOUCH_END, onTouchEnd);
+    }
+  }
+
+  private function updateTouch(pointID:Int, point:Point):Void {
+    if (activeAreas.exists(pointID)) {
+      var area = activeAreas[pointID];
+      if (!area.contain(point)) {
+        activeAreas.remove(pointID);
+        signal.emit(area.action, false);
         toRedraw();
-        return weapons;
+      }
-    }
+    } else {
-
+      for (area in areas) {
-    private var builder:IActionAreaBuilder;
+        if (area.contain(point)) {
-
+          activeAreas[pointID] = area;
-    private var actionLayer:Sprite;
+          signal.emit(area.action, true);
-
+          toRedraw();
-    public function new() {
+          break;
-        super();
-        style = "gamepad";
-        type = SCREEN;
-        builder = new SmartActionAreaBuilder();
-        signal = new Signal2();
-        areas = [];
-        weapons = [];
-        activeAreas = new Map();
-        skin = new GamepadSkin();
-        actionLayer = new Sprite();
-        actionLayer.addEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-        actionLayer.addEventListener(TouchEvent.TOUCH_BEGIN, onTouchBegin);
-        content.addChild(actionLayer);
-    }
-
-    private function onMouseDown(event:MouseEvent):Void {
-        onMouseMove(event);
-        stage.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-        stage.addEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    }
-
-    private function onMouseMove(event:MouseEvent):Void {
-        var point = new Point(event.localX, event.localY);
-        updateTouch(-1, point);
-    }
-
-    private function onMouseUp(event:MouseEvent):Void {
-        endTouch(-1);
-        stage.removeEventListener(MouseEvent.MOUSE_MOVE, onMouseMove);
-        stage.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp);
-    }
-
-    private function onTouchBegin(event:TouchEvent):Void {
-        onTouchMove(event);
-        stage.addEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
-        stage.addEventListener(TouchEvent.TOUCH_END, onTouchEnd);
-    }
-
-    private function onTouchMove(event:TouchEvent):Void {
-        var point = new Point(event.localX, event.localY);
-        updateTouch(event.touchPointID, point);
-    }
-
-    private function onTouchEnd(event:TouchEvent):Void {
-        endTouch(event.touchPointID);
-        if (Lambda.count(activeAreas) == 0) {
-            stage.removeEventListener(TouchEvent.TOUCH_MOVE, onTouchMove);
-            stage.removeEventListener(TouchEvent.TOUCH_END, onTouchEnd);
         }
+      }
     }
+  }
 
-    private function updateTouch(pointID:Int, point:Point):Void {
+  private function endTouch(pointID:Int):Void {
-        if (activeAreas.exists(pointID)) {
+    if (activeAreas.exists(pointID)) {
-            var area = activeAreas[pointID];
+      signal.emit(activeAreas[pointID].action, false);
-            if (!area.contain(point)) {
+      activeAreas.remove(pointID);
-                activeAreas.remove(pointID);
+      toRedraw();
-                signal.emit(area.action, false);
-                toRedraw();
-            }
-        } else {
-            for (area in areas) {
-                if (area.contain(point)) {
-                    activeAreas[pointID] = area;
-                    signal.emit(area.action, true);
-                    toRedraw();
-                    break;
-                }
-            }
-        }
     }
+  }
 
-    private function endTouch(pointID:Int):Void {
+  override public function update():Void {
-        if (activeAreas.exists(pointID)) {
+    super.update();
-            signal.emit(activeAreas[pointID].action, false);
+    areas = builder.build(width, height);
-            activeAreas.remove(pointID);
+    actionLayer.graphics.clear();
-            toRedraw();
+    actionLayer.graphics.beginFill(0, 0.0);
-        }
+    actionLayer.graphics.drawRect(0, 0, width, height);
-    }
+    actionLayer.graphics.endFill();
+  }
 
-    override public function update():Void {
+  public function dispose():Void {
-        super.update();
+    actionLayer.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-        areas = builder.build(width, height);
+    actionLayer.removeEventListener(TouchEvent.TOUCH_BEGIN, onTouchBegin);
-        actionLayer.graphics.clear();
+    stage = null;
-        actionLayer.graphics.beginFill(0, 0.0);
+  }
-        actionLayer.graphics.drawRect(0, 0, width, height);
-        actionLayer.graphics.endFill();
-    }
-
-    public function dispose():Void {
-        actionLayer.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown);
-        actionLayer.removeEventListener(TouchEvent.TOUCH_BEGIN, onTouchBegin);
-        stage = null;
-    }
 }

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

@@ -5,7 +5,7 @@ import ru.m.control.DeviceAction;
 import ru.m.geom.Point;
 
 interface IActionArea {
-    public var action(default, null):DeviceAction;
+  public var action(default, null):DeviceAction;
-    public function contain(point:Point):Bool;
+  public function contain(point:Point):Bool;
-    public function draw(graphics:Graphics):Void;
+  public function draw(graphics:Graphics):Void;
 }

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

@@ -1,5 +1,5 @@
 package ru.m.tankz.view.gamepad;
 
 interface IActionAreaBuilder {
-    public function build(width:Float, height:Float):Array<IActionArea>;
+  public function build(width:Float, height:Float):Array<IActionArea>;
 }

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

@@ -6,19 +6,19 @@ import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
 
 class RectangleActionArea implements IActionArea {
-    public var action(default, null):DeviceAction;
+  public var action(default, null):DeviceAction;
-    public var rectangle(default, null):Rectangle;
+  public var rectangle(default, null):Rectangle;
 
-    public function new(action:DeviceAction, rectangle:Rectangle) {
+  public function new(action:DeviceAction, rectangle:Rectangle) {
-        this.action = action;
+    this.action = action;
-        this.rectangle = rectangle;
+    this.rectangle = rectangle;
-    }
+  }
 
-    public function contain(point:Point):Bool {
+  public function contain(point:Point):Bool {
-        return rectangle.contain(point);
+    return rectangle.contain(point);
-    }
+  }
 
-    public function draw(graphics:Graphics):Void {
+  public function draw(graphics:Graphics):Void {
-        graphics.drawRect(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
+    graphics.drawRect(rectangle.x, rectangle.y, rectangle.width, rectangle.height);
-    }
+  }
 }

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

@@ -6,28 +6,28 @@ import ru.m.geom.Point;
 import ru.m.geom.Rectangle;
 
 class RhombusActionArea implements IActionArea {
-    public var action(default, null):DeviceAction;
+  public var action(default, null):DeviceAction;
-    public var rectangle(default, null):Rectangle;
+  public var rectangle(default, null):Rectangle;
 
-    private var center:Point;
+  private var center:Point;
-    private var distance:Float;
+  private var distance:Float;
 
-    public function new(action:DeviceAction, rectangle:Rectangle) {
+  public function new(action:DeviceAction, rectangle:Rectangle) {
-        this.action = action;
+    this.action = action;
-        this.rectangle = rectangle;
+    this.rectangle = rectangle;
-        center = rectangle.center;
+    center = rectangle.center;
-        distance = Math.max(rectangle.width / 2, rectangle.height / 2);
+    distance = Math.max(rectangle.width / 2, rectangle.height / 2);
-    }
+  }
 
-    public function contain(point:Point):Bool {
+  public function contain(point:Point):Bool {
-        return Math.abs(point.x - center.x) + Math.abs(point.y - center.y) < distance;
+    return Math.abs(point.x - center.x) + Math.abs(point.y - center.y) < distance;
-    }
+  }
 
-    public function draw(graphics:Graphics):Void {
+  public function draw(graphics:Graphics):Void {
-        graphics.moveTo(rectangle.x + rectangle.width / 2, rectangle.top);
+    graphics.moveTo(rectangle.x + rectangle.width / 2, rectangle.top);
-        graphics.lineTo(rectangle.right, rectangle.y + rectangle.height / 2);
+    graphics.lineTo(rectangle.right, rectangle.y + rectangle.height / 2);
-        graphics.lineTo(rectangle.x + rectangle.width / 2, rectangle.bottom);
+    graphics.lineTo(rectangle.x + rectangle.width / 2, rectangle.bottom);
-        graphics.lineTo(rectangle.left, rectangle.y + rectangle.height / 2);
+    graphics.lineTo(rectangle.left, rectangle.y + rectangle.height / 2);
-        graphics.lineTo(rectangle.x + rectangle.width / 2, rectangle.top);
+    graphics.lineTo(rectangle.x + rectangle.width / 2, rectangle.top);
-    }
+  }
 }

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

@@ -7,43 +7,30 @@ import ru.m.geom.Direction;
 import ru.m.geom.Rectangle;
 
 class SmartActionAreaBuilder implements IActionAreaBuilder {
-    public function new() {
+  public function new() {}
-    }
 
-    public function build(width:Float, height:Float):Array<IActionArea> {
+  public function build(width:Float, height:Float):Array<IActionArea> {
-        var areas:Array<IActionArea> = [];
+    var areas:Array<IActionArea> = [];
-        var size = Math.min(width, height) / 5;
+    var size = Math.min(width, height) / 5;
-        var padding = Box.fromArray([size / 4, size / 3]);
+    var padding = Box.fromArray([size / 4, size / 3]);
-        // top
+    // top
-        areas.push(new RhombusActionArea(
+    areas.push(new RhombusActionArea(DIRECTION(Direction.TOP),
-        DIRECTION(Direction.TOP),
+      new Rectangle(padding.left + size * 0.5, height - size * 2 - padding.bottom, size, size)));
-        new Rectangle(padding.left + size * 0.5, height - size * 2 - padding.bottom, size, size )
+    // left
-        ));
+    areas.push(new RhombusActionArea(DIRECTION(Direction.LEFT),
-        // left
+      new Rectangle(padding.left, height - size * 1.5 - padding.bottom, size, size)));
-        areas.push(new RhombusActionArea(
+    // bottom
-        DIRECTION(Direction.LEFT),
+    areas.push(new RhombusActionArea(DIRECTION(Direction.BOTTOM),
-        new Rectangle(padding.left, height - size * 1.5 - padding.bottom, size, size)
+      new Rectangle(padding.left + size * 0.5, height - size - padding.bottom, size, size)));
-        ));
+    // right
-        // bottom
+    areas.push(new RhombusActionArea(DIRECTION(Direction.RIGHT),
-        areas.push(new RhombusActionArea(
+      new Rectangle(padding.left + size, height - size * 1.5 - padding.bottom, size, size)));
-        DIRECTION(Direction.BOTTOM),
+    // key 0
-        new Rectangle(padding.left + size * 0.5, height - size - padding.bottom, size, size)
+    areas.push(new CircleActionArea(KEY(0),
-        ));
+      new Circle(width - size * 0.5 - padding.right, height - size * 0.5 - padding.bottom, size / 2)));
-        // right
+    // key 1
-        areas.push(new RhombusActionArea(
+    areas.push(new CircleActionArea(KEY(1),
-        DIRECTION(Direction.RIGHT),
+      new Circle(width - size * 0.5 - padding.right, height - size * 1.5 - padding.bottom, size / 2)));
-        new Rectangle(padding.left + size, height - size * 1.5 - padding.bottom, size, size)
+    return areas;
-        ));
+  }
-        // key 0
-        areas.push(new CircleActionArea(
-        KEY(0),
-        new Circle(width - size * 0.5 - padding.right, height - size * 0.5 - padding.bottom, size / 2)
-        ));
-        // key 1
-        areas.push(new CircleActionArea(
-        KEY(1),
-        new Circle(width - size * 0.5 - padding.right, height - size * 1.5 - padding.bottom, size / 2)
-        ));
-        return areas;
-    }
 }