From e12bf46f5ed8a0f55141e3208bc75cdf8df168c5 Mon Sep 17 00:00:00 2001
From: Marisa Kirisame <marisa@sayachan.org>
Date: Tue, 19 Apr 2022 00:59:41 +0200
Subject: [PATCH] Deep Impact alt bullet no longer has lethal splash damage.

---
 language.version                           |  4 ++--
 zscript/weapons/swwm_deepdarkimpact_fx.zsc | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/language.version b/language.version
index 264c46f10..69425a2cd 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r37 \cu(Mon 18 Apr 23:03:57 CEST 2022)\c-";
-SWWM_SHORTVER="\cw1.3pre r37 \cu(2022-04-18 23:03:57)\c-";
+SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r39 \cu(Tue 19 Apr 01:00:27 CEST 2022)\c-";
+SWWM_SHORTVER="\cw1.3pre r39 \cu(2022-04-19 01:00:27)\c-";
diff --git a/zscript/weapons/swwm_deepdarkimpact_fx.zsc b/zscript/weapons/swwm_deepdarkimpact_fx.zsc
index 54c722792..0646d98d7 100644
--- a/zscript/weapons/swwm_deepdarkimpact_fx.zsc
+++ b/zscript/weapons/swwm_deepdarkimpact_fx.zsc
@@ -10,7 +10,7 @@ Class AirBullet : FastProjectile
 		Obituary "$O_DEEPIMPACT";
 		Radius 2;
 		Height 4;
-		DamageFunction 100;
+		DamageFunction 50;
 		DamageType 'AirRip';
 		Speed 400;
 		PROJECTILE;
@@ -31,8 +31,10 @@ Class AirBullet : FastProjectile
 			lasthit = target;
 		}
 		Vector3 dirto = level.Vec3Offset(pos,target.Vec3Offset(0,0,target.Height/2.));
+		if ( vel.length() <= double.epsilon ) return damage;
+		if ( dirto.length() <= double.epsilon ) dirto = vel;
 		dirto /= dirto.length();
-		SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,200000);
+		SWWMUtility.DoKnockback(target,vel.unit()*.6+dirto*.4,80000);
 		if ( !target.player ) target.bBLASTED = true;
 		return damage;
 	}
@@ -56,7 +58,7 @@ Class AirBullet : FastProjectile
 			s.alpha *= .2;
 		}
 		bAMBUSH = true;
-		SWWMUtility.DoExplosion(self,GetMissileDamage(0,0),0,100,25,ignoreme:target);
+		SWWMUtility.DoExplosion(self,10,0,100,25,ignoreme:target);
 		bAMBUSH = false;
 		tcnt++;
 		if ( tcnt < 2 ) return;
@@ -76,7 +78,7 @@ Class AirBullet : FastProjectile
 			if ( (target.pos.z > target.floorz) && target.TestMobjZ() ) mm *= 1.6;
 			SWWMUtility.DoKnockback(target,dir,mm);
 		}
-		SWWMUtility.DoExplosion(self,0,200000,200,80,ignoreme:target);
+		SWWMUtility.DoExplosion(self,20,80000,200,80,ignoreme:target);
 		A_QuakeEx(6,6,6,20,0,250,"",QF_RELATIVE|QF_SCALEDOWN,rollIntensity:1.);
 		A_StartSound("deepimpact/bullethit",CHAN_VOICE,CHANF_DEFAULT,1.,.3);
 		A_SprayDecal("ImpactMark");