diff --git a/mods/ra/maps/drop-zone-w/map.yaml b/mods/ra/maps/drop-zone-w/map.yaml
index 7deb501c42..f21f44374e 100644
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -290,10 +290,13 @@ Weapons:
 			DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 		Warhead@1Eff: CreateEffect
 			Explosions: large_explosion
-			WaterExplosion: large_splash
 			ImpactSounds: kaboom12.aud
-			WaterImpactSound: splash9.aud
-		Warhead@2Smu: LeaveSmudge
+			ValidImpactTypes: Ground
+		Warhead@2Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: splash9.aud
+			ValidImpactTypes: Water
+		Warhead@3Smu: LeaveSmudge
 			SmudgeType: Crater
 	SubMissile:
 		ReloadDelay: 250
@@ -318,10 +321,13 @@ Weapons:
 			DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 		Warhead@1Eff: CreateEffect
 			Explosions: large_explosion
-			WaterExplosion: large_splash
 			ImpactSounds: kaboom12.aud
-			WaterImpactSound: splash9.aud
-		Warhead@2Smu: LeaveSmudge
+			ValidImpactTypes: Ground
+		Warhead@2Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: splash9.aud
+			ValidImpactTypes: Water
+		Warhead@3Smu: LeaveSmudge
 			SmudgeType: Crater
 
 Voices:
diff --git a/mods/ra/maps/fort-lonestar/map.yaml b/mods/ra/maps/fort-lonestar/map.yaml
index 2f0ceb9343..d5a03e5708 100644
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -817,7 +817,6 @@ Weapons:
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: self_destruct
-			WaterExplosion: self_destruct
 	MammothTusk:
 		ReloadDelay: 300
 		Range: 10c0
@@ -851,7 +850,6 @@ Weapons:
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: nuke
-			WaterExplosion: nuke
 	TankNapalm:
 		ReloadDelay: 40
 		Range: 8c0
@@ -880,7 +878,6 @@ Weapons:
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
 			Explosions: small_explosion
-			WaterExplosion: small_explosion
 			ImpactSounds: firebl3.aud
 	ParaBomb:
 		ReloadDelay: 5
@@ -903,7 +900,6 @@ Weapons:
 		Warhead@3Eff: CreateEffect
 			Explosions: napalm
 			ImpactSounds: firebl3.aud
-			WaterExplosion: napalm
 	155mm:
 		ReloadDelay: 10
 		Range: 7c5
@@ -932,7 +928,6 @@ Weapons:
 			SmudgeType: Scorch
 		Warhead@3Eff: CreateEffect
 			Explosions: small_napalm
-			WaterExplosion: small_napalm
 			ImpactSounds: firebl3.aud
 	FLAK-23:
 		ReloadDelay: 10
@@ -985,9 +980,12 @@ Weapons:
 			SmudgeType: Crater
 		Warhead@3Eff: CreateEffect
 			Explosions: nuke
-			WaterExplosion: large_splash
 			ImpactSounds: kaboom1.aud
-			WaterImpactSound: kaboom1.aud
+			ValidImpactTypes: Ground
+		Warhead@4Eff: CreateEffect
+			Explosions: large_splash
+			ImpactSounds: kaboom1.aud
+			ValidImpactTypes: Water
 	SilencedPPK:
 		ReloadDelay: 80
 		Range: 25c0