diff --git a/language.version b/language.version index 72f13eb17..f62938fd3 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r586 \cu(Mon 24 Oct 18:21:02 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r586 \cu(2022-10-24 18:21:02)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r587 \cu(Mon 24 Oct 20:33:17 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r587 \cu(2022-10-24 20:33:17)\c-"; diff --git a/zscript/swwm_player.zsc b/zscript/swwm_player.zsc index d0ba374ba..cdd10eb4f 100644 --- a/zscript/swwm_player.zsc +++ b/zscript/swwm_player.zsc @@ -100,7 +100,7 @@ Class Demolitionist : PlayerPawn int invwipe; // inventory wipe flags for next level - transient int lastbang; + transient int lastbang, lastbust; transient bool ingivecheat; diff --git a/zscript/weapons/swwm_cbt_fx.zsc b/zscript/weapons/swwm_cbt_fx.zsc index a887d541f..3a624c66e 100644 --- a/zscript/weapons/swwm_cbt_fx.zsc +++ b/zscript/weapons/swwm_cbt_fx.zsc @@ -337,7 +337,11 @@ Class BusterWall : Thinker if ( s ) s.busts++; SWWMUtility.AchievementProgressInc("bustin",1,Instigator.player); if ( (Instigator is 'Demolitionist') && !Random[DemoLines](0,3) && (int(girthitude**.15) >= 3) ) - SWWMHandler.AddOneliner("bustkill",2,50); + { + if ( gametic > Demolitionist(Instigator).lastbust ) + SWWMHandler.AddOneliner("bustkill",2,50); + Demolitionist(Instigator).lastbust = gametic+350; + } } // call hit fx for devastation sigil (if any) AngeryPower as = instigator?AngeryPower(instigator.FindInventory("AngeryPower")):null; @@ -508,7 +512,11 @@ Class BusterWall : Thinker if ( s ) s.busts++; SWWMUtility.AchievementProgressInc("bustin",1,Instigator.player); if ( (Instigator is 'Demolitionist') && !Random[DemoLines](0,3) && (int(girthitude**.15) >= 3) ) - SWWMHandler.AddOneliner("bustkill",2,50); + { + if ( gametic > Demolitionist(Instigator).lastbust ) + SWWMHandler.AddOneliner("bustkill",2,50); + Demolitionist(Instigator).lastbust = gametic+350; + } } // call hit fx for devastation sigil (if any) AngeryPower as = instigator?AngeryPower(instigator.FindInventory("AngeryPower")):null;