From 5e2cba0ae885c40c90b33342e4d53877dc089016 Mon Sep 17 00:00:00 2001
From: Till Affeldt <t.affeldt@tu-braunschweig.de>
Date: Thu, 8 Oct 2020 15:42:43 +0200
Subject: [PATCH] Delete puddles and snow faster, don't mark puddles as water
 by default

---
 abms/puddle.lua     |  8 +++-----
 abms/snow_cover.lua | 14 ++++++--------
 init.lua            |  2 +-
 settingtypes.txt    |  3 ++-
 4 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/abms/puddle.lua b/abms/puddle.lua
index 30d8eb4..0c6f943 100644
--- a/abms/puddle.lua
+++ b/abms/puddle.lua
@@ -144,13 +144,11 @@ climate_api.register_abm({
 climate_api.register_abm({
 	label = "remove rain puddles",
 	nodenames	= { "group:weather_puddle" },
-	interval	= 10,
-	chance		= 3,
+	interval	= 25,
+	chance		= 30,
 	catch_up	= true,
 
 	action = function (pos, node, env)
-		if env.humidity < 55 then
-			minetest.remove_node(pos)
-    end
+		minetest.remove_node(pos)
 	end
 })
diff --git a/abms/snow_cover.lua b/abms/snow_cover.lua
index ad72d58..c66d6a4 100644
--- a/abms/snow_cover.lua
+++ b/abms/snow_cover.lua
@@ -1,5 +1,5 @@
 local BLOCK_PREFIX = "regional_weather:snow_cover_"
-local CHECK_DISTANCE = 3
+local CHECK_DISTANCE = 5
 local MAX_AMOUNT = 20
 
 local S = regional_weather.i18n
@@ -114,7 +114,7 @@ if regional_weather.settings.snow_griefing then
 		},
 		neighbors	= { "air" },
 		interval	= 25,
-		chance		= 30,
+		chance		= 120,
 		catch_up	= false,
 
 		 conditions	= {
@@ -157,17 +157,15 @@ if regional_weather.settings.snow_griefing then
 	})
 end
 
+local chance = 50
+if regional_weather.settings.snow_griefing then chance = 30 end
 climate_api.register_abm({
 	label			= "melt snow covers",
 	nodenames	= { "group:weather_snow_cover" },
-	interval	= 15,
-	chance		= 4,
+	interval	= 25,
+	chance		= chance,
 	catch_up	= true,
 
-	 conditions	= {
-		 min_heat = 30
-	 },
-
    action = function (pos, node, env)
 			local value = minetest.get_item_group(node.name, "weather_snow_cover")
 			if value == nil then value = 0 end
diff --git a/init.lua b/init.lua
index 1e5bc37..d81b5fe 100644
--- a/init.lua
+++ b/init.lua
@@ -23,7 +23,7 @@ regional_weather.settings.player_speed	= get_setting_bool("player_speed", true)
 regional_weather.settings.snow					= get_setting_bool("snow_layers", true)
 regional_weather.settings.snow_griefing	= get_setting_bool("snow_griefing", true)
 regional_weather.settings.puddles				= get_setting_bool("puddles", true)
-regional_weather.settings.puddles_water	= get_setting_bool("puddles_water", true)
+regional_weather.settings.puddles_water	= get_setting_bool("puddles_water", false)
 regional_weather.settings.soil					= get_setting_bool("soil", true)
 regional_weather.settings.fire					= get_setting_bool("fire", true)
 regional_weather.settings.ice						= get_setting_bool("ice", true)
diff --git a/settingtypes.txt b/settingtypes.txt
index ea007e2..6122499 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -17,7 +17,8 @@ regional_weather_ice (Freeze river water) bool true
 regional_weather_puddles (Place rain puddles) bool true
 
 # If set to true, puddles will be marked as water and hydrate farmland.
-regional_weather_puddles_water (Hydrate farmland near puddles) bool true
+# Not compatible with some ambient sound or mob mods
+regional_weather_puddles_water (Hydrate farmland near puddles) bool false
 
 # If set to true, rain will cause dry farmland to turn wet.
 regional_weather_soil (Hydrate farmland during rain) bool true