Merged the three new trees and the correct normals for Coniferous2 and 3 from the milestone repository.

Tree_Deciduous into Objects
Deco_Tree_Deciduous2 into Decoration
Deco_Tree_Deciduous2 into Decoration

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Deco_Tree_Deciduous2_Burned
+Version=6,1
+Category=C4D_StaticBack
+Width=38
+Height=80
+Offset=-19,-40
+Vertices=10
+VertexX=0,0,0,0,0,0,0,0,0,0
+VertexY=40,38,30,20,10,0,-10,-20,-30,-35
+VertexCNAT=8,16,16,16,16,16,16,16,16,4
+VertexFriction=50,50,25,25,25,25,25,50,50,50
+Components=Wood=5
+Mass=120
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/Script.c

@@ -0,0 +1,14 @@
+/*-- Another Burned Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+public func IsBurnedTree()
+{
+	return true;
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 1;
+local ContactIncinerate = 3;

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Verbrannter Baum

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Deciduous2Burned.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Burned tree

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Deco_Tree_Deciduous2
+Version=6,1
+Category=C4D_StaticBack
+Width=38
+Height=80
+Offset=-19,-40
+Vertices=10
+VertexX=0,0,0,0,0,0,0,0,0,0
+VertexY=40,38,30,20,10,0,-10,-20,-30,-35
+VertexCNAT=8,16,16,16,16,16,16,16,16,4
+VertexFriction=50,50,25,25,25,25,25,50,50,50
+Components=Wood=5
+Mass=150
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Scene.material

@@ -0,0 +1,29 @@
+material Bushy_Tree
+{
+	receive_shadows off
+	
+	technique 0
+	{
+		pass 0
+		{
+			cull_hardware none
+
+			ambient 0.500000 0.500000 0.500000 1.000000
+			diffuse 0.800000 0.316192 0.800000 1.000000
+			specular 0.500000 0.500000 0.500000 1.000000 12.500000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			scene_blend alpha_blend
+			depth_write off
+			
+			texture_unit base
+			{
+				texture bushy.png
+				tex_address_mode wrap
+				filtering trilinear
+				colour_op_ex source1 src_texture src_texture
+			}
+		}
+	}
+}
+
+

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/Script.c

@@ -0,0 +1,21 @@
+/*-- Another Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+private func SeedChance() { return 500; }
+private func SeedArea() { return 400; }
+private func SeedAmount() { return 10; }
+
+local lib_tree_burned = Deco_Tree_Deciduous2_Burned;
+
+public func GetTreetopPosition(pos)
+{
+	return Shape->Rectangle(-28,-20, 46,40)->GetRandomPoint(pos);
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 2;
+local ContactIncinerate = 6;
+local NoBurnDecay = 1;

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Buschiger Baum

planet/Decoration.ocd/Vegetation.ocd/Deciduous2.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Bushy tree

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Deco_Tree_Deciduous3_Burned
+Version=6,1
+Category=C4D_StaticBack
+Width=50
+Height=50
+Offset=-25,-25
+Vertices=5
+VertexX=0,0,0,0,0
+VertexY=20,10,0,-10,-20
+VertexCNAT=8,16,16,16,4
+VertexFriction=50,25,25,25,50
+Components=Wood=5
+Mass=150
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/Script.c

@@ -0,0 +1,18 @@
+/*-- Yet Another Burned Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+public func IsBurnedTree()
+{
+	return true;
+}
+
+public func Incineration() {
+	SetClrModulation(RGB(100,100,100));
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 1;
+local ContactIncinerate = 3;

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Toter Baum

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Deciduous3Burned.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=dead tree

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Deco_Tree_Deciduous3
+Version=6,1
+Category=C4D_StaticBack
+Width=40
+Height=50
+Offset=-20,-25
+Vertices=5
+VertexX=0,0,0,0,0
+VertexY=20,10,0,-10,-20
+VertexCNAT=8,16,16,16,4
+VertexFriction=50,25,25,25,50
+Components=Wood=4
+Mass=110
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Scene.material

@@ -0,0 +1,40 @@
+material deciduous3_leaves_1
+{
+    receive_shadows on
+    technique
+    {
+        pass
+        {
+			cull_hardware none
+			alpha_rejection greater_equal 128
+
+            diffuse 1.0 1.0 1.0
+
+            texture_unit 
+            {
+                texture leaves.png
+                tex_address_mode wrap
+                filtering trilinear
+            }
+        }
+    }
+}
+
+material deciduous3_trunk_1
+{
+    receive_shadows on
+    technique
+    {
+        pass
+        {
+			diffuse 1.0 1.0 1.0
+
+            texture_unit
+            {
+                texture trunk.png
+                tex_address_mode wrap
+                filtering trilinear
+            }
+        }
+    }
+}

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/Script.c

@@ -0,0 +1,21 @@
+/*-- Yet Another Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+private func SeedChance() { return 500; }
+private func SeedArea() { return 400; }
+private func SeedAmount() { return 10; }
+
+local lib_tree_burned = Deco_Tree_Deciduous3_Burned;
+
+public func GetTreetopPosition(pos)
+{
+	return Shape->Rectangle(-20,-15, 25,30)->GetRandomPoint(pos);
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 2;
+local ContactIncinerate = 6;
+local NoBurnDecay = 1;

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Laubbaum

planet/Decoration.ocd/Vegetation.ocd/Deciduous3.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Deciduous tree

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Tree_Deciduous_Burned
+Version=6,1
+Category=C4D_StaticBack
+Width=46
+Height=70
+Offset=-23,-35
+Vertices=9
+VertexX=0,0,0,0,0,0,0,0,0
+VertexY=35,28,20,10,0,-10,-20,-25,-30
+VertexCNAT=8,16,16,16,16,16,16,16,4
+VertexFriction=50,50,25,25,25,25,50,50,50
+Components=Wood=5
+Mass=80
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/Script.c

@@ -0,0 +1,14 @@
+/*-- Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+public func IsBurnedTree()
+{
+	return true;
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 1;
+local ContactIncinerate = 3;

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Laubbaum

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DeciduousBurned.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Broadleaf

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/DefCore.txt

@@ -0,0 +1,18 @@
+[DefCore]
+id=Tree_Deciduous
+Version=6,1
+Category=C4D_StaticBack
+Width=46
+Height=70
+Offset=-23,-35
+Vertices=9
+VertexX=0,0,0,0,0,0,0,0,0
+VertexY=35,28,20,10,0,-10,-20,-25,-30
+VertexCNAT=8,16,16,16,16,16,16,16,4
+VertexFriction=50,50,25,25,25,25,50,50,50
+Components=Wood=5
+Mass=150
+StretchGrowth=1
+Oversize=1
+Float=1
+Rotate=1

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Scene.material

@@ -0,0 +1,25 @@
+material DecTreeMat
+{
+	receive_shadows on
+	technique
+	{
+		pass
+		{
+			cull_hardware none
+			scene_blend alpha_blend
+			depth_check off
+		
+			ambient 1.000000 1.000000 1.000000 1.000000
+			diffuse 1.000000 1.000000 1.000000 1.000000
+			specular 0.000000 0.000000 0.000000 1.000000 12.500000
+			emissive 0.000000 0.000000 0.000000 1.000000
+			
+			texture_unit
+			{
+				texture deciduous.png
+				tex_address_mode wrap
+				filtering trilinear
+			}
+		}
+	}
+}

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/Script.c

@@ -0,0 +1,21 @@
+/*-- Deciduous Tree --*/
+
+#include Library_Plant
+#include Library_Tree
+
+private func SeedChance() { return 500; }
+private func SeedArea() { return 400; }
+private func SeedAmount() { return 10; }
+
+local lib_tree_burned = Tree_Deciduous_Burned;
+
+public func GetTreetopPosition(pos)
+{
+	return Shape->Rectangle(-28,-20, 46,40)->GetRandomPoint(pos);
+}
+
+local Name = "$Name$";
+local Touchable = 0;
+local BlastIncinerate = 2;
+local ContactIncinerate = 6;
+local NoBurnDecay = 1;

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/StringTblDE.txt

@@ -0,0 +1 @@
+Name=Laubbaum

planet/Objects.ocd/Vegetation.ocd/Trees.ocd/Deciduous.ocd/StringTblUS.txt

@@ -0,0 +1 @@
+Name=Broadleaf