Kill ACUs when needed to prevent sharing

Explode -> all acus die Recall/Recall Delayed -> unsafe acus die
FAForever · Jun 12, 2024 · 173ace3 · 173ace3
1 parent 71ff6fc
commit 173ace3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/lua/SimUtils.lua b/lua/SimUtils.lua
@@ -958,6 +958,8 @@ function KillArmyOnDelayedRecall(self, shareOption, shareTime)
         for i, com in sharedCommanders do
             if com.LastTickDamaged + CommanderSafeTime > gameTick then
                 sharedCommanders[i] = nil
+                -- explode unsafe ACUs because KillArmy might not
+                com:Kill()
             end
         end
 

diff --git a/lua/aibrain.lua b/lua/aibrain.lua
@@ -989,9 +989,19 @@ AIBrain = Class(AIBrainHQComponent, AIBrainStatisticsComponent, AIBrainJammerCom
                 local safeCommanders = {}
 
                 local commanders = self:GetListOfUnits(categories.COMMAND, false)
-                for _, com in commanders do
-                    if com.LastTickDamaged + CommanderSafeTime <= GetGameTick() then
-                        table.insert(safeCommanders, com)
+                if shareAcuOption == 'Recall' then
+                    for _, com in commanders do
+                        if com.LastTickDamaged + CommanderSafeTime <= GetGameTick() then
+                            table.insert(safeCommanders, com)
+                        else
+                            -- explode unsafe ACUs because KillArmy might not
+                            com:Kill()
+                        end
+                    end
+                else
+                    -- explode all the ACUs so they don't get shared
+                    for _, com in commanders do
+                        com:Kill()
                     end
                 end