Merge remote-tracking branch 'upstream/master'

* Permet de les dropper quand on récolte le bloc où ils sont attachés.

bushes/init.lua

@@ -314,4 +314,6 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 	for _, pos in ipairs(locations) do
 		grow_youngtree2(pos)
 	end
-end)
+end)
+
+minetest.log("action", "[bushes] loaded.")

bushes_classic/nodes.lua

@@ -4,6 +4,8 @@ local S = minetest.get_translator("bushes_classic")
 plantlife_bushes = {}
 
 -- TODO: add support for nodebreakers? those dig like mese picks
+local random = math.random
+
 plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	if not (digger and pos and oldnode) then
 		return
@@ -63,7 +65,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 
 		-- with a chance of 1/3, return 2 bushes
 		local amount
-		if can_harvest and math.random(1,3) == 1 then
+		if can_harvest and random(1,3) == 1 then
 			amount = "2"
 		else
 			amount = "1"
@@ -75,7 +77,7 @@ plantlife_bushes.after_dig_node = function(pos, oldnode, oldmetadata, digger)
 	elseif groupcaps.choppy then
 
 		-- the amount of sticks may vary
-		local amount = math.random(4, 20)
+		local amount = random(4, 20)
 		-- return some sticks
 		harvested = "default:stick " .. amount
 
@@ -136,7 +138,7 @@ minetest.register_abm({
 			local dirt = minetest.get_node(dirtpos)
 			local is_soil = minetest.get_item_group(dirt.name, "soil") or minetest.get_item_group(dirt.name, "potting_soil")
 
-			if is_soil and (dirt.name == "farming:soil_wet" or math.random(1,3) == 1) then
+			if is_soil and (dirt.name == "farming:soil_wet" or random(1,3) == 1) then
 				minetest.swap_node( pos, {name = "bushes:" .. bush_name .. "_bush"})
 			end
 		end

cavestuff/nodes.lua

@@ -1,6 +1,8 @@
 -- support for i18n
 local S = minetest.get_translator("cavestuff")
 
+local random = math.random
+
 --Rocks
 
 local cbox = {
@@ -20,7 +22,7 @@ minetest.register_node("cavestuff:pebble_1",{
 	collision_box = cbox,
 	on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,
@@ -52,7 +54,7 @@ minetest.register_node("cavestuff:desert_pebble_1",{
 	collision_box = cbox,
 	 on_place = function(itemstack, placer, pointed_thing)
 		-- place a random pebble node
-		local stack = ItemStack("cavestuff:desert_pebble_"..math.random(1,2))
+		local stack = ItemStack("cavestuff:desert_pebble_"..random(1,2))
 		local ret = minetest.item_place(stack, placer, pointed_thing)
 		return ItemStack("cavestuff:desert_pebble_1 "..itemstack:get_count()-(1-ret:get_count()))
 	end,

dryplants/juncus.lua

@@ -153,4 +153,4 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
 	for _, pos in ipairs(locations) do
 		grow_juncus(pos)
 	end
-end)
+end)

ferns/gianttreefern.lua

@@ -282,13 +282,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)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk_big" or node.name == "ferns:fern_trunk_big_top" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk_big")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		if digger == nil then return end
+		local np = {x=pos.x,y=pos.y+1,z=pos.z}
+		local nn = minetest.get_node(np)
+		if nn.name == "ferns:fern_trunk_big" or
+			nn.name == "ferns:fern_trunk_big_top"
+		then
+			minetest.node_dig(np, nn, digger)
+		end
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

ferns/treefern.lua

@@ -11,6 +11,8 @@ local S = minetest.get_translator("ferns")
 
 assert(abstract_ferns.config.enable_treefern == true)
 
+local random = math.random
+
 function abstract_ferns.can_grow_tree_fern(pos)
 	local node_name = minetest.get_node(pos).name
 	if node_name ~= "air" and node_name ~= "ferns:sapling_tree_fern" and node_name ~= "default:junglegrass" then
@@ -39,12 +41,12 @@ abstract_ferns.grow_tree_fern = function(pos)
 		return
 	end
 
-	local size = math.random(1, 4) + math.random(1, 4)
+	local size = random(1, 4) + random(1, 4)
 	if (size > 5) then
 		size = 10 - size
 	end
 	size = size + 1
-	local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[math.random(1, 2)]
+	local crown = ({ "ferns:tree_fern_leaves", "ferns:tree_fern_leaves_02" })[random(1, 2)]
 
 	local i = 1
 	local brk = false
@@ -158,13 +160,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)
-        local node = minetest.get_node({x=pos.x,y=pos.y+1,z=pos.z})
-        if node.name == "ferns:fern_trunk" then
-            minetest.dig_node({x=pos.x,y=pos.y+1,z=pos.z})
-            minetest.add_item(pos,"ferns:fern_trunk")
-        end
-    end,
+	after_dig_node = function(pos, node, metadata, digger)
+		default.dig_up(pos, node, digger)
+	end,
 })
 
 -----------------------------------------------------------------------------------------------

nature_classic/blossom.lua

@@ -2,6 +2,8 @@
 local S = minetest.get_translator("nature_classic")
 -- Blossoms and such
 
+local random = math.random
+
 local function spawn_apple_under(pos)
     local below = {
 		x = pos.x,
@@ -46,7 +48,7 @@ minetest.register_abm({
     chance = nature.leaves_blossom_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-			if math.random(nature.leaves_blossom_chance) == 1 then
+			if random(nature.leaves_blossom_chance) == 1 then
 				nature.enqueue_node(pos, node, nature.blossom_node)
 			end
     end
@@ -61,7 +63,7 @@ minetest.register_abm({
     chance = nature.blossom_leaves_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-			if math.random(nature.blossom_leaves_chance) == 1 then
+			if random(nature.blossom_leaves_chance) == 1 then
 				nature.enqueue_node(pos, node, nature.blossom_leaves)
 			end
     end
@@ -76,7 +78,7 @@ minetest.register_abm({
     chance = nature.apple_chance,
 
     action = function(pos, node, active_object_count, active_object_count_wider)
-		if math.random(4) == 1 and nature.dtime < 0.2 and not minetest.find_node_near(pos, nature.apple_spread, { "default:apple" }) then
+		if random(4) == 1 and nature.dtime < 0.2 and not minetest.find_node_near(pos, nature.apple_spread, { "default:apple" }) then
 			spawn_apple_under(pos)
 		end
     end

nature_classic/init.lua

@@ -40,3 +40,5 @@ nature.blossom_duration = nature.blossom_delay
 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("action", S("[Nature Classic] loaded!"))

trunks/generating.lua

@@ -43,6 +43,89 @@ abstract_trunks.place_twig = function(pos)
 			if check_node_buildable_to(east) then
 				minetest.swap_node(east,		  {name="trunks:twig_8"})
 			end
+		elseif twig_size == 20 then
+			n1 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1})
+			n2 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_5", param2=3})
+				end
+				if minetest.registered_nodes[node_n_w.name].buildable_to then
+					minetest.swap_node(north_west, {name="trunks:twig_7", param2=3})
+				end
+				if minetest.registered_nodes[node_north.name].buildable_to then
+					minetest.swap_node(north,	  {name="trunks:twig_8", param2=3})
+				end
+			end
+			--	big twig 2
+		elseif twig_size == 21 then
+			n1 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z+1})
+			n2 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9"})
+				end
+				if minetest.registered_nodes[node_north.name].buildable_to then
+					minetest.swap_node(north,	  {name="trunks:twig_10"})
+				end
+				if minetest.registered_nodes[node_n_e.name].buildable_to then
+					minetest.swap_node(north_east, {name="trunks:twig_11"})
+				end
+			end
+		elseif twig_size == 22 then
+			n1 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z})
+			n2 = minetest.get_node({x=pos.x+1,y=pos.y,z=pos.z-1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=1})
+				end
+				if minetest.registered_nodes[node_east.name].buildable_to then
+					minetest.swap_node(east,		  {name="trunks:twig_10", param2=1})
+				end
+				if minetest.registered_nodes[node_s_e.name].buildable_to then
+					minetest.swap_node(south_east, {name="trunks:twig_11", param2=1})
+				end
+			end
+		elseif twig_size == 23 then
+			n1 = minetest.get_node({x=pos.x,y=pos.y,z=pos.z-1})
+			n2 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z-1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=2})
+				end
+				if minetest.registered_nodes[node_south.name].buildable_to then
+					minetest.swap_node(south,	  {name="trunks:twig_10", param2=2})
+				end
+				if minetest.registered_nodes[node_s_w.name].buildable_to then
+					minetest.swap_node(south_west, {name="trunks:twig_11", param2=2})
+				end
+			end
+		elseif twig_size == 24 then
+			n1 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z})
+			n2 = minetest.get_node({x=pos.x-1,y=pos.y,z=pos.z+1})
+			r1 = n1 and minetest.registered_nodes[n1.name]
+			r2 = n2 and minetest.registered_nodes[n2.name]
+			if not (r1 and r1.buildable_to or r2 and r2.buildable_to) then
+				if minetest.registered_nodes[node_here.name].buildable_to then
+					minetest.swap_node(right_here, {name="trunks:twig_9", param2=3})
+				end
+				if minetest.registered_nodes[node_west.name].buildable_to then
+					minetest.swap_node(west,		  {name="trunks:twig_10", param2=3})
+				end
+				if minetest.registered_nodes[node_n_w.name].buildable_to then
+					minetest.swap_node(north_west, {name="trunks:twig_11", param2=3})
+				end
+			end
+		elseif twig_size <= 25 then
+			minetest.swap_node(right_here, {name="trunks:twig_"..math.random(12,13), param2=math.random(0,3)})
 		end
 	elseif twig_size == 18 then
 		if not (check_node_buildable_to({x=pos.x+1,y=pos.y,z=pos.z-1})

trunks/nodes.lua

@@ -1,6 +1,8 @@
 -- Code by Mossmanikin & Neuromancer
 -- support for i18n
 local S = minetest.get_translator("trunks")
+
+local random = math.random
 -----------------------------------------------------------------------------------------------
 -- TWiGS
 -----------------------------------------------------------------------------------------------
@@ -66,7 +68,6 @@ end
 -----------------------------------------------------------------------------------------------
 -- MoSS
 -----------------------------------------------------------------------------------------------
-
 --			wall_top    = {-0.4375, 0.4375, -0.3125, 0.4375, 0.5, 0.3125},
 --			wall_bottom = {-0.4375, -0.5, -0.3125, 0.4375, -0.4375, 0.3125},
 --			wall_side   = {-0.5, -0.3125, -0.4375, -0.4375, 0.3125, 0.4375},

vines/init.lua

@@ -36,6 +36,8 @@ end
 
 -- FUNCTIONS
 
+local random = math.random
+
 local function on_dig(pos, node, player)
 	if not player or minetest.is_protected(pos, player:get_player_name()) then
 		return
@@ -139,7 +141,7 @@ vines.register_vine = function( name, defs, biome )
 		on_construct = function(pos)
 
 			local timer = minetest.get_node_timer(pos)
-			timer:start(math.random(growth_min, growth_max))
+			timer:start(random(growth_min, growth_max))
 		end,
 
 		on_timer = function(pos)
@@ -149,7 +151,7 @@ vines.register_vine = function( name, defs, biome )
 			local bottom_node = minetest.get_node( bottom )
 			if bottom_node.name == "air" then
 
-				if math.random(defs.average_length) ~= 1 then
+				if random(defs.average_length) ~= 1 then
 
 					minetest.swap_node(pos, {
 							name = vine_name_middle, param2 = node.param2})
@@ -159,7 +161,7 @@ vines.register_vine = function( name, defs, biome )
 
 					local timer = minetest.get_node_timer(bottom_node)
 
-					timer:start(math.random(growth_min, growth_max))
+					timer:start(random(growth_min, growth_max))
 				end
 			end
 		end,

youngtrees/init.lua

@@ -146,4 +146,6 @@ minetest.register_on_generated(function(minp, maxp, blockseed)
         local timer = minetest.get_node_timer({x=pos.x, y=pos.y+1, z=pos.z})
         timer:start(0)
     end
-end)
+end)
+
+minetest.log("action", "[youngtrees] loaded.")