Merge remote-tracking branch 'upstream/master'

fixes #6

biome_defs.lua

@@ -125,7 +125,10 @@ moretrees.willow_biome = {
 }
 
 moretrees.rubber_tree_biome = {
-	surface = "default:dirt_with_grass",
+	surface = {
+		"default:dirt_with_grass",
+		"default:sand",
+	},
 	avoid_nodes = moretrees.avoidnodes,
 	avoid_radius = 10,
 	seed_diff = 338,

default_settings.txt

@@ -55,6 +55,7 @@ moretrees.leafdecay_delay		= 2
 moretrees.leafdecay_chance		= 5
 moretrees.leafdecay_radius		= 5
 moretrees.palm_leafdecay_radius		= 10
+moretrees.date_palm_leafdecay_radius	= 14
 
 -- Change these settings if you want default trees to be gradually cut down
 -- above the elevation where firs normally generate.

node_defs.lua

@@ -215,6 +215,7 @@ local dirs2 = { 12, 9, 18, 7, 12 }
 
 local moretrees_new_leaves_drawtype = "allfaces_optional"
 local moretrees_plantlike_leaves_visual_scale = 1
+local moretrees_new_leaves_waving = 1
 
 if moretrees.plantlike_leaves then
 	moretrees_new_leaves_drawtype = "plantlike"
@@ -261,7 +262,7 @@ for i in ipairs(moretrees.treelist) do
 		droprarity = 20
 		decay = moretrees.palm_leafdecay_radius
 	elseif treename == "date_palm" then
-		decay = moretrees.palm_leafdecay_radius
+		decay = moretrees.date_palm_leafdecay_radius
 	end
 
 	if treename ~= "jungletree"  -- the default game provides jungle tree and pine trunk/planks nodes.
@@ -322,12 +323,9 @@ for i in ipairs(moretrees.treelist) do
 		})
 
 		local moretrees_leaves_inventory_image = nil
-		local moretrees_new_leaves_waving = nil
 
 		if moretrees.plantlike_leaves then
 			moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_"..treename.."_leaves.png")
-		else
-			moretrees_new_leaves_waving = 1
 		end
 
 		minetest.register_node("moretrees:"..treename.."_leaves", {
@@ -578,8 +576,6 @@ for color = 1, #jungleleaves do
 
 	if moretrees.plantlike_leaves then
 		moretrees_leaves_inventory_image = minetest.inventorycube("moretrees_jungletree_leaves_"..jungleleaves[color]..".png")
-	else
-		moretrees_new_leaves_waving = 1
 	end
 
 	minetest.register_node(leave_name, {
@@ -607,7 +603,8 @@ end
 -- we need our own copy of that node, which moretrees will match against.
 
 local jungle_tree = table.copy(minetest.registered_nodes["default:jungletree"])
-jungle_tree.drop = "default:jungletree"
+jungle_tree.drop = jungle_tree.drop or { items = {} }
+table.insert(jungle_tree.drop.items, { items = {"default:jungletree"}})
 minetest.register_node("moretrees:jungletree_trunk", jungle_tree)
 
 default.register_leafdecay({

saplings.lua

@@ -6,6 +6,9 @@
 local dirt_surfaces = {
 	set = true,
 	["default:dirt"] = true,
+	["default:dirt_with_snow"] = true,
+	["default:dry_dirt"] = true,
+	["default:dry_dirt_with_dry_grass"] = true,
 	["default:dirt_with_grass"] = true,
 	["default:dirt_with_dry_grass"] = true,
 	["default:dirt_with_coniferous_litter"] = true,
@@ -13,7 +16,8 @@ local dirt_surfaces = {
 	["woodsoils:dirt_with_leaves_1"] = true,
 	["woodsoils:dirt_with_leaves_2"] = true,
 	["woodsoils:grass_with_leaves_1"] = true,
-	["woodsoils:grass_with_leaves_2"] = true
+	["woodsoils:grass_with_leaves_2"] = true,
+	["meditteranean_biome:dirt_with_mediterranean_grass"] = true
 }
 
 local conifer_surfaces =  {
@@ -27,7 +31,8 @@ local conifer_surfaces =  {
 	["woodsoils:dirt_with_leaves_2"] = true,
 	["woodsoils:grass_with_leaves_1"] = true,
 	["woodsoils:grass_with_leaves_2"] = true,
-	["default:dirt_with_snow"] = true
+	["default:dirt_with_snow"] = true,
+	["meditteranean_biome:dirt_with_mediterranean_grass"] = true
 }
 
 local sand_surfaces = {
@@ -35,6 +40,7 @@ local sand_surfaces = {
 	["default:sand"] = true,
 	["default:desert_sand"] = true,
 	["cottages:loam"] = true,
+	["darkage:mud"] = true,
 	-- note, no silver sand here.
 	-- too cold for a palm, too... well... sandy for anything else.
 }
@@ -64,7 +70,7 @@ for i in ipairs(moretrees.treelist) do
 		grow_function = "moretrees.grow_"..treename
 	end
 
-	biome_lib:dbg(dump(moretrees[tree_biome].surface))
+	biome_lib.dbg(dump(moretrees[tree_biome].surface), 4)
 
 	biome_lib:grow_plants({
 		grow_delay = moretrees.sapling_interval,

tree_models.lua

@@ -146,7 +146,7 @@ moretrees.palm_model={
 -- So, a generic fruit trunk is spawned. An ABM will convert it to a male
 -- or female fruit trunk, and generate the actual dates.
 moretrees.date_palm_model={
-	axiom="TTTTddddddddddccccccccccRT[TGGGGT]"..
+	axiom="TTTTddddddddddccccccccccRT[TTT]"..
 		"ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]ccccc[&&a]"..
 		"GGccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]ccccc[&a]"..
 		"GGccccc[a]ccccc[a]ccccc[a]ccccc[a]ccccc[a]ccccc[a]",