BlueGit

timfa questward

Merge branch 'feature/system-letter-online-dispatch'

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
ca210cf9598606fad9ec466612f392e7c52bec7f
7 files changed +161 −127
server/src/bounty/service.js +4 −19
@@ -1,8 +1,6 @@
1 import { randomUUID } from "node:crypto";
2 import { ItemId, LETTER_MAX_BODY_CHARS, formatQuantity } from "../../../shared/definitions/items.js";
1 import { ItemId, formatQuantity } from "../../../shared/definitions/items.js";
3 2 import { bountyPayoutLetterBody, formatBountyCopper } from "../../../shared/bounty/pricing.js";
4 3 import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";
5 import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
6 4 import { layersFromBag } from "../../../shared/appearance/layers.js";
7 5 import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";
8 6 import {
@@ -252,28 +250,15 @@ export class BountyService
252 250 killerName,
253 251 victimName,
254 252 amountCopper: paidCopper
255 }).replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
256 const stack = attachOrigins({
257 itemId: ItemId.letter,
258 quantity: 1,
259 origins: [{ origin: writtenOrigin(BOUNTY_OFFICE_AUTHOR), quantity: 1 }],
260 instance: {
261 kind: "letter",
262 letterId: randomUUID(),
263 authorCharacterId: 0,
264 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
265 body,
266 opened: false,
267 writtenAt: Date.now()
268 }
269 253 });
270 254 try
271 255 {
272 this.courier.dispatchSystemLetter({
256 this.courier.enqueueSystemLetter({
273 257 characterId: killerCharacterId,
274 258 originTileX: office.tileX,
275 259 originTileY: office.tileY,
276 stack
260 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
261 body
277 262 });
278 263 }
279 264 catch
@@ -1,8 +1,6 @@
1import { randomUUID } from "node:crypto";
1import { ItemId, formatQuantity } from "../../../shared/definitions/items.js";
2import { ItemId, LETTER_MAX_BODY_CHARS, formatQuantity } from "../../../shared/definitions/items.js";
3import { bountyPayoutLetterBody, formatBountyCopper } from "../../../shared/bounty/pricing.js";
2import { bountyPayoutLetterBody, formatBountyCopper } from "../../../shared/bounty/pricing.js";
4import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";
3import { BOUNTY_OFFICE_AUTHOR } from "../../../shared/courier/systemLetters.js";
5import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
6import { layersFromBag } from "../../../shared/appearance/layers.js";
4import { layersFromBag } from "../../../shared/appearance/layers.js";
7import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";
5import { hairFromCharacterRow } from "../../../shared/appearance/hair.js";
8import {
6import {
@@ -252,28 +250,15 @@ export class BountyService
252 killerName,
250 killerName,
253 victimName,
251 victimName,
254 amountCopper: paidCopper
252 amountCopper: paidCopper
255 }).replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
256 const stack = attachOrigins({
257 itemId: ItemId.letter,
258 quantity: 1,
259 origins: [{ origin: writtenOrigin(BOUNTY_OFFICE_AUTHOR), quantity: 1 }],
260 instance: {
261 kind: "letter",
262 letterId: randomUUID(),
263 authorCharacterId: 0,
264 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
265 body,
266 opened: false,
267 writtenAt: Date.now()
268 }
269 });
253 });
270 try
254 try
271 {
255 {
272 this.courier.dispatchSystemLetter({
256 this.courier.enqueueSystemLetter({
273 characterId: killerCharacterId,
257 characterId: killerCharacterId,
274 originTileX: office.tileX,
258 originTileX: office.tileX,
275 originTileY: office.tileY,
259 originTileY: office.tileY,
276 stack
260 authorDisplayName: BOUNTY_OFFICE_AUTHOR,
261 body
277 });
262 });
278 }
263 }
279 catch
264 catch
server/src/combat/combatLogout.js +8 −39
@@ -1,6 +1,4 @@
1 import { randomUUID } from "node:crypto";
2 import { ItemId, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3 import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
1 import { ItemId } from "../../../shared/definitions/items.js";
4 2 import { combatLevelFromSkills } from "../../../shared/combat/combatLevel.js";
5 3 import
6 4 {
@@ -59,30 +57,16 @@ export function dispatchCombatLogoutBankLetter (simulation, characterId)
59 57 const row = simulation.stateDb.getCharacter(characterId);
60 58 if (!row || !simulation.courier)
61 59 { return; }
62 const body = formatCombatLogoutCowardiceBody().slice(0, LETTER_MAX_BODY_CHARS);
63 const stack = attachOrigins({
64 itemId: ItemId.letter,
65 quantity: 1,
66 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
67 instance: {
68 kind: "letter",
69 letterId: randomUUID(),
70 authorCharacterId: 0,
71 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
72 authorOrganization: QUESTWARD_GIFT_ORG,
73 body,
74 opened: false,
75 writtenAt: Date.now()
76 }
77 });
78 60 const originTileX = row.tile_x | 0;
79 61 const originTileY = row.tile_y | 0;
80 62 const bank = simulation.courier.nearestBank?.(originTileX, originTileY);
81 simulation.courier.dispatchSystemLetter({
63 simulation.courier.enqueueSystemLetter({
82 64 characterId,
83 65 originTileX: bank?.tileX ?? originTileX,
84 66 originTileY: bank?.tileY ?? originTileY,
85 stack
67 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
68 authorOrganization: QUESTWARD_GIFT_ORG,
69 body: formatCombatLogoutCowardiceBody()
86 70 });
87 71 }
88 72
@@ -90,28 +74,13 @@ export function dispatchChurchOfflineResurrectionLetter (simulation, characterId
90 74 {
91 75 if (!simulation.courier)
92 76 { return; }
93 const body = formatChurchOfflineResurrectionBody().slice(0, LETTER_MAX_BODY_CHARS);
94 const stack = attachOrigins({
95 itemId: ItemId.letter,
96 quantity: 1,
97 origins: [{ origin: writtenOrigin(CHURCH_LETTER_AUTHOR), quantity: 1 }],
98 instance: {
99 kind: "letter",
100 letterId: randomUUID(),
101 authorCharacterId: 0,
102 authorDisplayName: CHURCH_LETTER_AUTHOR,
103 authorOrganization: null,
104 body,
105 opened: false,
106 writtenAt: Date.now()
107 }
108 });
109 77 const altar = nearestAltarTile(simulation, tileX, tileY);
110 simulation.courier.dispatchSystemLetter({
78 simulation.courier.enqueueSystemLetter({
111 79 characterId,
112 80 originTileX: altar?.tileX ?? (tileX | 0),
113 81 originTileY: altar?.tileY ?? (tileY | 0),
114 stack
82 authorDisplayName: CHURCH_LETTER_AUTHOR,
83 body: formatChurchOfflineResurrectionBody()
115 84 });
116 85 }
117 86
@@ -1,6 +1,4 @@
1import { randomUUID } from "node:crypto";
1import { ItemId } from "../../../shared/definitions/items.js";
2import { ItemId, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
4import { combatLevelFromSkills } from "../../../shared/combat/combatLevel.js";
2import { combatLevelFromSkills } from "../../../shared/combat/combatLevel.js";
5import
3import
6 {
4 {
@@ -59,30 +57,16 @@ export function dispatchCombatLogoutBankLetter (simulation, characterId)
59 const row = simulation.stateDb.getCharacter(characterId);
57 const row = simulation.stateDb.getCharacter(characterId);
60 if (!row || !simulation.courier)
58 if (!row || !simulation.courier)
61 { return; }
59 { return; }
62 const body = formatCombatLogoutCowardiceBody().slice(0, LETTER_MAX_BODY_CHARS);
63 const stack = attachOrigins({
64 itemId: ItemId.letter,
65 quantity: 1,
66 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
67 instance: {
68 kind: "letter",
69 letterId: randomUUID(),
70 authorCharacterId: 0,
71 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
72 authorOrganization: QUESTWARD_GIFT_ORG,
73 body,
74 opened: false,
75 writtenAt: Date.now()
76 }
77 });
78 const originTileX = row.tile_x | 0;
60 const originTileX = row.tile_x | 0;
79 const originTileY = row.tile_y | 0;
61 const originTileY = row.tile_y | 0;
80 const bank = simulation.courier.nearestBank?.(originTileX, originTileY);
62 const bank = simulation.courier.nearestBank?.(originTileX, originTileY);
81 simulation.courier.dispatchSystemLetter({
63 simulation.courier.enqueueSystemLetter({
82 characterId,
64 characterId,
83 originTileX: bank?.tileX ?? originTileX,
65 originTileX: bank?.tileX ?? originTileX,
84 originTileY: bank?.tileY ?? originTileY,
66 originTileY: bank?.tileY ?? originTileY,
85 stack
67 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
68 authorOrganization: QUESTWARD_GIFT_ORG,
69 body: formatCombatLogoutCowardiceBody()
86 });
70 });
87}
71}
88
72
@@ -90,28 +74,13 @@ export function dispatchChurchOfflineResurrectionLetter (simulation, characterId
90{
74{
91 if (!simulation.courier)
75 if (!simulation.courier)
92 { return; }
76 { return; }
93 const body = formatChurchOfflineResurrectionBody().slice(0, LETTER_MAX_BODY_CHARS);
94 const stack = attachOrigins({
95 itemId: ItemId.letter,
96 quantity: 1,
97 origins: [{ origin: writtenOrigin(CHURCH_LETTER_AUTHOR), quantity: 1 }],
98 instance: {
99 kind: "letter",
100 letterId: randomUUID(),
101 authorCharacterId: 0,
102 authorDisplayName: CHURCH_LETTER_AUTHOR,
103 authorOrganization: null,
104 body,
105 opened: false,
106 writtenAt: Date.now()
107 }
108 });
109 const altar = nearestAltarTile(simulation, tileX, tileY);
77 const altar = nearestAltarTile(simulation, tileX, tileY);
110 simulation.courier.dispatchSystemLetter({
78 simulation.courier.enqueueSystemLetter({
111 characterId,
79 characterId,
112 originTileX: altar?.tileX ?? (tileX | 0),
80 originTileX: altar?.tileX ?? (tileX | 0),
113 originTileY: altar?.tileY ?? (tileY | 0),
81 originTileY: altar?.tileY ?? (tileY | 0),
114 stack
82 authorDisplayName: CHURCH_LETTER_AUTHOR,
83 body: formatChurchOfflineResurrectionBody()
115 });
84 });
116}
85}
117
86
server/src/courier/service.js +43 −29
@@ -4,12 +4,11 @@ import { MobId, mobDefinition, mobSpriteName } from "../../../shared/definitions
4 4 import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
5 5 import { isLetterWrittenBy } from "../../../shared/items/letters.js";
6 6 import { insertStack, insertStackGrowable, takeFromSlot, emptySlots, normalizeVault } from "../../../shared/items/inventory.js";
7 import { attachOrigins, writtenOrigin, normalizeOrigins } from "../../../shared/items/origin.js";
7 import { attachOrigins, normalizeOrigins } from "../../../shared/items/origin.js";
8 8 import { advanceCourierFlight } from "../../../shared/courier/flight.js";
9 9 import { GAIT } from "../../../shared/protocol/constants.js";
10 10 import { decodeChunkBlob } from "../world/chunkData.js";
11 11 import { findReservedChequeIndex } from "../items/bags.js";
12 import { randomUUID } from "node:crypto";
13 12 import {
14 13 BANK_LETTER_AUTHOR,
15 14 bankRestNoticeLetterBody,
@@ -19,6 +18,7 @@ import {
19 18 mergeBankRestNoticeLines,
20 19 sourceNameForVaultDeposit
21 20 } from "../../../shared/courier/bankNotice.js";
21 import { makeSystemLetterStack } from "./systemLetter.js";
22 22
23 23 export class CourierService
24 24 {
@@ -176,10 +176,42 @@ export class CourierService
176 176 return { transit, bag };
177 177 }
178 178
179 /**
180 * Shared entry for system letters (gift / CE / bounty / church / cowardice / …).
181 * Online (not combat-logout): pigeon flies immediately.
182 * Offline / combat-logout: held until the character enters the world.
183 */
184 enqueueSystemLetter ({
185 characterId,
186 originTileX,
187 originTileY,
188 authorDisplayName,
189 authorOrganization = null,
190 body,
191 centralExchange = false,
192 bankRestNotice = false
193 })
194 {
195 const stack = makeSystemLetterStack({
196 authorDisplayName,
197 authorOrganization,
198 body,
199 centralExchange,
200 bankRestNotice
201 });
202 return this.dispatchSystemLetter({
203 characterId,
204 originTileX,
205 originTileY,
206 stack
207 });
208 }
209
179 210 /**
180 211 * System letters (gift / CE / bounty): pigeon to the player (inventory; bank if full).
181 212 * While offline, hold with player destination so login flies from the bank to the character
182 213 * — never deposit the letter straight into the vault.
214 * Prefer enqueueSystemLetter when building a new system letter from author/body fields.
183 215 */
184 216 dispatchSystemLetter ({ characterId, originTileX, originTileY, stack })
185 217 {
@@ -745,35 +777,17 @@ export class CourierService
745 777 })));
746 778 const { full: playerName } = this.#characterDisplayName(characterId);
747 779 const body = bankRestNoticeLetterBody({ playerName, lines });
748 const stack = attachOrigins({
749 itemId: ItemId.letter,
750 quantity: 1,
751 origins: [{ origin: writtenOrigin(BANK_LETTER_AUTHOR), quantity: 1 }],
752 instance: {
753 kind: "letter",
754 letterId: randomUUID(),
755 authorCharacterId: 0,
756 authorDisplayName: BANK_LETTER_AUTHOR,
757 body,
758 opened: false,
759 writtenAt: Date.now(),
760 bankRestNotice: true
761 }
780 const stack = makeSystemLetterStack({
781 authorDisplayName: BANK_LETTER_AUTHOR,
782 body,
783 bankRestNotice: true
762 784 });
763 785 this.stateDb.clearBankRestNotices(characterId);
764 return this.stateDb.insertCourierTransit({
765 senderCharacterId: characterId,
766 destinationKind: "player",
767 destinationCharacterId: characterId,
768 vaultCharacterId: characterId,
769 cargo: { kind: "item", stack },
770 originX: bank.tileX + 0.5,
771 originY: bank.tileY + 0.5,
772 destX: tileX + 0.5,
773 destY: tileY + 0.5,
774 traveled: 0,
775 status: "in_transit",
776 entityId: null
786 return this.dispatchSystemLetter({
787 characterId,
788 originTileX: bank.tileX,
789 originTileY: bank.tileY,
790 stack
777 791 });
778 792 }
779 793 }
@@ -4,12 +4,11 @@ import { MobId, mobDefinition, mobSpriteName } from "../../../shared/definitions
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, emptySlots, normalizeVault } from "../../../shared/items/inventory.js";
7import { attachOrigins, writtenOrigin, 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 { GAIT } from "../../../shared/protocol/constants.js";
9import { GAIT } from "../../../shared/protocol/constants.js";
10import { decodeChunkBlob } from "../world/chunkData.js";
10import { decodeChunkBlob } from "../world/chunkData.js";
11import { findReservedChequeIndex } from "../items/bags.js";
11import { findReservedChequeIndex } from "../items/bags.js";
12import { randomUUID } from "node:crypto";
13import {
12import {
14 BANK_LETTER_AUTHOR,
13 BANK_LETTER_AUTHOR,
15 bankRestNoticeLetterBody,
14 bankRestNoticeLetterBody,
@@ -19,6 +18,7 @@ import {
19 mergeBankRestNoticeLines,
18 mergeBankRestNoticeLines,
20 sourceNameForVaultDeposit
19 sourceNameForVaultDeposit
21} from "../../../shared/courier/bankNotice.js";
20} from "../../../shared/courier/bankNotice.js";
21import { makeSystemLetterStack } from "./systemLetter.js";
22
22
23export class CourierService
23export class CourierService
24{
24{
@@ -176,10 +176,42 @@ export class CourierService
176 return { transit, bag };
176 return { transit, bag };
177 }
177 }
178
178
179 /**
180 * Shared entry for system letters (gift / CE / bounty / church / cowardice / …).
181 * Online (not combat-logout): pigeon flies immediately.
182 * Offline / combat-logout: held until the character enters the world.
183 */
184 enqueueSystemLetter ({
185 characterId,
186 originTileX,
187 originTileY,
188 authorDisplayName,
189 authorOrganization = null,
190 body,
191 centralExchange = false,
192 bankRestNotice = false
193 })
194 {
195 const stack = makeSystemLetterStack({
196 authorDisplayName,
197 authorOrganization,
198 body,
199 centralExchange,
200 bankRestNotice
201 });
202 return this.dispatchSystemLetter({
203 characterId,
204 originTileX,
205 originTileY,
206 stack
207 });
208 }
209
179 /**
210 /**
180 * System letters (gift / CE / bounty): pigeon to the player (inventory; bank if full).
211 * System letters (gift / CE / bounty): pigeon to the player (inventory; bank if full).
181 * While offline, hold with player destination so login flies from the bank to the character
212 * While offline, hold with player destination so login flies from the bank to the character
182 * — never deposit the letter straight into the vault.
213 * — never deposit the letter straight into the vault.
214 * Prefer enqueueSystemLetter when building a new system letter from author/body fields.
183 */
215 */
184 dispatchSystemLetter ({ characterId, originTileX, originTileY, stack })
216 dispatchSystemLetter ({ characterId, originTileX, originTileY, stack })
185 {
217 {
@@ -745,35 +777,17 @@ export class CourierService
745 })));
777 })));
746 const { full: playerName } = this.#characterDisplayName(characterId);
778 const { full: playerName } = this.#characterDisplayName(characterId);
747 const body = bankRestNoticeLetterBody({ playerName, lines });
779 const body = bankRestNoticeLetterBody({ playerName, lines });
748 const stack = attachOrigins({
780 const stack = makeSystemLetterStack({
749 itemId: ItemId.letter,
781 authorDisplayName: BANK_LETTER_AUTHOR,
750 quantity: 1,
782 body,
751 origins: [{ origin: writtenOrigin(BANK_LETTER_AUTHOR), quantity: 1 }],
783 bankRestNotice: true
752 instance: {
753 kind: "letter",
754 letterId: randomUUID(),
755 authorCharacterId: 0,
756 authorDisplayName: BANK_LETTER_AUTHOR,
757 body,
758 opened: false,
759 writtenAt: Date.now(),
760 bankRestNotice: true
761 }
762 });
784 });
763 this.stateDb.clearBankRestNotices(characterId);
785 this.stateDb.clearBankRestNotices(characterId);
764 return this.stateDb.insertCourierTransit({
786 return this.dispatchSystemLetter({
765 senderCharacterId: characterId,
787 characterId,
766 destinationKind: "player",
788 originTileX: bank.tileX,
767 destinationCharacterId: characterId,
789 originTileY: bank.tileY,
768 vaultCharacterId: characterId,
790 stack
769 cargo: { kind: "item", stack },
770 originX: bank.tileX + 0.5,
771 originY: bank.tileY + 0.5,
772 destX: tileX + 0.5,
773 destY: tileY + 0.5,
774 traveled: 0,
775 status: "in_transit",
776 entityId: null
777 });
791 });
778 }
792 }
779}
793}
server/src/courier/systemLetter.js added +44 −0
@@ -0,0 +1,44 @@
1 import { randomUUID } from "node:crypto";
2 import { ItemId, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3 import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
4
5 /**
6 * Build a system-authored letter stack (authorCharacterId 0).
7 * Callers should dispatch via CourierService.enqueueSystemLetter / dispatchSystemLetter
8 * so online players get a pigeon immediately and offline players are held until login.
9 */
10 export function makeSystemLetterStack ({
11 authorDisplayName,
12 authorOrganization = null,
13 body,
14 centralExchange = false,
15 bankRestNotice = false,
16 letterId = null,
17 writtenAt = Date.now()
18 })
19 {
20 const name = String(authorDisplayName ?? "").trim() || "Unknown";
21 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
22 const org = String(authorOrganization ?? "").trim() || null;
23 const instance = {
24 kind: "letter",
25 letterId: letterId ?? randomUUID(),
26 authorCharacterId: 0,
27 authorDisplayName: name,
28 body: trimmed,
29 opened: false,
30 writtenAt: writtenAt | 0 || Date.now()
31 };
32 if (org)
33 { instance.authorOrganization = org; }
34 if (centralExchange)
35 { instance.centralExchange = true; }
36 if (bankRestNotice)
37 { instance.bankRestNotice = true; }
38 return attachOrigins({
39 itemId: ItemId.letter,
40 quantity: 1,
41 origins: [{ origin: writtenOrigin(name), quantity: 1 }],
42 instance
43 });
44 }
@@ -0,0 +1,44 @@
1import { randomUUID } from "node:crypto";
2import { ItemId, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3import { attachOrigins, writtenOrigin } from "../../../shared/items/origin.js";
4
5/**
6 * Build a system-authored letter stack (authorCharacterId 0).
7 * Callers should dispatch via CourierService.enqueueSystemLetter / dispatchSystemLetter
8 * so online players get a pigeon immediately and offline players are held until login.
9 */
10export function makeSystemLetterStack ({
11 authorDisplayName,
12 authorOrganization = null,
13 body,
14 centralExchange = false,
15 bankRestNotice = false,
16 letterId = null,
17 writtenAt = Date.now()
18})
19{
20 const name = String(authorDisplayName ?? "").trim() || "Unknown";
21 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
22 const org = String(authorOrganization ?? "").trim() || null;
23 const instance = {
24 kind: "letter",
25 letterId: letterId ?? randomUUID(),
26 authorCharacterId: 0,
27 authorDisplayName: name,
28 body: trimmed,
29 opened: false,
30 writtenAt: writtenAt | 0 || Date.now()
31 };
32 if (org)
33 { instance.authorOrganization = org; }
34 if (centralExchange)
35 { instance.centralExchange = true; }
36 if (bankRestNotice)
37 { instance.bankRestNotice = true; }
38 return attachOrigins({
39 itemId: ItemId.letter,
40 quantity: 1,
41 origins: [{ origin: writtenOrigin(name), quantity: 1 }],
42 instance
43 });
44}
server/src/gifts/service.js +4 −18
@@ -208,30 +208,16 @@ export class GiftService
208 208
209 209 #dispatchGiftLetter (character, body)
210 210 {
211 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
212 const stack = attachOrigins({
213 itemId: ItemId.letter,
214 quantity: 1,
215 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
216 instance: {
217 kind: "letter",
218 letterId: randomUUID(),
219 authorCharacterId: 0,
220 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
221 authorOrganization: QUESTWARD_GIFT_ORG,
222 body: trimmed,
223 opened: false,
224 writtenAt: Date.now()
225 }
226 });
227 211 const originTileX = character.tile_x | 0;
228 212 const originTileY = character.tile_y | 0;
229 213 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
230 this.simulation.courier.dispatchSystemLetter({
214 this.simulation.courier.enqueueSystemLetter({
231 215 characterId: character.character_id,
232 216 originTileX: bank?.tileX ?? originTileX,
233 217 originTileY: bank?.tileY ?? originTileY,
234 stack
218 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
219 authorOrganization: QUESTWARD_GIFT_ORG,
220 body
235 221 });
236 222 }
237 223
@@ -208,30 +208,16 @@ export class GiftService
208
208
209 #dispatchGiftLetter (character, body)
209 #dispatchGiftLetter (character, body)
210 {
210 {
211 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
212 const stack = attachOrigins({
213 itemId: ItemId.letter,
214 quantity: 1,
215 origins: [{ origin: writtenOrigin(QUESTWARD_GIFT_AUTHOR), quantity: 1 }],
216 instance: {
217 kind: "letter",
218 letterId: randomUUID(),
219 authorCharacterId: 0,
220 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
221 authorOrganization: QUESTWARD_GIFT_ORG,
222 body: trimmed,
223 opened: false,
224 writtenAt: Date.now()
225 }
226 });
227 const originTileX = character.tile_x | 0;
211 const originTileX = character.tile_x | 0;
228 const originTileY = character.tile_y | 0;
212 const originTileY = character.tile_y | 0;
229 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
213 const bank = this.simulation.courier?.nearestBank?.(originTileX, originTileY);
230 this.simulation.courier.dispatchSystemLetter({
214 this.simulation.courier.enqueueSystemLetter({
231 characterId: character.character_id,
215 characterId: character.character_id,
232 originTileX: bank?.tileX ?? originTileX,
216 originTileX: bank?.tileX ?? originTileX,
233 originTileY: bank?.tileY ?? originTileY,
217 originTileY: bank?.tileY ?? originTileY,
234 stack
218 authorDisplayName: QUESTWARD_GIFT_AUTHOR,
219 authorOrganization: QUESTWARD_GIFT_ORG,
220 body
235 });
221 });
236 }
222 }
237
223
server/src/market/service.js +7 −22
@@ -1,7 +1,6 @@
1 import { randomUUID } from "node:crypto";
2 1 import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
3 2 import { BlockType } from "../../../shared/definitions/tiles.js";
4 import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3 import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
5 4 import {
6 5 addCoinsToSlots,
7 6 insertStack,
@@ -11,7 +10,7 @@ import {
11 10 cloneStack
12 11 } from "../../../shared/items/inventory.js";
13 12 import { assertMarketplaceSellable, canSellOnMarketplace } from "../../../shared/items/marketplace.js";
14 import { attachOrigins, normalizeOrigins, splitOrigins, writtenOrigin } from "../../../shared/items/origin.js";
13 import { attachOrigins, normalizeOrigins, splitOrigins } from "../../../shared/items/origin.js";
15 14 import { undiscountedMarketValue, undiscountedMarketCoins } from "../../../shared/shop/pricing.js";
16 15 import { CENTRAL_EXCHANGE_ORG } from "../../../shared/courier/systemLetters.js";
17 16 import {
@@ -666,29 +665,15 @@ export class MarketService
666 665
667 666 #dispatchBankLetter (characterId, origin, body, clerkName = null)
668 667 {
669 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
670 668 const name = String(clerkName || pickExchangeClerk()).trim() || pickExchangeClerk();
671 const stack = attachOrigins({
672 itemId: ItemId.letter,
673 quantity: 1,
674 origins: [{ origin: writtenOrigin(name), quantity: 1 }],
675 instance: {
676 kind: "letter",
677 letterId: randomUUID(),
678 authorCharacterId: 0,
679 authorDisplayName: name,
680 authorOrganization: CENTRAL_EXCHANGE_ORG,
681 centralExchange: true,
682 body: trimmed,
683 opened: false,
684 writtenAt: Date.now()
685 }
686 });
687 this.simulation.courier.dispatchSystemLetter({
669 this.simulation.courier.enqueueSystemLetter({
688 670 characterId,
689 671 originTileX: origin.tileX,
690 672 originTileY: origin.tileY,
691 stack
673 authorDisplayName: name,
674 authorOrganization: CENTRAL_EXCHANGE_ORG,
675 body,
676 centralExchange: true
692 677 });
693 678 }
694 679
@@ -1,7 +1,6 @@
1import { randomUUID } from "node:crypto";
2import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
1import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
3import { BlockType } from "../../../shared/definitions/tiles.js";
2import { BlockType } from "../../../shared/definitions/tiles.js";
4import { ItemId, itemDefinition, LETTER_MAX_BODY_CHARS } from "../../../shared/definitions/items.js";
3import { ItemId, itemDefinition } from "../../../shared/definitions/items.js";
5import {
4import {
6 addCoinsToSlots,
5 addCoinsToSlots,
7 insertStack,
6 insertStack,
@@ -11,7 +10,7 @@ import {
11 cloneStack
10 cloneStack
12} from "../../../shared/items/inventory.js";
11} from "../../../shared/items/inventory.js";
13import { assertMarketplaceSellable, canSellOnMarketplace } from "../../../shared/items/marketplace.js";
12import { assertMarketplaceSellable, canSellOnMarketplace } from "../../../shared/items/marketplace.js";
14import { attachOrigins, normalizeOrigins, splitOrigins, writtenOrigin } from "../../../shared/items/origin.js";
13import { attachOrigins, normalizeOrigins, splitOrigins } from "../../../shared/items/origin.js";
15import { undiscountedMarketValue, undiscountedMarketCoins } from "../../../shared/shop/pricing.js";
14import { undiscountedMarketValue, undiscountedMarketCoins } from "../../../shared/shop/pricing.js";
16import { CENTRAL_EXCHANGE_ORG } from "../../../shared/courier/systemLetters.js";
15import { CENTRAL_EXCHANGE_ORG } from "../../../shared/courier/systemLetters.js";
17import {
16import {
@@ -666,29 +665,15 @@ export class MarketService
666
665
667 #dispatchBankLetter (characterId, origin, body, clerkName = null)
666 #dispatchBankLetter (characterId, origin, body, clerkName = null)
668 {
667 {
669 const trimmed = String(body ?? "").replace(/\r\n/g, "\n").trimEnd().slice(0, LETTER_MAX_BODY_CHARS);
670 const name = String(clerkName || pickExchangeClerk()).trim() || pickExchangeClerk();
668 const name = String(clerkName || pickExchangeClerk()).trim() || pickExchangeClerk();
671 const stack = attachOrigins({
669 this.simulation.courier.enqueueSystemLetter({
672 itemId: ItemId.letter,
673 quantity: 1,
674 origins: [{ origin: writtenOrigin(name), quantity: 1 }],
675 instance: {
676 kind: "letter",
677 letterId: randomUUID(),
678 authorCharacterId: 0,
679 authorDisplayName: name,
680 authorOrganization: CENTRAL_EXCHANGE_ORG,
681 centralExchange: true,
682 body: trimmed,
683 opened: false,
684 writtenAt: Date.now()
685 }
686 });
687 this.simulation.courier.dispatchSystemLetter({
688 characterId,
670 characterId,
689 originTileX: origin.tileX,
671 originTileX: origin.tileX,
690 originTileY: origin.tileY,
672 originTileY: origin.tileY,
691 stack
673 authorDisplayName: name,
674 authorOrganization: CENTRAL_EXCHANGE_ORG,
675 body,
676 centralExchange: true
692 });
677 });
693 }
678 }
694
679
server/tests/gifts.test.js +51 −0
@@ -201,6 +201,57 @@ test("admin gift credits bank and queues a system letter", () =>
201 201 { harness.close(); }
202 202 });
203 203
204 test("admin gift to an online character pigeons the letter immediately", () =>
205 {
206 const harness = makeSimulation({ workerCount: 1 });
207 try
208 {
209 placeBank(harness.worldDb, 8, 8);
210 harness.simulation.courier.refreshBankIndex();
211 harness.simulation.applySettings({
212 pigeonTakeoffTilesPerSec: 40,
213 pigeonCruiseTilesPerSec: 40,
214 pigeonLandingTilesPerSec: 40,
215 simulationTickHz: 20
216 });
217
218 const character = makeCharacter(harness.stateDb, {
219 tileX: 8,
220 tileY: 8,
221 firstName: "Online",
222 lastName: "Target"
223 });
224 const entityId = harness.simulation.spawnCharacter(1, character);
225 assert.equal(harness.simulation.isCharacterOnline(character.character_id), true);
226
227 const gifts = new GiftService(harness.stateDb, harness.simulation);
228 const result = gifts.sendGift({
229 characterId: character.character_id,
230 message: "While you are here.",
231 items: [{ itemId: ItemId.stick, quantity: 2 }]
232 });
233 assert.equal(result.ok, true);
234 assert.equal(harness.stateDb.listHeldCourierDeliveries(character.character_id).length, 0);
235 const active = harness.stateDb.listActiveCourierTransits();
236 assert.equal(active.length, 1);
237 assert.equal(active[0].destinationKind, "player");
238 assert.equal(active[0].cargo.stack.instance.authorDisplayName, QUESTWARD_GIFT_AUTHOR);
239
240 const events = stepTimes(harness.simulation, 40);
241 const bag = harness.simulation.bagOf(entityId);
242 const letter = (bag.inventory ?? []).find((slot) => slot?.itemId === ItemId.letter);
243 assert.ok(letter, "online gift letter should arrive without relog");
244 assert.match(letter.instance.body, /While you are here/);
245 assert.ok(events.some((event) =>
246 event.type === "item-bubble"
247 && event.entityId === entityId
248 && event.itemId === ItemId.letter
249 ));
250 }
251 finally
252 { harness.close(); }
253 });
254
204 255 test("admin gift can credit a specific alchemy recipe paper", () =>
205 256 {
206 257 const harness = makeSimulation({ workerCount: 1 });
@@ -201,6 +201,57 @@ test("admin gift credits bank and queues a system letter", () =>
201 { harness.close(); }
201 { harness.close(); }
202});
202});
203
203
204test("admin gift to an online character pigeons the letter immediately", () =>
205{
206 const harness = makeSimulation({ workerCount: 1 });
207 try
208 {
209 placeBank(harness.worldDb, 8, 8);
210 harness.simulation.courier.refreshBankIndex();
211 harness.simulation.applySettings({
212 pigeonTakeoffTilesPerSec: 40,
213 pigeonCruiseTilesPerSec: 40,
214 pigeonLandingTilesPerSec: 40,
215 simulationTickHz: 20
216 });
217
218 const character = makeCharacter(harness.stateDb, {
219 tileX: 8,
220 tileY: 8,
221 firstName: "Online",
222 lastName: "Target"
223 });
224 const entityId = harness.simulation.spawnCharacter(1, character);
225 assert.equal(harness.simulation.isCharacterOnline(character.character_id), true);
226
227 const gifts = new GiftService(harness.stateDb, harness.simulation);
228 const result = gifts.sendGift({
229 characterId: character.character_id,
230 message: "While you are here.",
231 items: [{ itemId: ItemId.stick, quantity: 2 }]
232 });
233 assert.equal(result.ok, true);
234 assert.equal(harness.stateDb.listHeldCourierDeliveries(character.character_id).length, 0);
235 const active = harness.stateDb.listActiveCourierTransits();
236 assert.equal(active.length, 1);
237 assert.equal(active[0].destinationKind, "player");
238 assert.equal(active[0].cargo.stack.instance.authorDisplayName, QUESTWARD_GIFT_AUTHOR);
239
240 const events = stepTimes(harness.simulation, 40);
241 const bag = harness.simulation.bagOf(entityId);
242 const letter = (bag.inventory ?? []).find((slot) => slot?.itemId === ItemId.letter);
243 assert.ok(letter, "online gift letter should arrive without relog");
244 assert.match(letter.instance.body, /While you are here/);
245 assert.ok(events.some((event) =>
246 event.type === "item-bubble"
247 && event.entityId === entityId
248 && event.itemId === ItemId.letter
249 ));
250 }
251 finally
252 { harness.close(); }
253});
254
204test("admin gift can credit a specific alchemy recipe paper", () =>
255test("admin gift can credit a specific alchemy recipe paper", () =>
205{
256{
206 const harness = makeSimulation({ workerCount: 1 });
257 const harness = makeSimulation({ workerCount: 1 });