BlueGit

timfa questward

Keep dual equip tint for staves after magenta-equip carve-out.

Only skip worn dual tint when equipment is magenta-only (tintFromTier without dualTintFromTier), so staves with both flags still recolour wood and gem.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
7d596f0cabf0a70b71dcbb4a49647294ee645669
Parent
89e7b5c1
2 files changed +17 −4
server/tests/tint.test.js +8 −1
@@ -7,7 +7,9 @@ import {
7 7 dualChannelTintedRgb,
8 8 tierTintColor,
9 9 resolveItemTint,
10 resolveItemDualTint
10 resolveItemDualTint,
11 resolveEquipTint,
12 resolveEquipDualTint
11 13 } from "../../shared/render/tint.js";
12 14 import { MaterialTier, GatherMaterialId, hexToRgb01, MATERIAL_TINT_HEX, rgb } from "../../shared/definitions/materialTiers.js";
13 15 import { ItemId } from "../../shared/definitions/items.js";
@@ -130,6 +132,11 @@ test("staff dual-tints wood shaft and gem tip", () =>
130 132 assert.deepEqual(staff.shaft, tierTintColor("pine"));
131 133 assert.deepEqual(staff.tip, tierTintColor("tourmaline"));
132 134 assert.equal(resolveItemTint({ itemId: GemItemId.pineStaff }), null);
135 // Staff keeps dual equip art even though equipment.tintFromTier is also set.
136 const equipDual = resolveEquipDualTint({ itemId: GemItemId.pineStaff });
137 assert.deepEqual(equipDual.shaft, tierTintColor("pine"));
138 assert.deepEqual(equipDual.tip, tierTintColor("tourmaline"));
139 assert.equal(resolveEquipTint(GemItemId.pineStaff), null);
133 140 });
134 141
135 142 test("material tint hex converts to 0-1 rgb at load", () =>
@@ -7,7 +7,9 @@ import {
7 dualChannelTintedRgb,
7 dualChannelTintedRgb,
8 tierTintColor,
8 tierTintColor,
9 resolveItemTint,
9 resolveItemTint,
10 resolveItemDualTint
10 resolveItemDualTint,
11 resolveEquipTint,
12 resolveEquipDualTint
11} from "../../shared/render/tint.js";
13} from "../../shared/render/tint.js";
12import { MaterialTier, GatherMaterialId, hexToRgb01, MATERIAL_TINT_HEX, rgb } from "../../shared/definitions/materialTiers.js";
14import { MaterialTier, GatherMaterialId, hexToRgb01, MATERIAL_TINT_HEX, rgb } from "../../shared/definitions/materialTiers.js";
13import { ItemId } from "../../shared/definitions/items.js";
15import { ItemId } from "../../shared/definitions/items.js";
@@ -130,6 +132,11 @@ test("staff dual-tints wood shaft and gem tip", () =>
130 assert.deepEqual(staff.shaft, tierTintColor("pine"));
132 assert.deepEqual(staff.shaft, tierTintColor("pine"));
131 assert.deepEqual(staff.tip, tierTintColor("tourmaline"));
133 assert.deepEqual(staff.tip, tierTintColor("tourmaline"));
132 assert.equal(resolveItemTint({ itemId: GemItemId.pineStaff }), null);
134 assert.equal(resolveItemTint({ itemId: GemItemId.pineStaff }), null);
135 // Staff keeps dual equip art even though equipment.tintFromTier is also set.
136 const equipDual = resolveEquipDualTint({ itemId: GemItemId.pineStaff });
137 assert.deepEqual(equipDual.shaft, tierTintColor("pine"));
138 assert.deepEqual(equipDual.tip, tierTintColor("tourmaline"));
139 assert.equal(resolveEquipTint(GemItemId.pineStaff), null);
133});
140});
134
141
135test("material tint hex converts to 0-1 rgb at load", () =>
142test("material tint hex converts to 0-1 rgb at load", () =>
shared/render/tint.js +9 −3
@@ -285,8 +285,8 @@ export function resolveEquipTint (itemIdOrDef, instance = null)
285 285 { return normalizeRgb(instance.dyeColor); }
286 286 if (definition?.tint)
287 287 { return normalizeRgb(definition.tint); }
288 // Dual icon art may still use a magenta equip sprite (`equipment.tintFromTier`).
289 if (definition?.dualTintFromTier && !definition?.equipment?.tintFromTier)
288 // Dual worn art wins; magenta-only equip (e.g. plant clippers) still uses single tint.
289 if (definition?.dualTintFromTier && !equipUsesMagentaOnly(definition))
290 290 { return null; }
291 291 if (definition?.tintFromTier === "ash" && definition.tier)
292 292 { return ashTintColor(definition.tier); }
@@ -303,11 +303,17 @@ export function resolveEquipDualTint (stackOrDef, def = null)
303 303 const definition = def
304 304 ?? (stack ? itemDefinition(stack.itemId) : stackOrDef)
305 305 ?? null;
306 if (definition?.equipment?.tintFromTier)
306 if (equipUsesMagentaOnly(definition))
307 307 { return null; }
308 308 return resolveItemDualTint(stackOrDef, definition);
309 309 }
310 310
311 /** Magenta equip sprite with dual bag icon (grips hidden in hand). */
312 function equipUsesMagentaOnly (definition)
313 {
314 return !!definition?.equipment?.tintFromTier && !definition?.equipment?.dualTintFromTier;
315 }
316
311 317 function isOreItemDefinition (definition)
312 318 {
313 319 return definition?.defaultState === "ore";
@@ -285,8 +285,8 @@ export function resolveEquipTint (itemIdOrDef, instance = null)
285 { return normalizeRgb(instance.dyeColor); }
285 { return normalizeRgb(instance.dyeColor); }
286 if (definition?.tint)
286 if (definition?.tint)
287 { return normalizeRgb(definition.tint); }
287 { return normalizeRgb(definition.tint); }
288 // Dual icon art may still use a magenta equip sprite (`equipment.tintFromTier`).
288 // Dual worn art wins; magenta-only equip (e.g. plant clippers) still uses single tint.
289 if (definition?.dualTintFromTier && !definition?.equipment?.tintFromTier)
289 if (definition?.dualTintFromTier && !equipUsesMagentaOnly(definition))
290 { return null; }
290 { return null; }
291 if (definition?.tintFromTier === "ash" && definition.tier)
291 if (definition?.tintFromTier === "ash" && definition.tier)
292 { return ashTintColor(definition.tier); }
292 { return ashTintColor(definition.tier); }
@@ -303,11 +303,17 @@ export function resolveEquipDualTint (stackOrDef, def = null)
303 const definition = def
303 const definition = def
304 ?? (stack ? itemDefinition(stack.itemId) : stackOrDef)
304 ?? (stack ? itemDefinition(stack.itemId) : stackOrDef)
305 ?? null;
305 ?? null;
306 if (definition?.equipment?.tintFromTier)
306 if (equipUsesMagentaOnly(definition))
307 { return null; }
307 { return null; }
308 return resolveItemDualTint(stackOrDef, definition);
308 return resolveItemDualTint(stackOrDef, definition);
309}
309}
310
310
311/** Magenta equip sprite with dual bag icon (grips hidden in hand). */
312function equipUsesMagentaOnly (definition)
313{
314 return !!definition?.equipment?.tintFromTier && !definition?.equipment?.dualTintFromTier;
315}
316
311function isOreItemDefinition (definition)
317function isOreItemDefinition (definition)
312{
318{
313 return definition?.defaultState === "ore";
319 return definition?.defaultState === "ore";