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

Merge branch 'fix-multi-bail' into 'master'

Browse source 
Clamp pickuprings to 0

See merge request kart-krew-dev/ring-racers-internal!2874
This commit is contained in:
AJ Martinez 2025-09-18 04:54:22 +00:00
commit 54726eb665
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/p_enemy.c
View file

@ -3519,15 +3519,20 @@ void A_AttractChase(mobj_t *actor)
if (G_CompatLevel(0x0010)) if (G_CompatLevel(0x0010))
blocked |= !!(actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW); blocked |= !!(actor->target->player->bailcharge || actor->target->player->defenseLockout > PUNISHWINDOW);
if (stale || blocked) if (!G_CompatLevel(0x0010) || actor->extravalue2)
{ {
if (!G_CompatLevel(0x0010) && !stale) if (stale || blocked)
actor->target->player->pickuprings--; {
if (!G_CompatLevel(0x0010) && !stale)
if (actor->target->player->pickuprings)
actor->target->player->pickuprings--;
P_RemoveMobj(actor); P_RemoveMobj(actor);
return; return;
}
} }
if (actor->extravalue2) // Using for ring boost if (actor->extravalue2) // Using for ring boost
{ {
// Always fullbright // Always fullbright
@ -3605,7 +3610,9 @@ void A_AttractChase(mobj_t *actor)
actor->target->player->ringvolume -= RINGVOLUMECOLLECTPENALTY; actor->target->player->ringvolume -= RINGVOLUMECOLLECTPENALTY;
actor->target->player->ringtransparency -= RINGTRANSPARENCYCOLLECTPENALTY; actor->target->player->ringtransparency -= RINGTRANSPARENCYCOLLECTPENALTY;
actor->target->player->pickuprings--; if (actor->target->player->pickuprings || !G_CompatLevel(0x0011))
actor->target->player->pickuprings--;
P_RemoveMobj(actor); P_RemoveMobj(actor);
return; return;
} }