weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into funkyfranky

Browse Source
This commit is contained in:
funkyfranky 2017-09-06 17:51:08 +02:00
commit 8c97861e8e
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
View File

@ -1670,7 +1670,7 @@ do -- AI_A2A_DISPATCHER
self:F({SquadronName = SquadronName})
self.DefenderSquadrons[SquadronName] = self.DefenderSquadrons[SquadronName] or {}
self.DefenderSquadrons[SquadronName].Cap = self.DefenderSquadrons[SquadronName].Cap or {}
self.DefenderSquadrons[SquadronName].Gci = self.DefenderSquadrons[SquadronName].Gci or {}
local DefenderSquadron = self:GetSquadron( SquadronName )
@ -2688,6 +2688,7 @@ do -- AI_A2A_DISPATCHER
DefenderCount = DefenderCount + DefenderGroup:GetSize()
end
self:F( { DefenderCount = DefenderCount, DefendersMissing = DefendersMissing } )
DefenderCount = DefendersMissing
local ClosestDistance = 0
@ -2696,9 +2697,13 @@ do -- AI_A2A_DISPATCHER
local BreakLoop = false
while( DefenderCount > 0 and not BreakLoop ) do
self:F( { DefenderSquadrons = self.DefenderSquadrons } )
for SquadronName, DefenderSquadron in pairs( self.DefenderSquadrons or {} ) do
self:F( { GCI = DefenderSquadron.Gci } )
for InterceptID, Intercept in pairs( DefenderSquadron.Gci or {} ) do
self:F( { DefenderSquadron } )
@ -2737,8 +2742,8 @@ do -- AI_A2A_DISPATCHER
local DefenderGrouping = DefenderSquadron.Grouping or self.DefenderDefault.Grouping
local DefendersNeeded = math.ceil( DefenderCount * DefenderOverhead )
self:F( { DefaultOverhead = self.DefenderDefault.Overhead, Overhead = DefenderOverhead } )
self:F( { DefaultGrouping = self.DefenderDefault.Grouping, Grouping = DefenderGrouping } )
self:F( { Overhead = DefenderOverhead, SquadronOverhead = DefenderSquadron.Overhead , DefaultOverhead = self.DefenderDefault.Overhead } )
self:F( { Grouping = DefenderGrouping, SquadronGrouping = DefenderSquadron.Grouping, DefaultGrouping = self.DefenderDefault.Grouping } )
self:F( { DefendersCount = DefenderCount, DefendersNeeded = DefendersNeeded } )
while ( DefendersNeeded > 0 ) do
@ -2760,9 +2765,9 @@ do -- AI_A2A_DISPATCHER
self:AddDefenderToSquadron( DefenderSquadron, DefenderGCI, DefenderGrouping )
if DefenderGCI then
DefenderCount = DefenderCount - DefenderGrouping
local Fsm = AI_A2A_GCI:New( DefenderGCI, Gci.EngageMinSpeed, Gci.EngageMaxSpeed )
Fsm:SetDispatcher( self )
Fsm:SetHomeAirbase( DefenderSquadron.Airbase )

3
Moose Development/Moose/Functional/Detection.lua
View File

@ -1152,11 +1152,12 @@ do -- DETECTION_BASE
-- @return #DETECTION_BASE
function DETECTION_BASE:SetFriendlyPrefixes( FriendlyPrefixes )
self.FriendlyPrefixes = FriendlyPrefixes or {}
self.FriendlyPrefixes = self.FriendlyPrefixes or {}
if type( FriendlyPrefixes ) ~= "table" then
FriendlyPrefixes = { FriendlyPrefixes }
end
for PrefixID, Prefix in pairs( FriendlyPrefixes ) do
self:F( { FriendlyPrefix = Prefix } )
self.FriendlyPrefixes[Prefix] = Prefix
end
return self