Fix wall 2x2 corners mapping to nesw.
Legacy diagonal masks like 19 were clamped with min(15,n) to 15; keep cardinals via &15 so they become ne/es/…. Recompute connect states when a chunk loads in the editor.
@@ -686,6 +686,26 @@ function refreshNeighborConnect (localX, localY, typeId)
686
686
}
687
687
}
688
688
689
/** Fix legacy/wrong connect states (e.g. old diagonal masks saved as nesw) from live neighbors. */
690
function recomputeAllNeighborConnectInDraft ()
691
{
692
if (!draft)
693
{ return; }
694
for (let localY = 0; localY < CHUNK_SIZE; localY++)
695
{
696
for (let localX = 0; localX < CHUNK_SIZE; localX++)
697
{
698
const block = draft.blocks[localY * CHUNK_SIZE + localX];
699
if (!block)
700
{ continue; }
701
const def = BLOCK_DEFINITIONS[block.typeId];
702
if (!definitionUsesNeighborConnect(def))
703
{ continue; }
704
refreshNeighborConnect(localX, localY, block.typeId);
705
}
706
}
707
}
708
689
709
function updateRevisionUI ()
690
710
{
691
711
const applyBtn = $("apply");
@@ -748,6 +768,8 @@ function showSelectedChunk (payload)
748
768
view.applySnapshot(snapshotFromPayload(payload));
749
769
syncSpawnersOverlay(payload.chunkX, payload.chunkY, draft.spawners);
750
770
captureDraftBaseline();
771
recomputeAllNeighborConnectInDraft();
772
syncSaveButton();
751
773
if (navigateAfterSave && pendingNavigate)
752
774
{
753
775
const next = pendingNavigate;
@@ -686,6 +686,26 @@ function refreshNeighborConnect (localX, localY, typeId)686
}686
}687
}687
}688
688
689
/** Fix legacy/wrong connect states (e.g. old diagonal masks saved as nesw) from live neighbors. */690
function recomputeAllNeighborConnectInDraft ()691
{692
if (!draft)693
{ return; }694
for (let localY = 0; localY < CHUNK_SIZE; localY++)695
{696
for (let localX = 0; localX < CHUNK_SIZE; localX++)697
{698
const block = draft.blocks[localY * CHUNK_SIZE + localX];699
if (!block)700
{ continue; }701
const def = BLOCK_DEFINITIONS[block.typeId];702
if (!definitionUsesNeighborConnect(def))703
{ continue; }704
refreshNeighborConnect(localX, localY, block.typeId);705
}706
}707
}708
689
function updateRevisionUI ()709
function updateRevisionUI ()690
{710
{691
const applyBtn = $("apply");711
const applyBtn = $("apply");@@ -748,6 +768,8 @@ function showSelectedChunk (payload)748
view.applySnapshot(snapshotFromPayload(payload));768
view.applySnapshot(snapshotFromPayload(payload));749
syncSpawnersOverlay(payload.chunkX, payload.chunkY, draft.spawners);769
syncSpawnersOverlay(payload.chunkX, payload.chunkY, draft.spawners);750
captureDraftBaseline();770
captureDraftBaseline();771
recomputeAllNeighborConnectInDraft();772
syncSaveButton();751
if (navigateAfterSave && pendingNavigate)773
if (navigateAfterSave && pendingNavigate)752
{774
{753
const next = pendingNavigate;775
const next = pendingNavigate;@@ -1,19 +1,20 @@
1
1
import test from "node:test";
2
2
import assert from "node:assert/strict";
3
import {
4
NeighborBit,
5
computeNeighborConnectMask,
6
neighborConnectStateName,
7
parseNeighborConnectMask,
8
composeNeighborConnectState,
9
neighborConnectBlocksMatch,
10
parseMaterialNeighborConnectState,
11
worldTileToChunkLocal,
12
neighborConnectRefreshTiles,
13
cardinalConnectionSuffix,
14
composeNamedNeighborConnectState,
15
parseNamedNeighborConnectMask
16
} from "../../shared/world/neighborConnect.js";
3
import
4
{
5
NeighborBit,
6
computeNeighborConnectMask,
7
neighborConnectStateName,
8
parseNeighborConnectMask,
9
composeNeighborConnectState,
10
neighborConnectBlocksMatch,
11
parseMaterialNeighborConnectState,
12
worldTileToChunkLocal,
13
neighborConnectRefreshTiles,
14
cardinalConnectionSuffix,
15
composeNamedNeighborConnectState,
16
parseNamedNeighborConnectMask
17
} from "../../shared/world/neighborConnect.js";
17
18
import { CENTRAL_EXCHANGE_STAFF, pickExchangeClerk } from "../../shared/market/exchange.js";
18
19
import { MobId, normalizeSpawnerConfig, isCentralExchangeSpawner } from "../../shared/definitions/mobs.js";
19
20
import { BlockType, BLOCK_DEFINITIONS } from "../../shared/definitions/tiles.js";
@@ -61,6 +62,15 @@ test("named wall connection suffixes follow nesw / we / esw / wne", () =>
61
62
assert.deepEqual(neighborConnectRefreshTiles(15, 8).length, 5);
62
63
});
63
64
65
test("legacy diagonal wall masks keep cardinals only (19 → ne, not nesw)", () =>
66
{
67
const def = { key: "thin-stone-wall", neighborConnect: true, neighborConnectNamed: true };
68
assert.equal(parseNamedNeighborConnectMask("19", def), NeighborBit.n | NeighborBit.e);
69
assert.equal(composeNamedNeighborConnectState(def, parseNamedNeighborConnectMask("19", def)), "thin-stone-wall-ne");
70
assert.equal(parseNamedNeighborConnectMask("38", def), NeighborBit.e | NeighborBit.s);
71
assert.equal(parseNamedNeighborConnectMask("255", def), 15);
72
});
73
64
74
test("material neighbor-connect states keep wood id and only match same material", () =>
65
75
{
66
76
const def = BLOCK_DEFINITIONS[BlockType.table];
@@ -1,19 +1,20 @@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 {3
import4
NeighborBit,4
{5
computeNeighborConnectMask,5
NeighborBit,6
neighborConnectStateName,6
computeNeighborConnectMask,7
parseNeighborConnectMask,7
neighborConnectStateName,8
composeNeighborConnectState,8
parseNeighborConnectMask,9
neighborConnectBlocksMatch,9
composeNeighborConnectState,10
parseMaterialNeighborConnectState,10
neighborConnectBlocksMatch,11
worldTileToChunkLocal,11
parseMaterialNeighborConnectState,12
neighborConnectRefreshTiles,12
worldTileToChunkLocal,13
cardinalConnectionSuffix,13
neighborConnectRefreshTiles,14
composeNamedNeighborConnectState,14
cardinalConnectionSuffix,15
parseNamedNeighborConnectMask15
composeNamedNeighborConnectState,16
} from "../../shared/world/neighborConnect.js";16
parseNamedNeighborConnectMask17
} from "../../shared/world/neighborConnect.js";17
import { CENTRAL_EXCHANGE_STAFF, pickExchangeClerk } from "../../shared/market/exchange.js";18
import { CENTRAL_EXCHANGE_STAFF, pickExchangeClerk } from "../../shared/market/exchange.js";18
import { MobId, normalizeSpawnerConfig, isCentralExchangeSpawner } from "../../shared/definitions/mobs.js";19
import { MobId, normalizeSpawnerConfig, isCentralExchangeSpawner } from "../../shared/definitions/mobs.js";19
import { BlockType, BLOCK_DEFINITIONS } from "../../shared/definitions/tiles.js";20
import { BlockType, BLOCK_DEFINITIONS } from "../../shared/definitions/tiles.js";@@ -61,6 +62,15 @@ test("named wall connection suffixes follow nesw / we / esw / wne", () =>61
assert.deepEqual(neighborConnectRefreshTiles(15, 8).length, 5);62
assert.deepEqual(neighborConnectRefreshTiles(15, 8).length, 5);62
});63
});63
64
65
test("legacy diagonal wall masks keep cardinals only (19 → ne, not nesw)", () =>66
{67
const def = { key: "thin-stone-wall", neighborConnect: true, neighborConnectNamed: true };68
assert.equal(parseNamedNeighborConnectMask("19", def), NeighborBit.n | NeighborBit.e);69
assert.equal(composeNamedNeighborConnectState(def, parseNamedNeighborConnectMask("19", def)), "thin-stone-wall-ne");70
assert.equal(parseNamedNeighborConnectMask("38", def), NeighborBit.e | NeighborBit.s);71
assert.equal(parseNamedNeighborConnectMask("255", def), 15);72
});73
64
test("material neighbor-connect states keep wood id and only match same material", () =>74
test("material neighbor-connect states keep wood id and only match same material", () =>65
{75
{66
const def = BLOCK_DEFINITIONS[BlockType.table];76
const def = BLOCK_DEFINITIONS[BlockType.table];@@ -143,4 +143,6 @@ test("normalizeBlock migrates legacy numeric wall states to named suffixes", ()
143
143
assert.equal(migrated.state, "thick-stone-wall-esw");
144
144
const alone = normalizeBlock({ typeId: BlockType.stoneWallThin, state: "0", config: null });
145
145
assert.equal(alone.state, "thin-stone-wall");
146
const corner = normalizeBlock({ typeId: BlockType.stoneWallThin, state: "19", config: null });
147
assert.equal(corner.state, "thin-stone-wall-ne");
146
148
});
@@ -143,4 +143,6 @@ test("normalizeBlock migrates legacy numeric wall states to named suffixes", ()143
assert.equal(migrated.state, "thick-stone-wall-esw");143
assert.equal(migrated.state, "thick-stone-wall-esw");144
const alone = normalizeBlock({ typeId: BlockType.stoneWallThin, state: "0", config: null });144
const alone = normalizeBlock({ typeId: BlockType.stoneWallThin, state: "0", config: null });145
assert.equal(alone.state, "thin-stone-wall");145
assert.equal(alone.state, "thin-stone-wall");146
const corner = normalizeBlock({ typeId: BlockType.stoneWallThin, state: "19", config: null });147
assert.equal(corner.state, "thin-stone-wall-ne");146
});148
});