From a6c8e4a9d3779a1d59a888a7432b9946e901d9e9 Mon Sep 17 00:00:00 2001
From: Niklp <89982526+Niklp09@users.noreply.github.com>
Date: Fri, 27 Oct 2023 17:45:01 +0200
Subject: [PATCH] Remove biome_lib dep from pl_seaweed (#64)

* Remove biome_lib dep from pl_seaweed

* Push changes (new approach tomorrow)

* no.2
Co-authored-by: wsor4035 <24964441+wsor4035@users.noreply.github.com>
---
 dryplants/reedmace.lua      |  1 -
 pl_seaweed/init.lua         | 93 ++++++++++++-------------------------
 pl_seaweed/mod.conf         |  1 -
 pl_seaweed/settingtypes.txt |  7 +--
 4 files changed, 31 insertions(+), 71 deletions(-)

diff --git a/dryplants/reedmace.lua b/dryplants/reedmace.lua
index 6ecdbde..cad82c2 100644
--- a/dryplants/reedmace.lua
+++ b/dryplants/reedmace.lua
@@ -420,7 +420,6 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 
 	if #locations == 0 then return end
 	for _, pos in ipairs(locations) do
-		print(minetest.pos_to_string(pos))
 		grow_reedmace(pos)
 	end
 end)
diff --git a/pl_seaweed/init.lua b/pl_seaweed/init.lua
index b5456c7..b99f19a 100644
--- a/pl_seaweed/init.lua
+++ b/pl_seaweed/init.lua
@@ -1,10 +1,7 @@
 -- support for i18n
 local S = minetest.get_translator("pl_seaweed")
 
-pl_seaweed = {}
-
-local seaweed_max_count = tonumber(minetest.settings:get("pl_seaweed_max_count")) or 320
-local seaweed_rarity = tonumber(minetest.settings:get("pl_seaweed_rarity")) or 33
+local seaweed_rarity = minetest.settings:get("pl_seaweed.seaweed_rarity") or 0.06
 
 local function get_ndef(name)
 	return minetest.registered_nodes[name] or {}
@@ -105,68 +102,36 @@ for i in ipairs(algae_list) do
 			end
 		end,
 	})
+
+	minetest.register_decoration({
+		name = "flowers:seaweed"..num,
+		decoration = {"flowers:seaweed"..num},
+		place_on = {"default:water_source"},
+		deco_type = "simple",
+		flags = "liquid_surface",
+		spawn_by = {"default:dirt_with_grass", "default:sand"},
+		num_spawn_by = 1,
+		fill_ratio = seaweed_rarity,
+		check_offset = -1,
+		y_min = 1,
+		y_max = 1,
+	})
+
+	minetest.register_decoration({
+		name = "flowers:seaweed"..num .."_sand",
+		decoration = {"flowers:seaweed"..num},
+		place_on = {"default:sand"},
+		deco_type = "simple",
+		flags = "all_floors",
+		spawn_by = "default:water_source",
+		num_spawn_by = 1,
+		fill_ratio = seaweed_rarity*1.2,
+		check_offset = -1,
+		y_min = 1,
+		y_max = 1,
+	})
 end
 
-pl_seaweed.grow_seaweed = function(pos)
-	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
-	local seaweed = math.random(1,4)
-	local node_name = "flowers:seaweed"
-	if seaweed > 1 then
-		node_name = node_name .. "_" .. seaweed
-	end
-	minetest.swap_node(right_here, {name=node_name, param2=math.random(1,3)})
-end
-
-biome_lib.register_on_generate({
-		surface = {"default:water_source"},
-		max_count = seaweed_max_count,
-		rarity = seaweed_rarity,
-		min_elevation = 1,
-		max_elevation = 40,
-		near_nodes = {"default:dirt_with_grass"},
-		near_nodes_size = 4,
-		near_nodes_vertical = 1,
-		near_nodes_count = 1,
-		plantlife_limit = -0.9,
-	},
-	pl_seaweed.grow_seaweed
-)
-
--- pl_seaweed at beaches
--- MM: not satisfied with it, but IMHO some beaches should have some algae
-biome_lib.register_on_generate({
-		surface = {"default:water_source"},
-		max_count = seaweed_max_count,
-		rarity = seaweed_rarity,
-		min_elevation = 1,
-		max_elevation = 40,
-		near_nodes = {"default:sand"},
-		near_nodes_size = 1,
-		near_nodes_vertical = 0,
-		near_nodes_count = 3,
-		plantlife_limit = -0.9,
-		temp_max = -0.64, -- MM: more or less random values, just to make sure it's not everywhere
-		temp_min = -0.22, -- MM: more or less random values, just to make sure it's not everywhere
-	},
-	pl_seaweed.grow_seaweed
-)
-biome_lib.register_on_generate({
-		surface = {"default:sand"},
-		max_count = seaweed_max_count*2,
-		rarity = seaweed_rarity/2,
-		min_elevation = 1,
-		max_elevation = 40,
-		near_nodes = {"default:water_source"},
-		near_nodes_size = 1,
-		near_nodes_vertical = 0,
-		near_nodes_count = 3,
-		plantlife_limit = -0.9,
-		temp_max = -0.64, -- MM: more or less random values, just to make sure it's not everywhere
-		temp_min = -0.22, -- MM: more or less random values, just to make sure it's not everywhere
-	},
-	pl_seaweed.grow_seaweed
-)
-
 minetest.register_alias("flowers:flower_seaweed", "flowers:seaweed")
 minetest.register_alias("along_shore:pondscum_1", "flowers:seaweed")
 minetest.register_alias("along_shore:seaweed_1", "flowers:seaweed")
diff --git a/pl_seaweed/mod.conf b/pl_seaweed/mod.conf
index ed99972..73a791c 100644
--- a/pl_seaweed/mod.conf
+++ b/pl_seaweed/mod.conf
@@ -1,3 +1,2 @@
 name = pl_seaweed
-depends = biome_lib
 optional_depends = farming, flowers
diff --git a/pl_seaweed/settingtypes.txt b/pl_seaweed/settingtypes.txt
index 3cb8772..8c073c5 100644
--- a/pl_seaweed/settingtypes.txt
+++ b/pl_seaweed/settingtypes.txt
@@ -1,5 +1,2 @@
-#Seaweed maximum count
-pl_seaweed_max_count (Seaweed maximum count) int 320 1 1000
-
-#Seaweed rarity
-pl_seaweed_rarity (Seaweed rarity) int 33 0 100
+# Seaweed rarity (higher number -> higher probability)
+pl_seaweed.seaweed_rarity (Seaweed rarity) float 0.06 0.0001 1