Merge pull request #7318 from reaperrr/remove-percellwh

Removed PerCellDamageWarhead

mods/ra/maps/training-camp/map.yaml

@@ -1057,69 +1057,6 @@ Sequences:
 VoxelSequences:
 
 Weapons:
-	CrateNuke:
-		Warhead@areanuke2: PerCellDamage
-			Damage: 250
-			Size: 4
-			Versus:
-				None: 90
-				Light: 60
-				Heavy: 25
-				Concrete: 50
-			Delay: 12
-			DeathType: 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
-			Delay: 12
-		Warhead@areanuke3: PerCellDamage
-			Damage: 250
-			Size: 3
-			Versus:
-				None: 90
-				Light: 60
-				Heavy: 25
-				Concrete: 50
-			Delay: 24
-			DeathType: 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
-			Delay: 24
-		Warhead@areanuke4: PerCellDamage
-			Damage: 250
-			Versus:
-				None: 90
-				Light: 60
-				Heavy: 25
-				Concrete: 50
-			Delay: 36
-			DeathType: 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:
 

mods/ra/weapons.yaml

@@ -776,49 +776,36 @@ CrateExplosion:
 
 CrateNuke:
 	Warhead@1Dam_impact: SpreadDamage
-		Spread: 256
+		Spread: 1c0
 		Damage: 100
 		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		DeathType: 5
+		ValidTargets: Ground, Water, Air
 		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
-			Concrete: 50
+			Concrete: 25
 		AffectsParent: true
 	Warhead@2Res_impact: DestroyResource
 	Warhead@3Eff_impact: CreateEffect
 		Explosion: nuke
 		ImpactSound: kaboom1.aud
-	Warhead@4Dam_areanuke: PerCellDamage
-		Size: 5
-		Damage: 250
+	Warhead@4Dam_areanuke: SpreadDamage
+		Spread: 1c0
+		Damage: 60
+		Falloff: 1000, 600, 400, 250, 150, 100, 0
 		DeathType: 5
 		Delay: 4
+		ValidTargets: Ground, Water, Air
 		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
-			Concrete: 50
+			Concrete: 25
 		AffectsParent: true
-	Warhead@5Dam_areanuke: SpreadDamage
-		Damage: 250
-		DeathType: 5
-		Delay: 4
-		Versus:
-			None: 90
-			Light: 60
-			Heavy: 25
-			Concrete: 50
-		AffectsParent: true
-	Warhead@6Res_areanuke: DestroyResource
+	Warhead@5Res_areanuke: DestroyResource
 		Size: 5,4
 		Delay: 4
-	Warhead@7Smu_areanuke: LeaveSmudge
+	Warhead@6Smu_areanuke: LeaveSmudge
 		SmudgeType: Scorch
 		Size: 5,4
 		Delay: 4
-	Warhead@8Eff_areanuke: CreateEffect
+	Warhead@7Eff_areanuke: CreateEffect
 		ImpactSound: kaboom22.aud
 		Delay: 4
 

mods/ts/weapons.yaml

@@ -1026,9 +1026,10 @@ IonCannon:
 	Warhead@2Eff_impact: CreateEffect
 		Explosion: ionring
 		ImpactSound: ion1.aud
-	Warhead@3Dam_area: PerCellDamage
-		Size: 2
+	Warhead@3Dam_area: SpreadDamage
+		Spread: 1c0
 		Damage: 250
+		Falloff: 100, 50, 25, 0
 		DeathType: 5
 		Delay: 3
 		ValidTargets: Ground, Air