From 659dc8270eeddbff17032b8281bae87a1f1972eb Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Sun, 18 Dec 2022 01:10:34 -0500 Subject: [PATCH] Roulette speed thing - Slightly slower at start - More reasonable default --- src/k_roulette.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k_roulette.c b/src/k_roulette.c index ec15f4e9b..40cd68af4 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -821,7 +821,7 @@ static void K_InitRoulette(itemroulette_t *const roulette) roulette->secondToFirst = 0; roulette->elapsed = 0; - roulette->tics = roulette->speed = ROULETTE_SPEED_FASTEST; // Some default speed + roulette->tics = roulette->speed = ROULETTE_SPEED_TIMEATTACK; // Some default speed roulette->active = true; roulette->eggman = false; @@ -981,7 +981,7 @@ static void K_CalculateRouletteSpeed(itemroulette_t *const roulette) // Combine our two factors together. total = min(FRACUNIT, (frontRun / 2) + (progress / 2)); - if (leveltime < starttime + 20*TICRATE) + if (leveltime < starttime + 30*TICRATE) { // Don't impact as much at the start. // This makes it so that everyone gets to enjoy the lowest speed at the start. @@ -991,7 +991,7 @@ static void K_CalculateRouletteSpeed(itemroulette_t *const roulette) } else { - const fixed_t lerp = FixedDiv(leveltime - starttime, 20*TICRATE); + const fixed_t lerp = FixedDiv(leveltime - starttime, 30*TICRATE); total = FRACUNIT + FixedMul(lerp, total - FRACUNIT); } }