Better ship handling for AFK player

Author: VariableVince

src/core/execution/ExecutionManager.ts

@@ -75,6 +75,7 @@ export class Executor {
           intent.dst,
           intent.troops,
           intent.src,
+          player,
         );
       case "allianceRequest":
         return new AllianceRequestExecution(player, intent.recipient);

src/core/execution/FakeHumanExecution.ts

@@ -397,6 +397,7 @@ export class FakeHumanExecution implements Execution {
         closest.y,
         this.player.troops() / 5,
         null,
+        this.player,
       ),
     );
   }
@@ -598,6 +599,7 @@ export class FakeHumanExecution implements Execution {
         dst,
         this.player.troops() / 5,
         null,
+        this.player,
       ),
     );
     return;

src/core/execution/TransportShipExecution.ts

@@ -39,6 +39,7 @@ export class TransportShipExecution implements Execution {
     private ref: TileRef,
     private startTroops: number,
     private src: TileRef | null,
+    private originalOwner: Player,
   ) {}
 
   activeDuringSpawnPhase(): boolean {
@@ -181,6 +182,17 @@ export class TransportShipExecution implements Execution {
       }
     }
 
+    // Team member can conquer disconnected player and gets their ships
+    // captureUnit has changed the owner of the unit, now update attacker
+    if (
+      this.originalOwner.isDisconnected() &&
+      this.boat.owner() !== this.originalOwner &&
+      this.boat.owner().isOnSameTeam(this.originalOwner)
+    ) {
+      this.attacker = this.boat.owner();
+      this.originalOwner = this.boat.owner(); // for when this owner disconnects too
+    }
+
     const result = this.pathFinder.nextTile(this.boat.tile(), this.dst);
     switch (result.type) {
       case PathFindResultType.Completed:

src/core/execution/WarshipExecution.ts

@@ -55,10 +55,6 @@ export class WarshipExecution implements Execution {
       this.warship.delete();
       return;
     }
-    if (this.warship.owner().isDisconnected()) {
-      this.warship.delete();
-      return;
-    }
 
     const hasPort = this.warship.owner().unitCount(UnitType.Port) > 0;
     if (hasPort) {
@@ -93,7 +89,8 @@ export class WarshipExecution implements Execution {
       if (
         unit.owner() === this.warship.owner() ||
         unit === this.warship ||
-        unit.owner().isFriendly(this.warship.owner()) ||
+        // Keep below order so if warship owner is disconnected, isFriendly still returns true
+        this.warship.owner().isFriendly(unit.owner()) ||
         this.alreadySentShell.has(unit)
       ) {
         continue;

src/core/game/GameImpl.ts

@@ -877,6 +877,20 @@ export class GameImpl implements Game {
     return this._railNetwork;
   }
   conquerPlayer(conqueror: Player, conquered: Player) {
+    if (conquered.isDisconnected() && conqueror.isOnSameTeam(conquered)) {
+      const ships = conquered
+        .units()
+        .filter(
+          (u) =>
+            u.type() === UnitType.Warship ||
+            u.type() === UnitType.TransportShip,
+        );
+
+      for (const ship of ships) {
+        conqueror.captureUnit(ship);
+      }
+    }
+
     const gold = conquered.gold();
     this.displayMessage(
       `Conquered ${conquered.displayName()} received ${renderNumber(

tests/Attack.test.ts

@@ -21,7 +21,14 @@ let attackerSpawn: TileRef;
 
 function sendBoat(target: TileRef, source: TileRef, troops: number) {
   game.addExecution(
-    new TransportShipExecution(defender, null, target, troops, source),
+    new TransportShipExecution(
+      defender,
+      null,
+      target,
+      troops,
+      source,
+      defender,
+    ),
   );
 }