Creative: Fix inventory crash after toggling creative mode in-game

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

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index ee46f73dd7e7136b5954614a92f107d9d3429d10..016d58de59fe67a99944eefd5f932829750a1ebe 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -378,6 +378,24 @@ function default.register_biomes()
                humidity_point = 35,
        })
 
+       minetest.register_biome({
+               name = "tundra_beach",
+               --node_dust = "",
+               node_top = "default:gravel",
+               depth_top = 1,
+               node_filler = "default:gravel",
+               depth_filler = 2,
+               --node_stone = "",
+               --node_water_top = "",
+               --depth_water_top = ,
+               --node_water = "",
+               --node_river_water = "",
+               y_min = -3,
+               y_max = 1,
+               heat_point = 15,
+               humidity_point = 35,
+       })
+
        minetest.register_biome({
                name = "tundra_ocean",
                --node_dust = "",
@@ -391,7 +409,7 @@ function default.register_biomes()
                --node_water = "",
                --node_river_water = "",
                y_min = -112,
-               y_max = 1,
+               y_max = -4,
                heat_point = 15,
                humidity_point = 35,
        })
@@ -973,8 +991,8 @@ function default.register_decorations()
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = 0.04,
-                       scale = 0.02,
+                       offset = 0.036,
+                       scale = 0.022,
                        spread = {x = 250, y = 250, z = 250},
                        seed = 2,
                        octaves = 3,
@@ -992,8 +1010,8 @@ function default.register_decorations()
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = 0.002,
-                       scale = 0.001,
+                       offset = 0.0018,
+                       scale = 0.0011,
                        spread = {x = 250, y = 250, z = 250},
                        seed = 2,
                        octaves = 3,
@@ -1003,17 +1021,17 @@ function default.register_decorations()
                y_min = 1,
                y_max = 31000,
                schematic = {
-                       size = { x = 3, y = 3, z = 1},
+                       size = {x = 3, y = 3, z = 1},
                        data = {
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "default:tree", param2 = 12, prob = 191 },
-                               { name = "default:tree", param2 = 12 },
-                               { name = "default:tree", param2 = 12, prob = 127 },
-                               { name = "air", prob = 0 },
-                               { name = "flowers:mushroom_brown", prob = 63 },
-                               { name = "air", prob = 0 },
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "default:tree", param2 = 12, prob = 191},
+                               {name = "default:tree", param2 = 12},
+                               {name = "default:tree", param2 = 12, prob = 127},
+                               {name = "air", prob = 0},
+                               {name = "flowers:mushroom_brown", prob = 63},
+                               {name = "air", prob = 0},
                        },
                },
                flags = "place_center_x",
@@ -1026,7 +1044,7 @@ function default.register_decorations()
                deco_type = "schematic",
                place_on = {"default:dirt_with_grass", "default:dirt"},
                sidelen = 80,
-               fill_ratio = 0.09,
+               fill_ratio = 0.1,
                biomes = {"rainforest", "rainforest_swamp"},
                y_min = 0,
                y_max = 31000,
@@ -1039,22 +1057,22 @@ function default.register_decorations()
                deco_type = "schematic",
                place_on = {"default:dirt_with_grass", "default:dirt"},
                sidelen = 80,
-               fill_ratio = 0.01,
+               fill_ratio = 0.005,
                biomes = {"rainforest", "rainforest_swamp"},
                y_min = 1,
                y_max = 31000,
                schematic = {
-                       size = { x = 3, y = 3, z = 1},
+                       size = {x = 3, y = 3, z = 1},
                        data = {
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "default:jungletree", param2 = 12, prob = 191 },
-                               { name = "default:jungletree", param2 = 12 },
-                               { name = "default:jungletree", param2 = 12, prob = 127 },
-                               { name = "air", prob = 0 },
-                               { name = "flowers:mushroom_brown", prob = 127 },
-                               { name = "air", prob = 0 },
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "default:jungletree", param2 = 12, prob = 191},
+                               {name = "default:jungletree", param2 = 12},
+                               {name = "default:jungletree", param2 = 12, prob = 127},
+                               {name = "air", prob = 0},
+                               {name = "flowers:mushroom_brown", prob = 127},
+                               {name = "air", prob = 0},
                        },
                },
                flags = "place_center_x",
@@ -1068,8 +1086,8 @@ function default.register_decorations()
                place_on = {"default:dirt_with_snow", "default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = 0.04,
-                       scale = 0.02,
+                       offset = 0.036,
+                       scale = 0.022,
                        spread = {x = 250, y = 250, z = 250},
                        seed = 2,
                        octaves = 3,
@@ -1086,22 +1104,29 @@ function default.register_decorations()
                deco_type = "schematic",
                place_on = {"default:dirt_with_snow", "default:dirt_with_grass"},
                sidelen = 80,
-               fill_ratio = 0.003,
+               noise_params = {
+                       offset = 0.0018,
+                       scale = 0.0011,
+                       spread = {x = 250, y = 250, z = 250},
+                       seed = 2,
+                       octaves = 3,
+                       persist = 0.66
+               },
                biomes = {"taiga", "coniferous_forest"},
                y_min = 1,
                y_max = 31000,
                schematic = {
-                       size = { x = 3, y = 3, z = 1},
+                       size = {x = 3, y = 3, z = 1},
                        data = {
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "default:pine_tree", param2 = 12, prob = 191 },
-                               { name = "default:pine_tree", param2 = 12 },
-                               { name = "default:pine_tree", param2 = 12, prob = 127 },
-                               { name = "air", prob = 0 },
-                               { name = "flowers:mushroom_red", prob = 63 },
-                               { name = "air", prob = 0 },
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "default:pine_tree", param2 = 12, prob = 191},
+                               {name = "default:pine_tree", param2 = 12},
+                               {name = "default:pine_tree", param2 = 12, prob = 127},
+                               {name = "air", prob = 0},
+                               {name = "flowers:mushroom_red", prob = 63},
+                               {name = "air", prob = 0},
                        },
                },
                flags = "place_center_x",
@@ -1146,14 +1171,14 @@ function default.register_decorations()
                y_min = 1,
                y_max = 31000,
                schematic = {
-                       size = { x = 3, y = 2, z = 1},
+                       size = {x = 3, y = 2, z = 1},
                        data = {
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "default:acacia_tree", param2 = 12, prob = 191 },
-                               { name = "default:acacia_tree", param2 = 12 },
-                               { name = "default:acacia_tree", param2 = 12, prob = 127 },
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "default:acacia_tree", param2 = 12, prob = 191},
+                               {name = "default:acacia_tree", param2 = 12},
+                               {name = "default:acacia_tree", param2 = 12, prob = 127},
                        },
                },
                flags = "place_center_x",
@@ -1167,8 +1192,8 @@ function default.register_decorations()
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = 0.01,
-                       scale = -0.02,
+                       offset = 0.0,
+                       scale = -0.015,
                        spread = {x = 250, y = 250, z = 250},
                        seed = 2,
                        octaves = 3,
@@ -1179,7 +1204,6 @@ function default.register_decorations()
                y_max = 31000,
                schematic = minetest.get_modpath("default").."/schematics/aspen_tree.mts",
                flags = "place_center_x, place_center_z",
-               rotation = "random",
        })
 
        minetest.register_decoration({
@@ -1187,8 +1211,8 @@ function default.register_decorations()
                place_on = {"default:dirt_with_grass"},
                sidelen = 16,
                noise_params = {
-                       offset = 0.0005,
-                       scale = -0.001,
+                       offset = 0.0,
+                       scale = -0.0008,
                        spread = {x = 250, y = 250, z = 250},
                        seed = 2,
                        octaves = 3,
@@ -1198,17 +1222,17 @@ function default.register_decorations()
                y_min = 1,
                y_max = 31000,
                schematic = {
-                       size = { x = 3, y = 3, z = 1},
+                       size = {x = 3, y = 3, z = 1},
                        data = {
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "air", prob = 0 },
-                               { name = "default:aspen_tree", param2 = 12 },
-                               { name = "default:aspen_tree", param2 = 12 },
-                               { name = "default:aspen_tree", param2 = 12, prob = 127 },
-                               { name = "flowers:mushroom_red", prob = 63 },
-                               { name = "flowers:mushroom_brown", prob = 63 },
-                               { name = "air", prob = 0 },
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "air", prob = 0},
+                               {name = "default:aspen_tree", param2 = 12},
+                               {name = "default:aspen_tree", param2 = 12},
+                               {name = "default:aspen_tree", param2 = 12, prob = 127},
+                               {name = "flowers:mushroom_red", prob = 63},
+                               {name = "flowers:mushroom_brown", prob = 63},
+                               {name = "air", prob = 0},
                        },
                },
                flags = "place_center_x",