From da7f35cb2aaa18cf869d1d6e983d4163f99808b6 Mon Sep 17 00:00:00 2001
From: Anonimus <anonimus.srb2k@gmail.com>
Date: Thu, 23 Oct 2025 12:59:50 -0400
Subject: [PATCH] Adjust clustering * Increase epsilon value, let it modulate
 based on gamespeed * Adjust where the 'cluster point' is visualized in
 debugging * Relay the role of 'cluster player' to the highest placing player
 in the bottom half, should the previous enter the top half

---
 src/k_hud.c  | 17 ++++++++++++++++-
 src/k_kart.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
 2 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/src/k_hud.c b/src/k_hud.c
index aa96c8158..79aaa00ff 100644
--- a/src/k_hud.c
+++ b/src/k_hud.c
@@ -4046,7 +4046,22 @@ static void K_drawKartMinimapCluster(INT32 hudx, INT32 hudy, INT32 flags)
 	UINT8 pal = 180; // Strong pink color.
 	UINT8 size = 6;
 
-	K_drawKartMinimapDot(clusterpoint.x, clusterpoint.y, hudx, hudy, flags, pal, size);
+	fixed_t clusterx, clustery;
+
+	clusterx = clustery = 0;
+
+	if ((clusterid != UINT32_MAX) && (players[clusterid].mo) && (!P_MobjWasRemoved(players[clusterid].mo)))
+	{
+		clusterx = players[clusterid].mo->x;
+		clustery = players[clusterid].mo->y;
+	}
+	else
+	{
+		clusterx = clusterpoint.x;
+		clustery = clusterpoint.y;
+	}
+
+	K_drawKartMinimapDot(clusterx, clustery, hudx, hudy, flags, pal, size);
 }
 
 #define ICON_DOT_RADIUS (cv_minihead.value && !cv_showminimapnames.value) ? 8 : 10
diff --git a/src/k_kart.c b/src/k_kart.c
index 5637410a2..f65493613 100644
--- a/src/k_kart.c
+++ b/src/k_kart.c
@@ -9329,13 +9329,18 @@ static UINT32 K_UpdateDistanceFromCluster(player_t *player)
 {
 	player_t *cluster_p;
 	UINT32 i, pingame;
-	SINT8 first, second, tinypoptarget;
+	SINT8 first, second, bestloser, tinypoptarget;
+
+	INT16 bestloserpos;
+
 	INT32 divmul;
 
 	pingame = 0;
 
+	bestloserpos = INT16_MAX;
+
 	first = -1;
-	second = -1;
+	bestloser = second = -1;
 	tinypoptarget = -1;
 
 	divmul = 1;
@@ -9347,7 +9352,7 @@ static UINT32 K_UpdateDistanceFromCluster(player_t *player)
 		if (!(gametyperules & GTR_BUMPERS) || players[i].bumper)
 			pingame++;
 
-		if (players[i].mo && gametype == GT_RACE)
+		if ((players[i].mo) && (gametyperules & GTR_CIRCUIT))
 		{
 			if (players[i].position == 1 && first == -1)
 				first = i;
@@ -9372,12 +9377,19 @@ static UINT32 K_UpdateDistanceFromCluster(player_t *player)
 			if (!playeringame[i] || players[i].spectator)
 				continue;
 
-			if (players[i].mo && gametype == GT_RACE)
+			if ((players[i].mo) && (gametyperules & GTR_CIRCUIT))
 			{
+				if ((players[i].position < bestloserpos) &&
+					(K_IsPlayerLosing(&players[i])))
+				{
+					// This player is the highest-ranking "loser".
+					bestloserpos = players[i].position;
+					bestloser = (SINT8)i;
+				}
+				
 				if (players[i].position == (pingame - 1) && second == -1)
 				{
 					second = i;
-					break;
 				}
 			}
 		}
@@ -9385,6 +9397,18 @@ static UINT32 K_UpdateDistanceFromCluster(player_t *player)
 
 	tinypoptarget = (pingame < 3) ? first : second;
 
+	if (clusterid != UINT32_MAX)
+	{
+		if (!K_IsPlayerLosing(&players[clusterid]))
+		{
+			// Our cluster player isn't losing anymore, "relay" the ID to the "best loser"
+			if (bestloser != -1)
+			{
+				clusterid = bestloser;
+			}
+		}
+	}
+
 	if (K_UsingLegacyCheckpoints())
 	{
 		// Compare yourself against the cluster player to determine the distance.
@@ -9705,6 +9729,12 @@ static vector3_t *K_FindPlayerCluster(fixed_t eps, INT32 (*func)(player_t *, fix
 
         // Double-remove the clusterplayer flag. Bad hack, I know...
         clusterplayer[i] = false;
+		
+		// 10/22/2025: Pairs don't count anymore
+		if (N <= 2)
+		{
+			continue;
+		}
 
         // Density check
         if (N > bestdensity)
@@ -9741,9 +9771,11 @@ static vector3_t *K_FindPlayerCluster(fixed_t eps, INT32 (*func)(player_t *, fix
     return out;
 }
 
-#define CLUSTER_EPSILON (160*FRACUNIT)
-#define K_FindPlayerClusterLegacy() (K_FindPlayerCluster(CLUSTER_EPSILON, K_CountNeighboringPlayers, &clusterpoint))
-#define K_FindPlayerClusterDTF() (K_FindPlayerCluster((CLUSTER_EPSILON / FRACUNIT), K_CountNeighboringPlayersByDTF, &clusterdtf))
+#define CLUSTER_EPSILON (320*FRACUNIT)
+#define RESCALED_CLUSTER_EPS (FixedMul(FixedMul(CLUSTER_EPSILON, K_GetKartGameSpeedScalar(gamespeed)), mapobjectscale))
+
+#define K_FindPlayerClusterLegacy() (K_FindPlayerCluster(RESCALED_CLUSTER_EPS, K_CountNeighboringPlayers, &clusterpoint))
+#define K_FindPlayerClusterDTF() (K_FindPlayerCluster((RESCALED_CLUSTER_EPS / FRACUNIT), K_CountNeighboringPlayersByDTF, &clusterdtf))
 
 void K_UpdateClusterPoints(void)
 {
@@ -9754,10 +9786,10 @@ void K_UpdateClusterPoints(void)
     }
     else
     {
-        if (cv_kartdebugcluster.value)
+        /*if (cv_kartdebugcluster.value)
         {
             K_FindPlayerClusterLegacy();
-        }
+        }*/
 
         K_FindPlayerClusterDTF();
     }