From 38ae42c8ddc97037299d3f0a8323ae1da24159b5 Mon Sep 17 00:00:00 2001 From: Marisa the Magician Date: Sun, 10 Dec 2023 10:56:48 +0100 Subject: [PATCH] Even more tweaks to the overpressure shot. --- language.version | 4 ++-- zscript/dlc1/swwm_mister.zsc | 4 +++- zscript/dlc1/swwm_mister_fx.zsc | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/language.version b/language.version index 2df773c85..09ab42efa 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1047 \cu(Sun 10 Dec 10:48:24 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1047 \cu(2023-12-10 10:48:24)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1048 \cu(Sun 10 Dec 10:56:48 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r1048 \cu(2023-12-10 10:56:48)\c-"; diff --git a/zscript/dlc1/swwm_mister.zsc b/zscript/dlc1/swwm_mister.zsc index bbb7166ed..7fc74b610 100644 --- a/zscript/dlc1/swwm_mister.zsc +++ b/zscript/dlc1/swwm_mister.zsc @@ -671,7 +671,7 @@ Class MisterRifle : SWWMWeapon } if ( invoker.prefirecnt < 100 ) { - invoker.prefirecnt += 1.5; + invoker.prefirecnt += 2.; if ( invoker.prefirecnt >= 100 ) { invoker.prefirecnt = 100; @@ -852,6 +852,7 @@ Class MisterRifle : SWWMWeapon b.angle = atan2(mrt.HitList[i].x.y,mrt.HitList[i].x.x); b.pitch = asin(-mrt.HitList[i].x.z); b.target = self; + b.tracer = mrt.HitList[i].HitActor; b.mrc = mrc; mrc.effectors.Push(b); bi.Push(b); @@ -861,6 +862,7 @@ Class MisterRifle : SWWMWeapon b.angle = atan2(mrt.HitList[i].x.y,mrt.HitList[i].x.x)+180; b.pitch = asin(mrt.HitList[i].x.z); b.target = self; + b.tracer = mrt.HitList[i].HitActor; b.mrc = mrc; mrc.effectors.Push(b); bi.Push(b); diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index fa7ad595a..1b9cbe1d2 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -608,7 +608,7 @@ Class MisterRailEntryImpact : MisterBulletImpact override void A_BulletExplode() { A_AlertMonsters(swwm_uncapalert?0:2000,AMF_EMITFROMTARGET); - let [nhit, nkill] = SWWMUtility.DoExplosion(self,444,200000,100,100,DE_EXTRAZTHRUST|DE_COUNTENEMIES); + let [nhit, nkill] = SWWMUtility.DoExplosion(self,44,200000,100,100,DE_EXTRAZTHRUST|DE_COUNTENEMIES,ignoreme:tracer); // hit actor already taking the full brunt, no need to add more if ( mrc ) mrc.nkill += nkill; A_QuakeEx(6.,6.,6.,10,0,400,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:150,rollintensity:.8); A_StartSound("mister/hitover",CHAN_VOICE,attenuation:.35); @@ -661,7 +661,7 @@ Class MisterRailEntryImpact : MisterBulletImpact { if ( special1 && (special1 <= 10) ) { - let [nhit, nkill] = SWWMUtility.DoExplosion(self,44,3000+special1*50,80+special1*4,80+special1*4,DE_EXTRAZTHRUST|DE_COUNTENEMIES); + let [nhit, nkill] = SWWMUtility.DoExplosion(self,4,3000+special1*50,80+special1*4,80+special1*4,DE_EXTRAZTHRUST|DE_COUNTENEMIES); if ( mrc ) mrc.nkill += nkill; int numpt = Random[ExploS](0,special1/2); for ( int i=0; i