Skip to content

Change fallen log and simple trees to use new logs #1575

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Change fallen log and simple trees to use new logs #1575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95f35dc
fix
OneAvargeCoder193 Jun 1, 2025
0921bf6
fixes
OneAvargeCoder193 Jun 2, 2025
076b529
merge
OneAvargeCoder193 Aug 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions assets/cubyz/biomes/autumn/dead_forest.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:pine_needles",
.log = "cubyz:pine_log",
.top = "cubyz:pine_top",
.log = "cubyz:log/pine",
.chance = 0.19,
.type = .pyramid,
.height = 7,
Expand All @@ -39,8 +38,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:air",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.03,
.type = .round,
.height = 10,
Expand All @@ -51,7 +49,6 @@
.id = "cubyz:simple_tree",
.leaves = "cubyz:dead_leaves",
.log = "cubyz:dead_leaves",
.top = "cubyz:dead_leaves",
.chance = 0.8,
.type = .round,
.height = 0,
Expand All @@ -62,25 +59,22 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.05,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.03,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:air",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.075,
.type = .round,
.height = 8,
Expand Down
24 changes: 8 additions & 16 deletions assets/cubyz/biomes/autumn/forest.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:air",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.015,
.type = .round,
.height = 8,
Expand All @@ -31,8 +30,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:air",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.015,
.type = .round,
.height = 10,
Expand All @@ -43,8 +41,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:yellow_leaves",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.15,
.type = .round,
.height = 10,
Expand All @@ -57,8 +54,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:red_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.15,
.type = .round,
.height = 8,
Expand All @@ -69,8 +65,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:birch_leaves",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.03,
.type = .round,
.height = 10,
Expand All @@ -83,8 +78,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:oak_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.015,
.type = .round,
.height = 8,
Expand All @@ -94,16 +88,14 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.005,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.002,
.height = 6,
.height_variation = 3,
Expand Down
15 changes: 5 additions & 10 deletions assets/cubyz/biomes/autumn/mixed_forest.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:pine_needles",
.log = "cubyz:pine_log",
.top = "cubyz:pine_top",
.log = "cubyz:log/pine",
.chance = 0.2,
.type = .pyramid,
.height = 7,
Expand All @@ -30,8 +29,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:yellow_leaves",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.1,
.type = .round,
.height = 10,
Expand All @@ -43,25 +41,22 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.005,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.002,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:red_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.1,
.type = .round,
.height = 8,
Expand Down
3 changes: 1 addition & 2 deletions assets/cubyz/biomes/bush_lands.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:oak_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.16,
.type = .round,
.height = 1,
Expand Down
3 changes: 1 addition & 2 deletions assets/cubyz/biomes/bush_mountains.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:oak_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.16,
.type = .round,
.height = 4,
Expand Down
3 changes: 1 addition & 2 deletions assets/cubyz/biomes/cave/crystal_forest.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:oak_leaves",
.log = "cubyz:oak_log",
.top = "cubyz:oak_top",
.log = "cubyz:log/oak",
.chance = 0.32,
.type = .round,
.height = 4,
Expand Down
2 changes: 0 additions & 2 deletions assets/cubyz/biomes/cave/stone_forest.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@
.id = "cubyz:simple_tree",
.leaves = "cubyz:cobblestone",
.log = "cubyz:slate",
.top = "cubyz:slate",
.chance = 0.16,
.type = .round,
.height = 3,
Expand All @@ -48,7 +47,6 @@
.id = "cubyz:simple_tree",
.leaves = "cubyz:slate",
.log = "cubyz:slate",
.top = "cubyz:slate",
.chance = 0.48,
.type = .round,
.height = 3,
Expand Down
1 change: 0 additions & 1 deletion assets/cubyz/biomes/desert/base.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
.id = "cubyz:simple_tree",
.leaves = "cubyz:air",
.log = "cubyz:cactus",
.top = "cubyz:cactus_flower",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This breaks the behavior. Now cacti will no longer spawn with a flower on top.
Also should use log/cactus.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you should make a new structure for this, or add an optional argument to simple structure, abusing the tree was kind of hacky to begin with.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They should use SBBs

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't see a fix for this.

.chance = 0.005,
.type = .round,
.height = 2,
Expand Down
6 changes: 2 additions & 4 deletions assets/cubyz/biomes/forest/base.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,14 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.005,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.002,
.height = 6,
.height_variation = 3,
Expand Down
3 changes: 1 addition & 2 deletions assets/cubyz/biomes/forest/birch.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.005,
.height = 6,
.height_variation = 3,
Expand Down
10 changes: 4 additions & 6 deletions assets/cubyz/biomes/forest/chopped.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,30 +25,28 @@
},
.{
.id = "cubyz:simple_vegetation",
.block = "cubyz:oak_log",
.block = "cubyz:log/oak",
.chance = 0.2,
.height = 1,
.height_variation = 0,
},
.{
.id = "cubyz:simple_vegetation",
.block = "cubyz:birch_log",
.block = "cubyz:log/birch",
.chance = 0.1,
.height = 1,
.height_variation = 0,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.005,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.002,
.height = 6,
.height_variation = 3,
Expand Down
6 changes: 2 additions & 4 deletions assets/cubyz/biomes/forest/clearing.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,14 @@
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:oak_log",
.top = "cubyz:oak_log",
.log = "cubyz:log/oak",
.chance = 0.05,
.height = 6,
.height_variation = 3,
},
.{
.id = "cubyz:fallen_tree",
.log = "cubyz:birch_log",
.top = "cubyz:birch_log",
.log = "cubyz:log/birch",
.chance = 0.02,
.height = 6,
.height_variation = 3,
Expand Down
6 changes: 2 additions & 4 deletions assets/cubyz/biomes/forest/thin_birch.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:birch_leaves",
.log = "cubyz:birch_branch:0b11",
.top = "cubyz:birch_branch:0b11",
.log = "cubyz:birch_branch",
.chance = 0.7,
.type = .round,
.height = 14,
Expand All @@ -50,8 +49,7 @@
.{
.id = "cubyz:simple_tree",
.leaves = "cubyz:birch_leaves",
.log = "cubyz:birch_log",
.top = "cubyz:birch_top",
.log = "cubyz:log/birch",
.chance = 0.1,
.type = .round,
.height = 10,
Expand Down
Loading