BlueGit

timfa questward

fix campfires

timfa Tim Falken · pushed by timfa

Authored 2026-08-28 · 2 months ago

Hash
559467010b534eb10f77628ce3a24f354fca78b8
Parent
8922b85c
3 files changed +34 −22
client/assets/items/ash/ash.png Binary file +0 −0

The contents of this binary file are not shown.

server/tests/chunk-atlas-baked-blocks.test.js +8 −0
@@ -34,3 +34,11 @@ test("stone walls remain chunk-atlas baked", () =>
34 34 {
35 35 assert.equal(isChunkAtlasBakedBlock({ typeId: BlockType.stoneWall }), true);
36 36 });
37
38 test("runtime campfires are not chunk-atlas baked", () =>
39 {
40 assert.equal(isChunkAtlasBakedBlock({
41 typeId: BlockType.campfire,
42 state: "pine"
43 }), false);
44 });
@@ -34,3 +34,11 @@ test("stone walls remain chunk-atlas baked", () =>
34{
34{
35 assert.equal(isChunkAtlasBakedBlock({ typeId: BlockType.stoneWall }), true);
35 assert.equal(isChunkAtlasBakedBlock({ typeId: BlockType.stoneWall }), true);
36});
36});
37
38test("runtime campfires are not chunk-atlas baked", () =>
39{
40 assert.equal(isChunkAtlasBakedBlock({
41 typeId: BlockType.campfire,
42 state: "pine"
43 }), false);
44});
shared/definitions/tiles.js +26 −22
@@ -1,31 +1,31 @@
1 1 import
2 {
3 ORE_BEARING_MATERIALS,
4 oreBoulderState,
5 materialFromOreBoulderState,
6 MATERIAL_DISPLAY_NAME,
7 WoodTier,
8 WOOD_TIER_ORDER
9 } from "./materialTiers.js";
2 {
3 ORE_BEARING_MATERIALS,
4 oreBoulderState,
5 materialFromOreBoulderState,
6 MATERIAL_DISPLAY_NAME,
7 WoodTier,
8 WOOD_TIER_ORDER
9 } from "./materialTiers.js";
10 10 import
11 {
12 FLOWER_COLOR_ORDER,
13 FLOWER_COLOR_DISPLAY,
14 flowerBlockState
15 } from "./dyes.js";
11 {
12 FLOWER_COLOR_ORDER,
13 FLOWER_COLOR_DISPLAY,
14 flowerBlockState
15 } from "./dyes.js";
16 16 import
17 {
18 HERB_ORDER,
19 HERB_DEFINITIONS,
20 herbDefinition
21 } from "./herbs.js";
17 {
18 HERB_ORDER,
19 HERB_DEFINITIONS,
20 herbDefinition
21 } from "./herbs.js";
22 22 import { spriteImageName, defaultStateForType } from "./tileSprites.js";
23 23 import { isSeasonalStumpState, SeasonId } from "../world/season.js";
24 24 import
25 {
26 composeNeighborConnectState,
27 definitionUsesMaterialNeighborConnect
28 } from "../world/neighborConnect.js";
25 {
26 composeNeighborConnectState,
27 definitionUsesMaterialNeighborConnect
28 } from "../world/neighborConnect.js";
29 29
30 30 export const GroundType = Object.freeze({
31 31 grass: 1,
@@ -272,6 +272,8 @@ export const BLOCK_DEFINITIONS = Object.freeze({
272 272 craftingStationId: "fireplace",
273 273 /** State is wood tier id; tinted like logs. Bloom companion is fire only. */
274 274 tintFromTier: true,
275 /** Lit/expires at runtime — per-tile draw, not chunk atlas (see chunk-delta). */
276 perTileBlock: true,
275 277 outdoor: true
276 278 }),
277 279 [BlockType.oven]: Object.freeze({
@@ -620,6 +622,8 @@ export function isChunkAtlasBakedBlock (block)
620 622 const def = BLOCK_DEFINITIONS[entry.typeId];
621 623 if (!def || def.editorHidden)
622 624 { return false; }
625 if (def.perTileBlock)
626 { return false; }
623 627 if (resourceNodeDisplayName(entry))
624 628 { return false; }
625 629 if (isPickablePlantBlock(entry))
@@ -1,31 +1,31 @@
1import
1import
2 {
2{
3 ORE_BEARING_MATERIALS,
3 ORE_BEARING_MATERIALS,
4 oreBoulderState,
4 oreBoulderState,
5 materialFromOreBoulderState,
5 materialFromOreBoulderState,
6 MATERIAL_DISPLAY_NAME,
6 MATERIAL_DISPLAY_NAME,
7 WoodTier,
7 WoodTier,
8 WOOD_TIER_ORDER
8 WOOD_TIER_ORDER
9 } from "./materialTiers.js";
9} from "./materialTiers.js";
10import
10import
11 {
11{
12 FLOWER_COLOR_ORDER,
12 FLOWER_COLOR_ORDER,
13 FLOWER_COLOR_DISPLAY,
13 FLOWER_COLOR_DISPLAY,
14 flowerBlockState
14 flowerBlockState
15 } from "./dyes.js";
15} from "./dyes.js";
16import
16import
17 {
17{
18 HERB_ORDER,
18 HERB_ORDER,
19 HERB_DEFINITIONS,
19 HERB_DEFINITIONS,
20 herbDefinition
20 herbDefinition
21 } from "./herbs.js";
21} from "./herbs.js";
22import { spriteImageName, defaultStateForType } from "./tileSprites.js";
22import { spriteImageName, defaultStateForType } from "./tileSprites.js";
23import { isSeasonalStumpState, SeasonId } from "../world/season.js";
23import { isSeasonalStumpState, SeasonId } from "../world/season.js";
24import
24import
25 {
25{
26 composeNeighborConnectState,
26 composeNeighborConnectState,
27 definitionUsesMaterialNeighborConnect
27 definitionUsesMaterialNeighborConnect
28 } from "../world/neighborConnect.js";
28} from "../world/neighborConnect.js";
29
29
30export const GroundType = Object.freeze({
30export const GroundType = Object.freeze({
31 grass: 1,
31 grass: 1,
@@ -272,6 +272,8 @@ export const BLOCK_DEFINITIONS = Object.freeze({
272 craftingStationId: "fireplace",
272 craftingStationId: "fireplace",
273 /** State is wood tier id; tinted like logs. Bloom companion is fire only. */
273 /** State is wood tier id; tinted like logs. Bloom companion is fire only. */
274 tintFromTier: true,
274 tintFromTier: true,
275 /** Lit/expires at runtime — per-tile draw, not chunk atlas (see chunk-delta). */
276 perTileBlock: true,
275 outdoor: true
277 outdoor: true
276 }),
278 }),
277 [BlockType.oven]: Object.freeze({
279 [BlockType.oven]: Object.freeze({
@@ -620,6 +622,8 @@ export function isChunkAtlasBakedBlock (block)
620 const def = BLOCK_DEFINITIONS[entry.typeId];
622 const def = BLOCK_DEFINITIONS[entry.typeId];
621 if (!def || def.editorHidden)
623 if (!def || def.editorHidden)
622 { return false; }
624 { return false; }
625 if (def.perTileBlock)
626 { return false; }
623 if (resourceNodeDisplayName(entry))
627 if (resourceNodeDisplayName(entry))
624 { return false; }
628 { return false; }
625 if (isPickablePlantBlock(entry))
629 if (isPickablePlantBlock(entry))