Cheater_Detection: fixes to menu etc

Author: titaniummachine1

Cheater_Detection/Core/player_cache.lua

@@ -34,6 +34,17 @@ local TickEntityCache        = require("Cheater_Detection.Utils.TickEntityCache"
 
 local PlayerCache            = {}
 
+local function requestCosmeticScanIfEnabled(id)
+	local adv = G.Menu and G.Menu.Advanced
+	if not adv or adv.Cosmetics ~= true then
+		return
+	end
+	local ok, cosmetic = pcall(require, "Cheater_Detection.detectors.cosmetic_abuse")
+	if ok and cosmetic.RequestScan then
+		cosmetic.RequestScan(id)
+	end
+end
+
 ---@type table<string, table>
 local activeSet              = {}
 
@@ -245,6 +256,7 @@ function PlayerCache.SyncTick()
 			}
 			activeSet[id]    = state
 			anyNew           = true
+			requestCosmeticScanIfEnabled(id)
 			DirtySystem.MarkDirty(id, "connected")
 			DirtySystem.MarkDirty(id, "score")
 			DirtySystem.MarkDirty(id, "flags")

Cheater_Detection/Core/scheduler.lua

@@ -7,6 +7,7 @@ local SteamLookup = require("Cheater_Detection.services.steam_lookup")
 local HttpQueue = require("Cheater_Detection.services.http_queue")
 local Fetcher = require("Cheater_Detection.Database.Fetcher")
 local ValveCheck = require("Cheater_Detection.detectors.valve_check")
+local CosmeticAbuse = require("Cheater_Detection.detectors.cosmetic_abuse")
 local PlayerCache = require("Cheater_Detection.Core.player_cache")
 local G = require("Cheater_Detection.Utils.Globals")
 local Common = require("Cheater_Detection.Utils.Common")
@@ -28,7 +29,6 @@ local function detectorsNeedLiveCache()
         or (adv and adv.Bhop == true)
         or Common.IsDoubleTapDetectionEnabled()
         or (adv and adv.Choke == true)
-        or (adv and adv.Cosmetics == true)
 end
 
 local function syncPlayerCacheForMode()
@@ -68,6 +68,10 @@ function Scheduler.Tick()
         ValveCheck.Tick()
     end
 
+    if CosmeticAbuse.HasPendingWork() then
+        CosmeticAbuse.ProcessPending()
+    end
+
     if Fetcher and Fetcher.Tick then
         local ok, err = pcall(Fetcher.Tick)
         if not ok then

Cheater_Detection/Main.lua

@@ -519,16 +519,6 @@ local function OnCreateMove(cmd)
 		Profiler.End("FakeLag")
 	end
 
-	if enableCosmetics then
-		Profiler.Begin("Cosmetics")
-		for _, pState in ipairs(activePlayers) do
-			if not pState.wearablesScanned then
-				CosmeticAbuse.ScanPlayer(pState)
-			end
-		end
-		Profiler.End("Cosmetics")
-	end
-
 	Profiler.End("PlayerScan_Loop")
 	Profiler.End("CreateMove_Total")
 end

Cheater_Detection/Misc/Visuals/Menu.lua

@@ -155,10 +155,6 @@ local function DrawMenu()
 		TimMenu.BeginSector("Debug")
 		Advanced.debug = TimMenu.Checkbox("Debug Mode", Advanced.debug == true)
 		TimMenu.NextLine()
-		TimMenu.Text("DEBUG ON = detectors run on YOU (self-test). OFF = you are never scanned.")
-		TimMenu.NextLine()
-		TimMenu.Text("Your flags: top-center HUD box. Others: WorldToScreen over head.")
-		TimMenu.NextLine()
 		Advanced.profiler = TimMenu.Checkbox("Performance Profiler", Advanced.profiler == true)
 		TimMenu.NextLine()
 		-- Debug category selector to reduce console spam
@@ -179,10 +175,6 @@ local function DrawMenu()
 
 		TimMenu.BeginSector("Exploit Detection")
 		Advanced.Choke = TimMenu.Checkbox("Fake Lag Detection (Experimental)", Advanced.Choke == true)
-		local ft = globals.AbsoluteFrameTime()
-		if ft and ft > 0 and (1.0 / ft) < 40 then
-			TimMenu.Text("(OFF: Low FPS!)")
-		end
 		TimMenu.NextLine()
 		Advanced.DoubleTap = TimMenu.Checkbox("Double Tap Detection (Experimental)", Common.IsDoubleTapDetectionEnabled())
 		Advanced.AntiAim = TimMenu.Checkbox("Anti-Aim Detection", Advanced.AntiAim == true)
@@ -198,15 +190,6 @@ local function DrawMenu()
 		TimMenu.NextLine()
 		TimMenu.EndSector()
 		TimMenu.NextLine()
-
-		TimMenu.BeginSector("Aim Detection")
-		-- Disabled pending rework; forced off in Main.lua until silent aim is restored.
-		Advanced.SilentAimbot = false
-		Advanced.AimLock = false
-		TimMenu.Text("Silent Aim / AimLock: disabled (coming back later)")
-		TimMenu.NextLine()
-		TimMenu.EndSector()
-		TimMenu.NextLine()
 	elseif G.Menu.currentTab == "Notifications" then
 		local N = Notifications
 		Misc.JoinNotifications = Misc.JoinNotifications or {}

Cheater_Detection/Utils/Commands.lua

@@ -251,8 +251,17 @@ local function setupDiagnostics()
 
 	Commands.Register("cd_fl_status", function(_args)
 		local block = FakeLag.GetDetectionBlockReason()
+		local fps = FakeLag.GetFpsDiagnostics()
 		printc(100, 220, 255, 255, "[CD] FakeLag diagnostic:")
-		printc(200, 200, 200, 255, "  min FPS need  : >= 40 (smoothed)")
+		printc(200, 200, 200, 255, "  min FPS need  : >= 40 (instant, 1s worst, 1s avg, smoothed)")
+		if fps then
+			printc(200, 200, 200, 255, string.format(
+				"  fps now       : instant=%s  1s_worst=%s  1s_avg=%s  smoothed=%.0f",
+				fps.instant and string.format("%.0f", fps.instant) or "n/a",
+				fps.rollingMin and string.format("%.0f", fps.rollingMin) or "n/a",
+				fps.rollingAvg and string.format("%.0f", fps.rollingAvg) or "n/a",
+				fps.smoothed or 0))
+		end
 		printc(200, 200, 200, 255, string.format("  allowed       : %s", tostring(FakeLag.IsDetectionAllowed())))
 		printc(200, 200, 200, 255, string.format("  block reason  : %s", block or "none"))
 	end)

Cheater_Detection/detectors/cosmetic_abuse.lua

@@ -27,6 +27,11 @@ local regionCache = {}
 -- per-player scan results: id -> { regions = {region->count}, totalWearables = n }
 local playerScanData = {}
 
+-- Event-driven queue (no CreateMove scan of all players).
+local pendingScanIds = {}
+local COSMETICS_SCANS_PER_TICK = 3
+local MAX_WEARABLE_SCAN_ATTEMPTS = 66
+
 -- One entities.FindByClass("CTFWearable") pass per game tick, shared by all players.
 local wearableCacheTick = -1
 local wearablesByPlayerIndex = {}
@@ -195,10 +200,79 @@ function CosmeticAbuse.Init()
 end
 
 function CosmeticAbuse.InvalidatePlayer(id)
+	id = id and tostring(id)
+	if not id then
+		return
+	end
 	playerScanData[id] = nil
+	pendingScanIds[id] = nil
+	local state = PlayerCache.GetByID(id)
+	if state then
+		state.wearablesScanned = nil
+		state.wearableScanAttempts = nil
+	end
+end
+
+function CosmeticAbuse.RequestScan(id)
+	if not id or not isEnabled() then
+		return
+	end
+	id = tostring(id)
+	if not id:match("^7656119%d+$") then
+		return
+	end
+	pendingScanIds[id] = true
 	local state = PlayerCache.GetByID(id)
 	if state then
 		state.wearablesScanned = nil
+		state.wearableScanAttempts = nil
+	end
+	playerScanData[id] = nil
+end
+
+function CosmeticAbuse.HasPendingWork()
+	return next(pendingScanIds) ~= nil
+end
+
+function CosmeticAbuse.ProcessPending(maxScans)
+	if not isEnabled() then
+		for k in pairs(pendingScanIds) do
+			pendingScanIds[k] = nil
+		end
+		return
+	end
+
+	local limit = maxScans or COSMETICS_SCANS_PER_TICK
+	local processed = 0
+	for id in pairs(pendingScanIds) do
+		if processed >= limit then
+			break
+		end
+		local state = PlayerCache.GetByID(id)
+		if not state or not state.pdata or not state.pdata.isAlive or state.pdata.isDormant then
+			pendingScanIds[id] = nil
+		else
+			CosmeticAbuse.ScanPlayer(state)
+			processed = processed + 1
+			if state.wearablesScanned then
+				pendingScanIds[id] = nil
+			elseif (state.wearableScanAttempts or 0) >= MAX_WEARABLE_SCAN_ATTEMPTS then
+				pendingScanIds[id] = nil
+			end
+		end
+	end
+end
+
+function CosmeticAbuse.OnSessionReset()
+	for k in pairs(pendingScanIds) do
+		pendingScanIds[k] = nil
+	end
+	for _, state in pairs(PlayerCache.GetActiveTable()) do
+		if state and state.id then
+			state.wearablesScanned = nil
+			state.wearableScanAttempts = nil
+			CosmeticAbuse.RequestScan(state.id)
+		end
 	end
 end
 
@@ -223,7 +297,7 @@ function CosmeticAbuse.ScanPlayer(playerState)
 	if scanned == nil then
 		local attempts = (playerState.wearableScanAttempts or 0) + 1
 		playerState.wearableScanAttempts = attempts
-		if attempts < 66 then
+		if attempts < MAX_WEARABLE_SCAN_ATTEMPTS then
 			return
 		end
 		playerState.wearablesScanned = true
@@ -251,12 +325,8 @@ function CosmeticAbuse.ScanPlayer(playerState)
 	end
 end
 
-local function scanPlayerById(id)
-	if not id or not isEnabled() then return end
-	local state = PlayerCache.GetByID(tostring(id))
-	if state then
-		CosmeticAbuse.ScanPlayer(state)
-	end
+local function queueScanById(id)
+	CosmeticAbuse.RequestScan(id)
 end
 
 local function onPlayerSpawn(event)
@@ -266,7 +336,7 @@ local function onPlayerSpawn(event)
 	if not ent or not ent:IsValid() then return end
 	local id = tostring(Common.GetSteamID64(ent))
 	if id:match("^7656119%d+$") then
-		scanPlayerById(id)
+		queueScanById(id)
 	end
 end
 
@@ -277,13 +347,20 @@ local function onPlayerChangeClass(event)
 	if not ent or not ent:IsValid() then return end
 	local id = tostring(Common.GetSteamID64(ent))
 	if id:match("^7656119%d+$") then
-		CosmeticAbuse.InvalidatePlayer(id)
-		scanPlayerById(id)
+		CosmeticAbuse.RequestScan(id)
 	end
 end
 
-Events.Subscribe("OnPlayerJoinTeam", scanPlayerById)
+local function onSessionReset(_event)
+	if not isEnabled() then return end
+	CosmeticAbuse.OnSessionReset()
+end
+
+Events.Subscribe("OnPlayerJoinTeam", queueScanById)
 Events.Register("FireGameEvent", "CosmeticAbuse_Spawn", onPlayerSpawn, "player_spawn")
 Events.Register("FireGameEvent", "CosmeticAbuse_ClassChange", onPlayerChangeClass, "player_changeclass")
+Events.Register("FireGameEvent", "CosmeticAbuse_NewMap", onSessionReset, "game_newmap")
+Events.Register("FireGameEvent", "CosmeticAbuse_RoundStart", onSessionReset, "teamplay_round_start")
+Events.Register("FireGameEvent", "CosmeticAbuse_RoundEnd", onSessionReset, "round_end")
 
 return CosmeticAbuse