Merge pull request #10381 from penev92/warheadEffects

Enhance CreateEffectWarhead
2016-02-06 13:35:52 +01:00
parent ddea517b19 6913ac29e6
commit 7a0825ce92
36 changed files with 511 additions and 488 deletions
--- 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,11 +289,14 @@ Weapons:
 			Damage: 250
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@1Eff: CreateEffect
-			Explosion: large_explosion
-			WaterExplosion: large_splash
-			ImpactSound: kaboom12.aud
-			WaterImpactSound: splash9.aud
-		Warhead@2Smu: LeaveSmudge
+			Explosions: large_explosion
+			ImpactSounds: kaboom12.aud
+			ValidImpactTypes: Ground
+		Warhead@2Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: splash9.aud
+			ValidImpactTypes: Water
+		Warhead@3Smu: LeaveSmudge
 			SmudgeType: Crater
 	SubMissile:
 		ReloadDelay: 250
@@ -317,11 +320,14 @@ Weapons:
 			Damage: 400
 			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 		Warhead@1Eff: CreateEffect
-			Explosion: large_explosion
-			WaterExplosion: large_splash
-			ImpactSound: kaboom12.aud
-			WaterImpactSound: splash9.aud
-		Warhead@2Smu: LeaveSmudge
+			Explosions: large_explosion
+			ImpactSounds: kaboom12.aud
+			ValidImpactTypes: Ground
+		Warhead@2Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: splash9.aud
+			ValidImpactTypes: Water
+		Warhead@3Smu: LeaveSmudge
 			SmudgeType: Crater

 Voices:
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -816,8 +816,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: self_destruct
-			WaterExplosion: self_destruct
+			Explosions: self_destruct
 	MammothTusk:
 		ReloadDelay: 300
 		Range: 10c0
@@ -850,8 +849,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: nuke
-			WaterExplosion: nuke
+			Explosions: nuke
 	TankNapalm:
 		ReloadDelay: 40
 		Range: 8c0
@@ -879,9 +877,8 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: small_explosion
-			WaterExplosion: small_explosion
-			ImpactSound: firebl3.aud
+			Explosions: small_explosion
+			ImpactSounds: firebl3.aud
 	ParaBomb:
 		ReloadDelay: 5
 		Range: 5c0
@@ -901,9 +898,8 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
-			ImpactSound: firebl3.aud
-			WaterExplosion: napalm
+			Explosions: napalm
+			ImpactSounds: firebl3.aud
 	155mm:
 		ReloadDelay: 10
 		Range: 7c5
@@ -931,9 +927,8 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: small_napalm
-			WaterExplosion: small_napalm
-			ImpactSound: firebl3.aud
+			Explosions: small_napalm
+			ImpactSounds: firebl3.aud
 	FLAK-23:
 		ReloadDelay: 10
 		Range: 8c0
@@ -956,7 +951,7 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: med_explosion
+			Explosions: med_explosion
 	SCUD:
 		ReloadDelay: 280
 		Range: 7c0
@@ -984,10 +979,13 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
-			Explosion: nuke
-			WaterExplosion: large_splash
-			ImpactSound: kaboom1.aud
-			WaterImpactSound: kaboom1.aud
+			Explosions: nuke
+			ImpactSounds: kaboom1.aud
+			ValidImpactTypes: Ground
+		Warhead@4Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: kaboom1.aud
+			ValidImpactTypes: Water
 	SilencedPPK:
 		ReloadDelay: 80
 		Range: 25c0
@@ -1004,7 +1002,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,8 +670,8 @@ Weapons:
 			Size: 2,1
 			Delay: 5
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
-			ImpactSound: firebl3.aud
+			Explosions: napalm
+			ImpactSounds: firebl3.aud
 			Delay: 5

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

 Voices:
--- 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,8 +918,8 @@ Weapons:
 		Warhead@2Smu: LeaveSmudge
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
-			ImpactSound: firebl3.aud
+			Explosions: napalm
+			ImpactSounds: firebl3.aud
 	MissionBarrelExplodeInterior:
 		Warhead@1Dam: SpreadDamage
 			Spread: 350
@@ -938,8 +938,8 @@ Weapons:
 			Size: 2,1
 			Delay: 5
 		Warhead@3Eff: CreateEffect
-			Explosion: napalm
-			ImpactSound: firebl3.aud
+			Explosions: napalm
+			ImpactSounds: firebl3.aud
 			Delay: 5

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

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

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

 CrateNuke:
 	Warhead@1Dam_impact: SpreadDamage
@@ -44,8 +44,8 @@ CrateNuke:
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath
 	Warhead@2Res_impact: DestroyResource
 	Warhead@3Eff_impact: CreateEffect
-		Explosion: nuke
-		ImpactSound: kaboom1.aud
+		Explosions: nuke
+		ImpactSounds: kaboom1.aud
 	Warhead@4Dam_areanuke: SpreadDamage
 		Spread: 1c0
 		Damage: 60
@@ -64,7 +64,7 @@ CrateNuke:
 		Size: 5,4
 		Delay: 4
 	Warhead@7Eff_areanuke: CreateEffect
-		ImpactSound: kaboom22.aud
+		ImpactSounds: kaboom22.aud
 		Delay: 4

 MiniNuke:
@@ -81,8 +81,8 @@ MiniNuke:
 	Warhead@2Res_impact: DestroyResource
 		Size: 1
 	Warhead@3Eff_impact: CreateEffect
-		Explosion: nuke
-		ImpactSound: kaboom1.aud
+		Explosions: nuke
+		ImpactSounds: kaboom1.aud
 	Warhead@4Dam_areanuke1: SpreadDamage
 		Spread: 2c0
 		Damage: 60
@@ -97,7 +97,7 @@ MiniNuke:
 		Size: 2
 		Delay: 5
 	Warhead@6Eff_areanuke1: CreateEffect
-		ImpactSound: kaboom22.aud
+		ImpactSounds: kaboom22.aud
 		Delay: 5
 	Warhead@7Dam_areanuke2: SpreadDamage
 		Spread: 3c0
@@ -142,12 +142,12 @@ UnitExplode:
 			Heavy: 25
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
-		Explosion: self_destruct
-		ImpactSound: kaboom22.aud
+		Explosions: self_destruct
+		ImpactSounds: kaboom22.aud
 		InvalidImpactTypes: Water
 	Warhead@3EffWater: CreateEffect
-		Explosion: large_splash
-		ImpactSound: splash9.aud
+		Explosions: large_splash
+		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

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

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

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

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

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

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

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

 OreExplosion:
 	Warhead@1Dam: SpreadDamage
@@ -272,5 +272,5 @@ OreExplosion:
 		AddsResourceType: Ore
 		Size: 1,1
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
-		ImpactSound: kaboom25.aud
+		Explosions: med_explosion
+		ImpactSounds: 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,12 +42,12 @@
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3EffGround: CreateEffect
-		Explosion: small_explosion
-		ImpactSound: kaboom12.aud
+		Explosions: small_explosion
+		ImpactSounds: kaboom12.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
-		ImpactSound: splash9.aud
+		Explosions: small_splash
+		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 TeslaZap:
@@ -216,14 +216,14 @@ Crush:
 		Damage: 100
 		DamageTypes: Prone50Percent, TriggerProne, DefaultDeath
 	Warhead@2Eff: CreateEffect
-		ImpactSound: squishy2.aud
+		ImpactSounds: squishy2.aud

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

 Claw:
 	ReloadDelay: 30
@@ -274,5 +274,5 @@ MADTankDetonate:
 		SmudgeType: Crater
 		Size: 7,6
 	Warhead@3Eff: CreateEffect
-		Explosion: med_explosion
-		ImpactSound: mineblo1.aud
+		Explosions: med_explosion
+		ImpactSounds: 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,12 +19,12 @@ ParaBomb:
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
 	Warhead@3Eff: CreateEffect
-		Explosion: artillery_explosion
-		ImpactSound: kaboom15.aud
+		Explosions: artillery_explosion
+		ImpactSounds: kaboom15.aud
 		InvalidImpactTypes: Water
 	Warhead@4EffWater: CreateEffect
-		Explosion: small_splash
-		ImpactSound: splash9.aud
+		Explosions: small_splash
+		ImpactSounds: splash9.aud
 		ValidImpactTypes: Water

 Atomic:
@@ -43,8 +43,8 @@ Atomic:
 		SmudgeType: Scorch
 		Size: 1
 	Warhead@4Eff_impact: CreateEffect
-		Explosion: nuke
-		ImpactSound: kaboom1.aud
+		Explosions: nuke
+		ImpactSounds: kaboom1.aud
 	Warhead@5Dam_areanuke1: SpreadDamage
 		Spread: 2c0
 		Damage: 60
@@ -62,7 +62,7 @@ Atomic:
 		Size: 2
 		Delay: 5
 	Warhead@8Eff_areanuke1: CreateEffect
-		ImpactSound: kaboom22.aud
+		ImpactSounds: kaboom22.aud
 		Delay: 5
 	Warhead@9Dam_areanuke2: SpreadDamage
 		Spread: 3c0