Fix missing papyrus in savanna, add a dry dirt version

Papyrus was missing from the dry dirt 'savanna_shore' biome due to
only being placed on dirt. A mistake made when changing savanna
dirt to dry dirt.

Rename existing papyrus schematic to 'papyrus_on_dirt' and only
place in the 'rainforest_swamp' biome.
Add a new papyrus schematic 'papyrus_on_dry_dirt', placed in the
'savanna' biome.

diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
index afca9f8eb24bad1fd877d8e96724a8a2ccfd31f4..8c161d1e679c4ada962b35c5533de56f7a6a92d3 100644 (file)
--- a/mods/default/mapgen.lua
+++ b/mods/default/mapgen.lua
@@ -2143,8 +2143,10 @@ function default.register_decorations()
 
        -- Papyrus
 
+       -- Dirt version for rainforest swamp
+
        minetest.register_decoration({
-               name = "default:papyrus",
+               name = "default:papyrus_on_dirt",
                deco_type = "schematic",
                place_on = {"default:dirt"},
                sidelen = 16,
@@ -2156,10 +2158,32 @@ function default.register_decorations()
                        octaves = 3,
                        persist = 0.7
                },
-               biomes = {"savanna_shore", "rainforest_swamp"},
+               biomes = {"rainforest_swamp"},
+               y_max = 0,
+               y_min = 0,
+               schematic = minetest.get_modpath("default") .. "/schematics/papyrus_on_dirt.mts",
+       })
+
+       -- Dry dirt version for savanna shore
+
+       minetest.register_decoration({
+               name = "default:papyrus_on_dry_dirt",
+               deco_type = "schematic",
+               place_on = {"default:dry_dirt"},
+               sidelen = 16,
+               noise_params = {
+                       offset = -0.3,
+                       scale = 0.7,
+                       spread = {x = 200, y = 200, z = 200},
+                       seed = 354,
+                       octaves = 3,
+                       persist = 0.7
+               },
+               biomes = {"savanna_shore"},
                y_max = 0,
                y_min = 0,
-               schematic = minetest.get_modpath("default") .. "/schematics/papyrus.mts",
+               schematic = minetest.get_modpath("default") ..
+                       "/schematics/papyrus_on_dry_dirt.mts",
        })
 
        -- Bush

diff --git a/mods/default/schematics/papyrus.mts b/mods/default/schematics/papyrus.mts
deleted file mode 100644 (file)
index 1333a7c..0000000
Binary files a/mods/default/schematics/papyrus.mts and /dev/null differ

diff --git a/mods/default/schematics/papyrus_on_dirt.mts b/mods/default/schematics/papyrus_on_dirt.mts
new file mode 100644 (file)
index 0000000..1333a7c
Binary files /dev/null and b/mods/default/schematics/papyrus_on_dirt.mts differ

diff --git a/mods/default/schematics/papyrus_on_dry_dirt.mts b/mods/default/schematics/papyrus_on_dry_dirt.mts
new file mode 100644 (file)
index 0000000..3626580
Binary files /dev/null and b/mods/default/schematics/papyrus_on_dry_dirt.mts differ

diff --git a/schematic_tables.txt b/schematic_tables.txt
index a33300f7312e6c42e725221d301e78b2b768b7b5..eff2d3595bd918a135903a98dbf3a87e3f3f5e04 100644 (file)
--- a/schematic_tables.txt
+++ b/schematic_tables.txt
@@ -2100,7 +2100,7 @@ mts_save("large_cactus", {
 
 -- Papyrus
 
-mts_save("papyrus", {
+mts_save("papyrus_on_dirt", {
        size = {x = 1, y = 7, z = 1},
        data = {
                {name = "default:dirt", prob = 255, force_place = true},
@@ -2117,6 +2117,23 @@ mts_save("papyrus", {
        },
 })
 
+mts_save("papyrus_on_dry_dirt", {
+       size = {x = 1, y = 7, z = 1},
+       data = {
+               {name = "default:dry_dirt", prob = 255, force_place = true},
+               {name = "default:dry_dirt", prob = 255, force_place = true},
+               {name = "default:papyrus", prob = 255},
+               {name = "default:papyrus", prob = 255},
+               {name = "default:papyrus", prob = 255},
+               {name = "default:papyrus", prob = 255},
+               {name = "default:papyrus", prob = 255},
+       },
+       yslice_prob = {
+               {ypos = 2, prob = 127},
+               {ypos = 3, prob = 127},
+       },
+})
+
 
 -- Bush