gem fix
@@ -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 "../../../share4
import { ITEM_DEFINITIONS } from "../../../shared/definitions/items.js";4
import { ITEM_DEFINITIONS } from "../../../shared/definitions/items.js";5
import { MOB_DEFINITIONS } from "../../../shared/definitions/mobs.js";5
import { MOB_DEFINITIONS } from "../../../shared/definitions/mobs.js";6
import { HERB_ORDER } from "../../../shared/definitions/herbs.js";6
import { HERB_ORDER } from "../../../shared/definitions/herbs.js";7
import {7
import8
ORE_BEARING_MATERIALS,8
{9
oreBoulderState,9
ORE_BEARING_MATERIALS,10
materialTintColor,10
oreBoulderState,11
WOOD_TIER_ORDER11
materialTintColor,12
} from "../../../shared/definitions/materialTiers.js";12
WOOD_TIER_ORDER13
import {13
} from "../../../shared/definitions/materialTiers.js";14
FLOWER_COLOR_ORDER,14
import15
flowerBlockState,15
{16
flowerColorRgb16
FLOWER_COLOR_ORDER,17
} from "../../../shared/definitions/dyes.js";17
flowerBlockState,18
import {18
flowerColorRgb19
bloomImageName,19
} from "../../../shared/definitions/dyes.js";20
equipBloomImageName,20
import21
equipImageName,21
{22
isCompanionSpriteStem,22
bloomImageName,23
parseSpriteStem,23
equipBloomImageName,24
spriteImageName24
equipImageName,25
} from "../../../shared/definitions/tileSprites.js";25
isCompanionSpriteStem,26
parseSpriteStem,27
spriteImageName28
} from "../../../shared/definitions/tileSprites.js";26
import { preferredSeasonalDefaultState, typeHasSeasonalStates, isSeasonalOverlayVariant } from "../../../shared/world/season.js";29
import { preferredSeasonalDefaultState, typeHasSeasonalStates, isSeasonalOverlayVariant } from "../../../shared/world/season.js";27
import { composeNeighborConnectState, NEIGHBOR_CONNECT_MASK_COUNT } from "../../../shared/world/neighborConnect.js";30
import { 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,