From 3bf45ec4e9b5006c59d0b21bdc28469b448c1803 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Thu, 28 Jul 2022 23:05:24 +0200
Subject: [PATCH] Spawn mangroves in shallow water, fix schematics

---
 .../schematics/mcl_mangrove_tree_1.mts        | Bin 414 -> 456 bytes
 .../schematics/mcl_mangrove_tree_2.mts        | Bin 297 -> 329 bytes
 .../schematics/mcl_mangrove_tree_3.mts        | Bin 505 -> 553 bytes
 mods/MAPGEN/mcl_biomes/init.lua               |  31 +++++++++---------
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_1.mts b/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_1.mts
index dd4ebfad3071d7547d5019ce7ad5c2e85b397e1a..68e66e425b21e8e9b5fd4e581530e7619cb73110 100644
GIT binary patch
delta 336
zcmV-W0k8g^1IPoAfq%7D+pdE!42uhs&NDxpUqAGcG;K<`j2UV2+{SS;1S7f$e4)Jw
zP)JwbXRQ4`$&x;+MkOCL+BaF&{qkCygiMy;lE`FacA-n-6&fhH@8b5Y+83(DEKAbm
z^zyy>hQa)<=krsr)wwUoJEGYo`({}@&VEaj9ih|uzHQ=XGk<sv$$?I}()ZmY<LAil
z`yThcro9NBvWp%Ol|OS~bzwE(6Bq3z+gNR~Nn$3R&FNiOw<_zU?zqf;YEr_~xiK3%
z;!&-Q#MZ4n$U%ZB294Rx@6^QF-K>4*Ub9%I?4kz%d9@gJ+vE?(?U6|gGIfEj7P3DQ
zqYE<IACG&O07;0S8rxEWzFrW@Np`kvkzw0HE<#!@Cf=_mP0Ltvg0!9!Bn^5>jA{h|
i`qx8ii}57E6w%|;Hinzu89tTWu5GFZ>=^%XGFJ4;Zmnbh

delta 294
zcmV+>0one@1D*qrfq(5)%MQXY46D;k;=CW`*Xb+iBcUo|9FXQo5ZuIZv(Y(M0H<*^
zw*m~`?>S1>*vICsg1yt&)2Giik2;2H&wJUzrMb~v^+L)CPljhlgB#5_gUNlp%G;zb
zgo|E$;(7P{yXulLzjc4@6wvLrdg(dNB_nU<MMK}+9w-^q<bPOwd&lQy@E+P3nmgpg
zN6lOByXNG(bL4#A-}t!%&l@-X6!H13FP_y%Bd+-|0>H19CR+JRHBEsBkU8Wau1-}T
zt0f3WVpKtn!tof)5WspO+?G1XQ4cCR3DI%H2**LW2x+y5XuWK~=e|jWBr!Wk9AuXm
sYuf{oAbL_;gdZmkI_w<yJvE3Ld*2vpex`sOO=~~UnHML#01tUyMd|dCv;Y7A

diff --git a/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_2.mts b/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_2.mts
index 8497a695190e27f0c5d7516c1bdf3d7d6847334b..5307d7d323117523d1138d4b5b4b0177aca17800 100644
GIT binary patch
delta 185
zcmV;q07n0*0?7i9n18KP3l4=K3}bw5@$R~-YZybQ)qr_5f@3XpGDFyeoYxqwA};b$
zy~gJ&{)fZ7Cpw_p?3^c$3^{|;9daE7qRYX*8~Vk*%Lt6V)=<JazMsRY3wDxhbQ3_;
zCYqyswNXiyEg91VI{QK7{0@sjH?X_l!GV^wT|<9O#^=b^)H0dn*jb5)jY6_)$(Sy1
nnRs@J&O26SYEu;?(6t}Pr#FWmt@*VECMl&&x4u6B6QC=@`B_@@

delta 153
zcmV;K0A~Nm0;vL!n1Ah4?GAt-2$aOP=v{mD8p4Y6bFTh{8+6KXLn(xz(Y4xW*0#yK
zDC_xs<2Mw1O;kWNugp$^#S<Ws3M?MctzazFv-<vC5v}%+!o01&Lt6#=z_}Vu)A8FE
zR@^hQ3*)!cJ)-QXa$4KUnMN=g*{PwZVUtV?LWscAAIL&aVG^&k)$hSkbk0-KP|W=a
HYJaQQY@ku#

diff --git a/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_3.mts b/mods/ITEMS/mcl_mangrove/schematics/mcl_mangrove_tree_3.mts
index 27f918beaa7e72d9f91122023ad10843aaf20f23..96e3f0e662356cc0c0f5ab4c00974b7d14bcc5ae 100644
GIT binary patch
delta 395
zcmV;60d)TP1E~a%sDE8^!ypW^N!U~Wv;X??VT>_?(ye#h!<4(8;(%m9XiL<9X$5E$
zhr9cFZPxFQ27FZ8n#!)VO<B1sm!C(WhDK30%Fmwx_dctpMl;c!&G(nCPEyDbyB_Dr
zi`m|Z6uRLn!F`n~gPvLMVt+i$@$NS>0hiR}$eM$#w|w<i`+vEU<j^6%P#dLNIUhSX
zQRDrnNw>+n=E0zb-zx^S=fG!X166#^=~}zK>mEOOe?})7k6i^XfAjtWL1raoa$xXi
zNxh#X_CTdY%tV@+O^~Po+HEP+6H7GlaBgcTG9tx9yoGg!6FphXFh$Iyy1{IawRWTZ
zsKQZsl4G)JVSi_;NG~{R6UotVR5h7A{|ne>C1v}8!J{W&_vsm1Nf}?zG0JL*h}{h6
z(W+h)>N&g4;|sX0p~xgICdrf!W}PMPvAURH5l-ck9>1;pc+g4IWK$2snEijYj@d>v
pIV@UTwUPtuOdhWqqfK(k#5OtGNW^+MLbM{Ez$%}|Hw3nNY6zjQ$)NxM

delta 346
zcmV-g0j2(_1o;DysDHt-gdhxSz`oP|^Zxo%XrYv%?q2p{m~mpJv<-*@kpcEGzLQfT
z4GS&G<`HS%A}#nz%Y(9smWAn?4m*#W7Ddq%W#^wE?)^+nL(W9io9!=^PLlKCyI%X?
zo8Bz$?)OSdt{W5wb*PG<XULoH4@)1PeVNzMb)Bu2jix?We1E9MW!QeI6LuZq18wE*
z&iUAa6Sdxt?lhl#YZeH!_`5=&T_Zj-IZ)$sPG#-pu4jDnXB)diQ~NtiY}Nc9b=E+4
z|GW<dydOMx@Ke;2xXJx%YZtM`Hp6-tk!NRsd0K`h2}6Oz2<s9N%#5(cn6=O_pD8!h
z_zS94qzk5L5>vEDYMFP|I!m_3VllI4fZo3fJ2D^iV6PV)M2cjo5i!8t*(TODYVZ-P
sn)(QKhW)B_Alf98nb0P4i;UQigQan<0Xt>ZP-V<b^I3k6e|OBnQXpcn1poj5

diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua
index 0c0376cbf..2886fd9c3 100644
--- a/mods/MAPGEN/mcl_biomes/init.lua
+++ b/mods/MAPGEN/mcl_biomes/init.lua
@@ -1357,7 +1357,7 @@ local function register_biomes()
 		y_max = 23,
 		humidity_point = 95,
 		heat_point = 54,
-		_mcl_biome_type = "medium",
+		_mcl_biome_type = "hot",
 		_mcl_palette_index = 28,
 	})
 	minetest.register_biome({
@@ -1372,7 +1372,7 @@ local function register_biomes()
 		y_max = 0,
 		humidity_point = 95,
 		heat_point = 54,
-		_mcl_biome_type = "medium",
+		_mcl_biome_type = "hot",
 		_mcl_palette_index = 28,
 	})
 	minetest.register_biome({
@@ -1381,14 +1381,14 @@ local function register_biomes()
 		depth_top = 1,
 		node_filler = "mcl_mud:mud",
 		depth_filler = 3,
-		node_riverbed = "mcl_mud:mud",
+		node_riverbed = "mcl_core:gravel",
 		depth_riverbed = 2,
 		y_min = OCEAN_MIN,
 		y_max = -6,
 		vertical_blend = 1,
 		humidity_point = 95,
 		heat_point = 54,
-		_mcl_biome_type = "medium",
+		_mcl_biome_type = "hot",
 		_mcl_palette_index = 28,
 	})
 	-- Swampland
@@ -3031,12 +3031,12 @@ local function register_decorations()
 		deco_type = "schematic",
 		place_on = {"mcl_mud:mud"},
 		sidelen = 80,
-		fill_ratio = 0.045,
+		fill_ratio = 0.0065,
 		biomes = {"MangroveSwamp","MangroveSwamp_shore"},
 		y_min = 1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_mangrove.."/schematics/mcl_mangrove_tree_1.mts",
-		flags = "place_center_x, place_center_z",
+		flags = "place_center_x, place_center_z, force_placement",
 		rotation = "random",
 	})
 	minetest.register_decoration({
@@ -3044,12 +3044,12 @@ local function register_decorations()
 		deco_type = "schematic",
 		place_on = {"mcl_mud:mud"},
 		sidelen = 80,
-		fill_ratio = 0.045,
+		fill_ratio = 0.0045,
 		biomes = {"MangroveSwamp","MangroveSwamp_shore"},
-		y_min = 1,
+		y_min = -1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_mangrove.."/schematics/mcl_mangrove_tree_2.mts",
-		flags = "place_center_x, place_center_z",
+		flags = "place_center_x, place_center_z, force_placement",
 		rotation = "random",
 	})
 	minetest.register_decoration({
@@ -3057,12 +3057,12 @@ local function register_decorations()
 		deco_type = "schematic",
 		place_on = {"mcl_mud:mud"},
 		sidelen = 80,
-		fill_ratio = 0.045,
+		fill_ratio = 0.023,
 		biomes = {"MangroveSwamp","MangroveSwamp_shore"},
-		y_min = 1,
+		y_min = -1,
 		y_max = mcl_vars.mg_overworld_max,
 		schematic = mod_mcl_mangrove.."/schematics/mcl_mangrove_tree_3.mts",
-		flags = "place_center_x, place_center_z",
+		flags = "place_center_x, place_center_z, force_placement",
 		rotation = "random",
 	})
 
@@ -4870,14 +4870,15 @@ if mg_name ~= "singlenode" then
 				for _, pos in ipairs(gennotify["decoration#"..f] or {}) do
 					local nn=minetest.find_nodes_in_area(vector.offset(pos,-8,-1,-8),vector.offset(pos,8,2,8),{"mcl_mangrove:mangrove_roots"})
 					for _,v in pairs(nn) do
+						local l = pr:next(2,16)
 						if minetest.get_node(vector.offset(v,0,-1,0)).name == "mcl_core:water_source" then
-							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-10,0),{"mcl_core:water_source"}),{name="mcl_mangrove:water_logged_roots"})
+							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-l,0),{"mcl_core:water_source"}),{name="mcl_mangrove:water_logged_roots"})
 						end
 						if minetest.get_node(vector.offset(v,0,-1,0)).name == "mcl_mud:mud" then
-							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-10,0),{"mcl_mud:mud"}),{name="mcl_mangrove:mud_roots"})
+							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-l,0),{"mcl_mud:mud"}),{name="mcl_mangrove:mangrove_mud_roots"})
 						end
 						if minetest.get_node(vector.offset(v,0,-1,0)).name == "air" then
-							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-10,0),{"air"}),{name="mcl_mangrove:mangrove_roots"})
+							minetest.bulk_set_node(minetest.find_nodes_in_area(vector.offset(v,0,0,0),vector.offset(v,0,-l,0),{"air"}),{name="mcl_mangrove:mangrove_roots"})
 						end
 					end
 				end