BlueGit

timfa questward

Restore magenta plant-clippers equip and tint worn metal only.

Equip art hides the leather grips in-hand, so worn overlays use single-channel metal tint while the bag icon keeps dual metal/leather recolour.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
e7e9ae995306362b0e6b218571416e4eb1b2f207
Parent
60d60730
5 files changed +30 −7
client/assets/items/plant-clippers/plant-clippers-equip.png Binary file +0 −0

The contents of this binary file are not shown.

client/src/render/worldView.js +9 −3
@@ -5,7 +5,13 @@ import { bakeChunkOcclusion } from "/shared/lighting/chunkOcclusion.js";
5 5 import { smoothLitCorner } from "/shared/lighting/lightCorners.js";
6 6 import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
7 7 import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
8 import { resolveItemTint, resolveEquipTint, resolveItemDualTint, normalizeRgb } from "/shared/render/tint.js";
8 import {
9 resolveItemTint,
10 resolveEquipTint,
11 resolveItemDualTint,
12 resolveEquipDualTint,
13 normalizeRgb
14 } from "/shared/render/tint.js";
9 15 import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
10 16 import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
11 17 import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
@@ -1879,7 +1885,7 @@ export class WorldView
1879 1885 const dualTint = layerDef?.iconTintFromTier
1880 1886 ? null
1881 1887 : (layer.itemId != null
1882 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
1888 ? resolveEquipDualTint({ itemId: layer.itemId }, layerDef)
1883 1889 : null);
1884 1890 const tint = layer.tint
1885 1891 ? normalizeRgb(layer.tint)
@@ -2418,7 +2424,7 @@ export class WorldView
2418 2424 const layerDef = layer.itemId != null ? itemDefinition(layer.itemId) : null;
2419 2425 entity.overlayTightFit.push(!!layerDef?.tightFit);
2420 2426 const dualTint = layer.itemId != null
2421 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
2427 ? resolveEquipDualTint({ itemId: layer.itemId }, layerDef)
2422 2428 : null;
2423 2429 entity.overlayDualTints.push(dualTint);
2424 2430 entity.overlayTints.push(
@@ -5,7 +5,13 @@ import { bakeChunkOcclusion } from "/shared/lighting/chunkOcclusion.js";
5import { smoothLitCorner } from "/shared/lighting/lightCorners.js";
5import { smoothLitCorner } from "/shared/lighting/lightCorners.js";
6import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
6import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
7import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
7import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
8import { resolveItemTint, resolveEquipTint, resolveItemDualTint, normalizeRgb } from "/shared/render/tint.js";
8import {
9 resolveItemTint,
10 resolveEquipTint,
11 resolveItemDualTint,
12 resolveEquipDualTint,
13 normalizeRgb
14} from "/shared/render/tint.js";
9import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
15import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
10import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
16import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
11import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
17import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
@@ -1879,7 +1885,7 @@ export class WorldView
1879 const dualTint = layerDef?.iconTintFromTier
1885 const dualTint = layerDef?.iconTintFromTier
1880 ? null
1886 ? null
1881 : (layer.itemId != null
1887 : (layer.itemId != null
1882 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
1888 ? resolveEquipDualTint({ itemId: layer.itemId }, layerDef)
1883 : null);
1889 : null);
1884 const tint = layer.tint
1890 const tint = layer.tint
1885 ? normalizeRgb(layer.tint)
1891 ? normalizeRgb(layer.tint)
@@ -2418,7 +2424,7 @@ export class WorldView
2418 const layerDef = layer.itemId != null ? itemDefinition(layer.itemId) : null;
2424 const layerDef = layer.itemId != null ? itemDefinition(layer.itemId) : null;
2419 entity.overlayTightFit.push(!!layerDef?.tightFit);
2425 entity.overlayTightFit.push(!!layerDef?.tightFit);
2420 const dualTint = layer.itemId != null
2426 const dualTint = layer.itemId != null
2421 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
2427 ? resolveEquipDualTint({ itemId: layer.itemId }, layerDef)
2422 : null;
2428 : null;
2423 entity.overlayDualTints.push(dualTint);
2429 entity.overlayDualTints.push(dualTint);
2424 entity.overlayTints.push(
2430 entity.overlayTints.push(
server/tests/shearing.test.js +5 −2
@@ -16,7 +16,7 @@ import {
16 16 import { MobId, mobDefinition, mobSpriteName } from "../../shared/definitions/mobs.js";
17 17 import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";
18 18 import { recipeDefinition, recipesForStation } from "../../shared/crafting/stationRecipes.js";
19 import { resolveItemDualTint, resolveEquipTint } from "../../shared/render/tint.js";
19 import { resolveItemDualTint, resolveEquipTint, resolveEquipDualTint } from "../../shared/render/tint.js";
20 20 import { resolvePlantClippers } from "../../shared/definitions/gathering.js";
21 21 import { SkillId } from "../../shared/definitions/skills.js";
22 22 import { normalizePlayerSkills } from "../../shared/skills/state.js";
@@ -78,7 +78,10 @@ test("plant clippers use dual metal/leather tint and bar+leather recipe", () =>
78 78 assert.ok(dual?.shaft);
79 79 assert.ok(dual?.tip);
80 80 assert.equal(itemEquipSprite(MetalItemId.bronzePlantClippers), "item:plant-clippers:plant-clippers:equip");
81 assert.equal(resolveEquipTint(MetalItemId.bronzePlantClippers), null);
81 assert.equal(def.equipment?.tintFromTier, true);
82 const equipTint = resolveEquipTint(MetalItemId.bronzePlantClippers);
83 assert.ok(equipTint);
84 assert.equal(resolveEquipDualTint({ itemId: MetalItemId.bronzePlantClippers }, def), null);
82 85 const recipe = recipeDefinition("plant-clippers-bronze");
83 86 assert.deepEqual(recipe.inputs, [
84 87 { itemId: ItemId.bronzeBar, quantity: 1 },
@@ -16,7 +16,7 @@ import {
16import { MobId, mobDefinition, mobSpriteName } from "../../shared/definitions/mobs.js";
16import { MobId, mobDefinition, mobSpriteName } from "../../shared/definitions/mobs.js";
17import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";
17import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";
18import { recipeDefinition, recipesForStation } from "../../shared/crafting/stationRecipes.js";
18import { recipeDefinition, recipesForStation } from "../../shared/crafting/stationRecipes.js";
19import { resolveItemDualTint, resolveEquipTint } from "../../shared/render/tint.js";
19import { resolveItemDualTint, resolveEquipTint, resolveEquipDualTint } from "../../shared/render/tint.js";
20import { resolvePlantClippers } from "../../shared/definitions/gathering.js";
20import { resolvePlantClippers } from "../../shared/definitions/gathering.js";
21import { SkillId } from "../../shared/definitions/skills.js";
21import { SkillId } from "../../shared/definitions/skills.js";
22import { normalizePlayerSkills } from "../../shared/skills/state.js";
22import { normalizePlayerSkills } from "../../shared/skills/state.js";
@@ -78,7 +78,10 @@ test("plant clippers use dual metal/leather tint and bar+leather recipe", () =>
78 assert.ok(dual?.shaft);
78 assert.ok(dual?.shaft);
79 assert.ok(dual?.tip);
79 assert.ok(dual?.tip);
80 assert.equal(itemEquipSprite(MetalItemId.bronzePlantClippers), "item:plant-clippers:plant-clippers:equip");
80 assert.equal(itemEquipSprite(MetalItemId.bronzePlantClippers), "item:plant-clippers:plant-clippers:equip");
81 assert.equal(resolveEquipTint(MetalItemId.bronzePlantClippers), null);
81 assert.equal(def.equipment?.tintFromTier, true);
82 const equipTint = resolveEquipTint(MetalItemId.bronzePlantClippers);
83 assert.ok(equipTint);
84 assert.equal(resolveEquipDualTint({ itemId: MetalItemId.bronzePlantClippers }, def), null);
82 const recipe = recipeDefinition("plant-clippers-bronze");
85 const recipe = recipeDefinition("plant-clippers-bronze");
83 assert.deepEqual(recipe.inputs, [
86 assert.deepEqual(recipe.inputs, [
84 { itemId: ItemId.bronzeBar, quantity: 1 },
87 { itemId: ItemId.bronzeBar, quantity: 1 },
shared/definitions/tierFamilies.js +2 −1
@@ -238,9 +238,10 @@ export const ITEM_FAMILIES = Object.freeze({
238 238 stackable: false,
239 239 maxStackSize: 1,
240 240 seedValue: 10,
241 /** Red = metal blades, blue = leather grips. */
241 /** Icon: red = metal blades, blue = leather grips. Equip art is magenta only (grips hidden in hand). */
242 242 dualTintFromTier: true,
243 243 leatherTierFromMetal: true,
244 equipmentTintFromTier: true,
244 245 npcShopAllowed: true,
245 246 equipmentKind: EquipmentKind.plantClippers
246 247 }),
@@ -238,9 +238,10 @@ export const ITEM_FAMILIES = Object.freeze({
238 stackable: false,
238 stackable: false,
239 maxStackSize: 1,
239 maxStackSize: 1,
240 seedValue: 10,
240 seedValue: 10,
241 /** Red = metal blades, blue = leather grips. */
241 /** Icon: red = metal blades, blue = leather grips. Equip art is magenta only (grips hidden in hand). */
242 dualTintFromTier: true,
242 dualTintFromTier: true,
243 leatherTierFromMetal: true,
243 leatherTierFromMetal: true,
244 equipmentTintFromTier: true,
244 npcShopAllowed: true,
245 npcShopAllowed: true,
245 equipmentKind: EquipmentKind.plantClippers
246 equipmentKind: EquipmentKind.plantClippers
246 }),
247 }),
shared/render/tint.js +14 −1
@@ -285,7 +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 if (definition?.dualTintFromTier)
288 // Dual icon art may still use a magenta equip sprite (`equipment.tintFromTier`).
289 if (definition?.dualTintFromTier && !definition?.equipment?.tintFromTier)
289 290 { return null; }
290 291 if (definition?.tintFromTier === "ash" && definition.tier)
291 292 { return ashTintColor(definition.tier); }
@@ -295,6 +296,18 @@ export function resolveEquipTint (itemIdOrDef, instance = null)
295 296 return null;
296 297 }
297 298
299 /** Dual tint for worn overlays. Null when equip art is single-channel magenta. */
300 export function resolveEquipDualTint (stackOrDef, def = null)
301 {
302 const stack = stackOrDef?.itemId != null ? stackOrDef : null;
303 const definition = def
304 ?? (stack ? itemDefinition(stack.itemId) : stackOrDef)
305 ?? null;
306 if (definition?.equipment?.tintFromTier)
307 { return null; }
308 return resolveItemDualTint(stackOrDef, definition);
309 }
310
298 311 function isOreItemDefinition (definition)
299 312 {
300 313 return definition?.defaultState === "ore";
@@ -285,7 +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 if (definition?.dualTintFromTier)
288 // Dual icon art may still use a magenta equip sprite (`equipment.tintFromTier`).
289 if (definition?.dualTintFromTier && !definition?.equipment?.tintFromTier)
289 { return null; }
290 { return null; }
290 if (definition?.tintFromTier === "ash" && definition.tier)
291 if (definition?.tintFromTier === "ash" && definition.tier)
291 { return ashTintColor(definition.tier); }
292 { return ashTintColor(definition.tier); }
@@ -295,6 +296,18 @@ export function resolveEquipTint (itemIdOrDef, instance = null)
295 return null;
296 return null;
296}
297}
297
298
299/** Dual tint for worn overlays. Null when equip art is single-channel magenta. */
300export function resolveEquipDualTint (stackOrDef, def = null)
301{
302 const stack = stackOrDef?.itemId != null ? stackOrDef : null;
303 const definition = def
304 ?? (stack ? itemDefinition(stack.itemId) : stackOrDef)
305 ?? null;
306 if (definition?.equipment?.tintFromTier)
307 { return null; }
308 return resolveItemDualTint(stackOrDef, definition);
309}
310
298function isOreItemDefinition (definition)
311function isOreItemDefinition (definition)
299{
312{
300 return definition?.defaultState === "ore";
313 return definition?.defaultState === "ore";