Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev

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

bushes/init.lua

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

cavestuff/init.lua

@@ -7,8 +7,6 @@ local mname		= "cavestuff"
 -- support for i18n
 local S = minetest.get_translator("cavestuff")
 
-cavestuff = {}
-
 dofile(minetest.get_modpath("cavestuff").."/nodes.lua")
 dofile(minetest.get_modpath("cavestuff").."/mapgen.lua")
 

cavestuff/mapgen.lua

@@ -1,39 +1,52 @@
 --Map Generation Stuff
 
-biome_lib:register_generate_plant(
-	{
-		surface = {
-			"default:dirt_with_grass",
-			"default:gravel",
-			"default:stone",
-			"default:permafrost_with_stones"
-		},
-		max_count = 50,
-		rarity = 0,
-		plantlife_limit = -1,
-		check_air = true,
-		random_facedir = {0, 3}
-	},
-	{
-		"cavestuff:pebble_1",
-		"cavestuff:pebble_2"
-	}
-)
+minetest.register_on_generated(function(minp, maxp, seed)
+	if maxp.y >= 2 and minp.y <= 0 then
+		-- Generate pebbles
+		local perlin1 = minetest.get_perlin(329, 3, 0.6, 100)
+		-- Assume X and Z lengths are equal
+		local divlen = 16
+		local divs = (maxp.x-minp.x)/divlen+1;
+		for divx=0,divs-1 do
+		for divz=0,divs-1 do
+			local x0 = minp.x + math.floor((divx+0)*divlen)
+			local z0 = minp.z + math.floor((divz+0)*divlen)
+			local x1 = minp.x + math.floor((divx+1)*divlen)
+			local z1 = minp.z + math.floor((divz+1)*divlen)
+			-- Determine pebble amount from perlin noise
+			local pebble_amount = math.floor(perlin1:get2d({x=x0, y=z0}) ^ 2 * 2)
+			-- Find random positions for pebbles based on this random
+			local pr = PseudoRandom(seed+1)
+			for i=0,pebble_amount do
+				local x = pr:next(x0, x1)
+				local z = pr:next(z0, z1)
+				-- Find ground level (0...15)
+				local ground_y = nil
+				for y=30,0,-1 do
+					if minetest.get_node({x=x,y=y,z=z}).name ~= "air" then
+						ground_y = y
+						break
+					end
+				end
 
-biome_lib:register_generate_plant(
-	{
-		surface = {
-			"default:desert_sand",
-			"default:desert_stone"
-		},
-		max_count = 50,
-		rarity = 0,
-		plantlife_limit = -1,
-		check_air = true,
-		random_facedir = {0, 3}
-	},
-	{
-		"cavestuff:desert_pebble_1",
-		"cavestuff:desert_pebble_2"
-	}
-)
+				if ground_y then
+					local p = {x=x,y=ground_y+1,z=z}
+					local nn = minetest.get_node(p).name
+					-- Check if the node can be replaced
+					if minetest.registered_nodes[nn] and
+						minetest.registered_nodes[nn].buildable_to then
+						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
+						-- If desert sand, add dry shrub
+						if nn == "default:dirt_with_grass" then
+							minetest.swap_node(p,{name="cavestuff:pebble_"..pr:next(1,2), param2=math.random(0,3)})
+						elseif nn == "default:desert_sand" then
+							minetest.swap_node(p,{name="cavestuff:desert_pebble_"..pr:next(1,2), param2=math.random(0,3)})
+					    end
+					end
+				end
+
+			end
+		end
+		end
+	end
+end)

cavestuff/mod.conf

@@ -1,2 +1,2 @@
 name = cavestuff
-depends = default,biome_lib
+depends = default

dryplants/moregrass.lua

@@ -7,24 +7,26 @@
 -- Looked at code from:		default
 -----------------------------------------------------------------------------------------------
 
-biome_lib:register_generate_plant(
-	{
-		surface = {
-			"default:dirt_with_grass",
-			"stoneage:grass_with_silex",
-			"sumpf:peat",
-			"sumpf:sumpf"
-		},
-		max_count = TALL_GRASS_PER_MAPBLOCK,
-		rarity = 101 - TALL_GRASS_RARITY,
-		min_elevation = 1, -- above sea level
-		plantlife_limit = -0.9,
-		check_air = true,
+abstract_dryplants.grow_grass = function(pos)
+	local right_here = {x=pos.x, y=pos.y+1, z=pos.z}
+	local grass_size = math.random(1,5)
+	if minetest.get_node(right_here).name == "air"  -- instead of check_air = true,
+	or minetest.get_node(right_here).name == "default:junglegrass" then
+		minetest.swap_node(right_here, {name="default:grass_"..grass_size})
+	end
+end
+
+biome_lib:register_generate_plant({
+    surface = {
+		"default:dirt_with_grass",
+		"stoneage:grass_with_silex",
+		"sumpf:peat",
+		"sumpf:sumpf"
 	},
-	{	"default:grass_1",
-		"default:grass_2",
-		"default:grass_3",
-		"default:grass_4",
-		"default:grass_5"
-	}
+    max_count = TALL_GRASS_PER_MAPBLOCK,
+    rarity = 101 - TALL_GRASS_RARITY,
+    min_elevation = 1, -- above sea level
+	plantlife_limit = -0.9,
+  },
+  abstract_dryplants.grow_grass
 )

ferns/gianttreefern.lua

@@ -252,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)
-        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

@@ -138,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)
-        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,
 })
 
 -----------------------------------------------------------------------------------------------

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.")

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!"))

trunks/nodes.lua

@@ -42,14 +42,6 @@ for i in pairs(NoDe) do
 		liquids_pointable = true,
 		on_place = function(itemstack, placer, pointed_thing)
 			local pt = pointed_thing
-
-			if not placer then return end
-			local playername = placer:get_player_name()
-			if minetest.is_protected(pt.above, playername) then 
-				minetest.record_protection_violation(pt.above, playername)
-				return
-			end
-
 			local direction = minetest.dir_to_facedir(placer:get_look_dir())
 			if minetest.get_node(pt.above).name=="air" then
 				minetest.swap_node(pt.above, {name="trunks:twig_"..math.random(1,4), param2=direction})
@@ -79,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(),
 })
 
@@ -98,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(),
 })
 

woodsoils/nodes.lua

@@ -19,11 +19,6 @@ minetest.register_node("woodsoils:dirt_with_leaves_1", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	soil = {
-		base = "woodsoils:dirt_with_leaves_1",
-		dry = "farming:soil",
-		wet = "farming:soil_wet"
-	}
 })
 
 minetest.register_node("woodsoils:dirt_with_leaves_2", {
@@ -42,11 +37,6 @@ minetest.register_node("woodsoils:dirt_with_leaves_2", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	soil = {
-		base = "woodsoils:dirt_with_leaves_2",
-		dry = "farming:soil",
-		wet = "farming:soil_wet"
-	}
 })
 
 minetest.register_node("woodsoils:grass_with_leaves_1", {
@@ -65,11 +55,6 @@ minetest.register_node("woodsoils:grass_with_leaves_1", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	soil = {
-		base = "woodsoils:grass_with_leaves_1",
-		dry = "farming:soil",
-		wet = "farming:soil_wet"
-	}
 })
 
 minetest.register_node("woodsoils:grass_with_leaves_2", {
@@ -88,11 +73,6 @@ minetest.register_node("woodsoils:grass_with_leaves_2", {
 	sounds = default.node_sound_dirt_defaults({
 		footstep = {name="default_grass_footstep", gain=0.4},
 	}),
-	soil = {
-		base = "woodsoils:grass_with_leaves_2",
-		dry = "farming:soil",
-		wet = "farming:soil_wet"
-	}
 })
 
 -- For compatibility with older stuff

youngtrees/init.lua

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