From 92183e279db3b68214afadf78fce6da780c0a54e Mon Sep 17 00:00:00 2001
From: Wuzzy <Wuzzy@disroot.org>
Date: Sat, 14 May 2022 13:19:30 +0200
Subject: [PATCH] Generate wheat and cotton in map

---
 mods/rp_farming/init.lua   |  1 +
 mods/rp_farming/mapgen.lua | 22 +++++++++++++++-------
 mods/rp_farming/mod.conf   |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/mods/rp_farming/init.lua b/mods/rp_farming/init.lua
index 597b26e..1cc5b42 100644
--- a/mods/rp_farming/init.lua
+++ b/mods/rp_farming/init.lua
@@ -11,4 +11,5 @@ dofile(minetest.get_modpath("rp_farming").."/nodes.lua")
 dofile(minetest.get_modpath("rp_farming").."/plants.lua")
 dofile(minetest.get_modpath("rp_farming").."/craft.lua")
 dofile(minetest.get_modpath("rp_farming").."/achievements.lua")
+dofile(minetest.get_modpath("rp_farming").."/mapgen.lua")
 dofile(minetest.get_modpath("rp_farming").."/aliases.lua")
diff --git a/mods/rp_farming/mapgen.lua b/mods/rp_farming/mapgen.lua
index ecd5839..9f87e6d 100644
--- a/mods/rp_farming/mapgen.lua
+++ b/mods/rp_farming/mapgen.lua
@@ -11,7 +11,7 @@ minetest.register_decoration(
       fill_ratio = 0.008,
       biomes = {"Wilderness"},
       decoration = {"rp_farming:wheat_4"},
-      y_min = 0,
+      y_min = 1,
       y_max = 32000,
 })
 
@@ -20,21 +20,29 @@ minetest.register_decoration(
       deco_type = "simple",
       place_on = "rp_default:dirt_with_grass",
       sidelen = 16,
-      fill_ratio = 0.006,
-      biomes = {"Grassland", "Savanna"},
+      fill_ratio = 0.001,
+      biomes = {"Grassland"},
       decoration = {"rp_farming:wheat_4"},
-      y_min = 0,
+      y_min = 1,
       y_max = 32000,
+      noise_params = {
+          seed = 13,
+	  octaves = 2,
+	  scale = 0.001,
+	  offset = 0.0,
+	  spread = { x = 50, y = 50, z = 50 },
+      },
 })
 
 minetest.register_decoration(
    {
       deco_type = "simple",
-      place_on = "rp_default:sand",
+      place_on = {"rp_default:sand", "rp_default:dirt_with_dry_grass"},
       sidelen = 16,
       fill_ratio = 0.004,
-      biomes = {"Desert"},
+      biomes = {"Desert", "Savanna"},
       decoration = {"rp_farming:cotton_4"},
-      y_min = 0,
+      y_min = 1,
       y_max = 32000,
 })
+
diff --git a/mods/rp_farming/mod.conf b/mods/rp_farming/mod.conf
index 08069be..9647ffd 100644
--- a/mods/rp_farming/mod.conf
+++ b/mods/rp_farming/mod.conf
@@ -1,2 +1,2 @@
 name = rp_farming
-depends = rp_sounds, rp_weather, rp_crafting, rp_achievements, rp_item_drop
+depends = rp_sounds, rp_weather, rp_crafting, rp_achievements, rp_item_drop, rp_default