Merge branch 'overdrive-adjust' into 'master'

Move Overdrive boost power into standard OD

Closes #1516

See merge request kart-krew-dev/ring-racers-internal!2564
This commit is contained in:
Oni VelocitOni 2025-05-24 20:06:46 +00:00
commit 661d22bb4a

View file

@ -3567,7 +3567,7 @@ static void K_GetKartBoostPower(player_t *player)
Easing_InCubic( Easing_InCubic(
player->overdrivepower, player->overdrivepower,
0, 0,
5*FRACUNIT/10 75*FRACUNIT/100
), ),
Easing_InSine( Easing_InSine(
player->overdrivepower, player->overdrivepower,
@ -3643,7 +3643,7 @@ static void K_GetKartBoostPower(player_t *player)
{ {
fixed_t ringboost_base = FRACUNIT/4; fixed_t ringboost_base = FRACUNIT/4;
if (player->overdrive) if (player->overdrive)
ringboost_base += FRACUNIT/2; ringboost_base += FRACUNIT/4;
// This one's a little special: we add extra top speed per tic of ringboost stored up, to allow for Ring Box to really rocket away. // This one's a little special: we add extra top speed per tic of ringboost stored up, to allow for Ring Box to really rocket away.
// (We compensate when decrementing ringboost to avoid runaway exponential scaling hell.) // (We compensate when decrementing ringboost to avoid runaway exponential scaling hell.)
fixed_t rb = FixedDiv(player->ringboost * FRACUNIT, max(FRACUNIT, K_RingDurationBoost(player))); fixed_t rb = FixedDiv(player->ringboost * FRACUNIT, max(FRACUNIT, K_RingDurationBoost(player)));