@dreadwood-types/types 0.1.47 → 0.1.51

package/dist/landmarks.js

@@ -1,8 +1,12 @@
-import { BEACH_GATE_X, BEACH_SAND_START_Z, BEACH_START_Z, CHUNK_SIZE, OCEAN_START_Z, STONE_HOUSE_LODGE_RADIUS_ACROSS, STONE_HOUSE_RADIUS, UNDERGROUND_ORIGIN_X, WORLD_NORTH_PAD, WORLD_WIDTH, toLocalZ, toWorldZ, } from './constants.js';
+import { BEACH_GATE_X, BEACH_SAND_START_Z, BEACH_START_Z, CHUNK_SIZE, NORTH_SHIFT, OCEAN_START_Z, STONE_HOUSE_LODGE_RADIUS_ACROSS, STONE_HOUSE_RADIUS, UNDERGROUND_ORIGIN_X, WORLD_NORTH_PAD, WORLD_WIDTH, toLocalZ, toWorldZ, } from './constants.js';
 import { DEADLANDS_DEFENSE_DEPTH, DEADLANDS_GATE_X, DEADLANDS_MAX_X, DEADLANDS_MAX_Z, DEADLANDS_MIN_X, DEADLANDS_MIN_Z, } from './zones.js';
 import { SNOW_DEEP_Z, SNOW_EDGE_Z } from './snow.js';
+import { BEAR_FLOES_CAMP, BEAR_FLOES_ZONE } from './bearFloes.js';
+import { inIceDepths } from './iceDepths.js';
 import { dreadwoodsNpcZone } from './dreadwoodsZones.js';
-import { CAPITAL_DISTRICTS, CAPITAL_KEEP, CAPITAL_WORKS } from './capital.js';
+import { CAPITAL_AVENUE_Z, CAPITAL_DISTRICTS, CAPITAL_ROYAL_WAY_X, CAPITAL_WORKS } from './capital.js';
+import { GOBLIN_CAVE_OUTSIDE } from './goblinCave.js';
+import { HARBOUR_LIGHTHOUSE, HARBOUR_MIN_X, HARBOUR_MOLE_HEAD, HARBOUR_NAME, HARBOUR_ROAD_Z, HARBOUR_ROYAL_PIER, HARBOUR_SOUTH_Z, } from './harbour.js';
 import { BLOOD_LAKE_CX, BLOOD_LAKE_CZ, DREADWOODS_WEST_GATE_HALF_W, DREADWOODS_WEST_GATE_Z, } from './bloodRiver.js';
 export const CROSSROADS_WORLD_X = BEACH_GATE_X;
 export const CROSSROADS_LOCAL_Z = 17;
@@ -23,6 +27,11 @@ export const BOUNTY_BRUCE_LOCAL_Z = CROSSROADS_LOCAL_Z + 3;
  * tiled deck like the battlefield bridge, running the full depth of the ocean
  * strip, with two smashed spans in it that a player planks over one at a time.
  *
+ * Every section was stretched to about 1.5x on 2026-09-24 (James: "extend
+ * every section"): shore walk 31 rows to 46, middle stretch 28 to 42, far
+ * stretch 28 to 42, the east branch 11 tiles to 17 and the west spur 10 to 15.
+ * The breaks stay two rows. WORLD_SOUTH_CHUNKS grew to keep open sea past the head.
+ *
  * All world coordinates. The deck is Path at height 1 over Water, so it stands
  * proud of the sea the same way the bridge stands proud of the lake.
  */
@@ -37,16 +46,16 @@ export const HOPE_PIER_SHORE_Z = OCEAN_START_Z - 3;
  * and tying the end to WORLD_HEIGHT would spend that padding on more decking
  * and leave the boundary visible from the last plank.
  */
-export const HOPE_PIER_END_Z = OCEAN_START_Z + 87;
+export const HOPE_PIER_END_Z = OCEAN_START_Z + 130;
 /**
  * The east branch: a spur off the main walk to the moored ship, deliberately
  * SHORE-SIDE of both smashed spans so the ship is open to everybody, repaired
  * pier or not.
  */
-export const HOPE_PIER_BRANCH_Z = OCEAN_START_Z + 14;
+export const HOPE_PIER_BRANCH_Z = OCEAN_START_Z + 22;
 export const HOPE_PIER_BRANCH_HALF_W = 1;
 export const HOPE_PIER_BRANCH_MIN_X = HOPE_PIER_X + HOPE_PIER_HALF_W + 1;
-export const HOPE_PIER_BRANCH_MAX_X = HOPE_PIER_X + 12;
+export const HOPE_PIER_BRANCH_MAX_X = HOPE_PIER_X + 18;
 /**
  * The last four columns of the branch open out into a five-wide landing
  * stage against the ship: somewhere for cargo, nets and the ship's master to
@@ -81,15 +90,15 @@ export const HOPE_BEACH_LANDING = { x: HOPE_PIER_BRANCH_MAX_X - 2, z: HOPE_PIER_
  * FROZEN_LAKE_CENTER is declared further down; its z is 236.
  */
 /** The two rows of the pier walk, and the columns it runs over. */
-export const BRANSONS_LANDING_PIER_MIN_Z = 236;
-export const BRANSONS_LANDING_PIER_MAX_Z = 237;
+export const BRANSONS_LANDING_PIER_MIN_Z = 300;
+export const BRANSONS_LANDING_PIER_MAX_Z = 301;
 /** The seaward end of the walk (the head's west column) and its foot on the shore. */
 export const BRANSONS_LANDING_PIER_MIN_X = 3;
 export const BRANSONS_LANDING_PIER_FOOT_X = 21;
 /** The 4x4 landing head at the seaward end, a row wider than the walk each side. */
 export const BRANSONS_LANDING_HEAD_MAX_X = 6;
-export const BRANSONS_LANDING_HEAD_MIN_Z = 235;
-export const BRANSONS_LANDING_HEAD_MAX_Z = 238;
+export const BRANSONS_LANDING_HEAD_MIN_Z = 299;
+export const BRANSONS_LANDING_HEAD_MAX_Z = 302;
 /** Where the gangplank leaves the head for the ship: the head's south row. */
 export const BRANSONS_LANDING_GANGPLANK = { x: 4, z: BRANSONS_LANDING_HEAD_MAX_Z };
 /**
@@ -97,82 +106,88 @@ export const BRANSONS_LANDING_GANGPLANK = { x: 4, z: BRANSONS_LANDING_HEAD_MAX_Z
  * open sea. `face270` turns the SailShip's +z bow onto -x; the `landingship`
  * token picks the shorter hull.
  */
-export const BRANSONS_LANDING_SHIP = { x: 6, z: 241 };
+export const BRANSONS_LANDING_SHIP = { x: 6, z: 305 };
 export const BRANSONS_LANDING_SHIP_STYLE = 'landingship-face270';
 /**
  * The hull's tile footprint (all bay water), blocked so nothing paths under
  * it. Eleven long and four wide about the anchor: the bow a tile in from the
  * world's edge, the stern under the walk.
  */
-export const BRANSONS_LANDING_SHIP_HULL = { minX: 1, maxX: 11, minZ: 239, maxZ: 243 };
+export const BRANSONS_LANDING_SHIP_HULL = { minX: 1, maxX: 11, minZ: 303, maxZ: 307 };
 /**
  * Bay water by row: the columns from the rim water (x 0-1) east that the
  * bay opens up. Rounded at both ends, twenty wide along the pier.
  */
 export const BRANSONS_LANDING_COVE_ROWS = [
-    { z: 224, maxX: 3 },
-    { z: 225, maxX: 6 },
-    { z: 226, maxX: 9 },
-    { z: 227, maxX: 12 },
-    { z: 228, maxX: 14 },
-    { z: 229, maxX: 16 },
-    { z: 230, maxX: 18 },
-    { z: 231, maxX: 19 },
-    { z: 232, maxX: 20 },
-    { z: 233, maxX: 20 },
-    { z: 234, maxX: 20 },
-    { z: 235, maxX: 20 },
-    { z: 236, maxX: 20 },
-    { z: 237, maxX: 20 },
-    { z: 238, maxX: 20 },
-    { z: 239, maxX: 20 },
-    { z: 240, maxX: 20 },
-    { z: 241, maxX: 20 },
-    { z: 242, maxX: 20 },
-    { z: 243, maxX: 20 },
-    { z: 244, maxX: 19 },
-    { z: 245, maxX: 18 },
-    { z: 246, maxX: 16 },
-    { z: 247, maxX: 14 },
-    { z: 248, maxX: 12 },
-    { z: 249, maxX: 9 },
-    { z: 250, maxX: 6 },
-    { z: 251, maxX: 3 },
+    { z: 288, maxX: 3 },
+    { z: 289, maxX: 6 },
+    { z: 290, maxX: 9 },
+    { z: 291, maxX: 12 },
+    { z: 292, maxX: 14 },
+    { z: 293, maxX: 16 },
+    { z: 294, maxX: 18 },
+    { z: 295, maxX: 19 },
+    { z: 296, maxX: 20 },
+    { z: 297, maxX: 20 },
+    { z: 298, maxX: 20 },
+    { z: 299, maxX: 20 },
+    { z: 300, maxX: 20 },
+    { z: 301, maxX: 20 },
+    { z: 302, maxX: 20 },
+    { z: 303, maxX: 20 },
+    { z: 304, maxX: 20 },
+    { z: 305, maxX: 20 },
+    { z: 306, maxX: 20 },
+    { z: 307, maxX: 20 },
+    { z: 308, maxX: 19 },
+    { z: 309, maxX: 18 },
+    { z: 310, maxX: 16 },
+    { z: 311, maxX: 14 },
+    { z: 312, maxX: 12 },
+    { z: 313, maxX: 9 },
+    { z: 314, maxX: 6 },
+    { z: 315, maxX: 3 },
 ];
 /** The rim rows the bay replaces: the west rim loop places no crag on these. */
-export const BRANSONS_LANDING_COVE_MIN_Z = 224;
-export const BRANSONS_LANDING_COVE_MAX_Z = 251;
+export const BRANSONS_LANDING_COVE_MIN_Z = 288;
+export const BRANSONS_LANDING_COVE_MAX_Z = 315;
 /** Everything the landing owns, for the scenery sweep and the discovery zone. */
-export const BRANSONS_LANDING_WORKS = { minX: 0, maxX: 34, minZ: 220, maxZ: 255 };
+export const BRANSONS_LANDING_WORKS = { minX: 0, maxX: 34, minZ: 284, maxZ: 319 };
 /** Oskar, Branson's mate, on the shore a step off the pier foot, facing the boards. */
-export const BRANSONS_LANDING_OSKAR = { x: 22, z: 235, faceX: 21, faceZ: 235 };
+/**
+ * Oskar stands on the landing head, on the ship's side of it, where the
+ * gangway comes ashore: a boat man belongs beside his boat (James,
+ * 2026-09-22), not sixteen tiles up the pier on the sand. Passengers land
+ * on the head beside him and walk the planks in past the board.
+ */
+export const BRANSONS_LANDING_OSKAR = { x: 5, z: 302, faceX: 9, faceZ: 301 };
 /** The sailings board, up the apron from Oskar with room to walk round it. */
-export const BRANSONS_LANDING_BOARD = { x: 26, z: 233 };
+export const BRANSONS_LANDING_BOARD = { x: 26, z: 297 };
 /** The hut on the shelf north of the pier foot, its door to the south, and the steps down. */
-export const BRANSONS_LANDING_HUT = { x: 27, z: 228 };
-export const BRANSONS_LANDING_HUT_LANTERN = { x: 28, z: 230 };
+export const BRANSONS_LANDING_HUT = { x: 27, z: 292 };
+export const BRANSONS_LANDING_HUT_LANTERN = { x: 28, z: 294 };
 export const BRANSONS_LANDING_STEPS = [
-    { x: 27, z: 230 },
-    { x: 27, z: 231 },
+    { x: 27, z: 294 },
+    { x: 27, z: 295 },
 ];
 /** The shelf the hut stands on, its ledge row, and the apron the pier leaves from. */
 export const BRANSONS_LANDING_SHELF_HEIGHT = 3;
-export const BRANSONS_LANDING_LEDGE_Z = 230;
-export const BRANSONS_LANDING_APRON = { minX: 21, maxX: 33, minZ: 231, maxZ: 243 };
+export const BRANSONS_LANDING_LEDGE_Z = 294;
+export const BRANSONS_LANDING_APRON = { minX: 21, maxX: 33, minZ: 295, maxZ: 307 };
 export const BRANSONS_LANDING_APRON_HEIGHT = 1;
 /** A lantern post on the apron, south of the walk, and the stores stacked by the board. */
-export const BRANSONS_LANDING_APRON_LANTERN = { x: 24, z: 240 };
+export const BRANSONS_LANDING_APRON_LANTERN = { x: 24, z: 304 };
 /** Ice floes on the bay water, clear of the ship and the pier. */
 export const BRANSONS_LANDING_FLOES = [
-    { x: 2, z: 227, scale: 0.9 },
-    { x: 10, z: 229, scale: 0.8 },
-    { x: 16, z: 231, scale: 1.1 },
-    { x: 2, z: 233, scale: 1.0 },
-    { x: 19, z: 234, scale: 0.8 },
-    { x: 15, z: 240, scale: 0.9 },
-    { x: 18, z: 245, scale: 1.0 },
-    { x: 10, z: 248, scale: 0.9 },
-    { x: 4, z: 249, scale: 1.1 },
+    { x: 2, z: 291, scale: 0.9 },
+    { x: 10, z: 293, scale: 0.8 },
+    { x: 16, z: 295, scale: 1.1 },
+    { x: 2, z: 297, scale: 1.0 },
+    { x: 19, z: 298, scale: 0.8 },
+    { x: 15, z: 304, scale: 0.9 },
+    { x: 18, z: 309, scale: 1.0 },
+    { x: 10, z: 312, scale: 0.9 },
+    { x: 4, z: 313, scale: 1.1 },
 ];
 /** True for a cove water tile (the rim water at x 0-1 is water on every row anyway). */
 export function isBransonsLandingCoveTile(x, z) {
@@ -195,26 +210,26 @@ export function isBransonsLandingDeckTile(x, z) {
         z <= BRANSONS_LANDING_PIER_MAX_Z);
 }
 /** Kept for the rim loop and older callers: the crag line the bay now cuts through. */
-export const FROZEN_SHORE_JETTY = { x: 2, z: 237 };
-/** Where a voyage puts you ashore: the pier's foot plank, on the landing side. */
-export const FROZEN_SHORE_LANDING = { x: BRANSONS_LANDING_PIER_FOOT_X, z: BRANSONS_LANDING_PIER_MAX_Z };
+export const FROZEN_SHORE_JETTY = { x: 2, z: 301 };
+/** Where a voyage puts you ashore: the landing head, off the ship's gangway. */
+export const FROZEN_SHORE_LANDING = { x: 4, z: BRANSONS_LANDING_PIER_MAX_Z };
 /**
  * First smashed span, about a third of the way out - far enough that the walk
  * to it is a walk, close enough to see the break from the sand.
  */
-export const HOPE_PIER_GAP1_MIN_Z = OCEAN_START_Z + 28;
-export const HOPE_PIER_GAP1_MAX_Z = OCEAN_START_Z + 29;
+export const HOPE_PIER_GAP1_MIN_Z = OCEAN_START_Z + 43;
+export const HOPE_PIER_GAP1_MAX_Z = OCEAN_START_Z + 44;
 /** Second smashed span, out past the middle deck at about two thirds. */
-export const HOPE_PIER_GAP2_MIN_Z = OCEAN_START_Z + 58;
-export const HOPE_PIER_GAP2_MAX_Z = OCEAN_START_Z + 59;
+export const HOPE_PIER_GAP2_MIN_Z = OCEAN_START_Z + 87;
+export const HOPE_PIER_GAP2_MAX_Z = OCEAN_START_Z + 88;
 /**
  * The pier head: the last four rows widen into a platform, so the end of a long
  * walk is somewhere to stand rather than the last plank of a corridor.
  */
 export const HOPE_PIER_HEAD_MIN_Z = HOPE_PIER_END_Z - 3;
 /** The middle deck, a passing place between the two smashed spans. */
-export const HOPE_PIER_MID_MIN_Z = OCEAN_START_Z + 42;
-export const HOPE_PIER_MID_MAX_Z = OCEAN_START_Z + 44;
+export const HOPE_PIER_MID_MIN_Z = OCEAN_START_Z + 63;
+export const HOPE_PIER_MID_MAX_Z = OCEAN_START_Z + 65;
 /** Both widenings are five tiles across against the walk's three. */
 export const HOPE_PIER_WIDE_HALF_W = 2;
 /** The moored ship, off the seaward corner of the branch. */
@@ -238,7 +253,7 @@ export const HOPE_PIER_SHIP_Z = HOPE_PIER_BRANCH_Z;
 export const HOPE_PIER_SPUR_Z = HOPE_PIER_MID_MIN_Z + 1;
 export const HOPE_PIER_SPUR_HALF_W = 1;
 export const HOPE_PIER_SPUR_MAX_X = HOPE_PIER_X - HOPE_PIER_WIDE_HALF_W - 1;
-export const HOPE_PIER_SPUR_MIN_X = HOPE_PIER_X - 12;
+export const HOPE_PIER_SPUR_MIN_X = HOPE_PIER_X - 17;
 export const HOPE_PIER_HUT_X = HOPE_PIER_SPUR_MIN_X + 3;
 export const HOPE_PIER_HUT_Z = HOPE_PIER_SPUR_Z + HOPE_PIER_SPUR_HALF_W + 4;
 /**
@@ -291,6 +306,8 @@ export const PIER_CAST_MAX_TILES = 10;
  * timer and after every catch.
  */
 export const HOPE_PIER_SMELT_SPOT_COUNT = 5;
+/** Crab cage spots along the side of the Long Pier at once, redrawn like the smelt. */
+export const HOPE_BEACH_CRAB_SPOT_COUNT = 4;
 /**
  * Chebyshev tiles around HOPE_PIER_SHIP_X/Z no pier fish may sit in. The
  * moored ship has a one-tile footprint but its hull mesh covers a few tiles
@@ -451,8 +468,8 @@ export const BASECAMP_FAR_SIDE_LOCAL_Z = BASECAMP_CAVE_LOCAL_Z;
  * the south shore and the town stands back from the north shore.
  */
 export const BATTLEFIELD_NORTH_SHIFT = 18;
-/** An original survey Z, moved north by BATTLEFIELD_NORTH_SHIFT. */
-const bfZ = (surveyZ) => surveyZ - BATTLEFIELD_NORTH_SHIFT;
+/** An original survey Z, moved north by BATTLEFIELD_NORTH_SHIFT (and south by the northern extension, NORTH_SHIFT). */
+const bfZ = (surveyZ) => surveyZ - BATTLEFIELD_NORTH_SHIFT + NORTH_SHIFT;
 /**
  * Lake between soldier (south / farmward) and goblin (north) camps.
  * Water blocks walking; the battlefield crossing is the long bridge once repaired.
@@ -1171,47 +1188,38 @@ function roomSpawnSpots(minZ, maxZ, count) {
     }
     return spots;
 }
-/** A small, close-quarters pit for the oversized level-10 rats. */
+/** A small, close-quarters pit for the oversized level-10 rats: a pair since 2026-09-22. */
 function giantRatPitSpawnSpots() {
     const cx = DUNGEON_CENTER_X;
     const pz = DUNGEON_ROOM2_PIT_Z;
     const offsets = [
         [-7, -7],
         [7, -7],
-        [0, -4],
-        [-8, 1],
-        [8, 1],
-        [-5, 7],
-        [5, 7],
     ];
     return offsets.map(([dx, dz]) => ({ x: cx + dx, z: pz + dz }));
 }
-/** Swarming horde of tunnel vermin across the sunken rat pit (room 1). */
+/**
+ * Tunnel vermin across the sunken rat pit (room 1).
+ * Halved again on 2026-09-22 (James: the cave had too many rats): 15 spots,
+ * one to a nook, alcove or pit ring so every part of the room still has one.
+ */
 function room1RatSpawnSpots() {
     const cx = DUNGEON_CENTER_X;
-    // [dx, z] - well distributed across north nooks, 4 corner alcoves,
-    // mud puddles, center feeding mound, and perimeter walkways.
+    // [dx, z] - thinned from 29 (and 58 before that), still covering the room.
     const offsets = [
-        // North nooks and throat (z=63-64)
-        [-10, 64], [-8, 63], [-6, 64], [-4, 63], [4, 63], [6, 64], [8, 63], [10, 64],
-        // NW Alcove and rat nest (z=65-67)
-        [-14, 65], [-14, 67], [-12, 66], [-11, 65],
-        // NE Alcove and rat nest (z=65-67)
-        [14, 65], [14, 67], [12, 66], [11, 65],
-        // Upper mid and arrival flank (z=65-68)
-        [-9, 66], [-5, 65], [5, 65], [9, 66],
-        [-7, 68], [-3, 67], [3, 67], [7, 68],
-        // Center feast and sunken pit ring (z=69-73)
-        [-10, 70], [-6, 69], [-2, 69], [2, 69], [6, 69], [10, 70],
-        [-9, 72], [-5, 71], [-1, 72], [1, 71], [5, 72], [9, 71],
-        [-7, 73], [-3, 73], [3, 73], [7, 73],
-        // SW Alcove and mud puddle skeleton (z=75-77)
-        [-14, 75], [-14, 77], [-12, 75], [-11, 77],
-        // SE Alcove and trophy caches (z=75-77)
-        [14, 75], [14, 77], [12, 75], [11, 77],
-        // Lower pit and south mud puddle (z=75-78)
-        [-8, 75], [-4, 75], [-2, 77], [2, 76], [6, 76], [8, 75],
-        [-9, 78], [-5, 78], [5, 78], [9, 78],
+        // North nooks and throat (z=64)
+        [-10, 64], [6, 64],
+        // NW and NE alcoves (z=65-67)
+        [-14, 65], [14, 67],
+        // Upper mid and arrival flank (z=66)
+        [-9, 66], [9, 66],
+        // Center feast and sunken pit ring (z=69-71)
+        [-10, 70], [-2, 69], [6, 69],
+        [1, 71], [9, 71],
+        // SW and SE alcoves (z=75-77)
+        [-14, 75], [14, 77],
+        // Lower pit and south mud (z=76-77)
+        [-2, 77], [6, 76],
     ];
     return offsets.map(([dx, z]) => ({ x: cx + dx, z }));
 }
@@ -1361,7 +1369,7 @@ export function inNorthernGarrison(x, z) {
  * open up. Everything on it is placed from the centre; the fixed points
  * below moved with it.
  */
-export const FROZEN_LAKE_CENTER = { x: 56, z: 236 };
+export const FROZEN_LAKE_CENTER = { x: 56, z: 300 };
 export const FROZEN_LAKE_RX = 14;
 export const FROZEN_LAKE_RZ = 12;
 /** The level the ice is frozen at; the lowland around it already lies near it. */
@@ -1411,12 +1419,12 @@ export function onFrozenLakeIce(x, z) {
  */
 export const FROZEN_PLATEAU_H = 5;
 /** Where the lowland starts climbing to the plateau, and where it is level. */
-export const FROZEN_PLATEAU_RISE_Z = 214;
-export const FROZEN_PLATEAU_TOP_Z = 198;
+export const FROZEN_PLATEAU_RISE_Z = 278;
+export const FROZEN_PLATEAU_TOP_Z = 262;
 /** The hills east of here are left as they are. */
 export const FROZEN_PLATEAU_MAX_X = 46;
-export const CRYSTAL_GORGE_MIN_Z = 158;
-export const CRYSTAL_GORGE_MAX_Z = 166;
+export const CRYSTAL_GORGE_MIN_Z = 222;
+export const CRYSTAL_GORGE_MAX_Z = 230;
 export const CRYSTAL_GORGE_MAX_X = 44;
 /** The bridge column and the deck's half-width in tiles. */
 export const CRYSTAL_BRIDGE_X = 21;
@@ -1426,9 +1434,9 @@ export const FROZEN_HALLWAY_HALF_W = 4;
 export const FROZEN_HALLWAY_WALL_T = 5;
 export const FROZEN_HALLWAY_WALL_H = 10;
 /** The rune arch at the mouth and the iron gate at the far end. */
-export const FROZEN_HALLWAY_MOUTH_Z = 105;
-export const FROZEN_HALLWAY_GATE_Z = 26;
-export const FROZEN_HALLWAY_SEAL_Z = 6;
+export const FROZEN_HALLWAY_MOUTH_Z = 169;
+export const FROZEN_HALLWAY_GATE_Z = 90;
+export const FROZEN_HALLWAY_SEAL_Z = 70;
 /**
  * The Ice Prison: the rooms behind the hallway's iron gate, carved in the
  * off-map strip like the other interiors. You arrive in the Frozen Cells,
@@ -1483,9 +1491,15 @@ export const ICE_PRISON_BOUNDS = {
     minZ: ICE_PRISON_SHRINE.minZ - 8,
     maxZ: ICE_PRISON_CELLS.maxZ + 8,
 };
+/**
+ * The prison proper and the Frozen Depths north of it (iceDepths.ts): one
+ * predicate for the frost lighting, the rock palette and the cavern aggro,
+ * so the boss rooms are the same cold as the shrine they open off.
+ */
 export function inIcePrison(x, z) {
-    return (x >= ICE_PRISON_BOUNDS.minX && x <= ICE_PRISON_BOUNDS.maxX &&
-        z >= ICE_PRISON_BOUNDS.minZ && z <= ICE_PRISON_BOUNDS.maxZ);
+    return ((x >= ICE_PRISON_BOUNDS.minX && x <= ICE_PRISON_BOUNDS.maxX &&
+        z >= ICE_PRISON_BOUNDS.minZ && z <= ICE_PRISON_BOUNDS.maxZ) ||
+        inIceDepths(x, z));
 }
 /** How far the hallway's centre line swings either side of FROZEN_HALLWAY_X. */
 export const FROZEN_HALLWAY_SWING = 7;
@@ -1548,11 +1562,11 @@ export const ICE_CAVERN_SPAWNS = [
 export const THAW_GORGE_CX = DEADLANDS_MIN_X;
 export const THAW_GORGE_MIN_X = THAW_GORGE_CX - 4;
 export const THAW_GORGE_MAX_X = THAW_GORGE_CX + 4;
-export const THAW_GORGE_MIN_Z = 0;
+export const THAW_GORGE_MIN_Z = 64;
 /** Low river meets the battlefield lake's north bank. */
 export const THAW_GORGE_MAX_Z = BATTLEFIELD_LAKE_MIN_Z;
-export const THAW_BRIDGE_Z = 49;
-export const THAW_MID_BRIDGE_Z = 110;
+export const THAW_BRIDGE_Z = 113;
+export const THAW_MID_BRIDGE_Z = 174;
 export const THAW_WOODS_BRIDGE_Z = DEADLANDS_MIN_Z - 14;
 export const THAW_BRIDGE_ZS = [THAW_BRIDGE_Z, THAW_MID_BRIDGE_Z, THAW_WOODS_BRIDGE_Z];
 export const THAW_BRIDGE_HALF_W = 1;
@@ -1576,13 +1590,13 @@ export const THAW_FLOOD_EAST_X = THAW_GORGE_CX + 18;
  * then this fall, then the bridges over the low water. Not at Rains' span
  * and not south of it.
  */
-export const THAW_FALLS_Z = 26;
+export const THAW_FALLS_Z = 90;
 /** @deprecated Same tile as THAW_FALLS_Z; kept for older imports. */
 export const THAW_SIDE_FALLS_Z = THAW_FALLS_Z;
 export const THAW_ARCH_X = THAW_FLOOD_EAST_X + 7;
 export const THAW_ARCH_PILLAR_DZ = 2;
 export const THAW_MOUTH_STAND_X = THAW_FLOOD_WEST_X - 2;
-export const THAW_MOUTH_STAND_Z = 6;
+export const THAW_MOUTH_STAND_Z = 70;
 export const THAW_FALLS_STAND_X = THAW_FLOOD_WEST_X - 2;
 export const THAW_FALLS_STAND_Z = THAW_FALLS_Z;
 export function thawEastBridgeIdAtZ(z) {
@@ -1865,8 +1879,8 @@ export const GOBLIN_FRONTIER_ROAD = [
 ];
 /** The two occupied camp loops off the frontier road (built in goblinFrontier.ts). */
 export const GOBLIN_FRONTIER_CAMPS = [
-    { x: 113, z: 613 },
-    { x: 68, z: 571 },
+    { x: 113, z: 677 },
+    { x: 68, z: 635 },
 ];
 /**
  * Where the frontier is held. Goblins spawn here the way they do at the
@@ -2068,8 +2082,8 @@ export const DISCOVERY_ZONES = [
         label: 'The Frozen Shore',
         minX: 0,
         maxX: 12,
-        minZ: 0 - WORLD_NORTH_PAD,
-        maxZ: 345 - WORLD_NORTH_PAD,
+        minZ: NORTH_SHIFT - WORLD_NORTH_PAD,
+        maxZ: 409 - WORLD_NORTH_PAD,
     },
     {
         // The frozen lake and the fishers' ground on its banks. Listed before the
@@ -2099,9 +2113,21 @@ export const DISCOVERY_ZONES = [
         minZ: FROZEN_HALLWAY_SEAL_Z - 2 - WORLD_NORTH_PAD,
         maxZ: FROZEN_HALLWAY_MOUTH_Z + 7 - WORLD_NORTH_PAD,
     },
-    // The Capital's eight wards, each its own discovery; the castle ward is
-    // listed first because its bounds overlap the temple and noble wards.
-    ...[...CAPITAL_DISTRICTS].sort((a, b) => (a.id === 'capital-castle' ? -1 : b.id === 'capital-castle' ? 1 : 0)).map((d) => ({
+    {
+        // The walled port east of the East Gate: the ward, the piers and the
+        // breakwater out to the lighthouse. Listed before the capital, whose
+        // works reach over the moat's east bank.
+        id: 'capital-harbour',
+        label: HARBOUR_NAME,
+        minX: HARBOUR_MIN_X,
+        maxX: HARBOUR_MOLE_HEAD.maxX + 1,
+        minZ: HARBOUR_MOLE_HEAD.minZ - WORLD_NORTH_PAD,
+        maxZ: HARBOUR_SOUTH_Z - WORLD_NORTH_PAD,
+    },
+    // The Capital's eight districts (the 2026-09-25 plan), each its own
+    // discovery. The ids are the old wards', so nobody is paid twice; the
+    // rects tile the interior without overlapping, so their order is free.
+    ...CAPITAL_DISTRICTS.map((d) => ({
         id: d.id,
         label: d.label,
         minX: d.minX,
@@ -2128,12 +2154,22 @@ export const DISCOVERY_ZONES = [
         minZ: THAW_GORGE_MIN_Z - WORLD_NORTH_PAD,
         maxZ: DEADLANDS_MIN_Z - 1 - WORLD_NORTH_PAD,
     },
+    {
+        // The headland the polar bears come ashore on (bearFloes.ts), and the
+        // sea they ride in over. Listed before the snowfields, which reach it.
+        id: 'bear-floes',
+        label: 'The Bear Floes',
+        minX: BEAR_FLOES_ZONE.minX,
+        maxX: BEAR_FLOES_ZONE.maxX,
+        minZ: BEAR_FLOES_ZONE.minZ - WORLD_NORTH_PAD,
+        maxZ: BEAR_FLOES_ZONE.maxZ - WORLD_NORTH_PAD,
+    },
     {
         id: 'northern-snowfields',
         label: 'The Snowfields',
         minX: 0,
         maxX: NORTHERN_WALL_MAX_X,
-        minZ: 0 - WORLD_NORTH_PAD,
+        minZ: NORTH_SHIFT - WORLD_NORTH_PAD,
         maxZ: NORTHERN_WALL_Z - 25 - WORLD_NORTH_PAD,
     },
 ];
@@ -2182,17 +2218,21 @@ export function inMineYard(x, z, margin = 0) {
  */
 export const WORLD_MAP_LANDMARKS = [
     { x: NORTHERN_GATE_X, z: NORTHERN_WALL_Z, label: 'Northern Gate' },
-    { x: NORTHERN_CAMP_CENTER.x, z: NORTHERN_CAMP_CENTER.z, label: 'War Camp', labelSide: 'right' },
-    { x: 8, z: 200, label: 'Frozen Shore', labelSide: 'right' },
-    { x: BRANSONS_LANDING_SHIP.x, z: BRANSONS_LANDING_PIER_MAX_Z, label: "Branson's Landing", labelSide: 'below' },
+    { x: NORTHERN_CAMP_CENTER.x, z: NORTHERN_CAMP_CENTER.z, label: 'War Camp', labelSide: 'right', kind: 'shop' },
+    { x: 8, z: 264, label: 'Frozen Shore', labelSide: 'right' },
+    { x: BEAR_FLOES_CAMP.x, z: BEAR_FLOES_CAMP.z - 8, label: 'The Bear Floes', labelSide: 'right' },
+    { x: BRANSONS_LANDING_SHIP.x, z: BRANSONS_LANDING_PIER_MAX_Z, label: "Branson's Landing", labelSide: 'below', kind: 'shop' },
     { x: FROZEN_LAKE_CENTER.x, z: FROZEN_LAKE_CENTER.z, label: 'Frozen Lake', labelSide: 'right' },
     { x: CRYSTAL_BRIDGE_X, z: (CRYSTAL_GORGE_MIN_Z + CRYSTAL_GORGE_MAX_Z) / 2, label: 'Crystal Bridge', labelSide: 'right' },
     { x: FROZEN_HALLWAY_X, z: (FROZEN_HALLWAY_GATE_Z + FROZEN_HALLWAY_MOUTH_Z) / 2, label: 'Frozen Hallway', labelSide: 'right' },
     { x: THAW_GORGE_CX, z: THAW_BRIDGE_Z, label: 'Thaw Bridge', labelSide: 'right' },
     { x: THAW_GORGE_CX, z: THAW_FALLS_Z, label: 'Thaw Fall', labelSide: 'right' },
     { x: THAW_GORGE_CX, z: THAW_MOUTH_STAND_Z, label: 'Thaw Mouth', labelSide: 'right' },
-    { x: CAPITAL_KEEP.x - 110, z: CAPITAL_KEEP.z, label: 'The Capital', labelSide: 'above' },
-    { ...discoveryZoneCenter('no-harm-farm'), label: 'Farm' },
+    // The city's name over the Crown Cross, where the Royal Way meets the King's Road.
+    { x: CAPITAL_ROYAL_WAY_X, z: CAPITAL_AVENUE_Z, label: 'The Capital', labelSide: 'above', kind: 'shop' },
+    { x: HARBOUR_ROYAL_PIER.maxX - 6, z: HARBOUR_ROAD_Z, label: "King's Harbour", labelSide: 'below', kind: 'shop' },
+    { x: HARBOUR_LIGHTHOUSE.x, z: HARBOUR_LIGHTHOUSE.z, label: 'Lighthouse', labelSide: 'right' },
+    { ...discoveryZoneCenter('no-harm-farm'), label: 'Farm', kind: 'shop' },
     { x: CROSSROADS_WORLD_X, z: toWorldZ(CROSSROADS_LOCAL_Z), label: 'Crossroads' },
     { ...discoveryZoneCenter('henson-pond'), label: 'Pond' },
     {
@@ -2208,22 +2248,42 @@ export const WORLD_MAP_LANDMARKS = [
         label: 'Trout Fishery',
         labelSide: 'on',
     },
-    { ...discoveryZoneCenter('basecamp'), label: 'Base Camp', labelSide: 'left' },
+    { ...discoveryZoneCenter('basecamp'), label: 'Base Camp', labelSide: 'left', kind: 'shop' },
     {
         x: BATTLEFIELD_BRIDGE_X,
         z: Math.round((GOBLIN_FRONTIER_MIN_Z + GOBLIN_FRONTIER_MAX_Z) / 2),
         label: 'Battlefield',
         labelSide: 'above',
     },
-    { x: TOWN_GATE_X, z: TOWN_CROSS_STREET_Z, label: 'Calverton' },
+    { x: TOWN_GATE_X, z: TOWN_CROSS_STREET_Z, label: 'Calverton', kind: 'shop' },
     { x: BLOOD_LAKE_CX, z: BLOOD_LAKE_CZ, label: 'Blood Lake', labelSide: 'on' },
-    { x: SPIDER_CAVE_MOUTH_X, z: SPIDER_CAVE_MOUTH_Z, label: 'Dungeon', labelSide: 'left' },
+    {
+        x: SPIDER_CAVE_MOUTH_X,
+        z: SPIDER_CAVE_MOUTH_Z,
+        label: 'Spider Cave',
+        kind: 'dungeon',
+        dungeonId: 'spider-cave',
+    },
     {
         x: BASECAMP_CAVE_X,
         z: toWorldZ(BASECAMP_CAVE_LOCAL_Z),
-        label: 'Dungeon',
+        label: 'Rat Tunnel',
+        kind: 'dungeon',
+        dungeonId: 'rat-tunnel',
+    },
+    {
+        x: ICE_PRISON_OUTSIDE.x,
+        z: ICE_PRISON_OUTSIDE.z,
+        label: 'Ice Prison',
+        kind: 'dungeon',
+        dungeonId: 'ice-prison',
+    },
+    {
+        x: GOBLIN_CAVE_OUTSIDE.x,
+        z: GOBLIN_CAVE_OUTSIDE.z,
+        label: 'Goblin Cave',
         kind: 'dungeon',
-        labelSide: 'right',
+        dungeonId: 'goblin-cave',
     },
 ];
 /**