From: paramat <mat.gregory@virginmedia.com>
Date: Fri, 7 Aug 2015 15:03:53 +0000 (+0100)
Subject: Biomes: Tune v5/v7 biomes and v5/v6/v7 mushroom distribution
X-Git-Tag: 0.4.13~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=0a3bf5b220fa1c700f20baec40c85f88d197bfe9;p=oweals%2Fminetest_game.git

Biomes: Tune v5/v7 biomes and v5/v6/v7 mushroom distribution

More complex distribution of dry grasses
Remove water below glacier rivers
Gravel as glacier seabed
Do not force-place acacia root
Tune acacia tree density
Match mgv5/v7 mushrooms to tree density
Spawn mgv6 mushrooms by trees
---

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 660e0a12..661c8a0c 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -330,9 +330,9 @@ function default.register_biomes()
 		depth_filler = 3,
 		node_stone = "default:ice",
 		node_water_top = "default:ice",
-		depth_water_top = 8,
+		depth_water_top = 10,
 		--node_water = "",
-		y_min = -6,
+		y_min = -8,
 		y_max = 31000,
 		heat_point = -5,
 		humidity_point = 50,
@@ -341,16 +341,16 @@ function default.register_biomes()
 	minetest.register_biome({
 		name = "glacier_ocean",
 		node_dust = "default:snowblock",
-		node_top = "default:sand",
+		node_top = "default:gravel",
 		depth_top = 1,
-		node_filler = "default:sand",
+		node_filler = "default:gravel",
 		depth_filler = 2,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
 		y_min = -112,
-		y_max = -7,
+		y_max = -9,
 		heat_point = -5,
 		humidity_point = 50,
 	})
@@ -734,7 +734,7 @@ function default.register_mgv6_decorations()
 		y_max = 1,
 		decoration = "default:papyrus",
 		height = 2,
-	        height_max = 4,
+		height_max = 4,
 		spawn_by = "default:water_source",
 		num_spawn_by = 1,
 	})
@@ -828,14 +828,14 @@ local function register_grass_decoration(offset, scale, length)
 	})
 end
 
-local function register_dry_grass_decoration(length)
+local function register_dry_grass_decoration(offset, scale, length)
 	minetest.register_decoration({
 		deco_type = "simple",
 		place_on = {"default:dirt_with_dry_grass"},
 		sidelen = 16,
 		noise_params = {
-			offset = 0.04,
-			scale = 0.02,
+			offset = offset,
+			scale = scale,
 			spread = {x=200, y=200, z=200},
 			seed = 329,
 			octaves = 3,
@@ -914,8 +914,8 @@ function default.register_decorations()
 		place_on = {"default:dirt_with_dry_grass"},
 		sidelen = 80,
 		noise_params = {
-			offset = 0.001,
-			scale = 0.0015,
+			offset = 0,
+			scale = 0.003,
 			spread = {x=250, y=250, z=250},
 			seed = 2,
 			octaves = 3,
@@ -1003,11 +1003,11 @@ function default.register_decorations()
 
 	-- Dry grasses
 
-	register_dry_grass_decoration(5)
-	register_dry_grass_decoration(4)
-	register_dry_grass_decoration(3)
-	register_dry_grass_decoration(2)
-	register_dry_grass_decoration(1)
+	register_dry_grass_decoration(0.01, 0.05,  5)
+	register_dry_grass_decoration(0.03, 0.03,  4)
+	register_dry_grass_decoration(0.05, 0.01,  3)
+	register_dry_grass_decoration(0.07, -0.01, 2)
+	register_dry_grass_decoration(0.09, -0.03, 1)
 
 	-- Junglegrass
 
diff --git a/mods/default/schematics/acacia_tree.mts b/mods/default/schematics/acacia_tree.mts
index 986c022d..43e7867a 100644
Binary files a/mods/default/schematics/acacia_tree.mts and b/mods/default/schematics/acacia_tree.mts differ
diff --git a/mods/flowers/mapgen.lua b/mods/flowers/mapgen.lua
index 5efea1fe..e2260a92 100644
--- a/mods/flowers/mapgen.lua
+++ b/mods/flowers/mapgen.lua
@@ -1,4 +1,6 @@
+--
 -- Mgv6
+--
 
 local function register_mgv6_flower(name)
 	minetest.register_decoration({
@@ -26,7 +28,7 @@ local function register_mgv6_mushroom(name)
 		sidelen = 16,
 		noise_params = {
 			offset = 0,
-			scale = 0.006,
+			scale = 0.04,
 			spread = {x=100, y=100, z=100},
 			seed = 7133,
 			octaves = 3,
@@ -35,6 +37,8 @@ local function register_mgv6_mushroom(name)
 		y_min = 1,
 		y_max = 30,
 		decoration = "flowers:"..name,
+		spawn_by = "default:tree",
+		num_spawn_by = 1,
 	})
 end
 
@@ -50,7 +54,10 @@ function flowers.register_mgv6_decorations()
 	register_mgv6_mushroom("mushroom_red")
 end
 
--- All other biome API mapgens (not singlenode)
+
+--
+-- All other biome API mapgens
+--
 
 local function register_flower(seed, name)
 	minetest.register_decoration({
@@ -86,9 +93,9 @@ local function register_mushroom(name)
 			offset = 0,
 			scale = 0.006,
 			spread = {x=200, y=200, z=200},
-			seed = 7133,
+			seed = 2,
 			octaves = 3,
-			persist = 0.6
+			persist = 0.66
 		},
 		biomes = {"deciduous_forest", "coniferous_forest"},
 		y_min = 6,
@@ -109,7 +116,10 @@ function flowers.register_decorations()
 	register_mushroom("mushroom_red")
 end
 
+
+--
 -- Detect mapgen to select functions
+--
 
 -- Mods using singlenode mapgen can call these functions to enable
 -- the use of minetest.generate_ores or minetest.generate_decorations