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

Browse Source 
* Added airborne check for detected groups
This commit is contained in:
Applevangelist 2022-10-31 12:22:34 +01:00
parent fc77df4b5d
commit 8ee8898a78
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,7 @@ do
-- @field #AWACS -- @field #AWACS
AWACS = { AWACS = {
ClassName = "AWACS", -- #string ClassName = "AWACS", -- #string
version = "0.2.45", -- #string version = "0.2.46", -- #string
lid = "", -- #string lid = "", -- #string
coalition = coalition.side.BLUE, -- #number coalition = coalition.side.BLUE, -- #number
coalitiontxt = "blue", -- #string coalitiontxt = "blue", -- #string
@ -914,7 +914,7 @@ AWACS.TaskStatus = {
--@field #boolean FromAI --@field #boolean FromAI
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO-List 0.2.41 -- TODO-List 0.2.42
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- --
-- DONE - WIP - Player tasking, VID -- DONE - WIP - Player tasking, VID
@ -950,6 +950,7 @@ AWACS.TaskStatus = {
-- DONE - Anchor Stack Management -- DONE - Anchor Stack Management
-- DONE - Shift Length AWACS/AI -- DONE - Shift Length AWACS/AI
-- DONE - (WIP) Reporting -- DONE - (WIP) Reporting
-- DONE - Do not report non-airborne groups
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Constructor -- Constructor
@ -6232,16 +6233,20 @@ function AWACS:onafterNewCluster(From,Event,To,Cluster)
for _,_contact in pairs (table) do for _,_contact in pairs (table) do
local contact = _contact -- Ops.Intelligence#INTEL.Contact local contact = _contact -- Ops.Intelligence#INTEL.Contact
if contact and contact.group and contact.group:IsAlive() then if contact and contact.group and contact.group:IsAlive() then
return contact return contact, contact.group
end end
end end
return nil return nil
end end
local Contact = GetFirstAliveContact(ContactTable) -- Ops.Intelligence#INTEL.Contact local Contact, Group = GetFirstAliveContact(ContactTable) -- Ops.Intelligence#INTEL.Contact
if not Contact then return self end if not Contact then return self end
if Group and not Group:IsAirborne() then
return self
end
local targetset = SET_GROUP:New() local targetset = SET_GROUP:New()
-- SET for TARGET -- SET for TARGET
for _,_grp in pairs(ContactTable) do for _,_grp in pairs(ContactTable) do
@ -6316,7 +6321,7 @@ function AWACS:onafterNewContact(From,Event,To,Contact)
for _gid,_mgroup in pairs(self.ManagedGrps) do for _gid,_mgroup in pairs(self.ManagedGrps) do
local managedgroup = _mgroup -- #AWACS.ManagedGroup local managedgroup = _mgroup -- #AWACS.ManagedGroup
local group = managedgroup.Group local group = managedgroup.Group
if group and group:IsAlive() then if group and group:IsAlive() and group:IsAirborne() then
-- contact distance -- contact distance
local cpos = Contact.position or Contact.group:GetCoordinate() -- Core.Point#COORDINATE local cpos = Contact.position or Contact.group:GetCoordinate() -- Core.Point#COORDINATE
local mpos = group:GetCoordinate() local mpos = group:GetCoordinate()