Merge branch 'master-mode-all-access' into 'master'

Rank 1 Master always enters Sealed Star

See merge request KartKrew/Kart!1582
This commit is contained in:
Oni 2023-10-24 03:25:55 +00:00
commit a221cb467e
2 changed files with 13 additions and 0 deletions

View file

@ -3802,6 +3802,11 @@ void G_GetNextMap(void)
{
// On A rank pace? Then you get a chance for S rank!
permitrank = (K_CalculateGPGrade(&grandprixinfo.rank) >= GRADE_A);
// If you're on Master, a win floats you to rank-restricted levels for free.
// (This is a different class of challenge!)
if (grandprixinfo.masterbots && grandprixinfo.rank.position <= 1)
permitrank = true;
}
while (roundqueue.position < roundqueue.size

View file

@ -306,6 +306,14 @@ static void Y_CalculateMatchData(UINT8 rankingsmode, void (*comparison)(INT32))
* (2 * TICRATE)
) / GRADE_A;
// G_NextMap will float you to rank-restricted stages on Master wins.
// Fudge the rank display.
if (grandprixinfo.masterbots && grandprixinfo.rank.position <= 1)
{
data.showrank = true;
data.linemeter = 2*TICRATE;
}
// A little extra time to take it all in
timer += TICRATE;
}