thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 04:21:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'better-fastfall-bounce' into 'master'

Browse source 
Fastfall refinements

See merge request KartKrew/Kart!2340
This commit is contained in:
AJ Martinez 2024-05-02 23:47:10 +00:00
commit 46c7f849a2
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/k_kart.c
View file

@ -11832,6 +11832,16 @@ static void K_KartSpindash(player_t *player)
K_KartSpindashDust(player->mo);
}
// 2.2 - Driftbrake slideoff fastfall prevention
if (!G_CompatLevel(0x000A))
{
if (player->drift && onGround && player->cmd.buttons & BT_BRAKE)
{
player->pflags |= PF_NOFASTFALL;
return;
}
}
if (K_PlayerEBrake(player) == false)
{
player->spindash = 0;
@ -12048,6 +12058,23 @@ boolean K_FastFallBounce(player_t *player)
player->fastfall = 0;
// 2.2 - More lenient fastfall
if (!G_CompatLevel(0x000A))
{
if (player->curshield != KSHIELD_BUBBLE)
{
// Nudge the player in their facing angle, and provide a little starting momentum if they need it.
// The bounce is already a strong tradeoff, so this allows it to be used for saves and get you back into flow.
angle_t momangle = K_MomentumAngle(player->mo);
fixed_t minspeed = K_GetKartSpeed(player, false, false)/2;
fixed_t returnspeed = max(FixedHypot(player->mo->momx, player->mo->momy), minspeed);
// Initial momentum set uses real speed to avoid some weird twitchy behavior at low XY speed
P_InstaThrust(player->mo, momangle, FixedHypot(player->mo->momx, player->mo->momy)/2);
P_Thrust(player->mo, player->mo->angle, returnspeed/2);
}
}
player->mo->momz = bounce * P_MobjFlip(player->mo);
return true;