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)
-			{
-				if (Info.DeathWeapon != null)
-				{
-					Combat.DoExplosion(e.Attacker, Info.DeathWeapon,
-						self.CenterLocation.ToInt2(), 0);
-				}
-				
-				// Lose the stored ore
-				Player.TakeOre(Stored(self));
-			}
+				Player.TakeOre(Stored(self));		// Lose the stored ore
 		}
 		
 		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
 	{