incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make this code look less ass

Browse source
This commit is contained in:
NepDisk 2025-06-04 17:52:04 -04:00
parent 656268f31d
commit a47594d4be
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/k_kart.c
View file

@ -7266,27 +7266,21 @@ INT32 K_ChainOrDeincrementTime(player_t *player, INT32 timer, INT32 deincrement,
} }
// Get the tic inverse sum using kartspeed, kartweight and your number of boosts. // Get the tic inverse sum using kartspeed, kartweight and your number of boosts.
static INT32 ticinversesum(UINT8 kartspeed, UINT8 kartweight, UINT8 grade) static INT32 K_TicInversesum(UINT8 kartspeed, UINT8 kartweight, UINT8 grade)
{ {
return (TICRATE / kartspeed) + (TICRATE / CLAMP(kartweight, 1, 5)) + grade; return (TICRATE / kartspeed) + (TICRATE / CLAMP(kartweight, 1, 5)) + grade;
} }
// Get the maximum required stacks needed for the ringnerf based on kartspeed and kartweight // Get the threshold for the ringnerf based on kartspeed and kartweight
static INT32 statrangemap(UINT8 kartspeed, UINT8 kartweight) static INT32 K_StackThreshold(UINT8 kartspeed, UINT8 kartweight)
{ {
INT32 scaledsw = (9 - kartspeed) + (9 - kartweight); INT32 scaledsw = (9 - kartspeed) + (9 - kartweight);
fixed_t result = 4*FRACUNIT - (FixedMul(scaledsw*FRACUNIT/16, 2*FRACUNIT));
fixed_t scaled_input = (scaledsw)*FRACUNIT/16;
// Scale the result to be within range [2, 4]
fixed_t result = 4*FRACUNIT - (FixedMul(scaled_input, 2*FRACUNIT));
// Stay within range please! // Stay within range please!
result = CLAMP(result, 2*FRACUNIT, 4*FRACUNIT); result = CLAMP(result, 2*FRACUNIT, 4*FRACUNIT);
result = result >> FRACBITS; return result >> FRACBITS;
return result;
} }
static void K_HandleRingDeincrement(player_t *player, boolean chainnerf) static void K_HandleRingDeincrement(player_t *player, boolean chainnerf)
@ -7301,11 +7295,11 @@ static void K_HandleRingDeincrement(player_t *player, boolean chainnerf)
if (chainnerf) if (chainnerf)
{ {
UINT8 requiredgrade = statrangemap(player->kartspeed, player->kartweight); UINT8 requiredgrade = K_StackThreshold(player->kartspeed, player->kartweight);
if (player->numboosts >= requiredgrade) if (player->numboosts >= requiredgrade)
{ {
INT32 insum = ticinversesum(player->kartspeed, player->kartweight, player->numboosts); INT32 insum = K_TicInversesum(player->kartspeed, player->kartweight, player->numboosts);
INT32 subring = (player->ringboost*2)/insum; INT32 subring = (player->ringboost*2)/insum;
if (player->kartspeed == 1) if (player->kartspeed == 1)