Fix door Y-sort so S-closed draws above the player.
Widen the y-sort sub-order stride and keep equipment overlays in-band so south-closed doors stay in front on the same tile.
@@ -43,7 +43,8 @@ const LAYER_GROUND = 0;
43
43
const LAYER_EDGE = 900000;
44
44
const SORT_BLOCK = 2;
45
45
const SORT_ENTITY = 3;
46
const SORT_HP_BAR = 4;
46
/** Equipment overlays use SORT_ENTITY + 1 + index (same sortY band). */
47
const SORT_HP_BAR = 14;
47
48
const SORT_FX = 5;
48
49
const RENDER_LAYER_BLOOM = "bloom";
49
50
const SKULL_SPRITE = "fx:skull:skull";
@@ -2558,7 +2559,7 @@ export class WorldView
2558
2559
for (let index = 0; index < (entity.overlays ?? []).length; index++)
2559
2560
{
2560
2561
const overlay = entity.overlays[index];
2561
const overlaySortY = pivotY + 0.5 * (index + 1);
2562
const overlaySort = Math.min(SORT_HP_BAR - 2, SORT_ENTITY + 1 + index);
2562
2563
overlay.transform.rotation = walkTilt;
2563
2564
const dualTint = entity.overlayDualTints?.[index] ?? null;
2564
2565
if (dualTint)
@@ -2581,7 +2582,7 @@ export class WorldView
2581
2582
{
2582
2583
this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);
2583
2584
}
2584
this.#placePivoted(overlay, pivotX, pivotY, overlaySortY, SORT_ENTITY, entity.visualScale ?? 1, flight);
2585
this.#placePivoted(overlay, pivotX, pivotY, pivotY, overlaySort, entity.visualScale ?? 1, flight);
2585
2586
}
2586
2587
for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)
2587
2588
{
@@ -43,7 +43,8 @@ const LAYER_GROUND = 0;43
const LAYER_EDGE = 900000;43
const LAYER_EDGE = 900000;44
const SORT_BLOCK = 2;44
const SORT_BLOCK = 2;45
const SORT_ENTITY = 3;45
const SORT_ENTITY = 3;46
const SORT_HP_BAR = 4;46
/** Equipment overlays use SORT_ENTITY + 1 + index (same sortY band). */47
const SORT_HP_BAR = 14;47
const SORT_FX = 5;48
const SORT_FX = 5;48
const RENDER_LAYER_BLOOM = "bloom";49
const RENDER_LAYER_BLOOM = "bloom";49
const SKULL_SPRITE = "fx:skull:skull";50
const SKULL_SPRITE = "fx:skull:skull";@@ -2558,7 +2559,7 @@ export class WorldView2558
for (let index = 0; index < (entity.overlays ?? []).length; index++)2559
for (let index = 0; index < (entity.overlays ?? []).length; index++)2559
{2560
{2560
const overlay = entity.overlays[index];2561
const overlay = entity.overlays[index];2561
const overlaySortY = pivotY + 0.5 * (index + 1);2562
const overlaySort = Math.min(SORT_HP_BAR - 2, SORT_ENTITY + 1 + index);2562
overlay.transform.rotation = walkTilt;2563
overlay.transform.rotation = walkTilt;2563
const dualTint = entity.overlayDualTints?.[index] ?? null;2564
const dualTint = entity.overlayDualTints?.[index] ?? null;2564
if (dualTint)2565
if (dualTint)@@ -2581,7 +2582,7 @@ export class WorldView2581
{2582
{2582
this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);2583
this.#syncLitSprite(overlay, tileShade, flashStrength, wade, entity.overlayTints?.[index] ?? null, flashColor);2583
}2584
}2584
this.#placePivoted(overlay, pivotX, pivotY, overlaySortY, SORT_ENTITY, entity.visualScale ?? 1, flight);2585
this.#placePivoted(overlay, pivotX, pivotY, pivotY, overlaySort, entity.visualScale ?? 1, flight);2585
}2586
}2586
for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)2587
for (let index = 0; index < (entity.bloomOverlays ?? []).length; index++)2587
{2588
{@@ -95,7 +95,7 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o
95
95
test("door sort sub-order puts N-closed behind and S-closed in front", () =>
96
96
{
97
97
assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
98
assert.equal(doorSortSubOrder("pine-s-closed", 3), 4);
98
assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
99
99
assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
100
100
assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
101
101
});
@@ -95,7 +95,7 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o95
test("door sort sub-order puts N-closed behind and S-closed in front", () =>95
test("door sort sub-order puts N-closed behind and S-closed in front", () =>96
{96
{97
assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);97
assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);98
assert.equal(doorSortSubOrder("pine-s-closed", 3), 4);98
assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);99
assert.equal(doorSortSubOrder("pine-n-open", 3), 3);99
assert.equal(doorSortSubOrder("pine-n-open", 3), 3);100
assert.equal(doorSortSubOrder("pine-s-open", 3), 3);100
assert.equal(doorSortSubOrder("pine-s-open", 3), 3);101
});101
});@@ -33,6 +33,19 @@ test("Y-sort puts a southern tile in front of a northern tile", () =>
33
33
assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));
34
34
});
35
35
36
test("S-closed door stays in front of entity equipment overlays on the same tile", () =>
37
{
38
const sortY = 128;
39
const entityBody = ySortLayer(sortY, 3);
40
const entityOverlay = ySortLayer(sortY, 3 + 1 + 5);
41
const doorFront = ySortLayer(sortY, 12);
42
const doorBehind = ySortLayer(sortY, 1);
43
assert.ok(doorFront > entityOverlay);
44
assert.ok(doorFront > entityBody);
45
assert.ok(entityBody > doorBehind);
46
assert.ok(ySortLayer(sortY, 14) > doorFront);
47
});
48
36
49
test("flight sort stays above any ground y-sort in view", () =>
37
50
{
38
51
const farSouthBlock = ySortLayer(50_000, 3);
@@ -33,6 +33,19 @@ test("Y-sort puts a southern tile in front of a northern tile", () =>33
assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));33
assert.ok(ySortLayer(16, 1) > ySortLayer(0, 1));34
});34
});35
35
36
test("S-closed door stays in front of entity equipment overlays on the same tile", () =>37
{38
const sortY = 128;39
const entityBody = ySortLayer(sortY, 3);40
const entityOverlay = ySortLayer(sortY, 3 + 1 + 5);41
const doorFront = ySortLayer(sortY, 12);42
const doorBehind = ySortLayer(sortY, 1);43
assert.ok(doorFront > entityOverlay);44
assert.ok(doorFront > entityBody);45
assert.ok(entityBody > doorBehind);46
assert.ok(ySortLayer(sortY, 14) > doorFront);47
});48
36
test("flight sort stays above any ground y-sort in view", () =>49
test("flight sort stays above any ground y-sort in view", () =>37
{50
{38
const farSouthBlock = ySortLayer(50_000, 3);51
const farSouthBlock = ySortLayer(50_000, 3);