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

AWACS - limit merge calls

Browse Source
This commit is contained in:
Applevangelist 2022-06-02 17:39:39 +02:00
parent 3f918bd309
commit bd3364a3cf
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Moose Development/Moose/Ops/Awacs.lua
View File

@ -588,6 +588,7 @@ AWACS.CapVoices = {
-- @field #string EngagementTag -- @field #string EngagementTag
-- @field #boolean TACCallDone -- @field #boolean TACCallDone
-- @field #boolean MeldCallDone -- @field #boolean MeldCallDone
-- @field #boolean MergeCallDone
--- ---
-- @type AWACS.TaskDescription -- @type AWACS.TaskDescription
@ -1870,6 +1871,8 @@ function AWACS:_CheckMerges()
local pilot = _pilot -- #AWACS.ManagedGroup local pilot = _pilot -- #AWACS.ManagedGroup
if pilot.Group and pilot.Group:IsAlive() then if pilot.Group and pilot.Group:IsAlive() then
local ppos = pilot.Group:GetCoordinate() local ppos = pilot.Group:GetCoordinate()
local pcallsign = pilot.CallSign
self:I(self.lid.."Checking for "..pcallsign)
if ppos then if ppos then
self.Contacts:ForEach( self.Contacts:ForEach(
function (Contact) function (Contact)
@ -1877,9 +1880,13 @@ function AWACS:_CheckMerges()
local cpos = contact.Cluster.coordinate or contact.Contact.position or contact.Contact.group:GetCoordinate() local cpos = contact.Cluster.coordinate or contact.Contact.position or contact.Contact.group:GetCoordinate()
local dist = ppos:Get2DDistance(cpos) local dist = ppos:Get2DDistance(cpos)
local distnm = UTILS.Round(UTILS.MetersToNM(dist),0) local distnm = UTILS.Round(UTILS.MetersToNM(dist),0)
if (pilot.IsPlayer or self.debug) and distnm <= 5 then if (pilot.IsPlayer or self.debug) and distnm <= 5 and not contact.MergeCallDone then
self:I(self.lid.."Merged") local label = contact.EngagementTag or ""
self:_MergedCall(_id) if not contact.MergeCallDone or not string.find(label,pcallsign) then
self:I(self.lid.."Merged")
self:_MergedCall(_id)
contact.MergeCallDone = true
end
end end
end end
) )