From 07ab2c8e580e0f268919f0440a4e5f4edab7ea95 Mon Sep 17 00:00:00 2001
From: ikabod-kee <155805949+ikabod-kee@users.noreply.github.com>
Date: Wed, 15 Jan 2025 12:14:16 -0500
Subject: [PATCH] Swamp Revamp (#931)

* Added New Swamp

* Renamed Wetlands internally

* Bam

* Updated Wetlands height

* Update base.zig.zon

* Increased average biome size
---
 assets/cubyz/biomes/swamp.zig.zon         | 33 ----------------
 assets/cubyz/biomes/swamp/base.zig.zon    | 48 +++++++++++++++++++++++
 assets/cubyz/biomes/swamp/pond.zig.zon    | 23 +++++++++++
 assets/cubyz/biomes/wetlands/base.zig.zon | 41 +++++++++++++++++++
 4 files changed, 112 insertions(+), 33 deletions(-)
 delete mode 100644 assets/cubyz/biomes/swamp.zig.zon
 create mode 100644 assets/cubyz/biomes/swamp/base.zig.zon
 create mode 100644 assets/cubyz/biomes/swamp/pond.zig.zon
 create mode 100644 assets/cubyz/biomes/wetlands/base.zig.zon

diff --git a/assets/cubyz/biomes/swamp.zig.zon b/assets/cubyz/biomes/swamp.zig.zon
deleted file mode 100644
index ebd80a87..00000000
--- a/assets/cubyz/biomes/swamp.zig.zon
+++ /dev/null
@@ -1,33 +0,0 @@
-.{
-	.properties = .{
-		.cold,
-		.wet,
-	},
-	.minHeight = 22,
-	.maxHeight = 40,
-	
-	.roughness = 2,
-	.hills = 2,
-	
-	.music = "cubyz:leaves",
-
-	.validPlayerSpawn = true,
-	
-	.ground_structure = .{
-		"0 to 1 cubyz:grass",
-		"0 to 1 cubyz:water",
-		"2 to 3 cubyz:soil",
-	},
-	.structures = .{
-		.{
-			.id = "cubyz:simple_tree",
-			.leaves = "cubyz:oak_leaves",
-			.log = "cubyz:oak_log",
-			.top = "cubyz:oak_top",
-			.chance = 0.8,
-			.type = .round,
-			.height = 6,
-			.height_variation = 3,
-		},
-	},
-}
diff --git a/assets/cubyz/biomes/swamp/base.zig.zon b/assets/cubyz/biomes/swamp/base.zig.zon
new file mode 100644
index 00000000..f8cf358d
--- /dev/null
+++ b/assets/cubyz/biomes/swamp/base.zig.zon
@@ -0,0 +1,48 @@
+.{
+	.properties = .{
+		.hot,
+		.wet,
+		.overgrown,
+	},
+	.minHeight = 4,
+	.maxHeight = 4,
+	.minRadius = 160,
+	.maxRadius = 200,
+	.roughness = 3,
+	.hills = 1,
+	.music = "cubyz:leaves",
+	.validPlayerSpawn = true,
+	.ground_structure = .{
+		"4 to 5 cubyz:mud",
+	},
+	.structures = .{
+		.{
+			.id = "cubyz:ground_patch",
+			.block = "cubyz:lush_grass",
+			.chance = 0.33,
+			.width = 5,
+			.variation = 4,
+			.depth = 1,
+			.smoothness = 0.5,
+		},
+		.{
+			.id = "cubyz:simple_tree",
+			.leaves = "cubyz:willow_leaves",
+			.log = "cubyz:willow_log",
+			.top = "cubyz:willow_leaves",
+			.chance = 0.8,
+			.type = .round,
+			.height = 6,
+			.height_variation = 3,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:lush_grass_vegetation",
+			.chance = 0.1,
+			.width = 10,
+			.variation = 6,
+			.density = 0.3,
+			.priority = 0.1,
+		},
+	},
+}
diff --git a/assets/cubyz/biomes/swamp/pond.zig.zon b/assets/cubyz/biomes/swamp/pond.zig.zon
new file mode 100644
index 00000000..a7e537ef
--- /dev/null
+++ b/assets/cubyz/biomes/swamp/pond.zig.zon
@@ -0,0 +1,23 @@
+.{
+	.properties = .{
+		.hot,
+		.wet,
+	},
+	.minHeight = -4,
+	.maxHeight = -4,
+	.minRadius = 32,
+	.maxRadius = 48,
+	.chance = 0,
+	.roughness = 4,
+	.hills = 3,
+	.music = "cubyz:leaves",
+	.ground_structure = .{
+		"4 to 5 cubyz:mud",
+	},
+	.parentBiomes = .{
+		.{
+			.id = "cubyz:swamp/base",
+			.chance = 24,
+		},
+	},
+}
diff --git a/assets/cubyz/biomes/wetlands/base.zig.zon b/assets/cubyz/biomes/wetlands/base.zig.zon
new file mode 100644
index 00000000..ce23e67b
--- /dev/null
+++ b/assets/cubyz/biomes/wetlands/base.zig.zon
@@ -0,0 +1,41 @@
+.{
+	.properties = .{
+		.wet,
+		.hot,
+	},
+	.minHeight = 2,
+	.maxHeight = 2,
+	.roughness = 2,
+	.hills = 10,
+	.minRadius = 160,
+	.maxRadius = 200,
+	.music = "cubyz:sunrise",
+	.ground_structure = .{
+		"cubyz:lush_grass",
+		"5 to 7 cubyz:mud",
+	},
+	.structures = .{
+		.{
+			.id = "cubyz:ground_patch",
+			.block = "cubyz:mud",
+			.chance = 0.33,
+			.width = 5,
+			.variation = 4,
+			.depth = 1,
+			.smoothness = 0.5,
+		},
+		.{
+			.id = "cubyz:simple_tree",
+			.leaves = "cubyz:willow_leaves",
+			.log = "cubyz:willow_log",
+			.top = "cubyz:willow_top",
+			.chance = 0.033,
+			.type = .round,
+			.height = 13,
+			.height_variation = 4,
+			.leafRadius = 2,
+			.leafRadius_variation = 1,
+			.branched = false,
+		},
+	},
+}
\ No newline at end of file