Default: Allow papyrus growing on default:sand

Mgv5/mgv7 papyrus schematic now has sand nodes as a base
Add sand beach to mgv5/mgv7 deserts

diff --git a/mods/default/functions.lua b/mods/default/functions.lua
index fd759275d9e340c7c60e1fa48f94dc09a9005484..3accbd1f52cdc6fdfedb2901bdf705cf90208569 100644 (file)
--- a/mods/default/functions.lua
+++ b/mods/default/functions.lua
@@ -152,7 +152,8 @@ end
 function default.grow_papyrus(pos, node)
        pos.y = pos.y - 1
        local name = minetest.get_node(pos).name
-       if name ~= "default:dirt_with_grass" and name ~= "default:dirt" then
+       if name ~= "default:dirt_with_grass" and name ~= "default:dirt" and
+                       name ~= "default:sand" then
                return
        end
        if not minetest.find_node_near(pos, 3, {"group:water"}) then
@@ -184,7 +185,7 @@ minetest.register_abm({
 
 minetest.register_abm({
        nodenames = {"default:papyrus"},
-       neighbors = {"default:dirt", "default:dirt_with_grass"},
+       neighbors = {"default:dirt", "default:dirt_with_grass", "default:sand"},
        interval = 50,
        chance = 20,
        action = function(...)

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index c40f2204494b29879888aea6d725bf548ff9ee6b..733fd6d73dcf41fe66bb6455d735f81b1dbcdfad 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -578,7 +578,7 @@ function default.register_biomes()
                --node_water_top = "",
                --depth_water_top = ,
                --node_water = "",
-               y_min = 1,
+               y_min = 5,
                y_max = 31000,
                heat_point = 95,
                humidity_point = 10,
@@ -596,7 +596,7 @@ function default.register_biomes()
                --depth_water_top = ,
                --node_water = "",
                y_min = -112,
-               y_max = 0,
+               y_max = 4,
                heat_point = 95,
                humidity_point = 10,
        })
@@ -944,7 +944,7 @@ function default.register_decorations()
                        persist = 0.6
                },
                biomes = {"desert"},
-               y_min = 2,
+               y_min = 5,
                y_max = 31000,
                schematic = minetest.get_modpath("default").."/schematics/large_cactus.mts",
                flags = "place_center_x",
@@ -966,11 +966,11 @@ function default.register_decorations()
                        persist = 0.6
                },
                biomes = {"desert"},
-               y_min = 2,
+               y_min = 5,
                y_max = 31000,
                decoration = "default:cactus",
                height = 2,
-               height_max = 5,
+               height_max = 5,
        })
 
        -- Papyrus

diff --git a/mods/default/schematics/papyrus.mts b/mods/default/schematics/papyrus.mts
index a3b67776e25848302c6f9d29c4cfc797f28b0d89..8af4dc2ba41a842443faefc164684f503d29f916 100644 (file)
Binary files a/mods/default/schematics/papyrus.mts and b/mods/default/schematics/papyrus.mts differ