BlueGit

timfa questward

Fix plant-clippers equip art for dual metal/leather tint.

Replace the magenta placeholder equip sprite with the inventory dual-channel mask so worn clippers recolour like the bag icon.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
60d60730624da3113fcc2f120f24129bea5f20e6
Parent
d66e49b9
2 files changed +4 −2
client/assets/items/plant-clippers/plant-clippers-equip.png Binary file +0 −0

The contents of this binary file are not shown.

server/tests/shearing.test.js +4 −2
@@ -5,7 +5,7 @@ import { CraftingStationId } from "../../shared/definitions/craftingStations.js"
5 5 import { MetalItemId } from "../../shared/definitions/metalItems.js";
6 6 import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
7 7 import { ClothItemId, rawClothItemId } from "../../shared/definitions/clothItems.js";
8 import { ItemId, itemDefinition } from "../../shared/definitions/items.js";
8 import { ItemId, itemDefinition, itemEquipSprite } from "../../shared/definitions/items.js";
9 9 import {
10 10 ClothTier,
11 11 MaterialTier,
@@ -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 } from "../../shared/render/tint.js";
19 import { resolveItemDualTint, resolveEquipTint } 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";
@@ -77,6 +77,8 @@ test("plant clippers use dual metal/leather tint and bar+leather recipe", () =>
77 77 const dual = resolveItemDualTint({ itemId: MetalItemId.bronzePlantClippers }, def);
78 78 assert.ok(dual?.shaft);
79 79 assert.ok(dual?.tip);
80 assert.equal(itemEquipSprite(MetalItemId.bronzePlantClippers), "item:plant-clippers:plant-clippers:equip");
81 assert.equal(resolveEquipTint(MetalItemId.bronzePlantClippers), null);
80 82 const recipe = recipeDefinition("plant-clippers-bronze");
81 83 assert.deepEqual(recipe.inputs, [
82 84 { itemId: ItemId.bronzeBar, quantity: 1 },
@@ -5,7 +5,7 @@ import { CraftingStationId } from "../../shared/definitions/craftingStations.js"
5import { MetalItemId } from "../../shared/definitions/metalItems.js";
5import { MetalItemId } from "../../shared/definitions/metalItems.js";
6import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
6import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
7import { ClothItemId, rawClothItemId } from "../../shared/definitions/clothItems.js";
7import { ClothItemId, rawClothItemId } from "../../shared/definitions/clothItems.js";
8import { ItemId, itemDefinition } from "../../shared/definitions/items.js";
8import { ItemId, itemDefinition, itemEquipSprite } from "../../shared/definitions/items.js";
9import {
9import {
10 ClothTier,
10 ClothTier,
11 MaterialTier,
11 MaterialTier,
@@ -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 } from "../../shared/render/tint.js";
19import { resolveItemDualTint, resolveEquipTint } 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";
@@ -77,6 +77,8 @@ test("plant clippers use dual metal/leather tint and bar+leather recipe", () =>
77 const dual = resolveItemDualTint({ itemId: MetalItemId.bronzePlantClippers }, def);
77 const dual = resolveItemDualTint({ itemId: MetalItemId.bronzePlantClippers }, def);
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");
81 assert.equal(resolveEquipTint(MetalItemId.bronzePlantClippers), null);
80 const recipe = recipeDefinition("plant-clippers-bronze");
82 const recipe = recipeDefinition("plant-clippers-bronze");
81 assert.deepEqual(recipe.inputs, [
83 assert.deepEqual(recipe.inputs, [
82 { itemId: ItemId.bronzeBar, quantity: 1 },
84 { itemId: ItemId.bronzeBar, quantity: 1 },