2661 PR 3/3 Warship Manual Override, Aggro Override, and Heal-at-Port Command

src/client/graphics/layers/UnitLayer.ts

@@ -360,11 +360,17 @@ export class UnitLayer implements Layer {
   }
 
   private handleWarShipEvent(unit: UnitView) {
+    if (unit.retreating()) {
+      this.drawSprite(unit, colord("rgb(0,180,255)"));
+      return;
+    }
+
     if (unit.targetUnitId()) {
       this.drawSprite(unit, colord("rgb(200,0,0)"));
-    } else {
-      this.drawSprite(unit);
+      return;
     }
+
+    this.drawSprite(unit);
   }
 
   private handleShellEvent(unit: UnitView) {

src/core/configuration/Config.ts

@@ -153,6 +153,12 @@ export interface Config {
   warshipPatrolRange(): number;
   warshipShellAttackRate(): number;
   warshipTargettingRange(): number;
+  warshipPortHealingRadius(): number;
+  warshipPortHealingBonus(): number;
+  warshipRetreatHealthThreshold(): number;
+  warshipPassiveHealing(): number;
+  warshipPassiveHealingRange(): number;
+  warshipPortSwitchThreshold(): number;
   defensePostShellAttackRate(): number;
   defensePostTargettingRange(): number;
   // 0-1

src/core/configuration/DefaultConfig.ts

@@ -969,6 +969,30 @@ export class DefaultConfig implements Config {
     return 20;
   }
 
+  warshipPortHealingRadius(): number {
+    return 5;
+  }
+
+  warshipPortHealingBonus(): number {
+    return 5;
+  }
+
+  warshipRetreatHealthThreshold(): number {
+    return 750;
+  }
+
+  warshipPassiveHealing(): number {
+    return 1;
+  }
+
+  warshipPassiveHealingRange(): number {
+    return 150;
+  }
+
+  warshipPortSwitchThreshold(): number {
+    return 0.75;
+  }
+
   defensePostShellAttackRate(): number {
     return 100;
   }

src/core/execution/HealAtPortExecution.ts

@@ -0,0 +1,58 @@
+import { Execution, Game, Player, UnitType } from "../game/Game";
+import { TileRef } from "../game/GameMap";
+
+/**
+ * Orders a warship to retreat toward a friendly port for healing.
+ * Only works with friendly ports owned by the same player.
+ */
+export class HealAtPortExecution implements Execution {
+  constructor(
+    private readonly owner: Player,
+    private readonly warshipId: number,
+    private readonly portTile: TileRef,
+  ) {}
+
+  init(mg: Game, ticks: number): void {
+    if (!mg.isValidRef(this.portTile)) {
+      console.warn(`HealAtPortExecution: port tile ${this.portTile} not valid`);
+      return;
+    }
+
+    const warship = this.owner
+      .units(UnitType.Warship)
+      .find((u) => u.id() === this.warshipId);
+
+    if (!warship) {
+      console.warn("HealAtPortExecution: warship not found");
+      return;
+    }
+
+    if (!warship.isActive()) {
+      console.warn("HealAtPortExecution: warship is not active");
+      return;
+    }
+
+    const isFriendlyPort = this.owner
+      .units(UnitType.Port)
+      .some((port) => port.tile() === this.portTile);
+    if (!isFriendlyPort) {
+      console.warn("HealAtPortExecution: target port is not friendly");
+      return;
+    }
+
+    // Set warship to go to the port
+    warship.setPatrolTile(this.portTile);
+    warship.setTargetTile(this.portTile);
+    warship.setRetreating(true); // Enable healing behavior
+  }
+
+  tick(ticks: number): void {}
+
+  isActive(): boolean {
+    return false;
+  }
+
+  activeDuringSpawnPhase(): boolean {
+    return false;
+  }
+}

src/core/execution/MoveWarshipExecution.ts

@@ -25,7 +25,8 @@ export class MoveWarshipExecution implements Execution {
       return;
     }
     warship.setPatrolTile(this.position);
-    warship.setTargetTile(undefined);
+    warship.setTargetTile(this.position);
+    warship.setRetreating(false);
   }
 
   tick(ticks: number): void {}