diff --git a/language.version b/language.version index ba01db8c0..4068a141b 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r686 \cu(Mon 12 Dec 22:07:03 CET 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r686 \cu(2022-12-12 22:07:03)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r687 \cu(Mon 12 Dec 23:30:26 CET 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r687 \cu(2022-12-12 23:30:26)\c-"; diff --git a/zscript/weapons/swwm_blazeit_fx.zsc b/zscript/weapons/swwm_blazeit_fx.zsc index be44bf542..8d9375126 100644 --- a/zscript/weapons/swwm_blazeit_fx.zsc +++ b/zscript/weapons/swwm_blazeit_fx.zsc @@ -182,7 +182,7 @@ Class HellblazerMissile : Actor { Mixin SWWMMissileFix; - int deto; + int deto, detact; Actor seektarget; Vector3 InitialDir, Acceleration; @@ -235,7 +235,9 @@ Class HellblazerMissile : Actor Vector3 dir = vel.unit(); if ( vel.length() > 50. ) vel = dir*50.; } - if ( deto > 1 ) + // don't auto-detonate if we're too close to our shooter + // ensures player doesn't eat up the full brunt of the blast + if ( (deto > 1) && (!target || !SWWMUtility.SphereIntersect(target,pos,150)) ) { ExplodeMissile(); return;