thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-27 20:41:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Amps readjustment

Browse source
This commit is contained in:
Antonio Martinez 2024-08-22 22:45:29 -07:00
parent 36db256633
commit a19b323d36
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/k_kart.c
View file

@ -4007,8 +4007,10 @@ void K_SpawnAmps(player_t *player, UINT8 amps, mobj_t *impact)
if (gametyperules & GTR_SPHERES) if (gametyperules & GTR_SPHERES)
return; return;
// Give that Sonic guy some help. UINT16 scaledamps = min(amps, amps * (10 + (9-player->kartspeed) - (9-player->kartweight)) / 10);
UINT16 scaledamps = min(amps, amps * (10 + player->kartspeed - player->kartweight) / 10);
if (player->position <= 1)
scaledamps /= 2;
for (int i = 0; i < (scaledamps/2); i++) for (int i = 0; i < (scaledamps/2); i++)
{ {
@ -4052,6 +4054,13 @@ void K_AwardPlayerAmps(player_t *player, UINT8 amps)
if (player->rings <= 0 && player->ampspending == 0) if (player->rings <= 0 && player->ampspending == 0)
{ {
// Auto Overdrive!
// If this is a fresh OD, give 'em some extra juice to make up for lack of flexibility.
if (!player->overdrive && player->mo && !P_MobjWasRemoved(player->mo))
{
S_StartSound(player->mo, sfx_gshac);
player->amps *= 2;
}
K_Overdrive(player); K_Overdrive(player);
} }
} }

5
src/p_inter.c
View file

@ -3092,11 +3092,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
{ {
K_DoPowerClash(target, inflictor); K_DoPowerClash(target, inflictor);
if (inflictor->type != MT_PLAYER)
{
K_SpawnAmps(player, 5, inflictor);
}
if (inflictor->type == MT_SUPER_FLICKY) if (inflictor->type == MT_SUPER_FLICKY)
{ {
Obj_BlockSuperFlicky(inflictor); Obj_BlockSuperFlicky(inflictor);