OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix dash/boost triggering during intermissions.

Browse source 
Invert direction of wallclimb push, dunno why it was like that.
This commit is contained in:
Mari the Deer 2020-07-20 18:04:17 +02:00
commit 3ba203bd7a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
language.version
View file

@ -1,2 +1,2 @@
[default]
SWWM_MODVER="\chSWWM \cwGZ\c- r429 (Sun 19 Jul 09:14:18 CEST 2020)";
SWWM_MODVER="\chSWWM \cwGZ\c- r430 (Mon 20 Jul 18:04:17 CEST 2020)";

6
zscript/swwm_player.zsc
View file

@ -853,7 +853,7 @@ Class Demolitionist : PlayerPawn
if ( (waterlevel < 2) && !(bFly || bFlyCheat) )
dodge.z += (player.cmd.buttons&BT_CROUCH)?-.05:.15;
if ( !level.IsJumpingAllowed() ) dodge.z = min(0,dodge.z);
if ( (dodge.length() > 0) && (dashcooldown <= 0) && (dashfuel > 20.) && player.cmd.buttons&BT_USER2 && (player.onground || level.IsJumpingAllowed()) )
if ( (dodge.length() > 0) && (dashcooldown <= 0) && (dashfuel > 20.) && player.cmd.buttons&BT_USER2 && (player.onground || level.IsJumpingAllowed()) && (gamestate == GS_LEVEL) )
{
dashdir = dodge.unit();
dashcooldown = 10;
@ -921,7 +921,7 @@ Class Demolitionist : PlayerPawn
}
if ( walljump ) break;
}
if ( player.cmd.buttons&BT_JUMP )
if ( (player.cmd.buttons&BT_JUMP) && (gamestate == GS_LEVEL) )
{
// cooldown before we can do these, avoids accidental walljumps off ledges we just fell off from
if ( level.maptime < (lastgroundtic+4) )
@ -967,7 +967,7 @@ Class Demolitionist : PlayerPawn
{
if ( vel.z < 10. )
vel.z += jumpvelz+clamp(-pvelz*.8,0.,30.);
vel.xy += walldir*5*Speed;
vel.xy -= walldir*5*Speed;
}
if ( jumpactor && jumpactor.bSHOOTABLE )
{