Add white to the crack texture
[oweals/minetest_game.git] / mods / default / mapgen.lua
index f43a060bf90c231ae624b83069085acc4ed34eaa..386ba417010008dcd19091075d03404206cc6447 100644 (file)
@@ -4,7 +4,6 @@
 -- 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,6 +25,7 @@ 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
@@ -207,68 +207,16 @@ minetest.register_ore({
        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")
@@ -300,8 +248,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
@@ -312,119 +260,41 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume
        --print("generate_ore done")
 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
-               if minetest.registered_nodes[nn] and
-                       minetest.registered_nodes[nn].buildable_to then
-                       minetest.env:set_node(p, {name="default:papyrus"})
-               else
-                       return
-               end
-       end
-end
+--
+-- Mgv6 papyrus, cactus, long grasses
+--
 
-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
-               if minetest.registered_nodes[nn] and
-                       minetest.registered_nodes[nn].buildable_to then
-                       minetest.env:set_node(p, {name="default:cactus"})
-               else
-                       return
+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
-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}
-       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.env: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"})
-       end
-end
 
-function generate_nyancats(seed, minp, maxp)
-       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))
+       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
-end
 
-minetest.register_on_generated(function(minp, maxp, seed)
        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;
@@ -441,15 +311,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;
@@ -469,20 +339,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;
@@ -502,36 +372,96 @@ 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 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
+                                               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 dirt with grass, add grass
                                                elseif nn == "default:dirt_with_grass" then
-                                                       minetest.env:set_node(p,{name="default:grass_"..pr:next(1, 5)})
+                                                       minetest.set_node(p,{name="default:grass_"..pr:next(1, 5)})
                                                end
                                        end
                                end
-                               
+
                        end
                end
                end
        end
+end
 
-       -- Generate nyan cats
-       generate_nyancats(seed, minp, maxp)
+--
+-- Detect mapgen and register suitable on-generated function
+--
+
+minetest.register_on_mapgen_init(function(mg_params)
+       if mg_params.mgname == "v6" then
+               minetest.register_on_generated(default.mgv6_ongen)
+       end
 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)