BlueGit

timfa questward

Add ring, bracelet, and amulet jewellery with precious-metal crafts.

Players and humanoids get three jewellery slots; ring and bracelet draw under clothing, amulet over. Each piece uses one silver/gold/electrum bar and one cut gem (amulets also need matching yarn), with no default worn bonuses yet.

timfa Tim Falken · pushed by timfa

Authored 2026-09-02 · 2 months ago

Hash
b4308d34815974d9abe3401e4723f47bd1877e88
Parent
46241ce6
17 files changed +408 −52
client/src/editor/settingsModal.js +4 −1
@@ -40,7 +40,10 @@ const SLOT_LABELS = Object.freeze({
40 40 legs: "Legs",
41 41 boots: "Boots",
42 42 weapon: "Weapon",
43 offhand: "Off-hand"
43 offhand: "Off-hand",
44 ring: "Ring",
45 bracelet: "Bracelet",
46 amulet: "Amulet"
44 47 });
45 48
46 49 export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNight, getAuthSubject })
@@ -40,7 +40,10 @@ const SLOT_LABELS = Object.freeze({
40 legs: "Legs",
40 legs: "Legs",
41 boots: "Boots",
41 boots: "Boots",
42 weapon: "Weapon",
42 weapon: "Weapon",
43 offhand: "Off-hand"
43 offhand: "Off-hand",
44 ring: "Ring",
45 bracelet: "Bracelet",
46 amulet: "Amulet"
44});
47});
45
48
46export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNight, getAuthSubject })
49export function initSettingsModal ({ socket, MessageType, onApplied, onPreviewNight, getAuthSubject })
client/src/play/crafting.js +19 −2
@@ -34,6 +34,8 @@ import
34 34 LEATHER_TIER_ORDER,
35 35 LEATHER_DISPLAY_NAME,
36 36 LeatherTier,
37 GEM_TIER_ORDER,
38 GemTier,
37 39 woodTierForMetal,
38 40 clothTierForWood
39 41 } from "/shared/definitions/materialTiers.js";
@@ -169,6 +171,11 @@ export function initCrafting ({
169 171 return stationId === CraftingStationId.leatherworkingStation;
170 172 }
171 173
174 function isJeweleringStation ()
175 {
176 return stationId === CraftingStationId.jeweleringStation;
177 }
178
172 179 function usesMaterialDropdown ()
173 180 {
174 181 return isTailorStation()
@@ -177,7 +184,8 @@ export function initCrafting ({
177 184 || isCraftingBenchStation()
178 185 || isSpinningWheelStation()
179 186 || isLoomStation()
180 || isLeatherworkingStation();
187 || isLeatherworkingStation()
188 || isJeweleringStation();
181 189 }
182 190
183 191 /** One grid cell per craft group; material dropdown picks the tier variant. */
@@ -188,7 +196,8 @@ export function initCrafting ({
188 196 || isCraftingBenchStation()
189 197 || isSpinningWheelStation()
190 198 || isLoomStation()
191 || isLeatherworkingStation();
199 || isLeatherworkingStation()
200 || isJeweleringStation();
192 201 }
193 202
194 203 function craftGroupKey (recipe)
@@ -269,6 +278,14 @@ export function initCrafting ({
269 278 fallback: LeatherTier.softLeather
270 279 };
271 280 }
281 if (isJeweleringStation())
282 {
283 return {
284 order: GEM_TIER_ORDER,
285 names: MATERIAL_DISPLAY_NAME,
286 fallback: GemTier.tourmaline
287 };
288 }
272 289 if (isWoodworkingStation())
273 290 {
274 291 return {
@@ -34,6 +34,8 @@ import
34 LEATHER_TIER_ORDER,
34 LEATHER_TIER_ORDER,
35 LEATHER_DISPLAY_NAME,
35 LEATHER_DISPLAY_NAME,
36 LeatherTier,
36 LeatherTier,
37 GEM_TIER_ORDER,
38 GemTier,
37 woodTierForMetal,
39 woodTierForMetal,
38 clothTierForWood
40 clothTierForWood
39} from "/shared/definitions/materialTiers.js";
41} from "/shared/definitions/materialTiers.js";
@@ -169,6 +171,11 @@ export function initCrafting ({
169 return stationId === CraftingStationId.leatherworkingStation;
171 return stationId === CraftingStationId.leatherworkingStation;
170 }
172 }
171
173
174 function isJeweleringStation ()
175 {
176 return stationId === CraftingStationId.jeweleringStation;
177 }
178
172 function usesMaterialDropdown ()
179 function usesMaterialDropdown ()
173 {
180 {
174 return isTailorStation()
181 return isTailorStation()
@@ -177,7 +184,8 @@ export function initCrafting ({
177 || isCraftingBenchStation()
184 || isCraftingBenchStation()
178 || isSpinningWheelStation()
185 || isSpinningWheelStation()
179 || isLoomStation()
186 || isLoomStation()
180 || isLeatherworkingStation();
187 || isLeatherworkingStation()
188 || isJeweleringStation();
181 }
189 }
182
190
183 /** One grid cell per craft group; material dropdown picks the tier variant. */
191 /** One grid cell per craft group; material dropdown picks the tier variant. */
@@ -188,7 +196,8 @@ export function initCrafting ({
188 || isCraftingBenchStation()
196 || isCraftingBenchStation()
189 || isSpinningWheelStation()
197 || isSpinningWheelStation()
190 || isLoomStation()
198 || isLoomStation()
191 || isLeatherworkingStation();
199 || isLeatherworkingStation()
200 || isJeweleringStation();
192 }
201 }
193
202
194 function craftGroupKey (recipe)
203 function craftGroupKey (recipe)
@@ -269,6 +278,14 @@ export function initCrafting ({
269 fallback: LeatherTier.softLeather
278 fallback: LeatherTier.softLeather
270 };
279 };
271 }
280 }
281 if (isJeweleringStation())
282 {
283 return {
284 order: GEM_TIER_ORDER,
285 names: MATERIAL_DISPLAY_NAME,
286 fallback: GemTier.tourmaline
287 };
288 }
272 if (isWoodworkingStation())
289 if (isWoodworkingStation())
273 {
290 {
274 return {
291 return {
client/src/play/inventory.js +4 −1
@@ -23,7 +23,10 @@ const EQUIP_LABELS = {
23 23 [EQUIPMENT_SLOT.legs]: "Legs",
24 24 [EQUIPMENT_SLOT.boots]: "Boots",
25 25 [EQUIPMENT_SLOT.weapon]: "Weapon",
26 [EQUIPMENT_SLOT.offhand]: "Off-hand"
26 [EQUIPMENT_SLOT.offhand]: "Off-hand",
27 [EQUIPMENT_SLOT.ring]: "Ring",
28 [EQUIPMENT_SLOT.bracelet]: "Bracelet",
29 [EQUIPMENT_SLOT.amulet]: "Amulet"
27 30 };
28 31
29 32 export function initInventory ({
@@ -23,7 +23,10 @@ const EQUIP_LABELS = {
23 [EQUIPMENT_SLOT.legs]: "Legs",
23 [EQUIPMENT_SLOT.legs]: "Legs",
24 [EQUIPMENT_SLOT.boots]: "Boots",
24 [EQUIPMENT_SLOT.boots]: "Boots",
25 [EQUIPMENT_SLOT.weapon]: "Weapon",
25 [EQUIPMENT_SLOT.weapon]: "Weapon",
26 [EQUIPMENT_SLOT.offhand]: "Off-hand"
26 [EQUIPMENT_SLOT.offhand]: "Off-hand",
27 [EQUIPMENT_SLOT.ring]: "Ring",
28 [EQUIPMENT_SLOT.bracelet]: "Bracelet",
29 [EQUIPMENT_SLOT.amulet]: "Amulet"
27};
30};
28
31
29export function initInventory ({
32export function initInventory ({
server/tests/craftingStations.test.js +9 −5
@@ -13,7 +13,8 @@ import { emptySlots } from "../../shared/items/inventory.js";
13 13 import { canCraftFitInventory, CRAFT_DURATION_MS as RECIPE_CRAFT_MS, canStartCraft } from "../../shared/crafting/recipes.js";
14 14 import { recipesForStation, recipeDefinition } from "../../shared/crafting/stationRecipes.js";
15 15 import { CraftingItemId } from "../../shared/definitions/craftingItems.js";
16 import { GemItemId, JEWELRY_RECIPE_GUIDELINES } from "../../shared/definitions/gemItems.js";
16 import { GemItemId } from "../../shared/definitions/gemItems.js";
17 import { JEWELRY_RECIPE_GUIDELINES } from "../../shared/definitions/jewelryItems.js";
17 18 import { GatherMaterialId, GemTier, tierSmeltSkillLevel } from "../../shared/definitions/materialTiers.js";
18 19 import { MetalItemId } from "../../shared/definitions/metalItems.js";
19 20
@@ -135,7 +136,7 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
135 136 {
136 137 const cut = recipeDefinition("cut-tourmaline");
137 138 assert.ok(cut);
138 assert.equal(cut.craftGroupLabel, "Cut Tourmaline");
139 assert.equal(cut.craftGroupLabel, "Cut gem");
139 140 assert.equal(cut.stationId, CraftingStationId.jeweleringStation);
140 141 assert.equal(cut.skillId, SkillId.jewelering);
141 142 assert.equal(cut.minSkillLevel, tierSmeltSkillLevel(GemTier.tourmaline));
@@ -152,13 +153,16 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
152 153 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
153 154 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
154 155
155 assert.equal(recipesForStation(CraftingStationId.jeweleringStation).length, 7);
156 assert.equal(recipesForStation(CraftingStationId.jeweleringStation).length, 28);
156 157 assert.equal(JEWELRY_RECIPE_GUIDELINES.length, 7);
157 158 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalId, GatherMaterialId.silver);
158 159 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalQuantity, 1);
159 160 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalId, GatherMaterialId.gold);
160 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalQuantity, 4);
161 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalQuantity, 1);
161 162 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalId, GatherMaterialId.electrum);
162 163 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalBarItemId, MetalItemId.electrumBar);
163 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalQuantity, 7);
164 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalQuantity, 1);
165 assert.ok(recipeDefinition("ring-tourmaline"));
166 assert.ok(recipeDefinition("bracelet-diamond"));
167 assert.ok(recipeDefinition("amulet-jadeite"));
164 168 });
@@ -13,7 +13,8 @@ import { emptySlots } from "../../shared/items/inventory.js";
13import { canCraftFitInventory, CRAFT_DURATION_MS as RECIPE_CRAFT_MS, canStartCraft } from "../../shared/crafting/recipes.js";
13import { canCraftFitInventory, CRAFT_DURATION_MS as RECIPE_CRAFT_MS, canStartCraft } from "../../shared/crafting/recipes.js";
14import { recipesForStation, recipeDefinition } from "../../shared/crafting/stationRecipes.js";
14import { recipesForStation, recipeDefinition } from "../../shared/crafting/stationRecipes.js";
15import { CraftingItemId } from "../../shared/definitions/craftingItems.js";
15import { CraftingItemId } from "../../shared/definitions/craftingItems.js";
16import { GemItemId, JEWELRY_RECIPE_GUIDELINES } from "../../shared/definitions/gemItems.js";
16import { GemItemId } from "../../shared/definitions/gemItems.js";
17import { JEWELRY_RECIPE_GUIDELINES } from "../../shared/definitions/jewelryItems.js";
17import { GatherMaterialId, GemTier, tierSmeltSkillLevel } from "../../shared/definitions/materialTiers.js";
18import { GatherMaterialId, GemTier, tierSmeltSkillLevel } from "../../shared/definitions/materialTiers.js";
18import { MetalItemId } from "../../shared/definitions/metalItems.js";
19import { MetalItemId } from "../../shared/definitions/metalItems.js";
19
20
@@ -135,7 +136,7 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
135{
136{
136 const cut = recipeDefinition("cut-tourmaline");
137 const cut = recipeDefinition("cut-tourmaline");
137 assert.ok(cut);
138 assert.ok(cut);
138 assert.equal(cut.craftGroupLabel, "Cut Tourmaline");
139 assert.equal(cut.craftGroupLabel, "Cut gem");
139 assert.equal(cut.stationId, CraftingStationId.jeweleringStation);
140 assert.equal(cut.stationId, CraftingStationId.jeweleringStation);
140 assert.equal(cut.skillId, SkillId.jewelering);
141 assert.equal(cut.skillId, SkillId.jewelering);
141 assert.equal(cut.minSkillLevel, tierSmeltSkillLevel(GemTier.tourmaline));
142 assert.equal(cut.minSkillLevel, tierSmeltSkillLevel(GemTier.tourmaline));
@@ -152,13 +153,16 @@ test("jewelering cuts rough gems; staff recipes need cut gems", () =>
152 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
153 assert.ok(staff.inputs.some((row) => row.itemId === GemItemId.tourmalineCut));
153 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
154 assert.ok(!staff.inputs.some((row) => row.itemId === GemItemId.tourmaline));
154
155
155 assert.equal(recipesForStation(CraftingStationId.jeweleringStation).length, 7);
156 assert.equal(recipesForStation(CraftingStationId.jeweleringStation).length, 28);
156 assert.equal(JEWELRY_RECIPE_GUIDELINES.length, 7);
157 assert.equal(JEWELRY_RECIPE_GUIDELINES.length, 7);
157 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalId, GatherMaterialId.silver);
158 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalId, GatherMaterialId.silver);
158 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalQuantity, 1);
159 assert.equal(JEWELRY_RECIPE_GUIDELINES[0].metalQuantity, 1);
159 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalId, GatherMaterialId.gold);
160 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalId, GatherMaterialId.gold);
160 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalQuantity, 4);
161 assert.equal(JEWELRY_RECIPE_GUIDELINES[3].metalQuantity, 1);
161 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalId, GatherMaterialId.electrum);
162 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalId, GatherMaterialId.electrum);
162 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalBarItemId, MetalItemId.electrumBar);
163 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalBarItemId, MetalItemId.electrumBar);
163 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalQuantity, 7);
164 assert.equal(JEWELRY_RECIPE_GUIDELINES[6].metalQuantity, 1);
165 assert.ok(recipeDefinition("ring-tourmaline"));
166 assert.ok(recipeDefinition("bracelet-diamond"));
167 assert.ok(recipeDefinition("amulet-jadeite"));
164});
168});
server/tests/item-ids.test.js +2 −0
@@ -14,6 +14,7 @@ import { RANGED_ITEM_DEFINITIONS } from "../../shared/definitions/rangedItems.js
14 14 import { SPELLBOOK_ITEM_DEFINITIONS } from "../../shared/definitions/spellItems.js";
15 15 import { FISH_ITEM_DEFINITIONS } from "../../shared/definitions/fishItems.js";
16 16 import { GEM_ITEM_DEFINITIONS } from "../../shared/definitions/gemItems.js";
17 import { JEWELRY_ITEM_DEFINITIONS } from "../../shared/definitions/jewelryItems.js";
17 18 import { SWORD_ITEM_DEFINITIONS } from "../../shared/definitions/swordItems.js";
18 19 import { WAR_AXE_ITEM_DEFINITIONS } from "../../shared/definitions/warAxeItems.js";
19 20 import { ESSENCE_ITEM_DEFINITIONS } from "../../shared/definitions/essenceItems.js";
@@ -42,6 +43,7 @@ const ITEM_DEFINITION_SOURCES = Object.freeze([
42 43 ["spellbook", SPELLBOOK_ITEM_DEFINITIONS],
43 44 ["fish", FISH_ITEM_DEFINITIONS],
44 45 ["gem", GEM_ITEM_DEFINITIONS],
46 ["jewelry", JEWELRY_ITEM_DEFINITIONS],
45 47 ["sword", SWORD_ITEM_DEFINITIONS],
46 48 ["warAxe", WAR_AXE_ITEM_DEFINITIONS],
47 49 ["essence", ESSENCE_ITEM_DEFINITIONS],
@@ -14,6 +14,7 @@ import { RANGED_ITEM_DEFINITIONS } from "../../shared/definitions/rangedItems.js
14import { SPELLBOOK_ITEM_DEFINITIONS } from "../../shared/definitions/spellItems.js";
14import { SPELLBOOK_ITEM_DEFINITIONS } from "../../shared/definitions/spellItems.js";
15import { FISH_ITEM_DEFINITIONS } from "../../shared/definitions/fishItems.js";
15import { FISH_ITEM_DEFINITIONS } from "../../shared/definitions/fishItems.js";
16import { GEM_ITEM_DEFINITIONS } from "../../shared/definitions/gemItems.js";
16import { GEM_ITEM_DEFINITIONS } from "../../shared/definitions/gemItems.js";
17import { JEWELRY_ITEM_DEFINITIONS } from "../../shared/definitions/jewelryItems.js";
17import { SWORD_ITEM_DEFINITIONS } from "../../shared/definitions/swordItems.js";
18import { SWORD_ITEM_DEFINITIONS } from "../../shared/definitions/swordItems.js";
18import { WAR_AXE_ITEM_DEFINITIONS } from "../../shared/definitions/warAxeItems.js";
19import { WAR_AXE_ITEM_DEFINITIONS } from "../../shared/definitions/warAxeItems.js";
19import { ESSENCE_ITEM_DEFINITIONS } from "../../shared/definitions/essenceItems.js";
20import { ESSENCE_ITEM_DEFINITIONS } from "../../shared/definitions/essenceItems.js";
@@ -42,6 +43,7 @@ const ITEM_DEFINITION_SOURCES = Object.freeze([
42 ["spellbook", SPELLBOOK_ITEM_DEFINITIONS],
43 ["spellbook", SPELLBOOK_ITEM_DEFINITIONS],
43 ["fish", FISH_ITEM_DEFINITIONS],
44 ["fish", FISH_ITEM_DEFINITIONS],
44 ["gem", GEM_ITEM_DEFINITIONS],
45 ["gem", GEM_ITEM_DEFINITIONS],
46 ["jewelry", JEWELRY_ITEM_DEFINITIONS],
45 ["sword", SWORD_ITEM_DEFINITIONS],
47 ["sword", SWORD_ITEM_DEFINITIONS],
46 ["warAxe", WAR_AXE_ITEM_DEFINITIONS],
48 ["warAxe", WAR_AXE_ITEM_DEFINITIONS],
47 ["essence", ESSENCE_ITEM_DEFINITIONS],
49 ["essence", ESSENCE_ITEM_DEFINITIONS],
server/tests/jewelry.test.js added +64 −0
@@ -0,0 +1,64 @@
1 import test from "node:test";
2 import assert from "node:assert/strict";
3 import { ItemId, itemDefinition, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
4 import { JewelryItemId, jewelryCraftRecipes, jewelryMetalIdForGemTier } from "../../shared/definitions/jewelryItems.js";
5 import { GemItemId } from "../../shared/definitions/gemItems.js";
6 import { MetalItemId } from "../../shared/definitions/metalItems.js";
7 import { ClothItemId } from "../../shared/definitions/clothItems.js";
8 import { GatherMaterialId, GemTier } from "../../shared/definitions/materialTiers.js";
9 import { resolveItemDualTint } from "../../shared/render/tint.js";
10 import { EQUIPMENT_SLOTS, emptyEquipment } from "../../shared/items/inventory.js";
11 import { recipeDefinition } from "../../shared/crafting/recipes.js";
12
13 test("equipment slots include ring bracelet amulet", () =>
14 {
15 assert.ok(EQUIPMENT_SLOTS.includes("ring"));
16 assert.ok(EQUIPMENT_SLOTS.includes("bracelet"));
17 assert.ok(EQUIPMENT_SLOTS.includes("amulet"));
18 const empty = emptyEquipment();
19 assert.equal(empty.slots.ring, null);
20 assert.equal(empty.slots.amulet, null);
21 const ringIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.ring);
22 const chestIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.chest);
23 const amuletIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.amulet);
24 assert.ok(ringIdx < chestIdx, "ring draws under clothing");
25 assert.ok(amuletIdx > chestIdx, "amulet draws over clothing");
26 });
27
28 test("jewellery uses silver gold electrum by gem tier", () =>
29 {
30 assert.equal(jewelryMetalIdForGemTier(GemTier.tourmaline), GatherMaterialId.silver);
31 assert.equal(jewelryMetalIdForGemTier(GemTier.diamond), GatherMaterialId.gold);
32 assert.equal(jewelryMetalIdForGemTier(GemTier.jadeite), GatherMaterialId.electrum);
33 });
34
35 test("jewellery recipes take one bar one cut gem and yarn for amulets", () =>
36 {
37 const ring = recipeDefinition("ring-opal");
38 assert.ok(ring);
39 assert.deepEqual(ring.inputs, [
40 { itemId: MetalItemId.silverBar, quantity: 1 },
41 { itemId: GemItemId.opalCut, quantity: 1 }
42 ]);
43 const amulet = recipeDefinition("amulet-ruby");
44 assert.ok(amulet);
45 assert.equal(amulet.inputs.length, 3);
46 assert.ok(amulet.inputs.some((row) => row.itemId === MetalItemId.goldBar));
47 assert.ok(amulet.inputs.some((row) => row.itemId === GemItemId.rubyCut));
48 assert.ok(amulet.inputs.some((row) => row.itemId === ClothItemId.fairySilkYarn));
49 assert.equal(jewelryCraftRecipes().length, 21);
50 });
51
52 test("jewellery dual tint maps metal gem and yarn channels", () =>
53 {
54 const ring = resolveItemDualTint({ itemId: JewelryItemId.tourmalineRing });
55 assert.ok(ring?.shaft);
56 assert.ok(ring?.tip);
57 assert.equal(ring.coat, undefined);
58 const amulet = resolveItemDualTint({ itemId: JewelryItemId.jadeiteAmulet });
59 assert.ok(amulet?.shaft);
60 assert.ok(amulet?.tip);
61 assert.ok(amulet?.coat);
62 assert.equal(itemDefinition(JewelryItemId.diamondBracelet)?.equipment?.slot, EQUIPMENT_SLOT.bracelet);
63 assert.equal(ItemId.diamondRing, JewelryItemId.diamondRing);
64 });
@@ -0,0 +1,64 @@
1import test from "node:test";
2import assert from "node:assert/strict";
3import { ItemId, itemDefinition, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
4import { JewelryItemId, jewelryCraftRecipes, jewelryMetalIdForGemTier } from "../../shared/definitions/jewelryItems.js";
5import { GemItemId } from "../../shared/definitions/gemItems.js";
6import { MetalItemId } from "../../shared/definitions/metalItems.js";
7import { ClothItemId } from "../../shared/definitions/clothItems.js";
8import { GatherMaterialId, GemTier } from "../../shared/definitions/materialTiers.js";
9import { resolveItemDualTint } from "../../shared/render/tint.js";
10import { EQUIPMENT_SLOTS, emptyEquipment } from "../../shared/items/inventory.js";
11import { recipeDefinition } from "../../shared/crafting/recipes.js";
12
13test("equipment slots include ring bracelet amulet", () =>
14{
15 assert.ok(EQUIPMENT_SLOTS.includes("ring"));
16 assert.ok(EQUIPMENT_SLOTS.includes("bracelet"));
17 assert.ok(EQUIPMENT_SLOTS.includes("amulet"));
18 const empty = emptyEquipment();
19 assert.equal(empty.slots.ring, null);
20 assert.equal(empty.slots.amulet, null);
21 const ringIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.ring);
22 const chestIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.chest);
23 const amuletIdx = EQUIPMENT_DRAW_ORDER.indexOf(EQUIPMENT_SLOT.amulet);
24 assert.ok(ringIdx < chestIdx, "ring draws under clothing");
25 assert.ok(amuletIdx > chestIdx, "amulet draws over clothing");
26});
27
28test("jewellery uses silver gold electrum by gem tier", () =>
29{
30 assert.equal(jewelryMetalIdForGemTier(GemTier.tourmaline), GatherMaterialId.silver);
31 assert.equal(jewelryMetalIdForGemTier(GemTier.diamond), GatherMaterialId.gold);
32 assert.equal(jewelryMetalIdForGemTier(GemTier.jadeite), GatherMaterialId.electrum);
33});
34
35test("jewellery recipes take one bar one cut gem and yarn for amulets", () =>
36{
37 const ring = recipeDefinition("ring-opal");
38 assert.ok(ring);
39 assert.deepEqual(ring.inputs, [
40 { itemId: MetalItemId.silverBar, quantity: 1 },
41 { itemId: GemItemId.opalCut, quantity: 1 }
42 ]);
43 const amulet = recipeDefinition("amulet-ruby");
44 assert.ok(amulet);
45 assert.equal(amulet.inputs.length, 3);
46 assert.ok(amulet.inputs.some((row) => row.itemId === MetalItemId.goldBar));
47 assert.ok(amulet.inputs.some((row) => row.itemId === GemItemId.rubyCut));
48 assert.ok(amulet.inputs.some((row) => row.itemId === ClothItemId.fairySilkYarn));
49 assert.equal(jewelryCraftRecipes().length, 21);
50});
51
52test("jewellery dual tint maps metal gem and yarn channels", () =>
53{
54 const ring = resolveItemDualTint({ itemId: JewelryItemId.tourmalineRing });
55 assert.ok(ring?.shaft);
56 assert.ok(ring?.tip);
57 assert.equal(ring.coat, undefined);
58 const amulet = resolveItemDualTint({ itemId: JewelryItemId.jadeiteAmulet });
59 assert.ok(amulet?.shaft);
60 assert.ok(amulet?.tip);
61 assert.ok(amulet?.coat);
62 assert.equal(itemDefinition(JewelryItemId.diamondBracelet)?.equipment?.slot, EQUIPMENT_SLOT.bracelet);
63 assert.equal(ItemId.diamondRing, JewelryItemId.diamondRing);
64});
shared/crafting/stationRecipes.js +2 −0
@@ -18,6 +18,7 @@ import
18 18 import { TIER_FAMILY_RECIPES } from "./tierRecipes.js";
19 19 import { fishingToolRecipes, fishingCookRecipes } from "../definitions/fishItems.js";
20 20 import { staffCraftRecipes, gemCutRecipes } from "../definitions/gemItems.js";
21 import { jewelryCraftRecipes } from "../definitions/jewelryItems.js";
21 22
22 23 /**
23 24 * Craft recipe schema (shared client + server):
@@ -251,6 +252,7 @@ export const CRAFT_RECIPES = Object.freeze([
251 252 ...fishingToolRecipes(),
252 253 ...fishingCookRecipes(),
253 254 ...gemCutRecipes(),
255 ...jewelryCraftRecipes(),
254 256 ...staffCraftRecipes()
255 257 ]);
256 258
@@ -18,6 +18,7 @@ import
18import { TIER_FAMILY_RECIPES } from "./tierRecipes.js";
18import { TIER_FAMILY_RECIPES } from "./tierRecipes.js";
19import { fishingToolRecipes, fishingCookRecipes } from "../definitions/fishItems.js";
19import { fishingToolRecipes, fishingCookRecipes } from "../definitions/fishItems.js";
20import { staffCraftRecipes, gemCutRecipes } from "../definitions/gemItems.js";
20import { staffCraftRecipes, gemCutRecipes } from "../definitions/gemItems.js";
21import { jewelryCraftRecipes } from "../definitions/jewelryItems.js";
21
22
22/**
23/**
23 * Craft recipe schema (shared client + server):
24 * Craft recipe schema (shared client + server):
@@ -251,6 +252,7 @@ export const CRAFT_RECIPES = Object.freeze([
251 ...fishingToolRecipes(),
252 ...fishingToolRecipes(),
252 ...fishingCookRecipes(),
253 ...fishingCookRecipes(),
253 ...gemCutRecipes(),
254 ...gemCutRecipes(),
255 ...jewelryCraftRecipes(),
254 ...staffCraftRecipes()
256 ...staffCraftRecipes()
255]);
257]);
256
258
shared/definitions/equipmentKinds.js +2 −1
@@ -15,5 +15,6 @@ export const EquipmentKind = Object.freeze({
15 15 fishingNet: "fishingNet",
16 16 plantClippers: "plantClippers",
17 17 shears: "shears",
18 arrowAmmo: "arrowAmmo"
18 arrowAmmo: "arrowAmmo",
19 jewelry: "jewelry"
19 20 });
@@ -15,5 +15,6 @@ export const EquipmentKind = Object.freeze({
15 fishingNet: "fishingNet",
15 fishingNet: "fishingNet",
16 plantClippers: "plantClippers",
16 plantClippers: "plantClippers",
17 shears: "shears",
17 shears: "shears",
18 arrowAmmo: "arrowAmmo"
18 arrowAmmo: "arrowAmmo",
19 jewelry: "jewelry"
19});
20});
shared/definitions/gemItems.js +1 −37
@@ -3,7 +3,6 @@ import
3 3 {
4 4 GemTier,
5 5 GEM_TIER_ORDER,
6 GatherMaterialId,
7 6 MATERIAL_DISPLAY_NAME,
8 7 WOOD_TIER_ORDER,
9 8 gemTierForWood,
@@ -13,7 +12,6 @@ import
13 12 } from "./materialTiers.js";
14 13 import { EquipmentKind } from "./equipmentKinds.js";
15 14 import { CraftingStationId } from "./craftingStations.js";
16 import { MetalItemId } from "./metalItems.js";
17 15 import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
18 16 import { SkillId } from "./skills.js";
19 17 import { AttackType } from "./attackTypes.js";
@@ -105,40 +103,6 @@ export function staffItemIdForWood (woodTier)
105 103 return STAFF_ITEM_BY_WOOD[woodTier] ?? null;
106 104 }
107 105
108 /**
109 * Future jewellery at the jewelering station (not live craft recipes yet).
110 * Metal quantity = gem tier rank; silver (1–3), gold (4–6), electrum (7).
111 */
112 export const JEWELRY_RECIPE_GUIDELINES = Object.freeze(
113 GEM_TIER_ORDER.map((gemTier, index) =>
114 {
115 const tier = index + 1;
116 let metalId;
117 if (tier <= 3)
118 { metalId = GatherMaterialId.silver; }
119 else if (tier <= 6)
120 { metalId = GatherMaterialId.gold; }
121 else
122 { metalId = GatherMaterialId.electrum; }
123 const metalBarItemId = metalId === GatherMaterialId.electrum
124 ? MetalItemId.electrumBar
125 : metalId === GatherMaterialId.gold
126 ? MetalItemId.goldBar
127 : MetalItemId.silverBar;
128 return Object.freeze({
129 tier,
130 gemTier,
131 cutGemItemId: cutGemItemId(gemTier),
132 metalId,
133 metalBarItemId,
134 metalQuantity: tier,
135 stationId: CraftingStationId.jeweleringStation,
136 skillId: SkillId.jewelering,
137 minSkillLevel: tierMinSkillLevel(gemTier)
138 });
139 })
140 );
141
142 106 function buildRoughGemDefinitions ()
143 107 {
144 108 const out = {};
@@ -259,7 +223,7 @@ export function gemCutRecipes ()
259 223 return Object.freeze({
260 224 recipeId: `cut-${gemTier}`,
261 225 craftGroup: "cut-gem",
262 craftGroupLabel: `Cut ${gemName}`,
226 craftGroupLabel: "Cut gem",
263 227 stationId: CraftingStationId.jeweleringStation,
264 228 output: { itemId: cutGemItemId(gemTier), quantity: 1 },
265 229 inputs: [{ itemId: roughGemItemId(gemTier), quantity: 1 }],
@@ -3,7 +3,6 @@ import
3 {
3 {
4 GemTier,
4 GemTier,
5 GEM_TIER_ORDER,
5 GEM_TIER_ORDER,
6 GatherMaterialId,
7 MATERIAL_DISPLAY_NAME,
6 MATERIAL_DISPLAY_NAME,
8 WOOD_TIER_ORDER,
7 WOOD_TIER_ORDER,
9 gemTierForWood,
8 gemTierForWood,
@@ -13,7 +12,6 @@ import
13 } from "./materialTiers.js";
12 } from "./materialTiers.js";
14import { EquipmentKind } from "./equipmentKinds.js";
13import { EquipmentKind } from "./equipmentKinds.js";
15import { CraftingStationId } from "./craftingStations.js";
14import { CraftingStationId } from "./craftingStations.js";
16import { MetalItemId } from "./metalItems.js";
17import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
15import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
18import { SkillId } from "./skills.js";
16import { SkillId } from "./skills.js";
19import { AttackType } from "./attackTypes.js";
17import { AttackType } from "./attackTypes.js";
@@ -105,40 +103,6 @@ export function staffItemIdForWood (woodTier)
105 return STAFF_ITEM_BY_WOOD[woodTier] ?? null;
103 return STAFF_ITEM_BY_WOOD[woodTier] ?? null;
106}
104}
107
105
108/**
109 * Future jewellery at the jewelering station (not live craft recipes yet).
110 * Metal quantity = gem tier rank; silver (1–3), gold (4–6), electrum (7).
111 */
112export const JEWELRY_RECIPE_GUIDELINES = Object.freeze(
113 GEM_TIER_ORDER.map((gemTier, index) =>
114 {
115 const tier = index + 1;
116 let metalId;
117 if (tier <= 3)
118 { metalId = GatherMaterialId.silver; }
119 else if (tier <= 6)
120 { metalId = GatherMaterialId.gold; }
121 else
122 { metalId = GatherMaterialId.electrum; }
123 const metalBarItemId = metalId === GatherMaterialId.electrum
124 ? MetalItemId.electrumBar
125 : metalId === GatherMaterialId.gold
126 ? MetalItemId.goldBar
127 : MetalItemId.silverBar;
128 return Object.freeze({
129 tier,
130 gemTier,
131 cutGemItemId: cutGemItemId(gemTier),
132 metalId,
133 metalBarItemId,
134 metalQuantity: tier,
135 stationId: CraftingStationId.jeweleringStation,
136 skillId: SkillId.jewelering,
137 minSkillLevel: tierMinSkillLevel(gemTier)
138 });
139 })
140);
141
142function buildRoughGemDefinitions ()
106function buildRoughGemDefinitions ()
143{
107{
144 const out = {};
108 const out = {};
@@ -259,7 +223,7 @@ export function gemCutRecipes ()
259 return Object.freeze({
223 return Object.freeze({
260 recipeId: `cut-${gemTier}`,
224 recipeId: `cut-${gemTier}`,
261 craftGroup: "cut-gem",
225 craftGroup: "cut-gem",
262 craftGroupLabel: `Cut ${gemName}`,
226 craftGroupLabel: "Cut gem",
263 stationId: CraftingStationId.jeweleringStation,
227 stationId: CraftingStationId.jeweleringStation,
264 output: { itemId: cutGemItemId(gemTier), quantity: 1 },
228 output: { itemId: cutGemItemId(gemTier), quantity: 1 },
265 inputs: [{ itemId: roughGemItemId(gemTier), quantity: 1 }],
229 inputs: [{ itemId: roughGemItemId(gemTier), quantity: 1 }],
shared/definitions/items.js +15 −3
@@ -20,6 +20,7 @@ import { POTION_MAX_STACK } from "./alchemy.js";
20 20 import { SpellbookItemId, SPELLBOOK_ITEM_DEFINITIONS } from "./spellItems.js";
21 21 import { FISH_ITEM_DEFINITIONS, FishingToolItemId } from "./fishItems.js";
22 22 import { GemItemId, GEM_ITEM_DEFINITIONS } from "./gemItems.js";
23 import { JewelryItemId, JEWELRY_ITEM_DEFINITIONS } from "./jewelryItems.js";
23 24 import { SwordItemId, SWORD_ITEM_DEFINITIONS } from "./swordItems.js";
24 25 import { WarAxeItemId, WAR_AXE_ITEM_DEFINITIONS } from "./warAxeItems.js";
25 26 import { EssenceItemId, ESSENCE_ITEM_DEFINITIONS } from "./essenceItems.js";
@@ -57,6 +58,7 @@ export const ItemId = Object.freeze({
57 58 ...HerbItemId,
58 59 ...RangedItemId,
59 60 ...GemItemId,
61 ...JewelryItemId,
60 62 ...SwordItemId,
61 63 ...WarAxeItemId
62 64 });
@@ -67,17 +69,26 @@ export const EQUIPMENT_SLOT = Object.freeze({
67 69 legs: "legs",
68 70 boots: "boots",
69 71 weapon: "weapon",
70 offhand: "offhand"
72 offhand: "offhand",
73 ring: "ring",
74 bracelet: "bracelet",
75 amulet: "amulet"
71 76 });
72 77
73 /** Back → front. Weapon sits above chest but under legs (legs also cover shirt hem). */
78 /**
79 * Back → front.
80 * Ring / bracelet sit under clothing; amulet draws over clothing / offhand.
81 */
74 82 export const EQUIPMENT_DRAW_ORDER = Object.freeze([
75 83 EQUIPMENT_SLOT.boots,
84 EQUIPMENT_SLOT.ring,
85 EQUIPMENT_SLOT.bracelet,
76 86 EQUIPMENT_SLOT.chest,
77 87 EQUIPMENT_SLOT.weapon,
78 88 EQUIPMENT_SLOT.legs,
79 89 EQUIPMENT_SLOT.head,
80 EQUIPMENT_SLOT.offhand
90 EQUIPMENT_SLOT.offhand,
91 EQUIPMENT_SLOT.amulet
81 92 ]);
82 93
83 94 export const DEFAULT_MAX_STACK = 99;
@@ -323,6 +334,7 @@ export const ITEM_DEFINITIONS = Object.freeze({
323 334 ...SPELLBOOK_ITEM_DEFINITIONS,
324 335 ...FISH_ITEM_DEFINITIONS,
325 336 ...GEM_ITEM_DEFINITIONS,
337 ...JEWELRY_ITEM_DEFINITIONS,
326 338 ...SWORD_ITEM_DEFINITIONS,
327 339 ...WAR_AXE_ITEM_DEFINITIONS,
328 340 ...ESSENCE_ITEM_DEFINITIONS,
@@ -20,6 +20,7 @@ import { POTION_MAX_STACK } from "./alchemy.js";
20import { SpellbookItemId, SPELLBOOK_ITEM_DEFINITIONS } from "./spellItems.js";
20import { SpellbookItemId, SPELLBOOK_ITEM_DEFINITIONS } from "./spellItems.js";
21import { FISH_ITEM_DEFINITIONS, FishingToolItemId } from "./fishItems.js";
21import { FISH_ITEM_DEFINITIONS, FishingToolItemId } from "./fishItems.js";
22import { GemItemId, GEM_ITEM_DEFINITIONS } from "./gemItems.js";
22import { GemItemId, GEM_ITEM_DEFINITIONS } from "./gemItems.js";
23import { JewelryItemId, JEWELRY_ITEM_DEFINITIONS } from "./jewelryItems.js";
23import { SwordItemId, SWORD_ITEM_DEFINITIONS } from "./swordItems.js";
24import { SwordItemId, SWORD_ITEM_DEFINITIONS } from "./swordItems.js";
24import { WarAxeItemId, WAR_AXE_ITEM_DEFINITIONS } from "./warAxeItems.js";
25import { WarAxeItemId, WAR_AXE_ITEM_DEFINITIONS } from "./warAxeItems.js";
25import { EssenceItemId, ESSENCE_ITEM_DEFINITIONS } from "./essenceItems.js";
26import { EssenceItemId, ESSENCE_ITEM_DEFINITIONS } from "./essenceItems.js";
@@ -57,6 +58,7 @@ export const ItemId = Object.freeze({
57 ...HerbItemId,
58 ...HerbItemId,
58 ...RangedItemId,
59 ...RangedItemId,
59 ...GemItemId,
60 ...GemItemId,
61 ...JewelryItemId,
60 ...SwordItemId,
62 ...SwordItemId,
61 ...WarAxeItemId
63 ...WarAxeItemId
62});
64});
@@ -67,17 +69,26 @@ export const EQUIPMENT_SLOT = Object.freeze({
67 legs: "legs",
69 legs: "legs",
68 boots: "boots",
70 boots: "boots",
69 weapon: "weapon",
71 weapon: "weapon",
70 offhand: "offhand"
72 offhand: "offhand",
73 ring: "ring",
74 bracelet: "bracelet",
75 amulet: "amulet"
71});
76});
72
77
73/** Back → front. Weapon sits above chest but under legs (legs also cover shirt hem). */
78/**
79 * Back → front.
80 * Ring / bracelet sit under clothing; amulet draws over clothing / offhand.
81 */
74export const EQUIPMENT_DRAW_ORDER = Object.freeze([
82export const EQUIPMENT_DRAW_ORDER = Object.freeze([
75 EQUIPMENT_SLOT.boots,
83 EQUIPMENT_SLOT.boots,
84 EQUIPMENT_SLOT.ring,
85 EQUIPMENT_SLOT.bracelet,
76 EQUIPMENT_SLOT.chest,
86 EQUIPMENT_SLOT.chest,
77 EQUIPMENT_SLOT.weapon,
87 EQUIPMENT_SLOT.weapon,
78 EQUIPMENT_SLOT.legs,
88 EQUIPMENT_SLOT.legs,
79 EQUIPMENT_SLOT.head,
89 EQUIPMENT_SLOT.head,
80 EQUIPMENT_SLOT.offhand
90 EQUIPMENT_SLOT.offhand,
91 EQUIPMENT_SLOT.amulet
81]);
92]);
82
93
83export const DEFAULT_MAX_STACK = 99;
94export const DEFAULT_MAX_STACK = 99;
@@ -323,6 +334,7 @@ export const ITEM_DEFINITIONS = Object.freeze({
323 ...SPELLBOOK_ITEM_DEFINITIONS,
334 ...SPELLBOOK_ITEM_DEFINITIONS,
324 ...FISH_ITEM_DEFINITIONS,
335 ...FISH_ITEM_DEFINITIONS,
325 ...GEM_ITEM_DEFINITIONS,
336 ...GEM_ITEM_DEFINITIONS,
337 ...JEWELRY_ITEM_DEFINITIONS,
326 ...SWORD_ITEM_DEFINITIONS,
338 ...SWORD_ITEM_DEFINITIONS,
327 ...WAR_AXE_ITEM_DEFINITIONS,
339 ...WAR_AXE_ITEM_DEFINITIONS,
328 ...ESSENCE_ITEM_DEFINITIONS,
340 ...ESSENCE_ITEM_DEFINITIONS,
shared/definitions/jewelryItems.js added +248 −0
@@ -0,0 +1,248 @@
1 import { ItemCategory } from "./itemCategories.js";
2 import
3 {
4 GemTier,
5 GEM_TIER_ORDER,
6 GatherMaterialId,
7 MATERIAL_DISPLAY_NAME,
8 clothTierForGem,
9 tierMinSkillLevel,
10 tierRank
11 } from "./materialTiers.js";
12 import { EquipmentKind } from "./equipmentKinds.js";
13 import { CraftingStationId } from "./craftingStations.js";
14 import { MetalItemId } from "./metalItems.js";
15 import { cutGemItemId } from "./gemItems.js";
16 import { yarnItemId } from "./clothItems.js";
17 import { SkillId } from "./skills.js";
18 import { equipImageName } from "./tileSprites.js";
19
20 /**
21 * Jewellery pieces (ring / bracelet / amulet) set at the jewelering station.
22 * Metal: silver (gem tiers 1–3), gold (4–6), electrum (7).
23 * Inputs: 1 bar + 1 cut gem; amulets also need 1 matching-tier yarn.
24 * Tint: red = metal, blue = gem, green = yarn (amulet only).
25 * Descriptions are filled once unique effects are authored.
26 */
27
28 export const JewelryPiece = Object.freeze({
29 ring: "ring",
30 bracelet: "bracelet",
31 amulet: "amulet"
32 });
33
34 export const JEWELRY_PIECE_ORDER = Object.freeze([
35 JewelryPiece.ring,
36 JewelryPiece.bracelet,
37 JewelryPiece.amulet
38 ]);
39
40 /** Item IDs 561–581: rings, bracelets, amulets × 7 gem tiers. */
41 export const JewelryItemId = Object.freeze({
42 tourmalineRing: 561,
43 alexandriteRing: 562,
44 opalRing: 563,
45 diamondRing: 564,
46 emeraldRing: 565,
47 rubyRing: 566,
48 jadeiteRing: 567,
49 tourmalineBracelet: 568,
50 alexandriteBracelet: 569,
51 opalBracelet: 570,
52 diamondBracelet: 571,
53 emeraldBracelet: 572,
54 rubyBracelet: 573,
55 jadeiteBracelet: 574,
56 tourmalineAmulet: 575,
57 alexandriteAmulet: 576,
58 opalAmulet: 577,
59 diamondAmulet: 578,
60 emeraldAmulet: 579,
61 rubyAmulet: 580,
62 jadeiteAmulet: 581
63 });
64
65 const RING_BY_GEM = Object.freeze({
66 [GemTier.tourmaline]: JewelryItemId.tourmalineRing,
67 [GemTier.alexandrite]: JewelryItemId.alexandriteRing,
68 [GemTier.opal]: JewelryItemId.opalRing,
69 [GemTier.diamond]: JewelryItemId.diamondRing,
70 [GemTier.emerald]: JewelryItemId.emeraldRing,
71 [GemTier.ruby]: JewelryItemId.rubyRing,
72 [GemTier.jadeite]: JewelryItemId.jadeiteRing
73 });
74
75 const BRACELET_BY_GEM = Object.freeze({
76 [GemTier.tourmaline]: JewelryItemId.tourmalineBracelet,
77 [GemTier.alexandrite]: JewelryItemId.alexandriteBracelet,
78 [GemTier.opal]: JewelryItemId.opalBracelet,
79 [GemTier.diamond]: JewelryItemId.diamondBracelet,
80 [GemTier.emerald]: JewelryItemId.emeraldBracelet,
81 [GemTier.ruby]: JewelryItemId.rubyBracelet,
82 [GemTier.jadeite]: JewelryItemId.jadeiteBracelet
83 });
84
85 const AMULET_BY_GEM = Object.freeze({
86 [GemTier.tourmaline]: JewelryItemId.tourmalineAmulet,
87 [GemTier.alexandrite]: JewelryItemId.alexandriteAmulet,
88 [GemTier.opal]: JewelryItemId.opalAmulet,
89 [GemTier.diamond]: JewelryItemId.diamondAmulet,
90 [GemTier.emerald]: JewelryItemId.emeraldAmulet,
91 [GemTier.ruby]: JewelryItemId.rubyAmulet,
92 [GemTier.jadeite]: JewelryItemId.jadeiteAmulet
93 });
94
95 export function jewelryMetalIdForGemTier (gemTier)
96 {
97 const rank = tierRank(gemTier);
98 if (rank <= 3)
99 { return GatherMaterialId.silver; }
100 if (rank <= 6)
101 { return GatherMaterialId.gold; }
102 return GatherMaterialId.electrum;
103 }
104
105 export function jewelryMetalBarItemId (metalId)
106 {
107 if (metalId === GatherMaterialId.electrum)
108 { return MetalItemId.electrumBar; }
109 if (metalId === GatherMaterialId.gold)
110 { return MetalItemId.goldBar; }
111 return MetalItemId.silverBar;
112 }
113
114 export function jewelryItemIdFor (piece, gemTier)
115 {
116 if (piece === JewelryPiece.ring)
117 { return RING_BY_GEM[gemTier] ?? null; }
118 if (piece === JewelryPiece.bracelet)
119 { return BRACELET_BY_GEM[gemTier] ?? null; }
120 if (piece === JewelryPiece.amulet)
121 { return AMULET_BY_GEM[gemTier] ?? null; }
122 return null;
123 }
124
125 function pieceEquipSlot (piece)
126 {
127 if (piece === JewelryPiece.ring)
128 { return "ring"; }
129 if (piece === JewelryPiece.bracelet)
130 { return "bracelet"; }
131 return "amulet";
132 }
133
134 function pieceDisplayNoun (piece)
135 {
136 if (piece === JewelryPiece.ring)
137 { return "ring"; }
138 if (piece === JewelryPiece.bracelet)
139 { return "bracelet"; }
140 return "amulet";
141 }
142
143 function buildPieceDefinitions (piece, byGem)
144 {
145 const out = {};
146 for (const gemTier of GEM_TIER_ORDER)
147 {
148 const itemId = byGem[gemTier];
149 const metalId = jewelryMetalIdForGemTier(gemTier);
150 const clothTier = piece === JewelryPiece.amulet ? clothTierForGem(gemTier) : null;
151 const metalName = MATERIAL_DISPLAY_NAME[metalId] ?? metalId;
152 const gemName = MATERIAL_DISPLAY_NAME[gemTier] ?? gemTier;
153 const noun = pieceDisplayNoun(piece);
154 out[itemId] = Object.freeze({
155 itemId,
156 key: `${gemTier}-${piece}`,
157 displayName: `${metalName} ${gemName.toLowerCase()} ${noun}`,
158 /** Filled when unique worn effects are authored. */
159 description: "",
160 seedValue: tierRank(gemTier) * (piece === JewelryPiece.amulet ? 5 : 4),
161 stackable: false,
162 maxStackSize: 1,
163 uniqueInstance: false,
164 category: ItemCategory.finished,
165 iconKey: "jewelery",
166 defaultState: piece,
167 tier: gemTier,
168 gemTier,
169 metalTier: metalId,
170 ...(clothTier ? { clothTier } : {}),
171 tintFromTier: true,
172 dualTintFromTier: true,
173 jewelryTint: true,
174 equipment: Object.freeze({
175 slot: pieceEquipSlot(piece),
176 tier: gemTier,
177 kind: EquipmentKind.jewelry,
178 tintFromTier: true,
179 dualTintFromTier: true,
180 equipSprite: equipImageName("item", "jewelery", `${piece}-equip`)
181 }),
182 npcShopAllowed: true
183 });
184 }
185 return out;
186 }
187
188 export const JEWELRY_ITEM_DEFINITIONS = Object.freeze({
189 ...buildPieceDefinitions(JewelryPiece.ring, RING_BY_GEM),
190 ...buildPieceDefinitions(JewelryPiece.bracelet, BRACELET_BY_GEM),
191 ...buildPieceDefinitions(JewelryPiece.amulet, AMULET_BY_GEM)
192 });
193
194 /**
195 * Live jewelering recipes: 1 precious bar + 1 cut gem (+ 1 yarn for amulets).
196 * Metal quantity is always 1 (not gem-tier rank).
197 */
198 export function jewelryCraftRecipes ()
199 {
200 const out = [];
201 for (const piece of JEWELRY_PIECE_ORDER)
202 {
203 const noun = pieceDisplayNoun(piece);
204 const label = noun.charAt(0).toUpperCase() + noun.slice(1);
205 for (const gemTier of GEM_TIER_ORDER)
206 {
207 const metalId = jewelryMetalIdForGemTier(gemTier);
208 const inputs = [
209 { itemId: jewelryMetalBarItemId(metalId), quantity: 1 },
210 { itemId: cutGemItemId(gemTier), quantity: 1 }
211 ];
212 if (piece === JewelryPiece.amulet)
213 { inputs.push({ itemId: yarnItemId(clothTierForGem(gemTier)), quantity: 1 }); }
214 out.push(Object.freeze({
215 recipeId: `${piece}-${gemTier}`,
216 craftGroup: piece,
217 craftGroupLabel: label,
218 stationId: CraftingStationId.jeweleringStation,
219 output: { itemId: jewelryItemIdFor(piece, gemTier), quantity: 1 },
220 inputs,
221 minSkillLevel: tierMinSkillLevel(gemTier),
222 skillId: SkillId.jewelering,
223 xpMaterial: gemTier
224 }));
225 }
226 }
227 return out;
228 }
229
230 /** @deprecated Prefer {@link jewelryCraftRecipes}; kept for callers that listed metal/gem pairing. */
231 export const JEWELRY_RECIPE_GUIDELINES = Object.freeze(
232 GEM_TIER_ORDER.map((gemTier) =>
233 {
234 const metalId = jewelryMetalIdForGemTier(gemTier);
235 return Object.freeze({
236 tier: tierRank(gemTier),
237 gemTier,
238 cutGemItemId: cutGemItemId(gemTier),
239 metalId,
240 metalBarItemId: jewelryMetalBarItemId(metalId),
241 metalQuantity: 1,
242 yarnItemId: yarnItemId(clothTierForGem(gemTier)),
243 stationId: CraftingStationId.jeweleringStation,
244 skillId: SkillId.jewelering,
245 minSkillLevel: tierMinSkillLevel(gemTier)
246 });
247 })
248 );
@@ -0,0 +1,248 @@
1import { ItemCategory } from "./itemCategories.js";
2import
3 {
4 GemTier,
5 GEM_TIER_ORDER,
6 GatherMaterialId,
7 MATERIAL_DISPLAY_NAME,
8 clothTierForGem,
9 tierMinSkillLevel,
10 tierRank
11 } from "./materialTiers.js";
12import { EquipmentKind } from "./equipmentKinds.js";
13import { CraftingStationId } from "./craftingStations.js";
14import { MetalItemId } from "./metalItems.js";
15import { cutGemItemId } from "./gemItems.js";
16import { yarnItemId } from "./clothItems.js";
17import { SkillId } from "./skills.js";
18import { equipImageName } from "./tileSprites.js";
19
20/**
21 * Jewellery pieces (ring / bracelet / amulet) set at the jewelering station.
22 * Metal: silver (gem tiers 1–3), gold (4–6), electrum (7).
23 * Inputs: 1 bar + 1 cut gem; amulets also need 1 matching-tier yarn.
24 * Tint: red = metal, blue = gem, green = yarn (amulet only).
25 * Descriptions are filled once unique effects are authored.
26 */
27
28export const JewelryPiece = Object.freeze({
29 ring: "ring",
30 bracelet: "bracelet",
31 amulet: "amulet"
32});
33
34export const JEWELRY_PIECE_ORDER = Object.freeze([
35 JewelryPiece.ring,
36 JewelryPiece.bracelet,
37 JewelryPiece.amulet
38]);
39
40/** Item IDs 561–581: rings, bracelets, amulets × 7 gem tiers. */
41export const JewelryItemId = Object.freeze({
42 tourmalineRing: 561,
43 alexandriteRing: 562,
44 opalRing: 563,
45 diamondRing: 564,
46 emeraldRing: 565,
47 rubyRing: 566,
48 jadeiteRing: 567,
49 tourmalineBracelet: 568,
50 alexandriteBracelet: 569,
51 opalBracelet: 570,
52 diamondBracelet: 571,
53 emeraldBracelet: 572,
54 rubyBracelet: 573,
55 jadeiteBracelet: 574,
56 tourmalineAmulet: 575,
57 alexandriteAmulet: 576,
58 opalAmulet: 577,
59 diamondAmulet: 578,
60 emeraldAmulet: 579,
61 rubyAmulet: 580,
62 jadeiteAmulet: 581
63});
64
65const RING_BY_GEM = Object.freeze({
66 [GemTier.tourmaline]: JewelryItemId.tourmalineRing,
67 [GemTier.alexandrite]: JewelryItemId.alexandriteRing,
68 [GemTier.opal]: JewelryItemId.opalRing,
69 [GemTier.diamond]: JewelryItemId.diamondRing,
70 [GemTier.emerald]: JewelryItemId.emeraldRing,
71 [GemTier.ruby]: JewelryItemId.rubyRing,
72 [GemTier.jadeite]: JewelryItemId.jadeiteRing
73});
74
75const BRACELET_BY_GEM = Object.freeze({
76 [GemTier.tourmaline]: JewelryItemId.tourmalineBracelet,
77 [GemTier.alexandrite]: JewelryItemId.alexandriteBracelet,
78 [GemTier.opal]: JewelryItemId.opalBracelet,
79 [GemTier.diamond]: JewelryItemId.diamondBracelet,
80 [GemTier.emerald]: JewelryItemId.emeraldBracelet,
81 [GemTier.ruby]: JewelryItemId.rubyBracelet,
82 [GemTier.jadeite]: JewelryItemId.jadeiteBracelet
83});
84
85const AMULET_BY_GEM = Object.freeze({
86 [GemTier.tourmaline]: JewelryItemId.tourmalineAmulet,
87 [GemTier.alexandrite]: JewelryItemId.alexandriteAmulet,
88 [GemTier.opal]: JewelryItemId.opalAmulet,
89 [GemTier.diamond]: JewelryItemId.diamondAmulet,
90 [GemTier.emerald]: JewelryItemId.emeraldAmulet,
91 [GemTier.ruby]: JewelryItemId.rubyAmulet,
92 [GemTier.jadeite]: JewelryItemId.jadeiteAmulet
93});
94
95export function jewelryMetalIdForGemTier (gemTier)
96{
97 const rank = tierRank(gemTier);
98 if (rank <= 3)
99 { return GatherMaterialId.silver; }
100 if (rank <= 6)
101 { return GatherMaterialId.gold; }
102 return GatherMaterialId.electrum;
103}
104
105export function jewelryMetalBarItemId (metalId)
106{
107 if (metalId === GatherMaterialId.electrum)
108 { return MetalItemId.electrumBar; }
109 if (metalId === GatherMaterialId.gold)
110 { return MetalItemId.goldBar; }
111 return MetalItemId.silverBar;
112}
113
114export function jewelryItemIdFor (piece, gemTier)
115{
116 if (piece === JewelryPiece.ring)
117 { return RING_BY_GEM[gemTier] ?? null; }
118 if (piece === JewelryPiece.bracelet)
119 { return BRACELET_BY_GEM[gemTier] ?? null; }
120 if (piece === JewelryPiece.amulet)
121 { return AMULET_BY_GEM[gemTier] ?? null; }
122 return null;
123}
124
125function pieceEquipSlot (piece)
126{
127 if (piece === JewelryPiece.ring)
128 { return "ring"; }
129 if (piece === JewelryPiece.bracelet)
130 { return "bracelet"; }
131 return "amulet";
132}
133
134function pieceDisplayNoun (piece)
135{
136 if (piece === JewelryPiece.ring)
137 { return "ring"; }
138 if (piece === JewelryPiece.bracelet)
139 { return "bracelet"; }
140 return "amulet";
141}
142
143function buildPieceDefinitions (piece, byGem)
144{
145 const out = {};
146 for (const gemTier of GEM_TIER_ORDER)
147 {
148 const itemId = byGem[gemTier];
149 const metalId = jewelryMetalIdForGemTier(gemTier);
150 const clothTier = piece === JewelryPiece.amulet ? clothTierForGem(gemTier) : null;
151 const metalName = MATERIAL_DISPLAY_NAME[metalId] ?? metalId;
152 const gemName = MATERIAL_DISPLAY_NAME[gemTier] ?? gemTier;
153 const noun = pieceDisplayNoun(piece);
154 out[itemId] = Object.freeze({
155 itemId,
156 key: `${gemTier}-${piece}`,
157 displayName: `${metalName} ${gemName.toLowerCase()} ${noun}`,
158 /** Filled when unique worn effects are authored. */
159 description: "",
160 seedValue: tierRank(gemTier) * (piece === JewelryPiece.amulet ? 5 : 4),
161 stackable: false,
162 maxStackSize: 1,
163 uniqueInstance: false,
164 category: ItemCategory.finished,
165 iconKey: "jewelery",
166 defaultState: piece,
167 tier: gemTier,
168 gemTier,
169 metalTier: metalId,
170 ...(clothTier ? { clothTier } : {}),
171 tintFromTier: true,
172 dualTintFromTier: true,
173 jewelryTint: true,
174 equipment: Object.freeze({
175 slot: pieceEquipSlot(piece),
176 tier: gemTier,
177 kind: EquipmentKind.jewelry,
178 tintFromTier: true,
179 dualTintFromTier: true,
180 equipSprite: equipImageName("item", "jewelery", `${piece}-equip`)
181 }),
182 npcShopAllowed: true
183 });
184 }
185 return out;
186}
187
188export const JEWELRY_ITEM_DEFINITIONS = Object.freeze({
189 ...buildPieceDefinitions(JewelryPiece.ring, RING_BY_GEM),
190 ...buildPieceDefinitions(JewelryPiece.bracelet, BRACELET_BY_GEM),
191 ...buildPieceDefinitions(JewelryPiece.amulet, AMULET_BY_GEM)
192});
193
194/**
195 * Live jewelering recipes: 1 precious bar + 1 cut gem (+ 1 yarn for amulets).
196 * Metal quantity is always 1 (not gem-tier rank).
197 */
198export function jewelryCraftRecipes ()
199{
200 const out = [];
201 for (const piece of JEWELRY_PIECE_ORDER)
202 {
203 const noun = pieceDisplayNoun(piece);
204 const label = noun.charAt(0).toUpperCase() + noun.slice(1);
205 for (const gemTier of GEM_TIER_ORDER)
206 {
207 const metalId = jewelryMetalIdForGemTier(gemTier);
208 const inputs = [
209 { itemId: jewelryMetalBarItemId(metalId), quantity: 1 },
210 { itemId: cutGemItemId(gemTier), quantity: 1 }
211 ];
212 if (piece === JewelryPiece.amulet)
213 { inputs.push({ itemId: yarnItemId(clothTierForGem(gemTier)), quantity: 1 }); }
214 out.push(Object.freeze({
215 recipeId: `${piece}-${gemTier}`,
216 craftGroup: piece,
217 craftGroupLabel: label,
218 stationId: CraftingStationId.jeweleringStation,
219 output: { itemId: jewelryItemIdFor(piece, gemTier), quantity: 1 },
220 inputs,
221 minSkillLevel: tierMinSkillLevel(gemTier),
222 skillId: SkillId.jewelering,
223 xpMaterial: gemTier
224 }));
225 }
226 }
227 return out;
228}
229
230/** @deprecated Prefer {@link jewelryCraftRecipes}; kept for callers that listed metal/gem pairing. */
231export const JEWELRY_RECIPE_GUIDELINES = Object.freeze(
232 GEM_TIER_ORDER.map((gemTier) =>
233 {
234 const metalId = jewelryMetalIdForGemTier(gemTier);
235 return Object.freeze({
236 tier: tierRank(gemTier),
237 gemTier,
238 cutGemItemId: cutGemItemId(gemTier),
239 metalId,
240 metalBarItemId: jewelryMetalBarItemId(metalId),
241 metalQuantity: 1,
242 yarnItemId: yarnItemId(clothTierForGem(gemTier)),
243 stationId: CraftingStationId.jeweleringStation,
244 skillId: SkillId.jewelering,
245 minSkillLevel: tierMinSkillLevel(gemTier)
246 });
247 })
248);
shared/definitions/materialTiers.js +7 −0
@@ -579,6 +579,13 @@ export function clothTierForWood (woodTier)
579 579 return CLOTH_TIER_ORDER[idx >= 0 ? idx : 0] ?? ClothTier.cotton;
580 580 }
581 581
582 /** Matching cloth fibre for a gemstone (tourmaline↔cotton … jadeite↔dragonweave). */
583 export function clothTierForGem (gemTier)
584 {
585 const idx = GEM_TIER_ORDER.indexOf(gemTier);
586 return CLOTH_TIER_ORDER[idx >= 0 ? idx : 0] ?? ClothTier.cotton;
587 }
588
582 589 export function metalTierForWood (woodTier)
583 590 {
584 591 return METAL_TIER_FOR_WOOD[woodTier] ?? MaterialTier.bronze;
@@ -579,6 +579,13 @@ export function clothTierForWood (woodTier)
579 return CLOTH_TIER_ORDER[idx >= 0 ? idx : 0] ?? ClothTier.cotton;
579 return CLOTH_TIER_ORDER[idx >= 0 ? idx : 0] ?? ClothTier.cotton;
580}
580}
581
581
582/** Matching cloth fibre for a gemstone (tourmaline↔cotton … jadeite↔dragonweave). */
583export function clothTierForGem (gemTier)
584{
585 const idx = GEM_TIER_ORDER.indexOf(gemTier);
586 return CLOTH_TIER_ORDER[idx >= 0 ? idx : 0] ?? ClothTier.cotton;
587}
588
582export function metalTierForWood (woodTier)
589export function metalTierForWood (woodTier)
583{
590{
584 return METAL_TIER_FOR_WOOD[woodTier] ?? MaterialTier.bronze;
591 return METAL_TIER_FOR_WOOD[woodTier] ?? MaterialTier.bronze;
shared/equipment/stats.js +2 −0
@@ -39,6 +39,8 @@ export function equipMinSkillId (equipmentDef)
39 39 case EquipmentKind.plantClippers:
40 40 case EquipmentKind.shears:
41 41 return SkillId.herbalism;
42 case EquipmentKind.jewelry:
43 return SkillId.jewelering;
42 44 default:
43 45 return null;
44 46 }
@@ -39,6 +39,8 @@ export function equipMinSkillId (equipmentDef)
39 case EquipmentKind.plantClippers:
39 case EquipmentKind.plantClippers:
40 case EquipmentKind.shears:
40 case EquipmentKind.shears:
41 return SkillId.herbalism;
41 return SkillId.herbalism;
42 case EquipmentKind.jewelry:
43 return SkillId.jewelering;
42 default:
44 default:
43 return null;
45 return null;
44 }
46 }
shared/items/inventory.js +11 −1
@@ -1,5 +1,15 @@
1 1 export const INVENTORY_SLOTS = 32;
2 export const EQUIPMENT_SLOTS = Object.freeze(["head", "chest", "legs", "boots", "weapon", "offhand"]);
2 export const EQUIPMENT_SLOTS = Object.freeze([
3 "head",
4 "chest",
5 "legs",
6 "boots",
7 "weapon",
8 "offhand",
9 "ring",
10 "bracelet",
11 "amulet"
12 ]);
3 13
4 14 import { attachOrigins, mergeOriginLists, normalizeOrigins, splitOrigins } from "./origin.js";
5 15 import { stackRulesFor } from "./stackRules.js";
@@ -1,5 +1,15 @@
1export const INVENTORY_SLOTS = 32;
1export const INVENTORY_SLOTS = 32;
2export const EQUIPMENT_SLOTS = Object.freeze(["head", "chest", "legs", "boots", "weapon", "offhand"]);
2export const EQUIPMENT_SLOTS = Object.freeze([
3 "head",
4 "chest",
5 "legs",
6 "boots",
7 "weapon",
8 "offhand",
9 "ring",
10 "bracelet",
11 "amulet"
12]);
3
13
4import { attachOrigins, mergeOriginLists, normalizeOrigins, splitOrigins } from "./origin.js";
14import { attachOrigins, mergeOriginLists, normalizeOrigins, splitOrigins } from "./origin.js";
5import { stackRulesFor } from "./stackRules.js";
15import { stackRulesFor } from "./stackRules.js";
shared/items/starterLoadout.js +4 −1
@@ -15,7 +15,10 @@ export const DEFAULT_STARTER_EQUIPMENT = Object.freeze({
15 15 [EQUIPMENT_SLOT.legs]: null,
16 16 [EQUIPMENT_SLOT.boots]: null,
17 17 [EQUIPMENT_SLOT.weapon]: null,
18 [EQUIPMENT_SLOT.offhand]: ItemId.lantern
18 [EQUIPMENT_SLOT.offhand]: ItemId.lantern,
19 [EQUIPMENT_SLOT.ring]: null,
20 [EQUIPMENT_SLOT.bracelet]: null,
21 [EQUIPMENT_SLOT.amulet]: null
19 22 });
20 23
21 24 export const DEFAULT_STARTER_INVENTORY = Object.freeze([
@@ -15,7 +15,10 @@ export const DEFAULT_STARTER_EQUIPMENT = Object.freeze({
15 [EQUIPMENT_SLOT.legs]: null,
15 [EQUIPMENT_SLOT.legs]: null,
16 [EQUIPMENT_SLOT.boots]: null,
16 [EQUIPMENT_SLOT.boots]: null,
17 [EQUIPMENT_SLOT.weapon]: null,
17 [EQUIPMENT_SLOT.weapon]: null,
18 [EQUIPMENT_SLOT.offhand]: ItemId.lantern
18 [EQUIPMENT_SLOT.offhand]: ItemId.lantern,
19 [EQUIPMENT_SLOT.ring]: null,
20 [EQUIPMENT_SLOT.bracelet]: null,
21 [EQUIPMENT_SLOT.amulet]: null
19});
22});
20
23
21export const DEFAULT_STARTER_INVENTORY = Object.freeze([
24export const DEFAULT_STARTER_INVENTORY = Object.freeze([
shared/render/tint.js +12 −0
@@ -186,6 +186,18 @@ export function resolveItemDualTint (stackOrDef, def = null)
186 186 };
187 187 }
188 188
189 // Jewellery: red = precious metal, blue = gem, green = yarn (amulet only).
190 if (definition.jewelryTint && definition.gemTier && definition.metalTier)
191 {
192 const dual = {
193 shaft: tierTintColor(definition.metalTier),
194 tip: tierTintColor(definition.gemTier)
195 };
196 if (definition.clothTier)
197 { dual.coat = tierTintColor(definition.clothTier); }
198 return dual;
199 }
200
189 201 // Magic staff: wood shaft (red) + gem tip (blue).
190 202 if (definition.gemTier)
191 203 {
@@ -186,6 +186,18 @@ export function resolveItemDualTint (stackOrDef, def = null)
186 };
186 };
187 }
187 }
188
188
189 // Jewellery: red = precious metal, blue = gem, green = yarn (amulet only).
190 if (definition.jewelryTint && definition.gemTier && definition.metalTier)
191 {
192 const dual = {
193 shaft: tierTintColor(definition.metalTier),
194 tip: tierTintColor(definition.gemTier)
195 };
196 if (definition.clothTier)
197 { dual.coat = tierTintColor(definition.clothTier); }
198 return dual;
199 }
200
189 // Magic staff: wood shaft (red) + gem tip (blue).
201 // Magic staff: wood shaft (red) + gem tip (blue).
190 if (definition.gemTier)
202 if (definition.gemTier)
191 {
203 {
shared/skills/levelUpUnlocks.js +2 −0
@@ -149,7 +149,9 @@ function buildUnlockCatalog ()
149 149 {
150 150 const name = MATERIAL_DISPLAY_NAME[gem] ?? gem;
151 151 const cut = tierSmeltSkillLevel(gem);
152 const equip = tierMinSkillLevel(gem);
152 153 add(SkillId.jewelering, cut, `You can now cut ${name}.`);
154 add(SkillId.jewelering, equip, `You can now craft ${name} jewellery.`);
153 155 }
154 156
155 157 /** @type {Map<number, string[]>} */
@@ -149,7 +149,9 @@ function buildUnlockCatalog ()
149 {
149 {
150 const name = MATERIAL_DISPLAY_NAME[gem] ?? gem;
150 const name = MATERIAL_DISPLAY_NAME[gem] ?? gem;
151 const cut = tierSmeltSkillLevel(gem);
151 const cut = tierSmeltSkillLevel(gem);
152 const equip = tierMinSkillLevel(gem);
152 add(SkillId.jewelering, cut, `You can now cut ${name}.`);
153 add(SkillId.jewelering, cut, `You can now cut ${name}.`);
154 add(SkillId.jewelering, equip, `You can now craft ${name} jewellery.`);
153 }
155 }
154
156
155 /** @type {Map<number, string[]>} */
157 /** @type {Map<number, string[]>} */