tweaks

Author: c86ec23b-fef1-4979-b2fa-b9adc351b8cc

src/Entity/Misc/Dominator.ts

@@ -16,10 +16,12 @@
     along with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
-import { Color, ColorsHexCode, NameFlags, StyleFlags, Tank, ClientBound } from "../../Const/Enums";
+import { Color, ColorsHexCode, NameFlags, StyleFlags, EntityTags, Tank, ClientBound } from "../../Const/Enums";
 import ArenaEntity from "../../Native/Arena";
 import ClientCamera, { CameraEntity } from "../../Native/Camera";
+import { Entity } from "../../Native/Entity";
 import { AI, AIState, Inputs } from "../AI";
+import ObjectEntity from "../Object";
 import LivingEntity from "../Live";
 import Bullet from "../Tank/Projectile/Bullet";
 import TankBody from "../Tank/TankBody";
@@ -97,6 +99,14 @@ export default class Dominator extends TankBody {
             this.styleData.values.flags ^= StyleFlags.isFlashing;
             this.damageReduction = 1.0;
         }
+
+        this.entityTags |= EntityTags.isDominator;
+    }
+
+    public static isDominator(entity: Entity | null | undefined): entity is Dominator {
+        if (!ObjectEntity.isObject(entity)) return false;
+
+        return !!(entity.entityTags & EntityTags.isDominator);
     }
 
     public onDeath(killer: LivingEntity) {

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 : (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 + "'s" : "a"} Mothership!`)
             .u32(killerTeamIsATeam ? ColorsHexCode[killerTeam.teamData.values.teamColor] : 0x000000)
             .float(-1)
             .stringNT("").send();   

src/Entity/Misc/TeamEntity.ts

@@ -37,7 +37,7 @@ export const ColorsTeamName: { [K in Color]?: string } = {
     [Color.EnemyTriangle]: "TRIANGLE",
     [Color.EnemyPentagon]: "PENTAGON",
     [Color.EnemyCrasher]: "CRASHER",
-    [Color.Neutral]: "a mysterious group",
+    [Color.Neutral]: "NEUTRAL",
     [Color.ScoreboardBar]: "SCOREBOARD",
     [Color.Box]: "MAZE",
     [Color.EnemyTank]: "ENEMY",
@@ -62,6 +62,6 @@ export class TeamEntity extends Entity implements TeamGroupEntity {
     public static isTeam(entity: Entity | null | undefined): entity is TeamEntity {
         if (!entity) return false;
 
-        return !!entity.teamData
+        return !!entity.teamData;
     }
 }