BlueGit

timfa questward

Add dialogue step item rewards after lines, before exit.

Authors can attach bag gifts to a dialogue step; they grant when lines finish (overflow to bank) with coloured reward notices before triggers or branches evaluate.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
ea6b4c097d7c456eaa304030724152964fe3258b
Parent
fe8c9563
13 files changed +463 −9
client/src/editor/dialoguesModal.js +126 −0
@@ -1,5 +1,6 @@
1 1 import { normalizeDialogueTree } from "/shared/quests/normalize.js";
2 2 import { emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
3 import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
3 4
4 5 export function initDialoguesModal ({ socket, MessageType })
5 6 {
@@ -25,6 +26,72 @@ export function initDialoguesModal ({ socket, MessageType })
25 26 {
26 27 draft = null;
27 28 selectedId = null;
29 closeInlineItemSearch();
30 }
31 }
32
33 /** @type {null | { step: object, resultsEl: HTMLElement, inputEl: HTMLInputElement }} */
34 let itemPickContext = null;
35
36 function closeInlineItemSearch ()
37 {
38 if (itemPickContext?.resultsEl)
39 { itemPickContext.resultsEl.replaceChildren(); }
40 itemPickContext = null;
41 }
42
43 function openInlineItemSearch (step, inputEl, resultsEl)
44 {
45 itemPickContext = { step, inputEl, resultsEl };
46 inputEl.value = "";
47 renderInlineItemSearch("");
48 inputEl.focus();
49 }
50
51 function renderInlineItemSearch (query)
52 {
53 if (!itemPickContext)
54 { return; }
55 const { step, resultsEl } = itemPickContext;
56 resultsEl.replaceChildren();
57 const q = String(query ?? "").trim().toLowerCase();
58 const taken = new Set((step.itemRewards ?? []).map((row) => row.itemId));
59 const matches = listAllItemPickerEntries().filter((item) =>
60 {
61 if (taken.has(item.itemId))
62 { return false; }
63 if (!q)
64 { return true; }
65 return item.displayName.toLowerCase().includes(q)
66 || item.key.toLowerCase().includes(q)
67 || String(item.itemId).includes(q);
68 }).slice(0, 40);
69 if (!matches.length)
70 {
71 resultsEl.textContent = "No matching items.";
72 return;
73 }
74 for (const item of matches)
75 {
76 const row = document.createElement("button");
77 row.type = "button";
78 row.className = "shop-item-search-row";
79 const name = document.createElement("span");
80 name.className = "shop-item-search-row-name";
81 name.textContent = item.displayName;
82 const key = document.createElement("span");
83 key.className = "shop-item-search-row-key";
84 key.textContent = `${item.key} · #${item.itemId}`;
85 row.append(name, key);
86 row.addEventListener("click", () =>
87 {
88 if (!Array.isArray(step.itemRewards))
89 { step.itemRewards = []; }
90 step.itemRewards.push({ itemId: item.itemId, quantity: 1 });
91 closeInlineItemSearch();
92 renderEditor();
93 });
94 resultsEl.append(row);
28 95 }
29 96 }
30 97
@@ -67,6 +134,7 @@ export function initDialoguesModal ({ socket, MessageType })
67 134 draft.steps.push({
68 135 stepId: `step-${draft.steps.length + 1}`,
69 136 lines: [{ speaker: "npc", text: "…", effects: [] }],
137 itemRewards: [],
70 138 exit: { kind: "end" }
71 139 });
72 140 renderEditor();
@@ -128,6 +196,7 @@ export function initDialoguesModal ({ socket, MessageType })
128 196 draft.steps.push({
129 197 stepId: "greeting",
130 198 lines: [{ speaker: "npc", text: "…", effects: [] }],
199 itemRewards: [],
131 200 exit: { kind: "end" }
132 201 });
133 202 }
@@ -174,6 +243,63 @@ export function initDialoguesModal ({ socket, MessageType })
174 243 box.append(row);
175 244 });
176 245
246 if (!Array.isArray(step.itemRewards))
247 { step.itemRewards = []; }
248 const searchWrap = document.createElement("div");
249 searchWrap.className = "dialogue-reward-item-search";
250 searchWrap.hidden = true;
251 const searchInput = document.createElement("input");
252 searchInput.type = "search";
253 searchInput.placeholder = "Search items…";
254 searchInput.autocomplete = "off";
255 searchInput.addEventListener("input", () => renderInlineItemSearch(searchInput.value));
256 const searchResults = document.createElement("div");
257 searchResults.className = "dialogue-reward-item-results";
258 searchWrap.append(searchInput, searchResults);
259 const rewardsHead = sectionHeader("Item rewards", () =>
260 {
261 searchWrap.hidden = false;
262 openInlineItemSearch(step, searchInput, searchResults);
263 });
264 box.append(rewardsHead);
265 const rewardsHint = document.createElement("p");
266 rewardsHint.className = "content-editor-hint";
267 rewardsHint.textContent = "Granted after all lines, before triggers/branches.";
268 box.append(rewardsHint);
269 if (!step.itemRewards.length)
270 {
271 const empty = document.createElement("p");
272 empty.className = "content-editor-hint";
273 empty.textContent = "No item rewards.";
274 box.append(empty);
275 }
276 step.itemRewards.forEach((reward, rewardIndex) =>
277 {
278 const def = itemDefinition(reward.itemId);
279 const row = document.createElement("div");
280 row.className = "spawner-drops-row";
281 const name = document.createElement("span");
282 name.className = "spawner-sells-name";
283 name.textContent = def?.displayName ?? `Item ${reward.itemId}`;
284 const qty = document.createElement("input");
285 qty.type = "number";
286 qty.min = "1";
287 qty.step = "1";
288 qty.value = String(Math.max(1, reward.quantity | 0 || 1));
289 qty.title = "Quantity";
290 qty.addEventListener("input", () =>
291 {
292 step.itemRewards[rewardIndex].quantity = Math.max(1, Number(qty.value) || 1) | 0;
293 });
294 row.append(name, qty, removeButton(() =>
295 {
296 step.itemRewards.splice(rewardIndex, 1);
297 renderEditor();
298 }));
299 box.append(row);
300 });
301 box.append(searchWrap);
302
177 303 const exitKind = document.createElement("select");
178 304 for (const k of ["end", "triggers", "branches"])
179 305 {
@@ -1,5 +1,6 @@
1import { normalizeDialogueTree } from "/shared/quests/normalize.js";
1import { normalizeDialogueTree } from "/shared/quests/normalize.js";
2import { emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
2import { emptyConditionSet, normalizeConditionSet } from "/shared/quests/conditions.js";
3import { itemDefinition, listAllItemPickerEntries } from "/shared/definitions/items.js";
3
4
4export function initDialoguesModal ({ socket, MessageType })
5export function initDialoguesModal ({ socket, MessageType })
5{
6{
@@ -25,6 +26,72 @@ export function initDialoguesModal ({ socket, MessageType })
25 {
26 {
26 draft = null;
27 draft = null;
27 selectedId = null;
28 selectedId = null;
29 closeInlineItemSearch();
30 }
31 }
32
33 /** @type {null | { step: object, resultsEl: HTMLElement, inputEl: HTMLInputElement }} */
34 let itemPickContext = null;
35
36 function closeInlineItemSearch ()
37 {
38 if (itemPickContext?.resultsEl)
39 { itemPickContext.resultsEl.replaceChildren(); }
40 itemPickContext = null;
41 }
42
43 function openInlineItemSearch (step, inputEl, resultsEl)
44 {
45 itemPickContext = { step, inputEl, resultsEl };
46 inputEl.value = "";
47 renderInlineItemSearch("");
48 inputEl.focus();
49 }
50
51 function renderInlineItemSearch (query)
52 {
53 if (!itemPickContext)
54 { return; }
55 const { step, resultsEl } = itemPickContext;
56 resultsEl.replaceChildren();
57 const q = String(query ?? "").trim().toLowerCase();
58 const taken = new Set((step.itemRewards ?? []).map((row) => row.itemId));
59 const matches = listAllItemPickerEntries().filter((item) =>
60 {
61 if (taken.has(item.itemId))
62 { return false; }
63 if (!q)
64 { return true; }
65 return item.displayName.toLowerCase().includes(q)
66 || item.key.toLowerCase().includes(q)
67 || String(item.itemId).includes(q);
68 }).slice(0, 40);
69 if (!matches.length)
70 {
71 resultsEl.textContent = "No matching items.";
72 return;
73 }
74 for (const item of matches)
75 {
76 const row = document.createElement("button");
77 row.type = "button";
78 row.className = "shop-item-search-row";
79 const name = document.createElement("span");
80 name.className = "shop-item-search-row-name";
81 name.textContent = item.displayName;
82 const key = document.createElement("span");
83 key.className = "shop-item-search-row-key";
84 key.textContent = `${item.key} · #${item.itemId}`;
85 row.append(name, key);
86 row.addEventListener("click", () =>
87 {
88 if (!Array.isArray(step.itemRewards))
89 { step.itemRewards = []; }
90 step.itemRewards.push({ itemId: item.itemId, quantity: 1 });
91 closeInlineItemSearch();
92 renderEditor();
93 });
94 resultsEl.append(row);
28 }
95 }
29 }
96 }
30
97
@@ -67,6 +134,7 @@ export function initDialoguesModal ({ socket, MessageType })
67 draft.steps.push({
134 draft.steps.push({
68 stepId: `step-${draft.steps.length + 1}`,
135 stepId: `step-${draft.steps.length + 1}`,
69 lines: [{ speaker: "npc", text: "…", effects: [] }],
136 lines: [{ speaker: "npc", text: "…", effects: [] }],
137 itemRewards: [],
70 exit: { kind: "end" }
138 exit: { kind: "end" }
71 });
139 });
72 renderEditor();
140 renderEditor();
@@ -128,6 +196,7 @@ export function initDialoguesModal ({ socket, MessageType })
128 draft.steps.push({
196 draft.steps.push({
129 stepId: "greeting",
197 stepId: "greeting",
130 lines: [{ speaker: "npc", text: "…", effects: [] }],
198 lines: [{ speaker: "npc", text: "…", effects: [] }],
199 itemRewards: [],
131 exit: { kind: "end" }
200 exit: { kind: "end" }
132 });
201 });
133 }
202 }
@@ -174,6 +243,63 @@ export function initDialoguesModal ({ socket, MessageType })
174 box.append(row);
243 box.append(row);
175 });
244 });
176
245
246 if (!Array.isArray(step.itemRewards))
247 { step.itemRewards = []; }
248 const searchWrap = document.createElement("div");
249 searchWrap.className = "dialogue-reward-item-search";
250 searchWrap.hidden = true;
251 const searchInput = document.createElement("input");
252 searchInput.type = "search";
253 searchInput.placeholder = "Search items…";
254 searchInput.autocomplete = "off";
255 searchInput.addEventListener("input", () => renderInlineItemSearch(searchInput.value));
256 const searchResults = document.createElement("div");
257 searchResults.className = "dialogue-reward-item-results";
258 searchWrap.append(searchInput, searchResults);
259 const rewardsHead = sectionHeader("Item rewards", () =>
260 {
261 searchWrap.hidden = false;
262 openInlineItemSearch(step, searchInput, searchResults);
263 });
264 box.append(rewardsHead);
265 const rewardsHint = document.createElement("p");
266 rewardsHint.className = "content-editor-hint";
267 rewardsHint.textContent = "Granted after all lines, before triggers/branches.";
268 box.append(rewardsHint);
269 if (!step.itemRewards.length)
270 {
271 const empty = document.createElement("p");
272 empty.className = "content-editor-hint";
273 empty.textContent = "No item rewards.";
274 box.append(empty);
275 }
276 step.itemRewards.forEach((reward, rewardIndex) =>
277 {
278 const def = itemDefinition(reward.itemId);
279 const row = document.createElement("div");
280 row.className = "spawner-drops-row";
281 const name = document.createElement("span");
282 name.className = "spawner-sells-name";
283 name.textContent = def?.displayName ?? `Item ${reward.itemId}`;
284 const qty = document.createElement("input");
285 qty.type = "number";
286 qty.min = "1";
287 qty.step = "1";
288 qty.value = String(Math.max(1, reward.quantity | 0 || 1));
289 qty.title = "Quantity";
290 qty.addEventListener("input", () =>
291 {
292 step.itemRewards[rewardIndex].quantity = Math.max(1, Number(qty.value) || 1) | 0;
293 });
294 row.append(name, qty, removeButton(() =>
295 {
296 step.itemRewards.splice(rewardIndex, 1);
297 renderEditor();
298 }));
299 box.append(row);
300 });
301 box.append(searchWrap);
302
177 const exitKind = document.createElement("select");
303 const exitKind = document.createElement("select");
178 for (const k of ["end", "triggers", "branches"])
304 for (const k of ["end", "triggers", "branches"])
179 {
305 {
client/src/play/dialogue.js +91 −3
@@ -1,5 +1,5 @@
1 1 /**
2 * Play dialogue panel: page lines one-by-one, then choices / end.
2 * Play dialogue panel: page lines one-by-one, reward notices, then choices / end.
3 3 * Speaker icons are live WebGL portraits from WorldView (same stack as the world).
4 4 */
5 5
@@ -12,7 +12,15 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
12 12 const linesEl = document.getElementById("dialogue-lines");
13 13 const triggersEl = document.getElementById("dialogue-triggers");
14 14 let open = false;
15 /** @type {null | { label: string, npcEntityId: number|null, lines: object[], lineIndex: number, triggers: object[]|null }} */
15 /** @type {null | {
16 * label: string,
17 * npcEntityId: number|null,
18 * lines: object[],
19 * lineIndex: number,
20 * rewardMessages: string[]|null,
21 * rewardIndex: number,
22 * triggers: object[]|null
23 * }} */
16 24 let current = null;
17 25
18 26 function show (visible)
@@ -67,10 +75,54 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
67 75 return speaker === "player" ? "You" : "…";
68 76 }
69 77
78 function renderRewardLine ()
79 {
80 if (!current?.rewardMessages?.length)
81 { return false; }
82 const message = current.rewardMessages[current.rewardIndex];
83 if (!message)
84 { return false; }
85 if (titleEl)
86 { titleEl.textContent = "Reward"; }
87 linesEl?.replaceChildren();
88 triggersEl?.replaceChildren();
89 const row = document.createElement("div");
90 row.className = "dialogue-line dialogue-line-reward";
91 const text = document.createElement("span");
92 text.className = "dialogue-line-text dialogue-reward-text";
93 text.textContent = message;
94 row.append(text);
95 linesEl?.append(row);
96
97 const atLast = current.rewardIndex >= current.rewardMessages.length - 1;
98 const nextBtn = document.createElement("button");
99 nextBtn.type = "button";
100 nextBtn.className = "dialogue-next";
101 nextBtn.textContent = atLast ? "Continue" : "Next";
102 nextBtn.addEventListener("click", () =>
103 {
104 if (!atLast)
105 {
106 current.rewardIndex += 1;
107 renderRewardLine();
108 return;
109 }
110 current.rewardMessages = null;
111 socket.send({ type: MessageType.dialogueAdvance });
112 });
113 triggersEl?.append(nextBtn);
114 return true;
115 }
116
70 117 function renderLine ()
71 118 {
72 119 if (!current)
73 120 { return; }
121 if (current.rewardMessages?.length)
122 {
123 renderRewardLine();
124 return;
125 }
74 126 const line = current.lines[current.lineIndex];
75 127 const speaker = line?.speaker === "player" ? "player" : "npc";
76 128 if (titleEl)
@@ -187,11 +239,42 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
187 239 npcEntityId: message.npcEntityId ?? null,
188 240 lines: message.lines?.length ? message.lines : [{ speaker: "npc", text: "…" }],
189 241 lineIndex: 0,
242 rewardMessages: null,
243 rewardIndex: 0,
190 244 triggers: null
191 245 };
192 246 show(true);
193 247 renderLine();
194 248 },
249 handleItemRewards (message)
250 {
251 const messages = (message.messages ?? []).filter(Boolean);
252 if (!messages.length)
253 {
254 socket.send({ type: MessageType.dialogueAdvance });
255 return;
256 }
257 if (!current)
258 {
259 current = {
260 label: "Reward",
261 npcEntityId: message.npcEntityId ?? null,
262 lines: [],
263 lineIndex: 0,
264 rewardMessages: messages,
265 rewardIndex: 0,
266 triggers: null
267 };
268 show(true);
269 }
270 else
271 {
272 current.rewardMessages = messages;
273 current.rewardIndex = 0;
274 current.triggers = null;
275 }
276 renderLine();
277 },
195 278 handleChoices (message)
196 279 {
197 280 if (!current)
@@ -201,12 +284,17 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
201 284 npcEntityId: message.npcEntityId ?? null,
202 285 lines: [],
203 286 lineIndex: 0,
287 rewardMessages: null,
288 rewardIndex: 0,
204 289 triggers: message.triggers ?? []
205 290 };
206 291 show(true);
207 292 }
208 293 else
209 { current.triggers = message.triggers ?? []; }
294 {
295 current.triggers = message.triggers ?? [];
296 current.rewardMessages = null;
297 }
210 298 current.lineIndex = Math.max(0, (current.lines?.length ?? 1) - 1);
211 299 renderLine();
212 300 },
@@ -1,5 +1,5 @@
1/**
1/**
2 * Play dialogue panel: page lines one-by-one, then choices / end.
2 * Play dialogue panel: page lines one-by-one, reward notices, then choices / end.
3 * Speaker icons are live WebGL portraits from WorldView (same stack as the world).
3 * Speaker icons are live WebGL portraits from WorldView (same stack as the world).
4 */
4 */
5
5
@@ -12,7 +12,15 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
12 const linesEl = document.getElementById("dialogue-lines");
12 const linesEl = document.getElementById("dialogue-lines");
13 const triggersEl = document.getElementById("dialogue-triggers");
13 const triggersEl = document.getElementById("dialogue-triggers");
14 let open = false;
14 let open = false;
15 /** @type {null | { label: string, npcEntityId: number|null, lines: object[], lineIndex: number, triggers: object[]|null }} */
15 /** @type {null | {
16 * label: string,
17 * npcEntityId: number|null,
18 * lines: object[],
19 * lineIndex: number,
20 * rewardMessages: string[]|null,
21 * rewardIndex: number,
22 * triggers: object[]|null
23 * }} */
16 let current = null;
24 let current = null;
17
25
18 function show (visible)
26 function show (visible)
@@ -67,10 +75,54 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
67 return speaker === "player" ? "You" : "…";
75 return speaker === "player" ? "You" : "…";
68 }
76 }
69
77
78 function renderRewardLine ()
79 {
80 if (!current?.rewardMessages?.length)
81 { return false; }
82 const message = current.rewardMessages[current.rewardIndex];
83 if (!message)
84 { return false; }
85 if (titleEl)
86 { titleEl.textContent = "Reward"; }
87 linesEl?.replaceChildren();
88 triggersEl?.replaceChildren();
89 const row = document.createElement("div");
90 row.className = "dialogue-line dialogue-line-reward";
91 const text = document.createElement("span");
92 text.className = "dialogue-line-text dialogue-reward-text";
93 text.textContent = message;
94 row.append(text);
95 linesEl?.append(row);
96
97 const atLast = current.rewardIndex >= current.rewardMessages.length - 1;
98 const nextBtn = document.createElement("button");
99 nextBtn.type = "button";
100 nextBtn.className = "dialogue-next";
101 nextBtn.textContent = atLast ? "Continue" : "Next";
102 nextBtn.addEventListener("click", () =>
103 {
104 if (!atLast)
105 {
106 current.rewardIndex += 1;
107 renderRewardLine();
108 return;
109 }
110 current.rewardMessages = null;
111 socket.send({ type: MessageType.dialogueAdvance });
112 });
113 triggersEl?.append(nextBtn);
114 return true;
115 }
116
70 function renderLine ()
117 function renderLine ()
71 {
118 {
72 if (!current)
119 if (!current)
73 { return; }
120 { return; }
121 if (current.rewardMessages?.length)
122 {
123 renderRewardLine();
124 return;
125 }
74 const line = current.lines[current.lineIndex];
126 const line = current.lines[current.lineIndex];
75 const speaker = line?.speaker === "player" ? "player" : "npc";
127 const speaker = line?.speaker === "player" ? "player" : "npc";
76 if (titleEl)
128 if (titleEl)
@@ -187,11 +239,42 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
187 npcEntityId: message.npcEntityId ?? null,
239 npcEntityId: message.npcEntityId ?? null,
188 lines: message.lines?.length ? message.lines : [{ speaker: "npc", text: "…" }],
240 lines: message.lines?.length ? message.lines : [{ speaker: "npc", text: "…" }],
189 lineIndex: 0,
241 lineIndex: 0,
242 rewardMessages: null,
243 rewardIndex: 0,
190 triggers: null
244 triggers: null
191 };
245 };
192 show(true);
246 show(true);
193 renderLine();
247 renderLine();
194 },
248 },
249 handleItemRewards (message)
250 {
251 const messages = (message.messages ?? []).filter(Boolean);
252 if (!messages.length)
253 {
254 socket.send({ type: MessageType.dialogueAdvance });
255 return;
256 }
257 if (!current)
258 {
259 current = {
260 label: "Reward",
261 npcEntityId: message.npcEntityId ?? null,
262 lines: [],
263 lineIndex: 0,
264 rewardMessages: messages,
265 rewardIndex: 0,
266 triggers: null
267 };
268 show(true);
269 }
270 else
271 {
272 current.rewardMessages = messages;
273 current.rewardIndex = 0;
274 current.triggers = null;
275 }
276 renderLine();
277 },
195 handleChoices (message)
278 handleChoices (message)
196 {
279 {
197 if (!current)
280 if (!current)
@@ -201,12 +284,17 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
201 npcEntityId: message.npcEntityId ?? null,
284 npcEntityId: message.npcEntityId ?? null,
202 lines: [],
285 lines: [],
203 lineIndex: 0,
286 lineIndex: 0,
287 rewardMessages: null,
288 rewardIndex: 0,
204 triggers: message.triggers ?? []
289 triggers: message.triggers ?? []
205 };
290 };
206 show(true);
291 show(true);
207 }
292 }
208 else
293 else
209 { current.triggers = message.triggers ?? []; }
294 {
295 current.triggers = message.triggers ?? [];
296 current.rewardMessages = null;
297 }
210 current.lineIndex = Math.max(0, (current.lines?.length ?? 1) - 1);
298 current.lineIndex = Math.max(0, (current.lines?.length ?? 1) - 1);
211 renderLine();
299 renderLine();
212 },
300 },
client/src/play/main.js +5 −0
@@ -2198,6 +2198,11 @@ async function main ()
2198 2198 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2199 2199 dialogueUi?.handleStep(message);
2200 2200 break;
2201 case MessageType.dialogueItemRewards:
2202 if (message.npcEntityId != null)
2203 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2204 dialogueUi?.handleItemRewards(message);
2205 break;
2201 2206 case MessageType.dialogueChoices:
2202 2207 if (message.npcEntityId != null)
2203 2208 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
@@ -2198,6 +2198,11 @@ async function main ()
2198 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2198 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2199 dialogueUi?.handleStep(message);
2199 dialogueUi?.handleStep(message);
2200 break;
2200 break;
2201 case MessageType.dialogueItemRewards:
2202 if (message.npcEntityId != null)
2203 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2204 dialogueUi?.handleItemRewards(message);
2205 break;
2201 case MessageType.dialogueChoices:
2206 case MessageType.dialogueChoices:
2202 if (message.npcEntityId != null)
2207 if (message.npcEntityId != null)
2203 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
2208 { setUiFocus({ kind: "dialogue", entityId: message.npcEntityId | 0 }); }
client/ui/editor.css +15 −1
@@ -1422,4 +1422,18 @@ label {
1422 1422 color: #8a909c;
1423 1423 font-size: 0.85rem;
1424 1424 margin: 0.25rem 0 0.5rem;
1425 }
1425 }
1426 .dialogue-reward-item-search {
1427 display: flex;
1428 flex-direction: column;
1429 gap: 0.35rem;
1430 margin: 0.35rem 0 0.6rem;
1431 }
1432
1433 .dialogue-reward-item-results {
1434 max-height: 220px;
1435 overflow: auto;
1436 border: 1px solid #3a4250;
1437 border-radius: 4px;
1438 background: #12151c;
1439 }
@@ -1422,4 +1422,18 @@ label {
1422 color: #8a909c;
1422 color: #8a909c;
1423 font-size: 0.85rem;
1423 font-size: 0.85rem;
1424 margin: 0.25rem 0 0.5rem;
1424 margin: 0.25rem 0 0.5rem;
1425}
1425}
1426.dialogue-reward-item-search {
1427 display: flex;
1428 flex-direction: column;
1429 gap: 0.35rem;
1430 margin: 0.35rem 0 0.6rem;
1431}
1432
1433.dialogue-reward-item-results {
1434 max-height: 220px;
1435 overflow: auto;
1436 border: 1px solid #3a4250;
1437 border-radius: 4px;
1438 background: #12151c;
1439}
client/ui/play.css +11 −0
@@ -2533,6 +2533,17 @@ button.friend-account-name:hover {
2533 2533 color: #c9d4e8;
2534 2534 }
2535 2535
2536 .dialogue-line-reward {
2537 justify-content: center;
2538 }
2539
2540 .dialogue-reward-text {
2541 color: #d4b45a;
2542 font-style: italic;
2543 font-weight: 600;
2544 text-align: center;
2545 }
2546
2536 2547 .dialogue-triggers {
2537 2548 display: flex;
2538 2549 flex-wrap: wrap;
@@ -2533,6 +2533,17 @@ button.friend-account-name:hover {
2533 color: #c9d4e8;
2533 color: #c9d4e8;
2534}
2534}
2535
2535
2536.dialogue-line-reward {
2537 justify-content: center;
2538}
2539
2540.dialogue-reward-text {
2541 color: #d4b45a;
2542 font-style: italic;
2543 font-weight: 600;
2544 text-align: center;
2545}
2546
2536.dialogue-triggers {
2547.dialogue-triggers {
2537 display: flex;
2548 display: flex;
2538 flex-wrap: wrap;
2549 flex-wrap: wrap;
docs/QUESTS.md +4 −2
@@ -260,6 +260,7 @@ DialogueStep {
260 260 stepId: string
261 261 label: string
262 262 lines: DialogueLine[]
263 itemRewards?: { itemId: number, quantity: number }[] // after lines, before exit
263 264 exit:
264 265 | { kind: "triggers", triggers: DialogueTrigger[] }
265 266 | { kind: "branches", branches: DialogueBranch[] }
@@ -295,8 +296,9 @@ DialogueBranch {
295 296
296 297 1. Talk to NPC whose spawner has `dialogueId` → load world DialogueTree → open `entryStepId`.
297 298 2. Enter step → insert `dialogueHeard` if new → play lines (apply line effects).
298 3. Triggers / branches / end as authored.
299 4. **Interrupt:** if the NPC is **attacked** (takes a hostile hit / combat engagement against it) while a player has this dialogue open → **immediately close** that dialogue session (no further lines, choices, or pending line effects). Re-talk required. Does not roll back already-applied effects or heard rows.
299 3. On **advance** after the last line: grant `itemRewards` (bag first, overflow to bank/vault), show reward notices in the dialogue UI, then evaluate exit.
300 4. Triggers / branches / end as authored (conditions see items already granted).
301 5. **Interrupt:** if the NPC is **attacked** (takes a hostile hit / combat engagement against it) while a player has this dialogue open → **immediately close** that dialogue session (no further lines, choices, or pending line effects). Re-talk required. Does not roll back already-applied effects or heard rows.
300 302
301 303 ### 5.3 Editor (Dialogues panel)
302 304
@@ -260,6 +260,7 @@ DialogueStep {
260 stepId: string
260 stepId: string
261 label: string
261 label: string
262 lines: DialogueLine[]
262 lines: DialogueLine[]
263 itemRewards?: { itemId: number, quantity: number }[] // after lines, before exit
263 exit:
264 exit:
264 | { kind: "triggers", triggers: DialogueTrigger[] }
265 | { kind: "triggers", triggers: DialogueTrigger[] }
265 | { kind: "branches", branches: DialogueBranch[] }
266 | { kind: "branches", branches: DialogueBranch[] }
@@ -295,8 +296,9 @@ DialogueBranch {
295
296
2961. Talk to NPC whose spawner has `dialogueId` → load world DialogueTree → open `entryStepId`.
2971. Talk to NPC whose spawner has `dialogueId` → load world DialogueTree → open `entryStepId`.
2972. Enter step → insert `dialogueHeard` if new → play lines (apply line effects).
2982. Enter step → insert `dialogueHeard` if new → play lines (apply line effects).
2983. Triggers / branches / end as authored.
2993. On **advance** after the last line: grant `itemRewards` (bag first, overflow to bank/vault), show reward notices in the dialogue UI, then evaluate exit.
2994. **Interrupt:** if the NPC is **attacked** (takes a hostile hit / combat engagement against it) while a player has this dialogue open → **immediately close** that dialogue session (no further lines, choices, or pending line effects). Re-talk required. Does not roll back already-applied effects or heard rows.
3004. Triggers / branches / end as authored (conditions see items already granted).
3015. **Interrupt:** if the NPC is **attacked** (takes a hostile hit / combat engagement against it) while a player has this dialogue open → **immediately close** that dialogue session (no further lines, choices, or pending line effects). Re-talk required. Does not roll back already-applied effects or heard rows.
300
302
301### 5.3 Editor (Dialogues panel)
303### 5.3 Editor (Dialogues panel)
302
304
server/src/gateway/websocket.js +17 −0
@@ -1637,6 +1637,23 @@ export function attachGateway ({ httpServer, auth, stateDb, characters, friends,
1637 1637 }
1638 1638 continue;
1639 1639 }
1640 if (event.type === "dialogue-item-rewards")
1641 {
1642 const session = event.sessionId != null
1643 ? sessions.get(event.sessionId)
1644 : [...sessions.values()].find((entry) => entry.characterId === event.characterId);
1645 if (session)
1646 {
1647 send(session, {
1648 type: MessageType.dialogueItemRewards,
1649 dialogueId: event.dialogueId,
1650 stepId: event.stepId,
1651 npcEntityId: event.npcEntityId ?? null,
1652 messages: event.messages ?? []
1653 });
1654 }
1655 continue;
1656 }
1640 1657 if (event.type === "dialogue-close")
1641 1658 {
1642 1659 const session = event.sessionId != null
@@ -1637,6 +1637,23 @@ export function attachGateway ({ httpServer, auth, stateDb, characters, friends,
1637 }
1637 }
1638 continue;
1638 continue;
1639 }
1639 }
1640 if (event.type === "dialogue-item-rewards")
1641 {
1642 const session = event.sessionId != null
1643 ? sessions.get(event.sessionId)
1644 : [...sessions.values()].find((entry) => entry.characterId === event.characterId);
1645 if (session)
1646 {
1647 send(session, {
1648 type: MessageType.dialogueItemRewards,
1649 dialogueId: event.dialogueId,
1650 stepId: event.stepId,
1651 npcEntityId: event.npcEntityId ?? null,
1652 messages: event.messages ?? []
1653 });
1654 }
1655 continue;
1656 }
1640 if (event.type === "dialogue-close")
1657 if (event.type === "dialogue-close")
1641 {
1658 {
1642 const session = event.sessionId != null
1659 const session = event.sessionId != null
server/src/quests/runtime.js +94 −3
@@ -4,6 +4,7 @@ import { attachOrigins, godsOrigin } from "../../../shared/items/origin.js";
4 4 import { itemDefinition } from "../../../shared/definitions/items.js";
5 5 import { applySkillXp } from "../../../shared/skills/state.js";
6 6 import { skillLevel } from "../../../shared/definitions/skills.js";
7 import { formatDialogueRewardMessage } from "../../../shared/quests/dialogueRewards.js";
7 8 import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
8 9 import { floorDiv } from "../world/coordinates.js";
9 10 import { WorkerMessage } from "../simulation/protocol.js";
@@ -188,6 +189,8 @@ export class QuestRuntime
188 189 { return { ok: false, error: "No dialogue open." }; }
189 190 if (session.phase === "lines")
190 191 { return { ok: false, error: "Finish reading first." }; }
192 if (session.phase === "rewards")
193 { return { ok: false, error: "Finish reading first." }; }
191 194 const tree = this.content.dialogue(session.dialogueId);
192 195 if (!tree)
193 196 {
@@ -285,11 +288,11 @@ export class QuestRuntime
285 288 return { ok: true, events };
286 289 }
287 290
288 /** Client finished reading all lines of the current step. */
291 /** Client finished reading all lines (or reward notices) of the current step. */
289 292 advanceDialogue (characterId)
290 293 {
291 294 const session = this.sessions.get(characterId | 0);
292 if (!session || session.phase !== "lines")
295 if (!session || (session.phase !== "lines" && session.phase !== "rewards"))
293 296 { return { ok: false, error: "No dialogue lines to advance." }; }
294 297 const tree = this.content.dialogue(session.dialogueId);
295 298 if (!tree)
@@ -298,9 +301,38 @@ export class QuestRuntime
298 301 return { ok: true, events: [{ type: "dialogueClose", reason: "missing" }] };
299 302 }
300 303 const playerView = this.playerViewFor(characterId);
301 const exit = session.pendingExit ?? { kind: "end" };
302 304 const events = [];
303 305
306 if (session.phase === "lines")
307 {
308 const step = tree.steps.find((s) => s.stepId === session.stepId);
309 const rewardMessages = this.#grantStepItemRewards(
310 characterId,
311 step,
312 events
313 );
314 this.#reevaluateQuests(characterId, playerView, events);
315 if (rewardMessages.length > 0)
316 {
317 session.phase = "rewards";
318 events.push({
319 type: "dialogueItemRewards",
320 dialogueId: session.dialogueId,
321 stepId: session.stepId,
322 npcEntityId: session.entityId,
323 messages: rewardMessages
324 });
325 return { ok: true, events };
326 }
327 }
328
329 return this.#resolveDialogueExit(characterId, session, tree, playerView, events);
330 }
331
332 #resolveDialogueExit (characterId, session, tree, playerView, events)
333 {
334 const exit = session.pendingExit ?? { kind: "end" };
335
304 336 if (exit.kind === "branches")
305 337 {
306 338 const ctx = this.buildConditionContext(characterId, playerView);
@@ -356,6 +388,65 @@ export class QuestRuntime
356 388 return { ok: true, events };
357 389 }
358 390
391 /**
392 * Grant step.itemRewards into bag (overflow → bank/vault). Returns player-facing notices.
393 */
394 #grantStepItemRewards (characterId, step, events)
395 {
396 const rewards = step?.itemRewards ?? [];
397 if (!rewards.length)
398 { return []; }
399 const bagParts = [];
400 const bankParts = [];
401 for (const reward of rewards)
402 {
403 const bag = this.#loadBag(characterId);
404 if (!bag)
405 { continue; }
406 const itemId = reward.itemId | 0;
407 const def = itemDefinition(itemId);
408 const quantity = Math.max(1, Number(reward.quantity) || 1);
409 const displayName = def?.displayName ?? `Item ${itemId}`;
410 const stack = attachOrigins({
411 itemId,
412 quantity,
413 origins: [{ origin: godsOrigin(), quantity }]
414 });
415 const result = insertStack(bag.inventory, stack, def);
416 bag.inventory = result.slots;
417 const intoBag = quantity - Math.max(0, result.remainder | 0);
418 let intoBank = 0;
419 if (result.remainder > 0)
420 {
421 const vaultResult = insertStackGrowable(
422 bag.vault,
423 attachOrigins({
424 itemId,
425 quantity: result.remainder,
426 origins: [{ origin: godsOrigin(), quantity: result.remainder }]
427 }),
428 def
429 );
430 bag.vault = vaultResult.slots;
431 intoBank = (result.remainder | 0) - Math.max(0, vaultResult.remainder | 0);
432 }
433 this.#persistBag(characterId, bag);
434 events.push({ type: "inventoryDirty" });
435 if (intoBag > 0)
436 { bagParts.push({ displayName, quantity: intoBag }); }
437 if (intoBank > 0)
438 { bankParts.push({ displayName, quantity: intoBank }); }
439 }
440 const messages = [];
441 const bagMsg = formatDialogueRewardMessage(bagParts, "bag");
442 const bankMsg = formatDialogueRewardMessage(bankParts, "bank");
443 if (bagMsg)
444 { messages.push(bagMsg); }
445 if (bankMsg)
446 { messages.push(bankMsg); }
447 return messages;
448 }
449
359 450 #loadBag (characterId)
360 451 {
361 452 const onlineId = this.simulation.characterEntities.get(characterId | 0);
@@ -4,6 +4,7 @@ import { attachOrigins, godsOrigin } from "../../../shared/items/origin.js";
4import { itemDefinition } from "../../../shared/definitions/items.js";
4import { itemDefinition } from "../../../shared/definitions/items.js";
5import { applySkillXp } from "../../../shared/skills/state.js";
5import { applySkillXp } from "../../../shared/skills/state.js";
6import { skillLevel } from "../../../shared/definitions/skills.js";
6import { skillLevel } from "../../../shared/definitions/skills.js";
7import { formatDialogueRewardMessage } from "../../../shared/quests/dialogueRewards.js";
7import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
8import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
8import { floorDiv } from "../world/coordinates.js";
9import { floorDiv } from "../world/coordinates.js";
9import { WorkerMessage } from "../simulation/protocol.js";
10import { WorkerMessage } from "../simulation/protocol.js";
@@ -188,6 +189,8 @@ export class QuestRuntime
188 { return { ok: false, error: "No dialogue open." }; }
189 { return { ok: false, error: "No dialogue open." }; }
189 if (session.phase === "lines")
190 if (session.phase === "lines")
190 { return { ok: false, error: "Finish reading first." }; }
191 { return { ok: false, error: "Finish reading first." }; }
192 if (session.phase === "rewards")
193 { return { ok: false, error: "Finish reading first." }; }
191 const tree = this.content.dialogue(session.dialogueId);
194 const tree = this.content.dialogue(session.dialogueId);
192 if (!tree)
195 if (!tree)
193 {
196 {
@@ -285,11 +288,11 @@ export class QuestRuntime
285 return { ok: true, events };
288 return { ok: true, events };
286 }
289 }
287
290
288 /** Client finished reading all lines of the current step. */
291 /** Client finished reading all lines (or reward notices) of the current step. */
289 advanceDialogue (characterId)
292 advanceDialogue (characterId)
290 {
293 {
291 const session = this.sessions.get(characterId | 0);
294 const session = this.sessions.get(characterId | 0);
292 if (!session || session.phase !== "lines")
295 if (!session || (session.phase !== "lines" && session.phase !== "rewards"))
293 { return { ok: false, error: "No dialogue lines to advance." }; }
296 { return { ok: false, error: "No dialogue lines to advance." }; }
294 const tree = this.content.dialogue(session.dialogueId);
297 const tree = this.content.dialogue(session.dialogueId);
295 if (!tree)
298 if (!tree)
@@ -298,9 +301,38 @@ export class QuestRuntime
298 return { ok: true, events: [{ type: "dialogueClose", reason: "missing" }] };
301 return { ok: true, events: [{ type: "dialogueClose", reason: "missing" }] };
299 }
302 }
300 const playerView = this.playerViewFor(characterId);
303 const playerView = this.playerViewFor(characterId);
301 const exit = session.pendingExit ?? { kind: "end" };
302 const events = [];
304 const events = [];
303
305
306 if (session.phase === "lines")
307 {
308 const step = tree.steps.find((s) => s.stepId === session.stepId);
309 const rewardMessages = this.#grantStepItemRewards(
310 characterId,
311 step,
312 events
313 );
314 this.#reevaluateQuests(characterId, playerView, events);
315 if (rewardMessages.length > 0)
316 {
317 session.phase = "rewards";
318 events.push({
319 type: "dialogueItemRewards",
320 dialogueId: session.dialogueId,
321 stepId: session.stepId,
322 npcEntityId: session.entityId,
323 messages: rewardMessages
324 });
325 return { ok: true, events };
326 }
327 }
328
329 return this.#resolveDialogueExit(characterId, session, tree, playerView, events);
330 }
331
332 #resolveDialogueExit (characterId, session, tree, playerView, events)
333 {
334 const exit = session.pendingExit ?? { kind: "end" };
335
304 if (exit.kind === "branches")
336 if (exit.kind === "branches")
305 {
337 {
306 const ctx = this.buildConditionContext(characterId, playerView);
338 const ctx = this.buildConditionContext(characterId, playerView);
@@ -356,6 +388,65 @@ export class QuestRuntime
356 return { ok: true, events };
388 return { ok: true, events };
357 }
389 }
358
390
391 /**
392 * Grant step.itemRewards into bag (overflow → bank/vault). Returns player-facing notices.
393 */
394 #grantStepItemRewards (characterId, step, events)
395 {
396 const rewards = step?.itemRewards ?? [];
397 if (!rewards.length)
398 { return []; }
399 const bagParts = [];
400 const bankParts = [];
401 for (const reward of rewards)
402 {
403 const bag = this.#loadBag(characterId);
404 if (!bag)
405 { continue; }
406 const itemId = reward.itemId | 0;
407 const def = itemDefinition(itemId);
408 const quantity = Math.max(1, Number(reward.quantity) || 1);
409 const displayName = def?.displayName ?? `Item ${itemId}`;
410 const stack = attachOrigins({
411 itemId,
412 quantity,
413 origins: [{ origin: godsOrigin(), quantity }]
414 });
415 const result = insertStack(bag.inventory, stack, def);
416 bag.inventory = result.slots;
417 const intoBag = quantity - Math.max(0, result.remainder | 0);
418 let intoBank = 0;
419 if (result.remainder > 0)
420 {
421 const vaultResult = insertStackGrowable(
422 bag.vault,
423 attachOrigins({
424 itemId,
425 quantity: result.remainder,
426 origins: [{ origin: godsOrigin(), quantity: result.remainder }]
427 }),
428 def
429 );
430 bag.vault = vaultResult.slots;
431 intoBank = (result.remainder | 0) - Math.max(0, vaultResult.remainder | 0);
432 }
433 this.#persistBag(characterId, bag);
434 events.push({ type: "inventoryDirty" });
435 if (intoBag > 0)
436 { bagParts.push({ displayName, quantity: intoBag }); }
437 if (intoBank > 0)
438 { bankParts.push({ displayName, quantity: intoBank }); }
439 }
440 const messages = [];
441 const bagMsg = formatDialogueRewardMessage(bagParts, "bag");
442 const bankMsg = formatDialogueRewardMessage(bankParts, "bank");
443 if (bagMsg)
444 { messages.push(bagMsg); }
445 if (bankMsg)
446 { messages.push(bankMsg); }
447 return messages;
448 }
449
359 #loadBag (characterId)
450 #loadBag (characterId)
360 {
451 {
361 const onlineId = this.simulation.characterEntities.get(characterId | 0);
452 const onlineId = this.simulation.characterEntities.get(characterId | 0);
server/src/simulation/simulation.js +12 −0
@@ -1583,6 +1583,18 @@ export class Simulation
1583 1583 triggers: event.triggers
1584 1584 });
1585 1585 }
1586 else if (event.type === "dialogueItemRewards")
1587 {
1588 out.push({
1589 type: "dialogue-item-rewards",
1590 sessionId: sid,
1591 characterId: cid,
1592 dialogueId: event.dialogueId,
1593 stepId: event.stepId,
1594 npcEntityId: event.npcEntityId,
1595 messages: event.messages ?? []
1596 });
1597 }
1586 1598 else if (event.type === "dialogueClose")
1587 1599 {
1588 1600 if (event.npcEntityId != null && cid != null)
@@ -1583,6 +1583,18 @@ export class Simulation
1583 triggers: event.triggers
1583 triggers: event.triggers
1584 });
1584 });
1585 }
1585 }
1586 else if (event.type === "dialogueItemRewards")
1587 {
1588 out.push({
1589 type: "dialogue-item-rewards",
1590 sessionId: sid,
1591 characterId: cid,
1592 dialogueId: event.dialogueId,
1593 stepId: event.stepId,
1594 npcEntityId: event.npcEntityId,
1595 messages: event.messages ?? []
1596 });
1597 }
1586 else if (event.type === "dialogueClose")
1598 else if (event.type === "dialogueClose")
1587 {
1599 {
1588 if (event.npcEntityId != null && cid != null)
1600 if (event.npcEntityId != null && cid != null)
server/tests/quests-conditions.test.js +34 −0
@@ -6,6 +6,7 @@ import {
6 6 ConditionKind
7 7 } from "../../shared/quests/conditions.js";
8 8 import { normalizeQuestDef, normalizeDialogueTree } from "../../shared/quests/normalize.js";
9 import { formatDialogueRewardMessage } from "../../shared/quests/dialogueRewards.js";
9 10
10 11 test("ConditionSet AND + NOT", () =>
11 12 {
@@ -43,10 +44,43 @@ test("normalize quest and dialogue", () =>
43 44 steps: [{
44 45 stepId: "hi",
45 46 lines: [{ speaker: "npc", text: "Hello" }],
47 itemRewards: [
48 { itemId: 10, quantity: 2 },
49 { itemId: 10, quantity: 9 },
50 { itemId: 0, quantity: 1 }
51 ],
46 52 exit: { kind: "end" }
47 53 }]
48 54 });
49 55 assert.equal(tree.dialogueId, "smith");
50 56 assert.equal(tree.unique, true);
51 57 assert.equal(tree.steps[0].exit.kind, "end");
58 assert.deepEqual(tree.steps[0].itemRewards, [{ itemId: 10, quantity: 2 }]);
59 });
60
61 test("dialogue reward messages bag vs bank and lists", () =>
62 {
63 assert.equal(
64 formatDialogueRewardMessage([{ displayName: "Tin ore", quantity: 1 }], "bag"),
65 "Tin ore has been added to your bag."
66 );
67 assert.equal(
68 formatDialogueRewardMessage([{ displayName: "Tin ore", quantity: 3 }], "bank"),
69 "3 Tin ore have been sent to your bank."
70 );
71 assert.equal(
72 formatDialogueRewardMessage([
73 { displayName: "Tin ore", quantity: 1 },
74 { displayName: "Copper ore", quantity: 1 }
75 ], "bag"),
76 "Tin ore and Copper ore have been added to your bag."
77 );
78 assert.equal(
79 formatDialogueRewardMessage([
80 { displayName: "A", quantity: 1 },
81 { displayName: "B", quantity: 1 },
82 { displayName: "C", quantity: 1 }
83 ], "bag"),
84 "A, B and C have been added to your bag."
85 );
52 86 });
@@ -6,6 +6,7 @@ import {
6 ConditionKind
6 ConditionKind
7} from "../../shared/quests/conditions.js";
7} from "../../shared/quests/conditions.js";
8import { normalizeQuestDef, normalizeDialogueTree } from "../../shared/quests/normalize.js";
8import { normalizeQuestDef, normalizeDialogueTree } from "../../shared/quests/normalize.js";
9import { formatDialogueRewardMessage } from "../../shared/quests/dialogueRewards.js";
9
10
10test("ConditionSet AND + NOT", () =>
11test("ConditionSet AND + NOT", () =>
11{
12{
@@ -43,10 +44,43 @@ test("normalize quest and dialogue", () =>
43 steps: [{
44 steps: [{
44 stepId: "hi",
45 stepId: "hi",
45 lines: [{ speaker: "npc", text: "Hello" }],
46 lines: [{ speaker: "npc", text: "Hello" }],
47 itemRewards: [
48 { itemId: 10, quantity: 2 },
49 { itemId: 10, quantity: 9 },
50 { itemId: 0, quantity: 1 }
51 ],
46 exit: { kind: "end" }
52 exit: { kind: "end" }
47 }]
53 }]
48 });
54 });
49 assert.equal(tree.dialogueId, "smith");
55 assert.equal(tree.dialogueId, "smith");
50 assert.equal(tree.unique, true);
56 assert.equal(tree.unique, true);
51 assert.equal(tree.steps[0].exit.kind, "end");
57 assert.equal(tree.steps[0].exit.kind, "end");
58 assert.deepEqual(tree.steps[0].itemRewards, [{ itemId: 10, quantity: 2 }]);
59});
60
61test("dialogue reward messages bag vs bank and lists", () =>
62{
63 assert.equal(
64 formatDialogueRewardMessage([{ displayName: "Tin ore", quantity: 1 }], "bag"),
65 "Tin ore has been added to your bag."
66 );
67 assert.equal(
68 formatDialogueRewardMessage([{ displayName: "Tin ore", quantity: 3 }], "bank"),
69 "3 Tin ore have been sent to your bank."
70 );
71 assert.equal(
72 formatDialogueRewardMessage([
73 { displayName: "Tin ore", quantity: 1 },
74 { displayName: "Copper ore", quantity: 1 }
75 ], "bag"),
76 "Tin ore and Copper ore have been added to your bag."
77 );
78 assert.equal(
79 formatDialogueRewardMessage([
80 { displayName: "A", quantity: 1 },
81 { displayName: "B", quantity: 1 },
82 { displayName: "C", quantity: 1 }
83 ], "bag"),
84 "A, B and C have been added to your bag."
85 );
52});
86});
shared/protocol/constants.js +1 −0
@@ -273,6 +273,7 @@ export const MessageType = Object.freeze({
273 273 dialogueAdvance: "DIALOGUE_ADVANCE",
274 274 closeDialogue: "CLOSE_DIALOGUE",
275 275 dialogueChoices: "DIALOGUE_CHOICES",
276 dialogueItemRewards: "DIALOGUE_ITEM_REWARDS",
276 277 requestQuests: "REQUEST_QUESTS",
277 278 questsSnapshot: "QUESTS_SNAPSHOT",
278 279 questStepComplete: "QUEST_STEP_COMPLETE"
@@ -273,6 +273,7 @@ export const MessageType = Object.freeze({
273 dialogueAdvance: "DIALOGUE_ADVANCE",
273 dialogueAdvance: "DIALOGUE_ADVANCE",
274 closeDialogue: "CLOSE_DIALOGUE",
274 closeDialogue: "CLOSE_DIALOGUE",
275 dialogueChoices: "DIALOGUE_CHOICES",
275 dialogueChoices: "DIALOGUE_CHOICES",
276 dialogueItemRewards: "DIALOGUE_ITEM_REWARDS",
276 requestQuests: "REQUEST_QUESTS",
277 requestQuests: "REQUEST_QUESTS",
277 questsSnapshot: "QUESTS_SNAPSHOT",
278 questsSnapshot: "QUESTS_SNAPSHOT",
278 questStepComplete: "QUEST_STEP_COMPLETE"
279 questStepComplete: "QUEST_STEP_COMPLETE"
shared/quests/dialogueRewards.js added +29 −0
@@ -0,0 +1,29 @@
1 /**
2 * Format dialogue step item-reward notices (bag vs bank).
3 * @param {{ displayName: string, quantity: number }[]} items
4 * @param {"bag" | "bank"} destination
5 */
6 export function formatDialogueRewardMessage (items, destination)
7 {
8 const list = (Array.isArray(items) ? items : [])
9 .filter((entry) => entry && entry.displayName);
10 if (!list.length)
11 { return null; }
12 const labels = list.map((entry) =>
13 {
14 const qty = Math.max(1, Number(entry.quantity) || 1);
15 const name = String(entry.displayName);
16 return qty > 1 ? `${qty} ${name}` : name;
17 });
18 const subject = labels.length === 1
19 ? labels[0]
20 : labels.length === 2
21 ? `${labels[0]} and ${labels[1]}`
22 : `${labels.slice(0, -1).join(", ")} and ${labels[labels.length - 1]}`;
23 const plural = labels.length > 1 || (list[0].quantity | 0) > 1;
24 const verb = plural ? "have" : "has";
25 const where = destination === "bank"
26 ? "sent to your bank"
27 : "added to your bag";
28 return `${subject} ${verb} been ${where}.`;
29 }
@@ -0,0 +1,29 @@
1/**
2 * Format dialogue step item-reward notices (bag vs bank).
3 * @param {{ displayName: string, quantity: number }[]} items
4 * @param {"bag" | "bank"} destination
5 */
6export function formatDialogueRewardMessage (items, destination)
7{
8 const list = (Array.isArray(items) ? items : [])
9 .filter((entry) => entry && entry.displayName);
10 if (!list.length)
11 { return null; }
12 const labels = list.map((entry) =>
13 {
14 const qty = Math.max(1, Number(entry.quantity) || 1);
15 const name = String(entry.displayName);
16 return qty > 1 ? `${qty} ${name}` : name;
17 });
18 const subject = labels.length === 1
19 ? labels[0]
20 : labels.length === 2
21 ? `${labels[0]} and ${labels[1]}`
22 : `${labels.slice(0, -1).join(", ")} and ${labels[labels.length - 1]}`;
23 const plural = labels.length > 1 || (list[0].quantity | 0) > 1;
24 const verb = plural ? "have" : "has";
25 const where = destination === "bank"
26 ? "sent to your bank"
27 : "added to your bag";
28 return `${subject} ${verb} been ${where}.`;
29}
shared/quests/normalize.js +24 −0
@@ -84,10 +84,34 @@ function normalizeDialogueStep (raw, index)
84 84 stepId,
85 85 label: String(raw?.label ?? stepId).trim().slice(0, 80) || stepId,
86 86 lines: lines.length > 0 ? lines : [{ speaker: "npc", text: "…", effects: [] }],
87 itemRewards: normalizeItemRewards(raw?.itemRewards),
87 88 exit
88 89 };
89 90 }
90 91
92 /** Step-level gifts granted after all lines are read, before exit triggers/branches. */
93 function normalizeItemRewards (raw)
94 {
95 if (!Array.isArray(raw))
96 { return []; }
97 const out = [];
98 const seen = new Set();
99 for (const entry of raw)
100 {
101 if (!entry || typeof entry !== "object")
102 { continue; }
103 const itemId = Number(entry.itemId);
104 if (!Number.isFinite(itemId) || itemId <= 0 || seen.has(itemId))
105 { continue; }
106 seen.add(itemId);
107 out.push({
108 itemId: itemId | 0,
109 quantity: Math.max(1, Math.min(99_999, Number(entry.quantity) || 1)) | 0
110 });
111 }
112 return out;
113 }
114
91 115 function normalizeDialogueLine (raw)
92 116 {
93 117 if (!raw || typeof raw !== "object")
@@ -84,10 +84,34 @@ function normalizeDialogueStep (raw, index)
84 stepId,
84 stepId,
85 label: String(raw?.label ?? stepId).trim().slice(0, 80) || stepId,
85 label: String(raw?.label ?? stepId).trim().slice(0, 80) || stepId,
86 lines: lines.length > 0 ? lines : [{ speaker: "npc", text: "…", effects: [] }],
86 lines: lines.length > 0 ? lines : [{ speaker: "npc", text: "…", effects: [] }],
87 itemRewards: normalizeItemRewards(raw?.itemRewards),
87 exit
88 exit
88 };
89 };
89}
90}
90
91
92/** Step-level gifts granted after all lines are read, before exit triggers/branches. */
93function normalizeItemRewards (raw)
94{
95 if (!Array.isArray(raw))
96 { return []; }
97 const out = [];
98 const seen = new Set();
99 for (const entry of raw)
100 {
101 if (!entry || typeof entry !== "object")
102 { continue; }
103 const itemId = Number(entry.itemId);
104 if (!Number.isFinite(itemId) || itemId <= 0 || seen.has(itemId))
105 { continue; }
106 seen.add(itemId);
107 out.push({
108 itemId: itemId | 0,
109 quantity: Math.max(1, Math.min(99_999, Number(entry.quantity) || 1)) | 0
110 });
111 }
112 return out;
113}
114
91function normalizeDialogueLine (raw)
115function normalizeDialogueLine (raw)
92{
116{
93 if (!raw || typeof raw !== "object")
117 if (!raw || typeof raw !== "object")