OrdinaryMagician/swwmgz_m
OrdinaryMagician/swwmgz_m
1
Fork 0
Code Activity

Small cleaning up.

Browse source
This commit is contained in:
Mari the Deer 2024-03-21 12:04:07 +01:00
commit b7493b7735
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
zscript/player/swwm_player_anim.zsc
View file

@ -545,7 +545,7 @@ extend Class Demolitionist
return 2; // sprinting
}
if ( bWalking ) return 0; // walking
if ( isRunning() ) return 2; // sprinting
if ( IsRunning() ) return 2; // sprinting
return 1; // running
}

14
zscript/player/swwm_player_move.zsc
View file

@ -1,11 +1,11 @@
// general movement code
extend Class Demolitionist
{
bool isRunning()
bool IsRunning()
{
// for analog move, use midpoint between run/sprint
// for analog move, check for full sprint speed
if ( isAnalogMoving )
return (NormalizedMove().length() >= (gameinfo.normforwardmove[1]*256.));
return (NormalizedMove().length >= (gameinfo.normforwardmove[1]*256.));
return !!(player.cmd.buttons&BT_RUN);
}
@ -46,7 +46,7 @@ extend Class Demolitionist
fact = SWWMUtility.MapRange(rspeed,sspeed,.4,1.1,mscale);
else fact = 1.1; // sprinting
}
else fact = bWalking?.08:(player.cmd.buttons&BT_RUN)?1.1:.4;
else fact = bWalking?.08:IsRunning()?1.1:.4;
for ( Inventory i=Inv; i; i=i.Inv ) fact *= i.GetSpeedFactor();
return fact;
}
@ -140,7 +140,7 @@ extend Class Demolitionist
if ( m != n )
{
int side = (sin(bobtime*180.)>0.)?1:-1;
int spd = bWalking?0:isRunning()?2:1;
int spd = bWalking?0:IsRunning()?2:1;
PlayFootstep(side,spd);
}
}
@ -651,7 +651,7 @@ extend Class Demolitionist
// bhop, z vel relative to vel size
if ( vel.z < 25. ) // don't ramp up too hard
{
vel.z += jumpvelz*((isRunning()?1.2:.65)+vel.length()*.01);
vel.z += jumpvelz*((IsRunning()?1.2:.65)+vel.length()*.01);
// add part of last landing z velocity too
vel.z += max(0,-landvelz*(raging?.45:.35));
}
@ -663,7 +663,7 @@ extend Class Demolitionist
// first jump
if ( vel.z < 10. ) // don't ramp up too hard
{
vel.z += jumpvelz*(bWalking?.75:isRunning()?1.25:1.);
vel.z += jumpvelz*(bWalking?.75:IsRunning()?1.25:1.);
// add part of last landing z velocity too
vel.z += max(0,-landvelz*(raging?.35:.25));
}

2
zscript/player/swwm_player_tick.zsc
View file

@ -348,7 +348,7 @@ extend Class Demolitionist
if ( FindInventory("RagekitPower") )
{
// stop for just a split second UNLESS bunnyhopping
if ( !isRunning() || (level.maptime >= (lastairtic+10)) )
if ( !IsRunning() || (level.maptime >= (lastairtic+10)) )
ReactionTime = 6;
}
else