From b1f05abae0428974e818e6f829721d88a4148cd0 Mon Sep 17 00:00:00 2001
From: scamiv <6170744+scamiv@users.noreply.github.com>
Date: Sun, 28 Dec 2025 22:21:50 +0100
Subject: [PATCH] Add rubber band path optimization for coarse water
 pathfinding

- Introduced a new `PathRubberBand` module to optimize coarse paths by reducing zig-zag patterns with a line-of-sight spine.
- Updated `CoarseToFineWaterPath` to utilize the `rubberBandCoarsePath` function, enhancing the efficiency of corridor marking.
- This change improves pathfinding performance while maintaining correctness through mask expansion and fine fallback strategies.
---
 src/core/pathfinding/CoarseToFineWaterPath.ts |   8 +-
 src/core/pathfinding/PathRubberBand.ts        | 105 ++++++++++++++++++
 2 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 src/core/pathfinding/PathRubberBand.ts

diff --git a/src/core/pathfinding/CoarseToFineWaterPath.ts b/src/core/pathfinding/CoarseToFineWaterPath.ts
index c4244f49c..7fd257047 100644
--- a/src/core/pathfinding/CoarseToFineWaterPath.ts
+++ b/src/core/pathfinding/CoarseToFineWaterPath.ts
@@ -4,6 +4,7 @@ import {
   MultiSourceAnyTargetBFSOptions,
   MultiSourceAnyTargetBFSResult,
 } from "./MultiSourceAnyTargetBFS";
+import { rubberBandCoarsePath } from "./PathRubberBand";
 
 export type CoarseToFineWaterPathOptions = {
   /**
@@ -277,12 +278,17 @@ export function findWaterPathFromSeedsCoarseToFine(
   // Allowed corridor stamp is stable across attempts (widening is cumulative).
   const allowedSet = getStampSet(coarseMap);
   const allowed = nextStamp(allowedSet);
+  const corridorSpine = rubberBandCoarsePath(
+    coarseMap,
+    coarseResult.path,
+    bfsOpts,
+  );
   markCoarseCorridor(
     coarseWidth,
     coarseHeight,
     allowedSet.data,
     allowed,
-    coarseResult.path,
+    corridorSpine,
     corridorRadius0,
   );
 
diff --git a/src/core/pathfinding/PathRubberBand.ts b/src/core/pathfinding/PathRubberBand.ts
new file mode 100644
index 000000000..e975d6866
--- /dev/null
+++ b/src/core/pathfinding/PathRubberBand.ts
@@ -0,0 +1,105 @@
+import { GameMap, TileRef } from "../game/GameMap";
+import { BezenhamLine } from "../utilities/Line";
+import { MultiSourceAnyTargetBFSOptions } from "./MultiSourceAnyTargetBFS";
+
+function sign(n: number): -1 | 0 | 1 {
+  return n === 0 ? 0 : n > 0 ? 1 : -1;
+}
+
+function lineOfSightWater(
+  gm: GameMap,
+  from: TileRef,
+  to: TileRef,
+  noCornerCutting: boolean,
+): boolean {
+  const x0 = gm.x(from);
+  const y0 = gm.y(from);
+  const x1 = gm.x(to);
+  const y1 = gm.y(to);
+
+  const line = new BezenhamLine({ x: x0, y: y0 }, { x: x1, y: y1 });
+
+  let prevX = x0;
+  let prevY = y0;
+  let point = line.increment();
+  while (point !== true) {
+    const t = gm.ref(point.x, point.y);
+    if (!gm.isWater(t)) return false;
+
+    if (noCornerCutting) {
+      const dx = sign(point.x - prevX);
+      const dy = sign(point.y - prevY);
+      if (dx !== 0 && dy !== 0) {
+        const orthoA = gm.ref(prevX + dx, prevY);
+        const orthoB = gm.ref(prevX, prevY + dy);
+        if (!gm.isWater(orthoA) || !gm.isWater(orthoB)) return false;
+      }
+    }
+
+    prevX = point.x;
+    prevY = point.y;
+    point = line.increment();
+  }
+
+  return gm.isWater(to);
+}
+
+function expandLine(gm: GameMap, from: TileRef, to: TileRef, out: TileRef[]) {
+  const x0 = gm.x(from);
+  const y0 = gm.y(from);
+  const x1 = gm.x(to);
+  const y1 = gm.y(to);
+  const line = new BezenhamLine({ x: x0, y: y0 }, { x: x1, y: y1 });
+  let point = line.increment();
+  while (point !== true) {
+    const t = gm.ref(point.x, point.y);
+    if (out.length === 0 || out[out.length - 1] !== t) out.push(t);
+    point = line.increment();
+  }
+  if (out.length === 0 || out[out.length - 1] !== to) out.push(to);
+}
+
+/**
+ * Reduce "staircase inflation" in the coarse corridor by replacing zig-zaggy coarse paths
+ * with a line-of-sight spine, then expanding that spine back into a contiguous coarse-cell list.
+ *
+ * This is a performance optimization only; correctness is preserved by mask expansion + fine fallback.
+ */
+export function rubberBandCoarsePath(
+  coarseMap: GameMap,
+  coarsePath: readonly TileRef[],
+  bfsOpts: MultiSourceAnyTargetBFSOptions,
+): TileRef[] {
+  if (coarsePath.length <= 2) return [...coarsePath];
+
+  const kingMoves = bfsOpts.kingMoves ?? true;
+  if (!kingMoves) return [...coarsePath];
+  const noCornerCutting = bfsOpts.noCornerCutting ?? true;
+
+  // Keep this bounded: coarse paths can be long on big maps.
+  const maxLookahead = 1024;
+  const maxChecksPerAnchor = 64;
+
+  const waypoints: TileRef[] = [coarsePath[0]!];
+  let i = 0;
+  while (i < coarsePath.length - 1) {
+    const end = Math.min(coarsePath.length - 1, i + maxLookahead);
+    let best = i + 1;
+    let checks = 0;
+    for (let j = end; j > i; j--) {
+      if (lineOfSightWater(coarseMap, coarsePath[i]!, coarsePath[j]!, noCornerCutting)) {
+        best = j;
+        break;
+      }
+      if (++checks >= maxChecksPerAnchor) break;
+    }
+    waypoints.push(coarsePath[best]!);
+    i = best;
+  }
+
+  const spine: TileRef[] = [];
+  for (let k = 0; k < waypoints.length - 1; k++) {
+    expandLine(coarseMap, waypoints[k]!, waypoints[k + 1]!, spine);
+  }
+  return spine.length > 0 ? spine : [...coarsePath];
+}