BlueGit

timfa questward

Show the current dialogue speaker’s name in the panel title.

NPC lines keep the NPC name; player lines use the local player name.

timfa Tim Falken · pushed by timfa

Authored 2026-08-30 · 2 months ago

Hash
654800b9f5ad475403fdc4c0d1ca6543cef3aeb2
Parent
cb48b6ea
1 file changed +10 −7
client/src/play/dialogue.js +10 −7
@@ -55,31 +55,34 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
55 55 return canvas;
56 56 }
57 57
58 function npcDisplayName ()
58 function entityDisplayName (speaker)
59 59 {
60 const entity = speakerEntity("npc");
60 const entity = speakerEntity(speaker);
61 61 const first = (entity?.firstName ?? "").trim();
62 62 const last = (entity?.lastName ?? "").trim();
63 63 if (first && last)
64 64 { return `${first} ${last}`; }
65 return first || "…";
65 if (first)
66 { return first; }
67 return speaker === "player" ? "You" : "…";
66 68 }
67 69
68 70 function renderLine ()
69 71 {
70 72 if (!current)
71 73 { return; }
74 const line = current.lines[current.lineIndex];
75 const speaker = line?.speaker === "player" ? "player" : "npc";
72 76 if (titleEl)
73 { titleEl.textContent = npcDisplayName(); }
77 { titleEl.textContent = entityDisplayName(speaker); }
74 78 linesEl?.replaceChildren();
75 79 triggersEl?.replaceChildren();
76 80
77 const line = current.lines[current.lineIndex];
78 81 if (line)
79 82 {
80 83 const row = document.createElement("div");
81 row.className = `dialogue-line dialogue-line-${line.speaker === "player" ? "player" : "npc"}`;
82 row.append(speakerIconCanvas(line.speaker === "player" ? "player" : "npc"));
84 row.className = `dialogue-line dialogue-line-${speaker}`;
85 row.append(speakerIconCanvas(speaker));
83 86 const text = document.createElement("span");
84 87 text.className = "dialogue-line-text";
85 88 text.textContent = line.text ?? "";
@@ -55,31 +55,34 @@ export function initDialogue ({ socket, MessageType, getEntity, captureSpeakerIc
55 return canvas;
55 return canvas;
56 }
56 }
57
57
58 function npcDisplayName ()
58 function entityDisplayName (speaker)
59 {
59 {
60 const entity = speakerEntity("npc");
60 const entity = speakerEntity(speaker);
61 const first = (entity?.firstName ?? "").trim();
61 const first = (entity?.firstName ?? "").trim();
62 const last = (entity?.lastName ?? "").trim();
62 const last = (entity?.lastName ?? "").trim();
63 if (first && last)
63 if (first && last)
64 { return `${first} ${last}`; }
64 { return `${first} ${last}`; }
65 return first || "…";
65 if (first)
66 { return first; }
67 return speaker === "player" ? "You" : "…";
66 }
68 }
67
69
68 function renderLine ()
70 function renderLine ()
69 {
71 {
70 if (!current)
72 if (!current)
71 { return; }
73 { return; }
74 const line = current.lines[current.lineIndex];
75 const speaker = line?.speaker === "player" ? "player" : "npc";
72 if (titleEl)
76 if (titleEl)
73 { titleEl.textContent = npcDisplayName(); }
77 { titleEl.textContent = entityDisplayName(speaker); }
74 linesEl?.replaceChildren();
78 linesEl?.replaceChildren();
75 triggersEl?.replaceChildren();
79 triggersEl?.replaceChildren();
76
80
77 const line = current.lines[current.lineIndex];
78 if (line)
81 if (line)
79 {
82 {
80 const row = document.createElement("div");
83 const row = document.createElement("div");
81 row.className = `dialogue-line dialogue-line-${line.speaker === "player" ? "player" : "npc"}`;
84 row.className = `dialogue-line dialogue-line-${speaker}`;
82 row.append(speakerIconCanvas(line.speaker === "player" ? "player" : "npc"));
85 row.append(speakerIconCanvas(speaker));
83 const text = document.createElement("span");
86 const text = document.createElement("span");
84 text.className = "dialogue-line-text";
87 text.className = "dialogue-line-text";
85 text.textContent = line.text ?? "";
88 text.textContent = line.text ?? "";