Remove some bs from buildings with multiple damage states; cnc civilian structure rubble persists after death.

OpenRA.Mods.Cnc/CriticalBuildingState.cs

@@ -1,44 +0,0 @@
-#region Copyright & License Information
-/*
- * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
- * This file is part of OpenRA, which is free software. It is made 
- * available to you under the terms of the GNU General Public License
- * as published by the Free Software Foundation. For more information,
- * see LICENSE.
- */
-#endregion
-
-using OpenRA.Effects;
-using OpenRA.Traits;
-
-namespace OpenRA.Mods.Cnc
-{
-	class CriticalBuildingStateInfo : ITraitInfo, ITraitPrerequisite<HealthInfo>
-	{
-		public readonly int LingerTime = 20;
-		public object Create(ActorInitializer init) { return new CriticalBuildingState(init.self, this); }
-	}
-
-	class CriticalBuildingState : INotifyDamage
-	{
-		CriticalBuildingStateInfo info;
-
-		public CriticalBuildingState(Actor self, CriticalBuildingStateInfo info)
-		{
-			this.info = info;
-			self.traits.Get<Health>().RemoveOnDeath = false;
-		}
-
-		public void Damaged(Actor self, AttackInfo e)
-		{
-			if (e.DamageStateChanged && e.DamageState == DamageState.Dead)
-			{
-				self.traits.Get<RenderSimple>().anim.PlayRepeating("critical-idle");
-				self.World.AddFrameEndTask(
-					w => w.Add(
-						new DelayedAction(info.LingerTime,
-							() => w.Remove(self))));
-			}
-		}
-	}
-}

OpenRA.Mods.Cnc/DeadBuildingState.cs

@@ -0,0 +1,48 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2010 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made 
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see LICENSE.
+ */
+#endregion
+
+using OpenRA.Effects;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.Cnc
+{
+	class DeadBuildingStateInfo : ITraitInfo, ITraitPrerequisite<HealthInfo>, ITraitPrerequisite<RenderSimpleInfo>
+	{
+		public readonly int LingerTime = 20;
+		public readonly bool Zombie = false; // Civilian structures stick around after death
+		public object Create(ActorInitializer init) { return new DeadBuildingState(init.self, this); }
+	}
+
+	class DeadBuildingState : INotifyDamage
+	{
+		DeadBuildingStateInfo info;
+		RenderSimple rs;
+		public DeadBuildingState(Actor self, DeadBuildingStateInfo info)
+		{
+			this.info = info;
+			rs = self.traits.Get<RenderSimple>();
+			self.traits.Get<Health>().RemoveOnDeath = !rs.anim.HasSequence("dead");
+		}
+
+		public void Damaged(Actor self, AttackInfo e)
+		{
+			if (e.DamageStateChanged && e.DamageState == DamageState.Dead)
+			{
+				if (!rs.anim.HasSequence("dead")) return;
+				rs.anim.PlayRepeating("dead");
+				if (!info.Zombie)
+					self.World.AddFrameEndTask(
+						w => w.Add(
+							new DelayedAction(info.LingerTime,
+								() => w.Remove(self))));
+			}
+		}
+	}
+}

OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -52,7 +52,6 @@
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CriticalBuildingState.cs" />
     <Compile Include="Effects\IonCannon.cs" />
     <Compile Include="IonCannonPower.cs" />
     <Compile Include="PoisonedByTiberium.cs" />
@@ -60,6 +59,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TiberiumRefineryDockAction.cs" />
     <Compile Include="MobileAir.cs" />
+    <Compile Include="DeadBuildingState.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">