From c7fcf34a8a17beff4bc9825145c5bd27efc8187f Mon Sep 17 00:00:00 2001
From: Antonio Martinez <aj@worldsbe.st>
Date: Tue, 23 Sep 2025 22:12:38 -0400
Subject: [PATCH] Vibetweaking

---
 src/k_hud.cpp    | 8 +-------
 src/k_kart.c     | 7 ++-----
 src/k_kart.h     | 2 --
 src/k_roulette.c | 2 +-
 4 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/k_hud.cpp b/src/k_hud.cpp
index 09149d92a..f0be5a26e 100644
--- a/src/k_hud.cpp
+++ b/src/k_hud.cpp
@@ -3307,19 +3307,13 @@ static void K_drawKartEmeralds(void)
 
 INT32 K_GetTransFlagFromFixed(fixed_t value, boolean midrace)
 {
-	fixed_t base = midrace ? GRADINGFACTORSOFTCAP : FRACUNIT;
+	fixed_t base = FRACUNIT;
 
     value = std::clamp(value, base - FRACUNIT/2, base + FRACUNIT/2);
 
     // Calculate distance from "base""
     fixed_t distance = abs(base - value);
 
-	if (midrace)
-	{
-		if (value > base)
-			distance = FixedMul(distance, GRADINGFACTORCAPSTRENGTH);
-	}
-
 	distance = std::clamp(distance, 0, FRACUNIT/2);
 
     // Map the distance to 0-10 range (10 = closest to 1.0, 0 = farthest from 1.0)
diff --git a/src/k_kart.c b/src/k_kart.c
index 61da066ff..f24e46e7b 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -158,11 +158,8 @@ fixed_t K_EffectiveGradingFactor(const player_t *player)
 		return min;
 
 	fixed_t gf = player->gradingfactor;
-
-	if (gf > GRADINGFACTORSOFTCAP && !K_PlayerUsesBotMovement(player))
-		gf = GRADINGFACTORSOFTCAP + FixedDiv(gf - GRADINGFACTORSOFTCAP, GRADINGFACTORCAPSTRENGTH);
-
-	gf = (gf + FRACUNIT)/2;
+	if (franticitems)
+		gf = (gf + FRACUNIT)/2;
 
 	return max(min, gf);
 }
diff --git a/src/k_kart.h b/src/k_kart.h
index 9a5344856..ad084d6fa 100644
--- a/src/k_kart.h
+++ b/src/k_kart.h
@@ -136,8 +136,6 @@ fixed_t K_FinalCheckpointPower(void);
 fixed_t K_EffectiveGradingFactor(const player_t *player);
 #define MINGRADINGFACTOR (FRACUNIT/2)
 #define MINFRANTICFACTOR (8*FRACUNIT/10)
-#define GRADINGFACTORSOFTCAP (2*FRACUNIT)
-#define GRADINGFACTORCAPSTRENGTH (3*FRACUNIT)
 
 void K_TimerReset(void);
 void K_TimerInit(void);
diff --git a/src/k_roulette.c b/src/k_roulette.c
index a4117fc26..118e2dd52 100644
--- a/src/k_roulette.c
+++ b/src/k_roulette.c
@@ -1457,7 +1457,7 @@ void K_FillItemRouletteData(player_t *player, itemroulette_t *const roulette, bo
 		}
 	}
 
-	fixed_t largegamescaler = roulette->playing * 5 + 100; // Spread out item odds in large games for a less insane experience.
+	fixed_t largegamescaler = roulette->playing * 8 + 100; // Spread out item odds in large games for a less insane experience.
 	if (franticitems)
 		largegamescaler = 100; // Except in Frantic, where you know what you're getting