BlueGit

timfa questward

Label burnt food as Ruined by the cook instead of Made by.

timfa Tim Falken · pushed by timfa

Authored 2026-08-30 · 2 months ago

Hash
96d30a7312136fbd53f44cda648d3f9b1271ca17
Parent
fc707049
4 files changed +45 −27
server/src/crafting/service.js +3 −2
@@ -18,7 +18,8 @@ import
18 18 {
19 19 attachOrigins,
20 20 craftOrigin,
21 craftOriginVerbForStation
21 craftOriginVerbForStation,
22 CraftOriginVerb
22 23 } from "../../../shared/items/origin.js";
23 24 import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
24 25 import { bagView } from "../items/bags.js";
@@ -397,7 +398,7 @@ export function stepCrafting (world, now)
397 398 const outDef = itemDefinition(outSpec.itemId);
398 399 const outQty = Math.max(1, outSpec.quantity | 0 || 1);
399 400 const origin = craftOrigin(
400 craftOriginVerbForStation(session.stationId),
401 burned ? CraftOriginVerb.ruined : craftOriginVerbForStation(session.stationId),
401 402 characterDisplayName(world, handle)
402 403 );
403 404 const outStack = {
@@ -18,7 +18,8 @@ import
18 {
18 {
19 attachOrigins,
19 attachOrigins,
20 craftOrigin,
20 craftOrigin,
21 craftOriginVerbForStation
21 craftOriginVerbForStation,
22 CraftOriginVerb
22 } from "../../../shared/items/origin.js";
23 } from "../../../shared/items/origin.js";
23import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
24import { applySkillXp, publicSkillsView, storedSkillXp } from "../../../shared/skills/state.js";
24import { bagView } from "../items/bags.js";
25import { bagView } from "../items/bags.js";
@@ -397,7 +398,7 @@ export function stepCrafting (world, now)
397 const outDef = itemDefinition(outSpec.itemId);
398 const outDef = itemDefinition(outSpec.itemId);
398 const outQty = Math.max(1, outSpec.quantity | 0 || 1);
399 const outQty = Math.max(1, outSpec.quantity | 0 || 1);
399 const origin = craftOrigin(
400 const origin = craftOrigin(
400 craftOriginVerbForStation(session.stationId),
401 burned ? CraftOriginVerb.ruined : craftOriginVerbForStation(session.stationId),
401 characterDisplayName(world, handle)
402 characterDisplayName(world, handle)
402 );
403 );
403 const outStack = {
404 const outStack = {
server/src/spells/tinders.js +23 −8
@@ -10,13 +10,13 @@ import { rollSkill } from "../../../shared/combat/rolls.js";
10 10 import { firestartingDifficulty, campfireDurationMs } from "../../../shared/definitions/craftingStations.js";
11 11 import { MATERIAL_DISPLAY_NAME } from "../../../shared/definitions/materialTiers.js";
12 12 import { stackQuantity } from "../../../shared/items/inventory.js";
13 import { attachOrigins } from "../../../shared/items/origin.js";
13 import { attachOrigins, craftOrigin, CraftOriginVerb } from "../../../shared/items/origin.js";
14 14 import
15 {
16 addGroundItem,
17 publicGroundItem,
18 removeGroundItem
19 } from "../items/bags.js";
15 {
16 addGroundItem,
17 publicGroundItem,
18 removeGroundItem
19 } from "../items/bags.js";
20 20 import { tileToChunk, tileToLocal } from "../world/coordinates.js";
21 21 import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
22 22
@@ -227,10 +227,25 @@ export function applyTindersAtTile (world, impact, now)
227 227 ? (rawDef.burntItemId ?? CraftingItemId.burntMeat)
228 228 : cookedItemIdForRaw(rawDef);
229 229 consumeOneGroundStack(world, meatItem, events);
230 const stack = attachOrigins({ itemId: outId, quantity: 1, origins: [] });
230 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
231 const appearance = casterHandle != null
232 ? world.ecs.get(casterHandle, Component.appearance)
233 : null;
234 const cookName = [appearance?.firstName, appearance?.lastName]
235 .filter(Boolean)
236 .join(" ")
237 .trim() || "someone";
238 const origin = craftOrigin(
239 burned ? CraftOriginVerb.ruined : CraftOriginVerb.made,
240 cookName
241 );
242 const stack = attachOrigins({
243 itemId: outId,
244 quantity: 1,
245 origins: [{ origin, quantity: 1 }]
246 });
231 247 spawnGroundStack(world, tileX, tileY, stack, now, events);
232 248
233 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
234 249 const skills = casterHandle != null ? world.ecs.get(casterHandle, Component.skills) : null;
235 250 if (skills?.xp && impact.casterCharacterId)
236 251 {
@@ -10,13 +10,13 @@ import { rollSkill } from "../../../shared/combat/rolls.js";
10import { firestartingDifficulty, campfireDurationMs } from "../../../shared/definitions/craftingStations.js";
10import { firestartingDifficulty, campfireDurationMs } from "../../../shared/definitions/craftingStations.js";
11import { MATERIAL_DISPLAY_NAME } from "../../../shared/definitions/materialTiers.js";
11import { MATERIAL_DISPLAY_NAME } from "../../../shared/definitions/materialTiers.js";
12import { stackQuantity } from "../../../shared/items/inventory.js";
12import { stackQuantity } from "../../../shared/items/inventory.js";
13import { attachOrigins } from "../../../shared/items/origin.js";
13import { attachOrigins, craftOrigin, CraftOriginVerb } from "../../../shared/items/origin.js";
14import
14import
15 {
15{
16 addGroundItem,
16 addGroundItem,
17 publicGroundItem,
17 publicGroundItem,
18 removeGroundItem
18 removeGroundItem
19 } from "../items/bags.js";
19} from "../items/bags.js";
20import { tileToChunk, tileToLocal } from "../world/coordinates.js";
20import { tileToChunk, tileToLocal } from "../world/coordinates.js";
21import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
21import { CHUNK_SIZE } from "../../../shared/protocol/constants.js";
22
22
@@ -227,10 +227,25 @@ export function applyTindersAtTile (world, impact, now)
227 ? (rawDef.burntItemId ?? CraftingItemId.burntMeat)
227 ? (rawDef.burntItemId ?? CraftingItemId.burntMeat)
228 : cookedItemIdForRaw(rawDef);
228 : cookedItemIdForRaw(rawDef);
229 consumeOneGroundStack(world, meatItem, events);
229 consumeOneGroundStack(world, meatItem, events);
230 const stack = attachOrigins({ itemId: outId, quantity: 1, origins: [] });
230 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
231 const appearance = casterHandle != null
232 ? world.ecs.get(casterHandle, Component.appearance)
233 : null;
234 const cookName = [appearance?.firstName, appearance?.lastName]
235 .filter(Boolean)
236 .join(" ")
237 .trim() || "someone";
238 const origin = craftOrigin(
239 burned ? CraftOriginVerb.ruined : CraftOriginVerb.made,
240 cookName
241 );
242 const stack = attachOrigins({
243 itemId: outId,
244 quantity: 1,
245 origins: [{ origin, quantity: 1 }]
246 });
231 spawnGroundStack(world, tileX, tileY, stack, now, events);
247 spawnGroundStack(world, tileX, tileY, stack, now, events);
232
248
233 const casterHandle = world.ecs.handleOf(impact.casterEntityId);
234 const skills = casterHandle != null ? world.ecs.get(casterHandle, Component.skills) : null;
249 const skills = casterHandle != null ? world.ecs.get(casterHandle, Component.skills) : null;
235 if (skills?.xp && impact.casterCharacterId)
250 if (skills?.xp && impact.casterCharacterId)
236 {
251 {
server/tests/origins.test.js +18 −17
@@ -1,23 +1,23 @@
1 1 import test from "node:test";
2 2 import assert from "node:assert/strict";
3 3 import
4 {
5 ItemOriginKind,
6 GatherOriginVerb,
7 CraftOriginVerb,
8 gatherOrigin,
9 lootOrigin,
10 ashOrigin,
11 craftOrigin,
12 craftOriginVerbForStation,
13 royalTreasuryOrigin,
14 ROYAL_TREASURY_ORIGIN_LABEL,
15 originLabel,
16 formatOriginBreakdown,
17 mergeOriginLists,
18 normalizeOrigins,
19 splitOrigins
20 } from "../../shared/items/origin.js";
4 {
5 ItemOriginKind,
6 GatherOriginVerb,
7 CraftOriginVerb,
8 gatherOrigin,
9 lootOrigin,
10 ashOrigin,
11 craftOrigin,
12 craftOriginVerbForStation,
13 royalTreasuryOrigin,
14 ROYAL_TREASURY_ORIGIN_LABEL,
15 originLabel,
16 formatOriginBreakdown,
17 mergeOriginLists,
18 normalizeOrigins,
19 splitOrigins
20 } from "../../shared/items/origin.js";
21 21 import { CraftingStationId } from "../../shared/definitions/craftingStations.js";
22 22 import { emptySlots, insertStack, takeFromSlot, insertStackGrowable, singleItemFromStack } from "../../shared/items/inventory.js";
23 23 import { stackRulesFor } from "../../shared/items/stackRules.js";
@@ -82,6 +82,7 @@ test("craft origins use station verbs", () =>
82 82 assert.equal(originLabel(craftOrigin(CraftOriginVerb.smithed, "Ada")), "Smithed by Ada");
83 83 assert.equal(originLabel(craftOrigin(CraftOriginVerb.carved, "Ada")), "Carved by Ada");
84 84 assert.equal(originLabel(craftOrigin(CraftOriginVerb.assembled, "Ada")), "Assembled by Ada");
85 assert.equal(originLabel(craftOrigin(CraftOriginVerb.ruined, "Ada")), "Ruined by Ada");
85 86 assert.equal(originLabel({ kind: ItemOriginKind.shop, displayName: "Bob Shop" }), "Bought from Bob Shop");
86 87 });
87 88
@@ -1,23 +1,23 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import
3import
4 {
4{
5 ItemOriginKind,
5 ItemOriginKind,
6 GatherOriginVerb,
6 GatherOriginVerb,
7 CraftOriginVerb,
7 CraftOriginVerb,
8 gatherOrigin,
8 gatherOrigin,
9 lootOrigin,
9 lootOrigin,
10 ashOrigin,
10 ashOrigin,
11 craftOrigin,
11 craftOrigin,
12 craftOriginVerbForStation,
12 craftOriginVerbForStation,
13 royalTreasuryOrigin,
13 royalTreasuryOrigin,
14 ROYAL_TREASURY_ORIGIN_LABEL,
14 ROYAL_TREASURY_ORIGIN_LABEL,
15 originLabel,
15 originLabel,
16 formatOriginBreakdown,
16 formatOriginBreakdown,
17 mergeOriginLists,
17 mergeOriginLists,
18 normalizeOrigins,
18 normalizeOrigins,
19 splitOrigins
19 splitOrigins
20 } from "../../shared/items/origin.js";
20} from "../../shared/items/origin.js";
21import { CraftingStationId } from "../../shared/definitions/craftingStations.js";
21import { CraftingStationId } from "../../shared/definitions/craftingStations.js";
22import { emptySlots, insertStack, takeFromSlot, insertStackGrowable, singleItemFromStack } from "../../shared/items/inventory.js";
22import { emptySlots, insertStack, takeFromSlot, insertStackGrowable, singleItemFromStack } from "../../shared/items/inventory.js";
23import { stackRulesFor } from "../../shared/items/stackRules.js";
23import { stackRulesFor } from "../../shared/items/stackRules.js";
@@ -82,6 +82,7 @@ test("craft origins use station verbs", () =>
82 assert.equal(originLabel(craftOrigin(CraftOriginVerb.smithed, "Ada")), "Smithed by Ada");
82 assert.equal(originLabel(craftOrigin(CraftOriginVerb.smithed, "Ada")), "Smithed by Ada");
83 assert.equal(originLabel(craftOrigin(CraftOriginVerb.carved, "Ada")), "Carved by Ada");
83 assert.equal(originLabel(craftOrigin(CraftOriginVerb.carved, "Ada")), "Carved by Ada");
84 assert.equal(originLabel(craftOrigin(CraftOriginVerb.assembled, "Ada")), "Assembled by Ada");
84 assert.equal(originLabel(craftOrigin(CraftOriginVerb.assembled, "Ada")), "Assembled by Ada");
85 assert.equal(originLabel(craftOrigin(CraftOriginVerb.ruined, "Ada")), "Ruined by Ada");
85 assert.equal(originLabel({ kind: ItemOriginKind.shop, displayName: "Bob Shop" }), "Bought from Bob Shop");
86 assert.equal(originLabel({ kind: ItemOriginKind.shop, displayName: "Bob Shop" }), "Bought from Bob Shop");
86});
87});
87
88
shared/items/origin.js +1 −0
@@ -39,6 +39,7 @@ export const CraftOriginVerb = Object.freeze({
39 39 carved: "Carved",
40 40 assembled: "Assembled",
41 41 made: "Made",
42 ruined: "Ruined",
42 43 brewed: "Brewed",
43 44 mixed: "Mixed",
44 45 written: "Written",
@@ -39,6 +39,7 @@ export const CraftOriginVerb = Object.freeze({
39 carved: "Carved",
39 carved: "Carved",
40 assembled: "Assembled",
40 assembled: "Assembled",
41 made: "Made",
41 made: "Made",
42 ruined: "Ruined",
42 brewed: "Brewed",
43 brewed: "Brewed",
43 mixed: "Mixed",
44 mixed: "Mixed",
44 written: "Written",
45 written: "Written",