From 8a6f2c7bad7d6040b30c6d65f8084a0b89142e72 Mon Sep 17 00:00:00 2001 From: Antonio Martinez Date: Fri, 12 Sep 2025 01:53:57 -0400 Subject: [PATCH] Disable "popcorn" Superring + unforced SPB when those items are disabled --- src/k_roulette.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/k_roulette.c b/src/k_roulette.c index 6c5aad085..471ac150b 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -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 // and not many front/mid speed items). 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]) { @@ -1587,7 +1587,8 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo && specialstageinfo.valid == false && (spb_odds > 0) & (spbplace == -1) && (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. // Players who are _seriously_ struggling are more likely to see Invinc or Rockets, since those items