fix

Author: Aotumuri

src/core/execution/SpawnExecution.ts

@@ -37,22 +37,30 @@ export class SpawnExecution implements Execution {
   tick(ticks: number) {
     this.active = false;
 
-    const isSingleplayerNationSpawn =
-      this.playerInfo.playerType === PlayerType.Nation &&
-      this.mg.config().gameConfig().gameType === GameType.Singleplayer;
-
-    if (!this.mg.inSpawnPhase() && !isSingleplayerNationSpawn) {
-      this.active = false;
-      return;
-    }
-
     let player: Player | null = null;
     if (this.mg.hasPlayer(this.playerInfo.id)) {
       player = this.mg.player(this.playerInfo.id);
     } else {
       player = this.mg.addPlayer(this.playerInfo);
     }
 
+    const isSingleplayer =
+      this.mg.config().gameConfig().gameType === GameType.Singleplayer;
+    const isSingleplayerNationSpawn =
+      this.playerInfo.playerType === PlayerType.Nation && isSingleplayer;
+    const isSingleplayerInitialHumanSpawn =
+      isSingleplayer &&
+      this.playerInfo.playerType === PlayerType.Human &&
+      !player.hasSpawned();
+
+    if (
+      !this.mg.inSpawnPhase() &&
+      !isSingleplayerNationSpawn &&
+      !isSingleplayerInitialHumanSpawn
+    ) {
+      return;
+    }
+
     // Security: If random spawn is enabled, prevent players from re-rolling their spawn location
     if (this.mg.config().isRandomSpawn() && player.hasSpawned()) {
       return;

src/core/execution/TransportShipExecution.ts

@@ -156,15 +156,14 @@ export class TransportShipExecution implements Execution {
     }
 
     if (this.boat.retreating()) {
-      // Ensure retreat source is still valid for (new) owner
-      if (this.mg.owner(this.src!) !== this.attacker) {
-        // Use bestTransportShipSpawn, not canBuild because of its max boats check etc
-        const newSrc = this.attacker.bestTransportShipSpawn(this.dst);
-        if (newSrc === false) {
-          this.src = null;
-        } else {
-          this.src = newSrc;
-        }
+      // Recompute retreat source for current owner each tick. This guarantees
+      // we don't retreat to a stale source when ownership/shore availability changes.
+      // Use bestTransportShipSpawn, not canBuild because of its max boats check etc.
+      const newSrc = this.attacker.bestTransportShipSpawn(this.dst);
+      if (newSrc === false) {
+        this.src = null;
+      } else {
+        this.src = newSrc;
       }
 
       if (this.src === null) {

src/core/game/GameImpl.ts

@@ -66,6 +66,9 @@ export type CellString = string;
 
 export class GameImpl implements Game {
   private _ticks = 0;
+  private singleplayerStartTick: number | null = null;
+  private singleplayerSpawnPhaseCompleted = false;
+  private spawnPhaseLockedValue: boolean | null = null;
 
   private unInitExecs: Execution[] = [];
 
@@ -376,19 +379,63 @@ export class GameImpl implements Game {
     this.addUpdate({ type: GameUpdateType.GamePaused, paused });
   }
 
-  inSpawnPhase(): boolean {
+  private computeInSpawnPhase(): boolean {
     if (this.config().gameConfig().gameType === GameType.Singleplayer) {
-      // Singleplayer has no fixed spawn countdown; game starts once the human spawns.
-      return !this._humans.every((human) => this.player(human.id).hasSpawned());
+      if (this.singleplayerSpawnPhaseCompleted) {
+        return false;
+      }
+      // Singleplayer has no fixed spawn countdown; game starts once all current human
+      // players in the game have spawned. This supports tests that add players after
+      // game construction.
+      const humanPlayers = this.allPlayers().filter(
+        (player) => player.type() === PlayerType.Human,
+      );
+      if (humanPlayers.length > 0) {
+        return humanPlayers.some((player) => !player.hasSpawned());
+      }
     }
     return this._ticks <= this.config().numSpawnPhaseTurns();
   }
 
+  inSpawnPhase(): boolean {
+    if (this.spawnPhaseLockedValue !== null) {
+      return this.spawnPhaseLockedValue;
+    }
+    return this.computeInSpawnPhase();
+  }
+
+  private updateSingleplayerStartTick(): void {
+    if (this.config().gameConfig().gameType !== GameType.Singleplayer) {
+      return;
+    }
+
+    const humanPlayers = this.allPlayers().filter(
+      (player) => player.type() === PlayerType.Human,
+    );
+    const hasSpawnedHuman = humanPlayers.some((player) => player.hasSpawned());
+
+    if (this.inSpawnPhase() || !hasSpawnedHuman) {
+      this.singleplayerStartTick = null;
+      return;
+    }
+
+    this.singleplayerStartTick ??= this.ticks();
+  }
+
   ticks(): number {
     return this._ticks;
   }
 
   executeNextTick(): GameUpdates {
+    this.spawnPhaseLockedValue = this.computeInSpawnPhase();
+    if (
+      this.config().gameConfig().gameType === GameType.Singleplayer &&
+      !this.spawnPhaseLockedValue
+    ) {
+      this.singleplayerSpawnPhaseCompleted = true;
+    }
+    this.updateSingleplayerStartTick();
+
     this.updates = createGameUpdatesMap();
     this.execs.forEach((e) => {
       if (
@@ -424,6 +471,10 @@ export class GameImpl implements Game {
         hash: this.hash(),
       });
     }
+
+    this.spawnPhaseLockedValue = null;
+    this.updateSingleplayerStartTick();
+
     this._ticks++;
     return this.updates;
   }
@@ -731,6 +782,15 @@ export class GameImpl implements Game {
   }
 
   public isSpawnImmunityActive(): boolean {
+    if (this.config().gameConfig().gameType === GameType.Singleplayer) {
+      this.updateSingleplayerStartTick();
+      if (this.inSpawnPhase()) {
+        return true;
+      }
+      const startTick = this.singleplayerStartTick ?? this.ticks();
+      return startTick + this.config().spawnImmunityDuration() > this.ticks();
+    }
+
     return (
       this.config().numSpawnPhaseTurns() +
         this.config().spawnImmunityDuration() >

src/core/game/GameView.ts

@@ -584,6 +584,7 @@ export class PlayerView {
 
 export class GameView implements GameMap {
   private lastUpdate: GameUpdateViewData | null;
+  private singleplayerStartTick: Tick | null = null;
   private smallIDToID = new Map<number, PlayerID>();
   private _players = new Map<PlayerID, PlayerView>();
   private _units = new Map<number, UnitView>();
@@ -818,7 +819,35 @@ export class GameView implements GameMap {
     }
     return this.ticks() <= this._config.numSpawnPhaseTurns();
   }
+
+  private updateSingleplayerStartTick(): void {
+    if (this._config.gameConfig().gameType !== GameType.Singleplayer) {
+      return;
+    }
+
+    const humanPlayers = this.players().filter(
+      (player) => player.type() === PlayerType.Human,
+    );
+    const hasSpawnedHuman = humanPlayers.some((player) => player.hasSpawned());
+
+    if (this.inSpawnPhase() || !hasSpawnedHuman) {
+      this.singleplayerStartTick = null;
+      return;
+    }
+
+    this.singleplayerStartTick ??= this.ticks();
+  }
+
   isSpawnImmunityActive(): boolean {
+    if (this._config.gameConfig().gameType === GameType.Singleplayer) {
+      this.updateSingleplayerStartTick();
+      if (this.inSpawnPhase()) {
+        return true;
+      }
+      const startTick = this.singleplayerStartTick ?? this.ticks();
+      return startTick + this._config.spawnImmunityDuration() > this.ticks();
+    }
+
     return (
       this._config.numSpawnPhaseTurns() + this._config.spawnImmunityDuration() >
       this.ticks()

tests/AiAttackBehavior.test.ts

@@ -1,5 +1,11 @@
 import { AiAttackBehavior } from "../src/core/execution/utils/AiAttackBehavior";
-import { Game, Player, PlayerInfo, PlayerType } from "../src/core/game/Game";
+import {
+  Game,
+  GameType,
+  Player,
+  PlayerInfo,
+  PlayerType,
+} from "../src/core/game/Game";
 import { PseudoRandom } from "../src/core/PseudoRandom";
 import { setup } from "./util/Setup";
 
@@ -12,6 +18,7 @@ describe("Ai Attack Behavior", () => {
   // Helper function for basic test setup
   async function setupTestEnvironment() {
     const testGame = await setup("big_plains", {
+      gameType: GameType.Public,
       infiniteGold: true,
       instantBuild: true,
       infiniteTroops: true,

tests/AllianceAcceptNukes.test.ts

@@ -3,6 +3,7 @@ import { GameUpdateType } from "src/core/game/GameUpdates";
 import { NukeExecution } from "../src/core/execution/NukeExecution";
 import {
   Game,
+  GameType,
   Player,
   PlayerInfo,
   PlayerType,
@@ -21,6 +22,7 @@ describe("Alliance acceptance immediately destroys in-flight nukes", () => {
     game = await setup(
       "plains",
       {
+        gameType: GameType.Public,
         infiniteGold: true,
         instantBuild: true,
         infiniteTroops: true,

tests/AllianceDonation.test.ts

@@ -1,7 +1,7 @@
 import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
 import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution";
 import { DonateGoldExecution } from "../src/core/execution/DonateGoldExecution";
-import { Game, Player, PlayerType } from "../src/core/game/Game";
+import { Game, GameType, Player, PlayerType } from "../src/core/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
@@ -13,6 +13,7 @@ describe("Alliance Donation", () => {
     game = await setup(
       "plains",
       {
+        gameType: GameType.Public,
         infiniteGold: false,
         instantBuild: true,
         infiniteTroops: false,

tests/AllianceExtensionExecution.test.ts

@@ -1,7 +1,13 @@
 import { AllianceExtensionExecution } from "../src/core/execution/alliance/AllianceExtensionExecution";
 import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
 import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution";
-import { Game, MessageType, Player, PlayerType } from "../src/core/game/Game";
+import {
+  Game,
+  GameType,
+  MessageType,
+  Player,
+  PlayerType,
+} from "../src/core/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 
 let game: Game;
@@ -14,6 +20,7 @@ describe("AllianceExtensionExecution", () => {
     game = await setup(
       "ocean_and_land",
       {
+        gameType: GameType.Public,
         infiniteGold: true,
         instantBuild: true,
         infiniteTroops: true,

tests/AllianceRequestExecution.test.ts

@@ -1,7 +1,13 @@
 import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
 import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution";
 import { NukeExecution } from "../src/core/execution/NukeExecution";
-import { Game, Player, PlayerType, UnitType } from "../src/core/game/Game";
+import {
+  Game,
+  GameType,
+  Player,
+  PlayerType,
+  UnitType,
+} from "../src/core/game/Game";
 import { playerInfo, setup } from "./util/Setup";
 import { constructionExecution } from "./util/utils";
 
@@ -14,6 +20,7 @@ describe("AllianceRequestExecution", () => {
     game = await setup(
       "plains",
       {
+        gameType: GameType.Public,
         infiniteGold: true,
         instantBuild: true,
         infiniteTroops: true,

tests/NationCounterWarshipInfestation.test.ts

@@ -3,6 +3,7 @@ import {
   Cell,
   Difficulty,
   GameMode,
+  GameType,
   Nation,
   PlayerInfo,
   PlayerType,
@@ -18,6 +19,7 @@ import { setup } from "./util/Setup";
 describe("Counter Warship Infestation", () => {
   test("rich nation sends counter-warship in FFA when enemy has too many warships", async () => {
     const game = await setup("half_land_half_ocean", {
+      gameType: GameType.Public,
       infiniteGold: true,
       instantBuild: true,
       difficulty: Difficulty.Hard, // Required for counter-warship logic
@@ -168,6 +170,7 @@ describe("Counter Warship Infestation", () => {
     const game = await setup(
       "half_land_half_ocean",
       {
+        gameType: GameType.Public,
         infiniteGold: true,
         instantBuild: true,
         difficulty: Difficulty.Hard, // Required for counter-warship logic