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

Merge branch 'bubble-gamespeed' into 'master'

Browse source 
Use player max speed for bubblebounce min speed (resolves #969)

Closes #969

See merge request KartKrew/Kart!1868
This commit is contained in:
Oni 2024-02-01 03:00:43 +00:00
commit ebbe8203a2
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/k_kart.c
View file

@ -11342,7 +11342,14 @@ boolean K_FastFallBounce(player_t *player)
if (player->curshield == KSHIELD_BUBBLE)
{
S_StartSound(player->mo, sfx_s3k44);
P_InstaThrust(player->mo, player->mo->angle, 11*max(player->speed, abs(player->fastfall))/10);
// This is a slightly irritating way of doing this, but because ground contact while
// bubblebouncing gives you 1 tic of ground friction, naively using a factor of player
// speed makes your sustained speed heavily gamespeed dependent.
fixed_t minspeed = 12*K_GetKartSpeed(player, false, false)/10;
fixed_t fallspeed = abs(player->fastfall);
P_InstaThrust(player->mo, player->mo->angle, 11*max(minspeed, fallspeed)/10);
bounce += 3 * mapobjectscale;
}
else