BlueGit

timfa questward

Only S-closed doors sort in front of entities.

S-open, N-closed, and N-open all draw behind on the same tile.

timfa Tim Falken · pushed by timfa

Authored 2026-09-02 · 2 months ago

Hash
8c53edf33d1b71be62ca1710026ee84f453a5ef6
Parent
b9deccf6
2 files changed +11 −11
server/tests/doors.test.js +4 −4
@@ -92,12 +92,12 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o
92 92 }), false);
93 93 });
94 94
95 test("door sort sub-order puts N-closed behind and S-closed in front", () =>
95 test("door sort sub-order: only S-closed is in front", () =>
96 96 {
97 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
98 97 assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
99 assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
100 assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
98 assert.equal(doorSortSubOrder("pine-s-open", 3), 1);
99 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
100 assert.equal(doorSortSubOrder("pine-n-open", 3), 1);
101 101 });
102 102
103 103 test("doors are per-tile sprites with tinted catalog states", () =>
@@ -92,12 +92,12 @@ test("light and ranged LoS follow passage-open (flipped from resting), not the o
92 }), false);
92 }), false);
93});
93});
94
94
95test("door sort sub-order puts N-closed behind and S-closed in front", () =>
95test("door sort sub-order: only S-closed is in front", () =>
96{
96{
97 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
98 assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
97 assert.equal(doorSortSubOrder("pine-s-closed", 3), 12);
99 assert.equal(doorSortSubOrder("pine-n-open", 3), 3);
98 assert.equal(doorSortSubOrder("pine-s-open", 3), 1);
100 assert.equal(doorSortSubOrder("pine-s-open", 3), 3);
99 assert.equal(doorSortSubOrder("pine-n-closed", 3), 1);
100 assert.equal(doorSortSubOrder("pine-n-open", 3), 1);
101});
101});
102
102
103test("doors are per-tile sprites with tinted catalog states", () =>
103test("doors are per-tile sprites with tinted catalog states", () =>
shared/world/doors.js +7 −7
@@ -98,9 +98,9 @@ export function isDoorOpenState (state)
98 98
99 99 /**
100 100 * Y-sort sub-order within the door's tile (see `ySortLayer` / `Y_SORT_SUBORDER_STRIDE`).
101 * N-closed draws behind blocks/entities; S-closed in front of entity + equipment;
102 * still shares the tile's sortY so the row above stays behind.
103 * Visual open sprites use the default entity sub-order.
101 * Only S-closed draws in front of blocks/entities on that tile;
102 * S-open, N-closed, and N-open all draw behind.
103 * Still shares the tile's sortY so the row above stays behind.
104 104 */
105 105 export const DOOR_SORT_BEHIND = 1;
106 106 /** Above entity body (3) and equipment overlays (4…). */
@@ -109,11 +109,11 @@ export const DOOR_SORT_FRONT = 12;
109 109 export function doorSortSubOrder (state, defaultSubOrder = 3)
110 110 {
111 111 const parsed = parseDoorState(state);
112 if (!parsed || parsed.open)
112 if (!parsed)
113 113 { return defaultSubOrder; }
114 if (parsed.facing === DoorFacing.n)
115 { return DOOR_SORT_BEHIND; }
116 return DOOR_SORT_FRONT;
114 if (parsed.facing === DoorFacing.s && !parsed.open)
115 { return DOOR_SORT_FRONT; }
116 return DOOR_SORT_BEHIND;
117 117 }
118 118
119 119 /**
@@ -98,9 +98,9 @@ export function isDoorOpenState (state)
98
98
99/**
99/**
100 * Y-sort sub-order within the door's tile (see `ySortLayer` / `Y_SORT_SUBORDER_STRIDE`).
100 * Y-sort sub-order within the door's tile (see `ySortLayer` / `Y_SORT_SUBORDER_STRIDE`).
101 * N-closed draws behind blocks/entities; S-closed in front of entity + equipment;
101 * Only S-closed draws in front of blocks/entities on that tile;
102 * still shares the tile's sortY so the row above stays behind.
102 * S-open, N-closed, and N-open all draw behind.
103 * Visual open sprites use the default entity sub-order.
103 * Still shares the tile's sortY so the row above stays behind.
104 */
104 */
105export const DOOR_SORT_BEHIND = 1;
105export const DOOR_SORT_BEHIND = 1;
106/** Above entity body (3) and equipment overlays (4…). */
106/** Above entity body (3) and equipment overlays (4…). */
@@ -109,11 +109,11 @@ export const DOOR_SORT_FRONT = 12;
109export function doorSortSubOrder (state, defaultSubOrder = 3)
109export function doorSortSubOrder (state, defaultSubOrder = 3)
110{
110{
111 const parsed = parseDoorState(state);
111 const parsed = parseDoorState(state);
112 if (!parsed || parsed.open)
112 if (!parsed)
113 { return defaultSubOrder; }
113 { return defaultSubOrder; }
114 if (parsed.facing === DoorFacing.n)
114 if (parsed.facing === DoorFacing.s && !parsed.open)
115 { return DOOR_SORT_BEHIND; }
115 { return DOOR_SORT_FRONT; }
116 return DOOR_SORT_FRONT;
116 return DOOR_SORT_BEHIND;
117}
117}
118
118
119/**
119/**