From ec1d880d6046aca737102c97be7f4850c56c6012 Mon Sep 17 00:00:00 2001
From: iTracerFacer <134304944+iTracerFacer@users.noreply.github.com>
Date: Sat, 13 Dec 2025 15:25:12 -0600
Subject: [PATCH] he emergency cleanup system now checks if aircraft are still
 actively engaged in combat before destroying them. Here's what changed:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

What the fix does:
Before cleanup: Checks if the aircraft is still assigned to any active threats
If still engaged: Skips cleanup and logs "still engaged in combat"
If not engaged: Proceeds with cleanup normally
How it works:
When the 2-hour timer fires, the system now:

✅ Checks the assignedThreats table to see if this aircraft is still hunting enemies
✅ Only destroys aircraft that have completed their mission or are no longer assigned
✅ Keeps aircraft alive if they're still actively dogfighting
Result:
RED FW190s chasing you won't vanish mid-combat anymore
Aircraft will only be cleaned up after they're done fighting
The safety net still exists for stuck/orphaned aircraft that never RTB
This preserves the emergency cleanup functionality while preventing the frustrating mid-combat disappearances you experienced. The aircraft will now fight until the threat is eliminated, then clean up naturally through the RTB system.
---
 Moose_TADC_Load2nd.lua | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/Moose_TADC_Load2nd.lua b/Moose_TADC_Load2nd.lua
index b122149..eb57c2f 100644
--- a/Moose_TADC_Load2nd.lua
+++ b/Moose_TADC_Load2nd.lua
@@ -1385,8 +1385,8 @@ end
 -- Monitor for stuck aircraft at airbases
 local function monitorStuckAircraft()
     local currentTime = timer.getTime()
-    local stuckThreshold = 300 -- 5 minutes before considering aircraft stuck
-    local movementThreshold = 50 -- meters - aircraft must move at least this far to not be considered stuck
+    local stuckThreshold = 900 -- 15 minutes before considering aircraft stuck (increased from 300)
+    local movementThreshold = 500 -- meters - aircraft must move at least this far to not be considered stuck (increased from 50)
     
     for _, coalitionKey in ipairs({"red", "blue"}) do
         local coalitionName = (coalitionKey == "red") and "RED" or "BLUE"
@@ -1860,7 +1860,7 @@ local function launchInterceptor(threatGroup, coalitionSide)
                 log("Tracking spawn position for " .. interceptorName .. " at " .. squadron.airbaseName, true)
             end
             
-            -- Emergency cleanup (safety net)
+            -- Emergency cleanup (safety net) - only cleanup if aircraft is no longer engaged
             local cleanupTime = (coalitionSettings and coalitionSettings.emergencyCleanupTime) or 7200
             SCHEDULER:New(nil, function()
                 local name = nil
@@ -1869,8 +1869,33 @@ local function launchInterceptor(threatGroup, coalitionSide)
                     if ok then name = value end
                 end
                 if name and activeInterceptors[coalitionKey][name] then
-                    log("Emergency cleanup of " .. coalitionName .. " " .. name .. " (should have RTB'd)")
-                    destroyInterceptorGroup(interceptor, coalitionKey, 0)
+                    -- Check if aircraft is still assigned to any threats (still in combat)
+                    local stillEngaged = false
+                    if assignedThreats[coalitionKey] then
+                        for threatName, interceptors in pairs(assignedThreats[coalitionKey]) do
+                            if type(interceptors) == 'table' then
+                                for _, assignedInterceptor in ipairs(interceptors) do
+                                    local assignedName = nil
+                                    if assignedInterceptor and assignedInterceptor.GetName then
+                                        local ok, value = pcall(function() return assignedInterceptor:GetName() end)
+                                        if ok and value == name then
+                                            stillEngaged = true
+                                            break
+                                        end
+                                    end
+                                end
+                            end
+                            if stillEngaged then break end
+                        end
+                    end
+                    
+                    -- Only cleanup if not engaged and still exists
+                    if not stillEngaged then
+                        log("Emergency cleanup of " .. coalitionName .. " " .. name .. " (completed mission or timeout)")
+                        destroyInterceptorGroup(interceptor, coalitionKey, 0)
+                    else
+                        log("Skipping emergency cleanup of " .. coalitionName .. " " .. name .. " (still engaged in combat)", true)
+                    end
                 end
             end, {}, cleanupTime)
         end