Update bonemeal from upstream.

minetest-whynot · Nov 26, 2023 · 00358eb · 00358eb
1 parent d27851e
commit 00358eb
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 12 deletions.
diff --git a/builder/mods_src/tools/bonemeal b/builder/mods_src/tools/bonemeal
diff --git a/mods/tools/bonemeal/init.lua b/mods/tools/bonemeal/init.lua
@@ -86,7 +86,7 @@ end
 
 
 -- sapling check
-local function check_sapling(pos, sapling_node, light_ok)
+local function check_sapling(pos, sapling_node, strength, light_ok)
 
 	-- what is sapling placed on?
 	local under =  minetest.get_node({
@@ -128,7 +128,9 @@ local function check_sapling(pos, sapling_node, light_ok)
 
 				particle_effect(pos)
 
-				grow_tree(pos, saplings[n][2])
+				if math.random(5 - strength) == 1 then
+					grow_tree(pos, saplings[n][2])
+				end
 
 				return true
 			end
@@ -474,8 +476,7 @@ function bonemeal:on_use(pos, strength, node)
 	end
 
 	-- check for sapling growth
-	if random(5 - strength) == 1
-	and check_sapling(pos, node.name, light_ok) then
+	if check_sapling(pos, node.name, strength, light_ok) then
 		return true
 	end
 

diff --git a/mods/tools/bonemeal/locale/bonemeal.de.tr b/mods/tools/bonemeal/locale/bonemeal.de.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal geladen
 Bone=Knochen
 Bone Meal=Knochenmehl
 Fertiliser=Dünger

diff --git a/mods/tools/bonemeal/locale/bonemeal.en.tr b/mods/tools/bonemeal/locale/bonemeal.en.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-#[MOD] bonemeal loaded=
 #Bone=
 #Bone Meal=
 #Fertiliser=

diff --git a/mods/tools/bonemeal/locale/bonemeal.es.tr b/mods/tools/bonemeal/locale/bonemeal.es.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal cargado
 Bone=Hueso
 Bone Meal=Comida de hueso
 Fertiliser=Fertilizante

diff --git a/mods/tools/bonemeal/locale/bonemeal.fr.tr b/mods/tools/bonemeal/locale/bonemeal.fr.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal chargé
 Bone=Os
 Bone Meal=Poudre d'os
 Fertiliser=Engrais

diff --git a/mods/tools/bonemeal/locale/bonemeal.it.tr b/mods/tools/bonemeal/locale/bonemeal.it.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] bonemeal caricata
 Bone=Ossa
 Bone Meal=Pasto osseo
 Fertiliser=Fertilizzante

diff --git a/mods/tools/bonemeal/locale/bonemeal.ru.tr b/mods/tools/bonemeal/locale/bonemeal.ru.tr
@@ -1,5 +1,4 @@
 # textdomain:bonemeal
-[MOD] bonemeal loaded=[MOD] костная мука загружена
 Bone=Кость
 Bone Meal=Костная Мука
 Fertiliser=Удобрение

diff --git a/mods/tools/bonemeal/mods.lua b/mods/tools/bonemeal/mods.lua
@@ -184,7 +184,8 @@ if minetest.get_modpath("ethereal") then
 			"flowers:tulip", "flowers:viola", "ethereal:strawberry_7"}},
 		{"ethereal:gray_dirt", {}, {"ethereal:snowygrass", "", ""}},
 		{"ethereal:cold_dirt", {}, {"ethereal:snowygrass", "", ""}},
-		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown", "", "", ""}},
+		{"ethereal:mushroom_dirt", {}, {"flowers:mushroom_red", "flowers:mushroom_brown",
+				"ethereal:spore_grass", "ethereal:spore_grass", "", "", ""}},
 		{"ethereal:jungle_dirt", grass, {"default:junglegrass", "", "", ""}},
 		{"ethereal:grove_dirt", grass, {"ethereal:fern", "", "", ""}},
 		{"ethereal:bamboo_dirt", grass, {}}
+5 −4		init.lua
+0 −1		locale/bonemeal.de.tr
+0 −1		locale/bonemeal.en.tr
+0 −1		locale/bonemeal.es.tr
+0 −1		locale/bonemeal.fr.tr
+0 −1		locale/bonemeal.it.tr
+0 −1		locale/bonemeal.ru.tr
+2 −1		mods.lua