Merge pull request #6030 from UberWaffe/CustomWarheads

Custom Warheads refactor
2014-08-03 10:35:36 -05:00
parent 0502d90a05 c972b39687
commit b6fd757672
59 changed files with 2275 additions and 1233 deletions
--- a/mods/cnc/maps/gdi01/map.yaml
+++ b/mods/cnc/maps/gdi01/map.yaml
@@ -535,10 +535,10 @@ VoxelSequences:

 Weapons:
 	BoatMissile:
-		Warhead:
+		Warhead: SpreadDamage
 			Versus:
 				Heavy: 50%
-		Damage: 50
+			Damage: 50

 Voices:

--- a/mods/cnc/maps/gdi04a/map.yaml
+++ b/mods/cnc/maps/gdi04a/map.yaml
@@ -572,7 +572,7 @@ VoxelSequences:

 Weapons:
 	Tiberium:
-		Warhead:
+		Warhead: SpreadDamage
 			Damage: 6

 Voices:
--- a/mods/cnc/maps/gdi04b/map.yaml
+++ b/mods/cnc/maps/gdi04b/map.yaml
@@ -653,7 +653,7 @@ VoxelSequences:

 Weapons:
 	Tiberium:
-		Warhead:
+		Warhead: SpreadDamage
 			Damage: 4

 Voices:
--- a/mods/cnc/maps/gdi04c/map.yaml
+++ b/mods/cnc/maps/gdi04c/map.yaml
@@ -913,7 +913,7 @@ VoxelSequences:

 Weapons:
 	Rockets:
-		Warhead:
+		Warhead: SpreadDamage
 			Versus:
 				None: 20%

--- a/mods/cnc/weapons.yaml
+++ b/mods/cnc/weapons.yaml
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -8,16 +8,17 @@ LMG:
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 15
+		InfDeath: 2
 		Versus:
 			Wood: 25%
 			Light: 40%
 			Heavy: 10%
 			Concrete: 20%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffs
-		InfDeath: 2
-		Damage: 15

 Bazooka:
 	ROF: 50
@@ -32,18 +33,20 @@ Bazooka:
 		Image: RPG
 		ROT: 5
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 50
+		InfDeath: 4
 		Versus:
 			None: 10%
 			Wood: 75%
 			Light: 60%
 			Heavy: 90%
 			Concrete: 40%
-		Explosion: small_explosion
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
-		Damage: 50
+	Warhead@3Eff: CreateEffect
+		Explosion: small_explosion
 		ImpactSound: EXPLSML1.WAV

 Sniper:
@@ -56,16 +59,16 @@ Sniper:
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead:
-		Damage: 60
+	Warhead@1Dam: SpreadDamage
 		Spread: 32
+		Damage: 60
+		InfDeath: 2
 		Versus:
 			None: 100%
 			Wood: 0%
 			Light: 1%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 2

 Vulcan:
 	ROF: 30
@@ -78,16 +81,17 @@ Vulcan:
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 30
+		InfDeath: 2
 		Versus:
 			Wood: 0%
 			Light: 60%
 			Heavy: 10%
 			Concrete: 0%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffs
-		InfDeath: 2
-		Damage: 30

 Slung:
 	ROF: 60
@@ -102,17 +106,18 @@ Slung:
 		Angle: 88
 		Inaccuracy: 384
 		Image: MISSILE
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 192
+		Damage: 30
+		InfDeath: 4
 		Versus:
 			None: 0%
 			Wood: 75%
 			Light: 40%
 			Heavy: 90%
 			Concrete: 50%
+	Warhead@2Eff: CreateEffect
 		Explosion: small_explosion
-		InfDeath: 4
-		Damage: 30
 		ImpactSound: EXPLLG5.WAV

 HMG:
@@ -127,16 +132,17 @@ HMG:
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 30
+		InfDeath: 2
 		Versus:
 			Wood: 15%
 			Light: 45%
 			Heavy: 20%
 			Concrete: 20%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffs
-		InfDeath: 2
-		Damage: 30

 HMGo:
 	ROF: 30
@@ -150,16 +156,17 @@ HMGo:
 		TrailInterval: 1
 		ContrailDelay: 0
 		ContrailUsePlayerColor: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 40
+		InfDeath: 2
 		Versus:
 			Wood: 15%
 			Light: 45%
 			Heavy: 25%
 			Concrete: 20%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffs
-		InfDeath: 2
-		Damage: 40

 QuadRockets:
 	ROF: 40
@@ -175,19 +182,21 @@ QuadRockets:
 		ROT: 10
 		Speed: 256
 		RangeLimit: 40
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 25
+		InfDeath: 4
 		Versus:
 			None: 35%
 			Wood: 45%
 			Light: 100%
 			Heavy: 100%
 			Concrete: 35%
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: med_explosion
 		ImpactSound: EXPLSML1.WAV
-		SmudgeType: SandCrater, RockCrater
-		Damage: 25

 TurretGun:
 	ROF: 35
@@ -199,18 +208,20 @@ TurretGun:
 		Shadow: no
 		Inaccuracy: 288
 		Image: 120mm
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 55
+		InfDeath: 4
 		Versus:
 			None: 50%
 			Wood: 75%
 			Light: 100%
 			Concrete: 65%
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: small_napalm
 		ImpactSound: EXPLSML4.WAV
-		InfDeath: 4
-		SmudgeType: SandCrater, RockCrater
-		Damage: 55

 TowerMissile:
 	ROF: 35
@@ -230,19 +241,21 @@ TowerMissile:
 		Speed: 256
 		RangeLimit: 50
 		Angle: 110
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 384
+		Damage: 50
+		InfDeath: 3
 		Versus:
 			None: 50%
 			Wood: 45%
 			Light: 100%
 			Heavy: 50%
 			Concrete: 35%
-		InfDeath: 3
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: small_explosion
 		ImpactSound: EXPLMD1.WAV
-		SmudgeType: SandCrater, RockCrater
-		Damage: 50

 90mm:
 	ROF: 50
@@ -252,18 +265,20 @@ TowerMissile:
 		Speed: 640
 		Inaccuracy: 384
 		Image: 120mm
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 40
+		InfDeath: 4
 		Versus:
 			None: 50%
 			Wood: 50%
 			Light: 100%
 			Concrete: 50%
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: small_napalm
 		ImpactSound: EXPLSML4.WAV
-		InfDeath: 4
-		SmudgeType: SandCrater, RockCrater
-		Damage: 40

 90mma:
 	ROF: 50
@@ -273,18 +288,20 @@ TowerMissile:
 		Speed: 704
 		Inaccuracy: 352
 		Image: 120mm
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 40
+		InfDeath: 4
 		Versus:
 			None: 50%
 			Wood: 50%
 			Light: 100%
 			Concrete: 50%
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: small_napalm
 		ImpactSound: EXPLSML4.WAV
-		InfDeath: 4
-		SmudgeType: SandCrater, RockCrater
-		Damage: 40

 DevBullet:
 	ROF: 50
@@ -293,18 +310,20 @@ DevBullet:
 	Projectile: Bullet
 		Speed: 640
 		Image: doubleblastbullet
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 100
+		InfDeath: 4
 		Versus:
 			None: 100%
 			Wood: 50%
 			Light: 100%
 			Heavy: 100%
 			Concrete: 80%
-		Explosion: shockwave
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
-		Damage: 100
+	Warhead@3Eff: CreateEffect
+		Explosion: shockwave

 227mm:
 	ROF: 100
@@ -324,19 +343,21 @@ DevBullet:
 		Image: MISSILE2
 		ROT: 5
 		ContrailLength: 5
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 384
+		Damage: 60
+		InfDeath: 4
 		Versus:
 			None: 20%
 			Wood: 50%
 			Light: 100%
 			Heavy: 50%
 			Concrete: 80%
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: mini_explosion
 		ImpactSound: EXPLMD3.WAV
-		SmudgeType: SandCrater, RockCrater
-		Damage: 60

 FakeMissile:
 	ROF: 120
@@ -352,15 +373,17 @@ FakeMissile:
 		Image: MISSILE
 		ContrailLength: 15
 		ContrailUsePlayerColor: True
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 10
 		Versus:
 			None: 0%
 			Wood: 0%
 			Concrete: 0%
-		Explosion: deviator
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater, RockCrater
-		Damage: 10
+	Warhead@3Eff: CreateEffect
+		Explosion: deviator
 		ImpactSound: EXPLSML2.WAV

 155mm:
@@ -376,19 +399,21 @@ FakeMissile:
 		Inaccuracy: 1c256
 		ContrailLength: 20
 		Image: 155mm
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 384
+		Damage: 100
+		InfDeath: 3
 		Versus:
 			None: 100%
 			Wood: 80%
 			Light: 75%
 			Heavy: 50%
 			Concrete: 100%
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: SandCrater, RockCrater
+	Warhead@3Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: EXPLLG3.WAV
-		InfDeath: 3
-		SmudgeType: SandCrater, RockCrater
-		Damage: 100

 Sound:
 	ROF: 100
@@ -399,15 +424,15 @@ Sound:
 		HitAnim: laserfire
 		BeamDuration: 8
 		UsePlayerColor: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 32
+		Damage: 150
+		InfDeath: 6
 		Versus:
 			None: 60%
 			Wood: 85%
 			Light: 80%
 			Concrete: 75%
-		InfDeath: 6
-		Damage: 150

 ChainGun:
 	ROF: 10
@@ -417,16 +442,17 @@ ChainGun:
 	Projectile: Bullet
 		Speed: 1c256
 		High: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 96
+		Damage: 20
+		InfDeath: 2
 		Versus:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
 			Concrete: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffs
-		InfDeath: 2
-		Damage: 20

 Heal:
 	ROF: 160
@@ -434,26 +460,26 @@ Heal:
 	Report:
 	Projectile: Bullet
 		Speed: 1c256
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 160
+		Damage: -50
+		InfDeath: 1
 		Versus:
 			Wood: 0%
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 1
-		Damage: -50

 WormJaw:
 	ROF: 10
 	Range: 3c0
 	Report: WORM.WAV
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 160
+		Damage: 100
 		Versus:
 			Wood: 0%
 			Concrete: 0%
-		Damage: 100

 ParaBomb:
 	ROF: 10
@@ -461,17 +487,19 @@ ParaBomb:
 	Report:
 	Projectile: GravityBomb
 		Image: BOMBS
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 192
+		Damage: 500
+		InfDeath: 4
 		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 75%
 			Concrete: 50%
-		Explosion: self_destruct
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: Crater
-		Damage: 500
+	Warhead@3Eff: CreateEffect
+		Explosion: self_destruct
 		ImpactSound: EXPLLG3.WAV

 Napalm:
@@ -479,121 +507,132 @@ Napalm:
 	Range: 3c0
 	Projectile: GravityBomb
 		Image: BOMBS
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 640
+		Damage: 300
+		InfDeath: 4
 		Versus:
 			None: 20%
 			Wood: 100%
 			Light: 30%
 			Heavy: 20%
 			Concrete: 70%
-		InfDeath: 4
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Crater
+	Warhead@3Eff: CreateEffect
 		Explosion: artillery
 		ImpactSound: NAPALM1.WAV
-		SmudgeType: Crater
-		Damage: 300

 Crush:
-	Warhead:
-		ImpactSound: CRUSH1.WAV
+	Warhead@1Dam: SpreadDamage
 		Damage: 100
+	Warhead@2Eff: CreateEffect
+		ImpactSound: CRUSH1.WAV

 Demolish:
-	Warhead:
-		ImpactSound: EXPLLG2.WAV
+	Warhead@1Dam: SpreadDamage
+	Warhead@2Eff: CreateEffect
 		Explosion: building
+		ImpactSound: EXPLLG2.WAV

 Atomic:
-	Warhead:
-		Damage: 1800
+	Warhead@1Dam: SpreadDamage
 		Spread: 2c0
+		Damage: 1800
+		InfDeath: 5
 		Versus:
 			None: 100%
 			Wood: 100%
 			Light: 100%
 			Heavy: 50%
 			Concrete: 50%
+	Warhead@2Eff: CreateEffect
 		Explosion: nuke
-		InfDeath: 5
 		ImpactSound: EXPLLG2.WAV

 CrateNuke:
-	Warhead:
-		Damage: 800
+	Warhead@1Dam: SpreadDamage
 		Spread: 1c576
+		Damage: 800
+		InfDeath: 5
 		Versus:
 			None: 20%
 			Wood: 75%
 			Light: 25%
 			Heavy: 25%
 			Concrete: 50%
+	Warhead@2Eff: CreateEffect
 		Explosion: nuke
-		InfDeath: 5
 		ImpactSound: EXPLLG2.WAV

 CrateExplosion:
-	Warhead:
-		Damage: 400
+	Warhead@1Dam: SpreadDamage
 		Spread: 320
+		Damage: 400
+		InfDeath: 4
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: building
-		InfDeath: 4
 		ImpactSound: EXPLSML4.WAV

 UnitExplode:
-	Warhead:
-		Damage: 500
+	Warhead@1Dam: SpreadDamage
 		Spread: 320
+		Damage: 500
+		InfDeath: 4
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: building
-		InfDeath: 4
 		ImpactSound: EXPLMD1.WAV

 UnitExplodeSmall:
-	Warhead:
-		Damage: 60
+	Warhead@1Dam: SpreadDamage
 		Spread: 320
+		Damage: 60
+		InfDeath: 4
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: self_destruct
-		InfDeath: 4
 		ImpactSound: EXPLHG1.WAV, EXPLLG1.WAV, EXPLMD1.WAV, EXPLSML4.WAV

 UnitExplodeTiny:
-	Warhead:
-		Damage: 30
+	Warhead@1Dam: SpreadDamage
 		Spread: 224
+		Damage: 30
+		InfDeath: 4
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: med_explosion
-		InfDeath: 4
 		ImpactSound: EXPLMD2.WAV, EXPLSML1.WAV, EXPLSML2.WAV, EXPLSML3.WAV

 UnitExplodeScale:
-	Warhead:
-		Damage: 90
+	Warhead@1Dam: SpreadDamage
 		Spread: 416
+		Damage: 90
+		InfDeath: 4
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: building
-		InfDeath: 4
 		ImpactSound: EXPLLG2.WAV, EXPLLG3.WAV, EXPLLG5.WAV

 Grenade:
@@ -606,22 +645,24 @@ Grenade:
 		Angle: 62
 		Inaccuracy: 416
 		Image: BOMBS
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 192
+		Damage: 60
+		InfDeath: 3
 		Versus:
 			None: 50%
 			Wood: 100%
 			Light: 25%
 			Heavy: 5%
-		Explosion: med_explosion
-		InfDeath: 3
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
-		Damage: 60
+	Warhead@3Eff: CreateEffect
+		Explosion: med_explosion
 		ImpactSound: EXPLLG5.WAV

 Weathering:
 	ROF: 100
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Damage: 5

 Shrapnel:
@@ -634,31 +675,35 @@ Shrapnel:
 		Angle: 91, 264
 		Inaccuracy: 416
 		Image: bombs
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 192
+		Damage: 60
+		InfDeath: 3
 		Versus:
 			None: 50%
 			Wood: 100%
 			Light: 25%
 			Heavy: 5%
-		Explosion: med_explosion
-		InfDeath: 3
+	Warhead@2Smu: LeaveSmudge
 		SmudgeType: SandCrater
-		Damage: 60
+	Warhead@3Eff: CreateEffect
+		Explosion: med_explosion
 		ImpactSound: EXPLLG5.WAV

 SpiceExplosion:
-	Warhead:
-		Damage: 10
+	Warhead@1Dam: SpreadDamage
 		Spread: 9
-		Size: 2,2
+		Damage: 10
+		InfDeath: 3
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		Explosion: med_explosion
-		InfDeath: 3
-		ImpactSound: EXPLLG5.WAV
+	Warhead@2Res: CreateResource
 		AddsResourceType: Spice
+		Size: 2,2
+	Warhead@3Eff: CreateEffect
+		Explosion: med_explosion
+		ImpactSound: EXPLLG5.WAV

--- a/mods/ra/maps/allies-01-classic/map.yaml
+++ b/mods/ra/maps/allies-01-classic/map.yaml
@@ -615,7 +615,7 @@ Weapons:
 		Range: 5c0
 		ROF: 20
 		Burst: 1
-		Warhead:
+		Warhead: SpreadDamage
 			Damage: 20

 Voices:
--- a/mods/ra/maps/allies-02-classic/map.yaml
+++ b/mods/ra/maps/allies-02-classic/map.yaml
@@ -951,7 +951,7 @@ Weapons:
 		Range: 5c0
 		ROF: 20
 		Burst: 1
-		Warhead:
+		Warhead: SpreadDamage
 			Damage: 20

 Voices:
--- a/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
+++ b/mods/ra/maps/drop-zone-battle-of-tikiaki/map.yaml
@@ -364,7 +364,7 @@ Weapons:
 	PortaTesla:
 		ROF: 20
 		Range: 10c0
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 42
 			InfDeath: 5
 			Damage: 80
--- a/mods/ra/maps/drop-zone-w/map.yaml
+++ b/mods/ra/maps/drop-zone-w/map.yaml
@@ -313,20 +313,22 @@ Weapons:
 			Inaccuracy: 3c341
 			Image: 120MM
 			ContrailLength: 30
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 128
 			Versus:
 				None: 60%
 				Wood: 75%
 				Light: 60%
 				Heavy: 25%
+			InfDeath: 2
+			Damage: 250
+		Warhead@1Eff: CreateEffect
 			Explosion: large_explosion
 			WaterExplosion: large_splash
-			InfDeath: 2
-			SmudgeType: Crater
-			Damage: 250
 			ImpactSound: kaboom12.aud
 			WaterImpactSound: splash9.aud
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater
 	SubMissile:
 		ROF: 250
 		Range: 32c0
@@ -340,19 +342,21 @@ Weapons:
 			Image: MISSILE
 			Trail: smokey
 			ContrailLength: 30
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 426
 			Versus:
 				None: 40%
 				Light: 30%
 				Heavy: 30%
+			InfDeath: blownaway
+			Damage: 400
+		Warhead@1Eff: CreateEffect
 			Explosion: large_explosion
 			WaterExplosion: large_splash
-			InfDeath: blownaway
-			SmudgeType: Crater
-			Damage: 400
 			ImpactSound: kaboom12.aud
 			WaterImpactSound: splash9.aud
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater

 Voices:

--- a/mods/ra/maps/drop-zone/map.yaml
+++ b/mods/ra/maps/drop-zone/map.yaml
@@ -259,7 +259,7 @@ Weapons:
 	PortaTesla:
 		ROF: 20
 		Range: 10c0
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 42
 			InfDeath: 5
 			Damage: 80
--- a/mods/ra/maps/fort-lonestar/map.yaml
+++ b/mods/ra/maps/fort-lonestar/map.yaml
@@ -771,24 +771,26 @@ Weapons:
 			Inaccuracy: 1c682
 			Image: 120MM
 			ContrailLength: 50
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 256
 			Versus:
 				None: 75%
 				Wood: 75%
 				Light: 75%
 				Concrete: 100%
+			InfDeath: 4
+			Damage: 150
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater
+		Warhead@3Eff: CreateEffect
 			Explosion: self_destruct
 			WaterExplosion: self_destruct
-			InfDeath: 4
-			SmudgeType: Crater
-			Damage: 150
 	MammothTusk:
 		ROF: 300
 		Range: 10c0
 		Report: MISSILE6.AUD
 		Burst: 2
-		ValidTargets: Ground, Air
+		ValidTargets: Ground, Air, Enemy, Neutral, Ally
 		Projectile: Missile
 			Speed: 128
 			Arm: 2
@@ -801,7 +803,7 @@ Weapons:
 			Image: DRAGON
 			ROT: 10
 			RangeLimit: 80
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 640
 			Versus:
 				None: 125%
@@ -809,16 +811,18 @@ Weapons:
 				Light: 110%
 				Heavy: 100%
 				Concrete: 200%
+			InfDeath: 3
+			Damage: 250
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater
+		Warhead@3Eff: CreateEffect
 			Explosion: nuke
 			WaterExplosion: nuke
-			InfDeath: 3
-			SmudgeType: Crater
-			Damage: 250
 	TankNapalm:
 		ROF: 40
 		Range: 8c0
 		Report: AACANON3.AUD
-		ValidTargets: Ground
+		ValidTargets: Ground, Enemy, Neutral, Ally
 		Burst: 6
 		BurstDelay: 1
 		Projectile: Bullet
@@ -827,7 +831,7 @@ Weapons:
 			Inaccuracy: 2c512
 			Trail: smokey
 			ContrailLength: 2
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 341
 			Versus:
 				None: 90%
@@ -835,31 +839,35 @@ Weapons:
 				Light: 100%
 				Heavy: 100%
 				Concrete: 100%
+			InfDeath: 4
+			Damage: 15
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Scorch
+		Warhead@3Eff: CreateEffect
 			Explosion: small_explosion
 			WaterExplosion: small_explosion
-			InfDeath: 4
-			SmudgeType: Scorch
 			ImpactSound: firebl3.aud
-			Damage: 15
 	ParaBomb:
 		ROF: 5
 		Range: 5c0
 		Report: CHUTE1.AUD
 		Projectile: GravityBomb
 			Image: BOMBLET
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 426
 			Versus:
 				None: 125%
 				Wood: 100%
 				Light: 60%
 				Concrete: 25%
+			InfDeath: 5
+			Damage: 200
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater
+		Warhead@3Eff: CreateEffect
 			Explosion: napalm
 			ImpactSound: firebl3.aud
 			WaterExplosion: napalm
-			InfDeath: 5
-			SmudgeType: Crater
-			Damage: 200
 	155mm:
 		ROF: 10
 		Range: 7c5
@@ -874,7 +882,7 @@ Weapons:
 			Angle: 30
 			Inaccuracy: 1c682
 			ContrailLength: 2
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 426
 			Versus:
 				None: 80%
@@ -882,21 +890,23 @@ Weapons:
 				Light: 60%
 				Heavy: 75%
 				Concrete: 35%
+			InfDeath: 5
+			Damage: 10
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Scorch
+		Warhead@3Eff: CreateEffect
 			Explosion: small_napalm
 			WaterExplosion: small_napalm
-			InfDeath: 5
-			SmudgeType: Scorch
 			ImpactSound: firebl3.aud
-			Damage: 10
 	FLAK-23:
 		ROF: 10
 		Range: 8c0
 		Report: AACANON3.AUD
-		ValidTargets: Air,Ground
+		ValidTargets: Air, Ground, Enemy, Neutral, Ally
 		Projectile: Bullet
 			Speed: 1c682
 			High: true
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 213
 			Versus:
 				None: 35%
@@ -904,8 +914,11 @@ Weapons:
 				Light: 30%
 				Heavy: 40%
 				Concrete: 30%
-			Explosion: med_explosion
 			Damage: 25
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Scorch
+		Warhead@3Eff: CreateEffect
+			Explosion: med_explosion
 	SCUD:
 		ROF: 280
 		Range: 7c0
@@ -921,18 +934,20 @@ Weapons:
 			Inaccuracy: 426
 			Image: V2
 			Angle: 216
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 853
 			Versus:
 				None: 100%
 				Wood: 90%
 				Light: 80%
 				Heavy: 70%
+			InfDeath: 3
+			Damage: 500
+		Warhead@2Smu: LeaveSmudge
+			SmudgeType: Crater
+		Warhead@3Eff: CreateEffect
 			Explosion: nuke
 			WaterExplosion: large_splash
-			InfDeath: 3
-			SmudgeType: Crater
-			Damage: 500
 			ImpactSound: kaboom1.aud
 			WaterImpactSound: kaboom1.aud
 	SilencedPPK:
@@ -941,16 +956,17 @@ Weapons:
 		Report: silppk.aud
 		Projectile: Bullet
 			Speed: 1c682
-		Warhead:
+		Warhead: SpreadDamage
 			Spread: 128
 			Versus:
 				Wood: 0%
 				Light: 0%
 				Heavy: 50%
 				Concrete: 0%
-			Explosion: piffs
 			InfDeath: 2
 			Damage: 150
+		Warhead@2Eff: CreateEffect
+			Explosion: piffs

 Voices:

--- a/mods/ra/maps/intervention/map.yaml
+++ b/mods/ra/maps/intervention/map.yaml
@@ -2333,7 +2333,7 @@ Weapons:
 	Nike:
 		Range: 9c0
 	Maverick:
-		Warhead:
+		Warhead: SpreadDamage
 			Damage: 175

 Voices:
--- a/mods/ra/maps/training-camp/map.yaml
+++ b/mods/ra/maps/training-camp/map.yaml
@@ -1076,12 +1076,10 @@ VoxelSequences:

 Weapons:
 	CrateNuke:
-		Warhead@areanuke2:
+		Warhead@areanuke2: SpreadDamage
 			DamageModel: PerCell
 			Damage: 250
-			SmudgeType: Scorch
-			Size: 4,3
-			Ore: true
+			Size: 4
 			Versus:
 				None: 90%
 				Light: 60%
@@ -1089,13 +1087,21 @@ Weapons:
 				Concrete: 50%
 			Delay: 12
 			InfDeath: 4
+		Warhead@areanuke2Smu: LeaveSmudge
+			SmudgeType: Scorch
+			Size: 4,3
+			Delay: 12
+		Warhead@areanuke2Res: DestroyResource
+			DestroyResources: true
+			Size: 4,3
+			Delay: 12
+		Warhead@areanuke2Eff: CreateEffect
 			ImpactSound: kaboom22
-		Warhead@areanuke3:
+			Delay: 12
+		Warhead@areanuke3: SpreadDamage
 			DamageModel: PerCell
 			Damage: 250
-			SmudgeType: Scorch
-			Size: 3,2
-			Ore: true
+			Size: 3
 			Versus:
 				None: 90%
 				Light: 60%
@@ -1103,13 +1109,20 @@ Weapons:
 				Concrete: 50%
 			Delay: 24
 			InfDeath: 4
+		Warhead@areanuke3Smu: LeaveSmudge
+			SmudgeType: Scorch
+			Size: 3,2
+			Delay: 24
+		Warhead@areanuke3Res: DestroyResource
+			DestroyResources: true
+			Size: 3,2
+			Delay: 24
+		Warhead@areanuke3Eff: CreateEffect
 			ImpactSound: kaboom22
-		Warhead@areanuke4:
+			Delay: 24
+		Warhead@areanuke4: SpreadDamage
 			DamageModel: PerCell
 			Damage: 250
-			SmudgeType: Scorch
-			Size: 2,1
-			Ore: true
 			Versus:
 				None: 90%
 				Light: 60%
@@ -1117,7 +1130,17 @@ Weapons:
 				Concrete: 50%
 			Delay: 36
 			InfDeath: 4
+		Warhead@areanuke4Smu: LeaveSmudge
+			SmudgeType: Scorch
+			Size: 2,1
+			Delay: 36
+		Warhead@areanuke4Res: DestroyResource
+			DestroyResources: true
+			Size: 2,1
+			Delay: 36
+		Warhead@areanuke4Eff: CreateEffect
 			ImpactSound: kaboom22
+			Delay: 36

 Voices:

--- a/mods/ra/weapons.yaml
+++ b/mods/ra/weapons.yaml
--- a/mods/ts/weapons.yaml
+++ b/mods/ts/weapons.yaml
@@ -1,27 +1,29 @@
 UnitExplode:
-	Warhead:
-		Damage: 500
+	Warhead@1Dam: SpreadDamage
 		Spread: 426
+		Damage: 500
+		InfDeath: 2
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: large_twlt
-		InfDeath: 2
 		ImpactSound: expnew09.aud

 UnitExplodeSmall:
-	Warhead:
-		Damage: 40
+	Warhead@1Dam: SpreadDamage
 		Spread: 426
+		Damage: 40
+		InfDeath: 2
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+	Warhead@2Eff: CreateEffect
 		Explosion: medium_brnl
-		InfDeath: 2
 		ImpactSound: expnew13.aud

 Minigun:
@@ -30,17 +32,18 @@ Minigun:
 	Report: INFGUN3.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 12
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 12
-		ProneModifier: 70

 Grenade:
 	ROF: 60
@@ -52,17 +55,18 @@ Grenade:
 		Angle: 62
 		Inaccuracy: 554
 		Image: DISCUS
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 171
+		Damage: 40
+		InfDeath: 3
+		ProneModifier: 70
 		Versus:
 			None: 100%
 			Wood: 85%
 			Light: 70%
 			Heavy: 35%
 			Concrete: 28%
-		InfDeath: 3
-		Damage: 40
-		ProneModifier: 70
+	Warhead@2Eff: CreateEffect
 		Explosion: large_grey_explosion
 		ImpactSound: expnew13.aud

@@ -81,16 +85,17 @@ Bazooka:
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 25
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 25
+	Warhead@2Eff: CreateEffect
 		Explosion: small_clsn
 		ImpactSound: expnew12.aud

@@ -109,16 +114,17 @@ MultiCluster:
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 65
+		InfDeath: 3
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 3
-		Damage: 65
+	Warhead@2Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: expnew09.aud

@@ -128,16 +134,16 @@ Heal:
 	Report: HEALER1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 213
+		Damage: -50
+		InfDeath: 1
+		ProneModifier: 100
 		Versus:
 			Wood: 0%
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 1
-		Damage: -50
-		ProneModifier: 100

 Sniper:
 	ROF: 60
@@ -145,17 +151,17 @@ Sniper:
 	Report: SILENCER.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
-		Damage: 150
-		ProneModifier: 100
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
+		Damage: 150
+		InfDeath: 1
+		ProneModifier: 100
 		Versus:
 			None: 100%
 			Wood: 0%
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
-		InfDeath: 1

 M1Carbine:
 	ROF: 20
@@ -163,17 +169,18 @@ M1Carbine:
 	Report: INFGUN3.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 15
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 15
-		ProneModifier: 70

 LtRail:
 	ROF: 60
@@ -184,17 +191,17 @@ LtRail:
 		BeamWidth: 1
 		BeamDuration: 10
 		Color: 200,0,128,255
-	Warhead:
-		Damage: 150
-		ProneModifier: 100
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
+		Damage: 150
+		InfDeath: 2
+		ProneModifier: 100
 		Versus:
 			None: 100%
 			Wood: 130%
 			Light: 150%
 			Heavy: 110%
 			Concrete: 5%
-		InfDeath: 2

 CyCannon:
 	ROF: 50
@@ -206,17 +213,18 @@ CyCannon:
 		High: yes
 		Shadow: true
 		Image: TORPEDO
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 120
+		InfDeath: 6
+		ProneModifier: 100
 		Versus:
 			None: 100%
 			Wood: 65%
 			Light: 75%
 			Heavy: 50%
 			Concrete: 40%
-		InfDeath: 6
-		Damage: 120
-		ProneModifier: 100
+	Warhead@2Eff: CreateEffect
 		Explosion: large_bang
 		ImpactSound: expnew12.aud

@@ -227,17 +235,18 @@ Vulcan3:
 	Report: CYGUN1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 10
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 10
-		ProneModifier: 70

 Vulcan2:
 	ROF: 50
@@ -246,18 +255,19 @@ Vulcan2:
 	Report: TSGUN4.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 50
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			None: 100%
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 50
-		ProneModifier: 70

 Vulcan:
 	ROF: 60
@@ -265,17 +275,18 @@ Vulcan:
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 20
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 20
-		ProneModifier: 70

 FiendShard:
 	ROF: 30
@@ -289,15 +300,15 @@ FiendShard:
 		Inaccuracy: 512
 		Shadow: true
 		Angle: 88
-	Warhead:
+	Warhead@1Dam: SpreadDamage
+		Damage: 35
+		InfDeath: 1
+		ProneModifier: 100
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
-		InfDeath: 1
-		Damage: 35
-		ProneModifier: 100

 JumpCannon:
 	ROF: 40
@@ -306,17 +317,18 @@ JumpCannon:
 	Report: JUMPJET1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 15
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 15
-		ProneModifier: 70

 HoverMissile:
 	ROF: 68
@@ -334,16 +346,17 @@ HoverMissile:
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 30
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 30
+	Warhead@2Eff: CreateEffect
 		Explosion: small_clsn
 		ImpactSound: expnew12.aud

@@ -359,16 +372,17 @@ HoverMissile:
 		Image: 120mm
 		Shadow: true
 		Angle: 62
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 50
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 50
+	Warhead@2Eff: CreateEffect
 		Explosion: medium_clsn
 		ImpactSound: expnew14.aud

@@ -388,17 +402,18 @@ MammothTusk:
 		ROT: 10
 		Speed: 170
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 171
+		Damage: 40
+		InfDeath: 3
+		ProneModifier: 70
 		Versus:
 			None: 100%
 			Wood: 85%
 			Light: 70%
 			Heavy: 35%
 			Concrete: 28%
-		InfDeath: 3
-		Damage: 40
-		ProneModifier: 70
+	Warhead@2Eff: CreateEffect
 		Explosion: medium_bang
 		ImpactSound: expnew12.aud

@@ -408,17 +423,17 @@ Repair:
 	Report: REPAIR11.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 213
+		Damage: -50
+		InfDeath: 1
+		ProneModifier: 100
 		Versus:
 			None: 0%
 			Wood: 0%
 			Light: 100%
 			Heavy: 100%
 			Concrete: 0%
-		InfDeath: 1
-		Damage: -50
-		ProneModifier: 100

 SlimeAttack:
 	ROF: 80
@@ -427,30 +442,30 @@ SlimeAttack:
 	Report: VICER1.AUD
 	Projectile: Bullet
 		Speed: 426
-	Warhead:
+	Warhead@1Dam: SpreadDamage
+		Damage: 100
+		InfDeath: 2
+		ProneModifier: 100
 		Versus:
 			Wood: 25%
 			Light: 30%
 			Heavy: 10%
 			Concrete: 10%
-		InfDeath: 2
-		Damage: 100
-		ProneModifier: 100

 SuicideBomb:
 	ROF: 1
 	Range: 0c512
 	Report: HUNTER2.AUD
-	Warhead:
-		Damage: 11000
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
-		DestroyResources: true
+		Damage: 11000
+		InfDeath: 5
 		Versus:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
-		InfDeath: 5
+	Warhead@2Res: DestroyResource

 120mm:
 	ROF: 80
@@ -458,16 +473,17 @@ SuicideBomb:
 	Report: 120MMF.AUD
 	Projectile: Bullet
 		Speed: 1c512
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 70
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 70
+	Warhead@2Eff: CreateEffect
 		Explosion: large_clsn
 		ImpactSound: expnew14.aud

@@ -480,17 +496,17 @@ MechRailgun:
 	Projectile: LaserZap
 		Color: 200,0,255,255
 		BeamWidth: 3
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
+		Damage: 200
+		InfDeath: 5
+		ProneModifier: 100
 		Versus:
 			None: 200%
 			Wood: 175%
 			Light: 160%
 			Heavy: 100%
 			Concrete: 25%
-		InfDeath: 5
-		Damage: 200
-		ProneModifier: 100

 AssaultCannon:
 	ROF: 50
@@ -498,17 +514,18 @@ AssaultCannon:
 	Report: TSGUN4.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 40
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 40
-		ProneModifier: 70

 BikeMissile:
 	ROF: 60
@@ -527,38 +544,40 @@ BikeMissile:
 		ROT: 8
 		Speed: 213
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 256
+		Damage: 40
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 40
+	Warhead@2Eff: CreateEffect
 		Explosion: small_clsn
 		ImpactSound: expnew12.aud

 RaiderCannon:
 	ROF: 55
 	Range: 4c0
-	Burst: 2	#purely cosmetical, for alternate muzzle position
+	Burst: 2
 	BurstDelay: 55
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 40
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 40
-		ProneModifier: 70

 FireballLauncher:
 	ROF: 50
@@ -570,17 +589,17 @@ FireballLauncher:
 		Inacuracy: 384
 	Burst: 5
 	BurstDelay: 5
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 341
+		Damage: 25
+		InfDeath: 5
+		ProneModifier: 100
 		Versus:
 			None: 600%
 			Wood: 148%
 			Light: 59%
 			Heavy: 6%
 			Concrete: 2%
-		InfDeath: 5
-		Damage: 25
-		ProneModifier: 100

 SonicZap:
 	ROF: 120
@@ -591,13 +610,13 @@ SonicZap:
 		Color: 200,0,255,255
 		BeamWidth: 12
 		BeamDuration: 50
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
+		Damage: 100
+		InfDeath: 5
 		Versus:
 			Heavy: 80%
 			Concrete: 60%
-		InfDeath: 5
-		Damage: 100

 Dragon:
 	ROF: 50
@@ -615,16 +634,17 @@ Dragon:
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 30
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 30
+	Warhead@2Eff: CreateEffect
 		Explosion: small_clsn
 		ImpactSound: expnew12.aud

@@ -638,16 +658,17 @@ Dragon:
 		Image: 120mm
 		Shadow: true
 		Angle: 62
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 36
+		InfDeath: 2
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 2
-		Damage: 36
+	Warhead@2Eff: CreateEffect
 		Explosion: medium_clsn
 		ImpactSound: expnew14.aud

@@ -663,17 +684,18 @@ Dragon:
 		Shadow: true
 		High: yes
 	MinRange: 5c0
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 298
+		Damage: 150
+		InfDeath: 3
+		ProneModifier: 100
 		Versus:
 			None: 100%
 			Wood: 85%
 			Light: 68%
 			Heavy: 35%
 			Concrete: 35%
-		InfDeath: 3
-		Damage: 150
-		ProneModifier: 100
+	Warhead@2Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: expnew09.aud

@@ -693,16 +715,17 @@ Hellfire:
 		Image: DRAGON
 		ROT: 8
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 85
+		Damage: 30
+		InfDeath: 2
 		Versus:
 			None: 30%
 			Wood: 65%
 			Light: 150%
 			Heavy: 100%
 			Concrete: 30%
-		InfDeath: 2
-		Damage: 30
+	Warhead@2Eff: CreateEffect
 		Explosion: small_bang
 		ImpactSound: expnew12.aud

@@ -714,17 +737,18 @@ Bomb:
 		Speed: 170
 		Image: canister
 		Shadow: true
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 298
+		Damage: 160
+		InfDeath: 3
+		ProneModifier: 100
 		Versus:
 			None: 200%
 			Wood: 90%
 			Light: 75%
 			Heavy: 32%
 			Concrete: 100%
-		InfDeath: 3
-		Damage: 160
-		ProneModifier: 100
+	Warhead@2Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: expnew09.aud

@@ -743,16 +767,17 @@ Proton:
 		Image: TORPEDO
 		ROT: 1
 		RangeLimit: 35
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 20
+		InfDeath: 3
 		Versus:
 			None: 25%
 			Wood: 65%
 			Light: 75%
 			Heavy: 100%
 			Concrete: 60%
-		InfDeath: 3
-		Damage: 20
+	Warhead@2Eff: CreateEffect
 		Explosion: small_bang
 		ImpactSound: expnew12.aud

@@ -763,17 +788,18 @@ HarpyClaw:
 	Projectile: Bullet
 		Speed: 1c682
 	ValidTargets: Ground, Air
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 60
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 60
-		ProneModifier: 70

 Pistola:
 	ROF: 20
@@ -781,49 +807,57 @@ Pistola:
 	Report: GUN18.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 2
+		InfDeath: 1
+		ProneModifier: 70
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piff
-		InfDeath: 1
-		Damage: 2
-		ProneModifier: 70

 Tiberium:
 	ROF: 16
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
-		InfDeath: 6
 		Damage: 2
+		InfDeath: 6
 		PreventProne: yes

 TiberiumHeal:
 	ROF: 16
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
-		InfDeath: 6
 		Damage: -2
+		InfDeath: 6
 		PreventProne: yes

 IonCannon:
 	ValidTargets: Ground, Air
-	Warhead@impact:
-		Damage: 1000
+	Warhead@1Dam_impact: SpreadDamage
 		Spread: 1c0
+		Damage: 1000
 		InfDeath: 5
-		Explosion: ring1
 		ProneModifier: 100
-	Warhead@area:
-		DamageModel: PerCell
+	Warhead@2Eff_impact: CreateEffect
+		Explosion: ring1
+	Warhead@3Dam_area: PerCellDamage
+		Size: 2,1
 		Damage: 250
+		InfDeath: 5
+		Delay: 3
+	Warhead@4Dam_area: SpreadDamage
+		Damage: 250
+		InfDeath: 5
+		Delay: 3
+	Warhead@5Smu_area: LeaveSmudge
 		SmudgeType: Scorch
 		Size: 2,1
 		Delay: 3
-		InfDeath: 5

 VulcanTower:
 	ROF: 26
@@ -831,16 +865,17 @@ VulcanTower:
 	Report: CHAINGN1.AUD
 	Projectile: Bullet
 		Speed: 1c682
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 18
+		InfDeath: 1
 		Versus:
 			Wood: 60%
 			Light: 40%
 			Heavy: 25%
 			Concrete: 10%
+	Warhead@2Eff: CreateEffect
 		Explosion: piffpiff
-		InfDeath: 1
-		Damage: 18

 RPGTower:
 	ROF: 80
@@ -853,17 +888,18 @@ RPGTower:
 		Shadow: true
 		Angle: 62
 		Image: canister
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
+		Damage: 110
+		InfDeath: 2
+		ProneModifier: 70
 		Versus:
 			None: 30%
 			Wood: 75%
 			Light: 90%
 			Heavy: 100%
 			Concrete: 70%
-		InfDeath: 2
-		Damage: 110
-		ProneModifier: 70
+	Warhead@2Eff: CreateEffect
 		Explosion: large_clsn
 		ImpactSound: expnew14.aud

@@ -882,10 +918,11 @@ SAMTower:
 		Image: DRAGON
 		ROT: 5
 		RangeLimit: 60
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 128
-		InfDeath: 2
 		Damage: 33
+		InfDeath: 2
+	Warhead@2Eff: CreateEffect
 		Explosion: small_clsn
 		ImpactSound: expnew12.aud

@@ -896,12 +933,13 @@ ObeliskLaser:
 	Report: OBELRAY1.AUD
 	Projectile: LaserZap
 		BeamWidth: 4
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
-		InfDeath: 5
-		SmudgeType: Scorch
 		Damage: 250
+		InfDeath: 5
 		ProneModifier: 60
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch

 TurretLaser:
 	ROF: 40
@@ -910,24 +948,28 @@ TurretLaser:
 	Projectile: LaserZap
 		BeamWidth: 2
 		BeamDuration: 5
-	Warhead:
+	Warhead@1Dam: SpreadDamage
 		Spread: 42
-		InfDeath: 5
-		SmudgeType: Scorch
 		Damage: 30
+		InfDeath: 5
 		ProneModifier: 60
+	Warhead@2Smu: LeaveSmudge
+		SmudgeType: Scorch

 TiberiumExplosion:
-	Warhead:
-		Damage: 10
+	Warhead@1Dam: SpreadDamage
 		Spread: 9
-		Size: 1,1
+		Damage: 10
+		InfDeath: 3
 		Versus:
 			None: 90%
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
-		InfDeath: 3
+	Warhead@2Res: CreateResource
+		AddsResourceType: Tiberium
+		Size: 1,1
+	Warhead@3Eff: CreateEffect
 		Explosion: large_explosion
 		ImpactSound: expnew09.aud
-		AddsResourceType: Tiberium
+