Fix not_in_creative_inventory
[oweals/minetest_game.git] / mods / default / mapgen.lua
index 9c177fd5dd3a44b42d9196f760ae7271c282977e..4865341839625ef22893ebe1b9d438f2c32f0ac2 100644 (file)
@@ -4,27 +4,35 @@
 
 
 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_river_water_source", "default:river_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_snowblock", "default:snowblock")
+minetest.register_alias("mapgen_snow", "default:snow")
+minetest.register_alias("mapgen_ice", "default:ice")
+minetest.register_alias("mapgen_sandstone", "default:sandstone")
+
 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")
+minetest.register_alias("mapgen_sandstonebrick", "default:sandstonebrick")
+minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_sandstonebrick")
 
 
 --
@@ -39,18 +47,18 @@ function default.register_ores()
                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
                },
        })
 
@@ -58,18 +66,18 @@ function default.register_ores()
                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
                },
        })
 
@@ -77,18 +85,18 @@ function default.register_ores()
                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
                },
        })
 
@@ -96,18 +104,18 @@ function default.register_ores()
                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
                },
        })
 
@@ -115,7 +123,7 @@ function default.register_ores()
                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,
@@ -126,19 +134,18 @@ 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,
-               flags          = "absheight",
        })
 
        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,
@@ -149,7 +156,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,
@@ -160,115 +167,106 @@ 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,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
                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,
-               flags          = "absheight",
        })
 
        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,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
                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,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
                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,
-               flags          = "absheight",
        })
 
        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,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
                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,
-               flags          = "absheight",
        })
 
        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,
                y_max          = -128,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
                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,
-               flags          = "absheight",
        })
 
        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,
@@ -279,12 +277,11 @@ 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,
                y_max          = -64,
-               flags          = "absheight",
        })
 end
 
@@ -349,7 +346,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
@@ -360,6 +357,7 @@ function default.register_mgv6_decorations()
                height = 2,
                height_max = 4,
                spawn_by = "default:water_source",
+               num_spawn_by = 1,
        })
 
        -- Cacti
@@ -371,7 +369,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
@@ -393,7 +391,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
@@ -408,12 +406,12 @@ function default.register_mgv6_decorations()
 
        minetest.register_decoration({
                deco_type = "simple",
-               place_on = {"default:desert_sand"},
+               place_on = {"default:desert_sand", "default:dirt_with_snow"},
                sidelen = 16,
                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
@@ -441,7 +439,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 436,
                        octaves = 3,
                        persist = 0.6
@@ -459,7 +457,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 19822,
                        octaves = 3,
                        persist = 0.6
@@ -477,7 +475,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 1220999,
                        octaves = 3,
                        persist = 0.6
@@ -495,7 +493,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 36662,
                        octaves = 3,
                        persist = 0.6
@@ -513,7 +511,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 1133,
                        octaves = 3,
                        persist = 0.6
@@ -531,7 +529,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.03,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 73133,
                        octaves = 3,
                        persist = 0.6
@@ -551,7 +549,7 @@ function default.register_decorations()
                noise_params = {
                        offset = 0.04,
                        scale = 0.04,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
@@ -569,7 +567,7 @@ function default.register_decorations()
                noise_params = {
                        offset = 0.02,
                        scale = 0.06,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
@@ -587,7 +585,7 @@ function default.register_decorations()
                noise_params = {
                        offset = 0,
                        scale = 0.08,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
@@ -605,7 +603,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.02,
                        scale = 0.10,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
@@ -623,7 +621,7 @@ function default.register_decorations()
                noise_params = {
                        offset = -0.04,
                        scale = 0.12,
-                       spread = {x=200, y=200, z=200},
+                       spread = {x = 200, y = 200, z = 200},
                        seed = 66440,
                        octaves = 3,
                        persist = 0.6
@@ -645,14 +643,10 @@ end
 -- 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_ores()
-       default.register_biomes()
-       default.register_decorations()
-elseif mg_params.mgname == "v6" then
+if mg_params.mgname == "v6" then
        default.register_ores()
        default.register_mgv6_decorations()
-elseif mg_params.mgname == "v7" then
+elseif mg_params.mgname ~= "singlenode" then
        default.register_ores()
        default.register_biomes()
        default.register_decorations()
@@ -667,7 +661,7 @@ end
 -- 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
@@ -681,12 +675,12 @@ function default.make_nyancat(pos, facedir, length)
                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
 
@@ -699,69 +693,19 @@ 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
---
-
-
-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
-