BlueGit

timfa questward

Add tiered tree block definitions with placeholder seasonal sprites.

Each wood tier gets its own tree block type so gathering can target distinct tiers while art is still shared pine placeholders.

timfa Tim Falken · pushed by timfa

Authored 2026-08-26 · 2 months ago

Hash
a2ec097d780ad7cd3bd8b6306b3e76c90d255661
Parent
beb6a145
37 files changed +34 −17
client/assets/blocks/birch-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/birch-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/birch-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/birch-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/birch-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/birch-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/ebony-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/elder-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/heartwood-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/lignum-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/fall-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/fall.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/summer-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/summer.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/winter-stump.png added Binary file +0 −0

The contents of this binary file are not shown.

client/assets/blocks/oak-tree/winter.png added Binary file +0 −0

The contents of this binary file are not shown.

shared/definitions/tiles.js +34 −17
@@ -54,7 +54,13 @@ export const BlockType = Object.freeze({
54 54 bountyOffice: 20,
55 55 barber: 23,
56 56 /** Folklore herbs — state is herbId (`sage`, `mint`, …); sprites in `assets/herbs/`. */
57 herbPlant: 24
57 herbPlant: 24,
58 birchTree: 21,
59 oakTree: 22,
60 ebonyTree: 25,
61 lignumTree: 26,
62 heartwoodTree: 27,
63 elderTree: 28
58 64 });
59 65
60 66 export const GROUND_DEFINITIONS = Object.freeze({
@@ -109,6 +115,26 @@ export const GROUND_DEFINITIONS = Object.freeze({
109 115 })
110 116 });
111 117
118 function treeBlockDef (id, woodTier)
119 {
120 const name = MATERIAL_DISPLAY_NAME[woodTier] ?? woodTier;
121 return Object.freeze({
122 id,
123 key: `${woodTier}-tree`,
124 displayName: `${name} tree`,
125 passable: false,
126 /** Canopy: light passes but each tree tile adds +1 falloff distance. */
127 blocksLight: "partial",
128 lightRangeTiles: 0,
129 frames: 1,
130 framesPerRow: 1,
131 animationSpeed: 0,
132 outdoor: true,
133 gatherable: true,
134 woodTier
135 });
136 }
137
112 138 export const BLOCK_DEFINITIONS = Object.freeze({
113 139 [BlockType.stoneWall]: Object.freeze({
114 140 id: BlockType.stoneWall,
@@ -246,22 +272,13 @@ export const BLOCK_DEFINITIONS = Object.freeze({
246 272 craftingStationId: "crafting-bench",
247 273 outdoor: false
248 274 }),
249 [BlockType.pineTree]: Object.freeze({
250 id: BlockType.pineTree,
251 key: "pine-tree",
252 displayName: "Pine tree",
253 passable: false,
254 /** Canopy: light passes but each tree tile adds +1 falloff distance. */
255 blocksLight: "partial",
256 lightRangeTiles: 0,
257 frames: 1,
258 framesPerRow: 1,
259 animationSpeed: 0,
260 outdoor: true,
261 gatherable: true,
262 /** Wood tier yielded when chopped (axe). */
263 woodTier: WoodTier.pine
264 }),
275 [BlockType.pineTree]: treeBlockDef(BlockType.pineTree, WoodTier.pine),
276 [BlockType.birchTree]: treeBlockDef(BlockType.birchTree, WoodTier.birch),
277 [BlockType.oakTree]: treeBlockDef(BlockType.oakTree, WoodTier.oak),
278 [BlockType.ebonyTree]: treeBlockDef(BlockType.ebonyTree, WoodTier.ebony),
279 [BlockType.lignumTree]: treeBlockDef(BlockType.lignumTree, WoodTier.lignum),
280 [BlockType.heartwoodTree]: treeBlockDef(BlockType.heartwoodTree, WoodTier.heartwood),
281 [BlockType.elderTree]: treeBlockDef(BlockType.elderTree, WoodTier.elder),
265 282 [BlockType.marketplace]: Object.freeze({
266 283 id: BlockType.marketplace,
267 284 key: "marketplace",
@@ -54,7 +54,13 @@ export const BlockType = Object.freeze({
54 bountyOffice: 20,
54 bountyOffice: 20,
55 barber: 23,
55 barber: 23,
56 /** Folklore herbs — state is herbId (`sage`, `mint`, …); sprites in `assets/herbs/`. */
56 /** Folklore herbs — state is herbId (`sage`, `mint`, …); sprites in `assets/herbs/`. */
57 herbPlant: 24
57 herbPlant: 24,
58 birchTree: 21,
59 oakTree: 22,
60 ebonyTree: 25,
61 lignumTree: 26,
62 heartwoodTree: 27,
63 elderTree: 28
58});
64});
59
65
60export const GROUND_DEFINITIONS = Object.freeze({
66export const GROUND_DEFINITIONS = Object.freeze({
@@ -109,6 +115,26 @@ export const GROUND_DEFINITIONS = Object.freeze({
109 })
115 })
110});
116});
111
117
118function treeBlockDef (id, woodTier)
119{
120 const name = MATERIAL_DISPLAY_NAME[woodTier] ?? woodTier;
121 return Object.freeze({
122 id,
123 key: `${woodTier}-tree`,
124 displayName: `${name} tree`,
125 passable: false,
126 /** Canopy: light passes but each tree tile adds +1 falloff distance. */
127 blocksLight: "partial",
128 lightRangeTiles: 0,
129 frames: 1,
130 framesPerRow: 1,
131 animationSpeed: 0,
132 outdoor: true,
133 gatherable: true,
134 woodTier
135 });
136}
137
112export const BLOCK_DEFINITIONS = Object.freeze({
138export const BLOCK_DEFINITIONS = Object.freeze({
113 [BlockType.stoneWall]: Object.freeze({
139 [BlockType.stoneWall]: Object.freeze({
114 id: BlockType.stoneWall,
140 id: BlockType.stoneWall,
@@ -246,22 +272,13 @@ export const BLOCK_DEFINITIONS = Object.freeze({
246 craftingStationId: "crafting-bench",
272 craftingStationId: "crafting-bench",
247 outdoor: false
273 outdoor: false
248 }),
274 }),
249 [BlockType.pineTree]: Object.freeze({
275 [BlockType.pineTree]: treeBlockDef(BlockType.pineTree, WoodTier.pine),
250 id: BlockType.pineTree,
276 [BlockType.birchTree]: treeBlockDef(BlockType.birchTree, WoodTier.birch),
251 key: "pine-tree",
277 [BlockType.oakTree]: treeBlockDef(BlockType.oakTree, WoodTier.oak),
252 displayName: "Pine tree",
278 [BlockType.ebonyTree]: treeBlockDef(BlockType.ebonyTree, WoodTier.ebony),
253 passable: false,
279 [BlockType.lignumTree]: treeBlockDef(BlockType.lignumTree, WoodTier.lignum),
254 /** Canopy: light passes but each tree tile adds +1 falloff distance. */
280 [BlockType.heartwoodTree]: treeBlockDef(BlockType.heartwoodTree, WoodTier.heartwood),
255 blocksLight: "partial",
281 [BlockType.elderTree]: treeBlockDef(BlockType.elderTree, WoodTier.elder),
256 lightRangeTiles: 0,
257 frames: 1,
258 framesPerRow: 1,
259 animationSpeed: 0,
260 outdoor: true,
261 gatherable: true,
262 /** Wood tier yielded when chopped (axe). */
263 woodTier: WoodTier.pine
264 }),
265 [BlockType.marketplace]: Object.freeze({
282 [BlockType.marketplace]: Object.freeze({
266 id: BlockType.marketplace,
283 id: BlockType.marketplace,
267 key: "marketplace",
284 key: "marketplace",