BlueGit

timfa questward

Show skill/spell combat meta in UI and label ash by who lit the fire.

Skills list equipment bonuses; spells show tier and mind power. Campfire ash origins name the wood and the lighter.

timfa Tim Falken · pushed by timfa

Authored 2026-08-30 · 2 months ago

Hash
fc70704926bbe8ba90c08fcc30cb8f0f37a0aa6c
Parent
56eb6616
10 files changed +147 −18
client/src/play/main.js +12 −1
@@ -1375,7 +1375,16 @@ async function main ()
1375 1375 return you.split("(")[0].trim() || "Unknown";
1376 1376 }
1377 1377 });
1378 skills = initSkills();
1378 skills = initSkills({
1379 getEquipmentSlots ()
1380 {
1381 return inventory?.getEquipment?.() ?? {};
1382 },
1383 getSettings ()
1384 {
1385 return view?.settings ?? null;
1386 }
1387 });
1379 1388 spells = initSpells({
1380 1389 socket: { send (payload) { socket.send(payload); } },
1381 1390 MessageType
@@ -1583,6 +1592,7 @@ async function main ()
1583 1592 break;
1584 1593 case MessageType.inventory:
1585 1594 inventory?.handleInventory(message);
1595 skills?.refresh?.();
1586 1596 crafting?.refresh();
1587 1597 alchemy?.refresh();
1588 1598 shop?.refresh();
@@ -1667,6 +1677,7 @@ async function main ()
1667 1677 view.setWorldSeason(message.worldTime?.season);
1668 1678 chat?.syncSettings();
1669 1679 }
1680 skills?.refresh?.();
1670 1681 toasts?.applyRestartStatus?.(message.restartStatus);
1671 1682 break;
1672 1683 case MessageType.restartStatus:
@@ -1375,7 +1375,16 @@ async function main ()
1375 return you.split("(")[0].trim() || "Unknown";
1375 return you.split("(")[0].trim() || "Unknown";
1376 }
1376 }
1377 });
1377 });
1378 skills = initSkills();
1378 skills = initSkills({
1379 getEquipmentSlots ()
1380 {
1381 return inventory?.getEquipment?.() ?? {};
1382 },
1383 getSettings ()
1384 {
1385 return view?.settings ?? null;
1386 }
1387 });
1379 spells = initSpells({
1388 spells = initSpells({
1380 socket: { send (payload) { socket.send(payload); } },
1389 socket: { send (payload) { socket.send(payload); } },
1381 MessageType
1390 MessageType
@@ -1583,6 +1592,7 @@ async function main ()
1583 break;
1592 break;
1584 case MessageType.inventory:
1593 case MessageType.inventory:
1585 inventory?.handleInventory(message);
1594 inventory?.handleInventory(message);
1595 skills?.refresh?.();
1586 crafting?.refresh();
1596 crafting?.refresh();
1587 alchemy?.refresh();
1597 alchemy?.refresh();
1588 shop?.refresh();
1598 shop?.refresh();
@@ -1667,6 +1677,7 @@ async function main ()
1667 view.setWorldSeason(message.worldTime?.season);
1677 view.setWorldSeason(message.worldTime?.season);
1668 chat?.syncSettings();
1678 chat?.syncSettings();
1669 }
1679 }
1680 skills?.refresh?.();
1670 toasts?.applyRestartStatus?.(message.restartStatus);
1681 toasts?.applyRestartStatus?.(message.restartStatus);
1671 break;
1682 break;
1672 case MessageType.restartStatus:
1683 case MessageType.restartStatus:
client/src/play/skills.js +23 −4
@@ -1,4 +1,6 @@
1 export function initSkills ()
1 import { equipmentBonusesFromSlots } from "/shared/equipment/stats.js";
2
3 export function initSkills ({ getEquipmentSlots, getSettings } = {})
2 4 {
3 5 const panel = document.getElementById("skills-panel");
4 6 const list = document.getElementById("skills-list");
@@ -6,20 +8,36 @@ export function initSkills ()
6 8 document.getElementById("skills-toggle").addEventListener("click", () =>
7 9 {
8 10 panel.hidden = !panel.hidden;
11 if (!panel.hidden)
12 { render(current); }
9 13 });
10 14
15 function equipmentBonuses ()
16 {
17 return equipmentBonusesFromSlots(
18 getEquipmentSlots?.() ?? {},
19 getSettings?.() ?? null
20 );
21 }
22
11 23 function render (skills)
12 24 {
13 25 current = skills ?? [];
26 const bonuses = equipmentBonuses();
14 27 list.replaceChildren();
15 28 for (const skill of current)
16 29 {
17 list.append(renderSkillRow(skill));
30 list.append(renderSkillRow(skill, bonuses[skill.skillId] | 0));
18 31 }
19 32 }
20 33
21 34 return {
22 35 render,
36 refresh ()
37 {
38 if (current.length)
39 { render(current); }
40 },
23 41 skillLevel (skillId)
24 42 {
25 43 return current.find((entry) => entry.skillId === skillId)?.level ?? 1;
@@ -31,7 +49,7 @@ export function initSkills ()
31 49 };
32 50 }
33 51
34 function renderSkillRow (skill)
52 function renderSkillRow (skill, bonus)
35 53 {
36 54 const row = document.createElement("div");
37 55 row.className = "skill-row";
@@ -47,7 +65,8 @@ function renderSkillRow (skill)
47 65
48 66 const title = document.createElement("div");
49 67 title.className = "skill-title";
50 title.textContent = `${skill.displayName} — Level ${skill.level}`;
68 const bonusText = bonus > 0 ? ` (+${bonus})` : "";
69 title.textContent = `${skill.displayName} — Level ${skill.level}${bonusText}`;
51 70
52 71 const track = document.createElement("div");
53 72 track.className = "skill-xp-track";
@@ -1,4 +1,6 @@
1export function initSkills ()
1import { equipmentBonusesFromSlots } from "/shared/equipment/stats.js";
2
3export function initSkills ({ getEquipmentSlots, getSettings } = {})
2{
4{
3 const panel = document.getElementById("skills-panel");
5 const panel = document.getElementById("skills-panel");
4 const list = document.getElementById("skills-list");
6 const list = document.getElementById("skills-list");
@@ -6,20 +8,36 @@ export function initSkills ()
6 document.getElementById("skills-toggle").addEventListener("click", () =>
8 document.getElementById("skills-toggle").addEventListener("click", () =>
7 {
9 {
8 panel.hidden = !panel.hidden;
10 panel.hidden = !panel.hidden;
11 if (!panel.hidden)
12 { render(current); }
9 });
13 });
10
14
15 function equipmentBonuses ()
16 {
17 return equipmentBonusesFromSlots(
18 getEquipmentSlots?.() ?? {},
19 getSettings?.() ?? null
20 );
21 }
22
11 function render (skills)
23 function render (skills)
12 {
24 {
13 current = skills ?? [];
25 current = skills ?? [];
26 const bonuses = equipmentBonuses();
14 list.replaceChildren();
27 list.replaceChildren();
15 for (const skill of current)
28 for (const skill of current)
16 {
29 {
17 list.append(renderSkillRow(skill));
30 list.append(renderSkillRow(skill, bonuses[skill.skillId] | 0));
18 }
31 }
19 }
32 }
20
33
21 return {
34 return {
22 render,
35 render,
36 refresh ()
37 {
38 if (current.length)
39 { render(current); }
40 },
23 skillLevel (skillId)
41 skillLevel (skillId)
24 {
42 {
25 return current.find((entry) => entry.skillId === skillId)?.level ?? 1;
43 return current.find((entry) => entry.skillId === skillId)?.level ?? 1;
@@ -31,7 +49,7 @@ export function initSkills ()
31 };
49 };
32}
50}
33
51
34function renderSkillRow (skill)
52function renderSkillRow (skill, bonus)
35{
53{
36 const row = document.createElement("div");
54 const row = document.createElement("div");
37 row.className = "skill-row";
55 row.className = "skill-row";
@@ -47,7 +65,8 @@ function renderSkillRow (skill)
47
65
48 const title = document.createElement("div");
66 const title = document.createElement("div");
49 title.className = "skill-title";
67 title.className = "skill-title";
50 title.textContent = `${skill.displayName} — Level ${skill.level}`;
68 const bonusText = bonus > 0 ? ` (+${bonus})` : "";
69 title.textContent = `${skill.displayName} — Level ${skill.level}${bonusText}`;
51
70
52 const track = document.createElement("div");
71 const track = document.createElement("div");
53 track.className = "skill-xp-track";
72 track.className = "skill-xp-track";
client/src/play/spells.js +17 −2
@@ -1,3 +1,8 @@
1 /**
2 * Play spells panel: known spells, favourites bar, arm / cast intents.
3 */
4 import { spellMindPowerFromTier } from "/shared/definitions/spells.js";
5
1 6 export function initSpells ({ socket, MessageType })
2 7 {
3 8 const panel = document.getElementById("spells-panel");
@@ -68,8 +73,18 @@ export function initSpells ({ socket, MessageType })
68 73 body.className = "spell-body";
69 74
70 75 const title = document.createElement("div");
71 title.className = "spell-title";
72 title.textContent = spell.displayName;
76 title.className = "spell-title-row";
77 const name = document.createElement("span");
78 name.className = "spell-title";
79 name.textContent = spell.displayName;
80 const meta = document.createElement("span");
81 meta.className = "spell-meta";
82 const level = spell.tier | 0 || 1;
83 const power = spell.mindPower != null
84 ? spell.mindPower | 0
85 : spellMindPowerFromTier(level);
86 meta.textContent = `Lv. ${level} Pwr: ${power}`;
87 title.append(name, meta);
73 88
74 89 const desc = document.createElement("div");
75 90 desc.className = "spell-desc hint";
@@ -1,3 +1,8 @@
1/**
2 * Play spells panel: known spells, favourites bar, arm / cast intents.
3 */
4import { spellMindPowerFromTier } from "/shared/definitions/spells.js";
5
1export function initSpells ({ socket, MessageType })
6export function initSpells ({ socket, MessageType })
2{
7{
3 const panel = document.getElementById("spells-panel");
8 const panel = document.getElementById("spells-panel");
@@ -68,8 +73,18 @@ export function initSpells ({ socket, MessageType })
68 body.className = "spell-body";
73 body.className = "spell-body";
69
74
70 const title = document.createElement("div");
75 const title = document.createElement("div");
71 title.className = "spell-title";
76 title.className = "spell-title-row";
72 title.textContent = spell.displayName;
77 const name = document.createElement("span");
78 name.className = "spell-title";
79 name.textContent = spell.displayName;
80 const meta = document.createElement("span");
81 meta.className = "spell-meta";
82 const level = spell.tier | 0 || 1;
83 const power = spell.mindPower != null
84 ? spell.mindPower | 0
85 : spellMindPowerFromTier(level);
86 meta.textContent = `Lv. ${level} Pwr: ${power}`;
87 title.append(name, meta);
73
88
74 const desc = document.createElement("div");
89 const desc = document.createElement("div");
75 desc.className = "spell-desc hint";
90 desc.className = "spell-desc hint";
client/ui/play.css +14 −0
@@ -742,11 +742,25 @@ button.friend-account-name:hover {
742 742 min-width: 0;
743 743 }
744 744
745 .spell-title-row {
746 display: flex;
747 flex-wrap: wrap;
748 align-items: baseline;
749 gap: 0.35rem;
750 min-width: 0;
751 }
752
745 753 .spell-title {
746 754 font-weight: 600;
747 755 color: #eef2f8;
748 756 }
749 757
758 .spell-meta {
759 font-weight: 400;
760 font-size: 0.85rem;
761 color: #9aa3b2;
762 }
763
750 764 .spell-desc {
751 765 margin: 0;
752 766 font-size: 0.86rem;
@@ -742,11 +742,25 @@ button.friend-account-name:hover {
742 min-width: 0;
742 min-width: 0;
743}
743}
744
744
745.spell-title-row {
746 display: flex;
747 flex-wrap: wrap;
748 align-items: baseline;
749 gap: 0.35rem;
750 min-width: 0;
751}
752
745.spell-title {
753.spell-title {
746 font-weight: 600;
754 font-weight: 600;
747 color: #eef2f8;
755 color: #eef2f8;
748}
756}
749
757
758.spell-meta {
759 font-weight: 400;
760 font-size: 0.85rem;
761 color: #9aa3b2;
762}
763
750.spell-desc {
764.spell-desc {
751 margin: 0;
765 margin: 0;
752 font-size: 0.86rem;
766 font-size: 0.86rem;
server/src/firestarting/service.js +27 −6
@@ -17,7 +17,7 @@ import { SkillId, skillLevel } from "../../../shared/definitions/skills.js";
17 17 import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
18 18 import { rollSkill } from "../../../shared/combat/rolls.js";
19 19 import { stackQuantity } from "../../../shared/items/inventory.js";
20 import { attachOrigins } from "../../../shared/items/origin.js";
20 import { attachOrigins, ashOrigin } from "../../../shared/items/origin.js";
21 21 import { addGroundItem, publicGroundItem, removeGroundItem, bagView } from "../items/bags.js";
22 22 import { chebyshev } from "../combat/service.js";
23 23 import { tileToChunk, tileToLocal } from "../world/coordinates.js";
@@ -33,6 +33,13 @@ function userError (message)
33 33 return error;
34 34 }
35 35
36 function characterDisplayName (world, handle)
37 {
38 const appearance = world.ecs.get(handle, Component.appearance);
39 const name = [appearance?.firstName, appearance?.lastName].filter(Boolean).join(" ").trim();
40 return name || "someone";
41 }
42
36 43 function tileKey (tileX, tileY)
37 44 {
38 45 return `${tileX},${tileY}`;
@@ -177,16 +184,20 @@ function consumeOneGroundLog (world, item, events)
177 184 });
178 185 }
179 186
180 function spawnAsh (world, tileX, tileY, woodTier, now, events)
187 function spawnAsh (world, tileX, tileY, woodTier, litByName, now, events)
181 188 {
182 189 const ashItemId = ashItemIdForWood(woodTier);
183 190 if (!ashItemId)
184 191 { return; }
192 const woodName = MATERIAL_DISPLAY_NAME[woodTier] ?? woodTier;
185 193 const groundItemId = (world.nextGroundItemId = (world.nextGroundItemId ?? 1) + 1);
186 194 const stack = attachOrigins({
187 195 itemId: ashItemId,
188 196 quantity: 1,
189 origins: []
197 origins: [{
198 origin: ashOrigin(woodName, litByName),
199 quantity: 1
200 }]
190 201 });
191 202 const item = {
192 203 groundItemId,
@@ -326,20 +337,22 @@ function succeedLight (world, handle, entityId, characterId, session, events, pr
326 337
327 338 consumeOneGroundLog(world, item, events);
328 339 const expiresAt = now + campfireDurationMs(session.woodTier);
340 const litByName = characterDisplayName(world, handle);
329 341 const delta = placeBlock(
330 342 world,
331 343 session.tileX,
332 344 session.tileY,
333 345 BlockType.campfire,
334 346 session.woodTier,
335 { woodTier: session.woodTier, litAt: now, expiresAt }
347 { woodTier: session.woodTier, litAt: now, expiresAt, litByName }
336 348 );
337 349 events.push(delta);
338 350 ensureCampfires(world).set(tileKey(session.tileX, session.tileY), {
339 351 tileX: session.tileX,
340 352 tileY: session.tileY,
341 353 woodTier: session.woodTier,
342 expiresAt
354 expiresAt,
355 litByName
343 356 });
344 357
345 358 const skills = world.ecs.get(handle, Component.skills);
@@ -466,7 +479,15 @@ export function stepCampfireExpires (world, now)
466 479 const delta = clearBlockAt(world, entry.tileX, entry.tileY);
467 480 if (delta)
468 481 { events.push(delta); }
469 spawnAsh(world, entry.tileX, entry.tileY, entry.woodTier, now, events);
482 spawnAsh(
483 world,
484 entry.tileX,
485 entry.tileY,
486 entry.woodTier,
487 entry.litByName,
488 now,
489 events
490 );
470 491 }
471 492 return { events };
472 493 }
@@ -17,7 +17,7 @@ import { SkillId, skillLevel } from "../../../shared/definitions/skills.js";
17import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
17import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
18import { rollSkill } from "../../../shared/combat/rolls.js";
18import { rollSkill } from "../../../shared/combat/rolls.js";
19import { stackQuantity } from "../../../shared/items/inventory.js";
19import { stackQuantity } from "../../../shared/items/inventory.js";
20import { attachOrigins } from "../../../shared/items/origin.js";
20import { attachOrigins, ashOrigin } from "../../../shared/items/origin.js";
21import { addGroundItem, publicGroundItem, removeGroundItem, bagView } from "../items/bags.js";
21import { addGroundItem, publicGroundItem, removeGroundItem, bagView } from "../items/bags.js";
22import { chebyshev } from "../combat/service.js";
22import { chebyshev } from "../combat/service.js";
23import { tileToChunk, tileToLocal } from "../world/coordinates.js";
23import { tileToChunk, tileToLocal } from "../world/coordinates.js";
@@ -33,6 +33,13 @@ function userError (message)
33 return error;
33 return error;
34}
34}
35
35
36function characterDisplayName (world, handle)
37{
38 const appearance = world.ecs.get(handle, Component.appearance);
39 const name = [appearance?.firstName, appearance?.lastName].filter(Boolean).join(" ").trim();
40 return name || "someone";
41}
42
36function tileKey (tileX, tileY)
43function tileKey (tileX, tileY)
37{
44{
38 return `${tileX},${tileY}`;
45 return `${tileX},${tileY}`;
@@ -177,16 +184,20 @@ function consumeOneGroundLog (world, item, events)
177 });
184 });
178}
185}
179
186
180function spawnAsh (world, tileX, tileY, woodTier, now, events)
187function spawnAsh (world, tileX, tileY, woodTier, litByName, now, events)
181{
188{
182 const ashItemId = ashItemIdForWood(woodTier);
189 const ashItemId = ashItemIdForWood(woodTier);
183 if (!ashItemId)
190 if (!ashItemId)
184 { return; }
191 { return; }
192 const woodName = MATERIAL_DISPLAY_NAME[woodTier] ?? woodTier;
185 const groundItemId = (world.nextGroundItemId = (world.nextGroundItemId ?? 1) + 1);
193 const groundItemId = (world.nextGroundItemId = (world.nextGroundItemId ?? 1) + 1);
186 const stack = attachOrigins({
194 const stack = attachOrigins({
187 itemId: ashItemId,
195 itemId: ashItemId,
188 quantity: 1,
196 quantity: 1,
189 origins: []
197 origins: [{
198 origin: ashOrigin(woodName, litByName),
199 quantity: 1
200 }]
190 });
201 });
191 const item = {
202 const item = {
192 groundItemId,
203 groundItemId,
@@ -326,20 +337,22 @@ function succeedLight (world, handle, entityId, characterId, session, events, pr
326
337
327 consumeOneGroundLog(world, item, events);
338 consumeOneGroundLog(world, item, events);
328 const expiresAt = now + campfireDurationMs(session.woodTier);
339 const expiresAt = now + campfireDurationMs(session.woodTier);
340 const litByName = characterDisplayName(world, handle);
329 const delta = placeBlock(
341 const delta = placeBlock(
330 world,
342 world,
331 session.tileX,
343 session.tileX,
332 session.tileY,
344 session.tileY,
333 BlockType.campfire,
345 BlockType.campfire,
334 session.woodTier,
346 session.woodTier,
335 { woodTier: session.woodTier, litAt: now, expiresAt }
347 { woodTier: session.woodTier, litAt: now, expiresAt, litByName }
336 );
348 );
337 events.push(delta);
349 events.push(delta);
338 ensureCampfires(world).set(tileKey(session.tileX, session.tileY), {
350 ensureCampfires(world).set(tileKey(session.tileX, session.tileY), {
339 tileX: session.tileX,
351 tileX: session.tileX,
340 tileY: session.tileY,
352 tileY: session.tileY,
341 woodTier: session.woodTier,
353 woodTier: session.woodTier,
342 expiresAt
354 expiresAt,
355 litByName
343 });
356 });
344
357
345 const skills = world.ecs.get(handle, Component.skills);
358 const skills = world.ecs.get(handle, Component.skills);
@@ -466,7 +479,15 @@ export function stepCampfireExpires (world, now)
466 const delta = clearBlockAt(world, entry.tileX, entry.tileY);
479 const delta = clearBlockAt(world, entry.tileX, entry.tileY);
467 if (delta)
480 if (delta)
468 { events.push(delta); }
481 { events.push(delta); }
469 spawnAsh(world, entry.tileX, entry.tileY, entry.woodTier, now, events);
482 spawnAsh(
483 world,
484 entry.tileX,
485 entry.tileY,
486 entry.woodTier,
487 entry.litByName,
488 now,
489 events
490 );
470 }
491 }
471 return { events };
492 return { events };
472}
493}
server/src/spells/tinders.js +13 −4
@@ -53,7 +53,7 @@ function blockAt (world, tileX, tileY)
53 53 return data.blocks?.[index] ?? null;
54 54 }
55 55
56 function placeCampfire (world, tileX, tileY, woodTier, now)
56 function placeCampfire (world, tileX, tileY, woodTier, litByName, now)
57 57 {
58 58 const chunkX = tileToChunk(tileX);
59 59 const chunkY = tileToChunk(tileY);
@@ -65,7 +65,7 @@ function placeCampfire (world, tileX, tileY, woodTier, now)
65 65 const block = {
66 66 typeId: BlockType.campfire,
67 67 state: woodTier,
68 config: { woodTier, litAt: now, expiresAt }
68 config: { woodTier, litAt: now, expiresAt, litByName }
69 69 };
70 70 data.blocks[index] = block;
71 71 if (!world.campfireExpires)
@@ -74,7 +74,8 @@ function placeCampfire (world, tileX, tileY, woodTier, now)
74 74 tileX,
75 75 tileY,
76 76 woodTier,
77 expiresAt
77 expiresAt,
78 litByName
78 79 });
79 80 return {
80 81 type: "chunk-delta",
@@ -195,7 +196,15 @@ export function applyTindersAtTile (world, impact, now)
195 196 return events;
196 197 }
197 198 consumeOneGroundStack(world, logItem, events);
198 events.push(placeCampfire(world, tileX, tileY, woodTier, now));
199 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
200 const appearance = casterHandle != null
201 ? world.ecs.get(casterHandle, Component.appearance)
202 : null;
203 const litByName = [appearance?.firstName, appearance?.lastName]
204 .filter(Boolean)
205 .join(" ")
206 .trim() || "someone";
207 events.push(placeCampfire(world, tileX, tileY, woodTier, litByName, now));
199 208 return events;
200 209 }
201 210
@@ -53,7 +53,7 @@ function blockAt (world, tileX, tileY)
53 return data.blocks?.[index] ?? null;
53 return data.blocks?.[index] ?? null;
54}
54}
55
55
56function placeCampfire (world, tileX, tileY, woodTier, now)
56function placeCampfire (world, tileX, tileY, woodTier, litByName, now)
57{
57{
58 const chunkX = tileToChunk(tileX);
58 const chunkX = tileToChunk(tileX);
59 const chunkY = tileToChunk(tileY);
59 const chunkY = tileToChunk(tileY);
@@ -65,7 +65,7 @@ function placeCampfire (world, tileX, tileY, woodTier, now)
65 const block = {
65 const block = {
66 typeId: BlockType.campfire,
66 typeId: BlockType.campfire,
67 state: woodTier,
67 state: woodTier,
68 config: { woodTier, litAt: now, expiresAt }
68 config: { woodTier, litAt: now, expiresAt, litByName }
69 };
69 };
70 data.blocks[index] = block;
70 data.blocks[index] = block;
71 if (!world.campfireExpires)
71 if (!world.campfireExpires)
@@ -74,7 +74,8 @@ function placeCampfire (world, tileX, tileY, woodTier, now)
74 tileX,
74 tileX,
75 tileY,
75 tileY,
76 woodTier,
76 woodTier,
77 expiresAt
77 expiresAt,
78 litByName
78 });
79 });
79 return {
80 return {
80 type: "chunk-delta",
81 type: "chunk-delta",
@@ -195,7 +196,15 @@ export function applyTindersAtTile (world, impact, now)
195 return events;
196 return events;
196 }
197 }
197 consumeOneGroundStack(world, logItem, events);
198 consumeOneGroundStack(world, logItem, events);
198 events.push(placeCampfire(world, tileX, tileY, woodTier, now));
199 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
200 const appearance = casterHandle != null
201 ? world.ecs.get(casterHandle, Component.appearance)
202 : null;
203 const litByName = [appearance?.firstName, appearance?.lastName]
204 .filter(Boolean)
205 .join(" ")
206 .trim() || "someone";
207 events.push(placeCampfire(world, tileX, tileY, woodTier, litByName, now));
199 return events;
208 return events;
200 }
209 }
201
210
server/tests/origins.test.js +8 −0
@@ -7,6 +7,7 @@ import
7 7 CraftOriginVerb,
8 8 gatherOrigin,
9 9 lootOrigin,
10 ashOrigin,
10 11 craftOrigin,
11 12 craftOriginVerbForStation,
12 13 royalTreasuryOrigin,
@@ -49,6 +50,13 @@ test("loot origins name the mob and killer", () =>
49 50 }), "Dropped by Rat, slain by Ada Miner.");
50 51 });
51 52
53 test("ash origins name the wood and who lit the fire", () =>
54 {
55 const origin = ashOrigin("Pine", "Ada Miner");
56 assert.equal(origin.kind, ItemOriginKind.ash);
57 assert.equal(originLabel(origin), "From a pine log burnt by Ada Miner");
58 });
59
52 60 test("all coins are minted by the Royal Treasury", () =>
53 61 {
54 62 assert.equal(originLabel(royalTreasuryOrigin()), ROYAL_TREASURY_ORIGIN_LABEL);
@@ -7,6 +7,7 @@ import
7 CraftOriginVerb,
7 CraftOriginVerb,
8 gatherOrigin,
8 gatherOrigin,
9 lootOrigin,
9 lootOrigin,
10 ashOrigin,
10 craftOrigin,
11 craftOrigin,
11 craftOriginVerbForStation,
12 craftOriginVerbForStation,
12 royalTreasuryOrigin,
13 royalTreasuryOrigin,
@@ -49,6 +50,13 @@ test("loot origins name the mob and killer", () =>
49 }), "Dropped by Rat, slain by Ada Miner.");
50 }), "Dropped by Rat, slain by Ada Miner.");
50});
51});
51
52
53test("ash origins name the wood and who lit the fire", () =>
54{
55 const origin = ashOrigin("Pine", "Ada Miner");
56 assert.equal(origin.kind, ItemOriginKind.ash);
57 assert.equal(originLabel(origin), "From a pine log burnt by Ada Miner");
58});
59
52test("all coins are minted by the Royal Treasury", () =>
60test("all coins are minted by the Royal Treasury", () =>
53{
61{
54 assert.equal(originLabel(royalTreasuryOrigin()), ROYAL_TREASURY_ORIGIN_LABEL);
62 assert.equal(originLabel(royalTreasuryOrigin()), ROYAL_TREASURY_ORIGIN_LABEL);
shared/definitions/spells.js +11 −0
@@ -1,4 +1,5 @@
1 1 import { spellDifficultyFromTier } from "../spells/constants.js";
2 import { MATERIAL_TIER_ORDER, tierStatBonus } from "./materialTiers.js";
2 3 import { MagicElement } from "./attackTypes.js";
3 4
4 5 /**
@@ -478,6 +479,16 @@ export function spellDifficulty (spellDef)
478 479 return spellDifficultyFromTier(spellDef?.tier ?? 1);
479 480 }
480 481
482 /**
483 * Display Mind power rating for a spell tier (same numeric curve as gear tier bonuses).
484 * @param {number} tier
485 */
486 export function spellMindPowerFromTier (tier)
487 {
488 const rank = Math.max(1, Math.min(MATERIAL_TIER_ORDER.length, Math.floor(Number(tier) || 1)));
489 return tierStatBonus(MATERIAL_TIER_ORDER[rank - 1]);
490 }
491
481 492 /** Spells that are not starter knowledge and need a spellbook to learn. */
482 493 export function learnableSpellIds ()
483 494 {
@@ -1,4 +1,5 @@
1import { spellDifficultyFromTier } from "../spells/constants.js";
1import { spellDifficultyFromTier } from "../spells/constants.js";
2import { MATERIAL_TIER_ORDER, tierStatBonus } from "./materialTiers.js";
2import { MagicElement } from "./attackTypes.js";
3import { MagicElement } from "./attackTypes.js";
3
4
4/**
5/**
@@ -478,6 +479,16 @@ export function spellDifficulty (spellDef)
478 return spellDifficultyFromTier(spellDef?.tier ?? 1);
479 return spellDifficultyFromTier(spellDef?.tier ?? 1);
479}
480}
480
481
482/**
483 * Display Mind power rating for a spell tier (same numeric curve as gear tier bonuses).
484 * @param {number} tier
485 */
486export function spellMindPowerFromTier (tier)
487{
488 const rank = Math.max(1, Math.min(MATERIAL_TIER_ORDER.length, Math.floor(Number(tier) || 1)));
489 return tierStatBonus(MATERIAL_TIER_ORDER[rank - 1]);
490}
491
481/** Spells that are not starter knowledge and need a spellbook to learn. */
492/** Spells that are not starter knowledge and need a spellbook to learn. */
482export function learnableSpellIds ()
493export function learnableSpellIds ()
483{
494{
shared/items/origin.js +20 −0
@@ -5,6 +5,7 @@ export const ItemOriginKind = Object.freeze({
5 5 gods: "gods",
6 6 loot: "loot",
7 7 minted: "minted",
8 ash: "ash",
8 9 unknown: "unknown"
9 10 });
10 11
@@ -102,6 +103,15 @@ export function originLabel (origin, { lowercaseVerb = false } = {})
102 103 { return label; }
103 104 return label.charAt(0).toLowerCase() + label.slice(1);
104 105 }
106 if (origin.kind === ItemOriginKind.ash)
107 {
108 const wood = (origin.woodName?.trim() || "wood").toLowerCase();
109 const name = origin.displayName?.trim() || "someone";
110 const label = `From a ${wood} log burnt by ${name}`;
111 if (!lowercaseVerb)
112 { return label; }
113 return label.charAt(0).toLowerCase() + label.slice(1);
114 }
105 115 if (origin.kind === ItemOriginKind.gods)
106 116 { return "Received from the gods"; }
107 117 if (origin.kind === ItemOriginKind.minted)
@@ -170,6 +180,16 @@ export function lootOrigin (mobName, killerName)
170 180 };
171 181 }
172 182
183 /** Campfire ash: `From a pine log burnt by Ada`. */
184 export function ashOrigin (woodName, displayName)
185 {
186 return {
187 kind: ItemOriginKind.ash,
188 woodName: String(woodName ?? "").trim() || "wood",
189 displayName: String(displayName ?? "").trim() || "someone"
190 };
191 }
192
173 193 /** Starter gear granted at character creation. */
174 194 export function godsOrigin ()
175 195 {
@@ -5,6 +5,7 @@ export const ItemOriginKind = Object.freeze({
5 gods: "gods",
5 gods: "gods",
6 loot: "loot",
6 loot: "loot",
7 minted: "minted",
7 minted: "minted",
8 ash: "ash",
8 unknown: "unknown"
9 unknown: "unknown"
9});
10});
10
11
@@ -102,6 +103,15 @@ export function originLabel (origin, { lowercaseVerb = false } = {})
102 { return label; }
103 { return label; }
103 return label.charAt(0).toLowerCase() + label.slice(1);
104 return label.charAt(0).toLowerCase() + label.slice(1);
104 }
105 }
106 if (origin.kind === ItemOriginKind.ash)
107 {
108 const wood = (origin.woodName?.trim() || "wood").toLowerCase();
109 const name = origin.displayName?.trim() || "someone";
110 const label = `From a ${wood} log burnt by ${name}`;
111 if (!lowercaseVerb)
112 { return label; }
113 return label.charAt(0).toLowerCase() + label.slice(1);
114 }
105 if (origin.kind === ItemOriginKind.gods)
115 if (origin.kind === ItemOriginKind.gods)
106 { return "Received from the gods"; }
116 { return "Received from the gods"; }
107 if (origin.kind === ItemOriginKind.minted)
117 if (origin.kind === ItemOriginKind.minted)
@@ -170,6 +180,16 @@ export function lootOrigin (mobName, killerName)
170 };
180 };
171}
181}
172
182
183/** Campfire ash: `From a pine log burnt by Ada`. */
184export function ashOrigin (woodName, displayName)
185{
186 return {
187 kind: ItemOriginKind.ash,
188 woodName: String(woodName ?? "").trim() || "wood",
189 displayName: String(displayName ?? "").trim() || "someone"
190 };
191}
192
173/** Starter gear granted at character creation. */
193/** Starter gear granted at character creation. */
174export function godsOrigin ()
194export function godsOrigin ()
175{
195{
shared/spells/state.js +2 −1
@@ -1,4 +1,4 @@
1 import { SpellId, spellDefinition } from "../definitions/spells.js";
1 import { SpellId, spellDefinition, spellMindPowerFromTier } from "../definitions/spells.js";
2 2 import { MAX_FAVORITE_SPELLS } from "./constants.js";
3 3 import { skillLevel } from "../definitions/skills.js";
4 4 import { SkillId } from "../definitions/skills.js";
@@ -141,6 +141,7 @@ export function publicSpellsView (spells, skills)
141 141 spellId,
142 142 displayName: def?.displayName ?? spellId,
143 143 tier: def?.tier ?? 1,
144 mindPower: spellMindPowerFromTier(def?.tier ?? 1),
144 145 description: def?.description ?? "",
145 146 target: def?.target ?? "tile",
146 147 autoRepeat: !!def?.autoRepeat,
@@ -1,4 +1,4 @@
1import { SpellId, spellDefinition } from "../definitions/spells.js";
1import { SpellId, spellDefinition, spellMindPowerFromTier } from "../definitions/spells.js";
2import { MAX_FAVORITE_SPELLS } from "./constants.js";
2import { MAX_FAVORITE_SPELLS } from "./constants.js";
3import { skillLevel } from "../definitions/skills.js";
3import { skillLevel } from "../definitions/skills.js";
4import { SkillId } from "../definitions/skills.js";
4import { SkillId } from "../definitions/skills.js";
@@ -141,6 +141,7 @@ export function publicSpellsView (spells, skills)
141 spellId,
141 spellId,
142 displayName: def?.displayName ?? spellId,
142 displayName: def?.displayName ?? spellId,
143 tier: def?.tier ?? 1,
143 tier: def?.tier ?? 1,
144 mindPower: spellMindPowerFromTier(def?.tier ?? 1),
144 description: def?.description ?? "",
145 description: def?.description ?? "",
145 target: def?.target ?? "tile",
146 target: def?.target ?? "tile",
146 autoRepeat: !!def?.autoRepeat,
147 autoRepeat: !!def?.autoRepeat,