From c3169247922f378a43d2b7befdac36f074d32b6e Mon Sep 17 00:00:00 2001 From: AJ Martinez Date: Sat, 13 Sep 2025 22:23:52 -0400 Subject: [PATCH] Revert "Forever alone" This reverts commit 34bc8b9dced5a7436a1a3cc0ef1fe36544c34120. --- src/k_roulette.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/k_roulette.c b/src/k_roulette.c index 373093ec1..6c5aad085 100644 --- a/src/k_roulette.c +++ b/src/k_roulette.c @@ -1570,9 +1570,9 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo // Give interaction items a nudge against initial selection if you're lonely.. for (i = 1; i < NUMKARTRESULTS; i++) { - if (!K_IsItemSpeed(i)) + if (K_IsItemUselessAlone(i)) { - deltas[i] = Easing_InCubic(loneliness, deltas[i], deltas[i] + (4*DISTVAR)); + deltas[i] = Easing_InCubic(loneliness, deltas[i], deltas[i] + (2*DISTVAR)); } } } @@ -1696,10 +1696,6 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo // feels exciting, low-rolling feels punishing! boolean reject = (filterweakitems) && (powers[i] + DISTVAR < meanreelpower); - // If we're far away from interactions, be extra aggressive about tossing attack items. - if (filterweakitems && !reject && !K_IsItemSpeed(i)) - reject = (powers[i] + Easing_Linear(loneliness, DISTVAR, -2 * DISTVAR) < meanreelpower); - // Popcorn Super Ring is always strong enough, we put it there on purpose. if (i == KITEM_SUPERRING && !canfiltersuperring) reject = false;