Use util.randomFrom function instead of doing this manually

Author: c86ec23b-fef1-4979-b2fa-b9adc351b8cc

src/Gamemodes/Domination.ts

@@ -25,7 +25,7 @@ import TankBody from "../Entity/Tank/TankBody";
 import GameServer from "../Game";
 import ArenaEntity, { ArenaState } from "../Native/Arena";
 import { Entity } from "../Native/Entity";
-
+import { randomFrom } from "../util";
 
 const arenaSize = 11150;
 const baseSize = arenaSize / (3 + 1/3); // 3345, must scale with arena size
@@ -88,7 +88,7 @@ export default class DominationArena extends ArenaEntity {
         const xOffset = (Math.random() - 0.5) * baseSize,
               yOffset = (Math.random() - 0.5) * baseSize;
 
-        const team = this.playerTeamMap.get(client) || this.teams[~~(Math.random() * this.teams.length)];
+        const team = this.playerTeamMap.get(client) || randomFrom(this.teams);
         const teamBase: TeamBase = this.game.entities.inner.find((entity) => entity instanceof TeamBase && entity.relationsData.values.team === team) as TeamBase;
 
         tank.relationsData.values.team = teamBase.relationsData.values.team;

src/Gamemodes/Mothership.ts

@@ -24,7 +24,7 @@ import TankBody from "../Entity/Tank/TankBody";
 import GameServer from "../Game";
 import ArenaEntity, { ArenaState } from "../Native/Arena";
 import { Entity } from "../Native/Entity";
-import { PI2 } from "../util";
+import { PI2, randomFrom } from "../util";
 
 const arenaSize = 11150;
 const TEAM_COLORS = [Color.TeamBlue, Color.TeamRed];
@@ -70,7 +70,7 @@ export default class MothershipArena extends ArenaEntity {
 
     public spawnPlayer(tank: TankBody, client: Client) {
         if (!this.motherships.length && !this.playerTeamMotMap.has(client)) {
-            const team = this.teams[~~(Math.random()*this.teams.length)];
+            const team = randomFrom(this.teams);
             const { x, y } = this.findPlayerSpawnLocation();
 
             tank.positionData.values.x = x;
@@ -80,22 +80,17 @@ export default class MothershipArena extends ArenaEntity {
             return;
         }
 
-        const mothership = this.playerTeamMotMap.get(client) || this.motherships[~~(Math.random() * this.motherships.length)];
+        const mothership = this.playerTeamMotMap.get(client) || randomFrom(this.motherships);
         this.playerTeamMotMap.set(client, mothership);
 
         tank.relationsData.values.team = mothership.relationsData.values.team;
         tank.styleData.values.color = mothership.styleData.values.color;
 
         // TODO: Possess mothership if its unpossessed
-        if (Entity.exists(mothership)) {
-            tank.positionData.values.x = mothership.positionData.values.x;
-            tank.positionData.values.y = mothership.positionData.values.y;
-        } else {
-            const { x, y } = this.findPlayerSpawnLocation();
+        const { x, y } = this.findPlayerSpawnLocation();
 
-            tank.positionData.values.x = x;
-            tank.positionData.values.y = y;
-        }
+        tank.positionData.values.x = x;
+        tank.positionData.values.y = y;
 
         if (client.camera) client.camera.relationsData.team = tank.relationsData.values.team;
     }

src/Gamemodes/Team2.ts

@@ -25,6 +25,7 @@ import TankBody from "../Entity/Tank/TankBody";
 
 import { TeamEntity } from "../Entity/Misc/TeamEntity";
 import { Color } from "../Const/Enums";
+import { randomFrom } from "../util";
 
 const arenaSize = 11150;
 const baseWidth = arenaSize / (3 + 1/3) * 0.6; // 2007
@@ -54,7 +55,7 @@ export default class Teams2Arena extends ArenaEntity {
 
         const xOffset = (Math.random() - 0.5) * baseWidth;
 
-        const base = this.playerTeamMap.get(client) || [this.blueTeamBase, this.redTeamBase][0|Math.random()*2];
+        const base = this.playerTeamMap.get(client) || randomFrom([this.blueTeamBase, this.redTeamBase]);
         tank.relationsData.values.team = base.relationsData.values.team;
         tank.styleData.values.color = base.styleData.values.color;
         tank.positionData.values.x = base.positionData.values.x + xOffset;

src/Gamemodes/Team4.ts

@@ -25,6 +25,7 @@ import TankBody from "../Entity/Tank/TankBody";
 
 import { TeamEntity } from "../Entity/Misc/TeamEntity";
 import { Color } from "../Const/Enums";
+import { randomFrom } from "../util";
 
 const arenaSize = 11150;
 const baseSize = arenaSize / (3 + 1/3); // 3345
@@ -63,7 +64,7 @@ export default class Teams4Arena extends ArenaEntity {
         const xOffset = (Math.random() - 0.5) * baseSize,
               yOffset = (Math.random() - 0.5) * baseSize;
 
-        const base = this.playerTeamMap.get(client) || [this.blueTeamBase, this.redTeamBase, this.greenTeamBase, this.purpleTeamBase][0|Math.random()*4];
+        const base = this.playerTeamMap.get(client) || randomFrom([this.blueTeamBase, this.redTeamBase, this.greenTeamBase, this.purpleTeamBase]);
         tank.relationsData.values.team = base.relationsData.values.team;
         tank.styleData.values.color = base.styleData.values.color;
         tank.positionData.values.x = base.positionData.values.x + xOffset;