BlueGit

timfa questward

Remove thick smooth stone wall; keep thin only.

Palette and assets drop the thick variant; type id 39 stays unused so later wall ids stay stable.

timfa Tim Falken · pushed by timfa

Authored 2026-08-31 · 2 months ago

Hash
278db728ceff8fda815e30db4b0414cd8b6fe462
Parent
89b1543f
19 files changed +6 −18
client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-e.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-es.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-esw.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-n.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-ne.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-nes.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-nesw.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-ns.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-s.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-sw.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-swn.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-w.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-we.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-wn.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall-wne.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/thick-smooth-stone-wall/thick-smooth-stone-wall.png deleted Binary file +0 −0

The contents of this binary file are not shown.

client/scripts/texture-wall-sprites.mjs +3 −2
@@ -550,7 +550,6 @@ const VARIANT_OUT = {
550 550 thin: { dir: "thin-stone-wall", named: true, prefix: "thin-stone-wall" }
551 551 },
552 552 smooth: {
553 thick: { dir: "thick-smooth-stone-wall", named: true, prefix: "thick-smooth-stone-wall" },
554 553 thin: { dir: "thin-smooth-stone-wall", named: true, prefix: "thin-smooth-stone-wall" }
555 554 },
556 555 brick: {
@@ -648,8 +647,10 @@ function bakeVariant (variant, { force = false } = {})
648 647 let wrote = 0;
649 648 for (const kind of ["thick", "thin"])
650 649 {
651 const shapeKey = `${kind}-stone-wall`;
652 650 const out = cfg[kind];
651 if (!out)
652 { continue; }
653 const shapeKey = `${kind}-stone-wall`;
653 654 const outDir = join(ROOT, out.dir);
654 655 mkdirSync(outDir, { recursive: true });
655 656 const files = shapeFiles(shapeKey);
@@ -550,7 +550,6 @@ const VARIANT_OUT = {
550 thin: { dir: "thin-stone-wall", named: true, prefix: "thin-stone-wall" }
550 thin: { dir: "thin-stone-wall", named: true, prefix: "thin-stone-wall" }
551 },
551 },
552 smooth: {
552 smooth: {
553 thick: { dir: "thick-smooth-stone-wall", named: true, prefix: "thick-smooth-stone-wall" },
554 thin: { dir: "thin-smooth-stone-wall", named: true, prefix: "thin-smooth-stone-wall" }
553 thin: { dir: "thin-smooth-stone-wall", named: true, prefix: "thin-smooth-stone-wall" }
555 },
554 },
556 brick: {
555 brick: {
@@ -648,8 +647,10 @@ function bakeVariant (variant, { force = false } = {})
648 let wrote = 0;
647 let wrote = 0;
649 for (const kind of ["thick", "thin"])
648 for (const kind of ["thick", "thin"])
650 {
649 {
651 const shapeKey = `${kind}-stone-wall`;
652 const out = cfg[kind];
650 const out = cfg[kind];
651 if (!out)
652 { continue; }
653 const shapeKey = `${kind}-stone-wall`;
653 const outDir = join(ROOT, out.dir);
654 const outDir = join(ROOT, out.dir);
654 mkdirSync(outDir, { recursive: true });
655 mkdirSync(outDir, { recursive: true });
655 const files = shapeFiles(shapeKey);
656 const files = shapeFiles(shapeKey);
server/tests/tile-states.test.js +2 −2
@@ -23,9 +23,9 @@ test("sprite folders expose alphabetical states; first is default", () =>
23 23 assert.equal(catalog.blocks["thin-stone-wall"].defaultState, "thin-stone-wall");
24 24 assert.equal(catalog.blocks["thin-stone-wall"].states.length, 16);
25 25 assert.ok(catalog.images.some((image) => image.name === "block:thin-stone-wall:thin-stone-wall-wne"));
26 assert.equal(catalog.blocks["thick-smooth-stone-wall"].states.length, 16);
27 26 assert.equal(catalog.blocks["thin-smooth-stone-wall"].states.length, 16);
28 assert.ok(catalog.images.some((image) => image.name === "block:thick-smooth-stone-wall:thick-smooth-stone-wall"));
27 assert.ok(catalog.images.some((image) => image.name === "block:thin-smooth-stone-wall:thin-smooth-stone-wall"));
28 assert.equal(catalog.blocks["thick-smooth-stone-wall"], undefined);
29 29 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
30 30 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
31 31 assert.ok(catalog.images.some((image) => image.name === "block:thick-brick-wall:thick-brick-wall-we"));
@@ -23,9 +23,9 @@ test("sprite folders expose alphabetical states; first is default", () =>
23 assert.equal(catalog.blocks["thin-stone-wall"].defaultState, "thin-stone-wall");
23 assert.equal(catalog.blocks["thin-stone-wall"].defaultState, "thin-stone-wall");
24 assert.equal(catalog.blocks["thin-stone-wall"].states.length, 16);
24 assert.equal(catalog.blocks["thin-stone-wall"].states.length, 16);
25 assert.ok(catalog.images.some((image) => image.name === "block:thin-stone-wall:thin-stone-wall-wne"));
25 assert.ok(catalog.images.some((image) => image.name === "block:thin-stone-wall:thin-stone-wall-wne"));
26 assert.equal(catalog.blocks["thick-smooth-stone-wall"].states.length, 16);
27 assert.equal(catalog.blocks["thin-smooth-stone-wall"].states.length, 16);
26 assert.equal(catalog.blocks["thin-smooth-stone-wall"].states.length, 16);
28 assert.ok(catalog.images.some((image) => image.name === "block:thick-smooth-stone-wall:thick-smooth-stone-wall"));
27 assert.ok(catalog.images.some((image) => image.name === "block:thin-smooth-stone-wall:thin-smooth-stone-wall"));
28 assert.equal(catalog.blocks["thick-smooth-stone-wall"], undefined);
29 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
29 assert.equal(catalog.blocks["thick-brick-wall"].states.length, 16);
30 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
30 assert.equal(catalog.blocks["thin-brick-wall"].states.length, 16);
31 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"));
shared/definitions/tiles.js +1 −14
@@ -79,7 +79,7 @@ export const BlockType = Object.freeze({
79 79 silkCocoon: 36,
80 80 fence: 37,
81 81 stoneWallThin: 38,
82 smoothStoneWall: 39,
82 /** Former thick smooth stone wall (39) removed — id left unused. */
83 83 smoothStoneWallThin: 40,
84 84 brickWall: 41,
85 85 brickWallThin: 42,
@@ -205,19 +205,6 @@ export const BLOCK_DEFINITIONS = Object.freeze({
205 205 neighborConnect: true,
206 206 neighborConnectNamed: true
207 207 }),
208 [BlockType.smoothStoneWall]: Object.freeze({
209 id: BlockType.smoothStoneWall,
210 key: "thick-smooth-stone-wall",
211 displayName: "Thick smooth stone wall",
212 passable: false,
213 lightRangeTiles: 0,
214 frames: 1,
215 framesPerRow: 1,
216 animationSpeed: 0,
217 outdoor: false,
218 neighborConnect: true,
219 neighborConnectNamed: true
220 }),
221 208 [BlockType.smoothStoneWallThin]: Object.freeze({
222 209 id: BlockType.smoothStoneWallThin,
223 210 key: "thin-smooth-stone-wall",
@@ -79,7 +79,7 @@ export const BlockType = Object.freeze({
79 silkCocoon: 36,
79 silkCocoon: 36,
80 fence: 37,
80 fence: 37,
81 stoneWallThin: 38,
81 stoneWallThin: 38,
82 smoothStoneWall: 39,
82 /** Former thick smooth stone wall (39) removed — id left unused. */
83 smoothStoneWallThin: 40,
83 smoothStoneWallThin: 40,
84 brickWall: 41,
84 brickWall: 41,
85 brickWallThin: 42,
85 brickWallThin: 42,
@@ -205,19 +205,6 @@ export const BLOCK_DEFINITIONS = Object.freeze({
205 neighborConnect: true,
205 neighborConnect: true,
206 neighborConnectNamed: true
206 neighborConnectNamed: true
207 }),
207 }),
208 [BlockType.smoothStoneWall]: Object.freeze({
209 id: BlockType.smoothStoneWall,
210 key: "thick-smooth-stone-wall",
211 displayName: "Thick smooth stone wall",
212 passable: false,
213 lightRangeTiles: 0,
214 frames: 1,
215 framesPerRow: 1,
216 animationSpeed: 0,
217 outdoor: false,
218 neighborConnect: true,
219 neighborConnectNamed: true
220 }),
221 [BlockType.smoothStoneWallThin]: Object.freeze({
208 [BlockType.smoothStoneWallThin]: Object.freeze({
222 id: BlockType.smoothStoneWallThin,
209 id: BlockType.smoothStoneWallThin,
223 key: "thin-smooth-stone-wall",
210 key: "thin-smooth-stone-wall",