remove DeathWeapon; IExplodeModifier implemented for resource actors (and for V2, which was the original purpose)

OpenRA.Game/Traits/AttackBase.cs

@@ -44,7 +44,7 @@ namespace OpenRA.Traits
 		public virtual object Create(ActorInitializer init) { return new AttackBase(init.self); }
 	}
 
-	public class AttackBase : IIssueOrder, IResolveOrder, ITick
+	public class AttackBase : IIssueOrder, IResolveOrder, ITick, IExplodeModifier
 	{
 		[Sync] public Actor target;
 
@@ -77,6 +77,8 @@ namespace OpenRA.Traits
 			return true;
 		}
 
+		public bool ShouldExplode(Actor self) { return !IsReloading(); }
+
 		public bool IsReloading()
 		{
 			return (primaryFireDelay > 0) || (secondaryFireDelay > 0);

OpenRA.Game/Traits/StoresOre.cs

@@ -27,11 +27,10 @@ namespace OpenRA.Traits
 		public readonly int PipCount = 0;
 		public readonly PipType PipColor = PipType.Yellow;
 		public readonly int Capacity = 0;
-		[WeaponReference] public readonly string DeathWeapon = null;
 		public object Create(ActorInitializer init) { return new StoresOre(init.self, this); }
 	}
 
-	class StoresOre : IPips, INotifyCapture, INotifyDamage
+	class StoresOre : IPips, INotifyCapture, INotifyDamage, IExplodeModifier
 	{		
 		readonly PlayerResources Player;
 		readonly StoresOreInfo Info;
@@ -57,16 +56,7 @@ namespace OpenRA.Traits
 		public void Damaged(Actor self, AttackInfo e)
 		{
 			if (self.IsDead && Player.GetSiloFullness() > 0)
-			{
+				Player.TakeOre(Stored(self));		// Lose the stored ore
-				if (Info.DeathWeapon != null)
-				{
-					Combat.DoExplosion(e.Attacker, Info.DeathWeapon,
-						self.CenterLocation.ToInt2(), 0);
-				}
-				
-				// Lose the stored ore
-				Player.TakeOre(Stored(self));
-			}
 		}
 		
 		public IEnumerable<PipType> GetPips(Actor self)
@@ -75,5 +65,7 @@ namespace OpenRA.Traits
 				i => (Player.GetSiloFullness() > i * 1.0f / Info.PipCount) 
 					? Info.PipColor : PipType.Transparent );
 		}
+
+		public bool ShouldExplode(Actor self) { return Player.GetSiloFullness() > 0; }
 	}
 }

OpenRA.Game/Traits/TraitsInterfaces.cs

@@ -61,6 +61,7 @@ namespace OpenRA.Traits
 	public interface ITerrainCost { float GetTerrainCost(int2 cell, Actor forActor); }
 
 	public interface IDisable { bool Disabled { get; } }
+	public interface IExplodeModifier { bool ShouldExplode(Actor self); }
 
 	public interface IOccupySpace
 	{

OpenRA.Mods.RA/Explodes.cs

@@ -18,6 +18,7 @@
  */
 #endregion
 
+using System.Linq;
 using OpenRA.Traits;
 
 namespace OpenRA.Mods.RA
@@ -49,12 +50,10 @@ namespace OpenRA.Mods.RA
 
 		string ChooseWeaponForExplosion(Actor self)
 		{
+			var shouldExplode = self.traits.WithInterface<IExplodeModifier>().All(a => a.ShouldExplode(self));
+
 			var info = self.Info.Traits.Get<ExplodesInfo>();
-			var attack = self.traits.GetOrDefault<AttackBase>();
+			return shouldExplode ? info.Weapon : info.EmptyWeapon;
-
-			if (attack == null) return info.Weapon;
-
-			return attack.IsReloading() ? info.EmptyWeapon : info.Weapon;
 		}
 	}
 }

OpenRA.Mods.RA/Harvester.cs

@@ -32,13 +32,11 @@ namespace OpenRA.Mods.RA
 		public readonly int PipCount = 7;
 		public readonly PipType PipColor = PipType.Yellow;
 		public readonly string[] Resources = { };
-		[WeaponReference]
-		public readonly string DeathWeapon = null;
 
 		public object Create(ActorInitializer init) { return new Harvester(init.self, this); }
 	}
 
-	public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips, IRenderModifier
+	public class Harvester : IIssueOrder, IResolveOrder, INotifyDamage, IPips, IRenderModifier, IExplodeModifier
 	{
 		Dictionary<ResourceTypeInfo, int> contents = new Dictionary<ResourceTypeInfo, int>();
 		
@@ -143,17 +141,9 @@ namespace OpenRA.Mods.RA
 		public void Damaged(Actor self, AttackInfo e)
 		{
 			if (self.IsDead)
-			{
-				if (Info.DeathWeapon != null && contents.Count > 0)
-				{
-					Combat.DoExplosion(e.Attacker, Info.DeathWeapon,
-									  self.CenterLocation.ToInt2(), 0);
-				}
-				
 				if (LinkedProc != null)
 					LinkedProc.traits.WithInterface<IAcceptOre>().FirstOrDefault().UnlinkHarvester(LinkedProc,self);
 		}
-		}
 		
 		public void LinkProc(Actor self, Actor proc)
 		{
@@ -186,5 +176,7 @@ namespace OpenRA.Mods.RA
 		{
 			return Visible ? r : new Renderable[] { };
 		}
+
+		public bool ShouldExplode(Actor self) { return !IsEmpty; }
 	}
 }

OpenRA.Mods.RA/OreRefinery.cs

@@ -36,13 +36,11 @@ namespace OpenRA.Mods.RA
 		public readonly int Capacity = 0;
 		public readonly int ProcessTick = 25;
 		public readonly int ProcessAmount = 50;
-		[WeaponReference]
-		public readonly string DeathWeapon = null;
 
 		public object Create(ActorInitializer init) { return new OreRefinery(init.self, this); }
 	}
 
-	class OreRefinery : ITick, IAcceptOre, INotifyDamage, INotifySold, INotifyCapture, IPips
+	class OreRefinery : ITick, IAcceptOre, INotifyDamage, INotifySold, INotifyCapture, IPips, IExplodeModifier
 	{
 		readonly Actor self;
 		readonly OreRefineryInfo Info;
@@ -106,15 +104,10 @@ namespace OpenRA.Mods.RA
 
 		public void Damaged (Actor self, AttackInfo e)
 		{
-			if (self.IsDead) {
+			if (self.IsDead)
-				if (Info.DeathWeapon != null && Ore > 0) {
-					Combat.DoExplosion (e.Attacker, Info.DeathWeapon, self.CenterLocation.ToInt2 (), 0);
-				}
-				
 				foreach (var harv in LinkedHarv)
 					harv.traits.Get<Harvester> ().UnlinkProc(harv, self);
 		}
-		}
 
 		public int2 DeliverOffset {get{ return Info.DockOffset; }}
 		public void OnDock (Actor harv, DeliverResources dockOrder)
@@ -146,5 +139,7 @@ namespace OpenRA.Mods.RA
 			
 			return Graphics.Util.MakeArray (Info.PipCount, i => (Ore * 1f / Info.Capacity > i * 1f / Info.PipCount) ? Info.PipColor : PipType.Transparent);
 		}
+
+		public bool ShouldExplode(Actor self) { return Ore > 0; }
 	}
 }