Permafrost, cold grass, and osier (+ biome changes) (#1369)

* Permafrost, cold grass, osier, cold taiga, tweaks

* Tweak osier and cold grass item

* formatting

* Move cold_taiga to taiga/cold and migrate taiga/base

* Fix subbiomes

assets/cubyz/biomes/_migrations.zig.zon

@@ -1,3 +1,4 @@
 .{
 	.{.old = "jungle(TODO)", .new = "jungle"},
+	.{.old = "taiga", .new = "taiga/base"},
 }

assets/cubyz/biomes/decorative/stone_pit.zig.zon

@@ -29,7 +29,7 @@
 			.chance = 16,
 		},
 		.{
-			.id = "cubyz:taiga",
+			.id = "cubyz:taiga/base",
 			.chance = 6,
 		},
 		.{

assets/cubyz/biomes/decorative/stone_rock.zig.zon

@@ -31,7 +31,7 @@
 			.chance = 24,
 		},
 		.{
-			.id = "cubyz:taiga",
+			.id = "cubyz:taiga/base",
 			.chance = 4,
 		},
 		.{

assets/cubyz/biomes/peak.zig.zon

@@ -14,6 +14,7 @@
 
 	.ground_structure = .{
 		"3 to 6 cubyz:snow",
+		"1 to 3 cubyz:permafrost",
 	},
 	.stoneBlock = "cubyz:glacite",
 	.structures = .{

assets/cubyz/biomes/taiga/cold.zig.zon

@@ -0,0 +1,74 @@
+.{
+	.properties = .{
+		.cold,
+		.wet,
+	},
+	.minHeight = 22,
+	.maxHeight = 40,
+	.minRadius = 256,
+	.maxRadius = 320,
+	.roughness = 10,
+	.hills = 13,
+	.validPlayerSpawn = true,
+	.ground_structure = .{
+		"1 cubyz:cold_grass",
+		"1 to 3 cubyz:permafrost",
+	},
+	.stoneBlock = "cubyz:glacite",
+	.structures = .{
+		.{
+			.id = "cubyz:simple_tree",
+			.leaves = "cubyz:pine_needles",
+			.log = "cubyz:pine_log",
+			.top = "cubyz:pine_top",
+			.chance = 0.25,
+			.type = .pyramid,
+			.height = 6,
+			.height_variation = 7,
+			.branched = false,
+		},
+		.{
+			.id = "cubyz:ground_patch",
+			.block = "cubyz:gravel",
+			.chance = 0.02,
+			.width = 5,
+			.variation = 4,
+			.depth = 2,
+			.smoothness = 0.1,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:cold_grass_vegetation",
+			.chance = 0.04,
+			.width = 5,
+			.variation = 8,
+			.density = 0.5,
+			.priority = 0.2,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:fern",
+			.chance = 0.03,
+			.width = 4,
+			.variation = 7,
+			.density = 0.4,
+			.priority = 0.3,
+		},
+		.{
+			.id = "cubyz:boulder",
+			.chance = 0.01,
+			.block = "cubyz:glacite",
+			.size = 3,
+			.size_variance = 3,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:trumpet_lily",
+			.chance = 0.007,
+			.width = 8,
+			.variation = 3,
+			.density = 0.1,
+			.priority = 0.1,
+		},
+	},
+}

assets/cubyz/biomes/tundra/base.zig.zon

@@ -7,22 +7,57 @@
 	.maxHeight = 40,
 	.minRadius = 256,
 	.maxRadius = 320,
-	.roughness = 10,
+	.roughness = 2,
 	.hills = 15,
 	.mountains = 20,
 	.ground_structure = .{
-		"0 to 1 cubyz:dry_grass",
+		"0 to 1 cubyz:cold_grass",
-		"0 to 1 cubyz:gravel",
 	},
 	.structures = .{
 		.{
 			.id = "cubyz:flower_patch",
 			.block = "cubyz:dry_grass_vegetation",
-			.chance = 0.025,
+			.chance = 0.03,
 			.width = 5,
 			.variation = 8,
-			.density = 0.2,
+			.density = 0.4,
 			.priority = 0.1,
 		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:cold_grass_vegetation",
+			.chance = 0.04,
+			.width = 5,
+			.variation = 8,
+			.density = 0.5,
+			.priority = 0.2,
+		},
+		.{
+			.id = "cubyz:flower_patch",
+			.block = "cubyz:osier",
+			.chance = 0.04,
+			.width = 7,
+			.variation = 8,
+			.density = 1,
+			.priority = 0.3,
+		},
+		.{
+			.id = "cubyz:ground_patch",
+			.block = "cubyz:cold_grass",
+			.chance = 0.1,
+			.width = 5,
+			.variation = 4,
+			.depth = 1,
+			.smoothness = 0.5,
+		},
+		.{
+			.id = "cubyz:ground_patch",
+			.block = "cubyz:dry_grass",
+			.chance = 0.09,
+			.width = 6,
+			.variation = 5,
+			.depth = 1,
+			.smoothness = 0.5,
+		},
 	},
 }

assets/cubyz/blocks/cold_grass.zig.zon

@@ -0,0 +1,10 @@
+.{
+	.tags = .{.sand},
+	.blockHealth = 7,
+	.drops = .{
+		.{.items = .{"cubyz:permafrost"}},
+	},
+	.model = "cubyz:cube",
+	.texture = "cubyz:cold_grass",
+	.texture_bottom = "cubyz:permafrost",
+}

assets/cubyz/blocks/cold_grass_vegetation.zig.zon

@@ -0,0 +1,17 @@
+.{
+	.tags = .{.leaf},
+	.blockHealth = 0.2,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.degradable = true,
+	.viewThrough = true,
+	.absorbedLight = 0x000000,
+	.collide = false,
+	.model = "cubyz:cross",
+	.texture = "cubyz:cold_grass_vegetation",
+	.item = .{
+		.texture = "cold_grass.png",
+	},
+	.lodReplacement = "cubyz:air",
+}

assets/cubyz/blocks/osier.zig.zon

@@ -0,0 +1,18 @@
+.{
+	.tags = .{.leaf},
+	.blockHealth = 0.2,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.degradable = true,
+	.collide = false,
+	.alwaysViewThrough = true,
+	.absorbedLight = 0x121012,
+	.model = "cubyz:plane",
+	.rotation = .carpet,
+	.texture = "cubyz:osier",
+	.item = .{
+		.texture = "osier.png",
+	},
+	.lodReplacement = "cubyz:air",
+}

assets/cubyz/blocks/permafrost.zig.zon

@@ -0,0 +1,9 @@
+.{
+	.tags = .{.sand},
+	.blockHealth = 6.5,
+	.drops = .{
+		.{.items = .{.auto}},
+	},
+	.model = "cubyz:cube",
+	.texture = "cubyz:permafrost",
+}

assets/cubyz/blocks/textures/cold_grass_vegetation.zig.zon

@@ -0,0 +1,3 @@
+.{
+	.hasOcclusion = false,
+}