Merge pull request #59 from neki-dev/develop

Update to 1.11.1

package.json

@@ -1,7 +1,7 @@
 {
   "name": "izowave",
   "description": "Isometric game. Build and defense in open world",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "keywords": [
     "game",
     "isometric",

src/const/world/difficulty.ts

@@ -183,10 +183,10 @@ export const DIFFICULTY = {
    */
 
   BUILDING_AMMUNITION_COST: 40, // Building cost
-  BUILDING_AMMUNITION_HEALTH: 400, // Health
+  BUILDING_AMMUNITION_HEALTH: 600, // Health
   BUILDING_AMMUNITION_ALLOW_BY_WAVE: 3, // Minimal wave for allow build
   BUILDING_AMMUNITION_RADIUS: 120, // Heal radius
-  BUILDING_AMMUNITION_RADIUS_GROWTH: 0.25, // Radius growth by level (Linear)
+  BUILDING_AMMUNITION_RADIUS_GROWTH: 0.33, // Radius growth by level (Linear)
   BUILDING_AMMUNITION_AMMO: 120, // Ammo amount
   BUILDING_AMMUNITION_AMMO_GROWTH: 1.0, // Ammo amount growth by level (Quadratic)
 

src/game/scenes/world/builder.ts

@@ -540,6 +540,10 @@ export class Builder extends EventEmitter implements IBuilder {
         y: this.scene.input.activePointer.worldY,
       };
     } else {
+      if (this.scene.camera.isZooming()) {
+        return;
+      }
+
       const pointer = this.getCurrentPointer();
 
       if (!pointer.active || pointer.event.target !== this.scene.sys.canvas) {

src/game/scenes/world/camera.ts

@@ -57,13 +57,7 @@ export class Camera implements ICamera {
       });
     } else {
       this.scene.input.on(Phaser.Input.Events.POINTER_MOVE, () => {
-        if (this.scene.game.screen.isJoystickUsing()) {
-          return;
-        }
-
-        const isMultitouch = this.scene.input.pointer1.isDown && this.scene.input.pointer2.isDown;
-
-        if (!isMultitouch) {
+        if (!this.isZooming()) {
           return;
         }
 
@@ -84,6 +78,14 @@ export class Camera implements ICamera {
     }
   }
 
+  public isZooming() {
+    if (this.scene.game.screen.isJoystickUsing()) {
+      return false;
+    }
+
+    return this.scene.input.pointer1.isDown && this.scene.input.pointer2.isDown;
+  }
+
   private updateZoom(value: number) {
     const camera = this.scene.cameras.main;
     const zoom = camera.zoom - value;

src/game/scenes/world/entities/building/building.ts

@@ -845,7 +845,7 @@ export class Building extends Phaser.GameObjects.Image implements IBuilding, ITi
 
   public loadSavePayload(data: BuildingSavePayload) {
     if (data.upgradeLevel > 1) {
-      this.upgradeLevel = data.upgradeLevel;
+      this.upgradeLevel = Math.min(data.upgradeLevel, this.getMeta().MaxLevel);
 
       this.updateActionArea();
       this.setFrame(this.upgradeLevel - 1);

src/game/scenes/world/entities/building/variants/ammunition.ts

@@ -34,7 +34,7 @@ export class BuildingAmmunition extends Building implements IBuildingAmmunition
 
   static AllowByWave = DIFFICULTY.BUILDING_AMMUNITION_ALLOW_BY_WAVE;
 
-  static MaxLevel = 4;
+  static MaxLevel = 3;
 
   private maxAmmo: number = DIFFICULTY.BUILDING_AMMUNITION_AMMO;
 
@@ -152,13 +152,17 @@ export class BuildingAmmunition extends Building implements IBuildingAmmunition
     Tutorial.Complete(TutorialStep.BUY_AMMO);
   }
 
-  private onUpgrade() {
-    const maxAmmo = progressionQuadratic({
+  private getMaxAmmo() {
+    return progressionQuadratic({
       defaultValue: DIFFICULTY.BUILDING_AMMUNITION_AMMO,
       scale: DIFFICULTY.BUILDING_AMMUNITION_AMMO_GROWTH,
       level: this.upgradeLevel,
       roundTo: 10,
     });
+  }
+
+  private onUpgrade() {
+    const maxAmmo = this.getMaxAmmo();
     const addedAmmo = maxAmmo - this.maxAmmo;
 
     this.maxAmmo = maxAmmo;
@@ -175,8 +179,8 @@ export class BuildingAmmunition extends Building implements IBuildingAmmunition
   public loadSavePayload(data: BuildingSavePayload) {
     super.loadSavePayload(data);
 
-    if (data.ammo) {
-      this.ammo = data.ammo;
+    if (data.ammo !== undefined) {
+      this.ammo = Math.min(data.ammo, this.getMaxAmmo());
     }
   }
 }

src/game/scenes/world/entities/building/variants/tower/tower.ts

@@ -297,7 +297,7 @@ export class BuildingTower extends Building implements IBuildingTower {
   public loadSavePayload(data: BuildingSavePayload) {
     super.loadSavePayload(data);
 
-    if (data.ammo) {
+    if (data.ammo !== undefined) {
       this.ammo = data.ammo;
     }
   }

src/game/scenes/world/entities/npc/variants/enemy/variants/tank.ts

@@ -13,7 +13,7 @@ export class EnemyTank extends Enemy {
       ...data,
       texture: EnemyTexture.TANK,
       multipliers: {
-        health: 1.0,
+        health: 1.2,
         damage: 0.6,
         speed: 0.7,
       },

src/game/scenes/world/entities/npc/variants/enemy/variants/termer.ts

@@ -11,8 +11,8 @@ export class EnemyTermer extends Enemy {
       ...data,
       texture: EnemyTexture.TERMER,
       multipliers: {
-        health: 1.7,
-        damage: 1.1,
+        health: 1.8,
+        damage: 1.0,
         speed: 0.8,
       },
     });

src/types/world/camera.ts

@@ -25,4 +25,9 @@ export interface ICamera {
    * Add zoom control.
    */
   addZoomControl(): void
+
+  /**
+   * Check is zooming by touches.
+   */
+  isZooming(): boolean
 }