OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Fix warp to NaN when crouching with Silver Bullet.

Browse source
This commit is contained in:
Mari the Deer 2023-03-10 00:20:09 +01:00
commit 8d1886ad15
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

27
zscript/player/swwm_player_move.zsc
View file

@ -274,23 +274,30 @@ extend Class Demolitionist
accel.xy = RotateVector(nmove,angle)*cos(pitch);
accel.z += nmove.x*sin(-pitch);
double maxspd = 16.*TweakSpeed();
if ( CanCrouch() && (player.crouchfactor != 1) ) maxspd *= player.crouchfactor;
double spd = vel.length();
// quicker speedup
vel += accel*clamp(maxspd/max(.01,spd),1.,2.);
// additional steering + quicker slow down
spd = vel.length();
if ( spd > maxspd ) spd -= (spd-maxspd)*.1;
vel = (vel+accel).unit()*spd;
// account for special cases where max speed is zero
if ( maxspd <= 0. ) vel += accel;
else
{
if ( CanCrouch() && (player.crouchfactor != 1) ) maxspd *= player.crouchfactor;
double spd = vel.length();
// quicker speedup
vel += accel*clamp(maxspd/max(.01,spd),1.,2.);
// additional steering + quicker slow down
spd = vel.length();
if ( spd > maxspd ) spd -= (spd-maxspd)*.1;
vel = (vel+accel).unit()*spd;
}
player.vel += RotateVector(nmove,angle)*bobfactor*cos(pitch)*16.;
}
else if ( player.onground )
{
Vector2 accel = RotateVector(nmove,angle);
if ( waterlevel > 1 ) vel.xy += accel; // slippery if waist-high or deeper
double maxspd = 16.*TweakSpeed();
// account for special cases where max speed is zero
// also, slippery if waist-high or deeper
if ( (waterlevel > 1) || (maxspd <= 0.) ) vel.xy += accel;
else
{
double maxspd = 16.*TweakSpeed();
if ( CanCrouch() && (player.crouchfactor != 1) ) maxspd *= player.crouchfactor;
double spd = vel.xy.length();
// quicker speedup