diff --git a/language.version b/language.version index 6c6b563ee..cdbb3f448 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r995 \cu(Thu 2 Nov 16:53:10 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r995 \cu(2023-11-02 16:53:10)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r996 \cu(Thu 2 Nov 20:12:19 CET 2023)\c-"; +SWWM_SHORTVER="\cw1.3pre r996 \cu(2023-11-02 20:12:19)\c-"; diff --git a/zscript/dlc1/swwm_mister_fx.zsc b/zscript/dlc1/swwm_mister_fx.zsc index aaa61cd81..f9ed77f88 100644 --- a/zscript/dlc1/swwm_mister_fx.zsc +++ b/zscript/dlc1/swwm_mister_fx.zsc @@ -197,8 +197,11 @@ Class MisterFuzzy : SWWMNonInteractiveActor return; } if ( isFrozen() ) return; - let [nhit, nkill] = SWWMUtility.DoExplosion(self,(special2<0)?4:44,3000,80,80,DE_EXTRAZTHRUST|DE_COUNTENEMIES); - if ( mrc ) mrc.nkill += nkill; + if ( !(special1%3) ) + { + let [nhit, nkill] = SWWMUtility.DoExplosion(self,(special2<0)?4:44,3000,80,80,DE_EXTRAZTHRUST|DE_COUNTENEMIES); + if ( mrc ) mrc.nkill += nkill; + } special1--; if ( special1 <= 0 ) { @@ -401,7 +404,7 @@ Class MisterBulletImpact : SWWMNonInteractiveActor } virtual void A_BulletSubExplode() { - if ( special1 && (special1 <= 15) ) + if ( special1 && (special1 <= 10) ) { SWWMUtility.DoExplosion(self,44,5000+special1*200,50+special1*10,50+special1*10,DE_EXTRAZTHRUST); int numpt = Random[ExploS](0,special1); @@ -419,7 +422,7 @@ Class MisterBulletImpact : SWWMNonInteractiveActor { Spawn: TNT1 A 0; - XEX7 ABDEGHJKMNPQSTVWYZ\] 1 Bright + XEX7 ACEGIKMOQSUWY[] 1 Bright { A_SetScale(scale.x*1.02,scale.y*1.02); A_BulletSubExplode(); @@ -437,7 +440,7 @@ Class MisterBuckshotImpact : MisterBulletImpact override void A_BulletExplode() { A_AlertMonsters(swwm_uncapalert?0:1000,AMF_EMITFROMTARGET); - SWWMUtility.DoExplosion(self,444,8000,80,80,DE_EXTRAZTHRUST); + for ( int i=0; i<2; i++ ) SWWMUtility.DoExplosion(self,44,8000,80-i*20,80-i*20,DE_EXTRAZTHRUST); A_QuakeEx(2.,2.,2.,5,0,200,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:60,rollintensity:.2); A_StartSound("mister/hitscatter",CHAN_VOICE,attenuation:.35); A_SprayDecal("ShockMark",-172); @@ -521,7 +524,7 @@ Class MisterStreamImpact : MisterBulletImpact override void A_BulletExplode() { A_AlertMonsters(swwm_uncapalert?0:4000,AMF_EMITFROMTARGET); - SWWMUtility.DoExplosion(self,444,150000,120,120,DE_EXTRAZTHRUST); + for ( int i=0; i<3; i++ ) SWWMUtility.DoExplosion(self,44,15000,120-i*20,120-i*20,DE_EXTRAZTHRUST); A_QuakeEx(5.,5.,5.,5,0,300,"",QF_RELATIVE|QF_SCALEDOWN|QF_3D,falloff:100,rollintensity:.5); A_StartSound("mister/hitstream",CHAN_VOICE,attenuation:.35); A_StartSound("mister/hitstream",CHAN_WEAPON,attenuation:.25); @@ -569,7 +572,7 @@ Class MisterStreamImpact : MisterBulletImpact } override void A_BulletSubExplode() { - if ( special1 && (special1 <= 10) ) + if ( special1 && (special1 <= 5) ) { SWWMUtility.DoExplosion(self,44,2000+special1*50,80+special1*8,80+special1*8,DE_EXTRAZTHRUST); int numpt = Random[ExploS](0,special1/2); @@ -587,7 +590,7 @@ Class MisterStreamImpact : MisterBulletImpact { Spawn: TNT1 A 0; - XEX7 ACEGIKMOQSUWY[] 1 Bright + XEX7 ADGJMPSVY\ 1 Bright { A_SetScale(scale.x*1.02,scale.y*1.02); A_BulletSubExplode();