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

Use predetermined roulette speed for Time Attack

Browse source
This commit is contained in:
Sally Coolatta 2022-12-13 18:03:44 -05:00
parent 6b8a011aa1
commit 8d43acccb7
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/k_roulette.c
View file

@ -70,6 +70,7 @@
#define ROULETTE_SPEED_SLOWEST (20) #define ROULETTE_SPEED_SLOWEST (20)
#define ROULETTE_SPEED_FASTEST (2) #define ROULETTE_SPEED_FASTEST (2)
#define ROULETTE_SPEED_DIST (224*DISTVAR) #define ROULETTE_SPEED_DIST (224*DISTVAR)
#define ROULETTE_SPEED_TIMEATTACK (9)
static UINT8 K_KartItemOddsRace[NUMKARTRESULTS-1][8] = static UINT8 K_KartItemOddsRace[NUMKARTRESULTS-1][8] =
{ {
@ -797,6 +798,10 @@ static void K_CalculateRouletteSpeed(player_t *const player, itemroulette_t *con
size_t i; size_t i;
// Make them select their item after a little while.
// One of the few instances of bot RNG, would be nice to remove it.
player->botvars.itemdelay = P_RandomRange(PR_UNDEFINED, TICRATE, TICRATE*3);
for (i = 0; i < MAXPLAYERS; i++) for (i = 0; i < MAXPLAYERS; i++)
{ {
if (playeringame[i] == false || players[i].spectator == true) if (playeringame[i] == false || players[i].spectator == true)
@ -812,6 +817,13 @@ static void K_CalculateRouletteSpeed(player_t *const player, itemroulette_t *con
} }
} }
if (modeattacking || playing <= 1)
{
// Time Attack rules; use a consistent speed.
roulette->tics = roulette->speed = ROULETTE_SPEED_TIMEATTACK;
return;
}
ourDist = K_ScaleItemDistance(player->distancetofinish, playing); ourDist = K_ScaleItemDistance(player->distancetofinish, playing);
firstDist = K_ScaleItemDistance(firstDist, playing); firstDist = K_ScaleItemDistance(firstDist, playing);
@ -834,15 +846,18 @@ static void K_CalculateRouletteSpeed(player_t *const player, itemroulette_t *con
{ {
// Don't impact as much at the start. // Don't impact as much at the start.
// This makes it so that everyone gets to enjoy the lowest speed at the start. // This makes it so that everyone gets to enjoy the lowest speed at the start.
fixed_t lerp = FRACUNIT - FixedDiv(max(0, leveltime - starttime), 20*TICRATE); if (leveltime < starttime)
total += FixedMul(lerp, FRACUNIT - total); {
total = FRACUNIT;
}
else
{
const fixed_t lerp = FixedDiv(leveltime - starttime, 20*TICRATE);
total = FRACUNIT + FixedMul(lerp, total - FRACUNIT);
}
} }
roulette->tics = roulette->speed = ROULETTE_SPEED_FASTEST + FixedMul(ROULETTE_SPEED_SLOWEST - ROULETTE_SPEED_FASTEST, total); roulette->tics = roulette->speed = ROULETTE_SPEED_FASTEST + FixedMul(ROULETTE_SPEED_SLOWEST - ROULETTE_SPEED_FASTEST, total);
// Make them select their item after a little while.
// One of the few instances of bot RNG, would be nice to remove it.
player->botvars.itemdelay = P_RandomRange(PR_UNDEFINED, TICRATE, TICRATE*3);
} }
void K_StartItemRoulette(player_t *const player, itemroulette_t *const roulette) void K_StartItemRoulette(player_t *const player, itemroulette_t *const roulette)