Default/mapgen: Fix missing num_spawn_by = 1 line for papyrus
[oweals/minetest_game.git] / mods / default / mapgen.lua
index 72179afafaab360f5ec6f67d6521c43bd68e9d2c..53e7e4cc837e392fa25c8d5fae184c7567c6e390 100644 (file)
--- mods/default/mapgen.lua
-
 --
 -- 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")
+minetest.register_alias("mapgen_sand", "default:sand")
+minetest.register_alias("mapgen_water_source", "default:water_source")
+minetest.register_alias("mapgen_lava_source", "default:lava_source")
+minetest.register_alias("mapgen_gravel", "default:gravel")
+minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
+minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
+minetest.register_alias("mapgen_dirt_with_snow", "default:dirt_with_snow")
+minetest.register_alias("mapgen_snow", "default:snow")
+minetest.register_alias("mapgen_snowblock", "default:snowblock")
+minetest.register_alias("mapgen_ice", "default:ice")
+
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
+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_apple", "default:apple")
-minetest.register_alias("mapgen_water_source", "default:water_source")
-minetest.register_alias("mapgen_dirt", "default:dirt")
-minetest.register_alias("mapgen_sand", "default:sand")
-minetest.register_alias("mapgen_gravel", "default:gravel")
-minetest.register_alias("mapgen_clay", "default:clay")
-minetest.register_alias("mapgen_lava_source", "default:lava_source")
-minetest.register_alias("mapgen_cobble", "default:cobble")
-minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
-minetest.register_alias("mapgen_dirt_with_grass", "default:dirt_with_grass")
 minetest.register_alias("mapgen_junglegrass", "default:junglegrass")
-minetest.register_alias("mapgen_stone_with_coal", "default:stone_with_coal")
-minetest.register_alias("mapgen_stone_with_iron", "default:stone_with_iron")
-minetest.register_alias("mapgen_mese", "default:mese")
-minetest.register_alias("mapgen_desert_sand", "default:desert_sand")
-minetest.register_alias("mapgen_desert_stone", "default:desert_stone")
+minetest.register_alias("mapgen_pinetree", "default:pinetree")
+minetest.register_alias("mapgen_pine_needles", "default:pine_needles")
+
+minetest.register_alias("mapgen_cobble", "default:cobble")
 minetest.register_alias("mapgen_stair_cobble", "stairs:stair_cobble")
+minetest.register_alias("mapgen_mossycobble", "default:mossycobble")
+
 
 --
--- Ore generation
+-- Register ores
 --
 
+
+-- Blob ore first to avoid other ores inside blobs
+
 function default.register_ores()
+       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,
+                       scale=0.2,
+                       spread={x=5, y=5, z=5},
+                       seed=-316,
+                       octaves=1,
+                       persist=0.5
+               },
+       })
+
+       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,
+                       scale=0.2,
+                       spread={x=5, y=5, z=5},
+                       seed=2316,
+                       octaves=1,
+                       persist=0.5
+               },
+       })
+
+       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,
+                       scale=0.2,
+                       spread={x=5, y=5, z=5},
+                       seed=17676,
+                       octaves=1,
+                       persist=0.5
+               },
+       })
+
+       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,
+                       scale=0.2,
+                       spread={x=5, y=5, z=5},
+                       seed=766,
+                       octaves=1,
+                       persist=0.5
+               },
+       })
+
        minetest.register_ore({
                ore_type       = "scatter",
                ore            = "default:stone_with_coal",
@@ -52,7 +135,6 @@ function default.register_ores()
                clust_size     = 6,
                y_min          = -31000,
                y_max          = 0,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -86,7 +168,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -98,7 +179,6 @@ function default.register_ores()
                clust_size     = 6,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -110,7 +190,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -255,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -122,7 +201,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -134,7 +212,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -31000,
                y_max          = -1024,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -146,7 +223,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -255,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -158,7 +234,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -170,7 +245,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -255,
                y_max          = -128,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -182,7 +256,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -205,302 +278,153 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
-       })
-
-       minetest.register_ore({ 
-               ore_type         = "blob",
-               ore              = "default:clay",
-               wherein          = {"default:sand"},
-               clust_scarcity   = 24*24*24,
-               clust_size       = 7,
-               y_min            = -10,
-               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
-               },
        })
 end
 
 
-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")
+--
+-- Register biomes
+--
 
-       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")
+
+function default.register_biomes()
+       minetest.clear_registered_biomes()
+
+       minetest.register_biome({
+               name = "default:grassland",
+               --node_dust = "",
+               node_top = "default:dirt_with_grass",
+               depth_top = 1,
+               node_filler = "default:dirt",
+               depth_filler = 1,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               y_min = 5,
+               y_max = 31000,
+               heat_point = 50,
+               humidity_point = 50,
+       })
+
+       minetest.register_biome({
+               name = "default: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 = -31000,
+               y_max = 4,
+               heat_point = 50,
+               humidity_point = 50,
+       })
 end
 
+
 --
--- Mgv6 papyrus, cactus, long grasses
+-- Register mgv6 decorations
 --
 
-function default.mgv6_ongen(minp, maxp, seed)
-
-       function default.make_papyrus(pos, size)
-               for y=0,size-1 do
-                       local p = {x=pos.x, y=pos.y+y, z=pos.z}
-                       local nn = minetest.get_node(p).name
-                       if minetest.registered_nodes[nn] and
-                               minetest.registered_nodes[nn].buildable_to then
-                               minetest.set_node(p, {name="default:papyrus"})
-                       else
-                               return
-                       end
-               end
-       end
 
-       function default.make_cactus(pos, size)
-               for y=0,size-1 do
-                       local p = {x=pos.x, y=pos.y+y, z=pos.z}
-                       local nn = minetest.get_node(p).name
-                       if minetest.registered_nodes[nn] and
-                               minetest.registered_nodes[nn].buildable_to then
-                               minetest.set_node(p, {name="default:cactus"})
-                       else
-                               return
-                       end
-               end
-       end
+function default.register_mgv6_decorations()
 
-       if maxp.y >= 2 and minp.y <= 0 then
-               -- Generate papyrus
-               local perlin1 = minetest.get_perlin(354, 3, 0.7, 100)
-               -- Assume X and Z lengths are equal
-               local divlen = 8
-               local divs = (maxp.x-minp.x)/divlen+1;
-               for divx=0,divs-1 do
-               for divz=0,divs-1 do
-                       local x0 = minp.x + math.floor((divx+0)*divlen)
-                       local z0 = minp.z + math.floor((divz+0)*divlen)
-                       local x1 = minp.x + math.floor((divx+1)*divlen)
-                       local z1 = minp.z + math.floor((divz+1)*divlen)
-                       -- Determine papyrus amount from perlin noise
-                       local papyrus_amount = math.floor(perlin1:get2d({x=x0, y=z0}) * 45 - 20)
-                       -- Find random positions for papyrus based on this random
-                       local pr = PseudoRandom(seed+1)
-                       for i=0,papyrus_amount do
-                               local x = pr:next(x0, x1)
-                               local z = pr:next(z0, z1)
-                               if minetest.get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and
-                                               minetest.find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then
-                                       default.make_papyrus({x=x,y=2,z=z}, pr:next(2, 4))
-                               end
-                       end
-               end
-               end
-               -- Generate cactuses
-               local perlin1 = minetest.get_perlin(230, 3, 0.6, 100)
-               -- Assume X and Z lengths are equal
-               local divlen = 16
-               local divs = (maxp.x-minp.x)/divlen+1;
-               for divx=0,divs-1 do
-               for divz=0,divs-1 do
-                       local x0 = minp.x + math.floor((divx+0)*divlen)
-                       local z0 = minp.z + math.floor((divz+0)*divlen)
-                       local x1 = minp.x + math.floor((divx+1)*divlen)
-                       local z1 = minp.z + math.floor((divz+1)*divlen)
-                       -- Determine cactus amount from perlin noise
-                       local cactus_amount = math.floor(perlin1:get2d({x=x0, y=z0}) * 6 - 3)
-                       -- Find random positions for cactus based on this random
-                       local pr = PseudoRandom(seed+1)
-                       for i=0,cactus_amount do
-                               local x = pr:next(x0, x1)
-                               local z = pr:next(z0, z1)
-                               -- Find ground level (0...15)
-                               local ground_y = nil
-                               for y=30,0,-1 do
-                                       if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
-                                               ground_y = y
-                                               break
-                                       end
-                               end
-                               -- If desert sand, make cactus
-                               if ground_y and minetest.get_node({x=x,y=ground_y,z=z}).name == "default:desert_sand" then
-                                       default.make_cactus({x=x,y=ground_y+1,z=z}, pr:next(3, 4))
-                               end
-                       end
-               end
-               end
-               -- Generate grass
-               local perlin1 = minetest.get_perlin(329, 3, 0.6, 100)
-               -- Assume X and Z lengths are equal
-               local divlen = 16
-               local divs = (maxp.x-minp.x)/divlen+1;
-               for divx=0,divs-1 do
-               for divz=0,divs-1 do
-                       local x0 = minp.x + math.floor((divx+0)*divlen)
-                       local z0 = minp.z + math.floor((divz+0)*divlen)
-                       local x1 = minp.x + math.floor((divx+1)*divlen)
-                       local z1 = minp.z + math.floor((divz+1)*divlen)
-                       -- Determine grass amount from perlin noise
-                       local grass_amount = math.floor(perlin1:get2d({x=x0, y=z0}) ^ 3 * 9)
-                       -- Find random positions for grass based on this random
-                       local pr = PseudoRandom(seed+1)
-                       for i=0,grass_amount do
-                               local x = pr:next(x0, x1)
-                               local z = pr:next(z0, z1)
-                               -- Find ground level (0...15)
-                               local ground_y = nil
-                               for y=30,0,-1 do
-                                       if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
-                                               ground_y = y
-                                               break
-                                       end
-                               end
+       -- Papyrus
 
-                               if ground_y then
-                                       local p = {x=x,y=ground_y+1,z=z}
-                                       local nn = minetest.get_node(p).name
-                                       -- Check if the node can be replaced
-                                       if minetest.registered_nodes[nn] and
-                                               minetest.registered_nodes[nn].buildable_to then
-                                               nn = minetest.get_node({x=x,y=ground_y,z=z}).name
-                                               -- If desert sand, add dry shrub
-                                               if nn == "default:desert_sand" then
-                                                       minetest.set_node(p,{name="default:dry_shrub"})
-
-                                               -- If dirt with grass, add grass
-                                               elseif nn == "default:dirt_with_grass" then
-                                                       minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
-                                               end
-                                       end
-                               end
+       minetest.register_decoration({
+               deco_type = "simple",
+               place_on = {"default:dirt_with_grass"},
+               sidelen = 8,
+               noise_params = {
+                       offset = -0.3,
+                       scale = 0.7,
+                       spread = {x=100, y=100, z=100},
+                       seed = 354,
+                       octaves = 3,
+                       persist = 0.7
+               },
+               y_min = 1,
+               y_max = 1,
+               decoration = "default:papyrus",
+               height = 2,
+               height_max = 4,
+               spawn_by = "default:water_source",
+               num_spawn_by = 1,
+       })
 
-                       end
-               end
-               end
-       end
+       -- Cacti
 
-end
+       minetest.register_decoration({
+               deco_type = "simple",
+               place_on = {"default:desert_sand"},
+               sidelen = 16,
+               noise_params = {
+                       offset = -0.012,
+                       scale = 0.024,
+                       spread = {x=100, y=100, z=100},
+                       seed = 230,
+                       octaves = 3,
+                       persist = 0.6
+               },
+               y_min = 1,
+               y_max = 30,
+               decoration = "default:cactus",
+               height = 3,
+               height_max = 4,
+       })
 
---
--- Generate nyan cats in all mapgens
---
+       -- Grasses
 
--- 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}
-       if facedir == 0 then
-               tailvec.z = 1
-       elseif facedir == 1 then
-               tailvec.x = 1
-       elseif facedir == 2 then
-               tailvec.z = -1
-       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
-               p.x = p.x + tailvec.x
-               p.z = p.z + tailvec.z
-               minetest.set_node(p, {name="default:nyancat_rainbow", param2=facedir})
+       for length = 1, 5 do
+               minetest.register_decoration({
+                       deco_type = "simple",
+                       place_on = {"default:dirt_with_grass"},
+                       sidelen = 16,
+                       noise_params = {
+                               offset = 0,
+                               scale = 0.007,
+                               spread = {x=100, y=100, z=100},
+                               seed = 329,
+                               octaves = 3,
+                               persist = 0.6
+                       },
+                       y_min = 1,
+                       y_max = 30,
+                       decoration = "default:grass_"..length,
+               })
        end
-end
 
+       -- Dry shrubs
 
-function default.generate_nyancats(minp, maxp, seed)
-       local height_min = -31000
-       local height_max = -32
-       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)
-       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
-               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))
-               end
-       end
+       minetest.register_decoration({
+               deco_type = "simple",
+               place_on = {"default:desert_sand"},
+               sidelen = 16,
+               noise_params = {
+                       offset = 0,
+                       scale = 0.035,
+                       spread = {x=100, y=100, z=100},
+                       seed = 329,
+                       octaves = 3,
+                       persist = 0.6
+               },
+               y_min = 1,
+               y_max = 30,
+               decoration = "default:dry_shrub",
+       })
 end
 
 
-minetest.register_on_generated(default.generate_nyancats)
-
 --
--- Register biomes
+-- Register decorations
 --
 
-function default.register_biomes()
-       minetest.clear_registered_biomes()
-
-       minetest.register_biome({
-               name = "grassland",
-               node_top = "default:dirt_with_grass",
-               node_shore_top = "default:sand",
-               depth_top = 1,
-               node_filler = "default:dirt",
-               node_shore_filler = "default:sand",
-               depth_filler = 2,
-               height_shore = 3,
-               node_underwater = "default:sand",
-               --node_stone = "",
-               --node_water_top = "",
-               --depth_water_top = ,
-               --node_water = "",
-               --node_dust = "",
-               y_min = -31000,
-               y_max = 31000,
-               heat_point = 50,
-               humidity_point = 50,
-       })
 
-       --
-       -- Register decorations
-       --
+function default.register_decorations()
 
        -- Flowers
 
@@ -511,17 +435,17 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 436,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "flowers:rose",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -529,17 +453,17 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 19822,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
-               y_min = -31000,
+               biomes = {"default:grassland"},
+               y_min = 33,
                y_max = 31000,
                decoration = "flowers:tulip",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -547,17 +471,17 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 1220999,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "flowers:dandelion_yellow",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -565,17 +489,17 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 36662,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "flowers:geranium",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -583,17 +507,17 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 1133,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "flowers:viola",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -601,12 +525,12 @@ function default.register_biomes()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 73133,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "flowers:dandelion_white",
@@ -620,36 +544,36 @@ function default.register_biomes()
                sidelen = 16,
                noise_params = {
                        offset = 0.04,
-                       scale = 0.08,
-                       spread = {x=100, y=100, z=100},
+                       scale = 0.04,
+                       spread = {x=200, y=200, z=200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "default:grass_1",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
                        offset = 0.02,
-                       scale = 0.08,
-                       spread = {x=100, y=100, z=100},
+                       scale = 0.06,
+                       spread = {x=200, y=200, z=200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "default:grass_2",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
@@ -657,132 +581,181 @@ function default.register_biomes()
                noise_params = {
                        offset = 0,
                        scale = 0.08,
-                       spread = {x=100, y=100, z=100},
+                       spread = {x=200, y=200, z=200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "default:grass_3",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
                        offset = -0.02,
-                       scale = 0.08,
-                       spread = {x=100, y=100, z=100},
+                       scale = 0.10,
+                       spread = {x=200, y=200, z=200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "default:grass_4",
        })
-
+       
        minetest.register_decoration({
                deco_type = "simple",
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
                        offset = -0.04,
-                       scale = 0.08,
-                       spread = {x=100, y=100, z=100},
+                       scale = 0.12,
+                       spread = {x=200, y=200, z=200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
                },
-               biomes = {"grassland"},
+               biomes = {"default:grassland"},
                y_min = -31000,
                y_max = 31000,
                decoration = "default:grass_5",
        })
 end
 
+
 --
--- Register blob ore
+-- Detect mapgen to select functions
 --
 
-function default.register_blobs()
-       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,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=2316,
-                       octaves=1,
-                       persist=0.5
-               },
-       })
-
-       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,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=17676,
-                       octaves=1,
-                       persist=0.5
-               },
-       })
-
-       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,
-                       scale=0.2,
-                       spread={x=5, y=5, z=5},
-                       seed=766,
-                       octaves=1,
-                       persist=0.5
-               },
-       })
-end
 
---
--- Detect mapgen and select suitable biome code
---
+-- 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 == "v5" then
-       default.register_biomes()
-       default.register_blobs()
        default.register_ores()
+       default.register_biomes()
+       default.register_decorations()
 elseif mg_params.mgname == "v6" then
-       minetest.register_on_generated(default.mgv6_ongen)
        default.register_ores()
+       default.register_mgv6_decorations()
 elseif mg_params.mgname == "v7" then
-       default.register_biomes()
-       default.register_blobs()
        default.register_ores()
+       default.register_biomes()
+       default.register_decorations()
+end
+
+
+--
+-- Generate nyan cats in all mapgens
+--
+
+
+-- 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}
+       if facedir == 0 then
+               tailvec.z = 1
+       elseif facedir == 1 then
+               tailvec.x = 1
+       elseif facedir == 2 then
+               tailvec.z = -1
+       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
+               p.x = p.x + tailvec.x
+               p.z = p.z + tailvec.z
+               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
+       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)
+       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
+               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))
+               end
+       end
+end
+
+
+minetest.register_on_generated(default.generate_nyancats)
+
+
+--
+-- Deprecated ore generation code
+--
+
+
+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")
 end