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

Disable "popcorn" Superring + unforced SPB when those items are disabled

Browse source
This commit is contained in:
Antonio Martinez 2025-09-12 01:53:57 -04:00
parent ec70f62f36
commit 8a6f2c7bad
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/k_roulette.c
View file

@ -1521,7 +1521,7 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
// reels with non-disruptive catchup (since we have a ton of offensive items // reels with non-disruptive catchup (since we have a ton of offensive items
// and not many front/mid speed items). // and not many front/mid speed items).
boolean canfiltersuperring = true; boolean canfiltersuperring = true;
if ((gametyperules & GTR_CIRCUIT) && (specialstageinfo.valid == false)) if ((gametyperules & GTR_CIRCUIT) && (specialstageinfo.valid == false) && K_ItemEnabled(KITEM_SUPERRING))
{ {
if (targetpower > powers[KITEM_SUPERRING]) if (targetpower > powers[KITEM_SUPERRING])
{ {
@ -1587,7 +1587,8 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
&& specialstageinfo.valid == false && specialstageinfo.valid == false
&& (spb_odds > 0) & (spbplace == -1) && (spb_odds > 0) & (spbplace == -1)
&& (roulette->preexpdist >= powers[KITEM_SPB]) // SPECIAL CASE: Check raw distance instead of EXP-influenced target distance. && (roulette->preexpdist >= powers[KITEM_SPB]) // SPECIAL CASE: Check raw distance instead of EXP-influenced target distance.
&& !K_GetItemCooldown(KITEM_SPB)) && !K_GetItemCooldown(KITEM_SPB)
&& K_ItemEnabled(KITEM_SPB))
{ {
// When reenabling the SPB, we also adjust its delta to ensure that it has good odds of showing up. // When reenabling the SPB, we also adjust its delta to ensure that it has good odds of showing up.
// Players who are _seriously_ struggling are more likely to see Invinc or Rockets, since those items // Players who are _seriously_ struggling are more likely to see Invinc or Rockets, since those items