Add tiling info for grass nodes
[oweals/minetest_game.git] / mods / default / mapgen.lua
index 2156b2ef61e2b55c82966d13e3b0a9135aae2230..c40f2204494b29879888aea6d725bf548ff9ee6b 100644 (file)
@@ -2,7 +2,6 @@
 -- Aliases for map generator outputs
 --
 
-
 minetest.register_alias("mapgen_stone", "default:stone")
 minetest.register_alias("mapgen_dirt", "default:dirt")
 minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
@@ -17,6 +16,9 @@ minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow")
 minetest.register_alias("mapgen_snowblock", "default:snowblock")
 minetest.register_alias("mapgen_snow", "default:snow")
 minetest.register_alias("mapgen_ice", "default:ice")
+minetest.register_alias("mapgen_sandstone", "default:sandstone")
+
+-- Flora
 
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
@@ -24,9 +26,11 @@ 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
+
 minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
 minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
@@ -38,91 +42,102 @@ minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstonebr
 -- Register ores
 --
 
-
+-- All mapgens except singlenode
 -- Blob ore first to avoid other ores inside blobs
 
 function default.register_ores()
+
+       -- Clay
+
        minetest.register_ore({ 
                ore_type         = "blob",
                ore              = "default:clay",
                wherein          = {"default:sand"},
-               clust_scarcity   = 24*24*24,
+               clust_scarcity   = 24 * 24 * 24,
                clust_size       = 7,
                y_min            = -15,
                y_max            = 0,
                noise_threshhold = 0,
                noise_params     = {
-                       offset=0.35,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=-316,
-                       octaves=1,
-                       persist=0.5
+                       offset = 0.35,
+                       scale = 0.2,
+                       spread = {x = 5, y = 5, z = 5},
+                       seed = -316,
+                       octaves = 1,
+                       persist = 0.5
                },
        })
 
+       -- Sand
+
        minetest.register_ore({ 
                ore_type         = "blob",
                ore              = "default:sand",
                wherein          = {"default:stone"},
-               clust_scarcity   = 24*24*24,
+               clust_scarcity   = 24 * 24 * 24,
                clust_size       = 7,
                y_min            = -63,
                y_max            = 4,
                noise_threshhold = 0,
                noise_params     = {
-                       offset=0.35,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=2316,
-                       octaves=1,
-                       persist=0.5
+                       offset = 0.35,
+                       scale = 0.2,
+                       spread = {x = 5, y = 5, z = 5},
+                       seed = 2316,
+                       octaves = 1,
+                       persist = 0.5
                },
        })
 
+       -- Dirt
+
        minetest.register_ore({
                ore_type         = "blob",
                ore              = "default:dirt",
                wherein          = {"default:stone"},
-               clust_scarcity   = 24*24*24,
+               clust_scarcity   = 24 * 24 * 24,
                clust_size       = 7,
                y_min            = -63,
                y_max            = 31000,
                noise_threshhold = 0,
                noise_params     = {
-                       offset=0.35,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=17676,
-                       octaves=1,
-                       persist=0.5
+                       offset = 0.35,
+                       scale = 0.2,
+                       spread = {x = 5, y = 5, z = 5},
+                       seed = 17676,
+                       octaves = 1,
+                       persist = 0.5
                },
        })
 
+       -- Gravel
+
        minetest.register_ore({
                ore_type         = "blob",
                ore              = "default:gravel",
                wherein          = {"default:stone"},
-               clust_scarcity   = 24*24*24,
+               clust_scarcity   = 24 * 24 * 24,
                clust_size       = 7,
                y_min            = -31000,
                y_max            = 31000,
                noise_threshhold = 0,
                noise_params     = {
-                       offset=0.35,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=766,
-                       octaves=1,
-                       persist=0.5
+                       offset = 0.35,
+                       scale = 0.2,
+                       spread = {x = 5, y = 5, z = 5},
+                       seed = 766,
+                       octaves = 1,
+                       persist = 0.5
                },
        })
 
+       -- Coal
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_coal",
                wherein        = "default:stone",
-               clust_scarcity = 8*8*8,
+               clust_scarcity = 8 * 8 * 8,
                clust_num_ores = 8,
                clust_size     = 3,
                y_min          = -31000,
@@ -133,18 +148,20 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_coal",
                wherein        = "default:stone",
-               clust_scarcity = 24*24*24,
+               clust_scarcity = 24 * 24 * 24,
                clust_num_ores = 27,
                clust_size     = 6,
                y_min          = -31000,
                y_max          = 0,
        })
 
+       -- Iron
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 12*12*12,
+               clust_scarcity = 12 * 12 * 12,
                clust_num_ores = 3,
                clust_size     = 2,
                y_min          = -15,
@@ -155,7 +172,7 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 9*9*9,
+               clust_scarcity = 9 * 9 * 9,
                clust_num_ores = 5,
                clust_size     = 3,
                y_min          = -63,
@@ -166,7 +183,7 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 7*7*7,
+               clust_scarcity = 7 * 7 * 7,
                clust_num_ores = 5,
                clust_size     = 3,
                y_min          = -31000,
@@ -177,18 +194,20 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_iron",
                wherein        = "default:stone",
-               clust_scarcity = 24*24*24,
+               clust_scarcity = 24 * 24 * 24,
                clust_num_ores = 27,
                clust_size     = 6,
                y_min          = -31000,
                y_max          = -64,
        })
 
+       --Mese
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_mese",
                wherein        = "default:stone",
-               clust_scarcity = 18*18*18,
+               clust_scarcity = 18 * 18 * 18,
                clust_num_ores = 3,
                clust_size     = 2,
                y_min          = -255,
@@ -199,7 +218,7 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_mese",
                wherein        = "default:stone",
-               clust_scarcity = 14*14*14,
+               clust_scarcity = 14 * 14 * 14,
                clust_num_ores = 5,
                clust_size     = 3,
                y_min          = -31000,
@@ -210,18 +229,20 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:mese",
                wherein        = "default:stone",
-               clust_scarcity = 36*36*36,
+               clust_scarcity = 36 * 36 * 36,
                clust_num_ores = 3,
                clust_size     = 2,
                y_min          = -31000,
                y_max          = -1024,
        })
 
+       -- Gold
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_gold",
                wherein        = "default:stone",
-               clust_scarcity = 15*15*15,
+               clust_scarcity = 15 * 15 * 15,
                clust_num_ores = 3,
                clust_size     = 2,
                y_min          = -255,
@@ -232,18 +253,20 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_gold",
                wherein        = "default:stone",
-               clust_scarcity = 13*13*13,
+               clust_scarcity = 13 * 13 * 13,
                clust_num_ores = 5,
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
        })
 
+       -- Diamond
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_diamond",
                wherein        = "default:stone",
-               clust_scarcity = 17*17*17,
+               clust_scarcity = 17 * 17 * 17,
                clust_num_ores = 4,
                clust_size     = 3,
                y_min          = -255,
@@ -254,18 +277,20 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_diamond",
                wherein        = "default:stone",
-               clust_scarcity = 15*15*15,
+               clust_scarcity = 15 * 15 * 15,
                clust_num_ores = 4,
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
        })
 
+       -- Copper
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_copper",
                wherein        = "default:stone",
-               clust_scarcity = 12*12*12,
+               clust_scarcity = 12 * 12 * 12,
                clust_num_ores = 4,
                clust_size     = 3,
                y_min          = -63,
@@ -276,7 +301,7 @@ function default.register_ores()
                ore_type       = "scatter",
                ore            = "default:stone_with_copper",
                wherein        = "default:stone",
-               clust_scarcity = 9*9*9,
+               clust_scarcity = 9 * 9 * 9,
                clust_num_ores = 5,
                clust_size     = 3,
                y_min          = -31000,
@@ -289,16 +314,299 @@ end
 -- Register biomes
 --
 
+-- All mapgens except mgv6 and singlenode
 
 function default.register_biomes()
        minetest.clear_registered_biomes()
 
+       -- Permanent ice
+
+       minetest.register_biome({
+               name = "glacier",
+               node_dust = "default:snowblock",
+               node_top = "default:snowblock",
+               depth_top = 1,
+               node_filler = "default:snowblock",
+               depth_filler = 3,
+               node_stone = "default:ice",
+               node_water_top = "default:ice",
+               depth_water_top = 10,
+               --node_water = "",
+               y_min = -8,
+               y_max = 31000,
+               heat_point = -5,
+               humidity_point = 50,
+       })
+
+       minetest.register_biome({
+               name = "glacier_ocean",
+               node_dust = "default:snowblock",
+               node_top = "default:gravel",
+               depth_top = 1,
+               node_filler = "default:gravel",
+               depth_filler = 2,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = -112,
+               y_max = -9,
+               heat_point = -5,
+               humidity_point = 50,
+       })
+
+       -- Cold
+
+       minetest.register_biome({
+               name = "tundra",
+               node_dust = "default:snow",
+               node_top = "default:dirt_with_snow",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 0,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 2,
+               y_max = 31000,
+               heat_point = 20,
+               humidity_point = 30,
+       })
+
+       minetest.register_biome({
+               name = "tundra_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = 1,
+               heat_point = 20,
+               humidity_point = 30,
+       })
+
+       minetest.register_biome({
+               name = "taiga",
+               node_dust = "default:snow",
+               node_top = "default:snowblock",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 2,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 2,
+               y_max = 31000,
+               heat_point = 20,
+               humidity_point = 70,
+       })
+
+       minetest.register_biome({
+               name = "taiga_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = 1,
+               heat_point = 20,
+               humidity_point = 70,
+       })
+
+       -- Cool
+
+       minetest.register_biome({
+               name = "stone_grassland",
+               --node_dust = "",
+               node_top = "default:dirt_with_grass",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 0,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 6,
+               y_max = 31000,
+               heat_point = 45,
+               humidity_point = 30,
+       })
+
+       minetest.register_biome({
+               name = "stone_grassland_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = 5,
+               heat_point = 45,
+               humidity_point = 30,
+       })
+
+       minetest.register_biome({
+               name = "coniferous_forest",
+               --node_dust = "",
+               node_top = "default:dirt_with_grass",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 2,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 6,
+               y_max = 31000,
+               heat_point = 45,
+               humidity_point = 70,
+       })
+
+       minetest.register_biome({
+               name = "coniferous_forest_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = 5,
+               heat_point = 45,
+               humidity_point = 70,
+       })
+
+       -- Warm
+
+       minetest.register_biome({
+               name = "sandstone_grassland",
+               --node_dust = "",
+               node_top = "default:dirt_with_grass",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 0,
+               node_stone = "default:sandstone",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 6,
+               y_max = 31000,
+               heat_point = 70,
+               humidity_point = 30,
+       })
+
+       minetest.register_biome({
+               name = "sandstone_grassland_ocean",
+               --node_dust = "",
+               node_top = "default:sand",
+               depth_top = 1,
+               node_filler = "default:sand",
+               depth_filler = 2,
+               node_stone = "default:sandstone",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = -112,
+               y_max = 5,
+               heat_point = 70,
+               humidity_point = 30,
+       })
+
        minetest.register_biome({
-               name = "default:grassland",
+               name = "deciduous_forest",
                --node_dust = "",
                node_top = "default:dirt_with_grass",
                depth_top = 1,
                node_filler = "default:dirt",
+               depth_filler = 2,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 6,
+               y_max = 31000,
+               heat_point = 70,
+               humidity_point = 70,
+       })
+
+       minetest.register_biome({
+               name = "deciduous_forest_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = 5,
+               heat_point = 70,
+               humidity_point = 70,
+       })
+
+       -- Hot
+
+       minetest.register_biome({
+               name = "desert",
+               --node_dust = "",
+               node_top = "default:desert_sand",
+               depth_top = 1,
+               node_filler = "default:desert_sand",
+               depth_filler = 1,
+               node_stone = "default:desert_stone",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 1,
+               y_max = 31000,
+               heat_point = 95,
+               humidity_point = 10,
+       })
+
+       minetest.register_biome({
+               name = "desert_ocean",
+               --node_dust = "",
+               node_top = "default:sand",
+               depth_top = 1,
+               node_filler = "default:sand",
+               depth_filler = 2,
+               node_stone = "default:desert_stone",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = -112,
+               y_max = 0,
+               heat_point = 95,
+               humidity_point = 10,
+       })
+
+       minetest.register_biome({
+               name = "savanna",
+               --node_dust = "",
+               node_top = "default:dirt_with_dry_grass",
+               depth_top = 1,
+               node_filler = "default:dirt",
                depth_filler = 1,
                --node_stone = "",
                --node_water_top = "",
@@ -306,12 +614,12 @@ function default.register_biomes()
                --node_water = "",
                y_min = 5,
                y_max = 31000,
-               heat_point = 50,
+               heat_point = 95,
                humidity_point = 50,
        })
 
        minetest.register_biome({
-               name = "default:grassland_ocean",
+               name = "savanna_ocean",
                --node_dust = "",
                node_top = "default:sand",
                depth_top = 1,
@@ -321,8 +629,78 @@ function default.register_biomes()
                --node_water_top = "",
                --depth_water_top = ,
                --node_water = "",
-               y_min = -31000,
+               y_min = -112,
                y_max = 4,
+               heat_point = 95,
+               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,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 1,
+               y_max = 31000,
+               heat_point = 95,
+               humidity_point = 90,
+       })
+
+       minetest.register_biome({
+               name = "rainforest_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 = "",
+               y_min = 0,
+               y_max = 0,
+               heat_point = 95,
+               humidity_point = 90,
+       })
+
+       minetest.register_biome({
+               name = "rainforest_ocean",
+               --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 = "",
+               y_min = -112,
+               y_max = -1,
+               heat_point = 95,
+               humidity_point = 90,
+       })
+
+       -- Underground
+
+       minetest.register_biome({
+               name = "underground",
+               --node_dust = "",
+               --node_top = "",
+               depth_top = 0,
+               --node_filler = "",
+               depth_filler = -4,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = -31000,
+               y_max = -113,
                heat_point = 50,
                humidity_point = 50,
        })
@@ -330,11 +708,13 @@ end
 
 
 --
--- Register mgv6 decorations
+-- Register decorations
 --
 
+-- Mgv6
 
 function default.register_mgv6_decorations()
+       minetest.clear_registered_decorations()
 
        -- Papyrus
 
@@ -345,7 +725,7 @@ function default.register_mgv6_decorations()
                noise_params = {
                        offset = -0.3,
                        scale = 0.7,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x = 100, y = 100, z = 100},
                        seed = 354,
                        octaves = 3,
                        persist = 0.7
@@ -354,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,
        })
@@ -368,7 +748,7 @@ function default.register_mgv6_decorations()
                noise_params = {
                        offset = -0.012,
                        scale = 0.024,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x = 100, y = 100, z = 100},
                        seed = 230,
                        octaves = 3,
                        persist = 0.6
@@ -380,7 +760,7 @@ function default.register_mgv6_decorations()
                height_max = 4,
        })
 
-       -- Grasses
+       -- Long grasses
 
        for length = 1, 5 do
                minetest.register_decoration({
@@ -390,7 +770,7 @@ function default.register_mgv6_decorations()
                        noise_params = {
                                offset = 0,
                                scale = 0.007,
-                               spread = {x=100, y=100, z=100},
+                               spread = {x = 100, y = 100, z = 100},
                                seed = 329,
                                octaves = 3,
                                persist = 0.6
@@ -410,7 +790,7 @@ function default.register_mgv6_decorations()
                noise_params = {
                        offset = 0,
                        scale = 0.035,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x = 100, y = 100, z = 100},
                        seed = 329,
                        octaves = 3,
                        persist = 0.6
@@ -421,246 +801,257 @@ function default.register_mgv6_decorations()
        })
 end
 
+-- All mapgens except mgv6 and singlenode
 
---
--- Register decorations
---
-
-
-function default.register_decorations()
-
-       -- Flowers
-
+local function register_grass_decoration(offset, scale, length)
        minetest.register_decoration({
                deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
+               place_on = {"default:dirt_with_grass", "default:sand"},
                sidelen = 16,
                noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
+                       offset = offset,
+                       scale = scale,
                        spread = {x=200, y=200, z=200},
-                       seed = 436,
+                       seed = 329,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {
+                       "stone_grassland", "stone_grassland_ocean",
+                       "sandstone_grassland", "sandstone_grassland_ocean",
+                       "deciduous_forest", "deciduous_forest_ocean",
+                       "coniferous_forest", "coniferous_forest_ocean",
+               },
+               y_min = 5,
                y_max = 31000,
-               decoration = "flowers:rose",
+               decoration = "default:grass_"..length,
        })
-       
+end
+
+local function register_dry_grass_decoration(offset, scale, length)
        minetest.register_decoration({
                deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
+               place_on = {"default:dirt_with_dry_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
+                       offset = offset,
+                       scale = scale,
                        spread = {x=200, y=200, z=200},
-                       seed = 19822,
+                       seed = 329,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"default:grassland"},
-               y_min = 33,
+               biomes = {"savanna"},
+               y_min = 5,
                y_max = 31000,
-               decoration = "flowers:tulip",
+               decoration = "default:dry_grass_"..length,
        })
-       
+end
+
+function default.register_decorations()
+       minetest.clear_registered_decorations()
+
+       -- Apple tree
+
        minetest.register_decoration({
-               deco_type = "simple",
+               deco_type = "schematic",
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
-                       spread = {x=200, y=200, z=200},
-                       seed = 1220999,
+                       offset = 0.04,
+                       scale = 0.02,
+                       spread = {x=250, y=250, z=250},
+                       seed = 2,
                        octaves = 3,
-                       persist = 0.6
+                       persist = 0.66
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"deciduous_forest"},
+               y_min = 6,
                y_max = 31000,
-               decoration = "flowers:dandelion_yellow",
+               schematic = minetest.get_modpath("default").."/schematics/apple_tree.mts",
+               flags = "place_center_x, place_center_z",
        })
-       
+
+       -- Jungle tree
+
        minetest.register_decoration({
-               deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
-               sidelen = 16,
-               noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
-                       spread = {x=200, y=200, z=200},
-                       seed = 36662,
-                       octaves = 3,
-                       persist = 0.6
-               },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               deco_type = "schematic",
+               place_on = {"default:dirt_with_grass", "default:dirt"},
+               sidelen = 80,
+               fill_ratio = 0.09,
+               biomes = {"rainforest", "rainforest_swamp"},
+               y_min = 0,
                y_max = 31000,
-               decoration = "flowers:geranium",
+               schematic = minetest.get_modpath("default").."/schematics/jungle_tree.mts",
+               flags = "place_center_x, place_center_z",
        })
-       
+
+       -- Taiga and temperate forest pine tree
+
        minetest.register_decoration({
-               deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
+               deco_type = "schematic",
+               place_on = {"default:snowblock", "default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
-                       spread = {x=200, y=200, z=200},
-                       seed = 1133,
+                       offset = 0.04,
+                       scale = 0.02,
+                       spread = {x=250, y=250, z=250},
+                       seed = 2,
                        octaves = 3,
-                       persist = 0.6
+                       persist = 0.66
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"taiga", "coniferous_forest"},
+               y_min = 2,
                y_max = 31000,
-               decoration = "flowers:viola",
+               schematic = minetest.get_modpath("default").."/schematics/pine_tree.mts",
+               flags = "place_center_x, place_center_z",
        })
-       
+
+       -- Acacia tree
+
        minetest.register_decoration({
-               deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
-               sidelen = 16,
+               deco_type = "schematic",
+               place_on = {"default:dirt_with_dry_grass"},
+               sidelen = 80,
                noise_params = {
-                       offset = -0.02,
-                       scale = 0.03,
-                       spread = {x=200, y=200, z=200},
-                       seed = 73133,
+                       offset = 0,
+                       scale = 0.003,
+                       spread = {x=250, y=250, z=250},
+                       seed = 2,
                        octaves = 3,
-                       persist = 0.6
+                       persist = 0.66
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"savanna"},
+               y_min = 6,
                y_max = 31000,
-               decoration = "flowers:dandelion_white",
+               schematic = minetest.get_modpath("default").."/schematics/acacia_tree.mts",
+               flags = "place_center_x, place_center_z",
+               rotation = "random",
        })
 
-       -- Grasses
+       -- Large cactus
 
        minetest.register_decoration({
-               deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
-               sidelen = 16,
+               deco_type = "schematic",
+               place_on = {"default:desert_sand"},
+               sidelen = 80,
                noise_params = {
-                       offset = 0.04,
-                       scale = 0.04,
+                       offset = -0.0005,
+                       scale = 0.0015,
                        spread = {x=200, y=200, z=200},
-                       seed = 66440,
+                       seed = 230,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"desert"},
+               y_min = 2,
                y_max = 31000,
-               decoration = "default:grass_1",
+               schematic = minetest.get_modpath("default").."/schematics/large_cactus.mts",
+               flags = "place_center_x",
+               rotation = "random",
        })
-       
+
+       -- Cactus
+
        minetest.register_decoration({
                deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
-               sidelen = 16,
+               place_on = {"default:desert_sand"},
+               sidelen = 80,
                noise_params = {
-                       offset = 0.02,
-                       scale = 0.06,
+                       offset = -0.0005,
+                       scale = 0.0015,
                        spread = {x=200, y=200, z=200},
-                       seed = 66440,
+                       seed = 230,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"desert"},
+               y_min = 2,
                y_max = 31000,
-               decoration = "default:grass_2",
+               decoration = "default:cactus",
+               height = 2,
+               height_max = 5,
        })
-       
+
+       -- Papyrus
+
        minetest.register_decoration({
-               deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
+               deco_type = "schematic",
+               place_on = {"default:sand"},
                sidelen = 16,
                noise_params = {
-                       offset = 0,
-                       scale = 0.08,
+                       offset = -0.3,
+                       scale = 0.7,
                        spread = {x=200, y=200, z=200},
-                       seed = 66440,
+                       seed = 354,
                        octaves = 3,
-                       persist = 0.6
+                       persist = 0.7
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
-               y_max = 31000,
-               decoration = "default:grass_3",
+               biomes = {"savanna_ocean", "desert_ocean"},
+               y_min = 0,
+               y_max = 0,
+               schematic = minetest.get_modpath("default").."/schematics/papyrus.mts",
        })
-       
+
+       -- Grasses
+
+       register_grass_decoration(-0.03,  0.09,  5)
+       register_grass_decoration(-0.015, 0.075, 4)
+       register_grass_decoration(0,      0.06,  3)
+       register_grass_decoration(0.015,  0.045, 2)
+       register_grass_decoration(0.03,   0.03,  1)
+
+       -- Dry grasses
+
+       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
+
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
-               sidelen = 16,
-               noise_params = {
-                       offset = -0.02,
-                       scale = 0.10,
-                       spread = {x=200, y=200, z=200},
-                       seed = 66440,
-                       octaves = 3,
-                       persist = 0.6
-               },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               sidelen = 80,
+               fill_ratio = 0.1,
+               biomes = {"rainforest"},
+               y_min = 1,
                y_max = 31000,
-               decoration = "default:grass_4",
+               decoration = "default:junglegrass",
        })
-       
+
+       -- Dry shrub
+
        minetest.register_decoration({
                deco_type = "simple",
-               place_on = {"default:dirt_with_grass"},
+               place_on = {"default:desert_sand", "default:dirt_with_snow"},
                sidelen = 16,
                noise_params = {
-                       offset = -0.04,
-                       scale = 0.12,
+                       offset = 0,
+                       scale = 0.02,
                        spread = {x=200, y=200, z=200},
-                       seed = 66440,
+                       seed = 329,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"default:grassland"},
-               y_min = -31000,
+               biomes = {"desert", "tundra"},
+               y_min = 2,
                y_max = 31000,
-               decoration = "default:grass_5",
+               decoration = "default:dry_shrub",
        })
 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
-
-local mg_params = minetest.get_mapgen_params()
-if mg_params.mgname == "v6" then
-       default.register_ores()
-       default.register_mgv6_decorations()
-elseif mg_params.mgname ~= "singlenode" then
-       default.register_ores()
-       default.register_biomes()
-       default.register_decorations()
-end
-
-
---
--- Generate nyan cats in all mapgens
+-- Generate nyan cats
 --
 
+-- All mapgens except singlenode
 
--- facedir: 0/1/2/3 (head node facedir value)
--- length: length of rainbow tail
 function default.make_nyancat(pos, facedir, length)
-       local tailvec = {x=0, y=0, z=0}
+       local tailvec = {x = 0, y = 0, z = 0}
        if facedir == 0 then
                tailvec.z = 1
        elseif facedir == 1 then
@@ -670,20 +1061,18 @@ function default.make_nyancat(pos, facedir, length)
        elseif facedir == 3 then
                tailvec.x = -1
        else
-               --print("default.make_nyancat(): Invalid facedir: "+dump(facedir))
                facedir = 0
                tailvec.z = 1
        end
-       local p = {x=pos.x, y=pos.y, z=pos.z}
-       minetest.set_node(p, {name="default:nyancat", param2=facedir})
-       for i=1,length do
+       local p = {x = pos.x, y = pos.y, z = pos.z}
+       minetest.set_node(p, {name = "default:nyancat", param2 = facedir})
+       for i = 1, length do
                p.x = p.x + tailvec.x
                p.z = p.z + tailvec.z
-               minetest.set_node(p, {name="default:nyancat_rainbow", param2=facedir})
+               minetest.set_node(p, {name = "default:nyancat_rainbow", param2 = facedir})
        end
 end
 
-
 function default.generate_nyancats(minp, maxp, seed)
        local height_min = -31000
        local height_max = -32
@@ -692,69 +1081,36 @@ function default.generate_nyancats(minp, maxp, seed)
        end
        local y_min = math.max(minp.y, height_min)
        local y_max = math.min(maxp.y, height_max)
-       local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
+       local volume = (maxp.x - minp.x + 1) * (y_max - y_min + 1) * (maxp.z - minp.z + 1)
        local pr = PseudoRandom(seed + 9324342)
-       local max_num_nyancats = math.floor(volume / (16*16*16))
-       for i=1,max_num_nyancats do
+       local max_num_nyancats = math.floor(volume / (16 * 16 * 16))
+       for i = 1, max_num_nyancats do
                if pr:next(0, 1000) == 0 then
                        local x0 = pr:next(minp.x, maxp.x)
                        local y0 = pr:next(minp.y, maxp.y)
                        local z0 = pr:next(minp.z, maxp.z)
-                       local p0 = {x=x0, y=y0, z=z0}
-                       default.make_nyancat(p0, pr:next(0,3), pr:next(3,15))
+                       local p0 = {x = x0, y = y0, z = z0}
+                       default.make_nyancat(p0, pr:next(0, 3), pr:next(3, 15))
                end
        end
 end
 
 
-minetest.register_on_generated(default.generate_nyancats)
-
-
 --
--- Deprecated ore generation code
+-- 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
 
-function default.generate_ore(name, wherein, minp, maxp, seed,
-               chunks_per_volume, chunk_size, ore_per_chunk, height_min, height_max)
-       minetest.log('action', "WARNING: default.generate_ore is deprecated")
-
-       if maxp.y < height_min or minp.y > height_max then
-               return
-       end
-       local y_min = math.max(minp.y, height_min)
-       local y_max = math.min(maxp.y, height_max)
-       if chunk_size >= y_max - y_min + 1 then
-               return
-       end
-       local volume = (maxp.x-minp.x+1)*(y_max-y_min+1)*(maxp.z-minp.z+1)
-       local pr = PseudoRandom(seed)
-       local num_chunks = math.floor(chunks_per_volume * volume)
-       local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
-       --print("generate_ore num_chunks: "..dump(num_chunks))
-       for i=1,num_chunks do
-               local y0 = pr:next(y_min, y_max-chunk_size+1)
-               if y0 >= height_min and y0 <= height_max then
-                       local x0 = pr:next(minp.x, maxp.x-chunk_size+1)
-                       local z0 = pr:next(minp.z, maxp.z-chunk_size+1)
-                       local p0 = {x=x0, y=y0, z=z0}
-                       for x1=0,chunk_size-1 do
-                       for y1=0,chunk_size-1 do
-                       for z1=0,chunk_size-1 do
-                               if pr:next(1,inverse_chance) == 1 then
-                                       local x2 = x0+x1
-                                       local y2 = y0+y1
-                                       local z2 = z0+z1
-                                       local p2 = {x=x2, y=y2, z=z2}
-                                       if minetest.get_node(p2).name == wherein then
-                                               minetest.set_node(p2, {name=name})
-                                       end
-                               end
-                       end
-                       end
-                       end
-               end
-       end
-       --print("generate_ore done")
+local mg_params = minetest.get_mapgen_params()
+if mg_params.mgname == "v6" then
+       default.register_ores()
+       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_decorations()
+       minetest.register_on_generated(default.generate_nyancats)
 end
-