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

Award amps for kitchen sink

Browse source
This commit is contained in:
Antonio Martinez 2025-06-28 16:27:16 -04:00
parent 4a8723bba4
commit 9dbc6771c0
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/k_collide.cpp
View file

@ -1121,6 +1121,9 @@ boolean K_KitchenSinkCollide(mobj_t *t1, mobj_t *t2)
S_StartSound(NULL, sfx_bsnipe); // let all players hear it.
if (t1->target && !P_MobjWasRemoved(t1->target) && t1->target->player)
K_SpawnAmps(t1->target->player, 50, t2);
HU_SetCEchoFlags(0);
HU_SetCEchoDuration(5);
HU_DoCEcho(va("%s\\was hit by a kitchen sink.\\\\\\\\", player_names[t2->player-players]));

3
src/k_kart.c
View file

@ -4253,6 +4253,9 @@ void K_SpawnAmps(player_t *player, UINT8 amps, mobj_t *impact)
if (amps == 0)
return;
if (!player->mo && P_MobjWasRemoved(player->mo))
return;
UINT32 itemdistance = min(FRACUNIT-1, K_GetItemRouletteDistance(player, D_NumPlayersInRace())); // cap this to FRACUNIT-1, so it doesn't wrap when turning it into fixed_t
fixed_t itemdistmult = FRACUNIT + min(FRACUNIT, (itemdistance<<FRACBITS) / MAXAMPSCALINGDIST);
UINT16 scaledamps = min(amps, amps * (10 + (9-player->kartspeed) - (9-player->kartweight)) / 10);