BlueGit

timfa questward

Fix jewelry equip sprite keys and refresh viewport cull after zoom.

Equip overlays pointed at non-catalog names (double :equip), so worn jewellery never drew. Zoom now recenters/re-culls immediately so on-screen tiles are not left hidden.

timfa Tim Falken · pushed by timfa

Authored 2026-09-02 · 2 months ago

Hash
1c89f8955cb6b6bdea13a5585811ba0f2214923b
Parent
2b51d156
7 files changed +34 −4
client/assets/characters/player-body-female/hair-2.png Binary file +0 −0

The contents of this binary file are not shown.

client/assets/characters/player-body-female/player-body-female.png Binary file +0 −0

The contents of this binary file are not shown.

client/assets/characters/player-body-male/player-body-male.png Binary file +0 −0

The contents of this binary file are not shown.

client/src/editor/main.js +1 −0
@@ -810,6 +810,7 @@ function frameNeighborhood ()
810 810 const centerY = (chunkY + 0.5) * CHUNK_SIZE * size;
811 811 view.scene.cameraPosition.x = view.scene.real_size.x / 2 - centerX;
812 812 view.scene.cameraPosition.y = view.scene.real_size.y / 2 - centerY;
813 view.refreshViewport();
813 814 updateSelectionBorder();
814 815 }
815 816
@@ -810,6 +810,7 @@ function frameNeighborhood ()
810 const centerY = (chunkY + 0.5) * CHUNK_SIZE * size;
810 const centerY = (chunkY + 0.5) * CHUNK_SIZE * size;
811 view.scene.cameraPosition.x = view.scene.real_size.x / 2 - centerX;
811 view.scene.cameraPosition.x = view.scene.real_size.x / 2 - centerX;
812 view.scene.cameraPosition.y = view.scene.real_size.y / 2 - centerY;
812 view.scene.cameraPosition.y = view.scene.real_size.y / 2 - centerY;
813 view.refreshViewport();
813 updateSelectionBorder();
814 updateSelectionBorder();
814}
815}
815
816
client/src/render/worldView.js +13 −2
@@ -1365,6 +1365,17 @@ export class WorldView
1365 1365 this.#relayoutEditorSpawners();
1366 1366 this.#relayoutSpawnRangeHighlight();
1367 1367 this.#relayoutSpellTargetHighlight();
1368 // Play: recenter + refresh cull flags with the new tile size immediately.
1369 // Editor sets the camera via frameNeighborhood after setZoom — call refreshViewport there.
1370 if (this.followPlayer)
1371 { this.refreshViewport(); }
1372 }
1373
1374 /** Recenter (when following) and refresh off-screen cull flags after zoom/layout. */
1375 refreshViewport ()
1376 {
1377 this.#centerCamera();
1378 this.#cullOffscreenDrawables();
1368 1379 }
1369 1380
1370 1381 tileSize ()
@@ -2224,12 +2235,12 @@ export class WorldView
2224 2235 }
2225 2236
2226 2237 /**
2227 * World-pixel AABB of the screen, expanded by half a tile (zoom-aware).
2238 * World-pixel AABB of the screen, expanded for tall block sprites (zoom-aware).
2228 2239 * Tiles fully outside this rect are not drawn.
2229 2240 */
2230 2241 #drawBounds ()
2231 2242 {
2232 const pad = this.tileSize() * 0.5;
2243 const pad = this.tileSize() * 2;
2233 2244 const camX = this.scene.cameraPosition.x;
2234 2245 const camY = this.scene.cameraPosition.y;
2235 2246 const w = this.scene.real_size.x;
@@ -1365,6 +1365,17 @@ export class WorldView
1365 this.#relayoutEditorSpawners();
1365 this.#relayoutEditorSpawners();
1366 this.#relayoutSpawnRangeHighlight();
1366 this.#relayoutSpawnRangeHighlight();
1367 this.#relayoutSpellTargetHighlight();
1367 this.#relayoutSpellTargetHighlight();
1368 // Play: recenter + refresh cull flags with the new tile size immediately.
1369 // Editor sets the camera via frameNeighborhood after setZoom — call refreshViewport there.
1370 if (this.followPlayer)
1371 { this.refreshViewport(); }
1372 }
1373
1374 /** Recenter (when following) and refresh off-screen cull flags after zoom/layout. */
1375 refreshViewport ()
1376 {
1377 this.#centerCamera();
1378 this.#cullOffscreenDrawables();
1368 }
1379 }
1369
1380
1370 tileSize ()
1381 tileSize ()
@@ -2224,12 +2235,12 @@ export class WorldView
2224 }
2235 }
2225
2236
2226 /**
2237 /**
2227 * World-pixel AABB of the screen, expanded by half a tile (zoom-aware).
2238 * World-pixel AABB of the screen, expanded for tall block sprites (zoom-aware).
2228 * Tiles fully outside this rect are not drawn.
2239 * Tiles fully outside this rect are not drawn.
2229 */
2240 */
2230 #drawBounds ()
2241 #drawBounds ()
2231 {
2242 {
2232 const pad = this.tileSize() * 0.5;
2243 const pad = this.tileSize() * 2;
2233 const camX = this.scene.cameraPosition.x;
2244 const camX = this.scene.cameraPosition.x;
2234 const camY = this.scene.cameraPosition.y;
2245 const camY = this.scene.cameraPosition.y;
2235 const w = this.scene.real_size.x;
2246 const w = this.scene.real_size.x;
server/tests/jewelry.test.js +19 −1
@@ -1,6 +1,6 @@
1 1 import test from "node:test";
2 2 import assert from "node:assert/strict";
3 import { ItemId, itemDefinition, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
3 import { ItemId, itemDefinition, itemEquipSprite, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
4 4 import { JewelryItemId, jewelryCraftRecipes, jewelryMetalIdForGemTier } from "../../shared/definitions/jewelryItems.js";
5 5 import { GemItemId } from "../../shared/definitions/gemItems.js";
6 6 import { MetalItemId } from "../../shared/definitions/metalItems.js";
@@ -71,6 +71,24 @@ test("jewellery dual tint maps metal gem and yarn channels", () =>
71 71 assert.equal(ItemId.diamondRing, JewelryItemId.diamondRing);
72 72 });
73 73
74 test("jewellery equip sprites use catalog :equip names (not double-equip)", () =>
75 {
76 assert.equal(
77 itemDefinition(JewelryItemId.opalRing)?.equipment?.equipSprite,
78 "item:jewelery:ring:equip"
79 );
80 assert.equal(
81 itemDefinition(JewelryItemId.diamondBracelet)?.equipment?.equipSprite,
82 "item:jewelery:bracelet:equip"
83 );
84 assert.equal(
85 itemDefinition(JewelryItemId.rubyAmulet)?.equipment?.equipSprite,
86 "item:jewelery:amulet:equip"
87 );
88 assert.equal(itemEquipSprite(JewelryItemId.opalRing), "item:jewelery:ring:equip");
89 assert.equal(itemEquipSprite(JewelryItemId.rubyAmulet), "item:jewelery:amulet:equip");
90 });
91
74 92 test("jadeite fairy and jewelry teleport helpers gate on worn pieces", () =>
75 93 {
76 94 assert.equal(JADEITE_FAIRY_RESPAWN_MS, 60_000);
@@ -1,6 +1,6 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import { ItemId, itemDefinition, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
3import { ItemId, itemDefinition, itemEquipSprite, EQUIPMENT_SLOT, EQUIPMENT_DRAW_ORDER } from "../../shared/definitions/items.js";
4import { JewelryItemId, jewelryCraftRecipes, jewelryMetalIdForGemTier } from "../../shared/definitions/jewelryItems.js";
4import { JewelryItemId, jewelryCraftRecipes, jewelryMetalIdForGemTier } from "../../shared/definitions/jewelryItems.js";
5import { GemItemId } from "../../shared/definitions/gemItems.js";
5import { GemItemId } from "../../shared/definitions/gemItems.js";
6import { MetalItemId } from "../../shared/definitions/metalItems.js";
6import { MetalItemId } from "../../shared/definitions/metalItems.js";
@@ -71,6 +71,24 @@ test("jewellery dual tint maps metal gem and yarn channels", () =>
71 assert.equal(ItemId.diamondRing, JewelryItemId.diamondRing);
71 assert.equal(ItemId.diamondRing, JewelryItemId.diamondRing);
72});
72});
73
73
74test("jewellery equip sprites use catalog :equip names (not double-equip)", () =>
75{
76 assert.equal(
77 itemDefinition(JewelryItemId.opalRing)?.equipment?.equipSprite,
78 "item:jewelery:ring:equip"
79 );
80 assert.equal(
81 itemDefinition(JewelryItemId.diamondBracelet)?.equipment?.equipSprite,
82 "item:jewelery:bracelet:equip"
83 );
84 assert.equal(
85 itemDefinition(JewelryItemId.rubyAmulet)?.equipment?.equipSprite,
86 "item:jewelery:amulet:equip"
87 );
88 assert.equal(itemEquipSprite(JewelryItemId.opalRing), "item:jewelery:ring:equip");
89 assert.equal(itemEquipSprite(JewelryItemId.rubyAmulet), "item:jewelery:amulet:equip");
90});
91
74test("jadeite fairy and jewelry teleport helpers gate on worn pieces", () =>
92test("jadeite fairy and jewelry teleport helpers gate on worn pieces", () =>
75{
93{
76 assert.equal(JADEITE_FAIRY_RESPAWN_MS, 60_000);
94 assert.equal(JADEITE_FAIRY_RESPAWN_MS, 60_000);
shared/definitions/jewelryItems.js +1 −1
@@ -203,7 +203,7 @@ function buildPieceDefinitions (piece, byGem)
203 203 minCombatLevel: tierMinSkillLevel(gemTier),
204 204 tintFromTier: true,
205 205 dualTintFromTier: true,
206 equipSprite: equipImageName("item", "jewelery", `${piece}-equip`)
206 equipSprite: equipImageName("item", "jewelery", piece)
207 207 };
208 208 if (itemId === JewelryItemId.opalBracelet)
209 209 {
@@ -203,7 +203,7 @@ function buildPieceDefinitions (piece, byGem)
203 minCombatLevel: tierMinSkillLevel(gemTier),
203 minCombatLevel: tierMinSkillLevel(gemTier),
204 tintFromTier: true,
204 tintFromTier: true,
205 dualTintFromTier: true,
205 dualTintFromTier: true,
206 equipSprite: equipImageName("item", "jewelery", `${piece}-equip`)
206 equipSprite: equipImageName("item", "jewelery", piece)
207 };
207 };
208 if (itemId === JewelryItemId.opalBracelet)
208 if (itemId === JewelryItemId.opalBracelet)
209 {
209 {