encapsulate isSpawnPhase calculation into default config for reusability

Author: Lavodan

src/core/configuration/Config.ts

@@ -93,7 +93,12 @@ export interface Config {
   instantBuild(): boolean;
   isRandomSpawn(): boolean;
   numSpawnPhaseTurns(): number;
-  numSingleplayerGracePeriodTurns(): number;
+  numGracePeriodTurns(): number;
+  isSpawnPhase(
+    ticks: number,
+    gameType: GameType,
+    firstHumanSpawnTick?: number,
+  ): boolean;
   userSettings(): UserSettings;
   playerTeams(): TeamCountConfig;
 

src/core/configuration/DefaultConfig.ts

@@ -633,13 +633,31 @@ export class DefaultConfig implements Config {
   boatMaxNumber(): number {
     return 3;
   }
+
   numSpawnPhaseTurns(): number {
     return this._gameConfig.gameType === GameType.Singleplayer ? 100 : 300;
   }
   // Amount of ticks for player to change spawn placement in singleplayer
-  numSingleplayerGracePeriodTurns(): number {
+  numGracePeriodTurns(): number {
     return 15;
   }
+  isSpawnPhase(
+    ticks: number,
+    gameType: GameType,
+    firstHumanSpawnTick?: number,
+  ): boolean {
+    if (ticks > this.numSpawnPhaseTurns()) {
+      return false;
+    }
+    if (gameType !== GameType.Singleplayer) {
+      return true;
+    }
+    if (!firstHumanSpawnTick) {
+      return true;
+    }
+    return ticks <= firstHumanSpawnTick + this.numGracePeriodTurns();
+  }
+
   numBots(): number {
     return this.bots();
   }

src/core/game/GameImpl.ts

@@ -14,7 +14,6 @@ import {
   Execution,
   Game,
   GameMode,
-  GameType,
   GameUpdates,
   HumansVsNations,
   MessageType,
@@ -341,24 +340,17 @@ export class GameImpl implements Game {
   }
 
   inSpawnPhase(): boolean {
-    if (this._ticks > this.config().numSpawnPhaseTurns()) {
-      return false;
-    }
-    if (this.config().gameConfig().gameType === GameType.Singleplayer) {
-      if (!this.firstHumanSpawnTick) {
-        this.firstHumanSpawnTick = Array.from(this._players.values()).some(
-          (player) => player.type() === PlayerType.Human && player.hasSpawned(),
-        )
-          ? this._ticks
-          : 0;
-      } else {
-        return (
-          this._ticks <=
-          this.firstHumanSpawnTick +
-            this.config().numSingleplayerGracePeriodTurns()
-        );
-      }
+    if (!this.firstHumanSpawnTick) {
+      const humanSpawned = Array.from(this._players.values()).some(
+        (p) => p.type() === PlayerType.Human && p.hasSpawned(),
+      );
+      if (humanSpawned) this.firstHumanSpawnTick = this._ticks;
     }
+    return this._config.isSpawnPhase(
+      this.ticks(),
+      this.config().gameConfig().gameType,
+      this.firstHumanSpawnTick,
+    );
     return true;
   }
 

src/core/game/GameView.ts

@@ -9,7 +9,6 @@ import { WorkerClient } from "../worker/WorkerClient";
 import {
   Cell,
   EmojiMessage,
-  GameType,
   GameUpdates,
   Gold,
   NameViewData,
@@ -658,25 +657,17 @@ export class GameView implements GameMap {
     return this.lastUpdate.tick;
   }
   inSpawnPhase(): boolean {
-    if (this.ticks() > this._config.numSpawnPhaseTurns()) {
-      return false;
-    }
-    if (this._config.gameConfig().gameType === GameType.Singleplayer) {
-      if (!this.firstHumanSpawnTick) {
-        this.firstHumanSpawnTick = Array.from(this._players.values()).some(
-          (player) => player.type() === PlayerType.Human && player.hasSpawned(),
-        )
-          ? this.ticks()
-          : 0;
-      } else {
-        return (
-          this.ticks() <=
-          this.firstHumanSpawnTick +
-            this._config.numSingleplayerGracePeriodTurns()
-        );
-      }
+    if (!this.firstHumanSpawnTick) {
+      const humanSpawned = this.playerViews().some(
+        (p) => p.type() === PlayerType.Human && p.hasSpawned(),
+      );
+      if (humanSpawned) this.firstHumanSpawnTick = this.ticks();
     }
-    return true;
+    return this.config().isSpawnPhase(
+      this.ticks(),
+      this.config().gameConfig().gameType,
+      this.firstHumanSpawnTick,
+    );
   }
   config(): Config {
     return this._config;