From a06cb8fccb00cd34b3fbbea9e583aa34ad99e91a Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Fri, 24 Jul 2015 14:31:35 +0200
Subject: [PATCH] Tweaked RA and TD artillery explosion

Renamed RA UnitExplode to AmmoExplode, added new UnitExplode with 1/10
damage.
Reduced TD UnitExplode damage to 1/10 of old value.

Now artillery always explodes, but there's only a 75% chance it explodes
violently and only when it has ammo.
If either condition isn't met, it explodes with the (now less violent) UnitExplode.
---
 mods/cnc/rules/vehicles.yaml     |  4 ++++
 mods/cnc/weapons/explosions.yaml |  1 -
 mods/ra/rules/vehicles.yaml      |  5 +++--
 mods/ra/weapons/explosions.yaml  | 19 +++++++++++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml
index d768d3fb33..330d963794 100644
--- a/mods/cnc/rules/vehicles.yaml
+++ b/mods/cnc/rules/vehicles.yaml
@@ -153,6 +153,10 @@ ARTY:
 		InitialStance: Defend
 	LeavesHusk:
 		HuskActor: ARTY.Husk
+	Explodes:
+		Weapon: ArtilleryShell
+		EmptyWeapon: UnitExplode
+		LoadedChance: 75
 
 FTNK:
 	Inherits: ^Tank
diff --git a/mods/cnc/weapons/explosions.yaml b/mods/cnc/weapons/explosions.yaml
index 0e8b0d847d..7cc61ee337 100644
--- a/mods/cnc/weapons/explosions.yaml
+++ b/mods/cnc/weapons/explosions.yaml
@@ -27,7 +27,6 @@ UnitExplode:
 	Warhead@1Dam: SpreadDamage
 		Spread: 426
 		Damage: 50
-		Falloff: 1000, 368, 135, 50, 18, 7, 0
 		Versus:
 			None: 90
 			Wood: 75
diff --git a/mods/ra/rules/vehicles.yaml b/mods/ra/rules/vehicles.yaml
index 9b73e6c236..56ded60823 100644
--- a/mods/ra/rules/vehicles.yaml
+++ b/mods/ra/rules/vehicles.yaml
@@ -226,8 +226,9 @@ ARTY:
 	AttackFrontal:
 	WithMuzzleFlash:
 	Explodes:
-		Weapon: UnitExplode
-		Chance: 75
+		Weapon: ArtilleryExplode
+		EmptyWeapon: UnitExplodeSmall
+		LoadedChance: 75
 	AutoTarget:
 	ProducibleWithLevel:
 		Prerequisites: vehicles.upgraded
diff --git a/mods/ra/weapons/explosions.yaml b/mods/ra/weapons/explosions.yaml
index 750edfab47..8a8439c114 100644
--- a/mods/ra/weapons/explosions.yaml
+++ b/mods/ra/weapons/explosions.yaml
@@ -197,6 +197,25 @@ UnitExplodeSmall:
 		ImpactSound: splash9.aud
 		ValidImpactTypes: Water
 
+ArtilleryExplode:
+	Warhead@1Dam: SpreadDamage
+		Spread: 426
+		Damage: 150
+		Versus:
+			None: 90
+			Wood: 75
+			Light: 60
+			Heavy: 25
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+	Warhead@2Eff: CreateEffect
+		Explosion: self_destruct
+		ImpactSound: kaboom22.aud
+		InvalidImpactTypes: Water
+	Warhead@3EffWater: CreateEffect
+		Explosion: large_splash
+		ImpactSound: splash9.aud
+		ValidImpactTypes: Water
+
 BarrelExplode:
 	Warhead@1Dam: SpreadDamage
 		Spread: 426