Merge branch 'fix-subsonic-proration-flash' into 'master'

Subsonic's red flashing matches new default race threshold

See merge request kart-krew-dev/ring-racers-internal!2934
This commit is contained in:
Eidolon 2025-10-12 18:29:24 -05:00
commit 1f3eef72c7
2 changed files with 2 additions and 2 deletions

View file

@ -3205,7 +3205,7 @@ fixed_t K_PlayerTripwireSpeedThreshold(const player_t *player)
*/
#define REVERSED_SONICBOOM_PRORATION (30000)
#define MAX_SONICBOOM_REDUCTION (8*FRACUNIT/10)
#define MAX_SONICBOOM_REDUCTION (7*FRACUNIT/9) // Should bring Sonic Boom floor to 175% when far away
UINT32 dist = K_GetItemRouletteDistance(player, D_NumPlayersInRace());

View file

@ -8008,7 +8008,7 @@ static boolean P_MobjRegularThink(mobj_t *mobj)
player_t *player = target->player;
fixed_t myspeed = (player->speed);
boolean In_A_Race = ((gametyperules & GTR_CIRCUIT) && !K_Cooperative() && M_NotFreePlay() && !modeattacking); // If you're in a real race.
boolean prorated_sonicboom_alert = (K_PlayerTripwireSpeedThreshold(player) > 2 * K_GetKartSpeed(player, false, false)) ; // If you're being prorated.
boolean prorated_sonicboom_alert = (K_PlayerTripwireSpeedThreshold(player) > (9 * K_GetKartSpeed(player, false, false)/4)) ; // If you're being prorated, aka above 225%
fixed_t maxspeed = K_PlayerTripwireSpeedThreshold(player); // Centered at this speed.
fixed_t minspeed = max(2 * maxspeed / 4, 7 * K_GetKartSpeed(player, false, false) / 5); // Starts appearing at this speed.
fixed_t alertspeed = 9 * maxspeed / 10; // When to flash?