Add support for multiple explosions to CreateEffectWarhead

Have the engine pick one explosion at random from the provided list.
2016-01-02 16:47:56 +02:00
parent c22281876c
commit 7e3ec91d30
35 changed files with 292 additions and 279 deletions
--- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
+++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs
@@ -3432,6 +3432,18 @@ namespace OpenRA.Mods.Common.UtilityCommands
 					node.Value.Nodes.RemoveAll(x => x.Key == "Charges");
 				}

+				// Enhance CreateEffectWarhead
+				if (engineVersion < 20160131)
+				{
+					if (node.Key.StartsWith("Warhead") && node.Value.Value == "CreateEffect")
+					{
+						// Add support for multiple explosions to CreateEffectWarhead
+						var explosionNode = node.Value.Nodes.FirstOrDefault(x => x.Key == "Explosion");
+						if (explosionNode != null)
+							explosionNode.Key = "Explosions";
+					}
+				}
+
 				UpgradeWeaponRules(engineVersion, ref node.Value.Nodes, node, depth + 1);
 			}
 		}
--- a/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
+++ b/OpenRA.Mods.Common/Warheads/CreateEffectWarhead.cs
@@ -17,11 +17,11 @@ namespace OpenRA.Mods.Common.Warheads
 {
 	public class CreateEffectWarhead : Warhead
 	{
-		[Desc("Explosion effect to use.")]
-		public readonly string Explosion = null;
+		[Desc("List of explosion effects that can be used.")]
+		public readonly string[] Explosions = new string[0];

-		[Desc("Palette to use for explosion effect.")]
-		[PaletteReference("UsePlayerPalette")] public readonly string ExplosionPalette = "effect";
+		[Desc("Palette to use for explosion effect."), PaletteReference("UsePlayerPalette")]
+		public readonly string ExplosionPalette = "effect";

 		[Desc("Remap explosion effect to player color, if art supports it.")]
 		public readonly bool UsePlayerPalette = false;
@@ -99,8 +99,9 @@ namespace OpenRA.Mods.Common.Warheads
 			if (UsePlayerPalette)
 				palette += firedBy.Owner.InternalName;

-			if (Explosion != null)
-				world.AddFrameEndTask(w => w.Add(new Explosion(w, pos, Explosion, palette)));
+			var explosion = Explosions.RandomOrDefault(Game.CosmeticRandom);
+			if (explosion != null)
+				world.AddFrameEndTask(w => w.Add(new Explosion(w, pos, explosion, palette)));

 			if (ImpactSound != null)
 				Game.Sound.Play(ImpactSound, pos);
--- a/mods/cnc/weapons/explosions.yaml
+++ b/mods/cnc/weapons/explosions.yaml
@@ -4,7 +4,7 @@ FlametankExplode:
 		Damage: 100
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: big_napalm
+		Explosions: big_napalm
 		ImpactSound: xplobig6.aud

 HeliCrash:
@@ -13,14 +13,14 @@ HeliCrash:
 		Damage: 40
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: poof
+		Explosions: poof
 		ImpactSound: xplos.aud

 HeliExplode:
 	Warhead@1Dam: SpreadDamage
 		DamageTypes: ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_building
+		Explosions: small_building
 		ImpactSound: xplos.aud

 UnitExplode:
@@ -34,7 +34,7 @@ UnitExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: poof
+		Explosions: poof
 		ImpactSound: xplobig6.aud

 UnitExplodeSmall:
@@ -48,7 +48,7 @@ UnitExplodeSmall:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: big_frag
+		Explosions: big_frag
 		ImpactSound: xplobig4.aud

 GrenadierExplode:
@@ -62,7 +62,7 @@ GrenadierExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: poof
+		Explosions: poof
 		ImpactSound: xplosml2.aud

 Napalm.Crate:
@@ -80,5 +80,5 @@ Napalm.Crate:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
+		Explosions: med_napalm
 		ImpactSound: flamer2.aud
--- a/mods/cnc/weapons/largecaliber.yaml
+++ b/mods/cnc/weapons/largecaliber.yaml
@@ -18,7 +18,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 105mm:
@@ -40,7 +40,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 120mm:
@@ -63,7 +63,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 120mmDual:
@@ -88,7 +88,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 TurretGun:
@@ -110,7 +110,7 @@ TurretGun:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 ArtilleryShell:
@@ -137,5 +137,5 @@ ArtilleryShell:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: poof
+		Explosions: poof
 		ImpactSound: XPLOSML2.AUD
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -28,7 +28,7 @@ Rockets:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 BikeRockets:
@@ -62,7 +62,7 @@ BikeRockets:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 OrcaAGMissiles:
@@ -96,7 +96,7 @@ OrcaAGMissiles:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 OrcaAAMissiles:
@@ -128,7 +128,7 @@ OrcaAAMissiles:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 MammothMissiles:
@@ -161,11 +161,11 @@ MammothMissiles:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
+		Explosions: small_poof
 		ImpactSound: xplos.aud
 		InvalidImpactTypes: Air, AirHit
 	Warhead@4EffAir: CreateEffect
-		Explosion: small_building
+		Explosions: small_building
 		ImpactSound: xplos.aud
 		ValidImpactTypes: Air, AirHit

@@ -201,7 +201,7 @@ MammothMissiles:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_frag
+		Explosions: med_frag
 		ImpactSound: xplos.aud

 227mm.stnk:
@@ -234,7 +234,7 @@ MammothMissiles:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
 		ImpactSound: xplos.aud

 BoatMissile:
@@ -265,11 +265,11 @@ BoatMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
+		Explosions: small_poof
 		ImpactSound: xplos.aud
 		InvalidImpactTypes: Air, AirHit
 	Warhead@4EffAir: CreateEffect
-		Explosion: small_building
+		Explosions: small_building
 		ImpactSound: xplos.aud
 		ValidImpactTypes: Air, AirHit

@@ -301,7 +301,7 @@ TowerMissle:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_frag
+		Explosions: med_frag
 		ImpactSound: xplos.aud

 SAMMissile:
@@ -331,7 +331,7 @@ SAMMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_building
+		Explosions: small_building
 		ImpactSound: xplos.aud

 HonestJohn:
@@ -360,7 +360,7 @@ HonestJohn:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
+		Explosions: small_poof
 		ImpactSound: xplos.aud

 Patriot:
@@ -387,5 +387,5 @@ Patriot:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: poof
+		Explosions: poof
 		ImpactSound: xplos.aud
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -18,7 +18,7 @@ Flamethrower:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm
 		ImpactSound: flamer2.aud

 BigFlamer:
@@ -43,7 +43,7 @@ BigFlamer:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
+		Explosions: med_napalm
 		ImpactSound: flamer2.aud

 Chemspray:
@@ -64,7 +64,7 @@ Chemspray:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: chemball
+		Explosions: chemball
 		ImpactSound: xplos.aud

 Grenade:
@@ -89,7 +89,7 @@ Grenade:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_poof
+		Explosions: small_poof
 		ImpactSound: xplos.aud

 Napalm:
@@ -114,7 +114,7 @@ Napalm:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: med_napalm
+		Explosions: med_napalm
 		ImpactSound: flamer2.aud

 Laser:
@@ -155,7 +155,7 @@ TiberiumExplosion:
 		AddsResourceType: Tiberium
 		Size: 1,1
 	Warhead@3Eff: CreateEffect
-		Explosion: chemball
+		Explosions: chemball
 		ImpactSound: xplosml2.aud

 Heal:
@@ -236,5 +236,5 @@ Demolish:
 	Warhead@1Dam: SpreadDamage
 		DamageTypes: DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: xplobig6.aud
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -28,7 +28,7 @@ HighV:
 			Heavy: 35
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 HeliAGGun:
 	ReloadDelay: 20
@@ -52,7 +52,7 @@ HeliAGGun:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 HeliAAGun:
 	ReloadDelay: 20
@@ -76,7 +76,7 @@ HeliAAGun:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 Pistol:
 	ReloadDelay: 7
@@ -96,7 +96,7 @@ Pistol:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piff
+		Explosions: piff

 M16:
 	ReloadDelay: 20
@@ -116,7 +116,7 @@ M16:
 			Heavy: 10
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piff
+		Explosions: piff

 MachineGun:
 	ReloadDelay: 20
@@ -138,7 +138,7 @@ MachineGun:
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 Vulcan:
 	ValidTargets: Ground, Water
@@ -158,7 +158,7 @@ Vulcan:
 			Heavy: 35
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 APCGun:
 	ReloadDelay: 18
@@ -178,7 +178,7 @@ APCGun:
 			Heavy: 50
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_poof
+		Explosions: small_poof

 APCGun.AA:
 	ReloadDelay: 18
@@ -196,4 +196,4 @@ APCGun.AA:
 			Heavy: 50
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_frag
+		Explosions: small_frag
--- a/mods/cnc/weapons/superweapons.yaml
+++ b/mods/cnc/weapons/superweapons.yaml
@@ -13,7 +13,7 @@ Atomic:
 			Heavy: 50
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
 	Warhead@2Eff_impact: CreateEffect
-		Explosion: nuke_explosion
+		Explosions: nuke_explosion
 		ImpactSound: nukexplo.aud
 	Warhead@3Dam_areanukea: SpreadDamage
 		Spread: 2c512
--- a/mods/d2k/weapons/debris.yaml
+++ b/mods/d2k/weapons/debris.yaml
@@ -26,7 +26,7 @@ Debris:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: EXPLLG5.WAV

 Debris2:
@@ -60,7 +60,7 @@ Debris2:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: EXPLLG5.WAV

 Debris3:
@@ -94,7 +94,7 @@ Debris3:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: EXPLLG5.WAV

 Debris4:
@@ -128,5 +128,5 @@ Debris4:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: EXPLLG5.WAV
--- a/mods/d2k/weapons/largeguns.yaml
+++ b/mods/d2k/weapons/largeguns.yaml
@@ -25,7 +25,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm
 		ImpactSound: EXPLSML4.WAV

 80mm_A:
@@ -53,7 +53,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm

 80mm_H:
 	ReloadDelay: 55
@@ -80,7 +80,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm

 80mm_O:
 	ReloadDelay: 45
@@ -107,7 +107,7 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm

 DevBullet:
 	ReloadDelay: 75
@@ -131,7 +131,7 @@ DevBullet:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: shockwave
+		Explosions: shockwave
 		ImpactSound: EXPLMD1.WAV

 155mm:
@@ -162,5 +162,5 @@ DevBullet:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: EXPLMD2.WAV
--- a/mods/d2k/weapons/missiles.yaml
+++ b/mods/d2k/weapons/missiles.yaml
@@ -28,7 +28,7 @@ Bazooka:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: tiny_explosion
+		Explosions: tiny_explosion
 		ImpactSound: EXPLSML1.WAV

 Rocket:
@@ -60,7 +60,7 @@ Rocket:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: rocket_explosion
+		Explosions: rocket_explosion
 		ExplosionPalette: effect75alpha
 		ImpactSound: EXPLSML1.WAV

@@ -100,7 +100,7 @@ TowerMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: EXPLSML1.WAV

 mtank_pri:
@@ -138,7 +138,7 @@ mtank_pri:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: EXPLSML1.WAV

 DeviatorMissile:
@@ -175,7 +175,7 @@ DeviatorMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: deviator
+		Explosions: deviator
 		ExplosionPalette: deviatorgas
 		UsePlayerPalette: true
 		ImpactSound: EXPLSML1.WAV
--- a/mods/d2k/weapons/other.yaml
+++ b/mods/d2k/weapons/other.yaml
@@ -91,7 +91,7 @@ OrniBomb:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: NAPALM1.WAV

 Crush:
@@ -105,7 +105,7 @@ Demolish:
 	Warhead@1Dam: SpreadDamage
 		DamageTypes: ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: EXPLLG2.WAV

 Atomic:
@@ -125,7 +125,7 @@ Atomic:
 			harvester: 60
 		DamageTypes: Prone50Percent, TriggerProne, SoundDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: nuke
+		Explosions: nuke
 		ImpactSound: EXPLLG2.WAV

 CrateNuke:
@@ -146,7 +146,7 @@ CrateNuke:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, SoundDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: nuke
+		Explosions: nuke
 		ImpactSound: EXPLLG2.WAV

 CrateExplosion:
@@ -167,22 +167,22 @@ CrateExplosion:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: EXPLSML4.WAV

 UnitExplodeSmall:
 	Warhead@1Eff: CreateEffect
-		Explosion: self_destruct
+		Explosions: self_destruct
 		ImpactSound: EXPLSML1.WAV

 UnitExplodeMed:
 	Warhead@1Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: EXPLSML2.WAV

 UnitExplodeLarge:
 	Warhead@1Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: EXPLLG2.WAV

 grenade:
@@ -211,7 +211,7 @@ grenade:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: EXPLLG5.WAV

 Weathering:
@@ -236,7 +236,7 @@ GrenDeath:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: EXPLSML4.WAV

 SardDeath:
@@ -257,7 +257,7 @@ SardDeath:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm
 		ImpactSound: EXPLSML2.WAV

 SpiceExplosion:
@@ -287,7 +287,7 @@ SpiceExplosion:
 		AddsResourceType: Spice
 		Size: 1
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion

 BloomExplosion:
 	Report: EXPLMD1.WAV
@@ -320,4 +320,4 @@ BloomSpawn:
 		Blockable: false
 		Image: null
 	Warhead@1Eff: CreateEffect
-		Explosion: bloomspawn
+		Explosions: bloomspawn
--- a/mods/d2k/weapons/smallguns.yaml
+++ b/mods/d2k/weapons/smallguns.yaml
@@ -19,7 +19,7 @@ LMG:
 			harvester: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 Fremen_S:
 	ReloadDelay: 40
@@ -42,7 +42,7 @@ Fremen_S:
 			harvester: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: EXPLSML2.WAV

 M_LMG:
@@ -66,7 +66,7 @@ M_LMG:
 			harvester: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 M_HMG:
 	ReloadDelay: 40
@@ -88,7 +88,7 @@ M_HMG:
 			harvester: 50
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 Fremen_L:
 	ReloadDelay: 40
@@ -111,7 +111,7 @@ Fremen_L:
 			harvester: 50
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion

 HMG:
 	ReloadDelay: 20
@@ -134,7 +134,7 @@ HMG:
 			harvester: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 HMGo:
 	ReloadDelay: 18
@@ -157,7 +157,7 @@ HMGo:
 			harvester: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs

 HMG_muzzle:
 	ReloadDelay: 16
--- a/mods/ra/maps/allies-05a/map.yaml
+++ b/mods/ra/maps/allies-05a/map.yaml
@@ -1834,7 +1834,7 @@ Weapons:
 				Concrete: 0
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@2Eff: CreateEffect
-			Explosion: piffs
+			Explosions: piffs
 			InvalidImpactTypes: Water

 Voices:
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -289,7 +289,7 @@ Weapons:
 			Damage: 250
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@1Eff: CreateEffect
-			Explosion: large_explosion
+			Explosions: large_explosion
 			WaterExplosion: large_splash
 			ImpactSound: kaboom12.aud
 			WaterImpactSound: splash9.aud
@@ -317,7 +317,7 @@ Weapons:
 			Damage: 400
 			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 		Warhead@1Eff: CreateEffect
-			Explosion: large_explosion
+			Explosions: large_explosion
 			WaterExplosion: large_splash
 			ImpactSound: kaboom12.aud
 			WaterImpactSound: splash9.aud
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -816,7 +816,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: self_destruct
+			Explosions: self_destruct
 			WaterExplosion: self_destruct
 	MammothTusk:
 		ReloadDelay: 300
@@ -850,7 +850,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: nuke
+			Explosions: nuke
 			WaterExplosion: nuke
 	TankNapalm:
 		ReloadDelay: 40
@@ -879,7 +879,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: small_explosion
+			Explosions: small_explosion
 			WaterExplosion: small_explosion
 			ImpactSound: firebl3.aud
 	ParaBomb:
@@ -901,7 +901,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 			WaterExplosion: napalm
 	155mm:
@@ -931,7 +931,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: small_napalm
+			Explosions: small_napalm
 			WaterExplosion: small_napalm
 			ImpactSound: firebl3.aud
 	FLAK-23:
@@ -956,7 +956,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: med_explosion
+			Explosions: med_explosion
 	SCUD:
 		ReloadDelay: 280
 		Range: 7c0
@@ -984,7 +984,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: nuke
+			Explosions: nuke
 			WaterExplosion: large_splash
 			ImpactSound: kaboom1.aud
 			WaterImpactSound: kaboom1.aud
@@ -1004,7 +1004,7 @@ Weapons:
 			Damage: 150
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@2Eff: CreateEffect
-			Explosion: piffs
+			Explosions: piffs

 Voices:

--- a/mods/ra/maps/monster-tank-madness/map.yaml
+++ b/mods/ra/maps/monster-tank-madness/map.yaml
@@ -2404,10 +2404,10 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3EffGround: CreateEffect
-			Explosion: small_explosion
+			Explosions: small_explosion
 			InvalidImpactTypes: Water
 		Warhead@4EffWater: CreateEffect
-			Explosion: small_splash
+			Explosions: small_splash
 			ValidImpactTypes: Water

 Voices:
--- a/mods/ra/maps/soviet-02b/map.yaml
+++ b/mods/ra/maps/soviet-02b/map.yaml
@@ -670,7 +670,7 @@ Weapons:
 			Size: 2,1
 			Delay: 5
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 			Delay: 5

--- a/mods/ra/maps/soviet-03/map.yaml
+++ b/mods/ra/maps/soviet-03/map.yaml
@@ -1290,7 +1290,7 @@ Weapons:
 			Size: 2,1
 			Delay: 5
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 			Delay: 5

--- a/mods/ra/maps/soviet-07/map.yaml
+++ b/mods/ra/maps/soviet-07/map.yaml
@@ -891,10 +891,10 @@ Weapons:
 				Concrete: 10
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@2Eff: CreateEffect
-			Explosion: piffs
+			Explosions: piffs
 			InvalidImpactTypes: Water
 		Warhead@3EffWater: CreateEffect
-			Explosion: water_piffs
+			Explosions: water_piffs
 			ValidImpactTypes: Water
 	FireballLauncherInterior:
 		ReloadDelay: 65
@@ -918,7 +918,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 	MissionBarrelExplodeInterior:
 		Warhead@1Dam: SpreadDamage
@@ -938,7 +938,7 @@ Weapons:
 			Size: 2,1
 			Delay: 5
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 			Delay: 5

--- a/mods/ra/maps/survival02/map.yaml
+++ b/mods/ra/maps/survival02/map.yaml
@@ -1171,11 +1171,11 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: firebl3.aud
 			InvalidImpactTypes: Water
 		Warhead@4EffWater: CreateEffect
-			Explosion: napalm
+			Explosions: napalm
 			ImpactSound: splash9.aud
 			ValidImpactTypes: Water

--- a/mods/ra/weapons/explosions.yaml
+++ b/mods/ra/weapons/explosions.yaml
@@ -13,7 +13,7 @@ CrateNapalm:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: firebl3.aud

 CrateExplosion:
@@ -29,7 +29,7 @@ CrateExplosion:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: self_destruct
+		Explosions: self_destruct
 		ImpactSound: kaboom15.aud

 CrateNuke:
@@ -44,7 +44,7 @@ CrateNuke:
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
 	Warhead@2Res_impact: DestroyResource
 	Warhead@3Eff_impact: CreateEffect
-		Explosion: nuke
+		Explosions: nuke
 		ImpactSound: kaboom1.aud
 	Warhead@4Dam_areanuke: SpreadDamage
 		Spread: 1c0
@@ -81,7 +81,7 @@ MiniNuke:
 	Warhead@2Res_impact: DestroyResource
 		Size: 1
 	Warhead@3Eff_impact: CreateEffect
-		Explosion: nuke
+		Explosions: nuke
 		ImpactSound: kaboom1.aud
 	Warhead@4Dam_areanuke1: SpreadDamage
 		Spread: 2c0
@@ -142,11 +142,11 @@ UnitExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: self_destruct
+		Explosions: self_destruct
 		ImpactSound: kaboom22.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -161,7 +161,7 @@ UnitExplodeShip:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: kaboom25.aud

 UnitExplodeSubmarine:
@@ -175,7 +175,7 @@ UnitExplodeSubmarine:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud

 UnitExplodeSmall:
@@ -189,11 +189,11 @@ UnitExplodeSmall:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -208,11 +208,11 @@ ArtilleryExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: self_destruct
+		Explosions: self_destruct
 		ImpactSound: kaboom22.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -234,7 +234,7 @@ BarrelExplode:
 		Size: 2,1
 		Delay: 5
 	Warhead@3Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: firebl3.aud
 		Delay: 5

@@ -245,7 +245,7 @@ ATMine:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: mineblo1.aud

 APMine:
@@ -255,7 +255,7 @@ APMine:
 		AffectsParent: true
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: mine1.aud

 OreExplosion:
@@ -272,5 +272,5 @@ OreExplosion:
 		AddsResourceType: Ore
 		Size: 1,1
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
--- a/mods/ra/weapons/largecaliber.yaml
+++ b/mods/ra/weapons/largecaliber.yaml
@@ -17,10 +17,10 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ValidImpactTypes: Water

 90mm:
@@ -42,11 +42,11 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -71,11 +71,11 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -101,11 +101,11 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -128,11 +128,11 @@ TurretGun:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -161,11 +161,11 @@ TurretGun:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery_explosion
+		Explosions: artillery_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -194,11 +194,11 @@ TurretGun:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery_explosion
+		Explosions: artillery_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -221,10 +221,10 @@ TurretGun:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -28,11 +28,11 @@ Maverick:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -65,11 +65,11 @@ Dragon:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -103,11 +103,11 @@ HellfireAG:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -141,11 +141,11 @@ HellfireAA:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -177,15 +177,15 @@ MammothTusk:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom12.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water
 	Warhead@5EffAir: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud
 		ValidImpactTypes: Air, AirHit

@@ -214,7 +214,7 @@ Nike:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud

 RedEye:
@@ -243,7 +243,7 @@ RedEye:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud

 SubMissile:
@@ -271,11 +271,11 @@ SubMissile:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery_explosion
+		Explosions: artillery_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -307,15 +307,15 @@ Stinger:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@5EffAir: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud
 		ValidImpactTypes: Air, AirHit
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -347,15 +347,15 @@ StingerAA:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@5EffAir: CreateEffect
-		Explosion: med_explosion_air
+		Explosions: med_explosion_air
 		ImpactSound: kaboom25.aud
 		ValidImpactTypes: Air, AirHit
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -388,15 +388,15 @@ TorpTube:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water, WaterHit
 	Warhead@4EffWaterHit: CreateEffect
-		Explosion: artillery_explosion
+		Explosions: artillery_explosion
 		ImpactSound: kaboom15.aud
 		ValidImpactTypes: WaterHit
 	Warhead@5EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -427,11 +427,11 @@ SCUD:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: firebl3.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -463,10 +463,10 @@ APTusk:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -20,7 +20,7 @@ FireballLauncher:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: firebl3.aud

 Flamer:
@@ -47,7 +47,7 @@ Flamer:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: small_napalm
+		Explosions: small_napalm
 		ImpactSound: firebl3.aud

 Napalm:
@@ -69,11 +69,11 @@ Napalm:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Scorch
 	Warhead@3Eff: CreateEffect
-		Explosion: napalm
+		Explosions: napalm
 		ImpactSound: firebl3.aud
 		InvalidImpactTypes: Water
 	Warhead@4Eff: CreateEffect
-		Explosion: med_splash
+		Explosions: med_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -99,11 +99,11 @@ Grenade:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: kaboom25.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -130,10 +130,10 @@ DepthCharge:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: large_splash
+		Explosions: large_splash
 		ImpactSound: h2obomb2.aud
 	Warhead@4EffHit: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		ImpactSound: kaboom15.aud
 		ValidImpactTypes: WaterHit

@@ -222,7 +222,7 @@ Demolish:
 	Warhead@1Dam: SpreadDamage
 		DamageTypes: DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: building
+		Explosions: building
 		ImpactSound: kaboom25.aud

 Claw:
@@ -274,5 +274,5 @@ MADTankDetonate:
 		SmudgeType: Crater
 		Size: 7,6
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
+		Explosions: med_explosion
 		ImpactSound: mineblo1.aud
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -12,10 +12,10 @@ Colt45:
 		ValidTargets: Barrel, Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piff
+		Explosions: piff
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piff
+		Explosions: water_piff
 		ValidImpactTypes: Water

 ZSU-23:
@@ -39,7 +39,7 @@ ZSU-23:
 			Concrete: 50
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_explosion_air
+		Explosions: small_explosion_air

 Vulcan:
 	ReloadDelay: 30
@@ -58,10 +58,10 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff_1: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@2Eff_1Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 	Warhead@3Dam_2: SpreadDamage
 		Spread: 128
@@ -75,11 +75,11 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@4Eff_2: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 		Delay: 2
 	Warhead@4Eff_2Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 		Delay: 2
 	Warhead@5Dam_3: SpreadDamage
@@ -94,11 +94,11 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@6Eff_3: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 		Delay: 4
 	Warhead@6Eff_3Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 		Delay: 4
 	Warhead@7Dam_4: SpreadDamage
@@ -113,11 +113,11 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@8Eff_4: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 		Delay: 6
 	Warhead@8Eff_4Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 		Delay: 6
 	Warhead@9Dam_5: SpreadDamage
@@ -132,11 +132,11 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@10Eff_5: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 		Delay: 8
 	Warhead@10Eff_5Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 		Delay: 8
 	Warhead@11Dam_6: SpreadDamage
@@ -151,11 +151,11 @@ Vulcan:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@12Eff_6: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 		Delay: 10
 	Warhead@12Eff_6Water: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water
 		Delay: 10

@@ -178,10 +178,10 @@ ChainGun:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water

 ChainGun.Yak:
@@ -202,10 +202,10 @@ ChainGun.Yak:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water

 Pistol:
@@ -224,10 +224,10 @@ Pistol:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piff
+		Explosions: piff
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piff
+		Explosions: water_piff
 		ValidImpactTypes: Water

 M1Carbine:
@@ -246,10 +246,10 @@ M1Carbine:
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water

 M60mg:
@@ -269,10 +269,10 @@ M60mg:
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water

 SilencedPPK:
@@ -289,10 +289,10 @@ SilencedPPK:
 		ValidTargets: Infantry
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ValidImpactTypes: Water

 FLAK-23-AA:
@@ -315,7 +315,7 @@ FLAK-23-AA:
 			Concrete: 20
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2EffAir: CreateEffect
-		Explosion: small_explosion_air
+		Explosions: small_explosion_air
 		ValidImpactTypes: Air, AirHit

 FLAK-23-AG:
@@ -338,10 +338,10 @@ FLAK-23-AG:
 			Concrete: 20
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_explosion
+		Explosions: small_explosion
 		InvalidImpactTypes: Air, AirHit
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ValidImpactTypes: Water

 Sniper:
--- a/mods/ra/weapons/superweapons.yaml
+++ b/mods/ra/weapons/superweapons.yaml
@@ -19,11 +19,11 @@ ParaBomb:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery_explosion
+		Explosions: artillery_explosion
 		ImpactSound: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
+		Explosions: small_splash
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water

@@ -43,7 +43,7 @@ Atomic:
 		SmudgeType: Scorch
 		Size: 1
 	Warhead@4Eff_impact: CreateEffect
-		Explosion: nuke
+		Explosions: nuke
 		ImpactSound: kaboom1.aud
 	Warhead@5Dam_areanuke1: SpreadDamage
 		Spread: 2c0
--- a/mods/ts/weapons/bombsandgrenades.yaml
+++ b/mods/ts/weapons/bombsandgrenades.yaml
@@ -19,11 +19,11 @@ Grenade:
 			Concrete: 28
 		DamageTypes: Prone70Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_grey_explosion
+		Explosions: large_grey_explosion
 		ImpactSound: expnew13.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -51,11 +51,11 @@ Bomb:
 			Concrete: 100
 		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: expnew09.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -84,11 +84,11 @@ RPGTower:
 			Concrete: 70
 		DamageTypes: Prone70Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_clsn
+		Explosions: large_clsn
 		ImpactSound: expnew14.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash2.aud
 		ValidImpactTypes: Water
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -123,11 +123,11 @@ CyCannon:
 			Concrete: 80
 		DamageTypes: Prone350Percent, TriggerProne, EnergyDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_bang
+		Explosions: large_bang
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -160,11 +160,11 @@ Proton:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_bang
+		Explosions: small_bang
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
--- a/mods/ts/weapons/explosions.yaml
+++ b/mods/ts/weapons/explosions.yaml
@@ -10,7 +10,7 @@ UnitExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_twlt
+		Explosions: large_twlt
 		ImpactSound: expnew09.aud

 UnitExplodeSmall:
@@ -24,7 +24,7 @@ UnitExplodeSmall:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: medium_brnl
+		Explosions: medium_brnl
 		ImpactSound: expnew13.aud

 TiberiumExplosion:
@@ -41,7 +41,7 @@ TiberiumExplosion:
 		AddsResourceType: Tiberium
 		Size: 1,1
 	Warhead@3Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: expnew09.aud

 SmallDebris:
--- a/mods/ts/weapons/largeguns.yaml
+++ b/mods/ts/weapons/largeguns.yaml
@@ -19,11 +19,11 @@
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: medium_clsn
+		Explosions: medium_clsn
 		ImpactSound: expnew14.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -47,11 +47,11 @@
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_clsn
+		Explosions: large_clsn
 		ImpactSound: expnew14.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -81,11 +81,11 @@
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: medium_clsn
+		Explosions: medium_clsn
 		ImpactSound: expnew14.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -115,11 +115,11 @@
 			Concrete: 35
 		DamageTypes: Prone100Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: expnew06.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash2.aud
 		ValidImpactTypes: Water
--- a/mods/ts/weapons/missiles.yaml
+++ b/mods/ts/weapons/missiles.yaml
@@ -26,17 +26,17 @@ Bazooka:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
+		Explosions: small_clsn
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 	Warhead@4EffAir: CreateEffect
 		ValidImpactTypes: Air, AirHit
-		Explosion: tiny_twlt
+		Explosions: tiny_twlt
 		ImpactSound: expnew05.aud
 	Warhead@5Smu: LeaveSmudge
 		SmudgeType: SmallCrater
@@ -70,16 +70,16 @@ HoverMissile:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
+		Explosions: small_clsn
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
+		Explosions: small_twlt
 		ValidImpactTypes: Air, AirHit
 		ImpactSound: expnew06.aud
 	Warhead@5: LeaveSmudge
@@ -113,11 +113,11 @@ MammothTusk:
 			Concrete: 28
 		DamageTypes: Explosion
 	Warhead@2Eff: CreateEffect
-		Explosion: medium_twlt
+		Explosions: medium_twlt
 		ImpactSound: expnew07.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -152,11 +152,11 @@ BikeMissile:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
+		Explosions: small_clsn
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
@@ -192,16 +192,16 @@ Dragon:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
+		Explosions: small_clsn
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
+		Explosions: small_twlt
 		ValidImpactTypes: Air, AirHit
 		ImpactSound: expnew06.aud
 	Warhead@5Smu: LeaveSmudge
@@ -236,16 +236,16 @@ Hellfire:
 			Concrete: 30
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: small_clsn
+		Explosions: small_clsn
 		ImpactSound: expnew12.aud
 		InvalidImpactTypes: Water, Air, AirHit
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
 	Warhead@4EffAir: CreateEffect
-		Explosion: small_twlt
+		Explosions: small_twlt
 		ValidImpactTypes: Air, AirHit
 		ImpactSound: expnew06.aud
 	Warhead@5Smu: LeaveSmudge
@@ -273,5 +273,5 @@ RedEye2:
 		ValidTargets: Air
 		DamageTypes: SmallExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: tiny_twlt
+		Explosions: tiny_twlt
 		ImpactSound: expnew05.aud
--- a/mods/ts/weapons/otherweapons.yaml
+++ b/mods/ts/weapons/otherweapons.yaml
@@ -41,7 +41,7 @@ FiendShard:
 			Concrete: 20
 		DamageTypes: Prone100Percent, TriggerProne, BulletDeath
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash3.aud
 		ValidImpactTypes: Water
--- a/mods/ts/weapons/smallguns.yaml
+++ b/mods/ts/weapons/smallguns.yaml
@@ -14,10 +14,10 @@ Minigun:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -37,10 +37,10 @@ M1Carbine:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -60,10 +60,10 @@ Vulcan:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -85,10 +85,10 @@ Vulcan2:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -109,10 +109,10 @@ Vulcan3:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -132,10 +132,10 @@ VulcanTower:
 			Concrete: 10
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -156,10 +156,10 @@ JumpCannon:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -179,10 +179,10 @@ AssaultCannon:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -204,10 +204,10 @@ RaiderCannon:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -229,10 +229,10 @@ HarpyClaw:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piffs
+		Explosions: piffs
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piffs
+		Explosions: water_piffs
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

@@ -252,10 +252,10 @@ Pistola:
 			Concrete: 10
 		DamageTypes: Prone70Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: piff
+		Explosions: piff
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: water_piff
+		Explosions: water_piff
 		ExplosionPalette: ra
 		ValidImpactTypes: Water

--- a/mods/ts/weapons/superweapons.yaml
+++ b/mods/ts/weapons/superweapons.yaml
@@ -25,11 +25,11 @@ MultiCluster:
 			Concrete: 60
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: expnew09.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: small_watersplash
+		Explosions: small_watersplash
 		ExplosionPalette: player
 		ImpactSound: ssplash2.aud
 		ValidImpactTypes: Water
@@ -61,7 +61,7 @@ IonCannon:
 		ValidTargets: Ground, Air
 		DamageTypes: Prone100Percent, TriggerProne, EnergyDeath
 	Warhead@2Eff_impact: CreateEffect
-		Explosion: ionring
+		Explosions: ionring
 		ImpactSound: ion1.aud
 	Warhead@3Dam_area: SpreadDamage
 		Spread: 1c0
@@ -86,7 +86,7 @@ EMPulseCannon:
 		Angle: 62
 		Image: pulsball
 	Warhead@1Eff: CreateEffect
-		Explosion: pulse_explosion
+		Explosions: pulse_explosion
 	Warhead@emp: GrantUpgrade
 		Range: 3c0
 		Duration: 250
@@ -103,7 +103,7 @@ ClusterMissile:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
 	Warhead@SoundEffect0: CreateEffect
-		Explosion: large_explosion
+		Explosions: large_explosion
 		ImpactSound: expnew19.aud
 	Warhead@ResourceDestruction0: DestroyResource
 		Size: 1