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

Merge branch 'amp-scaling' into 'master'

Browse source 
Amp scaling

See merge request kart-krew-dev/ring-racers-internal!2526
This commit is contained in:
Oni VelocitOni 2025-05-04 18:24:16 +00:00
commit f28a2a4345
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/doomdef.h
View file

@ -741,6 +741,9 @@ extern int
/// Other karma comeback modes
//#define OTHERKARMAMODES
// Amp scaling
#define MAXAMPSCALINGDIST 18000
#ifdef __cplusplus
} // extern "C"
#endif

9
src/k_kart.c
View file

@ -4122,7 +4122,16 @@ void K_SpawnAmps(player_t *player, UINT8 amps, mobj_t *impact)
if (amps == 0)
return;
UINT32 itemdistance = max(0, min( FRACUNIT, K_GetItemRouletteDistance(player, D_NumPlayersInRace()))); // cap this to FRACUNIT, so it doesn't wrap when turning it into fixed_t
fixed_t itemdistmult = FRACUNIT + max( 0, min(FixedMul(FixedDiv(itemdistance<<FRACBITS, MAXAMPSCALINGDIST<<FRACBITS),FRACUNIT), FRACUNIT));
UINT16 scaledamps = min(amps, amps * (10 + (9-player->kartspeed) - (9-player->kartweight)) / 10);
// Debug print for scaledamps calculation
// CONS_Printf("K_SpawnAmps: player=%s, amps=%d, kartspeed=%d, kartweight=%d, itemdistance=%d, itemdistmult=%0.2f, statscaledamps=%d, distscaledamps=%d\n",
// player_names[player-players], amps, player->kartspeed, player->kartweight,
// itemdistance, FixedToFloat(itemdistmult),
// min(amps, amps * (10 + (9-player->kartspeed) - (9-player->kartweight)) / 10),
// FixedMul(scaledamps<<FRACBITS, itemdistmult)>>FRACBITS);
scaledamps = FixedMul(scaledamps<<FRACBITS, itemdistmult)>>FRACBITS;
/*
if (player->position <= 1)