Merge pull request #5198 from reaperrr/tibtree-fix

Closes #3107

mods/cnc/rules/defaults.yaml

@@ -485,6 +485,24 @@
 		StartsRevealed: true
 	LuaScriptEvents:
 
+^TibTree:
+	Tooltip:
+		Name: Blossom Tree
+	RenderBuilding:
+		Palette: staticterrain
+	Building:
+		Footprint: x
+		Dimensions: 1,1
+	AppearsOnRadar:
+	RadarColorFromTerrain:
+		Terrain: Tiberium
+	EditorAppearance:
+		RelativeToTopLeft: yes
+	BodyOrientation:
+	FrozenUnderFog:
+		StartsRevealed: true
+	LuaScriptEvents:
+
 ^Rock:
 	Tooltip:
 		Name: Rock

mods/cnc/rules/trees.yaml

@@ -1,37 +1,17 @@
 SPLIT2:
-	Inherits: ^Tree
+	Inherits: ^TibTree
-	RenderBuilding:
-		Palette: staticterrain
 	SeedsResource:
 		ResourceType: Tiberium
 		Interval: 55
-	Tooltip:
-		Name: Blossom Tree
-	RadarColorFromTerrain:
-		Terrain: Tiberium
-	-Health:
-	-DeadBuildingState:
-	-Armor:
 
 SPLIT3:
-	Inherits: ^Tree
+	Inherits: ^TibTree
-	RenderBuilding:
-		Palette: staticterrain
 	SeedsResource:
 		ResourceType: Tiberium
 		Interval: 55
-	Tooltip:
-		Name: Blossom Tree
-	RadarColorFromTerrain:
-		Terrain: Tiberium
-	-Health:
-	-DeadBuildingState:
-	-Armor:
 
 SPLITBLUE:
-	Inherits: ^Tree
+	Inherits: ^TibTree
-	RenderBuilding:
-		Palette: staticterrain
 	SeedsResource:
 		ResourceType: BlueTiberium
 		Interval: 110
@@ -39,9 +19,6 @@ SPLITBLUE:
 		Name: Blossom Tree (blue)
 	RadarColorFromTerrain:
 		Terrain: BlueTiberium
-	-Health:
-	-DeadBuildingState:
-	-Armor:
 
 ROCK1:
 	Inherits: ^Rock

mods/cnc/sequences/decorations.yaml

@@ -2,31 +2,40 @@ split2:
 	make:
 		Start: 0
 		Length: 30
+		Offset: 11, -15
 	active:
 		Start: 30
 		Length: 24
+		Offset: 11, -15
 	idle:
 		Start: 54
+		Offset: 11, -15
 
 split3:
 	make: split2
 		Start: 0
 		Length: 30
+		Offset: 11, -15
 	active: split2
 		Start: 30
 		Length: 24
+		Offset: 11, -15
 	idle: split2
 		Start: 54
+		Offset: 11, -15
 
 splitblue:
 	make: split3
 		Start: 0
 		Length: 30
+		Offset: 11, -15
 	active: split3
 		Start: 30
 		Length: 24
+		Offset: 11, -15
 	idle: split3
 		Start: 54
+		Offset: 11, -15
 
 rock1:
 	idle: