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

Merge branch 'team-assist' into 'master'

Browse source 
Significantly more active Speed Assist in teamplay

See merge request kart-krew-dev/ring-racers-internal!2969
This commit is contained in:
Eidolon 2025-10-26 18:51:49 -05:00
commit e864ba5255
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/k_kart.c
View file

@ -10510,12 +10510,18 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
UINT8 counted = 0;
UINT32 firstRaw = 0;
// We want the average position of the back quarter...
UINT32 requiredPosition = ((D_NumPlayersInRace()*3)/4) - 1;
// ...except in teamplay, where we want the true average.
if (g_teamplay)
requiredPosition = 1;
for (UINT8 i = 0; i < MAXPLAYERS; i++)
{
if (playeringame[i] == false || players[i].spectator == true || players[i].exiting)
continue;
if (players[i].position != 1 && players[i].position >= ((D_NumPlayersInRace()*3)/4) - 1) // Not in 1st, but also back quarter of the average (-1 guy, for leeway)
if (players[i].position != 1 && players[i].position >= requiredPosition)
{
counted++;
average += K_UndoMapScaling(players[i].distancetofinish);
@ -10537,6 +10543,15 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
UINT32 TOO_CLOSE = average + 6500; // Start gaining here, lose if closer
UINT32 WAY_TOO_CLOSE = average + 5500; // Lose at max rate here
fixed_t comeback = K_TeamComebackMultiplier(player);
if (comeback > FRACUNIT)
{
REALLY_FAR = FixedDiv(REALLY_FAR, comeback);
TOO_CLOSE = FixedDiv(TOO_CLOSE, comeback);
WAY_TOO_CLOSE = FixedDiv(WAY_TOO_CLOSE, comeback);
}
fixed_t MAX_GAIN_PER_SEC = FRACUNIT/20; // % assist to gain per sec when REALLY_FAR
fixed_t MAX_LOSS_PER_SEC = FRACUNIT/5; // % assist to lose per sec when WAY_TOO_CLOSE