BlueGit

timfa questward

Make carrier pigeons dimension-aware via doorway portals.

Couriers plan multi-leg routes through BlockType.doorway portals (BFS), fall back to fade-out/abstract/fade-in when unreachable, and stamp real dimensionIds on spawn/sim/despawn. Transit schema stores origin/dest dims + legs JSON with overworld migration for legacy rows.

timfa Tim Falken · pushed by timfa

Authored 2026-09-13 · 2 months ago

Hash
a56818607cfd7ade4d63d7da70e3e8cc7b21d573
Parent
ff13bbcf
11 files changed +1345 −95
server/src/bounty/service.js +1 −0
@@ -324,6 +324,7 @@ export class BountyService
324 324 characterId: killerCharacterId,
325 325 originTileX: office.tileX,
326 326 originTileY: office.tileY,
327 originDimensionId: office.dimensionId,
327 328 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
328 329 body
329 330 });
@@ -324,6 +324,7 @@ export class BountyService
324 characterId: killerCharacterId,
324 characterId: killerCharacterId,
325 originTileX: office.tileX,
325 originTileX: office.tileX,
326 originTileY: office.tileY,
326 originTileY: office.tileY,
327 originDimensionId: office.dimensionId,
327 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
328 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
328 body
329 body
329 });
330 });
server/src/combat/combatLogout.js +4 −1
@@ -59,11 +59,13 @@ export function dispatchCombatLogoutBankLetter (simulation, characterId)
59 59 { return; }
60 60 const originTileX = row.tile_x | 0;
61 61 const originTileY = row.tile_y | 0;
62 const bank = simulation.courier.nearestBank?.(originTileX, originTileY);
62 const originDim = row.dimension_id ?? undefined;
63 const bank = simulation.courier.nearestBank?.(originTileX, originTileY, originDim);
63 64 simulation.courier.enqueueSystemLetter({
64 65 characterId,
65 66 originTileX: bank?.tileX ?? originTileX,
66 67 originTileY: bank?.tileY ?? originTileY,
68 originDimensionId: bank?.dimensionId ?? originDim,
67 69 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
68 70 authorOrganization: QUESTWARD_GIFT_ORG,
69 71 body: formatCombatLogoutCowardiceBody()
@@ -79,6 +81,7 @@ export function dispatchChurchOfflineResurrectionLetter (simulation, characterId
79 81 characterId,
80 82 originTileX: altar?.tileX ?? (tileX | 0),
81 83 originTileY: altar?.tileY ?? (tileY | 0),
84 originDimensionId: altar?.dimensionId,
82 85 authorDisplayName: CHURCH_LETTER_AUTHOR,
83 86 body: formatChurchOfflineResurrectionBody()
84 87 });
@@ -59,11 +59,13 @@ export function dispatchCombatLogoutBankLetter (simulation, characterId)
59 { return; }
59 { return; }
60 const originTileX = row.tile_x | 0;
60 const originTileX = row.tile_x | 0;
61 const originTileY = row.tile_y | 0;
61 const originTileY = row.tile_y | 0;
62 const bank = simulation.courier.nearestBank?.(originTileX, originTileY);
62 const originDim = row.dimension_id ?? undefined;
63 const bank = simulation.courier.nearestBank?.(originTileX, originTileY, originDim);
63 simulation.courier.enqueueSystemLetter({
64 simulation.courier.enqueueSystemLetter({
64 characterId,
65 characterId,
65 originTileX: bank?.tileX ?? originTileX,
66 originTileX: bank?.tileX ?? originTileX,
66 originTileY: bank?.tileY ?? originTileY,
67 originTileY: bank?.tileY ?? originTileY,
68 originDimensionId: bank?.dimensionId ?? originDim,
67 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
69 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
68 authorOrganization: QUESTWARD_GIFT_ORG,
70 authorOrganization: QUESTWARD_GIFT_ORG,
69 body: formatCombatLogoutCowardiceBody()
71 body: formatCombatLogoutCowardiceBody()
@@ -79,6 +81,7 @@ export function dispatchChurchOfflineResurrectionLetter (simulation, characterId
79 characterId,
81 characterId,
80 originTileX: altar?.tileX ?? (tileX | 0),
82 originTileX: altar?.tileX ?? (tileX | 0),
81 originTileY: altar?.tileY ?? (tileY | 0),
83 originTileY: altar?.tileY ?? (tileY | 0),
84 originDimensionId: altar?.dimensionId,
82 authorDisplayName: CHURCH_LETTER_AUTHOR,
85 authorDisplayName: CHURCH_LETTER_AUTHOR,
83 body: formatChurchOfflineResurrectionBody()
86 body: formatChurchOfflineResurrectionBody()
84 });
87 });
server/src/courier/service.js +446 −76
@@ -3,9 +3,17 @@ import { BlockType } from "../../../shared/definitions/tiles.js";
3 3 import { MobId, mobDefinition, mobSpriteName } from "../../../shared/definitions/mobs.js";
4 4 import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
5 5 import { isLetterWrittenBy } from "../../../shared/items/letters.js";
6 import { insertStack, insertStackGrowable, takeFromSlot, emptySlots, normalizeVault } from "../../../shared/items/inventory.js";
6 import { insertStack, insertStackGrowable, takeFromSlot, normalizeVault } from "../../../shared/items/inventory.js";
7 7 import { attachOrigins, normalizeOrigins } from "../../../shared/items/origin.js";
8 8 import { advanceCourierFlight } from "../../../shared/courier/flight.js";
9 import {
10 buildDoorwayGraph,
11 planPortalLegs,
12 buildFallbackLegs,
13 advanceAbstractTravel,
14 poseOnCourierLeg,
15 ensureCourierLegs
16 } from "../../../shared/courier/doorwayGraph.js";
9 17 import { GAIT } from "../../../shared/protocol/constants.js";
10 18 import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
11 19 import { decodeChunkBlob } from "../world/chunkData.js";
@@ -30,8 +38,11 @@ export class CourierService
30 38 this.simulation = simulation;
31 39 this.bankTiles = [];
32 40 this.bountyOfficeTiles = [];
41 this.doorwayTiles = [];
42 this.doorwayGraph = buildDoorwayGraph([]);
33 43 this.refreshBankIndex();
34 44 this.refreshBountyOfficeIndex();
45 this.refreshDoorwayIndex();
35 46 }
36 47
37 48 refreshBankIndex ()
@@ -44,6 +55,12 @@ export class CourierService
44 55 this.bountyOfficeTiles = this.#listBlockTiles(BlockType.bountyOffice);
45 56 }
46 57
58 refreshDoorwayIndex ()
59 {
60 this.doorwayTiles = this.#listDoorwayTiles();
61 this.doorwayGraph = buildDoorwayGraph(this.doorwayTiles);
62 }
63
47 64 #listBlockTiles (typeId)
48 65 {
49 66 const revisionId = this.worldDb.getActiveRevisionId();
@@ -73,6 +90,39 @@ export class CourierService
73 90 return tiles;
74 91 }
75 92
93 #listDoorwayTiles ()
94 {
95 const revisionId = this.worldDb.getActiveRevisionId();
96 const tiles = [];
97 for (const coord of this.worldDb.listChunkCoords(revisionId))
98 {
99 const dim = normalizeDimensionId(coord.dimension_id ?? OVERWORLD_ID);
100 const row = this.worldDb.getChunkVersion(coord.chunk_x, coord.chunk_y, revisionId, dim);
101 if (!row)
102 { continue; }
103 const data = decodeChunkBlob(row.data_blob, this.simulation.settings.defaultGroundTypeId, coord.chunk_x, coord.chunk_y);
104 for (let localY = 0; localY < CHUNK_SIZE; localY++)
105 {
106 for (let localX = 0; localX < CHUNK_SIZE; localX++)
107 {
108 const block = data.blocks[localY * CHUNK_SIZE + localX];
109 if (block?.typeId !== BlockType.doorway)
110 { continue; }
111 const config = block.config && typeof block.config === "object" ? block.config : null;
112 tiles.push({
113 tileX: coord.chunk_x * CHUNK_SIZE + localX,
114 tileY: coord.chunk_y * CHUNK_SIZE + localY,
115 dimensionId: dim,
116 targetDimensionId: config?.targetDimensionId,
117 targetTileX: config?.tileX,
118 targetTileY: config?.tileY
119 });
120 }
121 }
122 }
123 return tiles;
124 }
125
76 126 nearestBank (tileX, tileY, dimensionId = null)
77 127 {
78 128 return this.#nearestTile(this.bankTiles, tileX, tileY, dimensionId);
@@ -94,32 +144,42 @@ export class CourierService
94 144 });
95 145 }
96 146
147 /**
148 * Prefer same-dimension tiles when dimensionId is set; otherwise / as fallback, nearest overall.
149 */
97 150 #nearestTile (tiles, tileX, tileY, dimensionId = null)
98 151 {
99 152 if (!tiles.length)
100 153 { return null; }
101 154 const dim = dimensionId != null ? normalizeDimensionId(dimensionId) : null;
102 let best = null;
103 let bestDist = Infinity;
155 let bestSame = null;
156 let bestSameDist = Infinity;
157 let bestAny = null;
158 let bestAnyDist = Infinity;
104 159 for (const tile of tiles)
105 160 {
106 if (dim != null && normalizeDimensionId(tile.dimensionId ?? OVERWORLD_ID) !== dim)
107 { continue; }
108 161 const dist = Math.hypot(tile.tileX - tileX, tile.tileY - tileY);
109 if (dist < bestDist)
162 if (dist < bestAnyDist)
110 163 {
111 bestDist = dist;
112 best = tile;
164 bestAnyDist = dist;
165 bestAny = tile;
166 }
167 if (dim != null
168 && normalizeDimensionId(tile.dimensionId ?? OVERWORLD_ID) === dim
169 && dist < bestSameDist)
170 {
171 bestSameDist = dist;
172 bestSame = tile;
113 173 }
114 174 }
115 return best;
175 return bestSame ?? bestAny;
116 176 }
117 177
118 178 /**
119 179 * Player dispatch: cargo is money or one inventory stack.
120 180 * destination: { kind: "bank" } | { kind: "player", firstName, lastName }
121 181 */
122 dispatchFromPlayer ({ characterId, originTileX, originTileY, destination, cargo })
182 dispatchFromPlayer ({ characterId, originTileX, originTileY, originDimensionId = OVERWORLD_ID, destination, cargo })
123 183 {
124 184 const onlineId = this.simulation.characterEntities.get(characterId);
125 185 const bag = onlineId
@@ -168,21 +228,21 @@ export class CourierService
168 228 throw error;
169 229 }
170 230
171 const dest = this.#resolveDestination(destination, originTileX, originTileY);
231 const originDim = normalizeDimensionId(originDimensionId);
232 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
172 233 this.#persistBag(characterId, bag);
173 const transit = this.stateDb.insertCourierTransit({
234 const transit = this.#insertRoutedTransit({
174 235 senderCharacterId: characterId,
175 236 destinationKind: dest.kind,
176 237 destinationCharacterId: dest.characterId ?? null,
177 238 vaultCharacterId: dest.vaultCharacterId ?? null,
178 239 cargo: takenCargo,
179 originX: originTileX + 0.5,
180 originY: originTileY + 0.5,
181 destX: dest.tileX + 0.5,
182 destY: dest.tileY + 0.5,
183 traveled: 0,
184 status: "in_transit",
185 entityId: null
240 originTileX,
241 originTileY,
242 originDimensionId: originDim,
243 destTileX: dest.tileX,
244 destTileY: dest.tileY,
245 destDimensionId: dest.dimensionId
186 246 });
187 247 return { transit, bag };
188 248 }
@@ -196,6 +256,7 @@ export class CourierService
196 256 characterId,
197 257 originTileX,
198 258 originTileY,
259 originDimensionId = OVERWORLD_ID,
199 260 authorDisplayName,
200 261 authorOrganization = null,
201 262 body,
@@ -214,6 +275,7 @@ export class CourierService
214 275 characterId,
215 276 originTileX,
216 277 originTileY,
278 originDimensionId,
217 279 stack
218 280 });
219 281 }
@@ -224,7 +286,7 @@ export class CourierService
224 286 * — never deposit the letter straight into the vault.
225 287 * Prefer enqueueSystemLetter when building a new system letter from author/body fields.
226 288 */
227 dispatchSystemLetter ({ characterId, originTileX, originTileY, stack })
289 dispatchSystemLetter ({ characterId, originTileX, originTileY, originDimensionId = OVERWORLD_ID, stack })
228 290 {
229 291 const recipientId = characterId | 0;
230 292 const cargo = { kind: "item", stack };
@@ -233,6 +295,7 @@ export class CourierService
233 295 senderCharacterId: recipientId,
234 296 originTileX,
235 297 originTileY,
298 originDimensionId,
236 299 destination: {
237 300 kind: "player",
238 301 firstName: row?.first_name ?? "Unknown",
@@ -249,18 +312,28 @@ export class CourierService
249 312 * Player-bound holds keep destinationKind "player" even though resolve would route to bank
250 313 * while offline — on login the pigeon then delivers to the character, not the vault.
251 314 */
252 dispatchHeldCargo ({ senderCharacterId, originTileX, originTileY, destination, cargo, vaultCharacterId = null })
315 dispatchHeldCargo ({
316 senderCharacterId,
317 originTileX,
318 originTileY,
319 originDimensionId = OVERWORLD_ID,
320 destination,
321 cargo,
322 vaultCharacterId = null
323 })
253 324 {
325 const originDim = normalizeDimensionId(originDimensionId);
254 326 const recipientId = vaultCharacterId ?? senderCharacterId;
255 327 if (!this.simulation.isCharacterOnline(recipientId))
256 328 {
257 const dest = this.#resolveDestination(destination, originTileX, originTileY);
329 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
258 330 const intendedKind = destination?.kind === "player" ? "player" : dest.kind;
259 331 this.stateDb.insertHeldCourierDelivery({
260 332 characterId: recipientId,
261 333 senderCharacterId,
262 334 originTileX,
263 335 originTileY,
336 originDimensionId: originDim,
264 337 destinationKind: intendedKind,
265 338 destinationCharacterId: dest.characterId ?? recipientId,
266 339 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? recipientId,
@@ -268,26 +341,26 @@ export class CourierService
268 341 });
269 342 return null;
270 343 }
271 const dest = this.#resolveDestination(destination, originTileX, originTileY);
272 return this.stateDb.insertCourierTransit({
344 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
345 return this.#insertRoutedTransit({
273 346 senderCharacterId,
274 347 destinationKind: dest.kind,
275 348 destinationCharacterId: dest.characterId ?? null,
276 349 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? null,
277 350 cargo,
278 originX: originTileX + 0.5,
279 originY: originTileY + 0.5,
280 destX: dest.tileX + 0.5,
281 destY: dest.tileY + 0.5,
282 traveled: 0,
283 status: "in_transit",
284 entityId: null
351 originTileX,
352 originTileY,
353 originDimensionId: originDim,
354 destTileX: dest.tileX,
355 destTileY: dest.tileY,
356 destDimensionId: dest.dimensionId
285 357 });
286 358 }
287 359
288 360 /** Flush offline-held deliveries and send a bank resting notice when the player enters the world. */
289 onCharacterEnteredWorld (characterId, tileX, tileY)
361 onCharacterEnteredWorld (characterId, tileX, tileY, dimensionId = OVERWORLD_ID)
290 362 {
363 const enterDim = normalizeDimensionId(dimensionId);
291 364 for (const held of this.stateDb.listHeldCourierDeliveries(characterId))
292 365 {
293 366 this.stateDb.deleteHeldCourierDelivery(held.holdId);
@@ -296,6 +369,7 @@ export class CourierService
296 369 senderCharacterId: held.senderCharacterId,
297 370 originTileX: held.originTileX,
298 371 originTileY: held.originTileY,
372 originDimensionId: held.originDimensionId ?? OVERWORLD_ID,
299 373 destination: held.destinationKind === "bank"
300 374 ? { kind: "bank" }
301 375 : {
@@ -307,7 +381,7 @@ export class CourierService
307 381 vaultCharacterId: held.vaultCharacterId ?? characterId
308 382 });
309 383 }
310 const noticeTransit = this.#dispatchBankRestNotice(characterId, tileX, tileY);
384 const noticeTransit = this.#dispatchBankRestNotice(characterId, tileX, tileY, enterDim);
311 385 void noticeTransit;
312 386 }
313 387
@@ -317,28 +391,256 @@ export class CourierService
317 391 const settings = this.simulation.settings;
318 392 for (const transit of this.stateDb.listActiveCourierTransits())
319 393 {
394 ensureCourierLegs(transit);
320 395 this.#retargetPlayerDest(transit);
396 ensureCourierLegs(transit);
397 const advancedEvents = this.#advanceTransit(transit, now, dt, settings);
398 events.push(...advancedEvents);
399 }
400 return events;
401 }
402
403 #insertRoutedTransit ({
404 senderCharacterId,
405 destinationKind,
406 destinationCharacterId,
407 vaultCharacterId,
408 cargo,
409 originTileX,
410 originTileY,
411 originDimensionId,
412 destTileX,
413 destTileY,
414 destDimensionId
415 })
416 {
417 const originDim = normalizeDimensionId(originDimensionId);
418 const destDim = normalizeDimensionId(destDimensionId ?? OVERWORLD_ID);
419 const originX = originTileX + 0.5;
420 const originY = originTileY + 0.5;
421 const destX = destTileX + 0.5;
422 const destY = destTileY + 0.5;
423 const legs = this.#planLegs({
424 fromX: originX,
425 fromY: originY,
426 fromDimensionId: originDim,
427 toX: destX,
428 toY: destY,
429 toDimensionId: destDim
430 });
431 return this.stateDb.insertCourierTransit({
432 senderCharacterId,
433 destinationKind,
434 destinationCharacterId,
435 vaultCharacterId,
436 cargo,
437 originX,
438 originY,
439 destX,
440 destY,
441 originDimensionId: originDim,
442 destDimensionId: destDim,
443 legs,
444 legIndex: 0,
445 traveled: 0,
446 status: "in_transit",
447 entityId: null
448 });
449 }
450
451 #planLegs ({ fromX, fromY, fromDimensionId, toX, toY, toDimensionId })
452 {
453 const planned = planPortalLegs({
454 fromX,
455 fromY,
456 fromDimensionId,
457 toX,
458 toY,
459 toDimensionId,
460 graph: this.doorwayGraph
461 });
462 if (planned.mode !== "fallback")
463 { return planned.legs; }
464 return buildFallbackLegs({
465 fromX,
466 fromY,
467 fromDimensionId,
468 toX,
469 toY,
470 toDimensionId,
471 isSimulating: (tileX, tileY, dimensionId) =>
472 this.simulation.chunkIsSimulating(tileX, tileY, dimensionId),
473 settings: this.simulation.settings
474 }).legs;
475 }
476
477 #repathTransit (transit, fromX, fromY, fromDimensionId, toX, toY, toDimensionId)
478 {
479 if (transit.entityId)
480 {
481 this.simulation.despawnEntity(transit.entityId);
482 transit.entityId = null;
483 }
484 transit.originX = fromX;
485 transit.originY = fromY;
486 transit.originDimensionId = normalizeDimensionId(fromDimensionId);
487 transit.destX = toX;
488 transit.destY = toY;
489 transit.destDimensionId = normalizeDimensionId(toDimensionId);
490 transit.legs = this.#planLegs({
491 fromX,
492 fromY,
493 fromDimensionId: transit.originDimensionId,
494 toX,
495 toY,
496 toDimensionId: transit.destDimensionId
497 });
498 transit.legIndex = 0;
499 transit.traveled = 0;
500 }
501
502 #currentPose (transit)
503 {
504 ensureCourierLegs(transit);
505 const leg = transit.legs[transit.legIndex | 0];
506 const pose = poseOnCourierLeg(leg, transit.traveled);
507 if (pose)
508 { return pose; }
509 if (leg?.kind === "abstract")
510 {
511 return {
512 x: leg.fromX,
513 y: leg.fromY,
514 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? transit.originDimensionId ?? OVERWORLD_ID)
515 };
516 }
517 return {
518 x: transit.originX,
519 y: transit.originY,
520 dimensionId: normalizeDimensionId(transit.originDimensionId ?? OVERWORLD_ID)
521 };
522 }
523
524 #advanceTransit (transit, now, dt, settings)
525 {
526 const events = [];
527 ensureCourierLegs(transit);
528 let remainingDt = Math.max(0, dt);
529 let guard = 0;
530 while (remainingDt > 0 && guard++ < 16)
531 {
532 const leg = transit.legs[transit.legIndex | 0];
533 if (!leg)
534 {
535 events.push(...this.#deliver(transit, now));
536 return events;
537 }
538
539 if (leg.kind === "portal")
540 {
541 transit.traveled = 0;
542 transit.legIndex = (transit.legIndex | 0) + 1;
543 if (transit.entityId)
544 {
545 this.simulation.despawnEntity(transit.entityId);
546 events.push({
547 type: "entity-despawn",
548 entityId: transit.entityId,
549 tileX: Math.floor(leg.fromX),
550 tileY: Math.floor(leg.fromY),
551 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
552 });
553 transit.entityId = null;
554 }
555 if ((transit.legIndex | 0) >= transit.legs.length)
556 {
557 events.push(...this.#deliver(transit, now));
558 return events;
559 }
560 continue;
561 }
562
563 if (leg.kind === "abstract")
564 {
565 if (transit.entityId)
566 {
567 const pose = this.#currentPose(transit);
568 this.simulation.despawnEntity(transit.entityId);
569 events.push({
570 type: "entity-despawn",
571 entityId: transit.entityId,
572 tileX: Math.floor(pose.x),
573 tileY: Math.floor(pose.y),
574 dimensionId: pose.dimensionId
575 });
576 transit.entityId = null;
577 }
578 const advanced = advanceAbstractTravel({
579 traveled: transit.traveled,
580 distance: leg.distance ?? 0,
581 dt: remainingDt,
582 settings
583 });
584 transit.traveled = advanced.traveled;
585 transit.updatedAt = now;
586 if (!advanced.arrived)
587 {
588 this.stateDb.updateCourierTransit(transit);
589 return events;
590 }
591 remainingDt = 0;
592 transit.traveled = 0;
593 transit.legIndex = (transit.legIndex | 0) + 1;
594 if ((transit.legIndex | 0) >= transit.legs.length)
595 {
596 events.push(...this.#deliver(transit, now));
597 return events;
598 }
599 continue;
600 }
601
602 // fly leg
321 603 const advanced = advanceCourierFlight({
322 originX: transit.originX,
323 originY: transit.originY,
324 destX: transit.destX,
325 destY: transit.destY,
604 originX: leg.fromX,
605 originY: leg.fromY,
606 destX: leg.toX,
607 destY: leg.toY,
326 608 traveled: transit.traveled,
327 dt,
609 dt: remainingDt,
328 610 settings
329 611 });
330 612 transit.traveled = advanced.traveled;
331 613 transit.updatedAt = now;
614 if (!advanced.arrived)
615 {
616 events.push(...this.#syncVisiblePigeon(transit, advanced, now, leg));
617 this.stateDb.updateCourierTransit(transit);
618 return events;
619 }
332 620
333 if (advanced.arrived)
621 remainingDt = 0;
622 transit.traveled = 0;
623 transit.legIndex = (transit.legIndex | 0) + 1;
624 if ((transit.legIndex | 0) >= transit.legs.length)
334 625 {
335 626 events.push(...this.#deliver(transit, now));
336 continue;
627 return events;
628 }
629 // Despawn at portal approach so next portal/fly starts clean.
630 if (transit.entityId)
631 {
632 this.simulation.despawnEntity(transit.entityId);
633 events.push({
634 type: "entity-despawn",
635 entityId: transit.entityId,
636 tileX: Math.floor(advanced.x),
637 tileY: Math.floor(advanced.y),
638 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
639 });
640 transit.entityId = null;
337 641 }
338
339 events.push(...this.#syncVisiblePigeon(transit, advanced, now));
340 this.stateDb.updateCourierTransit(transit);
341 642 }
643 this.stateDb.updateCourierTransit(transit);
342 644 return events;
343 645 }
344 646
@@ -350,10 +652,45 @@ export class CourierService
350 652 if (onlineId)
351 653 {
352 654 const pos = this.simulation.positionOf(onlineId);
353 if (pos)
655 if (!pos)
656 { return; }
657 const destDim = normalizeDimensionId(pos.dimensionId ?? OVERWORLD_ID);
658 const destX = pos.tileX + 0.5;
659 const destY = pos.tileY + 0.5;
660 const prevDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
661 if (destDim !== prevDim)
354 662 {
355 transit.destX = pos.tileX + 0.5;
356 transit.destY = pos.tileY + 0.5;
663 const pose = this.#currentPose(transit);
664 this.#repathTransit(
665 transit,
666 pose.x,
667 pose.y,
668 pose.dimensionId,
669 destX,
670 destY,
671 destDim
672 );
673 return;
674 }
675 transit.destX = destX;
676 transit.destY = destY;
677 transit.destDimensionId = destDim;
678 const lastIdx = transit.legs.length - 1;
679 const last = transit.legs[lastIdx];
680 if (last?.kind === "fly"
681 && normalizeDimensionId(last.toDimensionId ?? destDim) === destDim)
682 {
683 const oldToX = last.toX;
684 const oldToY = last.toY;
685 last.toX = destX;
686 last.toY = destY;
687 if ((transit.legIndex | 0) === lastIdx)
688 {
689 const oldTotal = Math.hypot(oldToX - last.fromX, oldToY - last.fromY);
690 const newTotal = Math.hypot(destX - last.fromX, destY - last.fromY);
691 if (oldTotal > 1e-6)
692 { transit.traveled = Math.min(newTotal, (transit.traveled || 0) * (newTotal / oldTotal)); }
693 }
357 694 }
358 695 return;
359 696 }
@@ -362,18 +699,28 @@ export class CourierService
362 699
363 700 #routeTransitToBank (transit, vaultCharacterId)
364 701 {
365 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY))
366 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY));
702 const pose = this.#currentPose(transit);
703 const bank = this.nearestBank(Math.floor(pose.x), Math.floor(pose.y), pose.dimensionId)
704 ?? this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY), transit.destDimensionId)
705 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY), transit.originDimensionId);
367 706 if (!bank)
368 707 { return; }
369 708 transit.destinationKind = "bank";
370 709 transit.vaultCharacterId = vaultCharacterId ?? transit.vaultCharacterId ?? transit.destinationCharacterId ?? transit.senderCharacterId;
371 transit.destX = bank.tileX + 0.5;
372 transit.destY = bank.tileY + 0.5;
710 this.#repathTransit(
711 transit,
712 pose.x,
713 pose.y,
714 pose.dimensionId,
715 bank.tileX + 0.5,
716 bank.tileY + 0.5,
717 bank.dimensionId ?? OVERWORLD_ID
718 );
373 719 }
374 720
375 #resolveDestination (destination, originTileX, originTileY)
721 #resolveDestination (destination, originTileX, originTileY, originDimensionId = OVERWORLD_ID)
376 722 {
723 const originDim = normalizeDimensionId(originDimensionId);
377 724 if (destination?.kind === "player")
378 725 {
379 726 const character = this.stateDb.getCharacterByName(destination.firstName, destination.lastName);
@@ -386,8 +733,9 @@ export class CourierService
386 733 const onlineId = this.simulation.characterEntities.get(character.character_id);
387 734 if (!onlineId)
388 735 {
389 const bank = this.nearestBank(originTileX, originTileY)
390 ?? this.nearestBank(character.tile_x, character.tile_y);
736 const charDim = normalizeDimensionId(character.dimension_id ?? OVERWORLD_ID);
737 const bank = this.nearestBank(originTileX, originTileY, originDim)
738 ?? this.nearestBank(character.tile_x, character.tile_y, charDim);
391 739 if (!bank)
392 740 {
393 741 const error = new Error("No bank exists in the world yet.");
@@ -399,7 +747,8 @@ export class CourierService
399 747 characterId: character.character_id,
400 748 vaultCharacterId: character.character_id,
401 749 tileX: bank.tileX,
402 tileY: bank.tileY
750 tileY: bank.tileY,
751 dimensionId: normalizeDimensionId(bank.dimensionId ?? OVERWORLD_ID)
403 752 };
404 753 }
405 754 const pos = this.simulation.positionOf(onlineId);
@@ -407,31 +756,40 @@ export class CourierService
407 756 kind: "player",
408 757 characterId: character.character_id,
409 758 tileX: pos.tileX,
410 tileY: pos.tileY
759 tileY: pos.tileY,
760 dimensionId: normalizeDimensionId(pos.dimensionId ?? OVERWORLD_ID)
411 761 };
412 762 }
413 763 if (destination?.kind === "bank")
414 764 {
415 const bank = this.nearestBank(originTileX, originTileY);
765 const bank = this.nearestBank(originTileX, originTileY, originDim);
416 766 if (!bank)
417 767 {
418 768 const error = new Error("No bank exists in the world yet.");
419 769 error.userFacing = true;
420 770 throw error;
421 771 }
422 return { kind: "bank", tileX: bank.tileX, tileY: bank.tileY };
772 return {
773 kind: "bank",
774 tileX: bank.tileX,
775 tileY: bank.tileY,
776 dimensionId: normalizeDimensionId(bank.dimensionId ?? OVERWORLD_ID)
777 };
423 778 }
424 779 const error = new Error("Pigeon destination must be bank or player.");
425 780 error.userFacing = true;
426 781 throw error;
427 782 }
428 783
429 #syncVisiblePigeon (transit, advanced, now)
784 #syncVisiblePigeon (transit, advanced, now, leg)
430 785 {
431 786 const events = [];
432 787 const tileX = Math.floor(advanced.x);
433 788 const tileY = Math.floor(advanced.y);
434 if (!this.simulation.chunkIsSimulating(tileX, tileY))
789 const dimensionId = normalizeDimensionId(
790 leg?.fromDimensionId ?? transit.originDimensionId ?? OVERWORLD_ID
791 );
792 if (!this.simulation.chunkIsSimulating(tileX, tileY, dimensionId))
435 793 {
436 794 if (transit.entityId)
437 795 {
@@ -441,7 +799,7 @@ export class CourierService
441 799 entityId: transit.entityId,
442 800 tileX,
443 801 tileY,
444 dimensionId: OVERWORLD_ID
802 dimensionId
445 803 });
446 804 transit.entityId = null;
447 805 }
@@ -453,14 +811,14 @@ export class CourierService
453 811 transit.entityId = null;
454 812 const def = mobDefinition(MobId.pigeon);
455 813 const entityId = this.simulation.spawnEntity({
456 position: { tileX, tileY },
814 position: { tileX, tileY, dimensionId },
457 815 movement: { gait: GAIT.walk, walkCarry: 0 },
458 816 path: { tiles: [] },
459 817 flight: {
460 818 x: advanced.x,
461 819 y: advanced.y,
462 targetX: transit.destX,
463 targetY: transit.destY,
820 targetX: leg?.toX ?? transit.destX,
821 targetY: leg?.toY ?? transit.destY,
464 822 speed: advanced.speed,
465 823 nextPickAt: now + 60_000,
466 824 lastAt: now,
@@ -483,8 +841,8 @@ export class CourierService
483 841 const moved = this.simulation.updateCourierFlight(transit.entityId, {
484 842 x: advanced.x,
485 843 y: advanced.y,
486 targetX: transit.destX,
487 targetY: transit.destY,
844 targetX: leg?.toX ?? transit.destX,
845 targetY: leg?.toY ?? transit.destY,
488 846 speed: advanced.speed,
489 847 lastAt: now,
490 848 courierId: transit.courierId
@@ -497,7 +855,7 @@ export class CourierService
497 855 entityId: moved.entityId,
498 856 tileX,
499 857 tileY,
500 dimensionId: OVERWORLD_ID
858 dimensionId
501 859 });
502 860 }
503 861 else if (moved?.event)
@@ -508,6 +866,7 @@ export class CourierService
508 866 #deliver (transit, now)
509 867 {
510 868 const events = [];
869 const destDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
511 870 if (transit.entityId)
512 871 {
513 872 this.simulation.despawnEntity(transit.entityId);
@@ -516,7 +875,7 @@ export class CourierService
516 875 entityId: transit.entityId,
517 876 tileX: Math.floor(transit.destX),
518 877 tileY: Math.floor(transit.destY),
519 dimensionId: OVERWORLD_ID
878 dimensionId: destDim
520 879 });
521 880 transit.entityId = null;
522 881 }
@@ -537,17 +896,26 @@ export class CourierService
537 896 const delivered = this.#tryDeliverToPlayer(transit.destinationCharacterId, transit.cargo);
538 897 if (!delivered)
539 898 {
540 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY))
541 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY));
899 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY), destDim)
900 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY), transit.originDimensionId);
542 901 if (bank)
543 902 {
544 transit.originX = transit.destX;
545 transit.originY = transit.destY;
546 transit.destX = bank.tileX + 0.5;
547 transit.destY = bank.tileY + 0.5;
548 transit.traveled = 0;
903 const pose = {
904 x: transit.destX,
905 y: transit.destY,
906 dimensionId: destDim
907 };
549 908 transit.destinationKind = "bank";
550 909 transit.vaultCharacterId = transit.destinationCharacterId;
910 this.#repathTransit(
911 transit,
912 pose.x,
913 pose.y,
914 pose.dimensionId,
915 bank.tileX + 0.5,
916 bank.tileY + 0.5,
917 bank.dimensionId ?? OVERWORLD_ID
918 );
551 919 transit.updatedAt = now;
552 920 this.stateDb.updateCourierTransit(transit);
553 921 events.push({
@@ -785,12 +1153,13 @@ export class CourierService
785 1153 };
786 1154 }
787 1155
788 #dispatchBankRestNotice (characterId, tileX, tileY)
1156 #dispatchBankRestNotice (characterId, tileX, tileY, dimensionId = OVERWORLD_ID)
789 1157 {
790 1158 const entries = this.stateDb.listBankRestNotices(characterId);
791 1159 if (!entries.length)
792 1160 { return null; }
793 const bank = this.nearestBank(tileX, tileY);
1161 const dim = normalizeDimensionId(dimensionId);
1162 const bank = this.nearestBank(tileX, tileY, dim);
794 1163 if (!bank)
795 1164 { return null; }
796 1165
@@ -811,6 +1180,7 @@ export class CourierService
811 1180 characterId,
812 1181 originTileX: bank.tileX,
813 1182 originTileY: bank.tileY,
1183 originDimensionId: bank.dimensionId ?? OVERWORLD_ID,
814 1184 stack
815 1185 });
816 1186 }
@@ -3,9 +3,17 @@ import { BlockType } from "../../../shared/definitions/tiles.js";
3import { MobId, mobDefinition, mobSpriteName } from "../../../shared/definitions/mobs.js";
3import { MobId, mobDefinition, mobSpriteName } from "../../../shared/definitions/mobs.js";
4import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
4import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
5import { isLetterWrittenBy } from "../../../shared/items/letters.js";
5import { isLetterWrittenBy } from "../../../shared/items/letters.js";
6import { insertStack, insertStackGrowable, takeFromSlot, emptySlots, normalizeVault } from "../../../shared/items/inventory.js";
6import { insertStack, insertStackGrowable, takeFromSlot, normalizeVault } from "../../../shared/items/inventory.js";
7import { attachOrigins, normalizeOrigins } from "../../../shared/items/origin.js";
7import { attachOrigins, normalizeOrigins } from "../../../shared/items/origin.js";
8import { advanceCourierFlight } from "../../../shared/courier/flight.js";
8import { advanceCourierFlight } from "../../../shared/courier/flight.js";
9import {
10 buildDoorwayGraph,
11 planPortalLegs,
12 buildFallbackLegs,
13 advanceAbstractTravel,
14 poseOnCourierLeg,
15 ensureCourierLegs
16} from "../../../shared/courier/doorwayGraph.js";
9import { GAIT } from "../../../shared/protocol/constants.js";
17import { GAIT } from "../../../shared/protocol/constants.js";
10import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
18import { OVERWORLD_ID, normalizeDimensionId } from "../../../shared/world/dimensions.js";
11import { decodeChunkBlob } from "../world/chunkData.js";
19import { decodeChunkBlob } from "../world/chunkData.js";
@@ -30,8 +38,11 @@ export class CourierService
30 this.simulation = simulation;
38 this.simulation = simulation;
31 this.bankTiles = [];
39 this.bankTiles = [];
32 this.bountyOfficeTiles = [];
40 this.bountyOfficeTiles = [];
41 this.doorwayTiles = [];
42 this.doorwayGraph = buildDoorwayGraph([]);
33 this.refreshBankIndex();
43 this.refreshBankIndex();
34 this.refreshBountyOfficeIndex();
44 this.refreshBountyOfficeIndex();
45 this.refreshDoorwayIndex();
35 }
46 }
36
47
37 refreshBankIndex ()
48 refreshBankIndex ()
@@ -44,6 +55,12 @@ export class CourierService
44 this.bountyOfficeTiles = this.#listBlockTiles(BlockType.bountyOffice);
55 this.bountyOfficeTiles = this.#listBlockTiles(BlockType.bountyOffice);
45 }
56 }
46
57
58 refreshDoorwayIndex ()
59 {
60 this.doorwayTiles = this.#listDoorwayTiles();
61 this.doorwayGraph = buildDoorwayGraph(this.doorwayTiles);
62 }
63
47 #listBlockTiles (typeId)
64 #listBlockTiles (typeId)
48 {
65 {
49 const revisionId = this.worldDb.getActiveRevisionId();
66 const revisionId = this.worldDb.getActiveRevisionId();
@@ -73,6 +90,39 @@ export class CourierService
73 return tiles;
90 return tiles;
74 }
91 }
75
92
93 #listDoorwayTiles ()
94 {
95 const revisionId = this.worldDb.getActiveRevisionId();
96 const tiles = [];
97 for (const coord of this.worldDb.listChunkCoords(revisionId))
98 {
99 const dim = normalizeDimensionId(coord.dimension_id ?? OVERWORLD_ID);
100 const row = this.worldDb.getChunkVersion(coord.chunk_x, coord.chunk_y, revisionId, dim);
101 if (!row)
102 { continue; }
103 const data = decodeChunkBlob(row.data_blob, this.simulation.settings.defaultGroundTypeId, coord.chunk_x, coord.chunk_y);
104 for (let localY = 0; localY < CHUNK_SIZE; localY++)
105 {
106 for (let localX = 0; localX < CHUNK_SIZE; localX++)
107 {
108 const block = data.blocks[localY * CHUNK_SIZE + localX];
109 if (block?.typeId !== BlockType.doorway)
110 { continue; }
111 const config = block.config && typeof block.config === "object" ? block.config : null;
112 tiles.push({
113 tileX: coord.chunk_x * CHUNK_SIZE + localX,
114 tileY: coord.chunk_y * CHUNK_SIZE + localY,
115 dimensionId: dim,
116 targetDimensionId: config?.targetDimensionId,
117 targetTileX: config?.tileX,
118 targetTileY: config?.tileY
119 });
120 }
121 }
122 }
123 return tiles;
124 }
125
76 nearestBank (tileX, tileY, dimensionId = null)
126 nearestBank (tileX, tileY, dimensionId = null)
77 {
127 {
78 return this.#nearestTile(this.bankTiles, tileX, tileY, dimensionId);
128 return this.#nearestTile(this.bankTiles, tileX, tileY, dimensionId);
@@ -94,32 +144,42 @@ export class CourierService
94 });
144 });
95 }
145 }
96
146
147 /**
148 * Prefer same-dimension tiles when dimensionId is set; otherwise / as fallback, nearest overall.
149 */
97 #nearestTile (tiles, tileX, tileY, dimensionId = null)
150 #nearestTile (tiles, tileX, tileY, dimensionId = null)
98 {
151 {
99 if (!tiles.length)
152 if (!tiles.length)
100 { return null; }
153 { return null; }
101 const dim = dimensionId != null ? normalizeDimensionId(dimensionId) : null;
154 const dim = dimensionId != null ? normalizeDimensionId(dimensionId) : null;
102 let best = null;
155 let bestSame = null;
103 let bestDist = Infinity;
156 let bestSameDist = Infinity;
157 let bestAny = null;
158 let bestAnyDist = Infinity;
104 for (const tile of tiles)
159 for (const tile of tiles)
105 {
160 {
106 if (dim != null && normalizeDimensionId(tile.dimensionId ?? OVERWORLD_ID) !== dim)
107 { continue; }
108 const dist = Math.hypot(tile.tileX - tileX, tile.tileY - tileY);
161 const dist = Math.hypot(tile.tileX - tileX, tile.tileY - tileY);
109 if (dist < bestDist)
162 if (dist < bestAnyDist)
110 {
163 {
111 bestDist = dist;
164 bestAnyDist = dist;
112 best = tile;
165 bestAny = tile;
166 }
167 if (dim != null
168 && normalizeDimensionId(tile.dimensionId ?? OVERWORLD_ID) === dim
169 && dist < bestSameDist)
170 {
171 bestSameDist = dist;
172 bestSame = tile;
113 }
173 }
114 }
174 }
115 return best;
175 return bestSame ?? bestAny;
116 }
176 }
117
177
118 /**
178 /**
119 * Player dispatch: cargo is money or one inventory stack.
179 * Player dispatch: cargo is money or one inventory stack.
120 * destination: { kind: "bank" } | { kind: "player", firstName, lastName }
180 * destination: { kind: "bank" } | { kind: "player", firstName, lastName }
121 */
181 */
122 dispatchFromPlayer ({ characterId, originTileX, originTileY, destination, cargo })
182 dispatchFromPlayer ({ characterId, originTileX, originTileY, originDimensionId = OVERWORLD_ID, destination, cargo })
123 {
183 {
124 const onlineId = this.simulation.characterEntities.get(characterId);
184 const onlineId = this.simulation.characterEntities.get(characterId);
125 const bag = onlineId
185 const bag = onlineId
@@ -168,21 +228,21 @@ export class CourierService
168 throw error;
228 throw error;
169 }
229 }
170
230
171 const dest = this.#resolveDestination(destination, originTileX, originTileY);
231 const originDim = normalizeDimensionId(originDimensionId);
232 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
172 this.#persistBag(characterId, bag);
233 this.#persistBag(characterId, bag);
173 const transit = this.stateDb.insertCourierTransit({
234 const transit = this.#insertRoutedTransit({
174 senderCharacterId: characterId,
235 senderCharacterId: characterId,
175 destinationKind: dest.kind,
236 destinationKind: dest.kind,
176 destinationCharacterId: dest.characterId ?? null,
237 destinationCharacterId: dest.characterId ?? null,
177 vaultCharacterId: dest.vaultCharacterId ?? null,
238 vaultCharacterId: dest.vaultCharacterId ?? null,
178 cargo: takenCargo,
239 cargo: takenCargo,
179 originX: originTileX + 0.5,
240 originTileX,
180 originY: originTileY + 0.5,
241 originTileY,
181 destX: dest.tileX + 0.5,
242 originDimensionId: originDim,
182 destY: dest.tileY + 0.5,
243 destTileX: dest.tileX,
183 traveled: 0,
244 destTileY: dest.tileY,
184 status: "in_transit",
245 destDimensionId: dest.dimensionId
185 entityId: null
186 });
246 });
187 return { transit, bag };
247 return { transit, bag };
188 }
248 }
@@ -196,6 +256,7 @@ export class CourierService
196 characterId,
256 characterId,
197 originTileX,
257 originTileX,
198 originTileY,
258 originTileY,
259 originDimensionId = OVERWORLD_ID,
199 authorDisplayName,
260 authorDisplayName,
200 authorOrganization = null,
261 authorOrganization = null,
201 body,
262 body,
@@ -214,6 +275,7 @@ export class CourierService
214 characterId,
275 characterId,
215 originTileX,
276 originTileX,
216 originTileY,
277 originTileY,
278 originDimensionId,
217 stack
279 stack
218 });
280 });
219 }
281 }
@@ -224,7 +286,7 @@ export class CourierService
224 * — never deposit the letter straight into the vault.
286 * — never deposit the letter straight into the vault.
225 * Prefer enqueueSystemLetter when building a new system letter from author/body fields.
287 * Prefer enqueueSystemLetter when building a new system letter from author/body fields.
226 */
288 */
227 dispatchSystemLetter ({ characterId, originTileX, originTileY, stack })
289 dispatchSystemLetter ({ characterId, originTileX, originTileY, originDimensionId = OVERWORLD_ID, stack })
228 {
290 {
229 const recipientId = characterId | 0;
291 const recipientId = characterId | 0;
230 const cargo = { kind: "item", stack };
292 const cargo = { kind: "item", stack };
@@ -233,6 +295,7 @@ export class CourierService
233 senderCharacterId: recipientId,
295 senderCharacterId: recipientId,
234 originTileX,
296 originTileX,
235 originTileY,
297 originTileY,
298 originDimensionId,
236 destination: {
299 destination: {
237 kind: "player",
300 kind: "player",
238 firstName: row?.first_name ?? "Unknown",
301 firstName: row?.first_name ?? "Unknown",
@@ -249,18 +312,28 @@ export class CourierService
249 * Player-bound holds keep destinationKind "player" even though resolve would route to bank
312 * Player-bound holds keep destinationKind "player" even though resolve would route to bank
250 * while offline — on login the pigeon then delivers to the character, not the vault.
313 * while offline — on login the pigeon then delivers to the character, not the vault.
251 */
314 */
252 dispatchHeldCargo ({ senderCharacterId, originTileX, originTileY, destination, cargo, vaultCharacterId = null })
315 dispatchHeldCargo ({
316 senderCharacterId,
317 originTileX,
318 originTileY,
319 originDimensionId = OVERWORLD_ID,
320 destination,
321 cargo,
322 vaultCharacterId = null
323 })
253 {
324 {
325 const originDim = normalizeDimensionId(originDimensionId);
254 const recipientId = vaultCharacterId ?? senderCharacterId;
326 const recipientId = vaultCharacterId ?? senderCharacterId;
255 if (!this.simulation.isCharacterOnline(recipientId))
327 if (!this.simulation.isCharacterOnline(recipientId))
256 {
328 {
257 const dest = this.#resolveDestination(destination, originTileX, originTileY);
329 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
258 const intendedKind = destination?.kind === "player" ? "player" : dest.kind;
330 const intendedKind = destination?.kind === "player" ? "player" : dest.kind;
259 this.stateDb.insertHeldCourierDelivery({
331 this.stateDb.insertHeldCourierDelivery({
260 characterId: recipientId,
332 characterId: recipientId,
261 senderCharacterId,
333 senderCharacterId,
262 originTileX,
334 originTileX,
263 originTileY,
335 originTileY,
336 originDimensionId: originDim,
264 destinationKind: intendedKind,
337 destinationKind: intendedKind,
265 destinationCharacterId: dest.characterId ?? recipientId,
338 destinationCharacterId: dest.characterId ?? recipientId,
266 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? recipientId,
339 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? recipientId,
@@ -268,26 +341,26 @@ export class CourierService
268 });
341 });
269 return null;
342 return null;
270 }
343 }
271 const dest = this.#resolveDestination(destination, originTileX, originTileY);
344 const dest = this.#resolveDestination(destination, originTileX, originTileY, originDim);
272 return this.stateDb.insertCourierTransit({
345 return this.#insertRoutedTransit({
273 senderCharacterId,
346 senderCharacterId,
274 destinationKind: dest.kind,
347 destinationKind: dest.kind,
275 destinationCharacterId: dest.characterId ?? null,
348 destinationCharacterId: dest.characterId ?? null,
276 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? null,
349 vaultCharacterId: vaultCharacterId ?? dest.vaultCharacterId ?? null,
277 cargo,
350 cargo,
278 originX: originTileX + 0.5,
351 originTileX,
279 originY: originTileY + 0.5,
352 originTileY,
280 destX: dest.tileX + 0.5,
353 originDimensionId: originDim,
281 destY: dest.tileY + 0.5,
354 destTileX: dest.tileX,
282 traveled: 0,
355 destTileY: dest.tileY,
283 status: "in_transit",
356 destDimensionId: dest.dimensionId
284 entityId: null
285 });
357 });
286 }
358 }
287
359
288 /** Flush offline-held deliveries and send a bank resting notice when the player enters the world. */
360 /** Flush offline-held deliveries and send a bank resting notice when the player enters the world. */
289 onCharacterEnteredWorld (characterId, tileX, tileY)
361 onCharacterEnteredWorld (characterId, tileX, tileY, dimensionId = OVERWORLD_ID)
290 {
362 {
363 const enterDim = normalizeDimensionId(dimensionId);
291 for (const held of this.stateDb.listHeldCourierDeliveries(characterId))
364 for (const held of this.stateDb.listHeldCourierDeliveries(characterId))
292 {
365 {
293 this.stateDb.deleteHeldCourierDelivery(held.holdId);
366 this.stateDb.deleteHeldCourierDelivery(held.holdId);
@@ -296,6 +369,7 @@ export class CourierService
296 senderCharacterId: held.senderCharacterId,
369 senderCharacterId: held.senderCharacterId,
297 originTileX: held.originTileX,
370 originTileX: held.originTileX,
298 originTileY: held.originTileY,
371 originTileY: held.originTileY,
372 originDimensionId: held.originDimensionId ?? OVERWORLD_ID,
299 destination: held.destinationKind === "bank"
373 destination: held.destinationKind === "bank"
300 ? { kind: "bank" }
374 ? { kind: "bank" }
301 : {
375 : {
@@ -307,7 +381,7 @@ export class CourierService
307 vaultCharacterId: held.vaultCharacterId ?? characterId
381 vaultCharacterId: held.vaultCharacterId ?? characterId
308 });
382 });
309 }
383 }
310 const noticeTransit = this.#dispatchBankRestNotice(characterId, tileX, tileY);
384 const noticeTransit = this.#dispatchBankRestNotice(characterId, tileX, tileY, enterDim);
311 void noticeTransit;
385 void noticeTransit;
312 }
386 }
313
387
@@ -317,28 +391,256 @@ export class CourierService
317 const settings = this.simulation.settings;
391 const settings = this.simulation.settings;
318 for (const transit of this.stateDb.listActiveCourierTransits())
392 for (const transit of this.stateDb.listActiveCourierTransits())
319 {
393 {
394 ensureCourierLegs(transit);
320 this.#retargetPlayerDest(transit);
395 this.#retargetPlayerDest(transit);
396 ensureCourierLegs(transit);
397 const advancedEvents = this.#advanceTransit(transit, now, dt, settings);
398 events.push(...advancedEvents);
399 }
400 return events;
401 }
402
403 #insertRoutedTransit ({
404 senderCharacterId,
405 destinationKind,
406 destinationCharacterId,
407 vaultCharacterId,
408 cargo,
409 originTileX,
410 originTileY,
411 originDimensionId,
412 destTileX,
413 destTileY,
414 destDimensionId
415 })
416 {
417 const originDim = normalizeDimensionId(originDimensionId);
418 const destDim = normalizeDimensionId(destDimensionId ?? OVERWORLD_ID);
419 const originX = originTileX + 0.5;
420 const originY = originTileY + 0.5;
421 const destX = destTileX + 0.5;
422 const destY = destTileY + 0.5;
423 const legs = this.#planLegs({
424 fromX: originX,
425 fromY: originY,
426 fromDimensionId: originDim,
427 toX: destX,
428 toY: destY,
429 toDimensionId: destDim
430 });
431 return this.stateDb.insertCourierTransit({
432 senderCharacterId,
433 destinationKind,
434 destinationCharacterId,
435 vaultCharacterId,
436 cargo,
437 originX,
438 originY,
439 destX,
440 destY,
441 originDimensionId: originDim,
442 destDimensionId: destDim,
443 legs,
444 legIndex: 0,
445 traveled: 0,
446 status: "in_transit",
447 entityId: null
448 });
449 }
450
451 #planLegs ({ fromX, fromY, fromDimensionId, toX, toY, toDimensionId })
452 {
453 const planned = planPortalLegs({
454 fromX,
455 fromY,
456 fromDimensionId,
457 toX,
458 toY,
459 toDimensionId,
460 graph: this.doorwayGraph
461 });
462 if (planned.mode !== "fallback")
463 { return planned.legs; }
464 return buildFallbackLegs({
465 fromX,
466 fromY,
467 fromDimensionId,
468 toX,
469 toY,
470 toDimensionId,
471 isSimulating: (tileX, tileY, dimensionId) =>
472 this.simulation.chunkIsSimulating(tileX, tileY, dimensionId),
473 settings: this.simulation.settings
474 }).legs;
475 }
476
477 #repathTransit (transit, fromX, fromY, fromDimensionId, toX, toY, toDimensionId)
478 {
479 if (transit.entityId)
480 {
481 this.simulation.despawnEntity(transit.entityId);
482 transit.entityId = null;
483 }
484 transit.originX = fromX;
485 transit.originY = fromY;
486 transit.originDimensionId = normalizeDimensionId(fromDimensionId);
487 transit.destX = toX;
488 transit.destY = toY;
489 transit.destDimensionId = normalizeDimensionId(toDimensionId);
490 transit.legs = this.#planLegs({
491 fromX,
492 fromY,
493 fromDimensionId: transit.originDimensionId,
494 toX,
495 toY,
496 toDimensionId: transit.destDimensionId
497 });
498 transit.legIndex = 0;
499 transit.traveled = 0;
500 }
501
502 #currentPose (transit)
503 {
504 ensureCourierLegs(transit);
505 const leg = transit.legs[transit.legIndex | 0];
506 const pose = poseOnCourierLeg(leg, transit.traveled);
507 if (pose)
508 { return pose; }
509 if (leg?.kind === "abstract")
510 {
511 return {
512 x: leg.fromX,
513 y: leg.fromY,
514 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? transit.originDimensionId ?? OVERWORLD_ID)
515 };
516 }
517 return {
518 x: transit.originX,
519 y: transit.originY,
520 dimensionId: normalizeDimensionId(transit.originDimensionId ?? OVERWORLD_ID)
521 };
522 }
523
524 #advanceTransit (transit, now, dt, settings)
525 {
526 const events = [];
527 ensureCourierLegs(transit);
528 let remainingDt = Math.max(0, dt);
529 let guard = 0;
530 while (remainingDt > 0 && guard++ < 16)
531 {
532 const leg = transit.legs[transit.legIndex | 0];
533 if (!leg)
534 {
535 events.push(...this.#deliver(transit, now));
536 return events;
537 }
538
539 if (leg.kind === "portal")
540 {
541 transit.traveled = 0;
542 transit.legIndex = (transit.legIndex | 0) + 1;
543 if (transit.entityId)
544 {
545 this.simulation.despawnEntity(transit.entityId);
546 events.push({
547 type: "entity-despawn",
548 entityId: transit.entityId,
549 tileX: Math.floor(leg.fromX),
550 tileY: Math.floor(leg.fromY),
551 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
552 });
553 transit.entityId = null;
554 }
555 if ((transit.legIndex | 0) >= transit.legs.length)
556 {
557 events.push(...this.#deliver(transit, now));
558 return events;
559 }
560 continue;
561 }
562
563 if (leg.kind === "abstract")
564 {
565 if (transit.entityId)
566 {
567 const pose = this.#currentPose(transit);
568 this.simulation.despawnEntity(transit.entityId);
569 events.push({
570 type: "entity-despawn",
571 entityId: transit.entityId,
572 tileX: Math.floor(pose.x),
573 tileY: Math.floor(pose.y),
574 dimensionId: pose.dimensionId
575 });
576 transit.entityId = null;
577 }
578 const advanced = advanceAbstractTravel({
579 traveled: transit.traveled,
580 distance: leg.distance ?? 0,
581 dt: remainingDt,
582 settings
583 });
584 transit.traveled = advanced.traveled;
585 transit.updatedAt = now;
586 if (!advanced.arrived)
587 {
588 this.stateDb.updateCourierTransit(transit);
589 return events;
590 }
591 remainingDt = 0;
592 transit.traveled = 0;
593 transit.legIndex = (transit.legIndex | 0) + 1;
594 if ((transit.legIndex | 0) >= transit.legs.length)
595 {
596 events.push(...this.#deliver(transit, now));
597 return events;
598 }
599 continue;
600 }
601
602 // fly leg
321 const advanced = advanceCourierFlight({
603 const advanced = advanceCourierFlight({
322 originX: transit.originX,
604 originX: leg.fromX,
323 originY: transit.originY,
605 originY: leg.fromY,
324 destX: transit.destX,
606 destX: leg.toX,
325 destY: transit.destY,
607 destY: leg.toY,
326 traveled: transit.traveled,
608 traveled: transit.traveled,
327 dt,
609 dt: remainingDt,
328 settings
610 settings
329 });
611 });
330 transit.traveled = advanced.traveled;
612 transit.traveled = advanced.traveled;
331 transit.updatedAt = now;
613 transit.updatedAt = now;
614 if (!advanced.arrived)
615 {
616 events.push(...this.#syncVisiblePigeon(transit, advanced, now, leg));
617 this.stateDb.updateCourierTransit(transit);
618 return events;
619 }
332
620
333 if (advanced.arrived)
621 remainingDt = 0;
622 transit.traveled = 0;
623 transit.legIndex = (transit.legIndex | 0) + 1;
624 if ((transit.legIndex | 0) >= transit.legs.length)
334 {
625 {
335 events.push(...this.#deliver(transit, now));
626 events.push(...this.#deliver(transit, now));
336 continue;
627 return events;
628 }
629 // Despawn at portal approach so next portal/fly starts clean.
630 if (transit.entityId)
631 {
632 this.simulation.despawnEntity(transit.entityId);
633 events.push({
634 type: "entity-despawn",
635 entityId: transit.entityId,
636 tileX: Math.floor(advanced.x),
637 tileY: Math.floor(advanced.y),
638 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
639 });
640 transit.entityId = null;
337 }
641 }
338
339 events.push(...this.#syncVisiblePigeon(transit, advanced, now));
340 this.stateDb.updateCourierTransit(transit);
341 }
642 }
643 this.stateDb.updateCourierTransit(transit);
342 return events;
644 return events;
343 }
645 }
344
646
@@ -350,10 +652,45 @@ export class CourierService
350 if (onlineId)
652 if (onlineId)
351 {
653 {
352 const pos = this.simulation.positionOf(onlineId);
654 const pos = this.simulation.positionOf(onlineId);
353 if (pos)
655 if (!pos)
656 { return; }
657 const destDim = normalizeDimensionId(pos.dimensionId ?? OVERWORLD_ID);
658 const destX = pos.tileX + 0.5;
659 const destY = pos.tileY + 0.5;
660 const prevDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
661 if (destDim !== prevDim)
354 {
662 {
355 transit.destX = pos.tileX + 0.5;
663 const pose = this.#currentPose(transit);
356 transit.destY = pos.tileY + 0.5;
664 this.#repathTransit(
665 transit,
666 pose.x,
667 pose.y,
668 pose.dimensionId,
669 destX,
670 destY,
671 destDim
672 );
673 return;
674 }
675 transit.destX = destX;
676 transit.destY = destY;
677 transit.destDimensionId = destDim;
678 const lastIdx = transit.legs.length - 1;
679 const last = transit.legs[lastIdx];
680 if (last?.kind === "fly"
681 && normalizeDimensionId(last.toDimensionId ?? destDim) === destDim)
682 {
683 const oldToX = last.toX;
684 const oldToY = last.toY;
685 last.toX = destX;
686 last.toY = destY;
687 if ((transit.legIndex | 0) === lastIdx)
688 {
689 const oldTotal = Math.hypot(oldToX - last.fromX, oldToY - last.fromY);
690 const newTotal = Math.hypot(destX - last.fromX, destY - last.fromY);
691 if (oldTotal > 1e-6)
692 { transit.traveled = Math.min(newTotal, (transit.traveled || 0) * (newTotal / oldTotal)); }
693 }
357 }
694 }
358 return;
695 return;
359 }
696 }
@@ -362,18 +699,28 @@ export class CourierService
362
699
363 #routeTransitToBank (transit, vaultCharacterId)
700 #routeTransitToBank (transit, vaultCharacterId)
364 {
701 {
365 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY))
702 const pose = this.#currentPose(transit);
366 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY));
703 const bank = this.nearestBank(Math.floor(pose.x), Math.floor(pose.y), pose.dimensionId)
704 ?? this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY), transit.destDimensionId)
705 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY), transit.originDimensionId);
367 if (!bank)
706 if (!bank)
368 { return; }
707 { return; }
369 transit.destinationKind = "bank";
708 transit.destinationKind = "bank";
370 transit.vaultCharacterId = vaultCharacterId ?? transit.vaultCharacterId ?? transit.destinationCharacterId ?? transit.senderCharacterId;
709 transit.vaultCharacterId = vaultCharacterId ?? transit.vaultCharacterId ?? transit.destinationCharacterId ?? transit.senderCharacterId;
371 transit.destX = bank.tileX + 0.5;
710 this.#repathTransit(
372 transit.destY = bank.tileY + 0.5;
711 transit,
712 pose.x,
713 pose.y,
714 pose.dimensionId,
715 bank.tileX + 0.5,
716 bank.tileY + 0.5,
717 bank.dimensionId ?? OVERWORLD_ID
718 );
373 }
719 }
374
720
375 #resolveDestination (destination, originTileX, originTileY)
721 #resolveDestination (destination, originTileX, originTileY, originDimensionId = OVERWORLD_ID)
376 {
722 {
723 const originDim = normalizeDimensionId(originDimensionId);
377 if (destination?.kind === "player")
724 if (destination?.kind === "player")
378 {
725 {
379 const character = this.stateDb.getCharacterByName(destination.firstName, destination.lastName);
726 const character = this.stateDb.getCharacterByName(destination.firstName, destination.lastName);
@@ -386,8 +733,9 @@ export class CourierService
386 const onlineId = this.simulation.characterEntities.get(character.character_id);
733 const onlineId = this.simulation.characterEntities.get(character.character_id);
387 if (!onlineId)
734 if (!onlineId)
388 {
735 {
389 const bank = this.nearestBank(originTileX, originTileY)
736 const charDim = normalizeDimensionId(character.dimension_id ?? OVERWORLD_ID);
390 ?? this.nearestBank(character.tile_x, character.tile_y);
737 const bank = this.nearestBank(originTileX, originTileY, originDim)
738 ?? this.nearestBank(character.tile_x, character.tile_y, charDim);
391 if (!bank)
739 if (!bank)
392 {
740 {
393 const error = new Error("No bank exists in the world yet.");
741 const error = new Error("No bank exists in the world yet.");
@@ -399,7 +747,8 @@ export class CourierService
399 characterId: character.character_id,
747 characterId: character.character_id,
400 vaultCharacterId: character.character_id,
748 vaultCharacterId: character.character_id,
401 tileX: bank.tileX,
749 tileX: bank.tileX,
402 tileY: bank.tileY
750 tileY: bank.tileY,
751 dimensionId: normalizeDimensionId(bank.dimensionId ?? OVERWORLD_ID)
403 };
752 };
404 }
753 }
405 const pos = this.simulation.positionOf(onlineId);
754 const pos = this.simulation.positionOf(onlineId);
@@ -407,31 +756,40 @@ export class CourierService
407 kind: "player",
756 kind: "player",
408 characterId: character.character_id,
757 characterId: character.character_id,
409 tileX: pos.tileX,
758 tileX: pos.tileX,
410 tileY: pos.tileY
759 tileY: pos.tileY,
760 dimensionId: normalizeDimensionId(pos.dimensionId ?? OVERWORLD_ID)
411 };
761 };
412 }
762 }
413 if (destination?.kind === "bank")
763 if (destination?.kind === "bank")
414 {
764 {
415 const bank = this.nearestBank(originTileX, originTileY);
765 const bank = this.nearestBank(originTileX, originTileY, originDim);
416 if (!bank)
766 if (!bank)
417 {
767 {
418 const error = new Error("No bank exists in the world yet.");
768 const error = new Error("No bank exists in the world yet.");
419 error.userFacing = true;
769 error.userFacing = true;
420 throw error;
770 throw error;
421 }
771 }
422 return { kind: "bank", tileX: bank.tileX, tileY: bank.tileY };
772 return {
773 kind: "bank",
774 tileX: bank.tileX,
775 tileY: bank.tileY,
776 dimensionId: normalizeDimensionId(bank.dimensionId ?? OVERWORLD_ID)
777 };
423 }
778 }
424 const error = new Error("Pigeon destination must be bank or player.");
779 const error = new Error("Pigeon destination must be bank or player.");
425 error.userFacing = true;
780 error.userFacing = true;
426 throw error;
781 throw error;
427 }
782 }
428
783
429 #syncVisiblePigeon (transit, advanced, now)
784 #syncVisiblePigeon (transit, advanced, now, leg)
430 {
785 {
431 const events = [];
786 const events = [];
432 const tileX = Math.floor(advanced.x);
787 const tileX = Math.floor(advanced.x);
433 const tileY = Math.floor(advanced.y);
788 const tileY = Math.floor(advanced.y);
434 if (!this.simulation.chunkIsSimulating(tileX, tileY))
789 const dimensionId = normalizeDimensionId(
790 leg?.fromDimensionId ?? transit.originDimensionId ?? OVERWORLD_ID
791 );
792 if (!this.simulation.chunkIsSimulating(tileX, tileY, dimensionId))
435 {
793 {
436 if (transit.entityId)
794 if (transit.entityId)
437 {
795 {
@@ -441,7 +799,7 @@ export class CourierService
441 entityId: transit.entityId,
799 entityId: transit.entityId,
442 tileX,
800 tileX,
443 tileY,
801 tileY,
444 dimensionId: OVERWORLD_ID
802 dimensionId
445 });
803 });
446 transit.entityId = null;
804 transit.entityId = null;
447 }
805 }
@@ -453,14 +811,14 @@ export class CourierService
453 transit.entityId = null;
811 transit.entityId = null;
454 const def = mobDefinition(MobId.pigeon);
812 const def = mobDefinition(MobId.pigeon);
455 const entityId = this.simulation.spawnEntity({
813 const entityId = this.simulation.spawnEntity({
456 position: { tileX, tileY },
814 position: { tileX, tileY, dimensionId },
457 movement: { gait: GAIT.walk, walkCarry: 0 },
815 movement: { gait: GAIT.walk, walkCarry: 0 },
458 path: { tiles: [] },
816 path: { tiles: [] },
459 flight: {
817 flight: {
460 x: advanced.x,
818 x: advanced.x,
461 y: advanced.y,
819 y: advanced.y,
462 targetX: transit.destX,
820 targetX: leg?.toX ?? transit.destX,
463 targetY: transit.destY,
821 targetY: leg?.toY ?? transit.destY,
464 speed: advanced.speed,
822 speed: advanced.speed,
465 nextPickAt: now + 60_000,
823 nextPickAt: now + 60_000,
466 lastAt: now,
824 lastAt: now,
@@ -483,8 +841,8 @@ export class CourierService
483 const moved = this.simulation.updateCourierFlight(transit.entityId, {
841 const moved = this.simulation.updateCourierFlight(transit.entityId, {
484 x: advanced.x,
842 x: advanced.x,
485 y: advanced.y,
843 y: advanced.y,
486 targetX: transit.destX,
844 targetX: leg?.toX ?? transit.destX,
487 targetY: transit.destY,
845 targetY: leg?.toY ?? transit.destY,
488 speed: advanced.speed,
846 speed: advanced.speed,
489 lastAt: now,
847 lastAt: now,
490 courierId: transit.courierId
848 courierId: transit.courierId
@@ -497,7 +855,7 @@ export class CourierService
497 entityId: moved.entityId,
855 entityId: moved.entityId,
498 tileX,
856 tileX,
499 tileY,
857 tileY,
500 dimensionId: OVERWORLD_ID
858 dimensionId
501 });
859 });
502 }
860 }
503 else if (moved?.event)
861 else if (moved?.event)
@@ -508,6 +866,7 @@ export class CourierService
508 #deliver (transit, now)
866 #deliver (transit, now)
509 {
867 {
510 const events = [];
868 const events = [];
869 const destDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
511 if (transit.entityId)
870 if (transit.entityId)
512 {
871 {
513 this.simulation.despawnEntity(transit.entityId);
872 this.simulation.despawnEntity(transit.entityId);
@@ -516,7 +875,7 @@ export class CourierService
516 entityId: transit.entityId,
875 entityId: transit.entityId,
517 tileX: Math.floor(transit.destX),
876 tileX: Math.floor(transit.destX),
518 tileY: Math.floor(transit.destY),
877 tileY: Math.floor(transit.destY),
519 dimensionId: OVERWORLD_ID
878 dimensionId: destDim
520 });
879 });
521 transit.entityId = null;
880 transit.entityId = null;
522 }
881 }
@@ -537,17 +896,26 @@ export class CourierService
537 const delivered = this.#tryDeliverToPlayer(transit.destinationCharacterId, transit.cargo);
896 const delivered = this.#tryDeliverToPlayer(transit.destinationCharacterId, transit.cargo);
538 if (!delivered)
897 if (!delivered)
539 {
898 {
540 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY))
899 const bank = this.nearestBank(Math.floor(transit.destX), Math.floor(transit.destY), destDim)
541 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY));
900 ?? this.nearestBank(Math.floor(transit.originX), Math.floor(transit.originY), transit.originDimensionId);
542 if (bank)
901 if (bank)
543 {
902 {
544 transit.originX = transit.destX;
903 const pose = {
545 transit.originY = transit.destY;
904 x: transit.destX,
546 transit.destX = bank.tileX + 0.5;
905 y: transit.destY,
547 transit.destY = bank.tileY + 0.5;
906 dimensionId: destDim
548 transit.traveled = 0;
907 };
549 transit.destinationKind = "bank";
908 transit.destinationKind = "bank";
550 transit.vaultCharacterId = transit.destinationCharacterId;
909 transit.vaultCharacterId = transit.destinationCharacterId;
910 this.#repathTransit(
911 transit,
912 pose.x,
913 pose.y,
914 pose.dimensionId,
915 bank.tileX + 0.5,
916 bank.tileY + 0.5,
917 bank.dimensionId ?? OVERWORLD_ID
918 );
551 transit.updatedAt = now;
919 transit.updatedAt = now;
552 this.stateDb.updateCourierTransit(transit);
920 this.stateDb.updateCourierTransit(transit);
553 events.push({
921 events.push({
@@ -785,12 +1153,13 @@ export class CourierService
785 };
1153 };
786 }
1154 }
787
1155
788 #dispatchBankRestNotice (characterId, tileX, tileY)
1156 #dispatchBankRestNotice (characterId, tileX, tileY, dimensionId = OVERWORLD_ID)
789 {
1157 {
790 const entries = this.stateDb.listBankRestNotices(characterId);
1158 const entries = this.stateDb.listBankRestNotices(characterId);
791 if (!entries.length)
1159 if (!entries.length)
792 { return null; }
1160 { return null; }
793 const bank = this.nearestBank(tileX, tileY);
1161 const dim = normalizeDimensionId(dimensionId);
1162 const bank = this.nearestBank(tileX, tileY, dim);
794 if (!bank)
1163 if (!bank)
795 { return null; }
1164 { return null; }
796
1165
@@ -811,6 +1180,7 @@ export class CourierService
811 characterId,
1180 characterId,
812 originTileX: bank.tileX,
1181 originTileX: bank.tileX,
813 originTileY: bank.tileY,
1182 originTileY: bank.tileY,
1183 originDimensionId: bank.dimensionId ?? OVERWORLD_ID,
814 stack
1184 stack
815 });
1185 });
816 }
1186 }
server/src/gifts/service.js +3 −1
@@ -210,11 +210,13 @@ export class GiftService
210 210 {
211 211 const originTileX = character.tile_x | 0;
212 212 const originTileY = character.tile_y | 0;
213 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
213 const originDim = character.dimension_id ?? undefined;
214 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY, originDim);
214 215 this.simulation.courier.enqueueSystemLetter({
215 216 characterId: character.character_id,
216 217 originTileX: bank?.tileX ?? originTileX,
217 218 originTileY: bank?.tileY ?? originTileY,
219 originDimensionId: bank?.dimensionId ?? originDim,
218 220 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
219 221 authorOrganization: QUESTWARD_GIFT_ORG,
220 222 body
@@ -210,11 +210,13 @@ export class GiftService
210 {
210 {
211 const originTileX = character.tile_x | 0;
211 const originTileX = character.tile_x | 0;
212 const originTileY = character.tile_y | 0;
212 const originTileY = character.tile_y | 0;
213 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
213 const originDim = character.dimension_id ?? undefined;
214 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY, originDim);
214 this.simulation.courier.enqueueSystemLetter({
215 this.simulation.courier.enqueueSystemLetter({
215 characterId: character.character_id,
216 characterId: character.character_id,
216 originTileX: bank?.tileX ?? originTileX,
217 originTileX: bank?.tileX ?? originTileX,
217 originTileY: bank?.tileY ?? originTileY,
218 originTileY: bank?.tileY ?? originTileY,
219 originDimensionId: bank?.dimensionId ?? originDim,
218 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
220 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
219 authorOrganization: QUESTWARD_GIFT_ORG,
221 authorOrganization: QUESTWARD_GIFT_ORG,
220 body
222 body
server/src/market/service.js +2 −0
@@ -677,6 +677,7 @@ export class MarketService
677 677 characterId,
678 678 originTileX: origin.tileX,
679 679 originTileY: origin.tileY,
680 originDimensionId: origin.dimensionId,
680 681 authorDisplayName: name,
681 682 authorOrganization: CENTRAL_EXCHANGE_ORG,
682 683 body,
@@ -690,6 +691,7 @@ export class MarketService
690 691 senderCharacterId: characterId,
691 692 originTileX: origin.tileX,
692 693 originTileY: origin.tileY,
694 originDimensionId: origin.dimensionId,
693 695 destination: { kind: "bank" },
694 696 cargo
695 697 });
@@ -677,6 +677,7 @@ export class MarketService
677 characterId,
677 characterId,
678 originTileX: origin.tileX,
678 originTileX: origin.tileX,
679 originTileY: origin.tileY,
679 originTileY: origin.tileY,
680 originDimensionId: origin.dimensionId,
680 authorDisplayName: name,
681 authorDisplayName: name,
681 authorOrganization: CENTRAL_EXCHANGE_ORG,
682 authorOrganization: CENTRAL_EXCHANGE_ORG,
682 body,
683 body,
@@ -690,6 +691,7 @@ export class MarketService
690 senderCharacterId: characterId,
691 senderCharacterId: characterId,
691 originTileX: origin.tileX,
692 originTileX: origin.tileX,
692 originTileY: origin.tileY,
693 originTileY: origin.tileY,
694 originDimensionId: origin.dimensionId,
693 destination: { kind: "bank" },
695 destination: { kind: "bank" },
694 cargo
696 cargo
695 });
697 });
server/src/persistence/stateDb.js +47 −7
@@ -104,6 +104,10 @@ CREATE TABLE IF NOT EXISTS courier_transits (
104 104 origin_y REAL NOT NULL,
105 105 dest_x REAL NOT NULL,
106 106 dest_y REAL NOT NULL,
107 origin_dimension_id TEXT NOT NULL DEFAULT 'overworld',
108 dest_dimension_id TEXT NOT NULL DEFAULT 'overworld',
109 legs_blob TEXT,
110 leg_index INTEGER NOT NULL DEFAULT 0,
107 111 traveled REAL NOT NULL DEFAULT 0,
108 112 status TEXT NOT NULL,
109 113 entity_id INTEGER,
@@ -160,6 +164,7 @@ CREATE TABLE IF NOT EXISTS held_courier_deliveries (
160 164 sender_character_id INTEGER NOT NULL,
161 165 origin_tile_x INTEGER NOT NULL,
162 166 origin_tile_y INTEGER NOT NULL,
167 origin_dimension_id TEXT NOT NULL DEFAULT 'overworld',
163 168 destination_kind TEXT NOT NULL,
164 169 destination_character_id INTEGER,
165 170 vault_character_id INTEGER,
@@ -255,6 +260,17 @@ export class StateDatabase
255 260 const courierColumns = this.db.prepare("PRAGMA table_info(courier_transits)").all();
256 261 if (!courierColumns.some((column) => column.name === "vault_character_id"))
257 262 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN vault_character_id INTEGER"); }
263 if (!courierColumns.some((column) => column.name === "origin_dimension_id"))
264 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN origin_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
265 if (!courierColumns.some((column) => column.name === "dest_dimension_id"))
266 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN dest_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
267 if (!courierColumns.some((column) => column.name === "legs_blob"))
268 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN legs_blob TEXT"); }
269 if (!courierColumns.some((column) => column.name === "leg_index"))
270 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN leg_index INTEGER NOT NULL DEFAULT 0"); }
271 const heldCourierColumns = this.db.prepare("PRAGMA table_info(held_courier_deliveries)").all();
272 if (!heldCourierColumns.some((column) => column.name === "origin_dimension_id"))
273 { this.db.exec("ALTER TABLE held_courier_deliveries ADD COLUMN origin_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
258 274 if (!bagColumns.some((column) => column.name === "spells_blob"))
259 275 {
260 276 this.db.exec("ALTER TABLE character_bags ADD COLUMN spells_blob TEXT NOT NULL DEFAULT '{}'");
@@ -1644,8 +1660,8 @@ export class StateDatabase
1644 1660 INSERT INTO courier_transits (
1645 1661 sender_character_id, destination_kind, destination_character_id, cargo_blob,
1646 1662 origin_x, origin_y, dest_x, dest_y, traveled, status, entity_id, updated_at, created_at,
1647 vault_character_id
1648 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1663 vault_character_id, origin_dimension_id, dest_dimension_id, legs_blob, leg_index
1664 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1649 1665 `).run(
1650 1666 transit.senderCharacterId,
1651 1667 transit.destinationKind,
@@ -1660,7 +1676,11 @@ export class StateDatabase
1660 1676 transit.entityId ?? null,
1661 1677 now,
1662 1678 transit.createdAt ?? now,
1663 transit.vaultCharacterId ?? null
1679 transit.vaultCharacterId ?? null,
1680 transit.originDimensionId ?? "overworld",
1681 transit.destDimensionId ?? "overworld",
1682 transit.legs != null ? JSON.stringify(transit.legs) : null,
1683 transit.legIndex | 0
1664 1684 );
1665 1685 return this.getCourierTransit(Number(result.lastInsertRowid));
1666 1686 }
@@ -1684,7 +1704,8 @@ export class StateDatabase
1684 1704 UPDATE courier_transits
1685 1705 SET traveled = ?, status = ?, entity_id = ?, updated_at = ?,
1686 1706 origin_x = ?, origin_y = ?, dest_x = ?, dest_y = ?,
1687 destination_kind = ?, destination_character_id = ?, vault_character_id = ?
1707 destination_kind = ?, destination_character_id = ?, vault_character_id = ?,
1708 origin_dimension_id = ?, dest_dimension_id = ?, legs_blob = ?, leg_index = ?
1688 1709 WHERE courier_id = ?
1689 1710 `).run(
1690 1711 transit.traveled ?? 0,
@@ -1698,6 +1719,10 @@ export class StateDatabase
1698 1719 transit.destinationKind,
1699 1720 transit.destinationCharacterId ?? null,
1700 1721 transit.vaultCharacterId ?? null,
1722 transit.originDimensionId ?? "overworld",
1723 transit.destDimensionId ?? "overworld",
1724 transit.legs != null ? JSON.stringify(transit.legs) : null,
1725 transit.legIndex | 0,
1701 1726 transit.courierId
1702 1727 );
1703 1728 }
@@ -1744,8 +1769,9 @@ export class StateDatabase
1744 1769 const result = this.db.prepare(`
1745 1770 INSERT INTO held_courier_deliveries (
1746 1771 character_id, sender_character_id, origin_tile_x, origin_tile_y,
1747 destination_kind, destination_character_id, vault_character_id, cargo_blob, created_at
1748 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
1772 destination_kind, destination_character_id, vault_character_id, cargo_blob, created_at,
1773 origin_dimension_id
1774 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1749 1775 `).run(
1750 1776 delivery.characterId,
1751 1777 delivery.senderCharacterId,
@@ -1755,7 +1781,8 @@ export class StateDatabase
1755 1781 delivery.destinationCharacterId ?? null,
1756 1782 delivery.vaultCharacterId ?? null,
1757 1783 JSON.stringify(delivery.cargo),
1758 now
1784 now,
1785 delivery.originDimensionId ?? "overworld"
1759 1786 );
1760 1787 return Number(result.lastInsertRowid);
1761 1788 }
@@ -1996,6 +2023,14 @@ function parseBag (row, characterId)
1996 2023
1997 2024 function parseCourierTransit (row)
1998 2025 {
2026 let legs = null;
2027 if (row.legs_blob)
2028 {
2029 try
2030 { legs = JSON.parse(row.legs_blob); }
2031 catch
2032 { legs = null; }
2033 }
1999 2034 return {
2000 2035 courierId: row.courier_id,
2001 2036 senderCharacterId: row.sender_character_id,
@@ -2007,6 +2042,10 @@ function parseCourierTransit (row)
2007 2042 originY: row.origin_y,
2008 2043 destX: row.dest_x,
2009 2044 destY: row.dest_y,
2045 originDimensionId: row.origin_dimension_id ?? "overworld",
2046 destDimensionId: row.dest_dimension_id ?? "overworld",
2047 legs: Array.isArray(legs) ? legs : null,
2048 legIndex: row.leg_index | 0,
2010 2049 traveled: row.traveled,
2011 2050 status: row.status,
2012 2051 entityId: row.entity_id,
@@ -2023,6 +2062,7 @@ function parseHeldCourierDelivery (row)
2023 2062 senderCharacterId: row.sender_character_id,
2024 2063 originTileX: row.origin_tile_x,
2025 2064 originTileY: row.origin_tile_y,
2065 originDimensionId: row.origin_dimension_id ?? "overworld",
2026 2066 destinationKind: row.destination_kind,
2027 2067 destinationCharacterId: row.destination_character_id,
2028 2068 vaultCharacterId: row.vault_character_id,
@@ -104,6 +104,10 @@ CREATE TABLE IF NOT EXISTS courier_transits (
104 origin_y REAL NOT NULL,
104 origin_y REAL NOT NULL,
105 dest_x REAL NOT NULL,
105 dest_x REAL NOT NULL,
106 dest_y REAL NOT NULL,
106 dest_y REAL NOT NULL,
107 origin_dimension_id TEXT NOT NULL DEFAULT 'overworld',
108 dest_dimension_id TEXT NOT NULL DEFAULT 'overworld',
109 legs_blob TEXT,
110 leg_index INTEGER NOT NULL DEFAULT 0,
107 traveled REAL NOT NULL DEFAULT 0,
111 traveled REAL NOT NULL DEFAULT 0,
108 status TEXT NOT NULL,
112 status TEXT NOT NULL,
109 entity_id INTEGER,
113 entity_id INTEGER,
@@ -160,6 +164,7 @@ CREATE TABLE IF NOT EXISTS held_courier_deliveries (
160 sender_character_id INTEGER NOT NULL,
164 sender_character_id INTEGER NOT NULL,
161 origin_tile_x INTEGER NOT NULL,
165 origin_tile_x INTEGER NOT NULL,
162 origin_tile_y INTEGER NOT NULL,
166 origin_tile_y INTEGER NOT NULL,
167 origin_dimension_id TEXT NOT NULL DEFAULT 'overworld',
163 destination_kind TEXT NOT NULL,
168 destination_kind TEXT NOT NULL,
164 destination_character_id INTEGER,
169 destination_character_id INTEGER,
165 vault_character_id INTEGER,
170 vault_character_id INTEGER,
@@ -255,6 +260,17 @@ export class StateDatabase
255 const courierColumns = this.db.prepare("PRAGMA table_info(courier_transits)").all();
260 const courierColumns = this.db.prepare("PRAGMA table_info(courier_transits)").all();
256 if (!courierColumns.some((column) => column.name === "vault_character_id"))
261 if (!courierColumns.some((column) => column.name === "vault_character_id"))
257 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN vault_character_id INTEGER"); }
262 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN vault_character_id INTEGER"); }
263 if (!courierColumns.some((column) => column.name === "origin_dimension_id"))
264 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN origin_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
265 if (!courierColumns.some((column) => column.name === "dest_dimension_id"))
266 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN dest_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
267 if (!courierColumns.some((column) => column.name === "legs_blob"))
268 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN legs_blob TEXT"); }
269 if (!courierColumns.some((column) => column.name === "leg_index"))
270 { this.db.exec("ALTER TABLE courier_transits ADD COLUMN leg_index INTEGER NOT NULL DEFAULT 0"); }
271 const heldCourierColumns = this.db.prepare("PRAGMA table_info(held_courier_deliveries)").all();
272 if (!heldCourierColumns.some((column) => column.name === "origin_dimension_id"))
273 { this.db.exec("ALTER TABLE held_courier_deliveries ADD COLUMN origin_dimension_id TEXT NOT NULL DEFAULT 'overworld'"); }
258 if (!bagColumns.some((column) => column.name === "spells_blob"))
274 if (!bagColumns.some((column) => column.name === "spells_blob"))
259 {
275 {
260 this.db.exec("ALTER TABLE character_bags ADD COLUMN spells_blob TEXT NOT NULL DEFAULT '{}'");
276 this.db.exec("ALTER TABLE character_bags ADD COLUMN spells_blob TEXT NOT NULL DEFAULT '{}'");
@@ -1644,8 +1660,8 @@ export class StateDatabase
1644 INSERT INTO courier_transits (
1660 INSERT INTO courier_transits (
1645 sender_character_id, destination_kind, destination_character_id, cargo_blob,
1661 sender_character_id, destination_kind, destination_character_id, cargo_blob,
1646 origin_x, origin_y, dest_x, dest_y, traveled, status, entity_id, updated_at, created_at,
1662 origin_x, origin_y, dest_x, dest_y, traveled, status, entity_id, updated_at, created_at,
1647 vault_character_id
1663 vault_character_id, origin_dimension_id, dest_dimension_id, legs_blob, leg_index
1648 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1664 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1649 `).run(
1665 `).run(
1650 transit.senderCharacterId,
1666 transit.senderCharacterId,
1651 transit.destinationKind,
1667 transit.destinationKind,
@@ -1660,7 +1676,11 @@ export class StateDatabase
1660 transit.entityId ?? null,
1676 transit.entityId ?? null,
1661 now,
1677 now,
1662 transit.createdAt ?? now,
1678 transit.createdAt ?? now,
1663 transit.vaultCharacterId ?? null
1679 transit.vaultCharacterId ?? null,
1680 transit.originDimensionId ?? "overworld",
1681 transit.destDimensionId ?? "overworld",
1682 transit.legs != null ? JSON.stringify(transit.legs) : null,
1683 transit.legIndex | 0
1664 );
1684 );
1665 return this.getCourierTransit(Number(result.lastInsertRowid));
1685 return this.getCourierTransit(Number(result.lastInsertRowid));
1666 }
1686 }
@@ -1684,7 +1704,8 @@ export class StateDatabase
1684 UPDATE courier_transits
1704 UPDATE courier_transits
1685 SET traveled = ?, status = ?, entity_id = ?, updated_at = ?,
1705 SET traveled = ?, status = ?, entity_id = ?, updated_at = ?,
1686 origin_x = ?, origin_y = ?, dest_x = ?, dest_y = ?,
1706 origin_x = ?, origin_y = ?, dest_x = ?, dest_y = ?,
1687 destination_kind = ?, destination_character_id = ?, vault_character_id = ?
1707 destination_kind = ?, destination_character_id = ?, vault_character_id = ?,
1708 origin_dimension_id = ?, dest_dimension_id = ?, legs_blob = ?, leg_index = ?
1688 WHERE courier_id = ?
1709 WHERE courier_id = ?
1689 `).run(
1710 `).run(
1690 transit.traveled ?? 0,
1711 transit.traveled ?? 0,
@@ -1698,6 +1719,10 @@ export class StateDatabase
1698 transit.destinationKind,
1719 transit.destinationKind,
1699 transit.destinationCharacterId ?? null,
1720 transit.destinationCharacterId ?? null,
1700 transit.vaultCharacterId ?? null,
1721 transit.vaultCharacterId ?? null,
1722 transit.originDimensionId ?? "overworld",
1723 transit.destDimensionId ?? "overworld",
1724 transit.legs != null ? JSON.stringify(transit.legs) : null,
1725 transit.legIndex | 0,
1701 transit.courierId
1726 transit.courierId
1702 );
1727 );
1703 }
1728 }
@@ -1744,8 +1769,9 @@ export class StateDatabase
1744 const result = this.db.prepare(`
1769 const result = this.db.prepare(`
1745 INSERT INTO held_courier_deliveries (
1770 INSERT INTO held_courier_deliveries (
1746 character_id, sender_character_id, origin_tile_x, origin_tile_y,
1771 character_id, sender_character_id, origin_tile_x, origin_tile_y,
1747 destination_kind, destination_character_id, vault_character_id, cargo_blob, created_at
1772 destination_kind, destination_character_id, vault_character_id, cargo_blob, created_at,
1748 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)
1773 origin_dimension_id
1774 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
1749 `).run(
1775 `).run(
1750 delivery.characterId,
1776 delivery.characterId,
1751 delivery.senderCharacterId,
1777 delivery.senderCharacterId,
@@ -1755,7 +1781,8 @@ export class StateDatabase
1755 delivery.destinationCharacterId ?? null,
1781 delivery.destinationCharacterId ?? null,
1756 delivery.vaultCharacterId ?? null,
1782 delivery.vaultCharacterId ?? null,
1757 JSON.stringify(delivery.cargo),
1783 JSON.stringify(delivery.cargo),
1758 now
1784 now,
1785 delivery.originDimensionId ?? "overworld"
1759 );
1786 );
1760 return Number(result.lastInsertRowid);
1787 return Number(result.lastInsertRowid);
1761 }
1788 }
@@ -1996,6 +2023,14 @@ function parseBag (row, characterId)
1996
2023
1997function parseCourierTransit (row)
2024function parseCourierTransit (row)
1998{
2025{
2026 let legs = null;
2027 if (row.legs_blob)
2028 {
2029 try
2030 { legs = JSON.parse(row.legs_blob); }
2031 catch
2032 { legs = null; }
2033 }
1999 return {
2034 return {
2000 courierId: row.courier_id,
2035 courierId: row.courier_id,
2001 senderCharacterId: row.sender_character_id,
2036 senderCharacterId: row.sender_character_id,
@@ -2007,6 +2042,10 @@ function parseCourierTransit (row)
2007 originY: row.origin_y,
2042 originY: row.origin_y,
2008 destX: row.dest_x,
2043 destX: row.dest_x,
2009 destY: row.dest_y,
2044 destY: row.dest_y,
2045 originDimensionId: row.origin_dimension_id ?? "overworld",
2046 destDimensionId: row.dest_dimension_id ?? "overworld",
2047 legs: Array.isArray(legs) ? legs : null,
2048 legIndex: row.leg_index | 0,
2010 traveled: row.traveled,
2049 traveled: row.traveled,
2011 status: row.status,
2050 status: row.status,
2012 entityId: row.entity_id,
2051 entityId: row.entity_id,
@@ -2023,6 +2062,7 @@ function parseHeldCourierDelivery (row)
2023 senderCharacterId: row.sender_character_id,
2062 senderCharacterId: row.sender_character_id,
2024 originTileX: row.origin_tile_x,
2063 originTileX: row.origin_tile_x,
2025 originTileY: row.origin_tile_y,
2064 originTileY: row.origin_tile_y,
2065 originDimensionId: row.origin_dimension_id ?? "overworld",
2026 destinationKind: row.destination_kind,
2066 destinationKind: row.destination_kind,
2027 destinationCharacterId: row.destination_character_id,
2067 destinationCharacterId: row.destination_character_id,
2028 vaultCharacterId: row.vault_character_id,
2068 vaultCharacterId: row.vault_character_id,
server/src/quests/runtime.js +3 −1
@@ -823,11 +823,13 @@ export class QuestRuntime
823 823 : "Adventurer";
824 824 const originTileX = row?.tile_x | 0;
825 825 const originTileY = row?.tile_y | 0;
826 const bank = courier.nearestBank?.(originTileX, originTileY);
826 const originDim = row?.dimension_id ?? undefined;
827 const bank = courier.nearestBank?.(originTileX, originTileY, originDim);
827 828 courier.enqueueSystemLetter({
828 829 characterId: characterId | 0,
829 830 originTileX: bank?.tileX ?? originTileX,
830 831 originTileY: bank?.tileY ?? originTileY,
832 originDimensionId: bank?.dimensionId ?? originDim,
831 833 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
832 834 authorOrganization: QUESTWARD_GIFT_ORG,
833 835 body: formatQuestBankRewardLetterBody({
@@ -823,11 +823,13 @@ export class QuestRuntime
823 : "Adventurer";
823 : "Adventurer";
824 const originTileX = row?.tile_x | 0;
824 const originTileX = row?.tile_x | 0;
825 const originTileY = row?.tile_y | 0;
825 const originTileY = row?.tile_y | 0;
826 const bank = courier.nearestBank?.(originTileX, originTileY);
826 const originDim = row?.dimension_id ?? undefined;
827 const bank = courier.nearestBank?.(originTileX, originTileY, originDim);
827 courier.enqueueSystemLetter({
828 courier.enqueueSystemLetter({
828 characterId: characterId | 0,
829 characterId: characterId | 0,
829 originTileX: bank?.tileX ?? originTileX,
830 originTileX: bank?.tileX ?? originTileX,
830 originTileY: bank?.tileY ?? originTileY,
831 originTileY: bank?.tileY ?? originTileY,
832 originDimensionId: bank?.dimensionId ?? originDim,
831 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
833 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
832 authorOrganization: QUESTWARD_GIFT_ORG,
834 authorOrganization: QUESTWARD_GIFT_ORG,
833 body: formatQuestBankRewardLetterBody({
835 body: formatQuestBankRewardLetterBody({
server/src/simulation/simulation.js +3 −1
@@ -227,6 +227,7 @@ export class Simulation
227 227 this.#syncAllReplicas();
228 228 this.courier?.refreshBankIndex();
229 229 this.courier?.refreshBountyOfficeIndex();
230 this.courier?.refreshDoorwayIndex();
230 231 this.market?.refreshIndex();
231 232 this.questContent.reload();
232 233 this.quests?.closeAllSessions();
@@ -578,7 +579,7 @@ export class Simulation
578 579 this.#queueReplication(replicationSpawn(this.directory.get(view.entityId) ?? view));
579 580 this.#recalculateActivation(this.now);
580 581 this.#syncGhosts();
581 this.courier?.onCharacterEnteredWorld(character.character_id, tileX, tileY);
582 this.courier?.onCharacterEnteredWorld(character.character_id, tileX, tileY, dimensionId);
582 583 const characterId = character.character_id ?? row.character_id;
583 584 this.quests?.ensureInitialQuests?.(characterId);
584 585 this.syncCharacterConditionAccess(characterId);
@@ -1243,6 +1244,7 @@ export class Simulation
1243 1244 characterId,
1244 1245 originTileX: position.tileX,
1245 1246 originTileY: position.tileY,
1247 originDimensionId: position.dimensionId ?? OVERWORLD_ID,
1246 1248 destination,
1247 1249 cargo
1248 1250 });
@@ -227,6 +227,7 @@ export class Simulation
227 this.#syncAllReplicas();
227 this.#syncAllReplicas();
228 this.courier?.refreshBankIndex();
228 this.courier?.refreshBankIndex();
229 this.courier?.refreshBountyOfficeIndex();
229 this.courier?.refreshBountyOfficeIndex();
230 this.courier?.refreshDoorwayIndex();
230 this.market?.refreshIndex();
231 this.market?.refreshIndex();
231 this.questContent.reload();
232 this.questContent.reload();
232 this.quests?.closeAllSessions();
233 this.quests?.closeAllSessions();
@@ -578,7 +579,7 @@ export class Simulation
578 this.#queueReplication(replicationSpawn(this.directory.get(view.entityId) ?? view));
579 this.#queueReplication(replicationSpawn(this.directory.get(view.entityId) ?? view));
579 this.#recalculateActivation(this.now);
580 this.#recalculateActivation(this.now);
580 this.#syncGhosts();
581 this.#syncGhosts();
581 this.courier?.onCharacterEnteredWorld(character.character_id, tileX, tileY);
582 this.courier?.onCharacterEnteredWorld(character.character_id, tileX, tileY, dimensionId);
582 const characterId = character.character_id ?? row.character_id;
583 const characterId = character.character_id ?? row.character_id;
583 this.quests?.ensureInitialQuests?.(characterId);
584 this.quests?.ensureInitialQuests?.(characterId);
584 this.syncCharacterConditionAccess(characterId);
585 this.syncCharacterConditionAccess(characterId);
@@ -1243,6 +1244,7 @@ export class Simulation
1243 characterId,
1244 characterId,
1244 originTileX: position.tileX,
1245 originTileX: position.tileX,
1245 originTileY: position.tileY,
1246 originTileY: position.tileY,
1247 originDimensionId: position.dimensionId ?? OVERWORLD_ID,
1246 destination,
1248 destination,
1247 cargo
1249 cargo
1248 });
1250 });
server/tests/courier.test.js +270 −8
@@ -1,13 +1,23 @@
1 1 import test from "node:test";
2 2 import assert from "node:assert/strict";
3 import { mkdtempSync } from "node:fs";
4 import { tmpdir } from "node:os";
5 import { join } from "node:path";
3 6 import { BlockType } from "../../shared/definitions/tiles.js";
4 7 import { ItemId } from "../../shared/definitions/items.js";
5 8 import { pigeonSpeedAtProgress, advanceCourierFlight } from "../../shared/courier/flight.js";
9 import { ensureCourierLegs } from "../../shared/courier/doorwayGraph.js";
10 import { OVERWORLD_ID, DimensionLightingMode, DimensionSeasonMode } from "../../shared/world/dimensions.js";
6 11 import { createEmptyChunkData, encodeChunkBlob } from "../src/world/chunkData.js";
12 import { WorldDatabase } from "../src/persistence/worldDb.js";
13 import { StateDatabase } from "../src/persistence/stateDb.js";
14 import { Simulation } from "../src/simulation/simulation.js";
7 15 import {
8 16 makeCharacter,
9 17 makeSimulation,
10 stepTimes
18 stepTimes,
19 writeOpenChunk,
20 openChunkStrip
11 21 } from "./helpers/simulationHarness.js";
12 22
13 23 test("pigeon flight uses takeoff, cruise, then landing speeds", () =>
@@ -54,6 +64,103 @@ function placeBank (worldDb, tileX, tileY)
54 64 );
55 65 }
56 66
67 function countItem (slots, itemId)
68 {
69 return (slots ?? [])
70 .filter((slot) => slot?.itemId === itemId)
71 .reduce((sum, slot) => sum + (slot.quantity | 0), 0);
72 }
73
74 const CAVE_ID = "courier-cave";
75
76 function placeBlock (worldDb, tileX, tileY, block, dimensionId = OVERWORLD_ID)
77 {
78 const chunkX = Math.floor(tileX / 16);
79 const chunkY = Math.floor(tileY / 16);
80 const rev = worldDb.getActiveRevisionId();
81 const existing = worldDb.getChunkVersion(chunkX, chunkY, rev, dimensionId);
82 const chunkData = createEmptyChunkData();
83 chunkData.open = true;
84 if (existing?.data_blob)
85 {
86 const parsed = typeof existing.data_blob === "string"
87 ? JSON.parse(existing.data_blob)
88 : existing.data_blob;
89 chunkData.grounds = parsed.grounds ?? chunkData.grounds;
90 chunkData.blocks = parsed.blocks ?? chunkData.blocks;
91 chunkData.open = parsed.open ?? true;
92 }
93 const localX = tileX - chunkX * 16;
94 const localY = tileY - chunkY * 16;
95 chunkData.blocks[localY * 16 + localX] = block;
96 worldDb.saveChunkVersion(
97 chunkX,
98 chunkY,
99 rev,
100 true,
101 encodeChunkBlob(chunkData),
102 dimensionId
103 );
104 }
105
106 function placeDoorway (worldDb, tileX, tileY, targetDimensionId, targetTileX, targetTileY, dimensionId = OVERWORLD_ID)
107 {
108 placeBlock(worldDb, tileX, tileY, {
109 typeId: BlockType.doorway,
110 state: "door",
111 config: {
112 targetDimensionId,
113 tileX: targetTileX,
114 tileY: targetTileY
115 }
116 }, dimensionId);
117 }
118
119 function placeBankDim (worldDb, tileX, tileY, dimensionId = OVERWORLD_ID)
120 {
121 placeBlock(worldDb, tileX, tileY, { typeId: BlockType.bank, state: 0 }, dimensionId);
122 }
123
124 function makeDimCourierHarness ()
125 {
126 const dir = mkdtempSync(join(tmpdir(), "mmo-courier-dim-"));
127 const worldDb = new WorldDatabase(join(dir, "world.sqlite"));
128 const stateDb = new StateDatabase(join(dir, "state.sqlite"));
129 openChunkStrip(worldDb, 2);
130 const rev = worldDb.getActiveRevisionId();
131 worldDb.saveDimension(rev, {
132 dimensionId: CAVE_ID,
133 displayName: "Courier Cave",
134 lightingMode: DimensionLightingMode.alwaysLit,
135 seasonMode: DimensionSeasonMode.summer,
136 defaultGroundTypeId: 1
137 });
138 const cave = createEmptyChunkData();
139 cave.open = true;
140 worldDb.saveChunkVersion(0, 0, rev, true, encodeChunkBlob(cave), CAVE_ID);
141 writeOpenChunk(worldDb, 0, 0);
142 writeOpenChunk(worldDb, 1, 0);
143 let now = 1_000;
144 const simulation = new Simulation(worldDb, stateDb, {
145 workerCount: 1,
146 workerMode: "inprocess",
147 now: () => now
148 });
149 return {
150 simulation,
151 worldDb,
152 stateDb,
153 advance (ms)
154 { now += ms; },
155 close ()
156 {
157 simulation.forceUnloadAll();
158 worldDb.close();
159 stateDb.close();
160 }
161 };
162 }
163
57 164 test("pigeon to bank deposits coin stacks into the sender vault", () =>
58 165 {
59 166 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -92,13 +199,6 @@ test("pigeon to bank deposits coin stacks into the sender vault", () =>
92 199 { harness.close(); }
93 200 });
94 201
95 function countItem (slots, itemId)
96 {
97 return (slots ?? [])
98 .filter((slot) => slot?.itemId === itemId)
99 .reduce((sum, slot) => sum + (slot.quantity | 0), 0);
100 }
101
102 202 test("pigeon to offline player flies to the bank and credits the recipient vault", () =>
103 203 {
104 204 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -186,6 +286,7 @@ test("logging in after offline bank deposits sends a bank resting notice by pige
186 286 finally
187 287 { harness.close(); }
188 288 });
289
189 290 test("pigeon delivers an item to an online player inventory", () =>
190 291 {
191 292 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -321,3 +422,164 @@ test("pigeon to bank redeems a filled cheque into reserved goods", () =>
321 422 finally
322 423 { harness.close(); }
323 424 });
425
426 test("same-dimension pigeon still delivers with multi-leg schema", () =>
427 {
428 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
429 try
430 {
431 placeBank(harness.worldDb, 20, 8);
432 harness.simulation.reloadWorld();
433 harness.simulation.applySettings({
434 pigeonTakeoffTilesPerSec: 40,
435 pigeonCruiseTilesPerSec: 40,
436 pigeonLandingTilesPerSec: 40,
437 simulationTickHz: 20
438 });
439 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
440 const entityId = harness.simulation.spawnCharacter(1, character);
441 const bag = harness.simulation.bagOf(entityId);
442 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
443 const result = harness.simulation.dispatchPigeon({
444 characterId: character.character_id,
445 destination: { kind: "bank" },
446 cargo: { kind: "item", slotIndex: coinSlot, quantity: 3 }
447 });
448 assert.equal(result.transit.originDimensionId, OVERWORLD_ID);
449 assert.equal(result.transit.destDimensionId, OVERWORLD_ID);
450 assert.ok(Array.isArray(result.transit.legs));
451 assert.equal(result.transit.legs.length, 1);
452 assert.equal(result.transit.legs[0].kind, "fly");
453 stepTimes(harness.simulation, 80);
454 const after = harness.stateDb.getBag(character.character_id);
455 assert.equal(countItem(after.vault, ItemId.coins), 3);
456 }
457 finally
458 { harness.close(); }
459 });
460
461 test("cross-dimension pigeon flies through doorway portals", () =>
462 {
463 const harness = makeDimCourierHarness();
464 try
465 {
466 placeBankDim(harness.worldDb, 20, 8, OVERWORLD_ID);
467 placeDoorway(harness.worldDb, 4, 8, OVERWORLD_ID, 8, 8, CAVE_ID);
468 harness.simulation.reloadWorld();
469 harness.simulation.applySettings({
470 pigeonTakeoffTilesPerSec: 40,
471 pigeonCruiseTilesPerSec: 40,
472 pigeonLandingTilesPerSec: 40,
473 simulationTickHz: 20
474 });
475 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
476 harness.stateDb.saveCharacterPosition(character.character_id, 2, 8, "walk", CAVE_ID);
477 const entityId = harness.simulation.spawnCharacter(1, character);
478 assert.equal(harness.simulation.positionOf(entityId).dimensionId, CAVE_ID);
479 const bag = harness.simulation.bagOf(entityId);
480 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
481 const result = harness.simulation.dispatchPigeon({
482 characterId: character.character_id,
483 destination: { kind: "bank" },
484 cargo: { kind: "item", slotIndex: coinSlot, quantity: 2 }
485 });
486 assert.equal(result.transit.originDimensionId, CAVE_ID);
487 assert.equal(result.transit.destDimensionId, OVERWORLD_ID);
488 assert.ok(result.transit.legs.some((leg) => leg.kind === "portal"));
489 assert.ok(result.transit.legs.some((leg) => leg.kind === "fly"));
490 stepTimes(harness.simulation, 200);
491 const after = harness.stateDb.getBag(character.character_id);
492 assert.equal(countItem(after.vault, ItemId.coins), 2);
493 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
494 }
495 finally
496 { harness.close(); }
497 });
498
499 test("cross-dimension pigeon without doorway path uses fade/abstract fallback", () =>
500 {
501 const harness = makeDimCourierHarness();
502 try
503 {
504 placeBankDim(harness.worldDb, 20, 8, OVERWORLD_ID);
505 harness.simulation.reloadWorld();
506 harness.simulation.applySettings({
507 pigeonTakeoffTilesPerSec: 40,
508 pigeonCruiseTilesPerSec: 40,
509 pigeonLandingTilesPerSec: 40,
510 simulationTickHz: 20
511 });
512 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
513 harness.stateDb.saveCharacterPosition(character.character_id, 2, 8, "walk", CAVE_ID);
514 const entityId = harness.simulation.spawnCharacter(1, character);
515 const bag = harness.simulation.bagOf(entityId);
516 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
517 const result = harness.simulation.dispatchPigeon({
518 characterId: character.character_id,
519 destination: { kind: "bank" },
520 cargo: { kind: "item", slotIndex: coinSlot, quantity: 1 }
521 });
522 assert.ok(result.transit.legs.some((leg) => leg.kind === "abstract"));
523 assert.ok(!result.transit.legs.some((leg) => leg.kind === "portal"));
524 stepTimes(harness.simulation, 300);
525 const after = harness.stateDb.getBag(character.character_id);
526 assert.equal(countItem(after.vault, ItemId.coins), 1);
527 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
528 }
529 finally
530 { harness.close(); }
531 });
532
533 test("legacy courier_transits rows migrate to overworld single-fly legs", () =>
534 {
535 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
536 try
537 {
538 placeBank(harness.worldDb, 20, 8);
539 harness.simulation.reloadWorld();
540 harness.simulation.applySettings({
541 pigeonTakeoffTilesPerSec: 40,
542 pigeonCruiseTilesPerSec: 40,
543 pigeonLandingTilesPerSec: 40,
544 simulationTickHz: 20
545 });
546 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
547 harness.simulation.spawnCharacter(1, character);
548 const now = Date.now();
549 harness.stateDb.db.prepare(`
550 INSERT INTO courier_transits (
551 sender_character_id, destination_kind, destination_character_id, cargo_blob,
552 origin_x, origin_y, dest_x, dest_y, traveled, status, entity_id, updated_at, created_at,
553 vault_character_id
554 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
555 `).run(
556 character.character_id,
557 "bank",
558 null,
559 JSON.stringify({ kind: "item", stack: { itemId: ItemId.coins, quantity: 4 } }),
560 2.5,
561 8.5,
562 20.5,
563 8.5,
564 0,
565 "in_transit",
566 null,
567 now,
568 now,
569 character.character_id
570 );
571 const listed = harness.stateDb.listActiveCourierTransits();
572 assert.equal(listed.length, 1);
573 assert.equal(listed[0].originDimensionId, OVERWORLD_ID);
574 assert.equal(listed[0].destDimensionId, OVERWORLD_ID);
575 assert.equal(listed[0].legs, null);
576 ensureCourierLegs(listed[0]);
577 assert.equal(listed[0].legs.length, 1);
578 stepTimes(harness.simulation, 80);
579 const after = harness.stateDb.getBag(character.character_id);
580 assert.equal(countItem(after.vault, ItemId.coins), 4);
581 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
582 }
583 finally
584 { harness.close(); }
585 });
@@ -1,13 +1,23 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import { mkdtempSync } from "node:fs";
4import { tmpdir } from "node:os";
5import { join } from "node:path";
3import { BlockType } from "../../shared/definitions/tiles.js";
6import { BlockType } from "../../shared/definitions/tiles.js";
4import { ItemId } from "../../shared/definitions/items.js";
7import { ItemId } from "../../shared/definitions/items.js";
5import { pigeonSpeedAtProgress, advanceCourierFlight } from "../../shared/courier/flight.js";
8import { pigeonSpeedAtProgress, advanceCourierFlight } from "../../shared/courier/flight.js";
9import { ensureCourierLegs } from "../../shared/courier/doorwayGraph.js";
10import { OVERWORLD_ID, DimensionLightingMode, DimensionSeasonMode } from "../../shared/world/dimensions.js";
6import { createEmptyChunkData, encodeChunkBlob } from "../src/world/chunkData.js";
11import { createEmptyChunkData, encodeChunkBlob } from "../src/world/chunkData.js";
12import { WorldDatabase } from "../src/persistence/worldDb.js";
13import { StateDatabase } from "../src/persistence/stateDb.js";
14import { Simulation } from "../src/simulation/simulation.js";
7import {
15import {
8 makeCharacter,
16 makeCharacter,
9 makeSimulation,
17 makeSimulation,
10 stepTimes
18 stepTimes,
19 writeOpenChunk,
20 openChunkStrip
11} from "./helpers/simulationHarness.js";
21} from "./helpers/simulationHarness.js";
12
22
13test("pigeon flight uses takeoff, cruise, then landing speeds", () =>
23test("pigeon flight uses takeoff, cruise, then landing speeds", () =>
@@ -54,6 +64,103 @@ function placeBank (worldDb, tileX, tileY)
54 );
64 );
55}
65}
56
66
67function countItem (slots, itemId)
68{
69 return (slots ?? [])
70 .filter((slot) => slot?.itemId === itemId)
71 .reduce((sum, slot) => sum + (slot.quantity | 0), 0);
72}
73
74const CAVE_ID = "courier-cave";
75
76function placeBlock (worldDb, tileX, tileY, block, dimensionId = OVERWORLD_ID)
77{
78 const chunkX = Math.floor(tileX / 16);
79 const chunkY = Math.floor(tileY / 16);
80 const rev = worldDb.getActiveRevisionId();
81 const existing = worldDb.getChunkVersion(chunkX, chunkY, rev, dimensionId);
82 const chunkData = createEmptyChunkData();
83 chunkData.open = true;
84 if (existing?.data_blob)
85 {
86 const parsed = typeof existing.data_blob === "string"
87 ? JSON.parse(existing.data_blob)
88 : existing.data_blob;
89 chunkData.grounds = parsed.grounds ?? chunkData.grounds;
90 chunkData.blocks = parsed.blocks ?? chunkData.blocks;
91 chunkData.open = parsed.open ?? true;
92 }
93 const localX = tileX - chunkX * 16;
94 const localY = tileY - chunkY * 16;
95 chunkData.blocks[localY * 16 + localX] = block;
96 worldDb.saveChunkVersion(
97 chunkX,
98 chunkY,
99 rev,
100 true,
101 encodeChunkBlob(chunkData),
102 dimensionId
103 );
104}
105
106function placeDoorway (worldDb, tileX, tileY, targetDimensionId, targetTileX, targetTileY, dimensionId = OVERWORLD_ID)
107{
108 placeBlock(worldDb, tileX, tileY, {
109 typeId: BlockType.doorway,
110 state: "door",
111 config: {
112 targetDimensionId,
113 tileX: targetTileX,
114 tileY: targetTileY
115 }
116 }, dimensionId);
117}
118
119function placeBankDim (worldDb, tileX, tileY, dimensionId = OVERWORLD_ID)
120{
121 placeBlock(worldDb, tileX, tileY, { typeId: BlockType.bank, state: 0 }, dimensionId);
122}
123
124function makeDimCourierHarness ()
125{
126 const dir = mkdtempSync(join(tmpdir(), "mmo-courier-dim-"));
127 const worldDb = new WorldDatabase(join(dir, "world.sqlite"));
128 const stateDb = new StateDatabase(join(dir, "state.sqlite"));
129 openChunkStrip(worldDb, 2);
130 const rev = worldDb.getActiveRevisionId();
131 worldDb.saveDimension(rev, {
132 dimensionId: CAVE_ID,
133 displayName: "Courier Cave",
134 lightingMode: DimensionLightingMode.alwaysLit,
135 seasonMode: DimensionSeasonMode.summer,
136 defaultGroundTypeId: 1
137 });
138 const cave = createEmptyChunkData();
139 cave.open = true;
140 worldDb.saveChunkVersion(0, 0, rev, true, encodeChunkBlob(cave), CAVE_ID);
141 writeOpenChunk(worldDb, 0, 0);
142 writeOpenChunk(worldDb, 1, 0);
143 let now = 1_000;
144 const simulation = new Simulation(worldDb, stateDb, {
145 workerCount: 1,
146 workerMode: "inprocess",
147 now: () => now
148 });
149 return {
150 simulation,
151 worldDb,
152 stateDb,
153 advance (ms)
154 { now += ms; },
155 close ()
156 {
157 simulation.forceUnloadAll();
158 worldDb.close();
159 stateDb.close();
160 }
161 };
162}
163
57test("pigeon to bank deposits coin stacks into the sender vault", () =>
164test("pigeon to bank deposits coin stacks into the sender vault", () =>
58{
165{
59 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
166 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -92,13 +199,6 @@ test("pigeon to bank deposits coin stacks into the sender vault", () =>
92 { harness.close(); }
199 { harness.close(); }
93});
200});
94
201
95function countItem (slots, itemId)
96{
97 return (slots ?? [])
98 .filter((slot) => slot?.itemId === itemId)
99 .reduce((sum, slot) => sum + (slot.quantity | 0), 0);
100}
101
102test("pigeon to offline player flies to the bank and credits the recipient vault", () =>
202test("pigeon to offline player flies to the bank and credits the recipient vault", () =>
103{
203{
104 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
204 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -186,6 +286,7 @@ test("logging in after offline bank deposits sends a bank resting notice by pige
186 finally
286 finally
187 { harness.close(); }
287 { harness.close(); }
188});
288});
289
189test("pigeon delivers an item to an online player inventory", () =>
290test("pigeon delivers an item to an online player inventory", () =>
190{
291{
191 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
292 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
@@ -321,3 +422,164 @@ test("pigeon to bank redeems a filled cheque into reserved goods", () =>
321 finally
422 finally
322 { harness.close(); }
423 { harness.close(); }
323});
424});
425
426test("same-dimension pigeon still delivers with multi-leg schema", () =>
427{
428 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
429 try
430 {
431 placeBank(harness.worldDb, 20, 8);
432 harness.simulation.reloadWorld();
433 harness.simulation.applySettings({
434 pigeonTakeoffTilesPerSec: 40,
435 pigeonCruiseTilesPerSec: 40,
436 pigeonLandingTilesPerSec: 40,
437 simulationTickHz: 20
438 });
439 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
440 const entityId = harness.simulation.spawnCharacter(1, character);
441 const bag = harness.simulation.bagOf(entityId);
442 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
443 const result = harness.simulation.dispatchPigeon({
444 characterId: character.character_id,
445 destination: { kind: "bank" },
446 cargo: { kind: "item", slotIndex: coinSlot, quantity: 3 }
447 });
448 assert.equal(result.transit.originDimensionId, OVERWORLD_ID);
449 assert.equal(result.transit.destDimensionId, OVERWORLD_ID);
450 assert.ok(Array.isArray(result.transit.legs));
451 assert.equal(result.transit.legs.length, 1);
452 assert.equal(result.transit.legs[0].kind, "fly");
453 stepTimes(harness.simulation, 80);
454 const after = harness.stateDb.getBag(character.character_id);
455 assert.equal(countItem(after.vault, ItemId.coins), 3);
456 }
457 finally
458 { harness.close(); }
459});
460
461test("cross-dimension pigeon flies through doorway portals", () =>
462{
463 const harness = makeDimCourierHarness();
464 try
465 {
466 placeBankDim(harness.worldDb, 20, 8, OVERWORLD_ID);
467 placeDoorway(harness.worldDb, 4, 8, OVERWORLD_ID, 8, 8, CAVE_ID);
468 harness.simulation.reloadWorld();
469 harness.simulation.applySettings({
470 pigeonTakeoffTilesPerSec: 40,
471 pigeonCruiseTilesPerSec: 40,
472 pigeonLandingTilesPerSec: 40,
473 simulationTickHz: 20
474 });
475 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
476 harness.stateDb.saveCharacterPosition(character.character_id, 2, 8, "walk", CAVE_ID);
477 const entityId = harness.simulation.spawnCharacter(1, character);
478 assert.equal(harness.simulation.positionOf(entityId).dimensionId, CAVE_ID);
479 const bag = harness.simulation.bagOf(entityId);
480 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
481 const result = harness.simulation.dispatchPigeon({
482 characterId: character.character_id,
483 destination: { kind: "bank" },
484 cargo: { kind: "item", slotIndex: coinSlot, quantity: 2 }
485 });
486 assert.equal(result.transit.originDimensionId, CAVE_ID);
487 assert.equal(result.transit.destDimensionId, OVERWORLD_ID);
488 assert.ok(result.transit.legs.some((leg) => leg.kind === "portal"));
489 assert.ok(result.transit.legs.some((leg) => leg.kind === "fly"));
490 stepTimes(harness.simulation, 200);
491 const after = harness.stateDb.getBag(character.character_id);
492 assert.equal(countItem(after.vault, ItemId.coins), 2);
493 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
494 }
495 finally
496 { harness.close(); }
497});
498
499test("cross-dimension pigeon without doorway path uses fade/abstract fallback", () =>
500{
501 const harness = makeDimCourierHarness();
502 try
503 {
504 placeBankDim(harness.worldDb, 20, 8, OVERWORLD_ID);
505 harness.simulation.reloadWorld();
506 harness.simulation.applySettings({
507 pigeonTakeoffTilesPerSec: 40,
508 pigeonCruiseTilesPerSec: 40,
509 pigeonLandingTilesPerSec: 40,
510 simulationTickHz: 20
511 });
512 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
513 harness.stateDb.saveCharacterPosition(character.character_id, 2, 8, "walk", CAVE_ID);
514 const entityId = harness.simulation.spawnCharacter(1, character);
515 const bag = harness.simulation.bagOf(entityId);
516 const coinSlot = bag.inventory.findIndex((slot) => slot?.itemId === ItemId.coins);
517 const result = harness.simulation.dispatchPigeon({
518 characterId: character.character_id,
519 destination: { kind: "bank" },
520 cargo: { kind: "item", slotIndex: coinSlot, quantity: 1 }
521 });
522 assert.ok(result.transit.legs.some((leg) => leg.kind === "abstract"));
523 assert.ok(!result.transit.legs.some((leg) => leg.kind === "portal"));
524 stepTimes(harness.simulation, 300);
525 const after = harness.stateDb.getBag(character.character_id);
526 assert.equal(countItem(after.vault, ItemId.coins), 1);
527 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
528 }
529 finally
530 { harness.close(); }
531});
532
533test("legacy courier_transits rows migrate to overworld single-fly legs", () =>
534{
535 const harness = makeSimulation({ workerCount: 1, maxChunkX: 2 });
536 try
537 {
538 placeBank(harness.worldDb, 20, 8);
539 harness.simulation.reloadWorld();
540 harness.simulation.applySettings({
541 pigeonTakeoffTilesPerSec: 40,
542 pigeonCruiseTilesPerSec: 40,
543 pigeonLandingTilesPerSec: 40,
544 simulationTickHz: 20
545 });
546 const character = makeCharacter(harness.stateDb, { tileX: 2, tileY: 8 });
547 harness.simulation.spawnCharacter(1, character);
548 const now = Date.now();
549 harness.stateDb.db.prepare(`
550 INSERT INTO courier_transits (
551 sender_character_id, destination_kind, destination_character_id, cargo_blob,
552 origin_x, origin_y, dest_x, dest_y, traveled, status, entity_id, updated_at, created_at,
553 vault_character_id
554 ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
555 `).run(
556 character.character_id,
557 "bank",
558 null,
559 JSON.stringify({ kind: "item", stack: { itemId: ItemId.coins, quantity: 4 } }),
560 2.5,
561 8.5,
562 20.5,
563 8.5,
564 0,
565 "in_transit",
566 null,
567 now,
568 now,
569 character.character_id
570 );
571 const listed = harness.stateDb.listActiveCourierTransits();
572 assert.equal(listed.length, 1);
573 assert.equal(listed[0].originDimensionId, OVERWORLD_ID);
574 assert.equal(listed[0].destDimensionId, OVERWORLD_ID);
575 assert.equal(listed[0].legs, null);
576 ensureCourierLegs(listed[0]);
577 assert.equal(listed[0].legs.length, 1);
578 stepTimes(harness.simulation, 80);
579 const after = harness.stateDb.getBag(character.character_id);
580 assert.equal(countItem(after.vault, ItemId.coins), 4);
581 assert.equal(harness.stateDb.listActiveCourierTransits().length, 0);
582 }
583 finally
584 { harness.close(); }
585});
server/tests/doorway-graph.test.js added +142 −0
@@ -0,0 +1,142 @@
1 import test from "node:test";
2 import assert from "node:assert/strict";
3 import {
4 buildDoorwayGraph,
5 findDimensionPath,
6 planPortalLegs,
7 buildFallbackLegs,
8 ensureCourierLegs,
9 advanceAbstractTravel,
10 poseOnCourierLeg,
11 estimateAbstractDistance
12 } from "../../shared/courier/doorwayGraph.js";
13 import { OVERWORLD_ID } from "../../shared/world/dimensions.js";
14
15 test("doorway graph BFS finds multi-hop dimension path and reconstructs edges", () =>
16 {
17 const graph = buildDoorwayGraph([
18 {
19 tileX: 10, tileY: 10, dimensionId: OVERWORLD_ID,
20 targetDimensionId: "cave", targetTileX: 2, targetTileY: 2
21 },
22 {
23 tileX: 4, tileY: 4, dimensionId: "cave",
24 targetDimensionId: "cellar", targetTileX: 8, targetTileY: 1
25 },
26 {
27 tileX: 99, tileY: 99, dimensionId: "island",
28 targetDimensionId: OVERWORLD_ID, targetTileX: 0, targetTileY: 0
29 }
30 ]);
31 assert.equal(graph.edges.length, 3);
32 assert.equal(graph.byFromDim.get(OVERWORLD_ID).length, 1);
33
34 const path = findDimensionPath(graph, OVERWORLD_ID, "cellar");
35 assert.ok(path);
36 assert.equal(path.length, 2);
37 assert.equal(path[0].toDimensionId, "cave");
38 assert.equal(path[1].toDimensionId, "cellar");
39 assert.equal(path[1].fromTileX, 4);
40
41 assert.equal(findDimensionPath(graph, OVERWORLD_ID, OVERWORLD_ID).length, 0);
42 assert.equal(findDimensionPath(graph, "cellar", OVERWORLD_ID), null);
43 });
44
45 test("planPortalLegs builds fly/portal/fly for cross-dimension path", () =>
46 {
47 const graph = buildDoorwayGraph([
48 {
49 tileX: 10, tileY: 8, dimensionId: OVERWORLD_ID,
50 targetDimensionId: "cave", targetTileX: 3, targetTileY: 3
51 }
52 ]);
53 const planned = planPortalLegs({
54 fromX: 1.5, fromY: 8.5, fromDimensionId: OVERWORLD_ID,
55 toX: 5.5, toY: 3.5, toDimensionId: "cave",
56 graph
57 });
58 assert.equal(planned.mode, "portal");
59 assert.equal(planned.legs.length, 3);
60 assert.equal(planned.legs[0].kind, "fly");
61 assert.equal(planned.legs[0].toX, 10.5);
62 assert.equal(planned.legs[1].kind, "portal");
63 assert.equal(planned.legs[1].toDimensionId, "cave");
64 assert.equal(planned.legs[1].toX, 3.5);
65 assert.equal(planned.legs[2].kind, "fly");
66 assert.equal(planned.legs[2].toX, 5.5);
67 });
68
69 test("planPortalLegs returns fallback mode when no doorway path", () =>
70 {
71 const graph = buildDoorwayGraph([]);
72 const planned = planPortalLegs({
73 fromX: 1, fromY: 1, fromDimensionId: "cave",
74 toX: 20, toY: 8, toDimensionId: OVERWORLD_ID,
75 graph
76 });
77 assert.equal(planned.mode, "fallback");
78 assert.equal(planned.legs, null);
79 });
80
81 test("buildFallbackLegs produces fade-out, abstract, fade-in", () =>
82 {
83 const simulating = new Set(["cave:1,1", "cave:0,1", "overworld:20,8", "overworld:19,8"]);
84 const isSimulating = (tx, ty, dim) => simulating.has(`${dim}:${tx},${ty}`);
85 const { mode, legs } = buildFallbackLegs({
86 fromX: 1.5, fromY: 1.5, fromDimensionId: "cave",
87 toX: 20.5, toY: 8.5, toDimensionId: OVERWORLD_ID,
88 isSimulating
89 });
90 assert.equal(mode, "fallback");
91 assert.ok(legs.length >= 2);
92 assert.equal(legs[0].kind, "fly");
93 assert.equal(legs[0].fromDimensionId, "cave");
94 const abstract = legs.find((leg) => leg.kind === "abstract");
95 assert.ok(abstract);
96 assert.ok(abstract.distance >= 0);
97 assert.equal(legs[legs.length - 1].kind, "fly");
98 assert.equal(legs[legs.length - 1].toDimensionId, OVERWORLD_ID);
99 assert.equal(legs[legs.length - 1].toX, 20.5);
100 });
101
102 test("ensureCourierLegs migrates legacy overworld rows", () =>
103 {
104 const transit = {
105 originX: 2.5,
106 originY: 8.5,
107 destX: 20.5,
108 destY: 8.5,
109 traveled: 3
110 };
111 ensureCourierLegs(transit);
112 assert.equal(transit.originDimensionId, OVERWORLD_ID);
113 assert.equal(transit.destDimensionId, OVERWORLD_ID);
114 assert.equal(transit.legs.length, 1);
115 assert.equal(transit.legs[0].kind, "fly");
116 assert.equal(transit.legIndex, 0);
117 assert.equal(transit.traveled, 3);
118 });
119
120 test("advanceAbstractTravel and poseOnCourierLeg helpers", () =>
121 {
122 const advanced = advanceAbstractTravel({
123 traveled: 0,
124 distance: 16,
125 dt: 1,
126 settings: { pigeonCruiseTilesPerSec: 8 }
127 });
128 assert.equal(advanced.speed, 8);
129 assert.equal(advanced.traveled, 8);
130 assert.equal(advanced.arrived, false);
131
132 const flyPose = poseOnCourierLeg({
133 kind: "fly",
134 fromDimensionId: OVERWORLD_ID,
135 fromX: 0, fromY: 0, toX: 10, toY: 0
136 }, 5);
137 assert.ok(Math.abs(flyPose.x - 5) < 1e-6);
138 assert.equal(poseOnCourierLeg({ kind: "abstract", distance: 10 }, 3), null);
139 assert.ok(estimateAbstractDistance({
140 fromX: 0, fromY: 0, toX: 10, toY: 0, crossDimension: true
141 }) >= 32);
142 });
@@ -0,0 +1,142 @@
1import test from "node:test";
2import assert from "node:assert/strict";
3import {
4 buildDoorwayGraph,
5 findDimensionPath,
6 planPortalLegs,
7 buildFallbackLegs,
8 ensureCourierLegs,
9 advanceAbstractTravel,
10 poseOnCourierLeg,
11 estimateAbstractDistance
12} from "../../shared/courier/doorwayGraph.js";
13import { OVERWORLD_ID } from "../../shared/world/dimensions.js";
14
15test("doorway graph BFS finds multi-hop dimension path and reconstructs edges", () =>
16{
17 const graph = buildDoorwayGraph([
18 {
19 tileX: 10, tileY: 10, dimensionId: OVERWORLD_ID,
20 targetDimensionId: "cave", targetTileX: 2, targetTileY: 2
21 },
22 {
23 tileX: 4, tileY: 4, dimensionId: "cave",
24 targetDimensionId: "cellar", targetTileX: 8, targetTileY: 1
25 },
26 {
27 tileX: 99, tileY: 99, dimensionId: "island",
28 targetDimensionId: OVERWORLD_ID, targetTileX: 0, targetTileY: 0
29 }
30 ]);
31 assert.equal(graph.edges.length, 3);
32 assert.equal(graph.byFromDim.get(OVERWORLD_ID).length, 1);
33
34 const path = findDimensionPath(graph, OVERWORLD_ID, "cellar");
35 assert.ok(path);
36 assert.equal(path.length, 2);
37 assert.equal(path[0].toDimensionId, "cave");
38 assert.equal(path[1].toDimensionId, "cellar");
39 assert.equal(path[1].fromTileX, 4);
40
41 assert.equal(findDimensionPath(graph, OVERWORLD_ID, OVERWORLD_ID).length, 0);
42 assert.equal(findDimensionPath(graph, "cellar", OVERWORLD_ID), null);
43});
44
45test("planPortalLegs builds fly/portal/fly for cross-dimension path", () =>
46{
47 const graph = buildDoorwayGraph([
48 {
49 tileX: 10, tileY: 8, dimensionId: OVERWORLD_ID,
50 targetDimensionId: "cave", targetTileX: 3, targetTileY: 3
51 }
52 ]);
53 const planned = planPortalLegs({
54 fromX: 1.5, fromY: 8.5, fromDimensionId: OVERWORLD_ID,
55 toX: 5.5, toY: 3.5, toDimensionId: "cave",
56 graph
57 });
58 assert.equal(planned.mode, "portal");
59 assert.equal(planned.legs.length, 3);
60 assert.equal(planned.legs[0].kind, "fly");
61 assert.equal(planned.legs[0].toX, 10.5);
62 assert.equal(planned.legs[1].kind, "portal");
63 assert.equal(planned.legs[1].toDimensionId, "cave");
64 assert.equal(planned.legs[1].toX, 3.5);
65 assert.equal(planned.legs[2].kind, "fly");
66 assert.equal(planned.legs[2].toX, 5.5);
67});
68
69test("planPortalLegs returns fallback mode when no doorway path", () =>
70{
71 const graph = buildDoorwayGraph([]);
72 const planned = planPortalLegs({
73 fromX: 1, fromY: 1, fromDimensionId: "cave",
74 toX: 20, toY: 8, toDimensionId: OVERWORLD_ID,
75 graph
76 });
77 assert.equal(planned.mode, "fallback");
78 assert.equal(planned.legs, null);
79});
80
81test("buildFallbackLegs produces fade-out, abstract, fade-in", () =>
82{
83 const simulating = new Set(["cave:1,1", "cave:0,1", "overworld:20,8", "overworld:19,8"]);
84 const isSimulating = (tx, ty, dim) => simulating.has(`${dim}:${tx},${ty}`);
85 const { mode, legs } = buildFallbackLegs({
86 fromX: 1.5, fromY: 1.5, fromDimensionId: "cave",
87 toX: 20.5, toY: 8.5, toDimensionId: OVERWORLD_ID,
88 isSimulating
89 });
90 assert.equal(mode, "fallback");
91 assert.ok(legs.length >= 2);
92 assert.equal(legs[0].kind, "fly");
93 assert.equal(legs[0].fromDimensionId, "cave");
94 const abstract = legs.find((leg) => leg.kind === "abstract");
95 assert.ok(abstract);
96 assert.ok(abstract.distance >= 0);
97 assert.equal(legs[legs.length - 1].kind, "fly");
98 assert.equal(legs[legs.length - 1].toDimensionId, OVERWORLD_ID);
99 assert.equal(legs[legs.length - 1].toX, 20.5);
100});
101
102test("ensureCourierLegs migrates legacy overworld rows", () =>
103{
104 const transit = {
105 originX: 2.5,
106 originY: 8.5,
107 destX: 20.5,
108 destY: 8.5,
109 traveled: 3
110 };
111 ensureCourierLegs(transit);
112 assert.equal(transit.originDimensionId, OVERWORLD_ID);
113 assert.equal(transit.destDimensionId, OVERWORLD_ID);
114 assert.equal(transit.legs.length, 1);
115 assert.equal(transit.legs[0].kind, "fly");
116 assert.equal(transit.legIndex, 0);
117 assert.equal(transit.traveled, 3);
118});
119
120test("advanceAbstractTravel and poseOnCourierLeg helpers", () =>
121{
122 const advanced = advanceAbstractTravel({
123 traveled: 0,
124 distance: 16,
125 dt: 1,
126 settings: { pigeonCruiseTilesPerSec: 8 }
127 });
128 assert.equal(advanced.speed, 8);
129 assert.equal(advanced.traveled, 8);
130 assert.equal(advanced.arrived, false);
131
132 const flyPose = poseOnCourierLeg({
133 kind: "fly",
134 fromDimensionId: OVERWORLD_ID,
135 fromX: 0, fromY: 0, toX: 10, toY: 0
136 }, 5);
137 assert.ok(Math.abs(flyPose.x - 5) < 1e-6);
138 assert.equal(poseOnCourierLeg({ kind: "abstract", distance: 10 }, 3), null);
139 assert.ok(estimateAbstractDistance({
140 fromX: 0, fromY: 0, toX: 10, toY: 0, crossDimension: true
141 }) >= 32);
142});
shared/courier/doorwayGraph.js added +424 −0
@@ -0,0 +1,424 @@
1 /**
2 * Pure doorway-portal graph for courier cross-dimension routing.
3 * Edges are unidirectional (from doorway tile → configured target).
4 */
5
6 import { OVERWORLD_ID, normalizeDimensionId } from "../world/dimensions.js";
7 import { DEFAULT_WORLD_SETTINGS } from "../protocol/constants.js";
8
9 /**
10 * @typedef {{
11 * fromDimensionId: string,
12 * fromTileX: number,
13 * fromTileY: number,
14 * toDimensionId: string,
15 * toTileX: number,
16 * toTileY: number
17 * }} DoorwayEdge
18 */
19
20 /**
21 * @typedef {{
22 * kind: "fly" | "portal" | "abstract",
23 * fromDimensionId?: string,
24 * fromX?: number,
25 * fromY?: number,
26 * toDimensionId?: string,
27 * toX?: number,
28 * toY?: number,
29 * distance?: number
30 * }} CourierLeg
31 */
32
33 /**
34 * Build a directed doorway graph from scanned doorway tiles.
35 * @param {Array<{
36 * tileX: number,
37 * tileY: number,
38 * dimensionId?: string,
39 * targetDimensionId?: string,
40 * targetTileX?: number,
41 * targetTileY?: number
42 * }>} doorways
43 */
44 export function buildDoorwayGraph (doorways)
45 {
46 const edges = [];
47 /** @type {Map<string, DoorwayEdge[]>} */
48 const byFromDim = new Map();
49 for (const doorway of doorways ?? [])
50 {
51 const targetRaw = doorway?.targetDimensionId;
52 if (targetRaw == null || String(targetRaw).trim() === "")
53 { continue; }
54 const targetTileX = Number(doorway.targetTileX);
55 const targetTileY = Number(doorway.targetTileY);
56 if (!Number.isFinite(targetTileX) || !Number.isFinite(targetTileY))
57 { continue; }
58 /** @type {DoorwayEdge} */
59 const edge = {
60 fromDimensionId: normalizeDimensionId(doorway.dimensionId ?? OVERWORLD_ID),
61 fromTileX: doorway.tileX | 0,
62 fromTileY: doorway.tileY | 0,
63 toDimensionId: normalizeDimensionId(targetRaw),
64 toTileX: targetTileX | 0,
65 toTileY: targetTileY | 0
66 };
67 edges.push(edge);
68 const list = byFromDim.get(edge.fromDimensionId);
69 if (list)
70 { list.push(edge); }
71 else
72 { byFromDim.set(edge.fromDimensionId, [edge]); }
73 }
74 return { edges, byFromDim };
75 }
76
77 /**
78 * BFS over dimensions via doorway edges. Returns the doorway edge sequence,
79 * or null if unreachable. Same-dimension yields [].
80 * @param {{ byFromDim: Map<string, DoorwayEdge[]> }} graph
81 * @param {string} fromDimensionId
82 * @param {string} toDimensionId
83 * @returns {DoorwayEdge[] | null}
84 */
85 export function findDimensionPath (graph, fromDimensionId, toDimensionId)
86 {
87 const fromDim = normalizeDimensionId(fromDimensionId);
88 const toDim = normalizeDimensionId(toDimensionId);
89 if (fromDim === toDim)
90 { return []; }
91 const byFromDim = graph?.byFromDim ?? new Map();
92 const queue = [fromDim];
93 const visited = new Set([fromDim]);
94 /** @type {Map<string, DoorwayEdge>} */
95 const cameVia = new Map();
96 let head = 0;
97 while (head < queue.length)
98 {
99 const current = queue[head++];
100 for (const edge of byFromDim.get(current) ?? [])
101 {
102 const next = edge.toDimensionId;
103 if (visited.has(next))
104 { continue; }
105 visited.add(next);
106 cameVia.set(next, edge);
107 if (next === toDim)
108 {
109 const path = [];
110 let dim = toDim;
111 while (dim !== fromDim)
112 {
113 const via = cameVia.get(dim);
114 if (!via)
115 { return null; }
116 path.push(via);
117 dim = via.fromDimensionId;
118 }
119 path.reverse();
120 return path;
121 }
122 queue.push(next);
123 }
124 }
125 return null;
126 }
127
128 function flyLeg (fromDimensionId, fromX, fromY, toDimensionId, toX, toY)
129 {
130 return {
131 kind: "fly",
132 fromDimensionId: normalizeDimensionId(fromDimensionId),
133 fromX,
134 fromY,
135 toDimensionId: normalizeDimensionId(toDimensionId),
136 toX,
137 toY
138 };
139 }
140
141 function portalLeg (edge)
142 {
143 return {
144 kind: "portal",
145 fromDimensionId: edge.fromDimensionId,
146 fromX: edge.fromTileX + 0.5,
147 fromY: edge.fromTileY + 0.5,
148 toDimensionId: edge.toDimensionId,
149 toX: edge.toTileX + 0.5,
150 toY: edge.toTileY + 0.5
151 };
152 }
153
154 /**
155 * Plan courier legs from origin to destination using the doorway graph.
156 * Same-dim → single fly. Cross-dim with path → fly/portal/fly….
157 * Cross-dim with no path → { mode: "fallback", legs: null } (caller builds fade legs).
158 */
159 export function planPortalLegs ({
160 fromX,
161 fromY,
162 fromDimensionId = OVERWORLD_ID,
163 toX,
164 toY,
165 toDimensionId = OVERWORLD_ID,
166 graph
167 })
168 {
169 const fromDim = normalizeDimensionId(fromDimensionId);
170 const toDim = normalizeDimensionId(toDimensionId);
171 if (fromDim === toDim)
172 {
173 return {
174 mode: "direct",
175 legs: [flyLeg(fromDim, fromX, fromY, toDim, toX, toY)]
176 };
177 }
178 const doorPath = findDimensionPath(graph, fromDim, toDim);
179 if (!doorPath)
180 {
181 return { mode: "fallback", legs: null };
182 }
183 /** @type {CourierLeg[]} */
184 const legs = [];
185 let cx = fromX;
186 let cy = fromY;
187 let cd = fromDim;
188 for (const edge of doorPath)
189 {
190 const enterX = edge.fromTileX + 0.5;
191 const enterY = edge.fromTileY + 0.5;
192 legs.push(flyLeg(cd, cx, cy, cd, enterX, enterY));
193 legs.push(portalLeg(edge));
194 cx = edge.toTileX + 0.5;
195 cy = edge.toTileY + 0.5;
196 cd = edge.toDimensionId;
197 }
198 legs.push(flyLeg(cd, cx, cy, toDim, toX, toY));
199 return { mode: "portal", legs };
200 }
201
202 /**
203 * Walk from (x,y) along unit direction until `stop(tileX, tileY)` is true.
204 * Returns the first tile-center where stop is true, or the last sample if never.
205 */
206 export function walkUntilStop ({
207 x,
208 y,
209 dirX,
210 dirY,
211 stop,
212 maxSteps = 96,
213 step = 1
214 })
215 {
216 let px = x;
217 let py = y;
218 const len = Math.hypot(dirX, dirY);
219 const ux = len > 1e-9 ? dirX / len : 1;
220 const uy = len > 1e-9 ? dirY / len : 0;
221 for (let i = 0; i < maxSteps; i++)
222 {
223 px += ux * step;
224 py += uy * step;
225 if (stop(Math.floor(px), Math.floor(py)))
226 { return { x: px, y: py, steps: i + 1 }; }
227 }
228 return { x: px, y: py, steps: maxSteps };
229 }
230
231 export function estimateAbstractDistance ({
232 fromX,
233 fromY,
234 toX,
235 toY,
236 fadeOutDist = 0,
237 fadeInDist = 0,
238 crossDimension = false
239 })
240 {
241 const direct = Math.hypot(toX - fromX, toY - fromY);
242 const budget = crossDimension ? Math.max(direct, 32) : direct;
243 return Math.max(0, budget - fadeOutDist - fadeInDist);
244 }
245
246 /**
247 * Build fade-out → abstract → fade-in legs when no doorway path exists.
248 * `isSimulating(tileX, tileY, dimensionId)` must not force-load regions.
249 */
250 export function buildFallbackLegs ({
251 fromX,
252 fromY,
253 fromDimensionId = OVERWORLD_ID,
254 toX,
255 toY,
256 toDimensionId = OVERWORLD_ID,
257 isSimulating,
258 settings = DEFAULT_WORLD_SETTINGS
259 })
260 {
261 void settings;
262 const fromDim = normalizeDimensionId(fromDimensionId);
263 const toDim = normalizeDimensionId(toDimensionId);
264 const awayX = fromX - toX;
265 const awayY = fromY - toY;
266 const awayLen = Math.hypot(awayX, awayY);
267 const outDirX = awayLen > 1e-9 ? awayX / awayLen : 1;
268 const outDirY = awayLen > 1e-9 ? awayY / awayLen : 0;
269
270 /** @type {CourierLeg[]} */
271 const legs = [];
272 let fadeOutEndX = fromX;
273 let fadeOutEndY = fromY;
274 let fadeOutDist = 0;
275 if (typeof isSimulating === "function"
276 && isSimulating(Math.floor(fromX), Math.floor(fromY), fromDim))
277 {
278 const exit = walkUntilStop({
279 x: fromX,
280 y: fromY,
281 dirX: outDirX,
282 dirY: outDirY,
283 stop: (tx, ty) => !isSimulating(tx, ty, fromDim)
284 });
285 fadeOutEndX = exit.x;
286 fadeOutEndY = exit.y;
287 fadeOutDist = Math.hypot(fadeOutEndX - fromX, fadeOutEndY - fromY);
288 legs.push(flyLeg(fromDim, fromX, fromY, fromDim, fadeOutEndX, fadeOutEndY));
289 }
290
291 const approachX = toX - fromX;
292 const approachY = toY - fromY;
293 const approachLen = Math.hypot(approachX, approachY);
294 const backDirX = approachLen > 1e-9 ? -approachX / approachLen : -1;
295 const backDirY = approachLen > 1e-9 ? -approachY / approachLen : 0;
296
297 let fadeInStartX = toX;
298 let fadeInStartY = toY;
299 let fadeInDist = 0;
300 const destSimulating = typeof isSimulating === "function"
301 && isSimulating(Math.floor(toX), Math.floor(toY), toDim);
302 if (destSimulating)
303 {
304 const entry = walkUntilStop({
305 x: toX,
306 y: toY,
307 dirX: backDirX,
308 dirY: backDirY,
309 stop: (tx, ty) => !isSimulating(tx, ty, toDim)
310 });
311 fadeInStartX = entry.x;
312 fadeInStartY = entry.y;
313 fadeInDist = Math.hypot(toX - fadeInStartX, toY - fadeInStartY);
314 }
315
316 const abstractDistance = estimateAbstractDistance({
317 fromX,
318 fromY,
319 toX,
320 toY,
321 fadeOutDist,
322 fadeInDist,
323 crossDimension: fromDim !== toDim
324 });
325 legs.push({
326 kind: "abstract",
327 fromDimensionId: fromDim,
328 fromX: fadeOutEndX,
329 fromY: fadeOutEndY,
330 toDimensionId: toDim,
331 toX: fadeInStartX,
332 toY: fadeInStartY,
333 distance: abstractDistance
334 });
335 legs.push(flyLeg(toDim, fadeInStartX, fadeInStartY, toDim, toX, toY));
336 return { mode: "fallback", legs };
337 }
338
339 /**
340 * Advance an abstract (invisible) travel leg at cruise speed.
341 */
342 export function advanceAbstractTravel ({
343 traveled,
344 distance,
345 dt,
346 settings = DEFAULT_WORLD_SETTINGS
347 })
348 {
349 const total = Math.max(0, distance ?? 0);
350 const cruise = Math.max(0.25, settings.pigeonCruiseTilesPerSec ?? 8);
351 if (!(total > 0))
352 {
353 return {
354 traveled: 0,
355 arrived: true,
356 speed: 0,
357 total: 0
358 };
359 }
360 const nextTraveled = Math.min(total, (traveled || 0) + cruise * Math.max(0, dt));
361 return {
362 traveled: nextTraveled,
363 arrived: nextTraveled >= total - 1e-6,
364 speed: cruise,
365 total
366 };
367 }
368
369 /**
370 * Pose along the current leg given traveled distance.
371 * Abstract legs have no visible pose (returns null).
372 */
373 export function poseOnCourierLeg (leg, traveled = 0)
374 {
375 if (!leg)
376 { return null; }
377 if (leg.kind === "abstract")
378 { return null; }
379 if (leg.kind === "portal")
380 {
381 return {
382 x: leg.toX,
383 y: leg.toY,
384 dimensionId: normalizeDimensionId(leg.toDimensionId ?? OVERWORLD_ID)
385 };
386 }
387 const fromX = leg.fromX;
388 const fromY = leg.fromY;
389 const toX = leg.toX;
390 const toY = leg.toY;
391 const total = Math.hypot(toX - fromX, toY - fromY);
392 const t = total < 1e-6 ? 1 : Math.min(1, Math.max(0, (traveled || 0) / total));
393 return {
394 x: fromX + (toX - fromX) * t,
395 y: fromY + (toY - fromY) * t,
396 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
397 };
398 }
399
400 /**
401 * Normalize / migrate a transit's legs. Old rows without legs become a single fly.
402 */
403 export function ensureCourierLegs (transit)
404 {
405 if (Array.isArray(transit.legs) && transit.legs.length > 0)
406 {
407 transit.legIndex = Math.max(0, Math.min(transit.legIndex | 0, transit.legs.length - 1));
408 return transit;
409 }
410 const fromDim = normalizeDimensionId(transit.originDimensionId ?? OVERWORLD_ID);
411 const toDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
412 transit.legs = [flyLeg(
413 fromDim,
414 transit.originX,
415 transit.originY,
416 toDim,
417 transit.destX,
418 transit.destY
419 )];
420 transit.legIndex = 0;
421 transit.originDimensionId = fromDim;
422 transit.destDimensionId = toDim;
423 return transit;
424 }
@@ -0,0 +1,424 @@
1/**
2 * Pure doorway-portal graph for courier cross-dimension routing.
3 * Edges are unidirectional (from doorway tile → configured target).
4 */
5
6import { OVERWORLD_ID, normalizeDimensionId } from "../world/dimensions.js";
7import { DEFAULT_WORLD_SETTINGS } from "../protocol/constants.js";
8
9/**
10 * @typedef {{
11 * fromDimensionId: string,
12 * fromTileX: number,
13 * fromTileY: number,
14 * toDimensionId: string,
15 * toTileX: number,
16 * toTileY: number
17 * }} DoorwayEdge
18 */
19
20/**
21 * @typedef {{
22 * kind: "fly" | "portal" | "abstract",
23 * fromDimensionId?: string,
24 * fromX?: number,
25 * fromY?: number,
26 * toDimensionId?: string,
27 * toX?: number,
28 * toY?: number,
29 * distance?: number
30 * }} CourierLeg
31 */
32
33/**
34 * Build a directed doorway graph from scanned doorway tiles.
35 * @param {Array<{
36 * tileX: number,
37 * tileY: number,
38 * dimensionId?: string,
39 * targetDimensionId?: string,
40 * targetTileX?: number,
41 * targetTileY?: number
42 * }>} doorways
43 */
44export function buildDoorwayGraph (doorways)
45{
46 const edges = [];
47 /** @type {Map<string, DoorwayEdge[]>} */
48 const byFromDim = new Map();
49 for (const doorway of doorways ?? [])
50 {
51 const targetRaw = doorway?.targetDimensionId;
52 if (targetRaw == null || String(targetRaw).trim() === "")
53 { continue; }
54 const targetTileX = Number(doorway.targetTileX);
55 const targetTileY = Number(doorway.targetTileY);
56 if (!Number.isFinite(targetTileX) || !Number.isFinite(targetTileY))
57 { continue; }
58 /** @type {DoorwayEdge} */
59 const edge = {
60 fromDimensionId: normalizeDimensionId(doorway.dimensionId ?? OVERWORLD_ID),
61 fromTileX: doorway.tileX | 0,
62 fromTileY: doorway.tileY | 0,
63 toDimensionId: normalizeDimensionId(targetRaw),
64 toTileX: targetTileX | 0,
65 toTileY: targetTileY | 0
66 };
67 edges.push(edge);
68 const list = byFromDim.get(edge.fromDimensionId);
69 if (list)
70 { list.push(edge); }
71 else
72 { byFromDim.set(edge.fromDimensionId, [edge]); }
73 }
74 return { edges, byFromDim };
75}
76
77/**
78 * BFS over dimensions via doorway edges. Returns the doorway edge sequence,
79 * or null if unreachable. Same-dimension yields [].
80 * @param {{ byFromDim: Map<string, DoorwayEdge[]> }} graph
81 * @param {string} fromDimensionId
82 * @param {string} toDimensionId
83 * @returns {DoorwayEdge[] | null}
84 */
85export function findDimensionPath (graph, fromDimensionId, toDimensionId)
86{
87 const fromDim = normalizeDimensionId(fromDimensionId);
88 const toDim = normalizeDimensionId(toDimensionId);
89 if (fromDim === toDim)
90 { return []; }
91 const byFromDim = graph?.byFromDim ?? new Map();
92 const queue = [fromDim];
93 const visited = new Set([fromDim]);
94 /** @type {Map<string, DoorwayEdge>} */
95 const cameVia = new Map();
96 let head = 0;
97 while (head < queue.length)
98 {
99 const current = queue[head++];
100 for (const edge of byFromDim.get(current) ?? [])
101 {
102 const next = edge.toDimensionId;
103 if (visited.has(next))
104 { continue; }
105 visited.add(next);
106 cameVia.set(next, edge);
107 if (next === toDim)
108 {
109 const path = [];
110 let dim = toDim;
111 while (dim !== fromDim)
112 {
113 const via = cameVia.get(dim);
114 if (!via)
115 { return null; }
116 path.push(via);
117 dim = via.fromDimensionId;
118 }
119 path.reverse();
120 return path;
121 }
122 queue.push(next);
123 }
124 }
125 return null;
126}
127
128function flyLeg (fromDimensionId, fromX, fromY, toDimensionId, toX, toY)
129{
130 return {
131 kind: "fly",
132 fromDimensionId: normalizeDimensionId(fromDimensionId),
133 fromX,
134 fromY,
135 toDimensionId: normalizeDimensionId(toDimensionId),
136 toX,
137 toY
138 };
139}
140
141function portalLeg (edge)
142{
143 return {
144 kind: "portal",
145 fromDimensionId: edge.fromDimensionId,
146 fromX: edge.fromTileX + 0.5,
147 fromY: edge.fromTileY + 0.5,
148 toDimensionId: edge.toDimensionId,
149 toX: edge.toTileX + 0.5,
150 toY: edge.toTileY + 0.5
151 };
152}
153
154/**
155 * Plan courier legs from origin to destination using the doorway graph.
156 * Same-dim → single fly. Cross-dim with path → fly/portal/fly….
157 * Cross-dim with no path → { mode: "fallback", legs: null } (caller builds fade legs).
158 */
159export function planPortalLegs ({
160 fromX,
161 fromY,
162 fromDimensionId = OVERWORLD_ID,
163 toX,
164 toY,
165 toDimensionId = OVERWORLD_ID,
166 graph
167})
168{
169 const fromDim = normalizeDimensionId(fromDimensionId);
170 const toDim = normalizeDimensionId(toDimensionId);
171 if (fromDim === toDim)
172 {
173 return {
174 mode: "direct",
175 legs: [flyLeg(fromDim, fromX, fromY, toDim, toX, toY)]
176 };
177 }
178 const doorPath = findDimensionPath(graph, fromDim, toDim);
179 if (!doorPath)
180 {
181 return { mode: "fallback", legs: null };
182 }
183 /** @type {CourierLeg[]} */
184 const legs = [];
185 let cx = fromX;
186 let cy = fromY;
187 let cd = fromDim;
188 for (const edge of doorPath)
189 {
190 const enterX = edge.fromTileX + 0.5;
191 const enterY = edge.fromTileY + 0.5;
192 legs.push(flyLeg(cd, cx, cy, cd, enterX, enterY));
193 legs.push(portalLeg(edge));
194 cx = edge.toTileX + 0.5;
195 cy = edge.toTileY + 0.5;
196 cd = edge.toDimensionId;
197 }
198 legs.push(flyLeg(cd, cx, cy, toDim, toX, toY));
199 return { mode: "portal", legs };
200}
201
202/**
203 * Walk from (x,y) along unit direction until `stop(tileX, tileY)` is true.
204 * Returns the first tile-center where stop is true, or the last sample if never.
205 */
206export function walkUntilStop ({
207 x,
208 y,
209 dirX,
210 dirY,
211 stop,
212 maxSteps = 96,
213 step = 1
214})
215{
216 let px = x;
217 let py = y;
218 const len = Math.hypot(dirX, dirY);
219 const ux = len > 1e-9 ? dirX / len : 1;
220 const uy = len > 1e-9 ? dirY / len : 0;
221 for (let i = 0; i < maxSteps; i++)
222 {
223 px += ux * step;
224 py += uy * step;
225 if (stop(Math.floor(px), Math.floor(py)))
226 { return { x: px, y: py, steps: i + 1 }; }
227 }
228 return { x: px, y: py, steps: maxSteps };
229}
230
231export function estimateAbstractDistance ({
232 fromX,
233 fromY,
234 toX,
235 toY,
236 fadeOutDist = 0,
237 fadeInDist = 0,
238 crossDimension = false
239})
240{
241 const direct = Math.hypot(toX - fromX, toY - fromY);
242 const budget = crossDimension ? Math.max(direct, 32) : direct;
243 return Math.max(0, budget - fadeOutDist - fadeInDist);
244}
245
246/**
247 * Build fade-out → abstract → fade-in legs when no doorway path exists.
248 * `isSimulating(tileX, tileY, dimensionId)` must not force-load regions.
249 */
250export function buildFallbackLegs ({
251 fromX,
252 fromY,
253 fromDimensionId = OVERWORLD_ID,
254 toX,
255 toY,
256 toDimensionId = OVERWORLD_ID,
257 isSimulating,
258 settings = DEFAULT_WORLD_SETTINGS
259})
260{
261 void settings;
262 const fromDim = normalizeDimensionId(fromDimensionId);
263 const toDim = normalizeDimensionId(toDimensionId);
264 const awayX = fromX - toX;
265 const awayY = fromY - toY;
266 const awayLen = Math.hypot(awayX, awayY);
267 const outDirX = awayLen > 1e-9 ? awayX / awayLen : 1;
268 const outDirY = awayLen > 1e-9 ? awayY / awayLen : 0;
269
270 /** @type {CourierLeg[]} */
271 const legs = [];
272 let fadeOutEndX = fromX;
273 let fadeOutEndY = fromY;
274 let fadeOutDist = 0;
275 if (typeof isSimulating === "function"
276 && isSimulating(Math.floor(fromX), Math.floor(fromY), fromDim))
277 {
278 const exit = walkUntilStop({
279 x: fromX,
280 y: fromY,
281 dirX: outDirX,
282 dirY: outDirY,
283 stop: (tx, ty) => !isSimulating(tx, ty, fromDim)
284 });
285 fadeOutEndX = exit.x;
286 fadeOutEndY = exit.y;
287 fadeOutDist = Math.hypot(fadeOutEndX - fromX, fadeOutEndY - fromY);
288 legs.push(flyLeg(fromDim, fromX, fromY, fromDim, fadeOutEndX, fadeOutEndY));
289 }
290
291 const approachX = toX - fromX;
292 const approachY = toY - fromY;
293 const approachLen = Math.hypot(approachX, approachY);
294 const backDirX = approachLen > 1e-9 ? -approachX / approachLen : -1;
295 const backDirY = approachLen > 1e-9 ? -approachY / approachLen : 0;
296
297 let fadeInStartX = toX;
298 let fadeInStartY = toY;
299 let fadeInDist = 0;
300 const destSimulating = typeof isSimulating === "function"
301 && isSimulating(Math.floor(toX), Math.floor(toY), toDim);
302 if (destSimulating)
303 {
304 const entry = walkUntilStop({
305 x: toX,
306 y: toY,
307 dirX: backDirX,
308 dirY: backDirY,
309 stop: (tx, ty) => !isSimulating(tx, ty, toDim)
310 });
311 fadeInStartX = entry.x;
312 fadeInStartY = entry.y;
313 fadeInDist = Math.hypot(toX - fadeInStartX, toY - fadeInStartY);
314 }
315
316 const abstractDistance = estimateAbstractDistance({
317 fromX,
318 fromY,
319 toX,
320 toY,
321 fadeOutDist,
322 fadeInDist,
323 crossDimension: fromDim !== toDim
324 });
325 legs.push({
326 kind: "abstract",
327 fromDimensionId: fromDim,
328 fromX: fadeOutEndX,
329 fromY: fadeOutEndY,
330 toDimensionId: toDim,
331 toX: fadeInStartX,
332 toY: fadeInStartY,
333 distance: abstractDistance
334 });
335 legs.push(flyLeg(toDim, fadeInStartX, fadeInStartY, toDim, toX, toY));
336 return { mode: "fallback", legs };
337}
338
339/**
340 * Advance an abstract (invisible) travel leg at cruise speed.
341 */
342export function advanceAbstractTravel ({
343 traveled,
344 distance,
345 dt,
346 settings = DEFAULT_WORLD_SETTINGS
347})
348{
349 const total = Math.max(0, distance ?? 0);
350 const cruise = Math.max(0.25, settings.pigeonCruiseTilesPerSec ?? 8);
351 if (!(total > 0))
352 {
353 return {
354 traveled: 0,
355 arrived: true,
356 speed: 0,
357 total: 0
358 };
359 }
360 const nextTraveled = Math.min(total, (traveled || 0) + cruise * Math.max(0, dt));
361 return {
362 traveled: nextTraveled,
363 arrived: nextTraveled >= total - 1e-6,
364 speed: cruise,
365 total
366 };
367}
368
369/**
370 * Pose along the current leg given traveled distance.
371 * Abstract legs have no visible pose (returns null).
372 */
373export function poseOnCourierLeg (leg, traveled = 0)
374{
375 if (!leg)
376 { return null; }
377 if (leg.kind === "abstract")
378 { return null; }
379 if (leg.kind === "portal")
380 {
381 return {
382 x: leg.toX,
383 y: leg.toY,
384 dimensionId: normalizeDimensionId(leg.toDimensionId ?? OVERWORLD_ID)
385 };
386 }
387 const fromX = leg.fromX;
388 const fromY = leg.fromY;
389 const toX = leg.toX;
390 const toY = leg.toY;
391 const total = Math.hypot(toX - fromX, toY - fromY);
392 const t = total < 1e-6 ? 1 : Math.min(1, Math.max(0, (traveled || 0) / total));
393 return {
394 x: fromX + (toX - fromX) * t,
395 y: fromY + (toY - fromY) * t,
396 dimensionId: normalizeDimensionId(leg.fromDimensionId ?? OVERWORLD_ID)
397 };
398}
399
400/**
401 * Normalize / migrate a transit's legs. Old rows without legs become a single fly.
402 */
403export function ensureCourierLegs (transit)
404{
405 if (Array.isArray(transit.legs) && transit.legs.length > 0)
406 {
407 transit.legIndex = Math.max(0, Math.min(transit.legIndex | 0, transit.legs.length - 1));
408 return transit;
409 }
410 const fromDim = normalizeDimensionId(transit.originDimensionId ?? OVERWORLD_ID);
411 const toDim = normalizeDimensionId(transit.destDimensionId ?? OVERWORLD_ID);
412 transit.legs = [flyLeg(
413 fromDim,
414 transit.originX,
415 transit.originY,
416 toDim,
417 transit.destX,
418 transit.destY
419 )];
420 transit.legIndex = 0;
421 transit.originDimensionId = fromDim;
422 transit.destDimensionId = toDim;
423 return transit;
424}