Merge pull request #8942 from reaperrr/explodes2

Add specific exception message when Explodes cannot find a weapon

OpenRA.Mods.Common/Traits/Explodes.cs

@@ -8,6 +8,7 @@
  */
 #endregion
 
+using System;
 using System.Linq;
 using OpenRA.Mods.Common.Warheads;
 using OpenRA.Traits;
@@ -17,7 +18,7 @@ namespace OpenRA.Mods.Common.Traits
 	[Desc("This actor explodes when killed.")]
 	public class ExplodesInfo : ITraitInfo
 	{
-		[WeaponReference, Desc("Weapon to use for explosion if ammo/payload is loaded.")]
+		[WeaponReference, FieldLoader.Require, Desc("Weapon to use for explosion if ammo/payload is loaded.")]
 		public readonly string Weapon = "UnitExplode";
 
 		[WeaponReference, Desc("Weapon to use for explosion if no ammo/payload is loaded.")]
@@ -54,9 +55,13 @@ namespace OpenRA.Mods.Common.Traits
 				return;
 
 			var weaponName = ChooseWeaponForExplosion(self);
-			if (weaponName == null)
+			if (string.IsNullOrEmpty(weaponName))
 				return;
 
+			if (!e.Attacker.World.Map.Rules.Weapons.ContainsKey(weaponName.ToLowerInvariant()))
+				throw new InvalidOperationException("Actor " + self.Info.Name
+					+ ": Could not find weapon '" + weaponName.ToLowerInvariant() + "', check for typos.");
+
 			var weapon = e.Attacker.World.Map.Rules.Weapons[weaponName.ToLowerInvariant()];
 			if (weapon.Report != null && weapon.Report.Any())
 				Sound.Play(weapon.Report.Random(e.Attacker.World.SharedRandom), self.CenterPosition);

mods/d2k/rules/infantry.yaml

@@ -164,7 +164,7 @@ grenadier:
 		IdleSequences: idle
 	Explodes:
 		Weapon: UnitExplodeSmall
-		Chance: 100
+		EmptyWeapon: UnitExplodeSmall
 	AttractsWorms:
 		Intensity: 180