Merge pull request #3111 from Mailaender/ra-building-artwork

Red Alert building artwork polishing

OpenRA.Mods.RA/Render/RenderBuildingSilo.cs

@@ -30,9 +30,10 @@ namespace OpenRA.Mods.RA.Render
 			Info = info;
 		}
 
-		public void BuildingComplete( Actor self )
+		public void BuildingComplete(Actor self)
 		{
-			anim.PlayFetchIndex("idle",
+			var animation = (self.GetDamageState() >= DamageState.Heavy) ? "damaged-idle" : "idle";
+			anim.PlayFetchIndex(animation,
 				() => playerResources.OreCapacity != 0
 					? (Info.FillSteps * playerResources.Ore) / (10 * playerResources.OreCapacity)
 					: 0);

mods/ra/rules/structures.yaml

@@ -948,7 +948,8 @@ FACT:
 		Facing: 96
 	ProductionBar:
 	-Sellable:
-		
+	DeadBuildingState:
+
 PROC:
 	Inherits: ^Building
 	Buildable:
@@ -990,6 +991,7 @@ PROC:
 		Percentage: 50
 		Minimum: 500
 		SoundToVictim: credit1.aud
+	DeadBuildingState:
 
 SILO:
 	Inherits: ^Building
@@ -1014,6 +1016,7 @@ SILO:
 	RevealsShroud:
 		Range: 4
 	RenderBuildingSilo:
+		FillSteps: 89
 	StoresOre:
 		PipCount: 5
 		Capacity: 1500
@@ -1133,6 +1136,7 @@ POWR:
 		Range: 4
 	Bib:
 	IronCurtainable:
+	DeadBuildingState:
 
 APWR:
 	Inherits: ^Building
@@ -1161,6 +1165,7 @@ APWR:
 		Range: 4
 	Bib:
 	IronCurtainable:
+	DeadBuildingState:
 
 STEK:
 	Inherits: ^Building

mods/ra/sequences.yaml

@@ -50,6 +50,8 @@ fact:
 	damaged-build:
 		Start: 27
 		Length: 25
+	dead: factdead
+		Start: 0
 
 proc:
 	idle:
@@ -59,14 +61,16 @@ proc:
 	make: procmake
 		Start: 0
 		Length: *
+	dead: procdead
+		Start: 0
 
 silo:
-	idle:
+	idle: silo2
 		Start: 0
-		Length: 5
-	damaged-idle:
-		Start: 5
-		Length: 5
+		Length: 9
+	damaged-idle: silo2
+		Start: 9
+		Length: 9
 	make: silomake
 		Start: 0
 		Length: *
@@ -79,6 +83,8 @@ powr:
 	make: powrmake
 		Start: 0
 		Length: *
+	dead: powrdead
+		Start: 0
 
 apwr:
 	idle:
@@ -88,6 +94,8 @@ apwr:
 	make: apwrmake
 		Start: 0
 		Length: *
+	dead: apwrdead
+		Start: 0
 
 barr:
 	idle:
@@ -158,9 +166,9 @@ weap:
 	make: weapmake
 		Start: 0
 		Length: *
-	build-top: weap2
+	build-top: weap3
 		Start: 0
-		Length: 4
+		Length: 10
 	damaged-build-top: weap2
 		Start: 4
 		Length: 4