Give 24 rails per craft instead of 15

[oweals/minetest_game.git] / mods / default / mapgen.lua

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index 9c177fd5dd3a44b42d9196f760ae7271c282977e..3dc6f611e893c4c5b09d506953d816dea87409e6 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -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")
 
 
 --
@@ -131,7 +139,6 @@ function default.register_ores()
                clust_size     = 6,
                y_min          = -31000,
                y_max          = 0,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -165,7 +172,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -177,7 +183,6 @@ function default.register_ores()
                clust_size     = 6,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -189,7 +194,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -255,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -201,7 +205,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -213,7 +216,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -31000,
                y_max          = -1024,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -225,7 +227,6 @@ function default.register_ores()
                clust_size     = 2,
                y_min          = -255,
                y_max          = -64,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -237,7 +238,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -249,7 +249,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -255,
                y_max          = -128,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -261,7 +260,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -256,
-               flags          = "absheight",
        })
 
        minetest.register_ore({
@@ -284,7 +282,6 @@ function default.register_ores()
                clust_size     = 3,
                y_min          = -31000,
                y_max          = -64,
-               flags          = "absheight",
        })
 end
 
@@ -360,6 +357,7 @@ function default.register_mgv6_decorations()
                height = 2,
                height_max = 4,
                spawn_by = "default:water_source",
+               num_spawn_by = 1,
        })
 
        -- Cacti
@@ -408,7 +406,7 @@ 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,
@@ -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()