X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mods%2Fdefault%2Fmapgen.lua;h=3424a557b0ccd8deb1482b3a50871fe9d4a5fd44;hb=28884cc784626544871bd28032130899393c74e9;hp=661c8a0cb1cfa8a438843a579c2871d721749993;hpb=0a3bf5b220fa1c700f20baec40c85f88d197bfe9;p=oweals%2Fminetest_game.git

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 661c8a0c..3424a557 100644
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -26,7 +26,7 @@ minetest.register_alias("mapgen_apple", "default:apple")
 minetest.register_alias("mapgen_jungletree", "default:jungletree")
 minetest.register_alias("mapgen_jungleleaves", "default:jungleleaves")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_pinetree", "default:pinetree")
+minetest.register_alias("mapgen_pine_tree", "default:pine_tree")
 minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
 
 -- Dungeons
@@ -50,84 +50,85 @@ function default.register_ores()
 	-- Clay
 
 	minetest.register_ore({ 
-		ore_type         = "blob",
-		ore              = "default:clay",
-		wherein          = {"default:sand"},
-		clust_scarcity   = 24 * 24 * 24,
-		clust_size       = 7,
-		y_min            = -15,
-		y_max            = 0,
-		noise_threshhold = 0,
-		noise_params     = {
-			offset = 0.35,
+		ore_type        = "blob",
+		ore             = "default:clay",
+		wherein         = {"default:sand"},
+		clust_scarcity  = 16 * 16 * 16,
+		clust_size      = 5,
+		y_min           = -15,
+		y_max           = 0,
+		noise_threshold = 0.0,
+		noise_params    = {
+			offset = 0.5,
 			scale = 0.2,
 			spread = {x = 5, y = 5, z = 5},
 			seed = -316,
 			octaves = 1,
-			persist = 0.5
+			persist = 0.0
 		},
 	})
 
 	-- Sand
 
 	minetest.register_ore({ 
-		ore_type         = "blob",
-		ore              = "default:sand",
-		wherein          = {"default:stone"},
-		clust_scarcity   = 24 * 24 * 24,
-		clust_size       = 7,
-		y_min            = -63,
-		y_max            = 4,
-		noise_threshhold = 0,
-		noise_params     = {
-			offset = 0.35,
+		ore_type        = "blob",
+		ore             = "default:sand",
+		wherein         = {"default:stone", "default:sandstone",
+			"default:desert_stone"},
+		clust_scarcity  = 16 * 16 * 16,
+		clust_size      = 5,
+		y_min           = -31,
+		y_max           = 4,
+		noise_threshold = 0.0,
+		noise_params    = {
+			offset = 0.5,
 			scale = 0.2,
 			spread = {x = 5, y = 5, z = 5},
 			seed = 2316,
 			octaves = 1,
-			persist = 0.5
+			persist = 0.0
 		},
 	})
 
 	-- Dirt
 
 	minetest.register_ore({
-		ore_type         = "blob",
-		ore              = "default:dirt",
-		wherein          = {"default:stone"},
-		clust_scarcity   = 24 * 24 * 24,
-		clust_size       = 7,
-		y_min            = -63,
-		y_max            = 31000,
-		noise_threshhold = 0,
-		noise_params     = {
-			offset = 0.35,
+		ore_type        = "blob",
+		ore             = "default:dirt",
+		wherein         = {"default:stone", "default:sandstone"},
+		clust_scarcity  = 16 * 16 * 16,
+		clust_size      = 5,
+		y_min           = -31,
+		y_max           = 31000,
+		noise_threshold = 0.0,
+		noise_params    = {
+			offset = 0.5,
 			scale = 0.2,
 			spread = {x = 5, y = 5, z = 5},
 			seed = 17676,
 			octaves = 1,
-			persist = 0.5
+			persist = 0.0
 		},
 	})
 
 	-- Gravel
 
 	minetest.register_ore({
-		ore_type         = "blob",
-		ore              = "default:gravel",
-		wherein          = {"default:stone"},
-		clust_scarcity   = 24 * 24 * 24,
-		clust_size       = 7,
-		y_min            = -31000,
-		y_max            = 31000,
-		noise_threshhold = 0,
-		noise_params     = {
-			offset = 0.35,
+		ore_type        = "blob",
+		ore             = "default:gravel",
+		wherein         = {"default:stone"},
+		clust_scarcity  = 16 * 16 * 16,
+		clust_size      = 5,
+		y_min           = -31000,
+		y_max           = 31000,
+		noise_threshold = 0.0,
+		noise_params    = {
+			offset = 0.5,
 			scale = 0.2,
 			spread = {x = 5, y = 5, z = 5},
 			seed = 766,
 			octaves = 1,
-			persist = 0.5
+			persist = 0.0
 		},
 	})
 
@@ -332,26 +333,28 @@ function default.register_biomes()
 		node_water_top = "default:ice",
 		depth_water_top = 10,
 		--node_water = "",
+		node_river_water = "default:ice",
 		y_min = -8,
 		y_max = 31000,
-		heat_point = -5,
+		heat_point = 0,
 		humidity_point = 50,
 	})
 
 	minetest.register_biome({
 		name = "glacier_ocean",
 		node_dust = "default:snowblock",
-		node_top = "default:gravel",
+		node_top = "default:sand",
 		depth_top = 1,
-		node_filler = "default:gravel",
-		depth_filler = 2,
+		node_filler = "default:sand",
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = -9,
-		heat_point = -5,
+		heat_point = 0,
 		humidity_point = 50,
 	})
 
@@ -359,19 +362,38 @@ function default.register_biomes()
 
 	minetest.register_biome({
 		name = "tundra",
-		node_dust = "default:snow",
+		--node_dust = "",
 		node_top = "default:dirt_with_snow",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 0,
+		depth_filler = 1,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 2,
 		y_max = 31000,
-		heat_point = 20,
-		humidity_point = 30,
+		heat_point = 15,
+		humidity_point = 35,
+	})
+
+	minetest.register_biome({
+		name = "tundra_beach",
+		--node_dust = "",
+		node_top = "default:gravel",
+		depth_top = 1,
+		node_filler = "default:gravel",
+		depth_filler = 2,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -3,
+		y_max = 1,
+		heat_point = 15,
+		humidity_point = 35,
 	})
 
 	minetest.register_biome({
@@ -380,32 +402,35 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = 1,
-		heat_point = 20,
-		humidity_point = 30,
+		y_max = -4,
+		heat_point = 15,
+		humidity_point = 35,
 	})
 
+
 	minetest.register_biome({
 		name = "taiga",
 		node_dust = "default:snow",
-		node_top = "default:snowblock",
+		node_top = "default:dirt_with_snow",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 2,
 		y_max = 31000,
-		heat_point = 20,
-		humidity_point = 70,
+		heat_point = 15,
+		humidity_point = 65,
 	})
 
 	minetest.register_biome({
@@ -414,18 +439,19 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
 		y_max = 1,
-		heat_point = 20,
-		humidity_point = 70,
+		heat_point = 15,
+		humidity_point = 65,
 	})
 
-	-- Cool
+	-- Temperate
 
 	minetest.register_biome({
 		name = "stone_grassland",
@@ -433,19 +459,20 @@ function default.register_biomes()
 		node_top = "default:dirt_with_grass",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 0,
+		depth_filler = 1,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
-		heat_point = 45,
-		humidity_point = 30,
+		heat_point = 40,
+		humidity_point = 35,
 	})
 
 	minetest.register_biome({
-		name = "stone_grassland_ocean",
+		name = "stone_grassland_dunes",
 		--node_dust = "",
 		node_top = "default:sand",
 		depth_top = 1,
@@ -455,27 +482,66 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = -112,
+		--node_river_water = "",
+		y_min = 5,
 		y_max = 5,
-		heat_point = 45,
-		humidity_point = 30,
+		heat_point = 40,
+		humidity_point = 35,
+	})
+
+	minetest.register_biome({
+		name = "stone_grassland_ocean",
+		--node_dust = "",
+		node_top = "default:sand",
+		depth_top = 1,
+		node_filler = "default:sand",
+		depth_filler = 3,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -112,
+		y_max = 4,
+		heat_point = 40,
+		humidity_point = 35,
 	})
 
+
 	minetest.register_biome({
 		name = "coniferous_forest",
 		--node_dust = "",
 		node_top = "default:dirt_with_grass",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
-		heat_point = 45,
-		humidity_point = 70,
+		heat_point = 40,
+		humidity_point = 65,
+	})
+
+	minetest.register_biome({
+		name = "coniferous_forest_dunes",
+		--node_dust = "",
+		node_top = "default:sand",
+		depth_top = 1,
+		node_filler = "default:sand",
+		depth_filler = 3,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = 5,
+		y_max = 5,
+		heat_point = 40,
+		humidity_point = 65,
 	})
 
 	minetest.register_biome({
@@ -484,18 +550,18 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
-		heat_point = 45,
-		humidity_point = 70,
+		y_max = 4,
+		heat_point = 40,
+		humidity_point = 65,
 	})
 
-	-- Warm
 
 	minetest.register_biome({
 		name = "sandstone_grassland",
@@ -503,19 +569,20 @@ function default.register_biomes()
 		node_top = "default:dirt_with_grass",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 0,
+		depth_filler = 1,
 		node_stone = "default:sandstone",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 6,
 		y_max = 31000,
-		heat_point = 70,
-		humidity_point = 30,
+		heat_point = 60,
+		humidity_point = 35,
 	})
 
 	minetest.register_biome({
-		name = "sandstone_grassland_ocean",
+		name = "sandstone_grassland_dunes",
 		--node_dust = "",
 		node_top = "default:sand",
 		depth_top = 1,
@@ -525,27 +592,66 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = -112,
+		--node_river_water = "",
+		y_min = 5,
 		y_max = 5,
-		heat_point = 70,
-		humidity_point = 30,
+		heat_point = 60,
+		humidity_point = 35,
+	})
+
+	minetest.register_biome({
+		name = "sandstone_grassland_ocean",
+		--node_dust = "",
+		node_top = "default:sand",
+		depth_top = 1,
+		node_filler = "default:sand",
+		depth_filler = 3,
+		node_stone = "default:sandstone",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -112,
+		y_max = 4,
+		heat_point = 60,
+		humidity_point = 35,
 	})
 
+
 	minetest.register_biome({
 		name = "deciduous_forest",
 		--node_dust = "",
 		node_top = "default:dirt_with_grass",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = 6,
+		--node_river_water = "",
+		y_min = 1,
 		y_max = 31000,
-		heat_point = 70,
-		humidity_point = 70,
+		heat_point = 60,
+		humidity_point = 65,
+	})
+
+	minetest.register_biome({
+		name = "deciduous_forest_swamp",
+		--node_dust = "",
+		node_top = "default:dirt",
+		depth_top = 1,
+		node_filler = "default:dirt",
+		depth_filler = 3,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -3,
+		y_max = 0,
+		heat_point = 60,
+		humidity_point = 65,
 	})
 
 	minetest.register_biome({
@@ -554,15 +660,16 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = 5,
-		heat_point = 70,
-		humidity_point = 70,
+		y_max = -4,
+		heat_point = 60,
+		humidity_point = 65,
 	})
 
 	-- Hot
@@ -578,10 +685,11 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = 1,
+		--node_river_water = "",
+		y_min = 5,
 		y_max = 31000,
-		heat_point = 95,
-		humidity_point = 10,
+		heat_point = 85,
+		humidity_point = 20,
 	})
 
 	minetest.register_biome({
@@ -590,17 +698,19 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		node_stone = "default:desert_stone",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = 0,
-		heat_point = 95,
-		humidity_point = 10,
+		y_max = 4,
+		heat_point = 85,
+		humidity_point = 20,
 	})
 
+
 	minetest.register_biome({
 		name = "savanna",
 		--node_dust = "",
@@ -612,9 +722,28 @@ function default.register_biomes()
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = 5,
+		--node_river_water = "",
+		y_min = 1,
 		y_max = 31000,
-		heat_point = 95,
+		heat_point = 85,
+		humidity_point = 50,
+	})
+
+	minetest.register_biome({
+		name = "savanna_swamp",
+		--node_dust = "",
+		node_top = "default:dirt",
+		depth_top = 1,
+		node_filler = "default:dirt",
+		depth_filler = 3,
+		--node_stone = "",
+		--node_water_top = "",
+		--depth_water_top = ,
+		--node_water = "",
+		--node_river_water = "",
+		y_min = -3,
+		y_max = 0,
+		heat_point = 85,
 		humidity_point = 50,
 	})
 
@@ -624,32 +753,35 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = 4,
-		heat_point = 95,
+		y_max = -4,
+		heat_point = 85,
 		humidity_point = 50,
 	})
 
+
 	minetest.register_biome({
 		name = "rainforest",
 		--node_dust = "",
 		node_top = "default:dirt_with_grass",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = 1,
 		y_max = 31000,
-		heat_point = 95,
-		humidity_point = 90,
+		heat_point = 85,
+		humidity_point = 80,
 	})
 
 	minetest.register_biome({
@@ -658,15 +790,16 @@ function default.register_biomes()
 		node_top = "default:dirt",
 		depth_top = 1,
 		node_filler = "default:dirt",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
-		y_min = 0,
+		--node_river_water = "",
+		y_min = -3,
 		y_max = 0,
-		heat_point = 95,
-		humidity_point = 90,
+		heat_point = 85,
+		humidity_point = 80,
 	})
 
 	minetest.register_biome({
@@ -675,15 +808,16 @@ function default.register_biomes()
 		node_top = "default:sand",
 		depth_top = 1,
 		node_filler = "default:sand",
-		depth_filler = 2,
+		depth_filler = 3,
 		--node_stone = "",
 		--node_water_top = "",
 		--depth_water_top = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -112,
-		y_max = -1,
-		heat_point = 95,
-		humidity_point = 90,
+		y_max = -4,
+		heat_point = 85,
+		humidity_point = 80,
 	})
 
 	-- Underground
@@ -692,13 +826,14 @@ 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 = ,
 		--node_water = "",
+		--node_river_water = "",
 		y_min = -31000,
 		y_max = -113,
 		heat_point = 50,
@@ -721,7 +856,7 @@ function default.register_mgv6_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		place_on = {"default:dirt_with_grass"},
-		sidelen = 8,
+		sidelen = 16,
 		noise_params = {
 			offset = -0.3,
 			scale = 0.7,
@@ -811,18 +946,16 @@ 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 = {
-			"stone_grassland", "stone_grassland_ocean",
-			"sandstone_grassland", "sandstone_grassland_ocean",
-			"deciduous_forest", "deciduous_forest_ocean",
-			"coniferous_forest", "coniferous_forest_ocean",
-		},
-		y_min = 5,
+		biomes = {"stone_grassland", "sandstone_grassland",
+			"deciduous_forest", "coniferous_forest",
+			"stone_grassland_dunes", "sandstone_grassland_dunes",
+			"coniferous_forest_dunes"},
+		y_min = 1,
 		y_max = 31000,
 		decoration = "default:grass_"..length,
 	})
@@ -836,13 +969,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,
 	})
@@ -851,28 +984,61 @@ end
 function default.register_decorations()
 	minetest.clear_registered_decorations()
 
-	-- Apple tree
+	-- Apple tree and log
 
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
-			offset = 0.04,
-			scale = 0.02,
-			spread = {x=250, y=250, z=250},
+			offset = 0.036,
+			scale = 0.022,
+			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",
 	})
 
-	-- Jungle tree
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_grass"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0018,
+			scale = 0.0011,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"deciduous_forest"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = {
+			size = {x = 3, y = 3, z = 1},
+			data = {
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "default:tree", param2 = 12, prob = 191},
+				{name = "default:tree", param2 = 12},
+				{name = "default:tree", param2 = 12, prob = 127},
+				{name = "air", prob = 0},
+				{name = "flowers:mushroom_brown", prob = 63},
+				{name = "air", prob = 0},
+			},
+		},
+		flags = "place_center_x",
+		rotation = "random",
+	})
+
+	-- Jungle tree and log
 
 	minetest.register_decoration({
 		deco_type = "schematic",
@@ -884,18 +1050,45 @@ 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",
+	})
+
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_grass", "default:dirt"},
+		sidelen = 80,
+		fill_ratio = 0.01,
+		biomes = {"rainforest", "rainforest_swamp"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = {
+			size = {x = 3, y = 3, z = 1},
+			data = {
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "default:jungletree", param2 = 12, prob = 191},
+				{name = "default:jungletree", param2 = 12},
+				{name = "default:jungletree", param2 = 12, prob = 127},
+				{name = "air", prob = 0},
+				{name = "flowers:mushroom_brown", prob = 127},
+				{name = "air", prob = 0},
+			},
+		},
+		flags = "place_center_x",
+		rotation = "random",
 	})
 
-	-- Taiga and temperate forest pine tree
+	-- Taiga and temperate coniferous forest pine tree and log
 
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:snowblock", "default:dirt_with_grass"},
+		place_on = {"default:dirt_with_snow", "default:dirt_with_grass"},
 		sidelen = 16,
 		noise_params = {
-			offset = 0.04,
-			scale = 0.02,
-			spread = {x=250, y=250, z=250},
+			offset = 0.036,
+			scale = 0.022,
+			spread = {x = 250, y = 250, z = 250},
 			seed = 2,
 			octaves = 3,
 			persist = 0.66
@@ -907,44 +1100,161 @@ function default.register_decorations()
 		flags = "place_center_x, place_center_z",
 	})
 
-	-- Acacia tree
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_snow", "default:dirt_with_grass"},
+		sidelen = 80,
+		noise_params = {
+			offset = 0.0018,
+			scale = 0.0011,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"taiga", "coniferous_forest"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = {
+			size = {x = 3, y = 3, z = 1},
+			data = {
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "default:pine_tree", param2 = 12, prob = 191},
+				{name = "default:pine_tree", param2 = 12},
+				{name = "default:pine_tree", param2 = 12, prob = 127},
+				{name = "air", prob = 0},
+				{name = "flowers:mushroom_red", prob = 63},
+				{name = "air", prob = 0},
+			},
+		},
+		flags = "place_center_x",
+		rotation = "random",
+	})
+
+	-- Acacia tree and log
 
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"default:dirt_with_dry_grass"},
-		sidelen = 80,
+		sidelen = 16,
 		noise_params = {
 			offset = 0,
-			scale = 0.003,
-			spread = {x=250, y=250, z=250},
+			scale = 0.002,
+			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",
 		rotation = "random",
 	})
 
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_dry_grass"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0,
+			scale = 0.001,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"savanna"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = {
+			size = {x = 3, y = 2, z = 1},
+			data = {
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "default:acacia_tree", param2 = 12, prob = 191},
+				{name = "default:acacia_tree", param2 = 12},
+				{name = "default:acacia_tree", param2 = 12, prob = 127},
+			},
+		},
+		flags = "place_center_x",
+		rotation = "random",
+	})
+
+	-- Aspen tree and log
+
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_grass"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0,
+			scale = -0.015,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"deciduous_forest"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = minetest.get_modpath("default").."/schematics/aspen_tree.mts",
+		flags = "place_center_x, place_center_z",
+		rotation = "random",
+	})
+
+	minetest.register_decoration({
+		deco_type = "schematic",
+		place_on = {"default:dirt_with_grass"},
+		sidelen = 16,
+		noise_params = {
+			offset = 0.0,
+			scale = -0.0008,
+			spread = {x = 250, y = 250, z = 250},
+			seed = 2,
+			octaves = 3,
+			persist = 0.66
+		},
+		biomes = {"deciduous_forest"},
+		y_min = 1,
+		y_max = 31000,
+		schematic = {
+			size = {x = 3, y = 3, z = 1},
+			data = {
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "air", prob = 0},
+				{name = "default:aspen_tree", param2 = 12},
+				{name = "default:aspen_tree", param2 = 12},
+				{name = "default:aspen_tree", param2 = 12, prob = 127},
+				{name = "flowers:mushroom_red", prob = 63},
+				{name = "flowers:mushroom_brown", prob = 63},
+				{name = "air", prob = 0},
+			},
+		},
+		flags = "place_center_x",
+		rotation = "random",
+	})
 	-- Large cactus
 
 	minetest.register_decoration({
 		deco_type = "schematic",
 		place_on = {"default:desert_sand"},
-		sidelen = 80,
+		sidelen = 16,
 		noise_params = {
-			offset = -0.0005,
-			scale = 0.0015,
-			spread = {x=200, y=200, z=200},
+			offset = -0.0003,
+			scale = 0.0009,
+			spread = {x = 200, y = 200, z = 200},
 			seed = 230,
 			octaves = 3,
 			persist = 0.6
 		},
 		biomes = {"desert"},
-		y_min = 2,
+		y_min = 5,
 		y_max = 31000,
 		schematic = minetest.get_modpath("default").."/schematics/large_cactus.mts",
 		flags = "place_center_x",
@@ -956,38 +1266,38 @@ function default.register_decorations()
 	minetest.register_decoration({
 		deco_type = "simple",
 		place_on = {"default:desert_sand"},
-		sidelen = 80,
+		sidelen = 16,
 		noise_params = {
-			offset = -0.0005,
-			scale = 0.0015,
-			spread = {x=200, y=200, z=200},
+			offset = -0.0003,
+			scale = 0.0009,
+			spread = {x = 200, y = 200, z = 200},
 			seed = 230,
 			octaves = 3,
 			persist = 0.6
 		},
 		biomes = {"desert"},
-		y_min = 2,
+		y_min = 5,
 		y_max = 31000,
 		decoration = "default:cactus",
 		height = 2,
-	        height_max = 5,
+		height_max = 5,
 	})
 
 	-- Papyrus
 
 	minetest.register_decoration({
 		deco_type = "schematic",
-		place_on = {"default:sand"},
+		place_on = {"default:dirt"},
 		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"},
 		y_min = 0,
 		y_max = 0,
 		schematic = minetest.get_modpath("default").."/schematics/papyrus.mts",
@@ -1031,7 +1341,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
@@ -1109,8 +1419,8 @@ if mg_params.mgname == "v6" then
 	default.register_mgv6_decorations()
 	minetest.register_on_generated(default.generate_nyancats)
 elseif mg_params.mgname ~= "singlenode" then
-	default.register_ores()
 	default.register_biomes()
+	default.register_ores()
 	default.register_decorations()
 	minetest.register_on_generated(default.generate_nyancats)
 end