Adapt RA warheads to new target types

2020-05-10 12:15:16 +02:00
parent c580a94ab7
commit e40c0516e6
9 changed files with 93 additions and 70 deletions
--- a/mods/ra/maps/allies-03a/weapons.yaml
+++ b/mods/ra/maps/allies-03a/weapons.yaml
@@ -1,3 +1,3 @@
 BarrelExplode:
 	Warhead@1Dam: SpreadDamage
-		ValidTargets: Ground, Prisoner
+		ValidTargets: Ground, GroundActor, Prisoner
--- a/mods/ra/maps/allies-03b/weapons.yaml
+++ b/mods/ra/maps/allies-03b/weapons.yaml
@@ -7,4 +7,4 @@ Colt45:

 BarrelExplode:
 	Warhead@1Dam: SpreadDamage
-		ValidTargets: Ground, Prisoner
+		ValidTargets: Ground, GroundActor, Prisoner
--- a/mods/ra/maps/fort-lonestar/weapons.yaml
+++ b/mods/ra/maps/fort-lonestar/weapons.yaml
@@ -34,7 +34,7 @@ MammothTusk:
 		RangeLimit: 12c0
 	Warhead@1Dam: SpreadDamage
 		Spread: 640
-		ValidTargets: Ground, Air
+		ValidTargets: GroundActor, AirborneActor
 		Versus:
 			None: 125
 			Wood: 110
@@ -61,7 +61,7 @@ TankNapalm:
 		Blockable: false
 	Warhead: SpreadDamage
 		Spread: 341
-		ValidTargets: Ground
+		ValidTargets: GroundActor
 		Versus:
 			None: 65
 			Wood: 125
@@ -130,7 +130,7 @@ FLAK-23:
 		Blockable: false
 	Warhead: SpreadDamage
 		Spread: 213
-		ValidTargets: Air, Ground
+		ValidTargets: AirborneActor, GroundActor
 		Versus:
 			None: 32
 			Wood: 28
--- a/mods/ra/weapons/ballistics.yaml
+++ b/mods/ra/weapons/ballistics.yaml
@@ -10,6 +10,7 @@
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 4000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 30
 			Wood: 75
@@ -18,16 +19,16 @@
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 	Warhead@3Eff: CreateEffect
 		Explosions: small_explosion
 		ImpactSounds: kaboom12.aud
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground, GroundActor, WaterActor, Trees
 	Warhead@4EffWater: CreateEffect
 		Explosions: small_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge

 25mm:
 	Inherits: ^Cannon
--- a/mods/ra/weapons/explosions.yaml
+++ b/mods/ra/weapons/explosions.yaml
@@ -3,6 +3,7 @@
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
 		Damage: 5000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 90
 			Wood: 75
@@ -12,16 +13,16 @@
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees
+		ValidTargets: Ground, Vehicle, Infantry
 	Warhead@2Eff: CreateEffect
 		Explosions: self_destruct
 		ImpactSounds: kaboom22.aud
-		ValidTargets: Ground, Air, Ship, Trees
+		ValidTargets: Ground, Air, GroundActor, AirborneActor, WaterActor, Trees
 	Warhead@3EffWater: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge

 CrateNapalm:
 	Inherits: ^Explosion
@@ -30,7 +31,7 @@ CrateNapalm:
 		Spread: 170
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Trees
+		ValidTargets: GroundActor, WaterActor, Trees
 		Versus:
 			Wood: 100
 			Concrete: 50
@@ -39,7 +40,7 @@ CrateNapalm:
 	Warhead@2Eff: CreateEffect
 		Explosions: napalm
 		ImpactSounds: firebl3.aud
-		ValidTargets: Ground, Water, Air, Trees
+		ValidTargets: Ground, Water, Air, GroundActor, AirborneActor, WaterActor, Trees
 	-Warhead@3EffWater:
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Scorch
@@ -50,7 +51,7 @@ CrateExplosion:
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		AffectsParent: true
 	Warhead@2Eff: CreateEffect
-		ValidTargets: Ground, Water, Air
+		ValidTargets: Ground, Water, Air, GroundActor, AirborneActor, WaterActor, Trees
 	-Warhead@3EffWater:

 UnitExplode:
@@ -82,6 +83,7 @@ UnitExplodeShip:
 		Explosions: building
 		ImpactSounds: kaboom25.aud
 		ValidTargets: Ground, Water
+		ImpactActors: false

 UnitExplodeSubmarine:
 	Inherits: ^Explosion
@@ -90,6 +92,7 @@ UnitExplodeSubmarine:
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Ground, Water
+		ImpactActors: false

 UnitExplodeSmall:
 	Inherits: ^Explosion
@@ -117,7 +120,8 @@ BuildingExplode:
 		Explosions: building, building_napalm, large_explosion, self_destruct, large_napalm
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Wall, Trees
+		ValidTargets: GroundActor
+		InvalidTargets: Wall

 SmallBuildingExplode:
 	Inherits: BuildingExplode
@@ -127,6 +131,7 @@ SmallBuildingExplode:
 CivPanicExplosion:
 	ValidTargets: Ground, GroundActor
 	Warhead@1Dam: SpreadDamage # Used to panic civilians which are emitted from a killed CivBuilding
+		ValidTargets: Infantry
 		Falloff: 100, 100
 		Range: 0, 128
 		Damage: 1
@@ -160,14 +165,17 @@ ATMine:
 		Spread: 256
 		Damage: 40000
 		AffectsParent: true
+		ValidTargets: GroundActor, WaterActor
 		InvalidTargets: Mine
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: large_explosion
 		ImpactSounds: mineblo1.aud
+		ImpactActors: false
 	Warhead@Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Structure, Wall, Trees
+		ValidTargets: Ground, GroundActor
+		InvalidTargets: Structure, Wall

 APMine:
 	Inherits: ATMine
@@ -184,6 +192,7 @@ OreExplosion:
 	Warhead@1Dam: SpreadDamage
 		Spread: 9
 		Damage: 1000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 90
 			Wood: 70
@@ -196,6 +205,7 @@ OreExplosion:
 	Warhead@2Eff: CreateEffect
 		Explosions: med_explosion
 		ImpactSounds: kaboom25.aud
+		ImpactActors: false

 CrateNuke:
 	ValidTargets: Ground, GroundActor, Trees, Water, WaterActor, Underwater, Air, AirborneActor
@@ -203,7 +213,7 @@ CrateNuke:
 		Spread: 1c0
 		Damage: 10000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Trees, Water, Air
+		ValidTargets: GroundActor, Trees, WaterActor, AirborneActor
 		Versus:
 			Concrete: 25
 		AffectsParent: true
@@ -218,7 +228,7 @@ CrateNuke:
 		Damage: 6000
 		Falloff: 1000, 600, 400, 250, 150, 100, 0
 		Delay: 5
-		ValidTargets: Ground, Water, Air
+		ValidTargets: GroundActor, WaterActor, AirborneActor
 		Versus:
 			Concrete: 25
 		AffectsParent: true
@@ -232,7 +242,7 @@ CrateNuke:
 		ImpactActors: false
 	Warhead@6Smu_areanuke1: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Trees
+		ValidTargets: Ground, Infantry
 		Size: 4
 		Delay: 5
 	Warhead@TREEKILL: SpreadDamage
@@ -249,7 +259,7 @@ MiniNuke:
 		Spread: 1c0
 		Damage: 15000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Trees, Water, Air
+		ValidTargets: GroundActor, Trees, WaterActor, Underwater, AirborneActor
 		Versus:
 			Wood: 25
 			Concrete: 25
@@ -266,7 +276,7 @@ MiniNuke:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 5
-		ValidTargets: Ground, Trees, Water, Underwater, Air
+		ValidTargets: GroundActor, Trees, WaterActor, Underwater, AirborneActor
 		Versus:
 			Wood: 50
 			Concrete: 25
@@ -284,7 +294,7 @@ MiniNuke:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 10
-		ValidTargets: Ground, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor
 		Versus:
 			Wood: 50
 			Concrete: 25
@@ -305,7 +315,7 @@ MiniNuke:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 15
-		ValidTargets: Ground, Water, Underwater
+		ValidTargets: GroundActor, WaterActor, Underwater
 		Versus:
 			Concrete: 25
 		AffectsParent: true
@@ -322,6 +332,6 @@ MiniNuke:
 		Delay: 15
 	Warhead@13Smu_areanuke3: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Trees
+		ValidTargets: Ground, Infantry
 		Size: 4
 		Delay: 15
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -17,7 +17,7 @@
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 5000
-		ValidTargets: Ground, Water, Air
+		ValidTargets: GroundActor, WaterActor, AirborneActor
 		Versus:
 			None: 10
 			Wood: 74
@@ -27,16 +27,16 @@
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 	Warhead@3Eff: CreateEffect
 		Explosions: med_explosion
 		ImpactSounds: kaboom25.aud
-		ValidTargets: Ground, Air, Ship, Trees
+		ValidTargets: Ground, Air, GroundActor, AirborneActor, WaterActor, Trees
 	Warhead@4EffWater: CreateEffect
 		Explosions: med_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge

 ^AntiAirMissile:
 	Inherits: ^AntiGroundMissile
@@ -104,7 +104,7 @@ HellfireAA:
 		CloseEnough: 0c600
 	Warhead@1Dam: SpreadDamage
 		Damage: 4000
-		ValidTargets: Air
+		ValidTargets: AirborneActor
 		Versus:
 			Wood: 75
 			Light: 75
@@ -132,11 +132,11 @@ MammothTusk:
 		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
 	Warhead@3Eff: CreateEffect
 		ImpactSounds: kaboom12.aud
-		ValidTargets: Ground, Trees
+		ValidTargets: Ground, GroundActor, Trees
 	Warhead@5EffAir: CreateEffect
 		Explosions: med_explosion_air
 		ImpactSounds: kaboom25.aud
-		ValidTargets: Air
+		ValidTargets: Air, AirborneActor

 Nike:
 	Inherits: ^AntiAirMissile
@@ -152,7 +152,7 @@ Nike:
 		Speed: 341
 	Warhead@1Dam: SpreadDamage
 		Damage: 5000
-		ValidTargets: Air
+		ValidTargets: AirborneActor
 		Versus:
 			Light: 90
 	Warhead@3Eff: CreateEffect
@@ -168,7 +168,7 @@ RedEye:
 		Speed: 298
 	Warhead@1Dam: SpreadDamage
 		Damage: 4000
-		ValidTargets: Air
+		ValidTargets: AirborneActor
 		Versus:
 			Light: 60

@@ -240,7 +240,7 @@ TorpTube:
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
 		Damage: 18000
-		ValidTargets: Water, Underwater, Bridge
+		ValidTargets: WaterActor, Underwater, Bridge
 		Versus:
 			Wood: 75
 			Light: 75
@@ -250,12 +250,12 @@ TorpTube:
 	Warhead@3Eff: CreateEffect
 		Explosions: artillery_explosion
 		ImpactSounds: kaboom15.aud
-		ValidTargets: Ship, Structure, Underwater, Ground, Bridge
+		ValidTargets: Ground, WaterActor, Underwater, GroundActor, Bridge
 	Warhead@4EffWater: CreateEffect
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Water
-		InvalidTargets: Ship, Structure, Underwater, Bridge
+		InvalidTargets: Bridge

 ^SubMissileDefault:
 	Inherits: ^AntiGroundMissile
@@ -329,7 +329,7 @@ SCUD:
 		Spread: 341
 		Damage: 4500
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Water, Trees
+		ValidTargets: GroundActor, WaterActor, Trees
 		Versus:
 			None: 90
 			Wood: 75
--- a/mods/ra/weapons/other.yaml
+++ b/mods/ra/weapons/other.yaml
@@ -5,7 +5,7 @@
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: 15000
-		ValidTargets: Ground, Water, Trees
+		ValidTargets: GroundActor, WaterActor, Trees
 		Versus:
 			None: 90
 			Wood: 50
@@ -80,6 +80,7 @@ Napalm:
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 10000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 1000
 		DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath
@@ -144,6 +145,7 @@ Demolish:
 	ValidTargets: GroundActor, WaterActor
 	Warhead@1Dam: SpreadDamage
 		DamageTypes: DefaultDeath
+		ValidTargets: GroundActor, WaterActor
 	Warhead@2Eff: CreateEffect
 		Explosions: building
 		ImpactSounds: kaboom25.aud
@@ -157,6 +159,7 @@ Claw:
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: 3000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 97
 			Wood: 10
@@ -224,6 +227,7 @@ MADTankThump:
 	Warhead@1Dam: HealthPercentageDamage
 		Spread: 7c0
 		Damage: 1
+		ValidTargets: GroundActor, WaterActor
 		InvalidTargets: MADTank, Infantry
 	Warhead@Shake: ShakeScreen
 		Duration: 10
@@ -236,6 +240,7 @@ MADTankDetonate:
 	Warhead@1Dam: HealthPercentageDamage
 		Spread: 7c0
 		Damage: 19
+		ValidTargets: GroundActor, WaterActor
 		InvalidTargets: MADTank, Infantry
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
--- a/mods/ra/weapons/smallcaliber.yaml
+++ b/mods/ra/weapons/smallcaliber.yaml
@@ -7,7 +7,7 @@
 	Warhead@1Dam: SpreadDamage
 		Spread: 213
 		Damage: 2000
-		ValidTargets: Air
+		ValidTargets: AirborneActor
 		Versus:
 			None: 40
 			Wood: 10
@@ -37,23 +37,23 @@ ZSU-23:
 FLAK-23-AA:
 	Inherits: ^AACannon
 	Warhead@1Dam: SpreadDamage
-		ValidTargets: Air, Ground, Water
+		ValidTargets: AirborneActor, GroundActor, WaterActor

 FLAK-23-AG:
 	Inherits: ^AACannon
 	Range: 6c0
-	ValidTargets: Ground, Water
+	ValidTargets: Ground, Water, GroundActor, WaterActor
 	Projectile: InstantHit
 		Blockable: true
 	Warhead@1Dam: SpreadDamage
-		ValidTargets: Air, Ground, Water
+		ValidTargets: AirborneActor, GroundActor, WaterActor
 	Warhead@2Eff: CreateEffect
 		Explosions: flak_explosion_ground
-		ValidTargets: Ground, Ship, Air, Trees
+		ValidTargets: Ground, GroundActor, Air, AirborneActor, WaterActor, Trees
 	Warhead@3EffWater: CreateEffect
 		Explosions: small_splash
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge

 ^HeavyMG:
 	ReloadDelay: 30
@@ -65,6 +65,7 @@ FLAK-23-AG:
 	Warhead@1Dam: SpreadDamage
 		Spread: 128
 		Damage: 2500
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 120
 			Wood: 60
@@ -74,11 +75,12 @@ FLAK-23-AG:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@2Eff: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Air, Trees
+		ValidTargets: Ground, Air
+		ImpactActors: false
 	Warhead@3EffWater: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge

 ^LightMG:
 	Inherits: ^HeavyMG
@@ -115,12 +117,13 @@ Vulcan:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@4Eff_2: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground
+		ImpactActors: false
 		Delay: 2
 	Warhead@4Eff_2Water: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge
 		Delay: 2
 	Warhead@5Dam_3: SpreadDamage
 		Spread: 128
@@ -135,12 +138,13 @@ Vulcan:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@6Eff_3: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground
+		ImpactActors: false
 		Delay: 4
 	Warhead@6Eff_3Water: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge
 		Delay: 4
 	Warhead@7Dam_4: SpreadDamage
 		Spread: 128
@@ -155,12 +159,13 @@ Vulcan:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@8Eff_4: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground
+		ImpactActors: false
 		Delay: 6
 	Warhead@8Eff_4Water: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge
 		Delay: 6
 	Warhead@9Dam_5: SpreadDamage
 		Spread: 128
@@ -175,12 +180,13 @@ Vulcan:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@10Eff_5: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground
+		ImpactActors: false
 		Delay: 8
 	Warhead@10Eff_5Water: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge
 		Delay: 8
 	Warhead@11Dam_6: SpreadDamage
 		Spread: 128
@@ -195,12 +201,13 @@ Vulcan:
 		DamageTypes: Prone50Percent, TriggerProne, BulletDeath
 	Warhead@12Eff_6: CreateEffect
 		Explosions: piffs
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground
+		ImpactActors: false
 		Delay: 10
 	Warhead@12Eff_6Water: CreateEffect
 		Explosions: water_piffs
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure, Bridge
+		InvalidTargets: Bridge
 		Delay: 10

 ChainGun:
--- a/mods/ra/weapons/superweapons.yaml
+++ b/mods/ra/weapons/superweapons.yaml
@@ -12,6 +12,7 @@ ParaBomb:
 	Warhead@1Dam: SpreadDamage
 		Spread: 768
 		Damage: 30000
+		ValidTargets: GroundActor, WaterActor
 		Versus:
 			None: 30
 			Wood: 30
@@ -20,24 +21,23 @@ ParaBomb:
 		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
 	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 	Warhead@3Eff: CreateEffect
 		Explosions: artillery_explosion
 		ImpactSounds: kaboom15.aud
-		ValidTargets: Ground, Ship, Trees
+		ValidTargets: Ground, GroundActor, WaterActor, Trees
 	Warhead@4EffWater: CreateEffect
 		Explosions: small_splash
 		ImpactSounds: splash9.aud
 		ValidTargets: Water, Underwater
-		InvalidTargets: Ship, Structure

 Atomic:
-	ValidTargets: Ground, GroundActor, Trees, Water, WaterActor, Underwater, Air, AirborneActor
+	ValidTargets: Ground, Water, GroundActor, WaterActor, Underwater, AirborneActor, Trees
 	Warhead@1Dam_impact: SpreadDamage
 		Spread: 1c0
 		Damage: 15000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
-		ValidTargets: Ground, Trees, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor, Trees
 		Versus:
 			Wood: 25
 			Concrete: 25
@@ -46,7 +46,7 @@ Atomic:
 		Size: 1
 	Warhead@3Smu_impact: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall
+		ValidTargets: Ground, Infantry
 		Size: 1
 	Warhead@4Eff_impact: CreateEffect
 		Explosions: nuke
@@ -58,7 +58,7 @@ Atomic:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 5
-		ValidTargets: Ground, Trees, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor, Trees
 		Versus:
 			Wood: 25
 			Concrete: 25
@@ -68,7 +68,7 @@ Atomic:
 		Delay: 5
 	Warhead@7Smu_areanuke1: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 		Size: 2
 		Delay: 5
 	Warhead@8Eff_areanuke1: CreateEffect
@@ -80,7 +80,7 @@ Atomic:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 10
-		ValidTargets: Ground, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor
 		Versus:
 			Wood: 50
 			Concrete: 25
@@ -97,7 +97,7 @@ Atomic:
 		Delay: 10
 	Warhead@12Smu_areanuke2: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 		Size: 3
 		Delay: 10
 	Warhead@13Dam_areanuke3: SpreadDamage
@@ -105,7 +105,7 @@ Atomic:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 15
-		ValidTargets: Ground, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor
 		Versus:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
@@ -121,7 +121,7 @@ Atomic:
 		Delay: 15
 	Warhead@16Smu_areanuke3: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 		Size: 4
 		Delay: 15
 	Warhead@17Dam_areanuke4: SpreadDamage
@@ -129,7 +129,7 @@ Atomic:
 		Damage: 6000
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Delay: 20
-		ValidTargets: Ground, Water, Underwater, Air
+		ValidTargets: GroundActor, WaterActor, Underwater, AirborneActor
 		Versus:
 			Concrete: 25
 		DamageTypes: Prone50Percent, TriggerProne, FireDeath, Incendiary
@@ -145,7 +145,7 @@ Atomic:
 		Delay: 20
 	Warhead@20Smu_areanuke4: LeaveSmudge
 		SmudgeType: Scorch
-		InvalidTargets: Vehicle, Structure, Wall, Husk, Trees
+		ValidTargets: Ground, Infantry
 		Size: 5
 		Delay: 20
 	Warhead@21Shake: ShakeScreen