From 57658d6b1088170c568264b0a2bae816de5fa685 Mon Sep 17 00:00:00 2001
From: ikabod-kee <155805949+ikabod-kee@users.noreply.github.com>
Date: Fri, 24 Jan 2025 17:06:09 -0500
Subject: [PATCH] Some Biomes --> Their own folders + Extra Sub Biomes (#955)

* Moved things into their own folders

* Small changes

* Changed Clearing Chances

* Fixes

* Radius Changes + Limestone Boulders
---
 .../{desert.zig.zon => desert/base.zig.zon}   |  0
 .../{forest.zig.zon => forest/base.zig.zon}   |  7 ++---
 .../biomes/{ => forest}/clearing.zig.zon      | 18 +++++++-----
 .../{prairie.zig.zon => prairie/base.zig.zon} |  7 ++---
 .../biomes/prairie/limestone_pit.zig.zon      | 29 +++++++++++++++++++
 5 files changed, 43 insertions(+), 18 deletions(-)
 rename assets/cubyz/biomes/{desert.zig.zon => desert/base.zig.zon} (100%)
 rename assets/cubyz/biomes/{forest.zig.zon => forest/base.zig.zon} (96%)
 rename assets/cubyz/biomes/{ => forest}/clearing.zig.zon (65%)
 rename assets/cubyz/biomes/{prairie.zig.zon => prairie/base.zig.zon} (97%)
 create mode 100644 assets/cubyz/biomes/prairie/limestone_pit.zig.zon

diff --git a/assets/cubyz/biomes/desert.zig.zon b/assets/cubyz/biomes/desert/base.zig.zon
similarity index 100%
rename from assets/cubyz/biomes/desert.zig.zon
rename to assets/cubyz/biomes/desert/base.zig.zon
diff --git a/assets/cubyz/biomes/forest.zig.zon b/assets/cubyz/biomes/forest/base.zig.zon
similarity index 96%
rename from assets/cubyz/biomes/forest.zig.zon
rename to assets/cubyz/biomes/forest/base.zig.zon
index 973bcae2c..3087ce09d 100644
--- a/assets/cubyz/biomes/forest.zig.zon
+++ b/assets/cubyz/biomes/forest/base.zig.zon
@@ -1,17 +1,14 @@
 .{
 	.properties = .{
-		.wet,
 	},
 	.minHeight = 22,
 	.maxHeight = 40,
-	
+	.minRadius = 150,
+	.maxRadius = 200,
 	.roughness = 10,
 	.hills = 10,
-	
 	.music = "cubyz:leaves",
-
 	.validPlayerSpawn = true,
-	
 	.ground_structure = .{
 		"cubyz:grass",
 		"2 to 3 cubyz:soil",
diff --git a/assets/cubyz/biomes/clearing.zig.zon b/assets/cubyz/biomes/forest/clearing.zig.zon
similarity index 65%
rename from assets/cubyz/biomes/clearing.zig.zon
rename to assets/cubyz/biomes/forest/clearing.zig.zon
index 4287a22e8..63625d698 100644
--- a/assets/cubyz/biomes/clearing.zig.zon
+++ b/assets/cubyz/biomes/forest/clearing.zig.zon
@@ -5,14 +5,10 @@
 	.radius = 32,
 	.minHeight = 22,
 	.maxHeight = 40,
-	
 	.roughness = 1,
 	.hills = 5,
-	
 	.music = "cubyz:sunrise",
-
 	.validPlayerSpawn = true,
-	
 	.ground_structure = .{
 		"cubyz:grass",
 		"2 to 3 cubyz:soil",
@@ -20,17 +16,23 @@
 	.structures = .{
 		.{
 			.id = "cubyz:boulder",
-			.chance = 0.0016,
+			.chance = 0.005,
 			.block = "cubyz:stone",
 			.size = 5,
 			.size_variance = 1,
 		},
+		.{
+			.id = "cubyz:simple_vegetation",
+			.block = "cubyz:grass_vegetation",
+			.chance = 0.6,
+			.height = 1,
+			.height_variation = 0,
+		},
 	},
-
 	.parentBiomes = .{
 		.{
-			.id = "cubyz:forest",
-			.chance = 0.1,
+			.id = "cubyz:forest/base",
+			.chance = 0.2,
 		},
 	},
 }
diff --git a/assets/cubyz/biomes/prairie.zig.zon b/assets/cubyz/biomes/prairie/base.zig.zon
similarity index 97%
rename from assets/cubyz/biomes/prairie.zig.zon
rename to assets/cubyz/biomes/prairie/base.zig.zon
index 1bbc9dcce..f30044e4b 100644
--- a/assets/cubyz/biomes/prairie.zig.zon
+++ b/assets/cubyz/biomes/prairie/base.zig.zon
@@ -4,15 +4,12 @@
 	},
 	.minHeight = 40,
 	.maxHeight = 44,
-	.minRadius = 100,
-	.maxRadius = 160,
+	.minRadius = 150,
+	.maxRadius = 200,
 	.roughness = 1,
 	.hills = 3,
-	
 	.music = "cubyz:sunrise",
-
 	.validPlayerSpawn = true,
-	
 	.ground_structure = .{
 		"1 cubyz:dirt",
 		"3 to 4 cubyz:limestone",
diff --git a/assets/cubyz/biomes/prairie/limestone_pit.zig.zon b/assets/cubyz/biomes/prairie/limestone_pit.zig.zon
new file mode 100644
index 000000000..fa345f32a
--- /dev/null
+++ b/assets/cubyz/biomes/prairie/limestone_pit.zig.zon
@@ -0,0 +1,29 @@
+.{
+	.properties = .{
+		.dry,
+		.barren,
+	},
+	.minRadius = 6,
+	.maxRadius = 12,
+	.chance = 0,
+	.minHeight = 30,
+	.maxHeight = 36,
+	.roughness = 1,
+	.hills = 10,
+	.stoneBlock = "cubyz:limestone",
+	.parentBiomes = .{
+		.{
+			.id = "cubyz:prairie/base",
+			.chance = 24,
+		},
+	},
+	.structures = .{
+		.{
+			.id = "cubyz:boulder",
+			.chance = 0.5,
+			.block = "cubyz:limestone",
+			.size = 2,
+			.size_variance = 9,
+		},
+	},
+}