Players can now spawn from factories

src/Client.ts

@@ -324,11 +324,11 @@ export default class Client {
                         this.setHasCheated(true);
 
                         player.destroy();
-                        player.onKill(player);
                         player.onDeath(player);
+                        player.onKill(player);
                     }
                 }
-                
+
                 return;
             }
             case ServerBound.Spawn: {

src/Const/Commands.ts

@@ -18,28 +18,36 @@
 
 import Client from "../Client"
 import { AccessLevel, maxPlayerLevel } from "../config";
+
+import ObjectEntity from "../Entity/Object";
+import LivingEntity from "../Entity/Live";
+
 import AbstractBoss from "../Entity/Boss/AbstractBoss";
 import Defender from "../Entity/Boss/Defender";
 import FallenBooster from "../Entity/Boss/FallenBooster";
 import FallenOverlord from "../Entity/Boss/FallenOverlord";
 import Guardian from "../Entity/Boss/Guardian";
 import Summoner from "../Entity/Boss/Summoner";
-import LivingEntity from "../Entity/Live";
+
 import ArenaCloser from "../Entity/Misc/ArenaCloser";
 import FallenAC from "../Entity/Misc/Boss/FallenAC";
-import Mothership from "../Entity/Misc/Mothership";
 import FallenSpike from "../Entity/Misc/Boss/FallenSpike";
 import FallenMegaTrapper from "../Entity/Misc/Boss/FallenMegaTrapper";
+
+import Mothership from "../Entity/Misc/Mothership";
 import Dominator from "../Entity/Misc/Dominator";
-import ObjectEntity from "../Entity/Object";
+
 import AbstractShape from "../Entity/Shape/AbstractShape";
 import Crasher from "../Entity/Shape/Crasher";
 import Pentagon from "../Entity/Shape/Pentagon";
 import Square from "../Entity/Shape/Square";
 import Triangle from "../Entity/Shape/Triangle";
+
 import AutoTurret from "../Entity/Tank/AutoTurret";
 import Bullet from "../Entity/Tank/Projectile/Bullet";
 import TankBody from "../Entity/Tank/TankBody";
+
+import { TeamEntity } from "../Entity/Misc/TeamEntity";
 import { AIState } from "../Entity/AI";
 import { Entity, EntityStateFlags } from "../Native/Entity";
 import { saveToVLog } from "../util";
@@ -60,6 +68,7 @@ export const enum CommandID {
     gameGodmode = "game_godmode",
     gameAnnounce = "game_announce",
     gameGoldenName = "game_golden_name",
+    gameNeutral = "game_neutral",
     adminSummon = "admin_summon",
     adminKillAll = "admin_kill_all",
     adminKillEntity = "admin_kill_entity",
@@ -154,6 +163,12 @@ export const commandDefinitions = {
         description: "Toggles the golden nickname color that appears upon using cheats",
         permissionLevel: AccessLevel.FullAccess,
         isCheat: false
+    },
+     game_neutral: {
+        id: CommandID.gameNeutral,
+        description: "Sets your tank's team to the neutral team",
+        permissionLevel: AccessLevel.FullAccess,
+        isCheat: false
     },
     admin_summon: {
         id: CommandID.adminSummon,
@@ -233,9 +248,14 @@ export const commandCallbacks = {
     game_teleport: (client: Client, xArg: string, yArg: string) => {
         const player = client.camera?.cameraData.player;
         if (!Entity.exists(player) || !ObjectEntity.isObject(player)) return;
+
+        if (!xArg || !yArg) return;
+
         const x = xArg.match(RELATIVE_POS_REGEX) ? player.positionData.x + parseInt(xArg.slice(1) || "0", 10) : parseInt(xArg, 10);
         const y = yArg.match(RELATIVE_POS_REGEX) ? player.positionData.y + parseInt(yArg.slice(1) || "0", 10) : parseInt(yArg, 10);
+
         if (isNaN(x) || isNaN(y)) return;
+
         player.positionData.x = x;
         player.positionData.y = y;
         player.setVelocity(0, 0);
@@ -293,6 +313,15 @@ export const commandCallbacks = {
     game_golden_name: (client: Client, activeArg?: string) => {
         client.setHasCheated(!client.hasCheated());
     },
+    game_neutral: (client: Client) => {
+        const team = client.camera?.game.arena;
+        const player = client.camera?.cameraData.values.player;
+
+        if (!team || !player) return;
+        if (!ObjectEntity.isObject(player)) return;
+
+        TeamEntity.setTeam(team, player);
+    },
     admin_summon: (client: Client, entityArg: string, countArg?: string, xArg?: string, yArg?: string) => {
         const count = countArg ? parseInt(countArg) : 1;
         let x = parseInt(xArg || "0", 10);

src/Entity/AI.ts

@@ -88,7 +88,7 @@ export class AI {
     /** The current game. */
     public game: GameServer;
     /** The AI's target. */
-    public target: Entity & { positionData: PositionGroup, physicsData: PhysicsGroup, relationsData: RelationsGroup, velocity: Vector } | null = null;
+    public target: ObjectEntity | null = null;
     /** The speed at which the ai's owner can move. */
     public movementSpeed = 1;
     /** The speed at which the ai can reach the target. */
@@ -168,9 +168,9 @@ export class AI {
                 chunk ^= bitValue;
                 const id = 32 * i + bitIdx;
 
-                const entity = this.game.entities.inner[id] as ObjectEntity;
+                const entity = this.game.entities.inner[id];
                 if (!entity || entity.hash === 0) continue;
-                if (!entity.positionData || !entity.relationsData || !entity.physicsData) continue;
+                if (!ObjectEntity.isObject(entity)) continue;
 
                 if (!entity.isPhysical) continue;
                 // Check if the target is living
@@ -197,7 +197,7 @@ export class AI {
             }
         }
 
-        return this.target = closestEntity as Entity & { positionData: PositionGroup, physicsData: PhysicsGroup, relationsData: RelationsGroup, velocity: Vector };
+        return this.target = closestEntity;
     }
 
     /** Aims and predicts at the target. */

src/Entity/Boss/AbstractBoss.ts

@@ -163,12 +163,10 @@ export default class AbstractBoss extends LivingEntity {
      * Will set game.arena.boss to null, so that the next boss can spawn
      */
     public onDeath(killer: LivingEntity) {
-        let killerName: string;
+        let killerName: string = "an unnamed tank";
 
         if (TankBody.isTank(killer) || AbstractBoss.isBoss(killer)) {
-            killerName = killer.nameData.values.name;
-        } else {
-            killerName = "an unnamed tank";
+            killerName = killer.nameData.values.name || "an unnamed tank";
         }
 
         this.game.broadcast()

src/Entity/Misc/MazeWall.ts

@@ -16,16 +16,17 @@
     along with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-import GameServer from "../../Game";
+import ArenaEntity from "../../Native/Arena";
 import ObjectEntity from "../Object";
 
 import { PhysicsFlags, Color } from "../../Const/Enums";
+
 /**
  * Only used for maze walls and nothing else.
  */
 export default class MazeWall extends ObjectEntity {
     public static newFromBounds(
-        game: GameServer,
+        arena: ArenaEntity,
         minX: number,
         minY: number,
         maxX: number,
@@ -40,11 +41,11 @@ export default class MazeWall extends ObjectEntity {
         const centerX = (minX + maxX) / 2;
         const centerY = (minY + maxY) / 2;
 
-        return new MazeWall(game, centerX, centerY, width, height);
+        return new MazeWall(arena, centerX, centerY, width, height);
     }
 
-    public constructor(game: GameServer, x: number, y: number, width: number, height: number) {
-        super(game);
+    public constructor(arena: ArenaEntity, x: number, y: number, width: number, height: number) {
+        super(arena.game);
 
         this.setGlobalEntity();
 
@@ -58,7 +59,7 @@ export default class MazeWall extends ObjectEntity {
         this.physicsData.values.pushFactor = 2;
         this.physicsData.values.absorbtionFactor = 0;
 
-        this.relationsData.values.team = this.game.arena;
+        this.relationsData.values.team = arena;
 
         this.styleData.values.borderWidth = 10;
         this.styleData.values.color = Color.Box;

src/Entity/Misc/Mothership.ts

@@ -89,7 +89,7 @@ export default class Mothership extends TankBody {
         this.game.broadcast()
             .u8(ClientBound.Notification)
             // If mothership has a team name, use it, otherwise just say has destroyed a mothership
-            .stringNT(`${killerTeamIsATeam ? (killerTeam.teamName || "a mysterious group") : (killer.nameData?.values.name || "an unnamed tank")} has destroyed ${teamIsATeam ? team.teamName + "'s" : "a"} Mothership!`)
+            .stringNT(`${killerTeamIsATeam ? (killerTeam.teamName || "a mysterious group") : (killer.nameData?.values.name || "an unnamed tank")} has destroyed ${teamIsATeam ? (team.teamName || "a mysterious group") + "'s" : "a"} Mothership!`)
             .u32(killerTeamIsATeam ? ColorsHexCode[killerTeam.teamData.values.teamColor] : 0x000000)
             .float(-1)
             .stringNT("").send();   

src/Entity/Misc/TeamBase.ts

@@ -19,7 +19,7 @@
 import GameServer from "../../Game";
 
 import { HealthFlags, PhysicsFlags, StyleFlags } from "../../Const/Enums";
-import { TeamGroupEntity } from "./TeamEntity";
+import { TeamEntity, TeamGroupEntity } from "./TeamEntity";
 import LivingEntity from "../Live";
 import BaseDrones from "./BaseDrones";
 /**
@@ -34,6 +34,8 @@ export default class TeamBase extends LivingEntity {
 
         this.relationsData.values.team = team;
 
+        if (team instanceof TeamEntity) team.base = this;
+
         this.positionData.values.x = x;
         this.positionData.values.y = y;
 

src/Entity/Misc/TeamEntity.ts

@@ -17,6 +17,9 @@
 */
 
 import GameServer from "../../Game";
+import TeamBase from "./TeamBase";
+import ObjectEntity from "../Object";
+import TankBody from "../Tank/TankBody";
 
 import { Color } from "../../Const/Enums";
 import { Entity } from "../../Native/Entity";
@@ -51,6 +54,9 @@ export class TeamEntity extends Entity implements TeamGroupEntity {
 
     /** Used for notifications in team based gamemodes */
     public teamName: string;
+
+    /** The team's spawn base. */
+    public base: TeamBase | null = null;
 
     public constructor(game: GameServer, color: Color, name: string = ColorsTeamName[color] || "UNKNOWN") {
         super(game);
@@ -64,4 +70,16 @@ export class TeamEntity extends Entity implements TeamGroupEntity {
 
         return !!entity.teamData;
     }
+
+    public static setTeam(team: TeamGroupEntity, entity: ObjectEntity) {
+        if (!Entity.exists(entity)) return;
+
+        entity.relationsData.values.team = team;
+
+        entity.styleData.color = team.teamData.values.teamColor;
+
+        if (TankBody.isTank(entity)) {
+            entity.cameraEntity.relationsData.values.team = team;
+        }
+    }
 }

src/Entity/Object.ts

@@ -18,7 +18,7 @@
 
 import * as util from "../util";
 import GameServer from "../Game";
-import Vector from "../Physics/Vector";
+import Vector, { VectorAbstract } from "../Physics/Vector";
 
 import { PhysicsGroup, PositionGroup, RelationsGroup, StyleGroup } from "../Native/FieldGroups";
 import { Entity } from "../Native/Entity";
@@ -95,11 +95,11 @@ export default class ObjectEntity extends Entity {
     /** Used to determine the parent of all parents. */
     public rootParent: ObjectEntity = this;
 
-    /** Entity tags. */
+    /** Entity bit flag tags. */
     public entityTags: number = 0;
 
     /** Entity type ID. */
-    public arenaMobID: string = ""
+    public arenaMobID: string | null = null;
 
     /** Velocity used for physics. */
     public velocity = new Vector();
@@ -231,7 +231,11 @@ export default class ObjectEntity extends Entity {
 
         if (this.physicsData.values.flags & PhysicsFlags.showsOnMap) {
             const globalEntities = this.game.entities.globalEntities;
-            util.removeFast(globalEntities, globalEntities.indexOf(this.id));
+            const id = this.id;
+
+            if (!globalEntities.includes(id)) return;
+
+            util.removeFast(globalEntities, globalEntities.indexOf(id));
         }
 
         super.delete();

src/Entity/Tank/Barrel.ts

@@ -1,5 +1,5 @@
 /*
-    DiepCustom - custom tank game server that shares diep.io's WebSocket protocol
+    DiepCustom - custom tank game server that shares diep.io"s WebSocket protocol
     Copyright (C) 2022 ABCxFF (github.com/ABCxFF)
 
     This program is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ import { BarrelAddon, BarrelAddonById } from "./BarrelAddons";
 import { Swarm } from "./Projectile/Swarm";
 import NecromancerSquare from "./Projectile/NecromancerSquare";
 /**
- * Class that determines when barrels can shoot, and when they can't.
+ * Class that determines when barrels can shoot, and when they can"t.
  */
 export class ShootCycle {
     /** The barrel this cycle is keeping track of. */
@@ -61,7 +61,7 @@ export class ShootCycle {
             this.reloadTime = this.barrelEntity.barrelData.reloadTime = reloadTime;
         }
 
-        const alwaysShoot = (this.barrelEntity.definition.forceFire) || (this.barrelEntity.definition.bullet.type === 'drone') || (this.barrelEntity.definition.bullet.type === 'minion');
+        const alwaysShoot = (this.barrelEntity.definition.forceFire) || (this.barrelEntity.definition.bullet.type === "drone") || (this.barrelEntity.definition.bullet.type === "minion");
 
         if (this.pos >= reloadTime) {
             // When its not shooting dont shoot, unless its a drone
@@ -70,7 +70,7 @@ export class ShootCycle {
                 return;
             }
             // When it runs out of drones, dont shoot
-            if (typeof this.barrelEntity.definition.droneCount === 'number' && this.barrelEntity.droneCount >= this.barrelEntity.definition.droneCount) {
+            if (typeof this.barrelEntity.definition.droneCount === "number" && this.barrelEntity.droneCount >= this.barrelEntity.definition.droneCount) {
                 this.pos = reloadTime;
                 return;
             }
@@ -105,7 +105,7 @@ export default class Barrel extends ObjectEntity {
     /** Number of drones that this barrel shot that are still alive. */
     public droneCount = 0;
 
-    /** The barrel's addons */
+    /** The barrel"s addons */
     public addons: BarrelAddon[] = [];
 
     /** Always existant barrel field group, present on all barrels. */
@@ -169,32 +169,32 @@ export default class Barrel extends ObjectEntity {
             case "rocket":
                 new Rocket(this, this.tank, tankDefinition, angle);
                 break;
-            case 'bullet': {
+            case "bullet": {
                 projectile = new Bullet(this, this.tank, tankDefinition, angle);
 
                 if (tankDefinition && (tankDefinition.id === Tank.ArenaCloser || tankDefinition.id === DevTank.Squirrel)) projectile.positionData.flags |= PositionFlags.canMoveThroughWalls;
                 break;
             }
-            case 'trap':
+            case "trap":
                 projectile = new Trap(this, this.tank, tankDefinition, angle);
                 break;
-            case 'drone':
+            case "drone":
                 projectile = new Drone(this, this.tank, tankDefinition, angle);
                 break;
-            case 'necrodrone':
+            case "necrodrone":
                 projectile = new NecromancerSquare(this, this.tank, tankDefinition, angle);
                 break;
-            case 'swarm':
+            case "swarm":
                 projectile = new Swarm(this, this.tank, tankDefinition, angle);
                 break;
-            case 'minion':
+            case "minion":
                 projectile = new Minion(this, this.tank, tankDefinition, angle);
                 break;
-            case 'flame':
+            case "flame":
                 projectile = new Flame(this, this.tank, tankDefinition, angle);
                 break;
-            case 'wall': {
-                const w = projectile = new MazeWall(this.game, Math.round(this.tank.inputs.mouse.x / 50) * 50, Math.round(this.tank.inputs.mouse.y / 50) * 50, 250, 250);
+            case "wall": {
+                const w = projectile = new MazeWall(this.game.arena, Math.round(this.tank.inputs.mouse.x / 50) * 50, Math.round(this.tank.inputs.mouse.y / 50) * 50, 250, 250);
                 setTimeout(() => {
                     w.delete();
                 }, 60 * 1000);
@@ -204,7 +204,7 @@ export default class Barrel extends ObjectEntity {
                 projectile = new CrocSkimmer(this, this.tank, tankDefinition, angle);
                 break;
             default:
-                util.log('Ignoring attempt to spawn projectile of type ' + this.definition.bullet.type);
+                util.log("Ignoring attempt to spawn projectile of type " + this.definition.bullet.type);
                 break;
         }
 

src/Entity/Tank/Projectile/Bullet.ts

@@ -73,7 +73,7 @@ export default class Bullet extends LivingEntity {
 
         this.physicsData.values.sides = 1;
         this.physicsData.values.flags |= PhysicsFlags.noOwnTeamCollision | PhysicsFlags.canEscapeArena;
-        if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls || this.relationsData.values.team === this.game.arena) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls
+        if (tank.positionData.values.flags & PositionFlags.canMoveThroughWalls) this.positionData.values.flags |= PositionFlags.canMoveThroughWalls
         this.physicsData.values.size = (barrel.physicsData.values.width / 2) * bulletDefinition.sizeRatio;
         this.styleData.values.color = tank.rootParent.styleData.values.color;
         this.styleData.values.flags |= StyleFlags.hasNoDmgIndicator;