thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-05-08 18:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

WIP: Adjust combo escape tuning defines

Browse source
This commit is contained in:
AJ Martinez 2024-01-29 18:27:26 -07:00
parent 9231e95101
commit 10ba1fa25f
2 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/k_kart.c
View file

@ -8805,17 +8805,28 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->bumperinflate && player->mo->hitlag == 0) if (player->bumperinflate && player->mo->hitlag == 0)
{ {
UINT16 cappedthrust = min(player->progressivethrust, THRUSTCAP); fixed_t thrustdelta = MAXCOMBOTHRUST - MINCOMBOTHRUST;
fixed_t floatdelta = MAXCOMBOFLOAT - MINCOMBOFLOAT;
fixed_t thrustpertic = thrustdelta / MAXCOMBOTIME;
fixed_t floatpertic = floatdelta / MAXCOMBOTIME;
fixed_t totalthrust = thrustpertic * player->progressivethrust + MINCOMBOTHRUST;
fixed_t totalfloat = floatpertic * player->progressivethrust + MINCOMBOFLOAT;
if (player->speed > K_GetKartSpeed(player, false, false))
totalthrust = 0;
if (player->tumbleBounces && player->tumbleBounces <= TUMBLEBOUNCES) if (player->tumbleBounces && player->tumbleBounces <= TUMBLEBOUNCES)
{ {
player->mo->momz += DAMAGEFLOAT * cappedthrust; player->mo->momz += totalfloat;
P_Thrust(player->mo, K_MomentumAngle(player->mo), DAMAGETHRUST * cappedthrust / 2); P_Thrust(player->mo, K_MomentumAngle(player->mo), totalthrust/2);
} }
else else
{ {
P_Thrust(player->mo, K_MomentumAngle(player->mo), DAMAGETHRUST * cappedthrust); P_Thrust(player->mo, K_MomentumAngle(player->mo), totalthrust);
} }
player->bumperinflate--; player->bumperinflate--;
} }
@ -8925,7 +8936,8 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->spinouttimer || player->tumbleBounces) if (player->spinouttimer || player->tumbleBounces)
{ {
player->progressivethrust++; if (player->progressivethrust < MAXCOMBOTIME)
player->progressivethrust++;
if (player->incontrol > 0) if (player->incontrol > 0)
player->incontrol = 0; player->incontrol = 0;
player->incontrol--; player->incontrol--;

8
src/k_kart.h
View file

@ -37,9 +37,11 @@ Make sure this matches the actual number of states
#define INSTAWHIP_TETHERBLOCK (TICRATE*4) #define INSTAWHIP_TETHERBLOCK (TICRATE*4)
#define PUNISHWINDOW (7*TICRATE/10) #define PUNISHWINDOW (7*TICRATE/10)
#define DAMAGEFLOAT (FRACUNIT/50) #define MAXCOMBOTHRUST (mapobjectscale*20)
#define DAMAGETHRUST (FRACUNIT/70) #define MAXCOMBOFLOAT (mapobjectscale*10)
#define THRUSTCAP (TICRATE*10) #define MINCOMBOTHRUST (mapobjectscale*2)
#define MINCOMBOFLOAT (mapobjectscale*1)
#define MAXCOMBOTIME (TICRATE*10)
#define FLAMESHIELD_MAX (120) #define FLAMESHIELD_MAX (120)