diff --git a/language.version b/language.version index 1f38b1bc9..26b4b35b3 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1076 \cu(Sun 31 Dec 12:02:46 CET 2023)\c-"; -SWWM_SHORTVER="\cw1.3pre r1076 \cu(2023-12-31 12:02:46)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r1076 \cu(Tue 2 Jan 22:34:15 CET 2024)\c-"; +SWWM_SHORTVER="\cw1.3pre r1076 \cu(2024-01-02 22:34:15)\c-"; diff --git a/zscript/player/swwm_player_tick.zsc b/zscript/player/swwm_player_tick.zsc index 1b4d710b9..d191ae96f 100644 --- a/zscript/player/swwm_player_tick.zsc +++ b/zscript/player/swwm_player_tick.zsc @@ -319,6 +319,7 @@ extend Class Demolitionist if ( spd > mystats.topspeed ) mystats.topspeed = spd; if ( spd > ((3600*GameTicRate)/32000.) ) SWWMUtility.AchievementProgress("sanic",int((spd*3600*GameTicRate)/32000.),player); + bool isdashing = InStateSequence(CurState,FindState("Dash")); if ( player.onground && !bNoGravity && !lastground ) { // bump down weapon @@ -349,6 +350,8 @@ extend Class Demolitionist A_StartSound("demolitionist/hardland",CHAN_FOOTSTEP,CHANF_OVERLAP,pitch:.7); A_StartSound("demolitionist/hardland",CHAN_FOOTSTEP,CHANF_OVERLAP,pitch:.4); } + // also cancel dashing if we stomped + if ( isdashing ) dashboost = 0.; mystats.stompcount++; } if ( lastvelz < -10 ) @@ -484,7 +487,6 @@ extend Class Demolitionist lastground = player.onground; lastvelz = prevvelz; prevvelz = vel.z; - bool isdashing = InStateSequence(CurState,FindState("Dash")); bool isboosting = InStateSequence(CurState,FindState("Boost")); bNOFRICTION = ((bFly&&!bFlyCheat&&!(player.cheats&CF_NOCLIP2))||isdashing); if ( fuelcooldown == 1 ) A_StartSound("demolitionist/fuelregen",CHAN_FUELREGEN,CHANF_LOOP,.35,4.,.5);