BlueGit

timfa questward

Merge branch 'feat/spawner-equip-preview'

timfa Tim Falken · pushed by timfa

Authored 2026-08-30 · 2 months ago

Hash
6d0653e931da6073007e119ba269d11aa5d39b92
3 files changed +157 −12
client/src/render/worldView.js +94 −11
@@ -5,6 +5,7 @@ import { bakeChunkOcclusion } from "/shared/lighting/chunkOcclusion.js";
5 5 import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
6 6 import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
7 7 import { resolveItemTint, resolveEquipTint, resolveItemDualTint, normalizeRgb } from "/shared/render/tint.js";
8 import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
8 9 import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
9 10 import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer } from "/shared/render/pivot.js";
10 11 import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
@@ -649,7 +650,7 @@ export class WorldView
649 650 {
650 651 if (!spawnerKey.startsWith(prefix))
651 652 { continue; }
652 entry.object?.destroy();
653 this.#destroyEditorSpawnerEntry(entry);
653 654 this.editorSpawners.delete(spawnerKey);
654 655 }
655 656 for (const [tileKey, objects] of [...this.tiles.entries()])
@@ -1737,10 +1738,11 @@ export class WorldView
1737 1738
1738 1739 /**
1739 1740 * Editor-only mob markers for authored spawners (invisible during play).
1741 * Humanoid / town guard / CE show body + equipment overlays.
1740 1742 * @param {number} chunkX
1741 1743 * @param {number} chunkY
1742 * @param {Array<{ localX: number, localY: number, config?: { mobTypeId?: string } }>} spawners
1743 * @param {(mobTypeId: string) => string} resolveSprite
1744 * @param {Array<{ localX: number, localY: number, config?: object }>} spawners
1745 * @param {(mobTypeId: number) => string} resolveSprite
1744 1746 */
1745 1747 setEditorSpawners (chunkX, chunkY, spawners, resolveSprite)
1746 1748 {
@@ -1749,32 +1751,102 @@ export class WorldView
1749 1751 {
1750 1752 if (!key.startsWith(prefix))
1751 1753 { continue; }
1752 entry.object?.destroy();
1754 this.#destroyEditorSpawnerEntry(entry);
1753 1755 this.editorSpawners.delete(key);
1754 1756 }
1757 const size = this.tileSize();
1755 1758 for (const spawner of spawners ?? [])
1756 1759 {
1757 1760 const tileX = chunkX * CHUNK_SIZE + spawner.localX;
1758 1761 const tileY = chunkY * CHUNK_SIZE + spawner.localY;
1759 const spriteName = resolveSprite?.(spawner.config?.mobTypeId) ?? null;
1760 if (!spriteName)
1762 const layers = layersFromSpawnerConfig(spawner.config);
1763 const bodySpriteName = layers?.[0]?.sprite
1764 ?? resolveSprite?.(spawner.config?.mobTypeId)
1765 ?? null;
1766 if (!bodySpriteName)
1761 1767 { continue; }
1762 1768 const key = `${prefix}${spawner.localX},${spawner.localY}`;
1763 const object = this.#ensureSprite(null, spriteName, SORT_ENTITY);
1769 const object = this.#ensureSprite(null, bodySpriteName, SORT_ENTITY);
1764 1770 if (!object)
1765 1771 { continue; }
1766 1772 object.renderer.alpha = 0.85;
1767 const pivot = tilePivot(tileX, tileY, this.tileSize());
1773 const bodyTint = layers?.[0]?.tint ? normalizeRgb(layers[0].tint) : null;
1774 if (bodyTint)
1775 { this.#syncUnlitTintSprite(object, bodyTint); }
1776 else
1777 { this.#markUnlit(object); }
1778 const overlays = [];
1779 for (const layer of layers?.slice(1) ?? [])
1780 {
1781 const overlay = this.#ensureSprite(null, layer.sprite, SORT_ENTITY);
1782 if (!overlay)
1783 { continue; }
1784 overlay.renderer.alpha = 0.85;
1785 this.#applyEditorSpawnerOverlayLook(overlay, layer);
1786 overlays.push(overlay);
1787 }
1788 const pivot = tilePivot(tileX, tileY, size);
1768 1789 this.#placePivoted(object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1769 this.#markUnlit(object);
1770 this.editorSpawners.set(key, { object, tileX, tileY, spriteName });
1790 for (let i = 0; i < overlays.length; i++)
1791 {
1792 this.#placePivoted(
1793 overlays[i],
1794 pivot.x,
1795 pivot.y,
1796 pivot.y + 0.05 + 0.001 * (i + 1),
1797 SORT_ENTITY
1798 );
1799 }
1800 this.editorSpawners.set(key, {
1801 object,
1802 overlays,
1803 tileX,
1804 tileY,
1805 spriteName: bodySpriteName
1806 });
1807 }
1808 }
1809
1810 #destroyEditorSpawnerEntry (entry)
1811 {
1812 entry?.object?.destroy();
1813 for (const overlay of entry?.overlays ?? [])
1814 { overlay?.destroy(); }
1815 }
1816
1817 #applyEditorSpawnerOverlayLook (overlay, layer)
1818 {
1819 const layerDef = layer.itemId != null ? itemDefinition(layer.itemId) : null;
1820 const dualTint = layerDef?.iconTintFromTier
1821 ? null
1822 : (layer.itemId != null
1823 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
1824 : null);
1825 const tint = layer.tint
1826 ? normalizeRgb(layer.tint)
1827 : (dualTint
1828 ? null
1829 : (layerDef?.iconTintFromTier
1830 ? resolveItemTint({ itemId: layer.itemId }, layerDef)
1831 : (layer.itemId != null ? resolveEquipTint(layer.itemId) : null)));
1832 if (dualTint)
1833 {
1834 overlay._lit = true;
1835 this.#syncDualTintLitSprite(overlay, 0, dualTint, 0, false);
1836 return;
1771 1837 }
1838 if (tint)
1839 {
1840 this.#syncUnlitTintSprite(overlay, tint);
1841 return;
1842 }
1843 this.#markUnlit(overlay);
1772 1844 }
1773 1845
1774 1846 clearEditorSpawners ()
1775 1847 {
1776 1848 for (const entry of this.editorSpawners.values())
1777 { entry.object?.destroy(); }
1849 { this.#destroyEditorSpawnerEntry(entry); }
1778 1850 this.editorSpawners.clear();
1779 1851 }
1780 1852
@@ -1787,6 +1859,17 @@ export class WorldView
1787 1859 { continue; }
1788 1860 const pivot = tilePivot(entry.tileX, entry.tileY, size);
1789 1861 this.#placePivoted(entry.object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1862 const overlays = entry.overlays ?? [];
1863 for (let i = 0; i < overlays.length; i++)
1864 {
1865 this.#placePivoted(
1866 overlays[i],
1867 pivot.x,
1868 pivot.y,
1869 pivot.y + 0.05 + 0.001 * (i + 1),
1870 SORT_ENTITY
1871 );
1872 }
1790 1873 }
1791 1874 }
1792 1875
@@ -5,6 +5,7 @@ import { bakeChunkOcclusion } from "/shared/lighting/chunkOcclusion.js";
5import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
5import { bloomCompanionName, spriteImageName } from "/shared/definitions/tileSprites.js";
6import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
6import { EQUIPMENT_SLOT, itemEquipSprite, itemSpriteName, itemDefinition } from "/shared/definitions/items.js";
7import { resolveItemTint, resolveEquipTint, resolveItemDualTint, normalizeRgb } from "/shared/render/tint.js";
7import { resolveItemTint, resolveEquipTint, resolveItemDualTint, normalizeRgb } from "/shared/render/tint.js";
8import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
8import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
9import { normalizeGround, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, isBlockOccludingLight, LightOcclusion } from "/shared/definitions/tiles.js";
9import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer } from "/shared/render/pivot.js";
10import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer } from "/shared/render/pivot.js";
10import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
11import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
@@ -649,7 +650,7 @@ export class WorldView
649 {
650 {
650 if (!spawnerKey.startsWith(prefix))
651 if (!spawnerKey.startsWith(prefix))
651 { continue; }
652 { continue; }
652 entry.object?.destroy();
653 this.#destroyEditorSpawnerEntry(entry);
653 this.editorSpawners.delete(spawnerKey);
654 this.editorSpawners.delete(spawnerKey);
654 }
655 }
655 for (const [tileKey, objects] of [...this.tiles.entries()])
656 for (const [tileKey, objects] of [...this.tiles.entries()])
@@ -1737,10 +1738,11 @@ export class WorldView
1737
1738
1738 /**
1739 /**
1739 * Editor-only mob markers for authored spawners (invisible during play).
1740 * Editor-only mob markers for authored spawners (invisible during play).
1741 * Humanoid / town guard / CE show body + equipment overlays.
1740 * @param {number} chunkX
1742 * @param {number} chunkX
1741 * @param {number} chunkY
1743 * @param {number} chunkY
1742 * @param {Array<{ localX: number, localY: number, config?: { mobTypeId?: string } }>} spawners
1744 * @param {Array<{ localX: number, localY: number, config?: object }>} spawners
1743 * @param {(mobTypeId: string) => string} resolveSprite
1745 * @param {(mobTypeId: number) => string} resolveSprite
1744 */
1746 */
1745 setEditorSpawners (chunkX, chunkY, spawners, resolveSprite)
1747 setEditorSpawners (chunkX, chunkY, spawners, resolveSprite)
1746 {
1748 {
@@ -1749,32 +1751,102 @@ export class WorldView
1749 {
1751 {
1750 if (!key.startsWith(prefix))
1752 if (!key.startsWith(prefix))
1751 { continue; }
1753 { continue; }
1752 entry.object?.destroy();
1754 this.#destroyEditorSpawnerEntry(entry);
1753 this.editorSpawners.delete(key);
1755 this.editorSpawners.delete(key);
1754 }
1756 }
1757 const size = this.tileSize();
1755 for (const spawner of spawners ?? [])
1758 for (const spawner of spawners ?? [])
1756 {
1759 {
1757 const tileX = chunkX * CHUNK_SIZE + spawner.localX;
1760 const tileX = chunkX * CHUNK_SIZE + spawner.localX;
1758 const tileY = chunkY * CHUNK_SIZE + spawner.localY;
1761 const tileY = chunkY * CHUNK_SIZE + spawner.localY;
1759 const spriteName = resolveSprite?.(spawner.config?.mobTypeId) ?? null;
1762 const layers = layersFromSpawnerConfig(spawner.config);
1760 if (!spriteName)
1763 const bodySpriteName = layers?.[0]?.sprite
1764 ?? resolveSprite?.(spawner.config?.mobTypeId)
1765 ?? null;
1766 if (!bodySpriteName)
1761 { continue; }
1767 { continue; }
1762 const key = `${prefix}${spawner.localX},${spawner.localY}`;
1768 const key = `${prefix}${spawner.localX},${spawner.localY}`;
1763 const object = this.#ensureSprite(null, spriteName, SORT_ENTITY);
1769 const object = this.#ensureSprite(null, bodySpriteName, SORT_ENTITY);
1764 if (!object)
1770 if (!object)
1765 { continue; }
1771 { continue; }
1766 object.renderer.alpha = 0.85;
1772 object.renderer.alpha = 0.85;
1767 const pivot = tilePivot(tileX, tileY, this.tileSize());
1773 const bodyTint = layers?.[0]?.tint ? normalizeRgb(layers[0].tint) : null;
1774 if (bodyTint)
1775 { this.#syncUnlitTintSprite(object, bodyTint); }
1776 else
1777 { this.#markUnlit(object); }
1778 const overlays = [];
1779 for (const layer of layers?.slice(1) ?? [])
1780 {
1781 const overlay = this.#ensureSprite(null, layer.sprite, SORT_ENTITY);
1782 if (!overlay)
1783 { continue; }
1784 overlay.renderer.alpha = 0.85;
1785 this.#applyEditorSpawnerOverlayLook(overlay, layer);
1786 overlays.push(overlay);
1787 }
1788 const pivot = tilePivot(tileX, tileY, size);
1768 this.#placePivoted(object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1789 this.#placePivoted(object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1769 this.#markUnlit(object);
1790 for (let i = 0; i < overlays.length; i++)
1770 this.editorSpawners.set(key, { object, tileX, tileY, spriteName });
1791 {
1792 this.#placePivoted(
1793 overlays[i],
1794 pivot.x,
1795 pivot.y,
1796 pivot.y + 0.05 + 0.001 * (i + 1),
1797 SORT_ENTITY
1798 );
1799 }
1800 this.editorSpawners.set(key, {
1801 object,
1802 overlays,
1803 tileX,
1804 tileY,
1805 spriteName: bodySpriteName
1806 });
1807 }
1808 }
1809
1810 #destroyEditorSpawnerEntry (entry)
1811 {
1812 entry?.object?.destroy();
1813 for (const overlay of entry?.overlays ?? [])
1814 { overlay?.destroy(); }
1815 }
1816
1817 #applyEditorSpawnerOverlayLook (overlay, layer)
1818 {
1819 const layerDef = layer.itemId != null ? itemDefinition(layer.itemId) : null;
1820 const dualTint = layerDef?.iconTintFromTier
1821 ? null
1822 : (layer.itemId != null
1823 ? resolveItemDualTint({ itemId: layer.itemId }, layerDef)
1824 : null);
1825 const tint = layer.tint
1826 ? normalizeRgb(layer.tint)
1827 : (dualTint
1828 ? null
1829 : (layerDef?.iconTintFromTier
1830 ? resolveItemTint({ itemId: layer.itemId }, layerDef)
1831 : (layer.itemId != null ? resolveEquipTint(layer.itemId) : null)));
1832 if (dualTint)
1833 {
1834 overlay._lit = true;
1835 this.#syncDualTintLitSprite(overlay, 0, dualTint, 0, false);
1836 return;
1771 }
1837 }
1838 if (tint)
1839 {
1840 this.#syncUnlitTintSprite(overlay, tint);
1841 return;
1842 }
1843 this.#markUnlit(overlay);
1772 }
1844 }
1773
1845
1774 clearEditorSpawners ()
1846 clearEditorSpawners ()
1775 {
1847 {
1776 for (const entry of this.editorSpawners.values())
1848 for (const entry of this.editorSpawners.values())
1777 { entry.object?.destroy(); }
1849 { this.#destroyEditorSpawnerEntry(entry); }
1778 this.editorSpawners.clear();
1850 this.editorSpawners.clear();
1779 }
1851 }
1780
1852
@@ -1787,6 +1859,17 @@ export class WorldView
1787 { continue; }
1859 { continue; }
1788 const pivot = tilePivot(entry.tileX, entry.tileY, size);
1860 const pivot = tilePivot(entry.tileX, entry.tileY, size);
1789 this.#placePivoted(entry.object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1861 this.#placePivoted(entry.object, pivot.x, pivot.y, pivot.y + 0.05, SORT_ENTITY);
1862 const overlays = entry.overlays ?? [];
1863 for (let i = 0; i < overlays.length; i++)
1864 {
1865 this.#placePivoted(
1866 overlays[i],
1867 pivot.x,
1868 pivot.y,
1869 pivot.y + 0.05 + 0.001 * (i + 1),
1870 SORT_ENTITY
1871 );
1872 }
1790 }
1873 }
1791 }
1874 }
1792
1875
server/tests/npc-equipment.test.js +16 −0
@@ -1,6 +1,7 @@
1 1 import test from "node:test";
2 2 import assert from "node:assert/strict";
3 3 import { npcDefaultEquipment, npcClothDyeFromSeed, NPC_CLOTH_DYE_BYTE_MIN } from "../../shared/appearance/npcEquipment.js";
4 import { layersFromSpawnerConfig } from "../../shared/appearance/layers.js";
4 5 import { ItemId } from "../../shared/definitions/items.js";
5 6 import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
6 7 import { clothTierForItemId } from "../../shared/definitions/clothItems.js";
@@ -64,3 +65,18 @@ test("authored spawner chest overrides default clothing", () =>
64 65 assert.equal(components.equipment.slots.chest.itemId, ItemId.clothShirt);
65 66 assert.equal(components.equipment.slots.chest.instance, undefined);
66 67 });
68
69 test("layersFromSpawnerConfig previews body gear for humanoid NPCs only", () =>
70 {
71 assert.equal(layersFromSpawnerConfig({ mobTypeId: MobId.deer }), null);
72 const layers = layersFromSpawnerConfig({
73 mobTypeId: MobId.humanoid,
74 displayName: "Preview Bob",
75 sex: "male",
76 equipment: { weapon: { itemId: ItemId.stick } }
77 });
78 assert.ok(layers?.length >= 2);
79 assert.match(layers[0].sprite, /player-body-male/);
80 assert.ok(layers.some((layer) => layer.itemId === ItemId.stick));
81 assert.ok(layers.some((layer) => layer.itemId === LeatherItemId.leatherShoes));
82 });
@@ -1,6 +1,7 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import { npcDefaultEquipment, npcClothDyeFromSeed, NPC_CLOTH_DYE_BYTE_MIN } from "../../shared/appearance/npcEquipment.js";
3import { npcDefaultEquipment, npcClothDyeFromSeed, NPC_CLOTH_DYE_BYTE_MIN } from "../../shared/appearance/npcEquipment.js";
4import { layersFromSpawnerConfig } from "../../shared/appearance/layers.js";
4import { ItemId } from "../../shared/definitions/items.js";
5import { ItemId } from "../../shared/definitions/items.js";
5import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
6import { LeatherItemId } from "../../shared/definitions/leatherItems.js";
6import { clothTierForItemId } from "../../shared/definitions/clothItems.js";
7import { clothTierForItemId } from "../../shared/definitions/clothItems.js";
@@ -64,3 +65,18 @@ test("authored spawner chest overrides default clothing", () =>
64 assert.equal(components.equipment.slots.chest.itemId, ItemId.clothShirt);
65 assert.equal(components.equipment.slots.chest.itemId, ItemId.clothShirt);
65 assert.equal(components.equipment.slots.chest.instance, undefined);
66 assert.equal(components.equipment.slots.chest.instance, undefined);
66});
67});
68
69test("layersFromSpawnerConfig previews body gear for humanoid NPCs only", () =>
70{
71 assert.equal(layersFromSpawnerConfig({ mobTypeId: MobId.deer }), null);
72 const layers = layersFromSpawnerConfig({
73 mobTypeId: MobId.humanoid,
74 displayName: "Preview Bob",
75 sex: "male",
76 equipment: { weapon: { itemId: ItemId.stick } }
77 });
78 assert.ok(layers?.length >= 2);
79 assert.match(layers[0].sprite, /player-body-male/);
80 assert.ok(layers.some((layer) => layer.itemId === ItemId.stick));
81 assert.ok(layers.some((layer) => layer.itemId === LeatherItemId.leatherShoes));
82});
shared/appearance/layers.js +47 −1
@@ -1,4 +1,8 @@
1 import { composeAppearanceLayers, bodySpriteName } from "./hair.js";
1 import { composeAppearanceLayers, bodySpriteName, appearanceHairFields, hairFromNameSeed } from "./hair.js";
2 import { npcDefaultEquipment } from "./npcEquipment.js";
3 import { mobDefinition, spawnerEquipmentSlot } from "../definitions/mobs.js";
4 import { itemDefinition } from "../definitions/items.js";
5 import { emptyEquipment } from "../items/inventory.js";
2 6
3 7 export { bodySpriteName } from "./hair.js";
4 8
@@ -16,3 +20,45 @@ export function layersFromBag (sex, bag, hair = null)
16 20 };
17 21 return composeAppearanceLayers(appearance, bag?.equipment?.slots ?? {});
18 22 }
23
24 /**
25 * Editor / preview layers for a humanoid-style spawner (body + authored/default gear).
26 * Returns null when the mob type does not use a player body.
27 */
28 export function layersFromSpawnerConfig (config)
29 {
30 const mobTypeId = config?.mobTypeId;
31 const def = mobDefinition(mobTypeId);
32 if (!def?.usePlayerBody)
33 { return null; }
34 const sex = config?.sex === "female" ? "female" : "male";
35 const displayName = String(config?.displayName ?? def.displayName ?? "npc").trim() || "npc";
36 const hair = hairFromNameSeed(displayName, sex);
37 const appearance = {
38 sex,
39 sprite: bodySpriteName(sex),
40 ...appearanceHairFields(hair)
41 };
42 const equipmentSlots = emptyEquipment().slots;
43 const authored = config?.equipment ?? {};
44 const defaults = npcDefaultEquipment(displayName, sex);
45 for (const slot of Object.keys(equipmentSlots))
46 {
47 let { itemId, dyeColor } = spawnerEquipmentSlot(authored[slot]);
48 if (!itemId && defaults?.[slot])
49 {
50 itemId = defaults[slot].itemId;
51 dyeColor = defaults[slot].dyeColor ?? null;
52 }
53 if (!itemId)
54 { continue; }
55 const itemDef = itemDefinition(itemId);
56 if (!itemDef?.equipment || itemDef.equipment.slot !== slot)
57 { continue; }
58 const stack = { itemId, quantity: 1 };
59 if (dyeColor && itemDef.dyeable)
60 { stack.instance = { kind: "clothing", dyeColor }; }
61 equipmentSlots[slot] = stack;
62 }
63 return composeAppearanceLayers(appearance, equipmentSlots);
64 }
@@ -1,4 +1,8 @@
1import { composeAppearanceLayers, bodySpriteName } from "./hair.js";
1import { composeAppearanceLayers, bodySpriteName, appearanceHairFields, hairFromNameSeed } from "./hair.js";
2import { npcDefaultEquipment } from "./npcEquipment.js";
3import { mobDefinition, spawnerEquipmentSlot } from "../definitions/mobs.js";
4import { itemDefinition } from "../definitions/items.js";
5import { emptyEquipment } from "../items/inventory.js";
2
6
3export { bodySpriteName } from "./hair.js";
7export { bodySpriteName } from "./hair.js";
4
8
@@ -16,3 +20,45 @@ export function layersFromBag (sex, bag, hair = null)
16 };
20 };
17 return composeAppearanceLayers(appearance, bag?.equipment?.slots ?? {});
21 return composeAppearanceLayers(appearance, bag?.equipment?.slots ?? {});
18}
22}
23
24/**
25 * Editor / preview layers for a humanoid-style spawner (body + authored/default gear).
26 * Returns null when the mob type does not use a player body.
27 */
28export function layersFromSpawnerConfig (config)
29{
30 const mobTypeId = config?.mobTypeId;
31 const def = mobDefinition(mobTypeId);
32 if (!def?.usePlayerBody)
33 { return null; }
34 const sex = config?.sex === "female" ? "female" : "male";
35 const displayName = String(config?.displayName ?? def.displayName ?? "npc").trim() || "npc";
36 const hair = hairFromNameSeed(displayName, sex);
37 const appearance = {
38 sex,
39 sprite: bodySpriteName(sex),
40 ...appearanceHairFields(hair)
41 };
42 const equipmentSlots = emptyEquipment().slots;
43 const authored = config?.equipment ?? {};
44 const defaults = npcDefaultEquipment(displayName, sex);
45 for (const slot of Object.keys(equipmentSlots))
46 {
47 let { itemId, dyeColor } = spawnerEquipmentSlot(authored[slot]);
48 if (!itemId && defaults?.[slot])
49 {
50 itemId = defaults[slot].itemId;
51 dyeColor = defaults[slot].dyeColor ?? null;
52 }
53 if (!itemId)
54 { continue; }
55 const itemDef = itemDefinition(itemId);
56 if (!itemDef?.equipment || itemDef.equipment.slot !== slot)
57 { continue; }
58 const stack = { itemId, quantity: 1 };
59 if (dyeColor && itemDef.dyeable)
60 { stack.instance = { kind: "clothing", dyeColor }; }
61 equipmentSlots[slot] = stack;
62 }
63 return composeAppearanceLayers(appearance, equipmentSlots);
64}