v2 explodes with napalm if it dies while loaded

OpenRA.Game/Traits/Explodes.cs

@@ -22,7 +22,11 @@ using OpenRA.Effects;
 
 namespace OpenRA.Traits
 {
-	class ExplodesInfo : TraitInfo<Explodes> { public readonly string Weapon = "UnitExplode"; }
+	class ExplodesInfo : TraitInfo<Explodes>
+	{
+		public readonly string Weapon = "UnitExplode";
+		public readonly string EmptyWeapon = "UnitExplode";
+	}
 
 	class Explodes : INotifyDamage
 	{
@@ -30,12 +34,26 @@ namespace OpenRA.Traits
 		{
 			if (self.IsDead)
 			{
-				var unit = self.traits.GetOrDefault<Unit>();
-				var altitude = unit != null ? unit.Altitude : 0;
-				Combat.DoExplosion(e.Attacker, 
-					self.Info.Traits.Get<ExplodesInfo>().Weapon, 
-					self.CenterLocation.ToInt2(), altitude);
+				var weapon = ChooseWeaponForExplosion(self);
+				if (weapon != null)
+				{
+					var unit = self.traits.GetOrDefault<Unit>();
+					var altitude = unit != null ? unit.Altitude : 0;
+					Combat.DoExplosion(e.Attacker,
+						self.Info.Traits.Get<ExplodesInfo>().Weapon,
+						self.CenterLocation.ToInt2(), altitude);
+				}
 			}
 		}
+
+		string ChooseWeaponForExplosion(Actor self)
+		{
+			var info = self.Info.Traits.Get<ExplodesInfo>();
+			var attack = self.traits.GetOrDefault<AttackBase>();
+
+			if (attack == null) return info.Weapon;
+
+			return attack.IsReloading() ? info.EmptyWeapon : info.Weapon;
+		}
 	}
 }

mods/ra/vehicles.yaml

@@ -57,6 +57,9 @@ V2RL:
 		PrimaryWeapon: SCUD
 	RenderUnitReload:
 	AutoTarget:
+	Explodes:
+		Weapon: SCUD
+		EmptyWeapon:
 
 1TNK:
 	Inherits: ^Vehicle
@@ -84,6 +87,7 @@ V2RL:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	LeavesHusk:
 		HuskActor: 1TNK.Husk
 
@@ -113,6 +117,7 @@ V2RL:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	LeavesHusk:
 		HuskActor: 2TNK.Husk
 
@@ -142,6 +147,7 @@ V2RL:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	LeavesHusk:
 		HuskActor: 3TNK.Husk
 
@@ -174,6 +180,7 @@ V2RL:
 	AutoTarget:
 	Explodes:
 		Weapon: UnitExplodeSmall
+		EmptyWeapon: UnitExplodeSmall
 	LeavesHusk:
 		HuskActor: 4TNK.Husk