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.
@@ -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 @@ import16
} from "/shared/render/tint.js";16
} from "/shared/render/tint.js";17
import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";17
import { layersFromSpawnerConfig } from "/shared/appearance/layers.js";18
import { chargeSpriteFrameIndex, itemMaxCharges } from "/shared/items/charges.js";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
import { doorSortSubOrder, doorRestingState } from "/shared/world/doors.js";20
import { doorSortSubOrder, doorRestingState } from "/shared/world/doors.js";21
import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer, flightSortLayer } from "/shared/render/pivot.js";21
import { spriteCenterFromPivot, spriteDrawSize, tilePivot, ySortLayer, flightSortLayer } from "/shared/render/pivot.js";22
import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";22
import { bakeChunkAtlases, tileBlockSpriteEntry } from "./chunkBake.js";@@ -4925,7 +4925,7 @@ export class WorldView4925
{ 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
}@@ -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 = fals186
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). */190
export function chunkTileLightOcclusion (data, localX, localY)190
export 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);@@ -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 @@1
import test from "node:test";1
import test from "node:test";2
import assert from "node:assert/strict";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
import { SeasonId, resolveSeasonalVisualState } from "../../shared/world/season.js";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
test("deep water ground is impassable; shallow water is passable and wadeable", () =>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
assert.equal(isChunkTilePassable(data, 2, 2), false);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
test("shallow water freezes in winter: no wade, not liquid for coast foam", () =>33
test("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);