thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 13:01:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reverse SPB distance scaling

Browse source
This commit is contained in:
Sally Coolatta 2022-09-23 04:04:05 -04:00
parent 2786957fef
commit 21bd7bf041
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/k_kart.c
View file

@ -578,6 +578,12 @@ fixed_t K_ItemOddsScale(UINT8 playerCount)
const UINT8 basePlayer = 8; // The player count we design most of the game around. const UINT8 basePlayer = 8; // The player count we design most of the game around.
fixed_t playerScaling = 0; fixed_t playerScaling = 0;
if (playerCount < 2)
{
// Cap to 1v1 scaling
playerCount = 2;
}
// Then, it multiplies it further if the player count isn't equal to basePlayer. // Then, it multiplies it further if the player count isn't equal to basePlayer.
// This is done to make low player count races more interesting and high player count rates more fair. // This is done to make low player count races more interesting and high player count rates more fair.
if (playerCount < basePlayer) if (playerCount < basePlayer)
@ -610,14 +616,11 @@ UINT32 K_ScaleItemDistance(UINT32 distance, UINT8 numPlayers)
distance = (15 * distance) / 14; distance = (15 * distance) / 14;
} }
if (numPlayers > 0) // Items get crazier with the fewer players that you have.
{ distance = FixedMul(
// Items get crazier with the fewer players that you have. distance,
distance = FixedMul( FRACUNIT + (K_ItemOddsScale(numPlayers) / 2)
distance, );
FRACUNIT + (K_ItemOddsScale(numPlayers) / 2)
);
}
return distance; return distance;
} }
@ -744,7 +747,7 @@ INT32 K_KartGetItemOdds(
if (first != NULL && second != NULL) if (first != NULL && second != NULL)
{ {
secondToFirst = secondDist - firstDist; secondToFirst = secondDist - firstDist;
secondToFirst = K_ScaleItemDistance(secondToFirst, pingame); secondToFirst = K_ScaleItemDistance(secondToFirst, 16 - pingame); // Reversed scaling, so 16P is like 1v1, and 1v1 is like 16P
} }
switch (item) switch (item)
@ -1047,7 +1050,7 @@ boolean K_ForcedSPB(player_t *player)
if (first != NULL && second != NULL) if (first != NULL && second != NULL)
{ {
secondToFirst = second->distancetofinish - first->distancetofinish; secondToFirst = second->distancetofinish - first->distancetofinish;
secondToFirst = K_ScaleItemDistance(secondToFirst, pingame); secondToFirst = K_ScaleItemDistance(secondToFirst, 16 - pingame);
} }
return (secondToFirst >= SPBFORCEDIST); return (secondToFirst >= SPBFORCEDIST);