BlueGit

timfa questward

gem fix

timfa Tim Falken · pushed by timfa

Authored 2026-08-29 · 2 months ago

Hash
b67f970bbe6b8384dc03bcd150a3caa61de55611
Parent
8b1a158b
2 files changed +37 −30
server/src/assets/spriteCatalog.js +26 −20
@@ -4,25 +4,28 @@ import { BLOCK_DEFINITIONS, GROUND_DEFINITIONS, BlockType } from "../../../share
4 4 import { ITEM_DEFINITIONS } from "../../../shared/definitions/items.js";
5 5 import { MOB_DEFINITIONS } from "../../../shared/definitions/mobs.js";
6 6 import { HERB_ORDER } from "../../../shared/definitions/herbs.js";
7 import {
8 ORE_BEARING_MATERIALS,
9 oreBoulderState,
10 materialTintColor,
11 WOOD_TIER_ORDER
12 } from "../../../shared/definitions/materialTiers.js";
13 import {
14 FLOWER_COLOR_ORDER,
15 flowerBlockState,
16 flowerColorRgb
17 } from "../../../shared/definitions/dyes.js";
18 import {
19 bloomImageName,
20 equipBloomImageName,
21 equipImageName,
22 isCompanionSpriteStem,
23 parseSpriteStem,
24 spriteImageName
25 } from "../../../shared/definitions/tileSprites.js";
7 import
8 {
9 ORE_BEARING_MATERIALS,
10 oreBoulderState,
11 materialTintColor,
12 WOOD_TIER_ORDER
13 } from "../../../shared/definitions/materialTiers.js";
14 import
15 {
16 FLOWER_COLOR_ORDER,
17 flowerBlockState,
18 flowerColorRgb
19 } from "../../../shared/definitions/dyes.js";
20 import
21 {
22 bloomImageName,
23 equipBloomImageName,
24 equipImageName,
25 isCompanionSpriteStem,
26 parseSpriteStem,
27 spriteImageName
28 } from "../../../shared/definitions/tileSprites.js";
26 29 import { preferredSeasonalDefaultState, typeHasSeasonalStates, isSeasonalOverlayVariant } from "../../../shared/world/season.js";
27 30 import { composeNeighborConnectState, NEIGHBOR_CONNECT_MASK_COUNT } from "../../../shared/world/neighborConnect.js";
28 31
@@ -170,7 +173,10 @@ function mobScanDefs ()
170 173 {
171 174 if (def.usePlayerBody)
172 175 { continue; }
173 const key = def.key ?? def.mobTypeId;
176 // spriteKey reuses another mob's art folder (e.g. Shade → rat).
177 const key = def.spriteKey ?? def.key ?? def.mobTypeId;
178 if (defs[key])
179 { continue; }
174 180 defs[key] = {
175 181 key,
176 182 id: def.mobTypeId,
@@ -4,25 +4,28 @@ import { BLOCK_DEFINITIONS, GROUND_DEFINITIONS, BlockType } from "../../../share
4import { ITEM_DEFINITIONS } from "../../../shared/definitions/items.js";
4import { ITEM_DEFINITIONS } from "../../../shared/definitions/items.js";
5import { MOB_DEFINITIONS } from "../../../shared/definitions/mobs.js";
5import { MOB_DEFINITIONS } from "../../../shared/definitions/mobs.js";
6import { HERB_ORDER } from "../../../shared/definitions/herbs.js";
6import { HERB_ORDER } from "../../../shared/definitions/herbs.js";
7import {
7import
8 ORE_BEARING_MATERIALS,
8 {
9 oreBoulderState,
9 ORE_BEARING_MATERIALS,
10 materialTintColor,
10 oreBoulderState,
11 WOOD_TIER_ORDER
11 materialTintColor,
12} from "../../../shared/definitions/materialTiers.js";
12 WOOD_TIER_ORDER
13import {
13 } from "../../../shared/definitions/materialTiers.js";
14 FLOWER_COLOR_ORDER,
14import
15 flowerBlockState,
15 {
16 flowerColorRgb
16 FLOWER_COLOR_ORDER,
17} from "../../../shared/definitions/dyes.js";
17 flowerBlockState,
18import {
18 flowerColorRgb
19 bloomImageName,
19 } from "../../../shared/definitions/dyes.js";
20 equipBloomImageName,
20import
21 equipImageName,
21 {
22 isCompanionSpriteStem,
22 bloomImageName,
23 parseSpriteStem,
23 equipBloomImageName,
24 spriteImageName
24 equipImageName,
25} from "../../../shared/definitions/tileSprites.js";
25 isCompanionSpriteStem,
26 parseSpriteStem,
27 spriteImageName
28 } from "../../../shared/definitions/tileSprites.js";
26import { preferredSeasonalDefaultState, typeHasSeasonalStates, isSeasonalOverlayVariant } from "../../../shared/world/season.js";
29import { preferredSeasonalDefaultState, typeHasSeasonalStates, isSeasonalOverlayVariant } from "../../../shared/world/season.js";
27import { composeNeighborConnectState, NEIGHBOR_CONNECT_MASK_COUNT } from "../../../shared/world/neighborConnect.js";
30import { composeNeighborConnectState, NEIGHBOR_CONNECT_MASK_COUNT } from "../../../shared/world/neighborConnect.js";
28
31
@@ -170,7 +173,10 @@ function mobScanDefs ()
170 {
173 {
171 if (def.usePlayerBody)
174 if (def.usePlayerBody)
172 { continue; }
175 { continue; }
173 const key = def.key ?? def.mobTypeId;
176 // spriteKey reuses another mob's art folder (e.g. Shade → rat).
177 const key = def.spriteKey ?? def.key ?? def.mobTypeId;
178 if (defs[key])
179 { continue; }
174 defs[key] = {
180 defs[key] = {
175 key,
181 key,
176 id: def.mobTypeId,
182 id: def.mobTypeId,
shared/definitions/gemItems.js +11 −10
@@ -1,13 +1,14 @@
1 1 import { ItemCategory } from "./itemCategories.js";
2 import {
3 GemTier,
4 GEM_TIER_ORDER,
5 MATERIAL_DISPLAY_NAME,
6 WOOD_TIER_ORDER,
7 gemTierForWood,
8 tierMinSkillLevel,
9 tierRank
10 } from "./materialTiers.js";
2 import
3 {
4 GemTier,
5 GEM_TIER_ORDER,
6 MATERIAL_DISPLAY_NAME,
7 WOOD_TIER_ORDER,
8 gemTierForWood,
9 tierMinSkillLevel,
10 tierRank
11 } from "./materialTiers.js";
11 12 import { EquipmentKind } from "./equipmentKinds.js";
12 13 import { CraftingStationId } from "./craftingStations.js";
13 14 import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
@@ -82,7 +83,7 @@ function buildGemDefinitions ()
82 83 maxStackSize: DEFAULT_STACK,
83 84 uniqueInstance: false,
84 85 category: ItemCategory.ingredient,
85 iconKey: "ore",
86 iconKey: "metal",
86 87 defaultState: "ore",
87 88 tier: gemTier,
88 89 tintFromTier: true,
@@ -1,13 +1,14 @@
1import { ItemCategory } from "./itemCategories.js";
1import { ItemCategory } from "./itemCategories.js";
2import {
2import
3 GemTier,
3 {
4 GEM_TIER_ORDER,
4 GemTier,
5 MATERIAL_DISPLAY_NAME,
5 GEM_TIER_ORDER,
6 WOOD_TIER_ORDER,
6 MATERIAL_DISPLAY_NAME,
7 gemTierForWood,
7 WOOD_TIER_ORDER,
8 tierMinSkillLevel,
8 gemTierForWood,
9 tierRank
9 tierMinSkillLevel,
10} from "./materialTiers.js";
10 tierRank
11 } from "./materialTiers.js";
11import { EquipmentKind } from "./equipmentKinds.js";
12import { EquipmentKind } from "./equipmentKinds.js";
12import { CraftingStationId } from "./craftingStations.js";
13import { CraftingStationId } from "./craftingStations.js";
13import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
14import { logItemIdForWood, ashItemIdForWood } from "./woodItems.js";
@@ -82,7 +83,7 @@ function buildGemDefinitions ()
82 maxStackSize: DEFAULT_STACK,
83 maxStackSize: DEFAULT_STACK,
83 uniqueInstance: false,
84 uniqueInstance: false,
84 category: ItemCategory.ingredient,
85 category: ItemCategory.ingredient,
85 iconKey: "ore",
86 iconKey: "metal",
86 defaultState: "ore",
87 defaultState: "ore",
87 tier: gemTier,
88 tier: gemTier,
88 tintFromTier: true,
89 tintFromTier: true,