BlueGit

timfa questward

Let light pass through deep water despite impassable ground.

Water grounds no longer map to solid light occlusion via passability; movement stays blocked while torch rays travel freely.

timfa Tim Falken · pushed by timfa

Authored 2026-09-04 · 2 months ago

Hash
ebdb070d54938ba3c7618eae59020267a9edbdef
Parent
c7496543
6 files changed +36 −11
client/src/render/worldView.js +2 −2
@@ -16,7 +16,7 @@ import
16 16 } from "/shared/render/tint.js";
17 17 import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
18 18 import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
19 import { normalizeGround, normalizeBlock, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, LightOcclusion, blockDefinition, blockLightOcclusionForBlock, GroundType, GROUND_DEFINITIONS } from "/shared/definitions/tiles.js";
19 import { normalizeGround, normalizeBlock, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, groundLightOcclusion, LightOcclusion, blockDefinition, blockLightOcclusionForBlock, GroundType, GROUND_DEFINITIONS } from "/shared/definitions/tiles.js";
20 20 import { doorSortSubOrder, doorRestingState } from "/shared/world/doors.js";
21 21 import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer, flightSortLayer } from "/shared/render/pivot.js";
22 22 import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
@@ -4925,7 +4925,7 @@ export class WorldView
4925 4925 { return false; }
4926 4926 const index = localY * CHUNK_SIZE + localX;
4927 4927 const ground = normalizeGround(snapshot.grounds?.[index]);
4928 if (!isGroundPassable(ground.typeId))
4928 if (groundLightOcclusion(ground.typeId) === LightOcclusion.solid)
4929 4929 { return true; }
4930 4930 return blockLightOcclusionForBlock(snapshot.blocks?.[index]) === LightOcclusion.solid;
4931 4931 }
@@ -16,7 +16,7 @@ import
16} from "/shared/render/tint.js";
16} from "/shared/render/tint.js";
17import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
17import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";
18import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
18import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";
19import { normalizeGround, normalizeBlock, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, LightOcclusion, blockDefinition, blockLightOcclusionForBlock, GroundType, GROUND_DEFINITIONS } from "/shared/definitions/tiles.js";
19import { normalizeGround, normalizeBlock, isWadeGroundInSeason, isWaterGround, isLiquidWaterGround, isGroundPassable, groundLightOcclusion, LightOcclusion, blockDefinition, blockLightOcclusionForBlock, GroundType, GROUND_DEFINITIONS } from "/shared/definitions/tiles.js";
20import { doorSortSubOrder, doorRestingState } from "/shared/world/doors.js";
20import { doorSortSubOrder, doorRestingState } from "/shared/world/doors.js";
21import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer, flightSortLayer } from "/shared/render/pivot.js";
21import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer, flightSortLayer } from "/shared/render/pivot.js";
22import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
22import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";
@@ -4925,7 +4925,7 @@ export class WorldView
4925 { return false; }
4925 { return false; }
4926 const index = localY * CHUNK_SIZE + localX;
4926 const index = localY * CHUNK_SIZE + localX;
4927 const ground = normalizeGround(snapshot.grounds?.[index]);
4927 const ground = normalizeGround(snapshot.grounds?.[index]);
4928 if (!isGroundPassable(ground.typeId))
4928 if (groundLightOcclusion(ground.typeId) === LightOcclusion.solid)
4929 { return true; }
4929 { return true; }
4930 return blockLightOcclusionForBlock(snapshot.blocks?.[index]) === LightOcclusion.solid;
4930 return blockLightOcclusionForBlock(snapshot.blocks?.[index]) === LightOcclusion.solid;
4931 }
4931 }
server/src/world/chunkData.js +1 −1
@@ -186,7 +186,7 @@ export function isChunkTilePassable (data, localX, localY, { canOpenDoors = fals
186 186 return isBlockPassable(block.typeId, block.state);
187 187 }
188 188
189 /** Light occlusion level for a chunk tile (ground impassable → solid). */
189 /** Light occlusion level for a chunk tile (water stays clear even when impassable). */
190 190 export function chunkTileLightOcclusion (data, localX, localY)
191 191 {
192 192 return tileLightOcclusionAt(data.grounds, data.blocks, localX, localY);
@@ -186,7 +186,7 @@ export function isChunkTilePassable (data, localX, localY, { canOpenDoors = fals
186 return isBlockPassable(block.typeId, block.state);
186 return isBlockPassable(block.typeId, block.state);
187}
187}
188
188
189/** Light occlusion level for a chunk tile (ground impassable → solid). */
189/** Light occlusion level for a chunk tile (water stays clear even when impassable). */
190export function chunkTileLightOcclusion (data, localX, localY)
190export function chunkTileLightOcclusion (data, localX, localY)
191{
191{
192 return tileLightOcclusionAt(data.grounds, data.blocks, localX, localY);
192 return tileLightOcclusionAt(data.grounds, data.blocks, localX, localY);
server/tests/water-grounds.test.js +12 −2
@@ -1,8 +1,8 @@
1 1 import test from "node:test";
2 2 import assert from "node:assert/strict";
3 import { GroundType, isGroundPassable, isWadeGround, isWaterGround, isLiquidWaterGround, isWadeGroundInSeason } from "../../shared/definitions/tiles.js";
3 import { GroundType, isGroundPassable, isWadeGround, isWaterGround, isLiquidWaterGround, isWadeGroundInSeason, groundLightOcclusion, LightOcclusion } from "../../shared/definitions/tiles.js";
4 4 import { SeasonId, resolveSeasonalVisualState } from "../../shared/world/season.js";
5 import { createEmptyChunkData, isChunkTilePassable, setGround } from "../src/world/chunkData.js";
5 import { createEmptyChunkData, isChunkTilePassable, isChunkTileClearForLight, setGround } from "../src/world/chunkData.js";
6 6
7 7 test("deep water ground is impassable; shallow water is passable and wadeable", () =>
8 8 {
@@ -20,6 +20,16 @@ test("deep water ground is impassable; shallow water is passable and wadeable",
20 20 assert.equal(isChunkTilePassable(data, 2, 2), false);
21 21 });
22 22
23 test("deep water does not occlude light rays", () =>
24 {
25 assert.equal(groundLightOcclusion(GroundType.water), LightOcclusion.clear);
26 assert.equal(groundLightOcclusion(GroundType.deepWater), LightOcclusion.clear);
27 const data = createEmptyChunkData();
28 setGround(data, 3, 3, GroundType.deepWater);
29 assert.equal(isChunkTileClearForLight(data, 3, 3), true);
30 assert.equal(isChunkTilePassable(data, 3, 3), false);
31 });
32
23 33 test("shallow water freezes in winter: no wade, not liquid for coast foam", () =>
24 34 {
25 35 assert.equal(isLiquidWaterGround(GroundType.water, SeasonId.summer), true);
@@ -1,8 +1,8 @@
1import test from "node:test";
1import test from "node:test";
2import assert from "node:assert/strict";
2import assert from "node:assert/strict";
3import { GroundType, isGroundPassable, isWadeGround, isWaterGround, isLiquidWaterGround, isWadeGroundInSeason } from "../../shared/definitions/tiles.js";
3import { GroundType, isGroundPassable, isWadeGround, isWaterGround, isLiquidWaterGround, isWadeGroundInSeason, groundLightOcclusion, LightOcclusion } from "../../shared/definitions/tiles.js";
4import { SeasonId, resolveSeasonalVisualState } from "../../shared/world/season.js";
4import { SeasonId, resolveSeasonalVisualState } from "../../shared/world/season.js";
5import { createEmptyChunkData, isChunkTilePassable, setGround } from "../src/world/chunkData.js";
5import { createEmptyChunkData, isChunkTilePassable, isChunkTileClearForLight, setGround } from "../src/world/chunkData.js";
6
6
7test("deep water ground is impassable; shallow water is passable and wadeable", () =>
7test("deep water ground is impassable; shallow water is passable and wadeable", () =>
8{
8{
@@ -20,6 +20,16 @@ test("deep water ground is impassable; shallow water is passable and wadeable",
20 assert.equal(isChunkTilePassable(data, 2, 2), false);
20 assert.equal(isChunkTilePassable(data, 2, 2), false);
21});
21});
22
22
23test("deep water does not occlude light rays", () =>
24{
25 assert.equal(groundLightOcclusion(GroundType.water), LightOcclusion.clear);
26 assert.equal(groundLightOcclusion(GroundType.deepWater), LightOcclusion.clear);
27 const data = createEmptyChunkData();
28 setGround(data, 3, 3, GroundType.deepWater);
29 assert.equal(isChunkTileClearForLight(data, 3, 3), true);
30 assert.equal(isChunkTilePassable(data, 3, 3), false);
31});
32
23test("shallow water freezes in winter: no wade, not liquid for coast foam", () =>
33test("shallow water freezes in winter: no wade, not liquid for coast foam", () =>
24{
34{
25 assert.equal(isLiquidWaterGround(GroundType.water, SeasonId.summer), true);
35 assert.equal(isLiquidWaterGround(GroundType.water, SeasonId.summer), true);
shared/definitions/tiles.js +13 −0
@@ -1057,6 +1057,19 @@ export function isWaterGround (typeId)
1057 1057 return !!groundDefinition(typeId)?.water;
1058 1058 }
1059 1059
1060 /**
1061 * Ground contribution to light-ray occlusion.
1062 * Water (incl. impassable deep water) stays optically clear — only movement is blocked.
1063 */
1064 export function groundLightOcclusion (typeId)
1065 {
1066 if (isWaterGround(typeId))
1067 { return LightOcclusion.clear; }
1068 if (!isGroundPassable(typeId))
1069 { return LightOcclusion.solid; }
1070 return LightOcclusion.clear;
1071 }
1072
1060 1073 export function isWadeGround (typeId)
1061 1074 {
1062 1075 return !!groundDefinition(typeId)?.wades;
@@ -1057,6 +1057,19 @@ export function isWaterGround (typeId)
1057 return !!groundDefinition(typeId)?.water;
1057 return !!groundDefinition(typeId)?.water;
1058}
1058}
1059
1059
1060/**
1061 * Ground contribution to light-ray occlusion.
1062 * Water (incl. impassable deep water) stays optically clear — only movement is blocked.
1063 */
1064export function groundLightOcclusion (typeId)
1065{
1066 if (isWaterGround(typeId))
1067 { return LightOcclusion.clear; }
1068 if (!isGroundPassable(typeId))
1069 { return LightOcclusion.solid; }
1070 return LightOcclusion.clear;
1071}
1072
1060export function isWadeGround (typeId)
1073export function isWadeGround (typeId)
1061{
1074{
1062 return !!groundDefinition(typeId)?.wades;
1075 return !!groundDefinition(typeId)?.wades;
shared/lighting/chunkOcclusion.js +4 −3
@@ -1,7 +1,7 @@
1 1 import { CHUNK_SIZE } from "../protocol/constants.js";
2 2 import {
3 3 blockLightOcclusionForBlock,
4 isGroundPassable,
4 groundLightOcclusion,
5 5 LightOcclusion,
6 6 normalizeGround
7 7 } from "../definitions/tiles.js";
@@ -11,8 +11,9 @@ export function tileLightOcclusionAt (grounds, blocks, localX, localY)
11 11 {
12 12 const index = localY * CHUNK_SIZE + localX;
13 13 const ground = normalizeGround(grounds?.[index]);
14 if (!isGroundPassable(ground.typeId))
15 { return LightOcclusion.solid; }
14 const groundOcclusion = groundLightOcclusion(ground.typeId);
15 if (groundOcclusion !== LightOcclusion.clear)
16 { return groundOcclusion; }
16 17 return blockLightOcclusionForBlock(blocks?.[index]);
17 18 }
18 19
@@ -1,7 +1,7 @@
1import { CHUNK_SIZE } from "../protocol/constants.js";
1import { CHUNK_SIZE } from "../protocol/constants.js";
2import {
2import {
3 blockLightOcclusionForBlock,
3 blockLightOcclusionForBlock,
4 isGroundPassable,
4 groundLightOcclusion,
5 LightOcclusion,
5 LightOcclusion,
6 normalizeGround
6 normalizeGround
7} from "../definitions/tiles.js";
7} from "../definitions/tiles.js";
@@ -11,8 +11,9 @@ export function tileLightOcclusionAt (grounds, blocks, localX, localY)
11{
11{
12 const index = localY * CHUNK_SIZE + localX;
12 const index = localY * CHUNK_SIZE + localX;
13 const ground = normalizeGround(grounds?.[index]);
13 const ground = normalizeGround(grounds?.[index]);
14 if (!isGroundPassable(ground.typeId))
14 const groundOcclusion = groundLightOcclusion(ground.typeId);
15 { return LightOcclusion.solid; }
15 if (groundOcclusion !== LightOcclusion.clear)
16 { return groundOcclusion; }
16 return blockLightOcclusionForBlock(blocks?.[index]);
17 return blockLightOcclusionForBlock(blocks?.[index]);
17}
18}
18
19
shared/lighting/tilePassable.js +4 −3
@@ -1,7 +1,7 @@
1 1 import { CHUNK_SIZE } from "../protocol/constants.js";
2 2 import {
3 3 blockLightOcclusionForBlock,
4 isGroundPassable,
4 groundLightOcclusion,
5 5 LightOcclusion,
6 6 normalizeGround
7 7 } from "../definitions/tiles.js";
@@ -27,8 +27,9 @@ export function makeSnapshotLightOcclusion (chunks)
27 27 { return LightOcclusion.clear; }
28 28 const index = localY * CHUNK_SIZE + localX;
29 29 const ground = normalizeGround(snapshot.grounds?.[index]);
30 if (!isGroundPassable(ground.typeId))
31 { return LightOcclusion.solid; }
30 const groundOcclusion = groundLightOcclusion(ground.typeId);
31 if (groundOcclusion !== LightOcclusion.clear)
32 { return groundOcclusion; }
32 33 return blockLightOcclusionForBlock(snapshot.blocks?.[index]);
33 34 };
34 35 }
@@ -1,7 +1,7 @@
1import { CHUNK_SIZE } from "../protocol/constants.js";
1import { CHUNK_SIZE } from "../protocol/constants.js";
2import {
2import {
3 blockLightOcclusionForBlock,
3 blockLightOcclusionForBlock,
4 isGroundPassable,
4 groundLightOcclusion,
5 LightOcclusion,
5 LightOcclusion,
6 normalizeGround
6 normalizeGround
7} from "../definitions/tiles.js";
7} from "../definitions/tiles.js";
@@ -27,8 +27,9 @@ export function makeSnapshotLightOcclusion (chunks)
27 { return LightOcclusion.clear; }
27 { return LightOcclusion.clear; }
28 const index = localY * CHUNK_SIZE + localX;
28 const index = localY * CHUNK_SIZE + localX;
29 const ground = normalizeGround(snapshot.grounds?.[index]);
29 const ground = normalizeGround(snapshot.grounds?.[index]);
30 if (!isGroundPassable(ground.typeId))
30 const groundOcclusion = groundLightOcclusion(ground.typeId);
31 { return LightOcclusion.solid; }
31 if (groundOcclusion !== LightOcclusion.clear)
32 { return groundOcclusion; }
32 return blockLightOcclusionForBlock(snapshot.blocks?.[index]);
33 return blockLightOcclusionForBlock(snapshot.blocks?.[index]);
33 };
34 };
34}
35}