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.
@@ -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
resolveItemDualTint10
resolveItemDualTint,11
resolveEquipTint,12
resolveEquipDualTint11
} from "../../shared/render/tint.js";13
} from "../../shared/render/tint.js";12
import { MaterialTier, GatherMaterialId, hexToRgb01, MATERIAL_TINT_HEX, rgb } from "../../shared/definitions/materialTiers.js";14
import { MaterialTier, GatherMaterialId, hexToRgb01, MATERIAL_TINT_HEX, rgb } from "../../shared/definitions/materialTiers.js";13
import { ItemId } from "../../shared/definitions/items.js";15
import { 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
135
test("material tint hex converts to 0-1 rgb at load", () =>142
test("material tint hex converts to 0-1 rgb at load", () =>