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

Auto-use rings from Super Ring if they'd be wasted due to the cap

Browse source
This commit is contained in:
TehRealSalt 2019-03-11 12:39:26 -04:00
parent 5507a41d64
commit 6be405953f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/p_enemy.c
View file

@ -3625,6 +3625,7 @@ void A_AttractChase(mobj_t *actor)
if (actor->extravalue1) // SRB2Kart if (actor->extravalue1) // SRB2Kart
{ {
#define RINGBOOSTPWR (((9 - actor->target->player->kartspeed) + (9 - actor->target->player->kartweight)) / 2)
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player) if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player)
{ {
P_RemoveMobj(actor); P_RemoveMobj(actor);
@ -3635,7 +3636,6 @@ void A_AttractChase(mobj_t *actor)
{ {
if (actor->extravalue1 >= 21) if (actor->extravalue1 >= 21)
{ {
#define RINGBOOSTPWR (((9 - actor->target->player->kartspeed) + (9 - actor->target->player->kartweight)) / 2)
// Base add is 3 tics for 9,9, adds 1.5 tics for each point closer to the 1,1 end // Base add is 3 tics for 9,9, adds 1.5 tics for each point closer to the 1,1 end
actor->target->player->kartstuff[k_ringboost] += ((3*RINGBOOSTPWR)/2) + 3; actor->target->player->kartstuff[k_ringboost] += ((3*RINGBOOSTPWR)/2) + 3;
S_StartSound(actor->target, sfx_s1b5); S_StartSound(actor->target, sfx_s1b5);
@ -3657,12 +3657,17 @@ void A_AttractChase(mobj_t *actor)
{ {
if (actor->extravalue1 >= 16) if (actor->extravalue1 >= 16)
{ {
P_GivePlayerRings(actor->target->player, 1); if (actor->target->player[k_rings] >= 20)
actor->target->player->kartstuff[k_pickuprings]--; actor->target->player->kartstuff[k_ringboost] += ((3*RINGBOOSTPWR)/2) + 3;
else
P_GivePlayerRings(actor->target->player, 1);
if (actor->cvmem) // caching if (actor->cvmem) // caching
S_StartSound(actor->target, sfx_s1c5); S_StartSound(actor->target, sfx_s1c5);
else else
S_StartSound(actor->target, sfx_s227); S_StartSound(actor->target, sfx_s227);
actor->target->player->kartstuff[k_pickuprings]--;
P_RemoveMobj(actor); P_RemoveMobj(actor);
return; return;
} }
@ -3680,6 +3685,7 @@ void A_AttractChase(mobj_t *actor)
actor->extravalue1++; actor->extravalue1++;
} }
} }
#undef RINGBOOSTPWR
} }
else else
{ {