init

Author: c86ec23b-fef1-4979-b2fa-b9adc351b8cc

src/Client.ts

@@ -258,8 +258,7 @@ export default class Client {
                 this.inputs.mouse.y = util.constrain(mouseY, minY, maxY);
 
                 const player = camera.cameraData.values.player;
-                if (!Entity.exists(player) || !(player instanceof TankBody)) return;
-
+                if (!TankBody.isTank(player)) return;
                 // No AI
                 if (this.inputs.isPossessing && this.accessLevel !== config.AccessLevel.FullAccess) return;
 
@@ -346,7 +345,7 @@ export default class Client {
                 if (camera.cameraData.statsAvailable <= 0) return;
 
                 const player = camera.cameraData.values.player;
-                if (!Entity.exists(player) || !(player instanceof TankBody)) return;
+                if (!TankBody.isTank(player)) return;
 
                 const definition = getTankById(player.currentTank);
                 if (!definition || !definition.stats.length) return;
@@ -366,7 +365,7 @@ export default class Client {
             }
             case ServerBound.TankUpgrade: {
                 const player = camera.cameraData.values.player;
-                if (!Entity.exists(player) || !(player instanceof TankBody)) return;
+                if (!TankBody.isTank(player)) return;
 
                 const definition = getTankById(player.currentTank);
                 const tankId: Tank = r.vi() ^ TANK_XOR;
@@ -460,7 +459,7 @@ export default class Client {
         ai.state = AIState.possessed;
 
         // Silly workaround to change color of player when needed
-        if (this.camera?.cameraData.values.player instanceof ObjectEntity) {
+        if (ObjectEntity.isObject(this.camera?.cameraData.values.player)) {
             const color = this.camera.cameraData.values.player.styleData.values.color;
             this.camera.cameraData.values.player.styleData.values.color = -1 as Color;
             this.camera.cameraData.values.player.styleData.color = color;
@@ -480,7 +479,7 @@ export default class Client {
         this.camera.cameraData.player = ai.owner;
         this.camera.cameraData.movementSpeed = ai.movementSpeed;
 
-        if (ai.owner instanceof TankBody) {
+        if (TankBody.isTank(ai.owner)) {
             // If its a TankBody, set the stats, level, and tank to that of the TankBody
             this.camera.cameraData.tank = ai.owner.cameraEntity.cameraData.values.tank;
             this.camera.setLevel(ai.owner.cameraEntity.cameraData.values.level);
@@ -490,13 +489,13 @@ export default class Client {
             for (let i = 0; i < StatCount; ++i) this.camera.cameraData.statNames[i as Stat] = ai.owner.cameraEntity.cameraData.statNames.values[i];
 
             this.camera.cameraData.FOV = ai.owner.cameraEntity.cameraData.FOV;
-        } else if (ai.owner instanceof AbstractBoss) {
+        } else if (AbstractBoss.isBoss(ai.owner)) {
             this.camera.setLevel(75);
             this.camera.cameraData.FOV = 0.35;
         } else {
             this.camera.setLevel(30);
         }
-        
+
         this.camera.cameraData.statsAvailable = 0;
         this.camera.cameraData.score = 0;
         this.camera.entityState = EntityStateFlags.needsCreate | EntityStateFlags.needsDelete;

src/Const/Enums.ts

@@ -40,8 +40,9 @@ export const enum Color {
     EnemyTank = 15,
     NecromancerSquare = 16,
     Fallen = 17,
+    EnemyHexagon = 18,
 
-    kMaxColors = 18
+    kMaxColors = 19
 }
 
 /**
@@ -66,6 +67,7 @@ export const ColorsHexCode: Record<Color, number> = {
     [Color.EnemyTank]: 0xF14E54,
     [Color.NecromancerSquare]: 0xFCC376,
     [Color.Fallen]: 0xC0C0C0,
+    [Color.EnemyHexagon]: 0xFCAD76,
     [Color.kMaxColors]: 0x000000
 }
 
@@ -281,6 +283,17 @@ export const enum NameFlags {
     highlightedName = 1 << 1
 }
 
+/**
+ * Entity type flags.
+ */
+export const enum EntityTags {
+    isShape = 1 << 0,
+    isTank = 1 << 1,
+    isDominator = 1 << 2,
+    isBoss = 1 << 3,
+    isShiny= 1 << 4,
+}
+
 /**
  * Credits to CX for discovering this.
  * This is not fully correct but it works up to the decimal (float rounding likely causes this).
@@ -306,4 +319,4 @@ export function levelToScore(level: number): number {
     if (level <= 0) return 0;
 
     return levelToScoreTable[level - 1];
-}
+}

src/Entity/Boss/AbstractBoss.ts

@@ -17,14 +17,16 @@
 */
 
 import GameServer from "../../Game";
+import ObjectEntity from "../Object";
+import LivingEntity from "../Live";
 import Barrel from "../Tank/Barrel";
+import TankBody from "../Tank/TankBody";
 
-import { ClientBound, Color, PositionFlags, NameFlags } from "../../Const/Enums";
+import { ClientBound, Color, PositionFlags, NameFlags, EntityTags } from "../../Const/Enums";
 import { VectorAbstract } from "../../Physics/Vector";
 import { AI, AIState, Inputs } from "../AI";
 import { NameGroup } from "../../Native/FieldGroups";
-import LivingEntity from "../Live";
-import TankBody from "../Tank/TankBody";
+import { Entity } from "../../Native/Entity";
 import { CameraEntity } from "../../Native/Camera";
 
 
@@ -137,6 +139,14 @@ export default class AbstractBoss extends LivingEntity {
         this.reloadTime = 15 * Math.pow(0.914, 7);
 
         this.healthData.values.health = this.healthData.values.maxHealth = 3000;
+
+        this.entityTags |= EntityTags.isBoss;
+    }
+    
+    public static isBoss(entity: Entity | null | undefined): entity is AbstractBoss {
+        if (!ObjectEntity.isObject(entity)) return false;
+
+        return !!(entity.entityTags & EntityTags.isBoss);
     }
 
     public get sizeFactor() {
@@ -158,8 +168,8 @@ export default class AbstractBoss extends LivingEntity {
 
         let killerName: string;
 
-        if ((killer.nameData && killer.nameData.values.name && !(killer.nameData.values.flags & NameFlags.hiddenName))) {
-            killerName = killer.nameData.values.name; // in Diep.io, it should only show the name in notification if it is visible above the killer entity for whatever reason
+        if (TankBody.isTank(killer)) {
+            killerName = killer.nameData.values.name;
         } else {
             killerName = "an unnamed tank";
         }

src/Entity/Live.ts

@@ -18,7 +18,8 @@
 
 import ObjectEntity from "./Object";
 
-import { StyleFlags } from "../Const/Enums";
+import { Entity } from "../Native/Entity";
+import { StyleFlags, EntityTags } from "../Const/Enums";
 import { HealthGroup } from "../Native/FieldGroups";
 
 /**
@@ -57,6 +58,12 @@ export default class LivingEntity extends ObjectEntity {
 
         super.destroy(animate);
     }
+    
+    public static isLive(entity: Entity | null | undefined): entity is LivingEntity {
+        if (!ObjectEntity.isObject(entity)) return false;
+
+        return !!entity.healthData;
+    }
 
     /** Applies damage to two entity after colliding with eachother. */
     public static handleCollision(entity1: LivingEntity, entity2: LivingEntity) {

src/Entity/Misc/Dominator.ts

@@ -100,10 +100,12 @@ export default class Dominator extends TankBody {
     }
 
     public onDeath(killer: LivingEntity) {
-        if (this.relationsData.values.team === this.game.arena && killer.relationsData.values.team instanceof TeamEntity) {
-            const killerTeam = killer.relationsData.values.team;
-            this.relationsData.team = killerTeam || this.game.arena;
-            this.styleData.color = this.relationsData.team.teamData?.teamColor || killer.styleData.values.color;
+        const killerTeam = killer.relationsData.values.team;
+        
+        if (TeamEntity.isTeam(killerTeam) && this.relationsData.values.team === this.game.arena) { // Only proper teams should capture doms
+            // capture neutral dominator
+            this.relationsData.team = killerTeam;
+            this.styleData.color = killerTeam.teamData.values.teamColor
             this.game.broadcast()
                 .u8(ClientBound.Notification)
                 .stringNT(`The ${this.prefix}${this.nameData.values.name} is now controlled by ${killerTeam.teamName}`)

src/Entity/Misc/Mothership.ts

@@ -79,10 +79,10 @@ export default class Mothership extends TankBody {
         if ((this.game.arena.state >= ArenaState.OVER)) return; // Do not send a defeat notification if the game has been won already
 
         const team = this.relationsData.values.team;
-        const teamIsATeam = team instanceof TeamEntity;
+        const teamIsATeam = TeamEntity.isTeam(team);
 
         const killerTeam = killer.relationsData.values.team;
-        const killerTeamIsATeam = killerTeam instanceof TeamEntity;
+        const killerTeamIsATeam = TeamEntity.isTeam(killerTeam);
 
         // UNCOMMENT TO ALLOW SOLO KILLS
         // if (!killerTeamIsATeam) return;

src/Entity/Misc/TeamEntity.ts

@@ -58,4 +58,10 @@ export class TeamEntity extends Entity implements TeamGroupEntity {
         this.teamData.values.teamColor = color;
         this.teamName = name;
     }
+
+    public static isTeam(entity: Entity | null | undefined): entity is TeamEntity {
+        if (!entity) return false;
+
+        return !!entity.teamData
+    }
 }

src/Entity/Object.ts

@@ -22,7 +22,7 @@ import Vector from "../Physics/Vector";
 
 import { PhysicsGroup, PositionGroup, RelationsGroup, StyleGroup } from "../Native/FieldGroups";
 import { Entity } from "../Native/Entity";
-import { PositionFlags, PhysicsFlags } from "../Const/Enums";
+import { PositionFlags, PhysicsFlags, EntityTags } from "../Const/Enums";
 
 /**
  * The animator for how entities delete (the opacity and size fade out).
@@ -70,10 +70,13 @@ class DeletionAnimation {
 export default class ObjectEntity extends Entity {
     /** Always existant relations field group. Present in all objects. */
     public relationsData: RelationsGroup = new RelationsGroup(this);
+
     /** Always existant physics field group. Present in all objects. */
     public physicsData: PhysicsGroup = new PhysicsGroup(this);
+
     /** Always existant position field group. Present in all objects. */
     public positionData: PositionGroup = new PositionGroup(this);
+
     /** Always existant style field group. Present in all objects. */
     public styleData: StyleGroup = new StyleGroup(this);
 
@@ -92,6 +95,12 @@ export default class ObjectEntity extends Entity {
     /** Used to determine the parent of all parents. */
     public rootParent: ObjectEntity = this;
 
+    /** Entity tags. */
+    public entityTags: number = 0;
+    
+    /** Entity type ID. */
+    public arenaMobID: string = ""
+
     /** Velocity used for physics. */
     public velocity = new Vector();
 
@@ -108,6 +117,12 @@ export default class ObjectEntity extends Entity {
 
         this.styleData.zIndex = game.entities.zIndex++;
     }
+    
+    public static isObject(entity: Entity | null | undefined): entity is ObjectEntity {
+        if (!entity) return false;
+
+        return !!entity.physicsData;
+    }
 
     /** Receives collision pairs from CollisionManager and applies kb */
     public static handleCollision(objA: ObjectEntity, objB: ObjectEntity) {

src/Entity/Shape/AbstractShape.ts

@@ -17,9 +17,11 @@
 */
 
 import GameServer from "../../Game";
+import ObjectEntity from "../Object";
 import LivingEntity from "../Live";
 
-import { Color, PositionFlags, NameFlags } from "../../Const/Enums";
+import { Entity } from "../../Native/Entity";
+import { Color, PositionFlags, NameFlags, EntityTags } from "../../Const/Enums";
 import { NameGroup } from "../../Native/FieldGroups";
 import { AI } from "../AI";
 import { normalizeAngle, PI2 } from "../../util";
@@ -74,6 +76,14 @@ export default class AbstractShape extends LivingEntity {
         this.orbitAngle = this.positionData.values.angle = (Math.random() * PI2);
 
         this.maxDamageMultiplier = 4.0;
+
+        this.entityTags |= EntityTags.isShape;
+    }
+    
+    public static isShape(entity: Entity | null | undefined): entity is AbstractShape {
+        if (!ObjectEntity.isObject(entity)) return false;
+
+        return !!(entity.entityTags & EntityTags.isShape);
     }
 
     protected turnTo(angle: number) {

src/Entity/Shape/Crasher.ts

@@ -59,6 +59,8 @@ export default class Crasher extends AbstractShape {
         this.ai.viewRange = 2000;
         this.ai.aimSpeed = (this.ai.movementSpeed = this.targettingSpeed);
         this.ai['_findTargetInterval'] = tps;
+
+        this.arenaMobID = "crasher";
     }
 
     tick(tick: number) {