v5.7.3

Author: titaniummachine1

Swing_Prediction.lua

@@ -144,62 +144,51 @@ end
 ---@param me WPlayer
 ---@return AimTarget? target
 local function GetBestTarget(me)
-    -- Define settings for target selection
-    local settings = {
-        MinDistance = 150,
+    settings = {
+        MinDistance = 200,
         MaxDistance = 1000,
-        MinHealth = 17,
+        MinHealth = 10,
         MaxHealth = 100,
         MinFOV = 0,
         MaxFOV = mFov:GetValue(),
     }
 
-    -- Get all players in the game
     local players = entities.FindByClass("CTFPlayer")
     local localPlayer = entities.GetLocalPlayer()
     if not localPlayer then return end
 
-    -- Create a table to store target factors for each player
+    ---@type Target[]
     local targetList = {}
-    for i = 1, #players do
-        targetList[i] = nil
-    end
+    local targetCount = 0
 
-    -- Calculate target factors for each player
+    -- Calculate target factors
     for i, player in pairs(players) do
-        -- Skip invalid players
-        if player == nil
-            or player:IsDormant()
-            or player == localPlayer
-            or player:GetTeamNumber() == localPlayer:GetTeamNumber()
-            or not player:IsAlive()
-            or gui.GetValue("ignore cloaked") == 1 and player:InCond(4)
-            or not Helpers.VisPos(player, pLocalOrigin, player:GetAbsOrigin())
-        then
-            goto continue
-        end
-
-        -- Calculate distance and height difference to player
+        if not Helpers.VisPos(player, pLocalOrigin, player:GetAbsOrigin()) then goto continue end
+        if player == localPlayer or player:GetTeamNumber() == localPlayer:GetTeamNumber() then goto continue end
+        if player == nil or not player:IsAlive() then goto continue end
+        if gui.GetValue("ignore cloaked") == 1 and (player:InCond(4)) then goto continue end
+        if player:IsDormant() then goto continue end
+        
         local distance = (player:GetAbsOrigin() - localPlayer:GetAbsOrigin()):Length()
         local height_diff = math.floor(math.abs(player:GetAbsOrigin().z - localPlayer:GetAbsOrigin().z))
 
-        -- Skip players that are too far away or too high
         if height_diff > 180 or distance > 700 then goto continue end
-
-        -- Calculate player's FOV and skip if it's too high
+        
+        -- Visibility Check
         local angles = Math.PositionAngles(localPlayer:GetAbsOrigin(), player:GetAbsOrigin())
         local fov = Math.AngleFov(engine.GetViewAngles(), angles)
         if fov > settings.MaxFOV then goto continue end
 
-        -- Calculate player's health factor
         local health = player:GetHealth()
+
         local distanceFactor = Math.RemapValClamped(distance, settings.MinDistance, settings.MaxDistance, 1, 0.1)
         local healthFactor = Math.RemapValClamped(health, settings.MinHealth, settings.MaxHealth, 1, 0.5)
         local fovFactor = Math.RemapValClamped(fov, settings.MinFOV, settings.MaxFOV, 1, 0.5)
 
-        -- Calculate overall factor for player
         local factor = distanceFactor * healthFactor * fovFactor
-        targetList[i] = { player = player, factor = factor}
+        targetCount = targetCount + 1
+        targetList[targetCount] = { player = player, factor = factor }
+        
         ::continue::
     end
 
@@ -208,8 +197,8 @@ local function GetBestTarget(me)
         return a.factor > b.factor
     end)
 
-    -- Select the best target
     local bestTarget = nil
+
     for _, target in ipairs(targetList) do
         local player = target.player
         local aimPos = player:GetAbsOrigin()
@@ -219,7 +208,6 @@ local function GetBestTarget(me)
         -- Set as best target
         bestTarget = { entity = player, pos = aimPos, angles = angles, factor = target.factor }
         break
-        ::continue::
     end
 
     return bestTarget
@@ -468,13 +456,8 @@ end]]--
         end
 
 --[-----Get best target------------------]
-
-    if #players == 1 then
-        return
-    end
-
     local keybind = mKeyOverrite:GetValue()
-    --if not pLocal:InCond(17) then
+    if not pLocal:InCond(17) then
         if keybind == KEY_NONE and GetBestTarget(pLocal) ~= nil then
             -- Check if player has no key bound
             CurrentTarget = GetBestTarget(pLocal).entity
@@ -486,7 +469,7 @@ end]]--
         else
             CurrentTarget = nil
         end
-    --end
+    end
 
     -- Refill and skip code when alone
     if CurrentTarget == nil then