From 51f79eaa3982c3078f6390d8d499879704815ec7 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Fri, 29 Jul 2022 02:48:00 +0200
Subject: [PATCH] Add lilypads and dead bushes

---
 mods/ENTITIES/mcl_mobs/spawning.lua |  5 ++++
 mods/MAPGEN/mcl_biomes/init.lua     | 42 ++++++++++++++++++++---------
 2 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/mods/ENTITIES/mcl_mobs/spawning.lua b/mods/ENTITIES/mcl_mobs/spawning.lua
index bc1b737161..58b8946f89 100644
--- a/mods/ENTITIES/mcl_mobs/spawning.lua
+++ b/mods/ENTITIES/mcl_mobs/spawning.lua
@@ -71,6 +71,7 @@ local list_of_all_biomes = {
 	"JungleM_underground",
 	"ExtremeHillsM_underground",
 	"JungleEdgeM_underground",
+	"MangroveSwamp_underground",
 
 	-- ocean:
 
@@ -134,6 +135,8 @@ local list_of_all_biomes = {
 	"BirchForestM_deep_ocean",
 	"Taiga_deep_ocean",
 	"JungleM_ocean",
+	"MangroveSwamp_ocean",
+	"MangroveSwamp_deep_ocean",
 
 	-- water or beach?
 
@@ -157,6 +160,7 @@ local list_of_all_biomes = {
 	"MushroomIslandShore",
 	"JungleM_shore",
 	"Jungle_shore",
+	"MangroveSwamp_shore",
 
 	-- dimension biome:
 
@@ -202,6 +206,7 @@ local list_of_all_biomes = {
 	"MesaBryce",
 	"JungleEdge",
 	"SavannaM",
+	"MangroveSwamp",
 }
 
 -- count how many mobs are in an area
diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 2886fd9c3e..43cc367de5 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -128,6 +128,7 @@ local function register_biomes()
 		"MesaBryce",
 		"MesaPlateauF",
 		"MesaPlateauFM",
+		"MangroveSwamp",
 	}
 
 	-- Ice Plains Spikes (rare)
@@ -1350,15 +1351,15 @@ local function register_biomes()
 		depth_top = 1,
 		node_filler = "mcl_mud:mud",
 		depth_filler = 3,
-		node_riverbed = "mcl_mud:mud",
+		node_riverbed = "mcl_core:dirt",
 		depth_riverbed = 2,
 		y_min = 1,
 		-- Note: Limited in height!
-		y_max = 23,
+		y_max = 27,
 		humidity_point = 95,
-		heat_point = 54,
+		heat_point = 94,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 28,
+		_mcl_palette_index = 27,
 	})
 	minetest.register_biome({
 		name = "MangroveSwamp_shore",
@@ -1366,20 +1367,20 @@ local function register_biomes()
 		depth_top = 1,
 		node_filler = "mcl_mud:mud",
 		depth_filler = 3,
-		node_riverbed = "mcl_mud:mud",
+		node_riverbed = "mcl_core:dirt",
 		depth_riverbed = 2,
 		y_min = -5,
 		y_max = 0,
 		humidity_point = 95,
-		heat_point = 54,
+		heat_point = 94,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 28,
+		_mcl_palette_index = 27,
 	})
 	minetest.register_biome({
 		name = "MangroveSwamp_ocean",
-		node_top = "mcl_mud:mud",
+		node_top = "mcl_core:dirt",
 		depth_top = 1,
-		node_filler = "mcl_mud:mud",
+		node_filler = "mcl_core:dirt",
 		depth_filler = 3,
 		node_riverbed = "mcl_core:gravel",
 		depth_riverbed = 2,
@@ -1387,9 +1388,9 @@ local function register_biomes()
 		y_max = -6,
 		vertical_blend = 1,
 		humidity_point = 95,
-		heat_point = 54,
+		heat_point = 94,
 		_mcl_biome_type = "hot",
-		_mcl_palette_index = 28,
+		_mcl_palette_index = 27,
 	})
 	-- Swampland
 	minetest.register_biome({
@@ -3091,7 +3092,6 @@ local function register_decorations()
 		decoration = "mcl_mangrove:water_logged_roots",
 		flags = "place_center_x, place_center_z, force_placement, all_ceilings",
 	})
-
 	minetest.register_decoration({
 		deco_type = "simple",
 		place_on = {"mcl_mud:mud"},
@@ -3102,6 +3102,24 @@ local function register_decorations()
 		decoration = "mcl_mangrove:mangrove_mud_roots",
 		flags = "place_center_x, place_center_z, force_placement",
 	})
+	minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"mcl_mud:mud"},
+		sidelen = 80,
+		fill_ratio = 0.008,
+		biomes = {"MangroveSwamp","MangroveSwamp_shore"},
+		decoration = "mcl_core:deadbush",
+		flags = "place_center_x, place_center_z",
+	})
+	minetest.register_decoration({
+		deco_type = "simple",
+		place_on = {"mcl_core:water_source"},
+		sidelen = 80,
+		fill_ratio = 0.035,
+		biomes = {"MangroveSwamp","MangroveSwamp_shore"},
+		decoration = "mcl_flowers:waterlily",
+		flags = "place_center_x, place_center_z, liquid_surface",
+	})
 
 	-- Jungle tree