Fix various issues with the recall mechanic (FAForever#6396)

lL1l1 · Nov 16, 2024 · 8d5096b · 8d5096b
1 parent 454dfc4
commit 8d5096b
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 110 deletions.
diff --git a/lua/aibrain.lua b/lua/aibrain.lua
@@ -436,6 +436,7 @@ AIBrain = Class(FactoryManagerBrainComponent, StatManagerBrainComponent, JammerM
 
         import("/lua/simutils.lua").UpdateUnitCap(self:GetArmyIndex())
         import("/lua/simping.lua").OnArmyDefeat(self:GetArmyIndex())
+        import("/lua/sim/Recall.lua").OnArmyDefeat(self:GetArmyIndex())
 
         local function KillArmy()
             local shareOption = ScenarioInfo.Options.Share

diff --git a/lua/shared/RecallParams.lua b/lua/shared/RecallParams.lua
@@ -14,6 +14,8 @@ TeamVoteCooldown = 1 * 60 * 10
 --- ticks that the recall vote is open (30 seconds)
 VoteTime = 30 * 10
 
+---@param acceptanceVotes number
+---@param totalVotes number
 function RecallRequestAccepted(acceptanceVotes, totalVotes)
     if totalVotes <= 3 then
         return acceptanceVotes >= totalVotes