add acacia trees

grows in the desert near the edges of the biome

10 files changed, 68 insertions, 16 deletions

diff --git a/biome_defs.lua b/biome_defs.lua
index 323433c..8c50de7 100644
--- a/biome_defs.lua
+++ b/biome_defs.lua
@@ -90,6 +90,18 @@ moretrees.willow_biome = {
 	max_count = 5,
 }
 
+moretrees.acacia_biome = {
+	surface = { "default:dirt_with_grass", "default:desert_sand" },
+	avoid_nodes = moretrees.avoidnodes,
+	avoid_radius = 15,
+	seed_diff = 1,
+	rarity = 50,
+	max_count = 15,
+	plantlife_limit = -1,
+	humidity_min = 0.3,
+	humidity_max = 0,
+}
+
 moretrees.rubber_tree_biome = {
 	surface = "default:dirt_with_grass",
 	avoid_nodes = moretrees.avoidnodes,
@@ -168,3 +180,4 @@ moretrees.fir_biome_snow = {
 	delete_above = true,
 	spawn_replace_node = true
 }
+
diff --git a/default_settings.txt b/default_settings.txt
index 2c08374..a7887c5 100644
--- a/default_settings.txt
+++ b/default_settings.txt
@@ -7,11 +7,12 @@ moretrees.enable_oak			= true
 moretrees.enable_sequoia		= true
 moretrees.enable_palm			= true
 moretrees.enable_pine			= true
-moretrees.enable_rubber_tree		= true
+moretrees.enable_rubber_tree	= true
 moretrees.enable_willow			= true
+moretrees.enable_acacia			= true
 moretrees.enable_birch			= true
 moretrees.enable_spruce			= true
-moretrees.enable_jungle_tree		= true
+moretrees.enable_jungle_tree	= true
 moretrees.enable_fir			= true
 moretrees.enable_beech			= false
 
diff --git a/init.lua b/init.lua
index b9aa270..786b9e9 100644
--- a/init.lua
+++ b/init.lua
@@ -92,6 +92,7 @@ if moretrees.spawn_saplings then
 	moretrees.spawn_pine_object = "moretrees:pine_sapling_ongen"
 	moretrees.spawn_rubber_tree_object = "moretrees:rubber_tree_sapling_ongen"
 	moretrees.spawn_willow_object = "moretrees:willow_sapling_ongen"
+	moretrees.spawn_acacia_object = "moretrees:acacia_sapling_ongen"
 	moretrees.spawn_birch_object = "moretrees:birch_sapling_ongen"
 	moretrees.spawn_spruce_object = "moretrees:spruce_sapling_ongen"
 	moretrees.spawn_jungletree_object = "moretrees:jungletree_sapling_ongen"
@@ -106,6 +107,7 @@ else
 	moretrees.spawn_pine_object = moretrees.pine_model
 	moretrees.spawn_rubber_tree_object = moretrees.rubber_tree_model
 	moretrees.spawn_willow_object = moretrees.willow_model
+	moretrees.spawn_acacia_object = moretrees.acacia_model
 	moretrees.spawn_birch_object = "moretrees:grow_birch"
 	moretrees.spawn_spruce_object = "moretrees:grow_spruce"
 	moretrees.spawn_jungletree_object = "moretrees:grow_jungletree"
@@ -146,6 +148,10 @@ if moretrees.enable_willow then
 	plantslib:register_generate_plant(moretrees.willow_biome, moretrees.spawn_willow_object)
 end
 
+if moretrees.enable_acacia then
+	plantslib:register_generate_plant(moretrees.acacia_biome, moretrees.spawn_acacia_object)
+end
+
 if moretrees.enable_birch then
 	plantslib:register_generate_plant(moretrees.birch_biome, moretrees.spawn_birch_object)
 end
diff --git a/node_defs.lua b/node_defs.lua
index 890e929..c487189 100644
--- a/node_defs.lua
+++ b/node_defs.lua
@@ -10,18 +10,19 @@ end
 moretrees.avoidnodes = {}
 	
 moretrees.treelist = {
-	{"beech",	"Beech Tree"},
+	{"beech",		"Beech Tree"},
 	{"apple_tree",	"Apple Tree"},
-	{"oak",		"Oak Tree",		"acorn",	"Acorn",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
-	{"sequoia",	"Giant Sequoia"},
-	{"birch",	"Birch Tree"},
-	{"palm",	"Palm Tree",		"coconut",	"Coconut",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
-	{"spruce",	"Spruce Tree",		"spruce_cone",	"Spruce Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
-	{"pine",	"Pine Tree",		"pine_cone",	"Pine Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
-	{"willow",	"Willow Tree"},
+	{"oak",			"Oak Tree",			"acorn",		"Acorn",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"sequoia",		"Giant Sequoia"},
+	{"birch",		"Birch Tree"},
+	{"palm",		"Palm Tree",		"coconut",		"Coconut",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 1.0 },
+	{"spruce",		"Spruce Tree",		"spruce_cone",	"Spruce Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"pine",		"Pine Tree",		"pine_cone",	"Pine Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"willow",		"Willow Tree"},
+	{"acacia",		"Acacia Tree"},
 	{"rubber_tree",	"Rubber Tree"},
 	{"jungletree",	"Jungle Tree"},
-	{"fir",		"Douglas Fir",		"fir_cone",	"Fir Cone",	{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
+	{"fir",			"Douglas Fir",		"fir_cone",		"Fir Cone",		{-0.2, -0.5, -0.2, 0.2, 0, 0.2}, 0.8 },
 }
 
 local dirs1 = { 21, 20, 23, 22, 21 }
diff --git a/textures/moretrees_acacia_leaves.png b/textures/moretrees_acacia_leaves.png
new file mode 100644
index 0000000..08cf399
--- /dev/null
+++ b/textures/moretrees_acacia_leaves.png
diff --git a/textures/moretrees_acacia_sapling.png b/textures/moretrees_acacia_sapling.png
new file mode 100644
index 0000000..07170a0
--- /dev/null
+++ b/textures/moretrees_acacia_sapling.png
diff --git a/textures/moretrees_acacia_trunk.png b/textures/moretrees_acacia_trunk.png
new file mode 100644
index 0000000..169823d
--- /dev/null
+++ b/textures/moretrees_acacia_trunk.png
diff --git a/textures/moretrees_acacia_trunk_top.png b/textures/moretrees_acacia_trunk_top.png
new file mode 100644
index 0000000..2cf5ef0
--- /dev/null
+++ b/textures/moretrees_acacia_trunk_top.png
diff --git a/textures/moretrees_acacia_wood.png b/textures/moretrees_acacia_wood.png
new file mode 100644
index 0000000..f5e6a68
--- /dev/null
+++ b/textures/moretrees_acacia_wood.png
diff --git a/tree_models.lua b/tree_models.lua
index 5d88ce8..f1cf5a5 100644
--- a/tree_models.lua
+++ b/tree_models.lua
@@ -9,8 +9,8 @@ moretrees.beech_model={
 	angle=30,
 	iterations=2,
 	random_level=0,
-	trunk_type="single";
-	thin_branches=true;
+	trunk_type="single",
+	thin_branches=true
 }
 
 moretrees.apple_tree_model={
@@ -23,7 +23,7 @@ moretrees.apple_tree_model={
 	iterations=2,
 	random_level=0,
 	trunk_type="single",
-	thin_branches=true;
+	thin_branches=true,
 	fruit="default:apple",
 	fruit_chance=15,
 }
@@ -37,8 +37,8 @@ moretrees.oak_model={
 	angle=30,
 	iterations=5,
 	random_level=2,
-	trunk_type="crossed";
-	thin_branches=false;
+	trunk_type="crossed",
+	thin_branches=false,
 	fruit="moretrees:acorn",
 	fruit_chance=3,
 }
@@ -169,6 +169,37 @@ moretrees.willow_model={
 	thin_branches=true
 }
 
+moretrees.acacia_model={
+	axiom="FFFFFFccccA",
+	rules_a = "[B]//[B]//[B]//[B]",
+	rules_b = "&TTTT&TT^^G&&----GGGGGG++GGG++"	-- line up with the "canvas" edge
+			.."fffffffGG++G++"					-- first layer, drawn in a zig-zag raster pattern
+			.."Gffffffff--G--"
+			.."ffffffffG++G++"
+			.."fffffffff--G--"
+			.."fffffffff++G++"
+			.."fffffffff--G--"
+			.."ffffffffG++G++"
+			.."Gffffffff--G--"
+			.."fffffffGG"
+			.."^^G&&----GGGGGGG++GGGGGG++"		-- re-align to second layer canvas edge
+			.."ffffGGG++G++"					-- second layer
+			.."GGfffff--G--"
+			.."ffffffG++G++"
+			.."fffffff--G--"
+			.."ffffffG++G++"
+			.."GGfffff--G--"
+			.."ffffGGG",
+	rules_c = "/",
+	trunk="moretrees:acacia_trunk",
+	leaves="moretrees:acacia_leaves",
+	angle=45,
+	iterations=3,
+	random_level=0,
+	trunk_type="single",
+	thin_branches=true,
+}
+
 moretrees.rubber_tree_model={
 	axiom="FFFFA",
 	rules_a="[&FFBFA]////[&BFFFA]////[&FBFFA]",