Mgv5/7 biomes: Add more shallow dirt waters

Dirt waters are more suitable for waterlilies
Add dedicated dunes biome in coniferous forest
Papyrus: use dirt base again
Force-place roots on mapgen tree schematics
Tune some humidity points to improve voronoi cells
Add random rotation to jungle trees

mods/default/mapgen.lua

@@ -374,7 +374,7 @@ function default.register_biomes()
 		y_min = 2,
 		y_max = 31000,
 		heat_point = 20,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
 	minetest.register_biome({
@@ -392,9 +392,10 @@ function default.register_biomes()
 		y_min = -112,
 		y_max = 1,
 		heat_point = 20,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
+
 	minetest.register_biome({
 		name = "taiga",
 		node_dust = "default:snow",
@@ -410,7 +411,7 @@ function default.register_biomes()
 		y_min = 2,
 		y_max = 31000,
 		heat_point = 20,
-		humidity_point = 70,
+		humidity_point = 75,
 	})
 
 	minetest.register_biome({
@@ -428,10 +429,10 @@ function default.register_biomes()
 		y_min = -112,
 		y_max = 1,
 		heat_point = 20,
-		humidity_point = 70,
+		humidity_point = 75,
 	})
 
-	-- Cool
+	-- Temperate
 
 	minetest.register_biome({
 		name = "stone_grassland",
@@ -445,10 +446,10 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 6,
+		y_min = 5,
 		y_max = 31000,
 		heat_point = 45,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
 	minetest.register_biome({
@@ -464,11 +465,12 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
+		y_max = 4,
 		heat_point = 45,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
+
 	minetest.register_biome({
 		name = "coniferous_forest",
 		--node_dust = "",
@@ -481,10 +483,28 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 6,
+		y_min = 9,
 		y_max = 31000,
 		heat_point = 45,
-		humidity_point = 70,
+		humidity_point = 75,
+	})
+
+	minetest.register_biome({
+		name = "coniferous_forest_dunes",
+		--node_dust = "",
+		node_top = "default:sand",
+		depth_top = 1,
+		node_filler = "default:sand",
+		depth_filler = 2,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = 5,
+		y_max = 8,
+		heat_point = 45,
+		humidity_point = 75,
 	})
 
 	minetest.register_biome({
@@ -500,12 +520,11 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
+		y_max = 4,
 		heat_point = 45,
-		humidity_point = 70,
+		humidity_point = 75,
 	})
 
-	-- Warm
 
 	minetest.register_biome({
 		name = "sandstone_grassland",
@@ -519,10 +538,10 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 6,
+		y_min = 5,
 		y_max = 31000,
 		heat_point = 70,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
 	minetest.register_biome({
@@ -538,11 +557,12 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
+		y_max = 4,
 		heat_point = 70,
-		humidity_point = 30,
+		humidity_point = 25,
 	})
 
+
 	minetest.register_biome({
 		name = "deciduous_forest",
 		--node_dust = "",
@@ -555,10 +575,28 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 6,
+		y_min = 1,
 		y_max = 31000,
 		heat_point = 70,
-		humidity_point = 70,
+		humidity_point = 75,
+	})
+
+	minetest.register_biome({
+		name = "deciduous_forest_swamp",
+		--node_dust = "",
+		node_top = "default:dirt",
+		depth_top = 1,
+		node_filler = "default:dirt",
+		depth_filler = 2,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -3,
+		y_max = 0,
+		heat_point = 70,
+		humidity_point = 75,
 	})
 
 	minetest.register_biome({
@@ -574,9 +612,9 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
+		y_max = -4,
 		heat_point = 70,
-		humidity_point = 70,
+		humidity_point = 75,
 	})
 
 	-- Hot
@@ -617,6 +655,7 @@ function default.register_biomes()
 		humidity_point = 10,
 	})
 
+
 	minetest.register_biome({
 		name = "savanna",
 		--node_dust = "",
@@ -629,12 +668,30 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 5,
+		y_min = 1,
 		y_max = 31000,
 		heat_point = 95,
 		humidity_point = 50,
 	})
 
+	minetest.register_biome({
+		name = "savanna_swamp",
+		--node_dust = "",
+		node_top = "default:dirt",
+		depth_top = 1,
+		node_filler = "default:dirt",
+		depth_filler = 2,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -3,
+		y_max = 0,
+		heat_point = 95,
+		humidity_point = 50,
+	})
+
 	minetest.register_biome({
 		name = "savanna_ocean",
 		--node_dust = "",
@@ -648,11 +705,12 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = 4,
+		y_max = -4,
 		heat_point = 95,
 		humidity_point = 50,
 	})
 
+
 	minetest.register_biome({
 		name = "rainforest",
 		--node_dust = "",
@@ -683,7 +741,7 @@ function default.register_biomes()
 		--depth_water_top = ,
 		--node_water = "",
 		--node_river_water = "",
-		y_min = 0,
+		y_min = -3,
 		y_max = 0,
 		heat_point = 95,
 		humidity_point = 90,
@@ -702,7 +760,7 @@ function default.register_biomes()
 		--node_water = "",
 		--node_river_water = "",
 		y_min = -112,
-		y_max = -1,
+		y_max = -4,
 		heat_point = 95,
 		humidity_point = 90,
 	})
@@ -713,9 +771,9 @@ function default.register_biomes()
 		name = "underground",
 		--node_dust = "",
 		--node_top = "",
-		depth_top = 0,
+		--depth_top = ,
 		--node_filler = "",
-		depth_filler = -4,
+		--depth_filler = ,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
@@ -833,18 +891,14 @@ local function register_grass_decoration(offset, scale, length)
 		noise_params = {
 			offset = offset,
 			scale = scale,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 329,
 			octaves = 3,
 			persist = 0.6
 		},
-		biomes = {
+		biomes = {"stone_grassland", "sandstone_grassland",
-			"stone_grassland", "stone_grassland_ocean",
+			"deciduous_forest", "coniferous_forest", "coniferous_forest_dunes"},
-			"sandstone_grassland", "sandstone_grassland_ocean",
+		y_min = 1,
-			"deciduous_forest", "deciduous_forest_ocean",
-			"coniferous_forest", "coniferous_forest_ocean",
-		},
-		y_min = 5,
 		y_max = 31000,
 		decoration = "default:grass_"..length,
 	})
@@ -858,13 +912,13 @@ local function register_dry_grass_decoration(offset, scale, length)
 		noise_params = {
 			offset = offset,
 			scale = scale,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 329,
 			octaves = 3,
 			persist = 0.6
 		},
 		biomes = {"savanna"},
-		y_min = 5,
+		y_min = 1,
 		y_max = 31000,
 		decoration = "default:dry_grass_"..length,
 	})
@@ -882,13 +936,13 @@ function default.register_decorations()
 		noise_params = {
 			offset = 0.04,
 			scale = 0.02,
-			spread = {x=250, y=250, z=250},
+			spread = {x = 250, y = 250, z = 250},
 			seed = 2,
 			octaves = 3,
 			persist = 0.66
 		},
 		biomes = {"deciduous_forest"},
-		y_min = 6,
+		y_min = 1,
 		y_max = 31000,
 		schematic = minetest.get_modpath("default").."/schematics/apple_tree.mts",
 		flags = "place_center_x, place_center_z",
@@ -906,6 +960,7 @@ function default.register_decorations()
 		y_max = 31000,
 		schematic = minetest.get_modpath("default").."/schematics/jungle_tree.mts",
 		flags = "place_center_x, place_center_z",
+		rotation = "random",
 	})
 
 	-- Taiga and temperate forest pine tree
@@ -917,7 +972,7 @@ function default.register_decorations()
 		noise_params = {
 			offset = 0.04,
 			scale = 0.02,
-			spread = {x=250, y=250, z=250},
+			spread = {x = 250, y = 250, z = 250},
 			seed = 2,
 			octaves = 3,
 			persist = 0.66
@@ -938,13 +993,13 @@ function default.register_decorations()
 		noise_params = {
 			offset = 0,
 			scale = 0.003,
-			spread = {x=250, y=250, z=250},
+			spread = {x = 250, y = 250, z = 250},
 			seed = 2,
 			octaves = 3,
 			persist = 0.66
 		},
 		biomes = {"savanna"},
-		y_min = 6,
+		y_min = 1,
 		y_max = 31000,
 		schematic = minetest.get_modpath("default").."/schematics/acacia_tree.mts",
 		flags = "place_center_x, place_center_z",
@@ -960,7 +1015,7 @@ function default.register_decorations()
 		noise_params = {
 			offset = -0.0005,
 			scale = 0.0015,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 230,
 			octaves = 3,
 			persist = 0.6
@@ -982,7 +1037,7 @@ function default.register_decorations()
 		noise_params = {
 			offset = -0.0005,
 			scale = 0.0015,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 230,
 			octaves = 3,
 			persist = 0.6
@@ -999,17 +1054,17 @@ function default.register_decorations()
 
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:sand"},
+		place_on = {"default:dirt", "default:sand"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.3,
 			scale = 0.7,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 354,
 			octaves = 3,
 			persist = 0.7
 		},
-		biomes = {"savanna_ocean", "desert_ocean"},
+		biomes = {"savanna_swamp", "desert_ocean"},
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("default").."/schematics/papyrus.mts",
@@ -1053,7 +1108,7 @@ function default.register_decorations()
 		noise_params = {
 			offset = 0,
 			scale = 0.02,
-			spread = {x=200, y=200, z=200},
+			spread = {x = 200, y = 200, z = 200},
 			seed = 329,
 			octaves = 3,
 			persist = 0.6

mods/flowers/mapgen.lua

@@ -94,13 +94,9 @@ local function register_flower(seed, name)
 			octaves = 3,
 			persist = 0.6
 		},
-		biomes = {
+		biomes = {"stone_grassland", "sandstone_grassland",
-			"stone_grassland",
+			"deciduous_forest", "coniferous_forest"},
-			"sandstone_grassland",
+		y_min = 1,
-			"deciduous_forest",
-			"coniferous_forest",
-		},
-		y_min = 6,
 		y_max = 31000,
 		decoration = "flowers:"..name,
 	})
@@ -120,7 +116,7 @@ local function register_mushroom(name)
 			persist = 0.66
 		},
 		biomes = {"deciduous_forest", "coniferous_forest"},
-		y_min = 6,
+		y_min = 1,
 		y_max = 31000,
 		decoration = "flowers:"..name,
 	})
@@ -129,7 +125,7 @@ end
 local function register_waterlily()
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:dirt", "default:sand"},
+		place_on = {"default:dirt"},
 		sidelen = 16,
 		noise_params = {
 			offset = -0.12,
@@ -139,8 +135,7 @@ local function register_waterlily()
 			octaves = 3,
 			persist = 0.7
 		},
-		biomes = {"deciduous_forest_ocean", "sandstone_grassland_ocean",
+		biomes = {"rainforest_swamp", "savanna_swamp", "deciduous_forest_swamp"},
-			"rainforest_swamp", "savanna_ocean", "desert_ocean"},
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("flowers").."/schematics/waterlily.mts",