Remove sizeFactor, add entity scaling function instead (#188)

* Add files via upload

.

* fixes

* Update index.ts

* Update Camera.ts

* Hopefully fix floating barrels

* Remove unused resize method in Barrel class

Removed unused resize method from Barrel class.

* Workaround for setLevel bugs while in possession

* FOV + name fix if overridden by gamemode

---------

Co-authored-by: ABC <79597906+abcxff@users.noreply.github.com>

Author: c86ec23b-fef1-4979-b2fa-b9adc351b8cc

src/Client.ts

@@ -494,6 +494,7 @@ export default class Client {
             this.camera.cameraData.FOV = 0.35;
         } else {
             this.camera.setLevel(30);
+            this.camera.cameraData.FOV = 0.35;
         }
 
         this.camera.cameraData.statsAvailable = 0;
@@ -541,9 +542,9 @@ export default class Client {
 
         const tank = camera.cameraData.player = camera.relationsData.owner = camera.relationsData.parent = new TankBody(this.game, camera, this.inputs);
         tank.setTank(Tank.Basic);
+        tank.nameData.values.name = name;
         this.game.arena.spawnPlayer(tank, this);
         camera.setLevel(camera.cameraData.values.respawnLevel);
-        tank.nameData.values.name = name;
 
         if (this.hasCheated()) this.setHasCheated(true);
 

src/Entity/AI.ts

@@ -113,7 +113,7 @@ export class AI {
         this._aiHash = (AI._aiHashCounter++) % 16384;
 
         this.inputs.mouse.set({
-            x: 20,
+            x: 0,
             y: 0
         });
 

src/Entity/Boss/AbstractBoss.ts

@@ -134,7 +134,7 @@ export default class AbstractBoss extends LivingEntity {
         this.styleData.values.color = Color.Fallen;
 
         this.physicsData.values.sides = 1;
-        this.physicsData.values.size = 50 * Math.pow(1.01, 75 - 1);
+        this.physicsData.values.size = 50;
 
         this.reloadTime = 15 * Math.pow(0.914, 7);
 

src/Entity/Boss/Defender.ts

@@ -36,12 +36,12 @@ const MountedTurretDefinition: BarrelDefinition = {
     ...AutoTurretDefinition,
     bullet: {
         ...AutoTurretDefinition.bullet,
-        speed: 2.3,
-        damage: 1.3,
+        speed: 2.46,
+        damage: 1.2,
         health: 5.75,
         color: Color.Neutral
     }
-};
+}
 
 /**
  * Definitions (stats and data) of the trap launcher on Defender
@@ -78,7 +78,6 @@ const DEFENDER_SIZE = 150;
  * Class which represents the boss "Defender"
  */
 export default class Defender extends AbstractBoss {
-
     /** Defender's trap launchers */
     private trappers: Barrel[] = [];
     /** See AbstractBoss.movementSpeed */
@@ -116,21 +115,9 @@ export default class Defender extends AbstractBoss {
             base.positionData.values.x = this.physicsData.values.size * Math.cos(angle) * offset;
 
             base.physicsData.values.flags |= PositionFlags.absoluteRotation;
-
-            const tickBase = base.tick;
-            base.tick = (tick: number) => {
-                base.positionData.y = this.physicsData.values.size * Math.sin(angle) * offset;
-                base.positionData.x = this.physicsData.values.size * Math.cos(angle) * offset;
-
-                tickBase.call(base, tick);
-            }
         }
     }
 
-    public get sizeFactor() {
-        return (this.physicsData.values.size / Math.SQRT1_2) / DEFENDER_SIZE;
-    }
-
     public tick(tick: number) {
        super.tick(tick);
 

src/Entity/Boss/FallenBooster.ts

@@ -41,10 +41,7 @@ export default class FallenBooster extends AbstractBoss {
             def.bullet = Object.assign({}, def.bullet, { speed: 1.7, health: 6.25, damage:def.bullet.damage * 0.8 });
             this.barrels.push(new Barrel(this, def));
         }
-    }
-
-    public get sizeFactor() {
-        return this.physicsData.values.size / 50;
+        this.scale(Math.pow(1.01, 75 - 1)); // Level 75 size
     }
 
     protected moveAroundMap() {

src/Entity/Boss/FallenOverlord.ts

@@ -34,15 +34,12 @@ export default class FallenOverlord extends AbstractBoss {
         this.nameData.values.name = "Fallen Overlord";
 
         for (const barrelDefinition of TankDefinitions[Tank.Overlord].barrels) {
-
             const def = Object.assign({}, barrelDefinition, { droneCount: 7, reload: 0.36 });
             def.bullet = Object.assign({}, def.bullet, { sizeRatio: 0.5, speed: 1.7, damage: 0.56, health: 12.5 });
             this.barrels.push(new Barrel(this, def));
         }
-    }
 
-    public get sizeFactor() {
-        return this.physicsData.values.size / 50;
+        this.scale(Math.pow(1.01, 75 - 1)); // Level 75 size
     }
 
     public tick(tick: number) {

src/Entity/Misc/ArenaCloser.ts

@@ -37,10 +37,13 @@ export default class ArenaCloser extends TankBody {
         const inputs = new Inputs();
         const camera = new CameraEntity(game);
 
+        super(game, camera, inputs);
+
+        camera.cameraData.values.player = this;
         camera.setLevel(300);
-        camera.sizeFactor = (ArenaCloser.BASE_SIZE / 50);
 
-        super(game, camera, inputs);
+        this.scaleFactor = 1;
+        this.scale(ArenaCloser.BASE_SIZE / this.baseSize);
 
         this.relationsData.values.team = game.arena;
 
@@ -68,7 +71,6 @@ export default class ArenaCloser extends TankBody {
         this.styleData.values.color = Color.Neutral;
         this.positionData.values.flags |= PositionFlags.canMoveThroughWalls;
         this.physicsData.values.flags |= PhysicsFlags.canEscapeArena;
-        camera.cameraData.values.player = this;
 
         for (let i = Stat.MovementSpeed; i < Stat.BodyDamage; ++i) camera.cameraData.values.statLevels.values[i] = 7;
 
@@ -89,7 +91,6 @@ export default class ArenaCloser extends TankBody {
         }
 
         super.tick(tick);
-
         this.ai.movementSpeed = this.cameraEntity.cameraData.movementSpeed = 80;
     }
 }

src/Entity/Misc/BaseDrones.ts

@@ -32,8 +32,8 @@ import { CameraEntity } from "../../Native/Camera";
 const DroneSpawnerDefinition = (count: number): BarrelDefinition => ({
     angle: 0,
     offset: 0,
-    size: 95 / 5,
-    width: 42 / 5,
+    size: 95,
+    width: 42,
     delay: 0,
     reload: 0,
     recoil: 0,
@@ -92,8 +92,4 @@ export default class BaseDrones extends ObjectEntity implements BarrelBase {
         this.droneSpawner.styleData.values.flags = this.styleData.values.flags ^= StyleFlags.isVisible;
 
     }
-
-    public get sizeFactor() {
-        return 5; // Large drone AI range, hacky
-    }
 }

src/Entity/Misc/Boss/FallenAC.ts

@@ -36,6 +36,7 @@ export default class FallenAC extends AbstractBoss {
         for (const barrelDefinition of TankDefinitions[Tank.ArenaCloser].barrels) {
             this.barrels.push(new Barrel(this, barrelDefinition));
         }
+        this.scale(Math.pow(1.01, 75 - 1)); // Level 75 size
     }
 
     public get sizeFactor() {

src/Entity/Misc/Boss/FallenMegaTrapper.ts

@@ -41,6 +41,7 @@ export default class FallenMegaTrapper extends AbstractBoss {
             def.bullet = Object.assign({}, def.bullet, { speed: 1.7, damage: 20, health: 20, });
             this.barrels.push(new Barrel(this, def));
         }
+        this.scale(Math.pow(1.01, 75 - 1)); // Level 75 size
         this.ai.aimSpeed = this.barrels[0].bulletAccel;
 
     }