BlueGit

timfa questward

Add magenta thick/thin wood walls with per-tier tinting.

Material neighbor-connect masks (0–15) expand to every wood tier in the catalog, same pattern as fences and tables.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
78419164e6c07c8e8d2cc32281f0114a989c58aa
Parent
9a4c9267
34 files changed +36 −1
client/assets/blocks/thick-wood-wall/0.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/1.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/10.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/11.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/12.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/13.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/14.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/15.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/2.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/3.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/4.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/5.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/6.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/7.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/8.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-wood-wall/9.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/0.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/1.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/10.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/11.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/12.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/13.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/14.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/15.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/2.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/3.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/4.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/5.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/6.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/7.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/8.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thin-wood-wall/9.png added Binary file +0 −0

The contents of this binary file are not shown.

server/tests/tile-states.test.js +4 −0
@@ -6,6 +6,7 @@ import { buildSpriteCatalog } from "../src/assets/spriteCatalog.js";
6 6 import { cycleState, isCompanionSpriteStem, parseSpriteStem, resolveState } from "../../shared/definitions/tileSprites.js";
7 7 import { decodeChunkBlob, createEmptyChunkData } from "../src/world/chunkData.js";
8 8 import { GroundType, BlockType, normalizeGround, normalizeBlock, setBlockVisualState } from "../../shared/definitions/tiles.js";
9 import { WOOD_TIER_ORDER } from "../../shared/definitions/materialTiers.js";
9 10 import { diffChunks } from "../src/editor/service.js";
10 11
11 12 const ASSET_ROOT = join(fileURLToPath(new URL("../../client/assets", import.meta.url)));
@@ -28,6 +29,9 @@ test("sprite folders expose alphabetical states; first is default", () =>
28 29 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
29 30 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
30 31 assert.ok(catalog.images.some((image) => image.name === "block:thick-brick-wall:thick-brick-wall-we"));
32 assert.ok(catalog.images.some((image) => image.name === "block:thick-wood-wall:pine-0"));
33 assert.ok(catalog.images.some((image) => image.name === "block:thin-wood-wall:oak-15"));
34 assert.equal(catalog.blocks["thick-wood-wall"].states.length, WOOD_TIER_ORDER.length * 16);
31 35 assert.equal(catalog.images[0].subImgTotal, 1);
32 36 assert.equal(catalog.images[0].perRow, 1);
33 37 });
@@ -6,6 +6,7 @@ import { buildSpriteCatalog } from "../src/assets/spriteCatalog.js";
6import { cycleState, isCompanionSpriteStem, parseSpriteStem, resolveState } from "../../shared/definitions/tileSprites.js";
6import { cycleState, isCompanionSpriteStem, parseSpriteStem, resolveState } from "../../shared/definitions/tileSprites.js";
7import { decodeChunkBlob, createEmptyChunkData } from "../src/world/chunkData.js";
7import { decodeChunkBlob, createEmptyChunkData } from "../src/world/chunkData.js";
8import { GroundType, BlockType, normalizeGround, normalizeBlock, setBlockVisualState } from "../../shared/definitions/tiles.js";
8import { GroundType, BlockType, normalizeGround, normalizeBlock, setBlockVisualState } from "../../shared/definitions/tiles.js";
9import { WOOD_TIER_ORDER } from "../../shared/definitions/materialTiers.js";
9import { diffChunks } from "../src/editor/service.js";
10import { diffChunks } from "../src/editor/service.js";
10
11
11const ASSET_ROOT = join(fileURLToPath(new URL("../../client/assets", import.meta.url)));
12const ASSET_ROOT = join(fileURLToPath(new URL("../../client/assets", import.meta.url)));
@@ -28,6 +29,9 @@ test("sprite folders expose alphabetical states; first is default", () =>
28 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
29 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
29 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
30 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
30 assert.ok(catalog.images.some((image) => image.name === "block:thick-brick-wall:thick-brick-wall-we"));
31 assert.ok(catalog.images.some((image) => image.name === "block:thick-brick-wall:thick-brick-wall-we"));
32 assert.ok(catalog.images.some((image) => image.name === "block:thick-wood-wall:pine-0"));
33 assert.ok(catalog.images.some((image) => image.name === "block:thin-wood-wall:oak-15"));
34 assert.equal(catalog.blocks["thick-wood-wall"].states.length, WOOD_TIER_ORDER.length * 16);
31 assert.equal(catalog.images[0].subImgTotal, 1);
35 assert.equal(catalog.images[0].subImgTotal, 1);
32 assert.equal(catalog.images[0].perRow, 1);
36 assert.equal(catalog.images[0].perRow, 1);
33});
37});
shared/definitions/tiles.js +32 −1
@@ -82,7 +82,9 @@ export const BlockType = Object.freeze({
82 82 smoothStoneWall: 39,
83 83 smoothStoneWallThin: 40,
84 84 brickWall: 41,
85 brickWallThin: 42
85 brickWallThin: 42,
86 woodWall: 43,
87 woodWallThin: 44
86 88 });
87 89
88 90 export const GROUND_DEFINITIONS = Object.freeze({
@@ -253,6 +255,35 @@ export const BLOCK_DEFINITIONS = Object.freeze({
253 255 neighborConnect: true,
254 256 neighborConnectNamed: true
255 257 }),
258 [BlockType.woodWall]: Object.freeze({
259 id: BlockType.woodWall,
260 key: "thick-wood-wall",
261 displayName: "Thick wood wall",
262 passable: false,
263 lightRangeTiles: 0,
264 frames: 1,
265 framesPerRow: 1,
266 animationSpeed: 0,
267 outdoor: false,
268 /** Magenta face-lit masks `0`–`15`; catalog expands `${wood}-${mask}`. */
269 neighborConnect: true,
270 neighborConnectByMaterial: true,
271 defaultNeighborMaterial: WoodTier.pine
272 }),
273 [BlockType.woodWallThin]: Object.freeze({
274 id: BlockType.woodWallThin,
275 key: "thin-wood-wall",
276 displayName: "Thin wood wall",
277 passable: false,
278 lightRangeTiles: 0,
279 frames: 1,
280 framesPerRow: 1,
281 animationSpeed: 0,
282 outdoor: false,
283 neighborConnect: true,
284 neighborConnectByMaterial: true,
285 defaultNeighborMaterial: WoodTier.pine
286 }),
256 287 [BlockType.torch]: Object.freeze({
257 288 id: BlockType.torch,
258 289 key: "torch",
@@ -82,7 +82,9 @@ export const BlockType = Object.freeze({
82 smoothStoneWall: 39,
82 smoothStoneWall: 39,
83 smoothStoneWallThin: 40,
83 smoothStoneWallThin: 40,
84 brickWall: 41,
84 brickWall: 41,
85 brickWallThin: 42
85 brickWallThin: 42,
86 woodWall: 43,
87 woodWallThin: 44
86});
88});
87
89
88export const GROUND_DEFINITIONS = Object.freeze({
90export const GROUND_DEFINITIONS = Object.freeze({
@@ -253,6 +255,35 @@ export const BLOCK_DEFINITIONS = Object.freeze({
253 neighborConnect: true,
255 neighborConnect: true,
254 neighborConnectNamed: true
256 neighborConnectNamed: true
255 }),
257 }),
258 [BlockType.woodWall]: Object.freeze({
259 id: BlockType.woodWall,
260 key: "thick-wood-wall",
261 displayName: "Thick wood wall",
262 passable: false,
263 lightRangeTiles: 0,
264 frames: 1,
265 framesPerRow: 1,
266 animationSpeed: 0,
267 outdoor: false,
268 /** Magenta face-lit masks `0`–`15`; catalog expands `${wood}-${mask}`. */
269 neighborConnect: true,
270 neighborConnectByMaterial: true,
271 defaultNeighborMaterial: WoodTier.pine
272 }),
273 [BlockType.woodWallThin]: Object.freeze({
274 id: BlockType.woodWallThin,
275 key: "thin-wood-wall",
276 displayName: "Thin wood wall",
277 passable: false,
278 lightRangeTiles: 0,
279 frames: 1,
280 framesPerRow: 1,
281 animationSpeed: 0,
282 outdoor: false,
283 neighborConnect: true,
284 neighborConnectByMaterial: true,
285 defaultNeighborMaterial: WoodTier.pine
286 }),
256 [BlockType.torch]: Object.freeze({
287 [BlockType.torch]: Object.freeze({
257 id: BlockType.torch,
288 id: BlockType.torch,
258 key: "torch",
289 key: "torch",