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 'less-stiff-turns' into 'drift-regression'

Browse source 
Reduce turn stiffening at high speed

See merge request KartKrew/Kart!2313
This commit is contained in:
Oni 2024-04-29 06:02:17 +00:00
commit fd83529745
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/k_kart.c
View file

@ -10456,7 +10456,16 @@ INT16 K_GetKartTurnValue(const player_t *player, INT16 turnvalue)
}
else
{
p_speed = min(currentSpeed, (p_maxspeed * 2));
// Turning dampens as you go faster, but at extremely high speeds, keeping some control is important.
// Dampening is applied in two stages, one harsh and one soft.
// The harsh window is larger for characters with better baseline maneuverability.
// TODO COMPATLEVEL
// Was p_speed = min(stageSpeed, p_maxspeed * 2);
fixed_t stageSpeed = min(currentSpeed, (100 + 2*(9-player->kartweight)) * p_maxspeed/100);
if (stageSpeed < currentSpeed)
stageSpeed += (currentSpeed - stageSpeed) / 3;
p_speed = min(stageSpeed, p_maxspeed * 2);
}
if (K_PodiumSequence() == true)
@ -10482,6 +10491,7 @@ INT16 K_GetKartTurnValue(const player_t *player, INT16 turnvalue)
// Sal: K_GetKartDriftValue is short-circuited to give a weird additive magic number,
// instead of an entirely replaced turn value. This gaslit me years ago when I was doing a
// code readability pass, where I missed that fact because it also returned early.
// TODO COMPATLEVEL (I have no fucking clue what's going on here)
turnfixed += K_GetKartDriftValue(player, FRACUNIT) * FRACUNIT;
return (turnfixed / FRACUNIT);
}
@ -10500,7 +10510,8 @@ INT16 K_GetKartTurnValue(const player_t *player, INT16 turnvalue)
fixed_t topspeed = K_GetKartSpeed(player, false, false);
if (K_Sliptiding(player))
{
finalhandleboost = FixedMul(5*SLIPTIDEHANDLING/4, FixedDiv(player->speed, topspeed));
// TODO COMPATLEVEL (was 5*SLIPTIDEHANDLING/4)
finalhandleboost = FixedMul(3*SLIPTIDEHANDLING/4, FixedDiv(player->speed, topspeed));
}
if (finalhandleboost > 0 && player->respawn.state == RESPAWNST_NONE)

1
src/p_user.c
View file

@ -2338,6 +2338,7 @@ static void P_UpdatePlayerAngle(player_t *player)
// That means undoing them takes the same amount of time as doing them.
// This can lead to oscillating death spiral states on a multi-tic correction, as we swing past the target angle.
// So before we go into death-spirals, if our predicton is _almost_ right...
// TODO COMPATLEVEL (was 4*ANG1/3)
angle_t leniency = (8*ANG1/3) * min(player->cmd.latency, 6);
// Don't force another turning tic, just give them the desired angle!