Tweak some textures, new chest texture
[oweals/minetest_game.git] / mods / default / mapgen.lua
index 8955caeb5244a3122a3d9f1d6428e008ceafcda3..4907cf7b97630cee667c26a2f2d246d9c502196d 100644 (file)
@@ -1,10 +1,9 @@
--- minetest/default/mapgen.lua
+-- mods/default/mapgen.lua
 
 --
 -- Aliases for map generator outputs
 --
 
-minetest.register_alias("mapgen_air", "air")
 minetest.register_alias("mapgen_stone", "default:stone")
 minetest.register_alias("mapgen_tree", "default:tree")
 minetest.register_alias("mapgen_leaves", "default:leaves")
@@ -26,17 +25,273 @@ 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_stair_cobble", "stairs:stair_cobble")
 
 --
 -- Ore generation
 --
 
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_coal",
+       wherein        = "default:stone",
+       clust_scarcity = 8*8*8,
+       clust_num_ores = 8,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = 64,
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_coal",
+       wherein        = "default:stone",
+       clust_scarcity = 24*24*24,
+       clust_num_ores = 27,
+       clust_size     = 6,
+       height_min     = -31000,
+       height_max     = 0,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_iron",
+       wherein        = "default:stone",
+       clust_scarcity = 12*12*12,
+       clust_num_ores = 3,
+       clust_size     = 2,
+       height_min     = -15,
+       height_max     = 2,
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_iron",
+       wherein        = "default:stone",
+       clust_scarcity = 9*9*9,
+       clust_num_ores = 5,
+       clust_size     = 3,
+       height_min     = -63,
+       height_max     = -16,
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_iron",
+       wherein        = "default:stone",
+       clust_scarcity = 7*7*7,
+       clust_num_ores = 5,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = -64,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_iron",
+       wherein        = "default:stone",
+       clust_scarcity = 24*24*24,
+       clust_num_ores = 27,
+       clust_size     = 6,
+       height_min     = -31000,
+       height_max     = -64,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_mese",
+       wherein        = "default:stone",
+       clust_scarcity = 18*18*18,
+       clust_num_ores = 3,
+       clust_size     = 2,
+       height_min     = -255,
+       height_max     = -64,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_mese",
+       wherein        = "default:stone",
+       clust_scarcity = 14*14*14,
+       clust_num_ores = 5,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = -256,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:mese",
+       wherein        = "default:stone",
+       clust_scarcity = 36*36*36,
+       clust_num_ores = 3,
+       clust_size     = 2,
+       height_min     = -31000,
+       height_max     = -1024,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_gold",
+       wherein        = "default:stone",
+       clust_scarcity = 15*15*15,
+       clust_num_ores = 3,
+       clust_size     = 2,
+       height_min     = -255,
+       height_max     = -64,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_gold",
+       wherein        = "default:stone",
+       clust_scarcity = 13*13*13,
+       clust_num_ores = 5,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = -256,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_diamond",
+       wherein        = "default:stone",
+       clust_scarcity = 17*17*17,
+       clust_num_ores = 4,
+       clust_size     = 3,
+       height_min     = -255,
+       height_max     = -128,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_diamond",
+       wherein        = "default:stone",
+       clust_scarcity = 15*15*15,
+       clust_num_ores = 4,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = -256,
+       flags          = "absheight",
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_copper",
+       wherein        = "default:stone",
+       clust_scarcity = 12*12*12,
+       clust_num_ores = 4,
+       clust_size     = 3,
+       height_min     = -63,
+       height_max     = -16,
+})
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:stone_with_copper",
+       wherein        = "default:stone",
+       clust_scarcity = 9*9*9,
+       clust_num_ores = 5,
+       clust_size     = 3,
+       height_min     = -31000,
+       height_max     = -64,
+       flags          = "absheight",
+})
+
+if minetest.setting_get("mg_name") == "indev" then
+       -- Floatlands and high mountains springs
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:water_source",
+               ore_param2     = 128,
+               wherein        = "default:stone",
+               clust_scarcity = 40*40*40,
+               clust_num_ores = 8,
+               clust_size     = 3,
+               height_min     = 100,
+               height_max     = 31000,
+       })
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:lava_source",
+               ore_param2     = 128,
+               wherein        = "default:stone",
+               clust_scarcity = 50*50*50,
+               clust_num_ores = 5,
+               clust_size     = 2,
+               height_min     = 10000,
+               height_max     = 31000,
+       })
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:sand",
+               wherein        = "default:stone",
+               clust_scarcity = 20*20*20,
+               clust_num_ores = 5*5*3,
+               clust_size     = 5,
+               height_min     = 500,
+               height_max     = 31000,
+       })
+
+       -- Underground springs
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:water_source",
+               ore_param2     = 128,
+               wherein        = "default:stone",
+               clust_scarcity = 25*25*25,
+               clust_num_ores = 8,
+               clust_size     = 3,
+               height_min     = -10000,
+               height_max     = -10,
+       })
+
+       minetest.register_ore({
+               ore_type       = "scatter",
+               ore            = "default:lava_source",
+               ore_param2     = 128,
+               wherein        = "default:stone",
+               clust_scarcity = 35*35*35,
+               clust_num_ores = 5,
+               clust_size     = 2,
+               height_min     = -31000,
+               height_max     = -100,
+       })
+end
+
+minetest.register_ore({
+       ore_type       = "scatter",
+       ore            = "default:clay",
+       wherein        = "default:sand",
+       clust_scarcity = 15*15*15,
+       clust_num_ores = 64,
+       clust_size     = 5,
+       height_max     = 0,
+       height_min     = -10,
+})
+
 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)
@@ -56,8 +311,8 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume
                                        local y2 = y0+y1
                                        local z2 = z0+z1
                                        local p2 = {x=x2, y=y2, z=z2}
-                                       if minetest.env:get_node(p2).name == wherein then
-                                               minetest.env:set_node(p2, {name=name})
+                                       if minetest.get_node(p2).name == wherein then
+                                               minetest.set_node(p2, {name=name})
                                        end
                                end
                        end
@@ -71,10 +326,10 @@ end
 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.env:get_node(p).name
+               local nn = minetest.get_node(p).name
                if minetest.registered_nodes[nn] and
                        minetest.registered_nodes[nn].buildable_to then
-                       minetest.env:set_node(p, {name="default:papyrus"})
+                       minetest.set_node(p, {name="default:papyrus"})
                else
                        return
                end
@@ -84,10 +339,10 @@ 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.env:get_node(p).name
+               local nn = minetest.get_node(p).name
                if minetest.registered_nodes[nn] and
                        minetest.registered_nodes[nn].buildable_to then
-                       minetest.env:set_node(p, {name="default:cactus"})
+                       minetest.set_node(p, {name="default:cactus"})
                else
                        return
                end
@@ -107,16 +362,16 @@ function default.make_nyancat(pos, facedir, length)
        elseif facedir == 3 then
                tailvec.x = -1
        else
-               print("default.make_nyancat(): Invalid facedir: "+dump(facedir))
+               --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.env:set_node(p, {name="default:nyancat", param2=facedir})
+       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.env:set_node(p, {name="default:nyancat_rainbow"})
+               minetest.set_node(p, {name="default:nyancat_rainbow", param2=facedir})
        end
 end
 
@@ -143,57 +398,9 @@ function generate_nyancats(seed, minp, maxp)
 end
 
 minetest.register_on_generated(function(minp, maxp, seed)
-       -- Generate regular ores
-       default.generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+0, 1/8/8/8,    3, 8, -31000,  64)
-       default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+1, 1/12/12/12, 2, 3,    -15,   2)
-       default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+2, 1/9/9/9,    3, 5,    -63, -16)
-       default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+3, 1/7/7/7,    3, 5, -31000, -64)
-       
-       default.generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+4, 1/16/16/16, 2, 3,   -127,  -64)
-       default.generate_ore("default:stone_with_mese", "default:stone", minp, maxp, seed+5, 1/9/9/9,    3, 5, -31000, -128)
-       default.generate_ore("default:mese",            "default:stone", minp, maxp, seed+8, 1/16/16/16, 2, 3, -31000,-1024)
-       
-       default.generate_ore("default:stone_with_coal", "default:stone", minp, maxp, seed+7, 1/24/24/24, 6,27, -31000,  0)
-       default.generate_ore("default:stone_with_iron", "default:stone", minp, maxp, seed+6, 1/24/24/24, 6,27, -31000, -64)
-
        if maxp.y >= 2 and minp.y <= 0 then
-               -- Generate clay
-               -- Assume X and Z lengths are equal
-               local divlen = 4
-               local divs = (maxp.x-minp.x)/divlen+1;
-               for divx=0+1,divs-1-1 do
-               for divz=0+1,divs-1-1 do
-                       local cx = minp.x + math.floor((divx+0.5)*divlen)
-                       local cz = minp.z + math.floor((divz+0.5)*divlen)
-                       if minetest.env:get_node({x=cx,y=1,z=cz}).name == "default:water_source" and
-                                       minetest.env:get_node({x=cx,y=0,z=cz}).name == "default:sand" then
-                               local is_shallow = true
-                               local num_water_around = 0
-                               if minetest.env:get_node({x=cx-divlen*2,y=1,z=cz+0}).name == "default:water_source" then
-                                       num_water_around = num_water_around + 1 end
-                               if minetest.env:get_node({x=cx+divlen*2,y=1,z=cz+0}).name == "default:water_source" then
-                                       num_water_around = num_water_around + 1 end
-                               if minetest.env:get_node({x=cx+0,y=1,z=cz-divlen*2}).name == "default:water_source" then
-                                       num_water_around = num_water_around + 1 end
-                               if minetest.env:get_node({x=cx+0,y=1,z=cz+divlen*2}).name == "default:water_source" then
-                                       num_water_around = num_water_around + 1 end
-                               if num_water_around >= 2 then
-                                       is_shallow = false
-                               end     
-                               if is_shallow then
-                                       for x1=-divlen,divlen do
-                                       for z1=-divlen,divlen do
-                                               if minetest.env:get_node({x=cx+x1,y=0,z=cz+z1}).name == "default:sand" then
-                                                       minetest.env:set_node({x=cx+x1,y=0,z=cz+z1}, {name="default:clay"})
-                                               end
-                                       end
-                                       end
-                               end
-                       end
-               end
-               end
                -- Generate papyrus
-               local perlin1 = minetest.env:get_perlin(354, 3, 0.7, 100)
+               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;
@@ -210,15 +417,15 @@ minetest.register_on_generated(function(minp, maxp, seed)
                        for i=0,papyrus_amount do
                                local x = pr:next(x0, x1)
                                local z = pr:next(z0, z1)
-                               if minetest.env:get_node({x=x,y=1,z=z}).name == "default:dirt_with_grass" and
-                                               minetest.env:find_node_near({x=x,y=1,z=z}, 1, "default:water_source") then
+                               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.env:get_perlin(230, 3, 0.6, 100)
+               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;
@@ -238,20 +445,20 @@ minetest.register_on_generated(function(minp, maxp, seed)
                                -- Find ground level (0...15)
                                local ground_y = nil
                                for y=30,0,-1 do
-                                       if minetest.env:get_node({x=x,y=y,z=z}).name ~= "air" then
+                                       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.env:get_node({x=x,y=ground_y,z=z}).name == "default:desert_sand" then
+                               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.env:get_perlin(329, 3, 0.6, 100)
+               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;
@@ -262,7 +469,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
                        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}) * 5 + 0)
+                       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
@@ -271,7 +478,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
                                -- Find ground level (0...15)
                                local ground_y = nil
                                for y=30,0,-1 do
-                                       if minetest.env:get_node({x=x,y=y,z=z}).name ~= "air" then
+                                       if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
                                                ground_y = y
                                                break
                                        end
@@ -279,18 +486,18 @@ minetest.register_on_generated(function(minp, maxp, seed)
                                
                                if ground_y then
                                        local p = {x=x,y=ground_y+1,z=z}
-                                       local nn = minetest.env:get_node(p).name
+                                       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.env:get_node({x=x,y=ground_y,z=z}).name
-                                               -- If desert sand, make dry shrub
+                                               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.env:set_node(p,{name="default:dry_shrub"})
+                                                       minetest.set_node(p,{name="default:dry_shrub"})
                                                        
-                                               -- If grass, make junglegrass
+                                               -- If dirt with grass, add grass
                                                elseif nn == "default:dirt_with_grass" then
-                                                       minetest.env:set_node(p,{name="default:junglegrass"})
+                                                       minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
                                                end
                                        end
                                end