thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'slip-tide-stacked' into 'master'

Browse source 
Sliptiding now stacks your handling boosts

See merge request KartKrew/Kart!344
This commit is contained in:
Sal 2021-01-06 20:30:58 -05:00
commit d7c158099f
1 changed files with 13 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/k_kart.c
View file

@ -2063,20 +2063,17 @@ fixed_t K_GetSpindashChargeSpeed(player_t *player)
return (player->kartspeed + player->kartweight) * (FRACUNIT/64); return (player->kartspeed + player->kartweight) * (FRACUNIT/64);
} }
// Light weights have stronger boost stacking -- aka, better metabolism than heavies XD
#define METABOLISM
// sets k_boostpower, k_speedboost, k_accelboost, and k_handleboost to whatever we need it to be // sets boostpower, speedboost, accelboost, and handleboost to whatever we need it to be
static void K_GetKartBoostPower(player_t *player) static void K_GetKartBoostPower(player_t *player)
{ {
#ifdef METABOLISM // Light weights have stronger boost stacking -- aka, better metabolism than heavies XD
const fixed_t maxmetabolismincrease = FRACUNIT/2; const fixed_t maxmetabolismincrease = FRACUNIT/2;
const fixed_t metabolism = FRACUNIT - ((9-player->kartweight) * maxmetabolismincrease / 8); const fixed_t metabolism = FRACUNIT - ((9-player->kartweight) * maxmetabolismincrease / 8);
#endif // METABOLISM
// v2 almost broke sliptiding when it fixed turning bugs! // v2 almost broke sliptiding when it fixed turning bugs!
// This value is fine-tuned to feel like v1 again without reverting any of those changes. // This value is fine-tuned to feel like v1 again without reverting any of those changes.
const fixed_t sliptidehandling = 7*FRACUNIT/10; const fixed_t sliptidehandling = FRACUNIT/2;
fixed_t boostpower = FRACUNIT; fixed_t boostpower = FRACUNIT;
fixed_t speedboost = 0, accelboost = 0, handleboost = 0; fixed_t speedboost = 0, accelboost = 0, handleboost = 0;
@ -2095,43 +2092,35 @@ static void K_GetKartBoostPower(player_t *player)
if (player->kartstuff[k_bananadrag] > TICRATE) if (player->kartstuff[k_bananadrag] > TICRATE)
boostpower = (4*boostpower)/5; boostpower = (4*boostpower)/5;
#ifdef METABOLISM // Note: Handling will ONLY stack when sliptiding!
// When you're not, it just uses the best instead of adding together, like the old behavior.
#define ADDBOOST(s,a,h) { \ #define ADDBOOST(s,a,h) { \
numboosts++; \ numboosts++; \
speedboost += FixedDiv(s, FRACUNIT + (metabolism * (numboosts-1))); \ speedboost += FixedDiv(s, FRACUNIT + (metabolism * (numboosts-1))); \
accelboost += FixedDiv(a, FRACUNIT + (metabolism * (numboosts-1))); \ accelboost += FixedDiv(a, FRACUNIT + (metabolism * (numboosts-1))); \
handleboost = max(h, handleboost); \ if (player->kartstuff[k_aizdriftstrat]) \
handleboost += FixedDiv(h, FRACUNIT + (metabolism * (numboosts-1))); \
else \
handleboost = max(h, handleboost); \
} }
#else
#define ADDBOOST(s,a,h) { \
numboosts++; \
speedboost += s / numboosts; \
accelboost += a / numboosts; \
handleboost = max(h, handleboost); \
}
#endif // METABOLISM
if (player->kartstuff[k_sneakertimer]) // Sneaker if (player->kartstuff[k_sneakertimer]) // Sneaker
{ {
UINT8 i; UINT8 i;
for (i = 0; i < player->kartstuff[k_numsneakers]; i++) for (i = 0; i < player->kartstuff[k_numsneakers]; i++)
{ {
ADDBOOST(FRACUNIT/2, 8*FRACUNIT, sliptidehandling); // + 50% top speed, + 800% acceleration, +70% handling ADDBOOST(FRACUNIT/2, 8*FRACUNIT, sliptidehandling); // + 50% top speed, + 800% acceleration, +50% handling
} }
} }
if (player->kartstuff[k_invincibilitytimer]) // Invincibility if (player->kartstuff[k_invincibilitytimer]) // Invincibility
{ {
ADDBOOST(3*FRACUNIT/8, 3*FRACUNIT, sliptidehandling/3); // + 37.5% top speed, + 300% acceleration, +23% handling ADDBOOST(3*FRACUNIT/8, 3*FRACUNIT, sliptidehandling/2); // + 37.5% top speed, + 300% acceleration, +25% handling
} }
if (player->kartstuff[k_growshrinktimer] > 0) // Grow if (player->kartstuff[k_growshrinktimer] > 0) // Grow
{ {
ADDBOOST(0, 0, sliptidehandling/3); // + 0% top speed, + 0% acceleration, +23% handling ADDBOOST(0, 0, sliptidehandling/2); // + 0% top speed, + 0% acceleration, +25% handling
} }
if (player->kartstuff[k_flamedash]) // Flame Shield dash if (player->kartstuff[k_flamedash]) // Flame Shield dash
@ -2140,7 +2129,7 @@ static void K_GetKartBoostPower(player_t *player)
ADDBOOST( ADDBOOST(
dash, // + infinite top speed dash, // + infinite top speed
3*FRACUNIT, // + 300% acceleration 3*FRACUNIT, // + 300% acceleration
FixedMul(FixedDiv(dash, FRACUNIT/2), sliptidehandling/3) // + infinite handling FixedMul(FixedDiv(dash, FRACUNIT/2), sliptidehandling/2) // + infinite handling
); );
} }