[common] multiple weapon support

CHANGELOG.md

@@ -2,6 +2,7 @@
 ------
 * Improved `ResultFrame`
 * Improved bonuses
+* Set `DeviceType.SCREEN` as default on mobile devices 
 
 0.16.0
 ------

WORK.md

@@ -5,3 +5,4 @@
 * improve bots
 * save human state in classic game
 * game config macro
+* additional weapon (rockets)

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

@@ -1,7 +1,5 @@
 package ru.m.tankz;
 
-import haxework.color.Color;
-import haxework.view.utils.DrawUtil.FillType;
 import flash.text.TextFormatAlign;
 import haxework.color.Color;
 import haxework.view.geometry.Box;
@@ -10,6 +8,7 @@ import haxework.view.geometry.SizeValue;
 import haxework.view.geometry.VAlign;
 import haxework.view.theme.ITheme;
 import haxework.view.theme.Theme;
+import haxework.view.utils.DrawUtil;
 import openfl.Assets;
 import ru.m.skin.ButtonSVGSkin;
 

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

@@ -20,7 +20,7 @@ class HumanControl extends Control {
     private var binding:Map<DeviceType, Map<DeviceAction, TankAction>>;
 
     private var moveQueue:Array<Direction>;
-    private var shotTimer:Timer;
+    private var shotTimers:Map<Int, Timer>;
 
     public function new(playerId:PlayerId, controlIndex:Int) {
         super(playerId);
@@ -34,6 +34,7 @@ class HumanControl extends Control {
             binding.get(bind.device).set(bind.action, action);
         }
         moveQueue = [];
+        shotTimers = new Map();
     }
 
     public function hasDevice(device:DeviceType):Bool {
@@ -60,10 +61,10 @@ class HumanControl extends Control {
         super.stop();
         bus.signal.disconnect(onDeviceAction);
         moveQueue = [];
-        if (shotTimer != null) {
+        for (timer in shotTimers) {
-            shotTimer.stop();
+            timer.stop();
-            shotTimer = null;
         }
+        shotTimers = new Map();
     }
 
     public function toggleAction(action:TankAction, on:Bool):Void {
@@ -77,17 +78,18 @@ class HumanControl extends Control {
                     moveQueue.remove(direction);
                 }
                 updateMove();
-            case TankAction.SHOT:
+            case TankAction.SHOT(weapon):
                 if (on) {
-                    if (shotTimer == null) {
+                    if (!shotTimers.exists(weapon)) {
-                        shotTimer = new Timer(300);
+                        var timer = new Timer(300);
-                        shotTimer.run = shot;
+                        timer.run = shooter(weapon);
-                        shot();
+                        timer.run();
+                        shotTimers.set(weapon, timer);
                     }
                 } else {
-                    if (shotTimer != null) {
+                    if (shotTimers.exists(weapon)) {
-                        shotTimer.stop();
+                        shotTimers.get(weapon).stop();
-                        shotTimer = null;
+                        shotTimers.remove(weapon);
                     }
                 }
             case TankAction.STOP:
@@ -107,7 +109,9 @@ class HumanControl extends Control {
         }
     }
 
-    private function shot():Void {
+    private function shooter(weapon:Int):Void -> Void {
-        action(SHOT);
+        return function():Void {
+            action(SHOT(weapon));
+        }
     }
 }

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

@@ -20,7 +20,7 @@ class RenderUtil {
     }
 
     public static function bulletImage(piercing:Int = 0):BitmapData {
-        var type = piercing > 0 ? 'piercing' : 'normal';
+        var type = piercing > 1 ? 'piercing' : 'normal';
         return Assets.getBitmapData('resources/image/bullet/${type}.png');
     }
 }

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

@@ -24,6 +24,8 @@ class BitmapRenderItem extends RenderItem {
         if (image != value) {
             image = value;
             bitmap.bitmapData = image;
+            bitmap.width = rect.width;
+            bitmap.height = rect.height;
         }
         return image;
     }

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

@@ -11,7 +11,7 @@ import ru.m.tankz.control.Control;
 
 class SettingsStorage extends SharedObjectStorage {
 
-    private static inline var VERSION = 3;
+    private static inline var VERSION = 4;
 
     public function new() {
         super('settings_${VERSION}');
@@ -36,7 +36,8 @@ class SettingsStorage extends SharedObjectStorage {
             MOVE(Direction.LEFT) => {device: device, action: DIRECTION(Direction.LEFT)},
             MOVE(Direction.BOTTOM) => {device: device, action: DIRECTION(Direction.BOTTOM)},
             MOVE(Direction.RIGHT) => {device: device, action: DIRECTION(Direction.RIGHT)},
-            SHOT => {device: device, action: KEY(0)},
+            SHOT(0) => {device: device, action: KEY(0)},
+            SHOT(1) => {device: device, action: KEY(1)},
         ];
     }
 
@@ -46,7 +47,8 @@ class SettingsStorage extends SharedObjectStorage {
             MOVE(Direction.LEFT) => null,
             MOVE(Direction.BOTTOM) => null,
             MOVE(Direction.RIGHT) => null,
-            SHOT => null,
+            SHOT(0) => null,
+            SHOT(1) => null,
         ];
     }
 
@@ -60,14 +62,16 @@ class SettingsStorage extends SharedObjectStorage {
             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 => {device: KEYBOARD, action: KEY(Keyboard.SPACE)},
+            SHOT(0) => {device: KEYBOARD, action: KEY(Keyboard.SPACE)},
+            SHOT(1) => {device: KEYBOARD, action: KEY(Keyboard.Q)},
         ],
         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 => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_0)},
+            SHOT(0) => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_0)},
+            SHOT(1) => {device: KEYBOARD, action: KEY(Keyboard.NUMPAD_DECIMAL)},
         ],
     ];
 }

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

@@ -2,8 +2,11 @@
 views:
     - $type: haxework.view.group.VGroupView
       style: container
-      layout.margin: 10
       overflow.y: scroll
+      views:
+          - $type: haxework.view.group.VGroupView
+            layout.margin: 10
+            layout.hAlign: center
             views:
                 - $type: haxework.view.form.LabelView
                   text: Tank'z
@@ -22,10 +25,13 @@ views:
                   style: button.menu
                   +onPress: ~startGame('death')
                   text: DeathMatch
+                - $type: haxework.view.SpriteView
+                  style: line
                 - $type: haxework.view.form.ButtonView
                   style: button.menu
                   +onPress: ~switcher.change('record')
                   text: Records
+                  visible: false
                 - id: network
                   $type: haxework.view.form.ButtonView
                   style: button.menu

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

@@ -43,6 +43,7 @@ class ViewUtil {
     public static function toActionLabel(action:TankAction):String {
         return switch (action) {
             case MOVE(d): 'MOVE_$d';
+            case SHOT(w): 'SHOT_$w';
             case x: '$x';
         }
     }

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

@@ -33,9 +33,15 @@ class SmartActionAreaBuilder implements IActionAreaBuilder {
         DIRECTION(Direction.RIGHT),
         new Rectangle(padding + size, height - size * 1.5 - padding, size, size)
         ));
+        // key 0
         areas.push(new CircleActionArea(
         KEY(0),
-        new Circle(width - size * 1 - padding, height - size * 1 - padding, size / 2)
+        new Circle(width - size * 1 - padding, height - size * 0.5 - padding, size / 2)
+        ));
+        // key 1
+        areas.push(new CircleActionArea(
+        KEY(1),
+        new Circle(width - size * 1 - padding, height - size * 1.5 - padding, size / 2)
         ));
         return areas;
     }

src/common/haxe/ru/m/geom/Point.hx

@@ -13,6 +13,10 @@ class Point {
         return new Point(x + point.x, y + point.y);
     }
 
+    public function clone():Point {
+        return new Point(x, y);
+    }
+
     public function hashCode():Int {
         return Std.int(x + 1000 * y);
     }

src/common/haxe/ru/m/tankz/bot/BotControl.hx

@@ -32,7 +32,7 @@ class BotControl extends Control {
             shotTimer.stop();
             shotTimer = null;
         }
-        action(SHOT);
+        action(SHOT(0));
     }
 
     public function shot(delay:Int = 100):Void {

src/common/haxe/ru/m/tankz/control/Control.hx

@@ -10,7 +10,7 @@ import ru.m.tankz.Type;
 enum TankAction {
     MOVE(direction:Direction);
     STOP;
-    SHOT;
+    SHOT(weapon:Int);
 }
 
 class Control {

src/common/haxe/ru/m/tankz/core/Bullet.hx

@@ -9,6 +9,7 @@ class Bullet extends MobileEntity {
     public var playerId(default, null):PlayerId;
     public var tankId(get, null):Int;
     public var tank(default, default):Tank;
+    public var weapon(default, default):Weapon;
     public var config(default, null):BulletConfig;
 
     public function new(id:Int, rect:Rectangle, playerId:PlayerId, config:BulletConfig) {

src/common/haxe/ru/m/tankz/core/Weapon.hx

@@ -5,8 +5,10 @@ import ru.m.tankz.config.Config;
 class Weapon {
 
     public var config(default, null):WeaponConfig;
+    public var count(default, default):Int;
 
     public function new(config:WeaponConfig) {
         this.config = config;
+        this.count = 0;
     }
 }

src/common/haxe/ru/m/tankz/game/EntityBuilder.hx

@@ -56,9 +56,7 @@ class EntityBuilder {
         return tank;
     }
 
-    public function buildBullet(point:Point, direction:Direction, playerId:PlayerId, type:TankType):Bullet {
+    public function buildBullet(point:Point, direction:Direction, playerId:PlayerId, bulletConfig:BulletConfig):Bullet {
-        var tankConfig = config.getTank(type);
-        var bulletConfig = tankConfig.weapons[0].bullet;
         var bullet = new Bullet(++entityId, new Rectangle(point.x - bulletConfig.width / 2, point.y - bulletConfig.height / 2, bulletConfig.width, bulletConfig.height, direction), playerId, bulletConfig);
         return bullet;
     }

src/common/haxe/ru/m/tankz/game/GameRunner.hx

@@ -1,5 +1,6 @@
 package ru.m.tankz.game;
 
+import ru.m.tankz.core.Weapon;
 import ru.m.geom.Line;
 import ru.m.geom.Point;
 import ru.m.tankz.bonus.BonusFactory;
@@ -155,8 +156,10 @@ class GameRunner extends Game implements EngineListener {
                 tank.rect.lean(cell.rect);
                 emitTankMove(tank);
             case [BULLET(bullet), BULLET(other_bullet)]:
+                if (bullet.playerId != other_bullet.playerId) {
                     gameEventSignal.emit(DESTROY(BULLET(bullet.id)));
                     gameEventSignal.emit(DESTROY(BULLET(other_bullet.id)));
+                }
             case [BULLET(bullet), CELL(cell)]:
                 bullet.rect.lean(cell.rect);
                 gameEventSignal.emit(HIT(CELL(cell.cellX, cell.cellY, buildShot(bullet))));
@@ -256,14 +259,16 @@ class GameRunner extends Game implements EngineListener {
                     timer.stop();
                     timer = null;
                 }
-            case ACTION(tankId, SHOT):
+            case ACTION(tankId, SHOT(index)):
                 var tank:Tank = cast engine.entities.get(tankId);
                 var player = getPlayer(tank.playerId);
-                if (!tank.freezing && player.bullets < tank.weapon.config.count) {
+                var weapon:Weapon = tank.weapons.length > index - 1 ? tank.weapons[index] : null;
+                if (weapon != null && !tank.freezing && weapon.count < weapon.config.count) {
                     var rect = tank.rect;
                     var point = rect.center.add(new Point(rect.width / 4 * rect.direction.x, rect.height / 4 * rect.direction.y));
-                    var bullet = builder.buildBullet(point, rect.direction, player.id, tank.config.type);
+                    var bullet = builder.buildBullet(point, rect.direction, player.id, weapon.config.bullet);
                     bullet.tank = tank;
+                    bullet.weapon = weapon;
                     bullet.move(bullet.rect.direction);
                     engine.spawn(bullet);
                     gameEventSignal.emit(EventUtil.buildBulletSpawn(bullet));
@@ -279,8 +284,9 @@ class GameRunner extends Game implements EngineListener {
                 var player = getPlayer(playerId);
                 player.tankId = id;
                 player.state.tank = info;
-            case SPAWN(BULLET(_, _, playerId, _)):
+            case SPAWN(BULLET(id, _, _, _)):
-                getPlayer(playerId).bullets++;
+                var bullet:Bullet = engine.getEntity(id);
+                bullet.weapon.count++;
             case CHANGE(BRICK(id, type)):
                 engine.map.bricksById[id].config = config.getBrick(type);
             case DESTROY(EAGLE(id, shot)):
@@ -344,8 +350,7 @@ class GameRunner extends Game implements EngineListener {
                 engine.destroy(id);
             case DESTROY(BULLET(id)):
                 var bullet:Bullet = engine.getEntity(id);
-                var player = getPlayer(bullet.playerId);
+                bullet.weapon.count--;
-                player.bullets--;
                 var side:Line = bullet.rect.getSide(bullet.rect.direction.reverse()).move(
                     // ToDo: move
                     new Point(bullet.rect.direction.x * 5, bullet.rect.direction.y * 5)

src/common/haxe/ru/m/tankz/game/Player.hx

@@ -10,7 +10,6 @@ class Player {
     public var tankId(default, set):Int;
     public var isAlive(get, null):Bool;
     public var state(default, default):PlayerState;
-    public var bullets(default, default):Int;
 
     public function new(teamId:TeamId, config:PlayerConfig, state:PlayerState = null) {
         this.config = config;
@@ -18,7 +17,6 @@ class Player {
         this.state = state == null ? new PlayerState(id) : state;
         this.state.reset();
         this.state.life = Math.isNaN(config.life) ? 0 : config.life;
-        this.bullets = 0;
         this.tankId = -1;
     }
 

src/common/resources/config/death.yaml

@@ -86,5 +86,7 @@ tanks:
     weapons:
       - bullet: {<<: *bullet, speed: 12.0}
         count: 2
+      - bullet: {<<: *bullet, speed: 4.0, width: 16, height: 16, piercing: 4}
+        count: 1
 
 bonuses: []