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.
The contents of this binary file are not shown.
@@ -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";5
import { smoothLitCorner } from "/shared/lighting/lightCorners.js";5
import { smoothLitCorner } from "/shared/lighting/lightCorners.js";6
import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";6
import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";7
import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";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
normalizeRgb14
} from "/shared/render/tint.js";9
import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";15
import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";10
import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";16
import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";11
import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";17
import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";@@ -1879,7 +1885,7 @@ export class WorldView1879
const dualTint = layerDef?.iconTintFromTier1885
const dualTint = layerDef?.iconTintFromTier1880
? null1886
? null1881
: (layer.itemId != null1887
: (layer.itemId != null1882
? resolveItemDualTint({ itemId: layer.itemId }, layerDef)1888
? resolveEquipDualTint({ itemId: layer.itemId }, layerDef)1883
: null);1889
: null);1884
const tint = layer.tint1890
const tint = layer.tint1885
? normalizeRgb(layer.tint)1891
? normalizeRgb(layer.tint)@@ -2418,7 +2424,7 @@ export class WorldView2418
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 != null2426
const dualTint = layer.itemId != null2421
? 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(@@ -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 {16
import { MobId, mobDefinition, mobSpriteName } from "../../shared/definitions/mobs.js";16
import { MobId, mobDefinition, mobSpriteName } from "../../shared/definitions/mobs.js";17
import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";17
import { EquipmentKind } from "../../shared/definitions/equipmentKinds.js";18
import { recipeDefinition, recipesForStation } from "../../shared/crafting/stationRecipes.js";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
import { resolvePlantClippers } from "../../shared/definitions/gathering.js";20
import { resolvePlantClippers } from "../../shared/definitions/gathering.js";21
import { SkillId } from "../../shared/definitions/skills.js";21
import { SkillId } from "../../shared/definitions/skills.js";22
import { normalizePlayerSkills } from "../../shared/skills/state.js";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
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 },