Merge branch 'master' of yunohost.local:mtcontrib/plantlife_modpack into nalc-1.2-dev

Fix typo in vines/init.lua

See merge request VanessaE/plantlife_modpack!4

bushes/init.lua

@@ -258,3 +258,5 @@ biome_lib:register_generate_plant({
 )
 
 		--http://dev.minetest.net/Node_Drawtypes
+
+minetest.log("action", "[bushes] loaded.")

bushes_classic/init.lua

@@ -55,4 +55,4 @@ biome_lib:spawn_on_surfaces({
 
 minetest.register_alias("bushes:basket_pies", "bushes:basket_strawberry")
 
-print(S("[Bushes] Loaded."))
+print(S("[Bushes_classic] Loaded."))

ferns/gianttreefern.lua

@@ -14,10 +14,10 @@ local S = plantlife_i18n.gettext
 -- lot of code, lot to load
 
 abstract_ferns.grow_giant_tree_fern = function(pos)
-	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
+	local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
-	if minetest.get_node(pos_01).name ~= "air"
+	local name = minetest.get_node(pos_aux).name
-			and minetest.get_node(pos_01).name ~= "ferns:sapling_giant_tree_fern"
+	if name ~= "air" and name ~= "ferns:sapling_giant_tree_fern"
-			and minetest.get_node(pos_01).name ~= "default:junglegrass" then
+			and name ~= "default:junglegrass" then
 		return
 	end
 
@@ -64,7 +64,9 @@ abstract_ferns.grow_giant_tree_fern = function(pos)
 
 	local brk = false
 	for i = 1, size-3 do
-		if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then
+		pos_aux.y = pos.y + i
+		local name = minetest.get_node(pos_aux).name
+		if not (name == "air" or (i == 1 and name == "ferns:sapling_giant_tree_fern")) then
 			brk = true
 			break
 		end
@@ -250,13 +252,16 @@ minetest.register_node("ferns:fern_trunk_big", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
+	after_dig_node = function(pos, node, metadata, digger)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
+		if digger == nil then return end
-        if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then
+		local np = {x=pos.x,y=pos.y+1,z=pos.z}
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
+		local nn = minetest.get_node(np)
-            minetest.add_item(pos,"ferns:fern_trunk_big")
+		if nn.name == "ferns:fern_trunk_big" or
-        end
+			nn.name == "ferns:fern_trunk_big_top"
-    end,
+		then
+			minetest.node_dig(np, nn, digger)
+		end
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

ferns/treefern.lua

@@ -13,10 +13,10 @@ assert(abstract_ferns.config.enable_treefern == true)
 
 abstract_ferns.grow_tree_fern = function(pos)
 
-	local pos_01 = {x = pos.x, y = pos.y + 1, z = pos.z}
+	local pos_aux = {x = pos.x, y = pos.y + 1, z = pos.z}
-	if minetest.get_node(pos_01).name ~= "air"
+	local name = minetest.get_node(pos_aux).name
-			and minetest.get_node(pos_01).name ~= "ferns:sapling_tree_fern"
+	if name ~= "air" and name ~= "ferns:sapling_tree_fern"
-			and minetest.get_node(pos_01).name ~= "default:junglegrass" then
+			and name ~= "default:junglegrass" then
 		return
 	end
 
@@ -30,7 +30,9 @@ abstract_ferns.grow_tree_fern = function(pos)
 	local i = 1
 	local brk = false
 	while (i < size) do
-		if minetest.get_node({x = pos.x, y = pos.y + i, z = pos.z}).name ~= "air" then
+		pos_aux.y = pos.y + i
+		name = minetest.get_node(pos_aux).name
+		if not (name == "air" or (i == 1 and name == "ferns:sapling_tree_fern")) then
 			brk = true
 			break
 		end
@@ -136,13 +138,9 @@ minetest.register_node("ferns:fern_trunk", {
 	},
 	groups = {tree=1,choppy=2,oddly_breakable_by_hand=2,flammable=3,wood=1},
 	sounds = default.node_sound_wood_defaults(),
-	after_destruct = function(pos,oldnode)
+	after_dig_node = function(pos, node, metadata, digger)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
+		default.dig_up(pos, node, digger)
-        if node.name == "ferns:fern_trunk" then
+	end,
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk")
-        end
-    end,
 })
 
 -----------------------------------------------------------------------------------------------

junglegrass/init.lua

@@ -1,3 +1,5 @@
 minetest.register_alias("junglegrass:shortest", "air")
 minetest.register_alias("junglegrass:short", "air")
 minetest.register_alias("junglegrass:medium", "air")
+
+minetest.log("action", "[junglegrass] loaded.")

molehills/molehills_settings.txt

@@ -2,5 +2,5 @@
 
 Molehills_Max_Count		= 320 -- absolute maximum number in an area of 80x80x80 nodes
 
-Molehills_Rarity		= 87 -- larger values make molehills more rare (100 means chance of 0 %)
+Molehills_Rarity		= 95 -- larger values make molehills more rare (100 means chance of 0 %)
 

nature_classic/init.lua

@@ -47,4 +47,4 @@ dofile(minetest.get_modpath(current_mod_name) .. "/config.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/global_function.lua")
 dofile(minetest.get_modpath(current_mod_name) .. "/blossom.lua")
 
-minetest.log("info", S("[Nature Classic] loaded!"))
+minetest.log("action", S("[Nature Classic] loaded!"))

plantlife_i18n/init.lua

@@ -5,3 +5,5 @@ plantlife_i18n = { }
 
 local MP = minetest.get_modpath(minetest.get_current_modname())
 plantlife_i18n.gettext, plantlife_i18n.ngettext = dofile(MP.."/intllib.lua")
+
+minetest.log("action", "[plantlife_i18n] loaded.")

trunks/generating.lua

@@ -1,14 +1,5 @@
 -- Code by Mossmanikin, Neuromancer, and others
 
-local function clone_node(name)
-	local node2 = {}
-	local node = minetest.registered_nodes[name]
-	for k,v in pairs(node) do
-		node2[k]=v
-	end
-	return node2
-end
-
 -----------------------------------------------------------------------------------------------
 -- TWiGS
 -----------------------------------------------------------------------------------------------
@@ -230,7 +221,7 @@ for i in pairs(TRuNKS) do
 	if minetest.get_modpath(MoD) ~= nil
 	and NR < 6 -- moretrees trunks allready have facedir
 	and minetest.registered_nodes[trunkname] then -- the node being called exists.
-			temptrunk = clone_node(trunkname)
+			temptrunk = table.copy(minetest.registered_nodes[trunkname])
 			temptrunk.paramtype2 = "facedir"
 			minetest.register_node(":"..trunkname, temptrunk)
 	end

trunks/nodes.lua

@@ -71,7 +71,7 @@ minetest.register_node("trunks:moss", {
 	walkable = false,
 	node_box = {type = "fixed", fixed = flat_moss},
 	selection_box = {type = "fixed", fixed = flat_stick},--{type = "wallmounted"},
-	groups = {snappy = 3, flammable = 3 },
+	groups = {snappy = 3, flammable = 3, attached_node = 1 },
 	sounds = default.node_sound_leaves_defaults(),
 })
 
@@ -90,7 +90,7 @@ minetest.register_node("trunks:moss_fungus", {
 	walkable = false,
 	node_box = {type = "fixed", fixed = flat_moss},
 	selection_box = {type = "fixed", fixed = flat_stick},--{type = "wallmounted"},
-	groups = {snappy = 3, flammable = 3 },
+	groups = {snappy = 3, flammable = 3, attached_node = 1 },
 	sounds = default.node_sound_leaves_defaults(),
 })
 

vines/init.lua

@@ -3,6 +3,8 @@ vines = {
 	recipes = {}
 }
 
+local enable_roots = minetest.settings:get_bool("vines_enable_roots")
+
 -- support for i18n
 local S = plantlife_i18n.gettext
 
@@ -11,7 +13,7 @@ local S = plantlife_i18n.gettext
 minetest.register_craftitem("vines:vines", {
 	description = S("Vines"),
 	inventory_image = "vines_item.png",
-	group = {vines = 1, flammable = 2}
+	groups = {vines = 1, flammable = 2}
 })
 
 -- FUNCTIONS
@@ -305,6 +307,14 @@ minetest.register_tool("vines:shears", {
 })
 
 -- VINES
+local spawn_root_surfaces = {}
+
+if enable_roots ~= false then
+	spawn_root_surfaces = {
+		"default:dirt_with_grass",
+		"default:dirt"
+	}
+end
 
 vines.register_vine('root',
 	{description = S("Roots"), average_length = 9}, {
@@ -313,10 +323,7 @@ vines.register_vine('root',
 	avoid_radius = 5,
 	spawn_delay = 500,
 	spawn_chance = 10,
-	spawn_surfaces = {
+	spawn_surfaces = spawn_root_surfaces,
-		"default:dirt_with_grass",
-		"default:dirt"
-	},
 	spawn_on_bottom = true,
 	plantlife_limit = -0.6,
 	humidity_min = 0.4,

youngtrees/init.lua

@@ -147,3 +147,5 @@ biome_lib:register_generate_plant({
   },
   abstract_youngtrees.grow_youngtree
 )
+
+minetest.log("action", "[youngtrees] loaded.")