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 'desperation-spindash' into 'master'

Browse source 
Desperation spindash

See merge request KartKrew/Kart!967
This commit is contained in:
Oni 2023-02-24 07:31:00 +00:00
commit 4309df414c
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_kart.c
View file

@ -3026,7 +3026,9 @@ fixed_t K_GetSpindashChargeSpeed(player_t *player)
// (can be higher than this value when overcharged) // (can be higher than this value when overcharged)
const fixed_t val = (10*FRACUNIT/277) + (((player->kartspeed + player->kartweight) + 2) * FRACUNIT) / 45; const fixed_t val = (10*FRACUNIT/277) + (((player->kartspeed + player->kartweight) + 2) * FRACUNIT) / 45;
return (gametyperules & GTR_CLOSERPLAYERS) ? (4 * val) : val; // Old behavior before desperation spindash
// return (gametyperules & GTR_CLOSERPLAYERS) ? (4 * val) : val;
return val;
} }
// sets boostpower, speedboost, accelboost, and handleboost to whatever we need it to be // sets boostpower, speedboost, accelboost, and handleboost to whatever we need it to be
@ -9719,8 +9721,11 @@ static void K_KartSpindash(player_t *player)
{ {
fixed_t thrust = FixedMul(player->mo->scale, player->spindash*FRACUNIT/5); fixed_t thrust = FixedMul(player->mo->scale, player->spindash*FRACUNIT/5);
// Old behavior, before emergency zero-ring spindash
/*
if (gametyperules & GTR_CLOSERPLAYERS) if (gametyperules & GTR_CLOSERPLAYERS)
thrust *= 2; thrust *= 2;
*/
// Give a bit of a boost depending on charge. // Give a bit of a boost depending on charge.
P_InstaThrust(player->mo, player->mo->angle, thrust); P_InstaThrust(player->mo, player->mo->angle, thrust);
@ -9793,9 +9798,13 @@ static void K_KartSpindash(player_t *player)
if ((buttons & (BT_DRIFT|BT_BRAKE)) == (BT_DRIFT|BT_BRAKE)) if ((buttons & (BT_DRIFT|BT_BRAKE)) == (BT_DRIFT|BT_BRAKE))
{ {
UINT8 ringdropframes = 2 + (player->kartspeed + player->kartweight); UINT8 ringdropframes = 2 + (player->kartspeed + player->kartweight);
INT16 chargetime = MAXCHARGETIME - ++player->spindash;
boolean spawnOldEffect = true; boolean spawnOldEffect = true;
if (player->rings <= 0) // Use the damn spindash
player->spindash++; // I am no longer asking
INT16 chargetime = MAXCHARGETIME - ++player->spindash;
if (player->spindash >= SPINDASHTHRUSTTIME) if (player->spindash >= SPINDASHTHRUSTTIME)
{ {
K_KartSpindashDust(player->mo); K_KartSpindashDust(player->mo);