Merge branch 'ring-respawn-fuck-you' into 'master'

Faster ring respawn once again

See merge request KartKrew/Kart!1212
This commit is contained in:
Oni 2023-04-30 06:44:44 +00:00
commit 6069d2042a

View file

@ -11652,7 +11652,7 @@ void P_RespawnSpecials(void)
} }
else if (pcount > 1) else if (pcount > 1)
{ {
time = (120 * TICRATE) / (pcount - 1); time = (120 * TICRATE) / ((((pcount - 1) * (pcount - 1)) / 3) + 1);
// If the map is longer or shorter than 3 laps, then adjust ring respawn to account for this. // If the map is longer or shorter than 3 laps, then adjust ring respawn to account for this.
// 5 lap courses would have more retreaded ground, while 2 lap courses would have less. // 5 lap courses would have more retreaded ground, while 2 lap courses would have less.
@ -11662,10 +11662,10 @@ void P_RespawnSpecials(void)
time = (time * 3) / max(1, mapheaderinfo[gamemap-1]->numlaps); time = (time * 3) / max(1, mapheaderinfo[gamemap-1]->numlaps);
} }
if (time < 10*TICRATE) if (time < 2*TICRATE)
{ {
// Ensure it doesn't go into absurdly low values // Ensure it doesn't go into absurdly low values
time = 10*TICRATE; time = 2*TICRATE;
} }
} }
} }