BlueGit

timfa questward

Move magic staff crafting to the woodworking bench.

Staff uses wood-tier material selection like quarterstaff; no longer listed at the crafting bench.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
cd53e91fa387ee36bed165d37538b27a8a544c3b
Parent
0d515f61
3 files changed +5 −5
client/src/play/crafting.js +2 −4
@@ -179,8 +179,7 @@ export function initCrafting ({
179 179 {
180 180 if (isCraftingBenchStation()
181 181 && (recipe.craftGroup === "bow"
182 || recipe.craftGroup === "fishing-rod"
183 || recipe.craftGroup === "staff"))
182 || recipe.craftGroup === "fishing-rod"))
184 183 { return woodTierForMetal(material); }
185 184 if (isCraftingBenchStation() && recipe.craftGroup === "fishing-net")
186 185 { return clothTierForWood(woodTierForMetal(material)); }
@@ -342,8 +341,7 @@ export function initCrafting ({
342 341 if (match?.xpMaterial && !(isCraftingBenchStation()
343 342 && (match.craftGroup === "bow"
344 343 || match.craftGroup === "fishing-rod"
345 || match.craftGroup === "fishing-net"
346 || match.craftGroup === "staff")))
344 || match.craftGroup === "fishing-net")))
347 345 {
348 346 selectedMaterial = match.xpMaterial;
349 347 if (materialTierSelect)
@@ -179,8 +179,7 @@ export function initCrafting ({
179 {
179 {
180 if (isCraftingBenchStation()
180 if (isCraftingBenchStation()
181 && (recipe.craftGroup === "bow"
181 && (recipe.craftGroup === "bow"
182 || recipe.craftGroup === "fishing-rod"
182 || recipe.craftGroup === "fishing-rod"))
183 || recipe.craftGroup === "staff"))
184 { return woodTierForMetal(material); }
183 { return woodTierForMetal(material); }
185 if (isCraftingBenchStation() && recipe.craftGroup === "fishing-net")
184 if (isCraftingBenchStation() && recipe.craftGroup === "fishing-net")
186 { return clothTierForWood(woodTierForMetal(material)); }
185 { return clothTierForWood(woodTierForMetal(material)); }
@@ -342,8 +341,7 @@ export function initCrafting ({
342 if (match?.xpMaterial && !(isCraftingBenchStation()
341 if (match?.xpMaterial && !(isCraftingBenchStation()
343 && (match.craftGroup === "bow"
342 && (match.craftGroup === "bow"
344 || match.craftGroup === "fishing-rod"
343 || match.craftGroup === "fishing-rod"
345 || match.craftGroup === "fishing-net"
344 || match.craftGroup === "fishing-net")))
346 || match.craftGroup === "staff")))
347 {
345 {
348 selectedMaterial = match.xpMaterial;
346 selectedMaterial = match.xpMaterial;
349 if (materialTierSelect)
347 if (materialTierSelect)
server/tests/craftingStations.test.js +2 −0
@@ -73,6 +73,7 @@ test("recipesForStation lists woodworking stick and quarterstaff recipes", () =>
73 73 const bench = recipesForStation(CraftingStationId.woodworkingBench);
74 74 assert.ok(bench.some((recipe) => recipe.recipeId === "stick-pine"));
75 75 assert.ok(bench.some((recipe) => recipe.recipeId === "quarterstaff-birch"));
76 assert.ok(bench.some((recipe) => recipe.recipeId === "staff-pine"));
76 77 const stick = recipeDefinition("stick-pine");
77 78 assert.equal(stick.output.itemId, ItemId.stick);
78 79 assert.deepEqual(stick.inputs, [{ itemId: ItemId.pineLog, quantity: 1 }]);
@@ -147,6 +148,7 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
147 148
148 149 const staff = recipeDefinition("staff-pine");
149 150 assert.ok(staff);
151 assert.equal(staff.stationId, CraftingStationId.woodworkingBench);
150 152 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
151 153 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
152 154
@@ -73,6 +73,7 @@ test("recipesForStation lists woodworking stick and quarterstaff recipes", () =>
73 const bench = recipesForStation(CraftingStationId.woodworkingBench);
73 const bench = recipesForStation(CraftingStationId.woodworkingBench);
74 assert.ok(bench.some((recipe) => recipe.recipeId === "stick-pine"));
74 assert.ok(bench.some((recipe) => recipe.recipeId === "stick-pine"));
75 assert.ok(bench.some((recipe) => recipe.recipeId === "quarterstaff-birch"));
75 assert.ok(bench.some((recipe) => recipe.recipeId === "quarterstaff-birch"));
76 assert.ok(bench.some((recipe) => recipe.recipeId === "staff-pine"));
76 const stick = recipeDefinition("stick-pine");
77 const stick = recipeDefinition("stick-pine");
77 assert.equal(stick.output.itemId, ItemId.stick);
78 assert.equal(stick.output.itemId, ItemId.stick);
78 assert.deepEqual(stick.inputs, [{ itemId: ItemId.pineLog, quantity: 1 }]);
79 assert.deepEqual(stick.inputs, [{ itemId: ItemId.pineLog, quantity: 1 }]);
@@ -147,6 +148,7 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
147
148
148 const staff = recipeDefinition("staff-pine");
149 const staff = recipeDefinition("staff-pine");
149 assert.ok(staff);
150 assert.ok(staff);
151 assert.equal(staff.stationId, CraftingStationId.woodworkingBench);
150 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
152 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
151 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
153 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
152
154
shared/definitions/gemItems.js +1 −1
@@ -280,7 +280,7 @@ export function staffCraftRecipes ()
280 280 recipeId: `staff-${woodTier}`,
281 281 craftGroup: "staff",
282 282 craftGroupLabel: "Staff",
283 stationId: CraftingStationId.craftingBench,
283 stationId: CraftingStationId.woodworkingBench,
284 284 output: { itemId: staffItemIdForWood(woodTier), quantity: 1 },
285 285 inputs: [
286 286 { itemId: logItemIdForWood(woodTier), quantity: 1 },
@@ -280,7 +280,7 @@ export function staffCraftRecipes ()
280 recipeId: `staff-${woodTier}`,
280 recipeId: `staff-${woodTier}`,
281 craftGroup: "staff",
281 craftGroup: "staff",
282 craftGroupLabel: "Staff",
282 craftGroupLabel: "Staff",
283 stationId: CraftingStationId.craftingBench,
283 stationId: CraftingStationId.woodworkingBench,
284 output: { itemId: staffItemIdForWood(woodTier), quantity: 1 },
284 output: { itemId: staffItemIdForWood(woodTier), quantity: 1 },
285 inputs: [
285 inputs: [
286 { itemId: logItemIdForWood(woodTier), quantity: 1 },
286 { itemId: logItemIdForWood(woodTier), quantity: 1 },