From 0afb1ed5c8bf7faf5004cab8995c7074252ec893 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Wed, 4 Nov 2015 21:32:26 +0100
Subject: [PATCH] Improve SpiceExplosion and add BloomExplosion

Fixes angle and loudness of spice debris, adds BloomExplosion to add proper animation and damage crushing actors.
---
 mods/d2k/rules/arrakis.yaml |  3 +++
 mods/d2k/weapons.yaml       | 31 +++++++++++++++++++++++++++----
 2 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/mods/d2k/rules/arrakis.yaml b/mods/d2k/rules/arrakis.yaml
index 8a191c64ab..18b67265a1 100644
--- a/mods/d2k/rules/arrakis.yaml
+++ b/mods/d2k/rules/arrakis.yaml
@@ -10,6 +10,9 @@ spicebloom:
 		Name: Spice Bloom
 	SpiceBloom:
 		Weapon: SpiceExplosion
+	Explodes:
+		Weapon: BloomExplosion
+		EmptyWeapon: BloomExplosion
 	Crushable:
 		CrushClasses: spicebloom
 		CrushedByFriendlies: true
diff --git a/mods/d2k/weapons.yaml b/mods/d2k/weapons.yaml
index f1fc599a27..fa8e180497 100644
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -766,13 +766,12 @@ SardDeath:
 		ImpactSound: EXPLSML2.WAV
 
 SpiceExplosion:
-	Report: EXPLMD1.WAV
 	Projectile: Bullet
 		Speed: 50, 75
-		High: true
-		Angle: 91, 264
+		Blockable: false
+		Angle: 60, 90
 		Trail: large_trail
-		Image: null
+		Image: 120mm
 	Warhead@1Dam: SpreadDamage
 		Spread: 320
 		Falloff: 100, 60, 30, 15, 0
@@ -795,3 +794,27 @@ SpiceExplosion:
 	Warhead@3Eff: CreateEffect
 		Explosion: med_explosion
 
+BloomExplosion:
+	Report: EXPLMD1.WAV
+	Range: 0c8
+	Projectile: Bullet
+		Speed: 1c0
+		Blockable: false
+		Image: null
+	Warhead@1Dam: SpreadDamage
+		Spread: 320
+		Falloff: 100, 60, 30, 15, 0
+		Damage: 750
+		Versus:
+			none: 90
+			wall: 5
+			building: 65
+			wood: 50
+			light: 40
+			heavy: 30
+			invulnerable: 0
+			cy: 20
+			harvester: 25
+		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+		AffectsParent: true
+