From 27862e19dfd4c8e4061b2009da178c0dd96b22be Mon Sep 17 00:00:00 2001
From: Sheldan <5037282+Sheldan@users.noreply.github.com>
Date: Sun, 7 Sep 2025 15:25:50 +0200
Subject: [PATCH] survivors: chainBall now attacks the furthest away enemy
 within range refactoring player stats a bit changing schedule the enemies are
 spawned

---
 absurd-survivors/src/Player.ts     | 23 ++++++++++++++++-------
 absurd-survivors/src/World.ts      | 18 ++++++++++++++++++
 absurd-survivors/src/main.ts       |  5 ++++-
 absurd-survivors/src/projectile.ts |  1 -
 absurd-survivors/src/weapons.ts    |  7 ++++++-
 5 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/absurd-survivors/src/Player.ts b/absurd-survivors/src/Player.ts
index 02133de..6ee8a52 100644
--- a/absurd-survivors/src/Player.ts
+++ b/absurd-survivors/src/Player.ts
@@ -162,12 +162,21 @@ export class PlayerStatus {
 }
 
 export class PlayerStats {
-    constructor(private _speed: number,
-                private _size: number,
-                private _health: number,
-                private _pullRange: number,
-                private _weaponRange: number,
-                private _weaponRangeFactor: number) {
+
+    private _speed: number;
+    private _size: number;
+    private _health: number;
+    private _pullRange: number;
+    private _weaponRange: number;
+    private _weaponRangeFactor: number;
+
+    constructor() {
+        this._speed = 3;
+        this._size = 5;
+        this._health = 10;
+        this._pullRange = 150;
+        this._weaponRange = 250;
+        this._weaponRangeFactor = 1;
     }
 
     increaseLevel() {
@@ -228,6 +237,6 @@ export class PlayerStats {
     }
 
     public static defaultPlayerStats(): PlayerStats {
-        return new PlayerStats(3, 5, 10, 150, 250, 1);
+        return new PlayerStats();
     }
 }
\ No newline at end of file
diff --git a/absurd-survivors/src/World.ts b/absurd-survivors/src/World.ts
index 8934e17..bf91768 100644
--- a/absurd-survivors/src/World.ts
+++ b/absurd-survivors/src/World.ts
@@ -90,6 +90,24 @@ export class World {
         return this.getClosestTargetToButNot(point, undefined, range)
     }
 
+    getFarthestTargetButWithin(point: Vector, range?: number): [number, Placeable | undefined] | undefined {
+        let currentTarget;
+        let currentDistance = Number.MAX_SAFE_INTEGER;
+        this._enemies.items.forEach(enemy => {
+            let distance = point.distanceTo(enemy.getPosition());
+            if(range && distance > range) {
+                return;
+            }
+            if((range - distance) < currentDistance) {
+                currentDistance = distance;
+                currentTarget = enemy
+            }
+        })
+        if(currentTarget) {
+            return [currentDistance, currentTarget];
+        }
+    }
+
     getClosestTargetToButNot(point: Vector, placeable?: Placeable, range?: number): [number, Placeable | undefined] | undefined {
         return this.getClosestTargetToButNotArray(point, [placeable], range)
     }
diff --git a/absurd-survivors/src/main.ts b/absurd-survivors/src/main.ts
index bb310d9..087a023 100644
--- a/absurd-survivors/src/main.ts
+++ b/absurd-survivors/src/main.ts
@@ -110,9 +110,12 @@ docReady(function () {
 
     setInterval(() => {
         BasicEnemy.spawnBasicEnemy(world)
-        ShootingEnemy.spawnShootingEnemy(world)
     }, 1_000)
 
+    setInterval(() => {
+        ShootingEnemy.spawnShootingEnemy(world)
+    }, 3_000)
+
     setInterval(() => {
         HealthEnemy.spawnHealthEnemy(world)
     }, 15_000)
diff --git a/absurd-survivors/src/projectile.ts b/absurd-survivors/src/projectile.ts
index 2687acc..390ed0d 100644
--- a/absurd-survivors/src/projectile.ts
+++ b/absurd-survivors/src/projectile.ts
@@ -49,7 +49,6 @@ export abstract class Projectile implements Acting, Placeable {
                 this.status.collisionCooldown.resetCooldown()
             }
         } else if(this.parent === this.world.player) {
-            // TODO think why this was done, why do I need to calculate the newest target on _each_ act?
             let closestTargetTo = this.world.getClosestTargetToButNot(this.position, this.lastColliding);
             if(closestTargetTo !== undefined && closestTargetTo[1] !== undefined) {
                 let target: Placeable = closestTargetTo[1]!;
diff --git a/absurd-survivors/src/weapons.ts b/absurd-survivors/src/weapons.ts
index e9d82b0..03c9308 100644
--- a/absurd-survivors/src/weapons.ts
+++ b/absurd-survivors/src/weapons.ts
@@ -97,7 +97,7 @@ export class ChainBall extends MeleeWeapon {
 
     createProjectile(): boolean {
         let range = this.calculateRange()
-        let closestTargetTo = this.world.getClosestTargetTo(this.world.player.position, range);
+        let closestTargetTo = this.world.getFarthestTargetButWithin(this.world.player.position, range);
         if(closestTargetTo !== undefined && closestTargetTo[1] !== undefined) {
             let stats = new ProjectileStats()
                 .withPiercings(1000)
@@ -267,6 +267,11 @@ export class WeaponStats {
 
     constructor() {
         this._weaponRangeFactor = 1
+        this._weaponRange = 0
+        this._projectilePiercings = 0
+        this._projectileSpeed = 100
+        this._damage = 1
+        this._shootInterval = 50
     }
 
     increase() {