FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

AWACS - PlayerGuidance makes picture calls refer to asking player BRA, delete contact engagement label on checking out

Browse Source
This commit is contained in:
Applevangelist
2022-06-07 11:30:20 +02:00
parent 30dc338636
commit 01e9e83641
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -357,7 +357,7 @@ do
-- @field #AWACS -- @field #AWACS
AWACS = { AWACS = {
ClassName = "AWACS", -- #string ClassName = "AWACS", -- #string
version = "beta 0.1.27", -- #string version = "beta 0.1.28", -- #string
lid = "", -- #string lid = "", -- #string
coalition = coalition.side.BLUE, -- #number coalition = coalition.side.BLUE, -- #number
coalitiontxt = "blue", -- #string coalitiontxt = "blue", -- #string
@@ -697,7 +697,7 @@ AWACS.TaskStatus = {
--@field #boolean FromAI --@field #boolean FromAI
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO-List 0.1.27 -- TODO-List 0.1.28
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- --
-- DONE - WIP - Player tasking, VID -- DONE - WIP - Player tasking, VID
@@ -2259,15 +2259,14 @@ function AWACS:_CreatePicture(AO,Callsign,GID,MaxEntries,IsGeneral)
textScreen = contact.TargetGroupNaming.." group," textScreen = contact.TargetGroupNaming.." group,"
end end
--if IsGeneral then if IsGeneral or not self.PlayerGuidance then
refBRAA=self:_ToStringBULLS(coordinate) refBRAA=self:_ToStringBULLS(coordinate)
refBRAATTS = self:_ToStringBULLS(coordinate, false, true) refBRAATTS = self:_ToStringBULLS(coordinate, false, true)
local alt = contact.Contact.group:GetAltitude() or 8000 local alt = contact.Contact.group:GetAltitude() or 8000
alt = UTILS.Round(UTILS.MetersToFeet(alt)/1000,0) alt = UTILS.Round(UTILS.MetersToFeet(alt)/1000,0)
-- Alpha Group. Bulls eye 0 2 1, 16 miles, 25 thousand. -- Alpha Group. Bulls eye 0 2 1, 16 miles, 25 thousand.
text = text .. " "..refBRAATTS.." miles, "..alt.." thousand." -- Alpha Group. Bulls eye 0 2 1, 16 miles, 25 thousand. text = text .. " "..refBRAATTS.." miles, "..alt.." thousand." -- Alpha Group. Bulls eye 0 2 1, 16 miles, 25 thousand.
textScreen = textScreen .. " "..refBRAA.." miles, "..alt.." thousand." -- Alpha Group, Bullseye 021, 16 miles, 25 thousand, textScreen = textScreen .. " "..refBRAA.." miles, "..alt.." thousand." -- Alpha Group, Bullseye 021, 16 miles, 25 thousand,
--[[
else else
-- pilot reference -- pilot reference
refBRAA = coordinate:ToStringBRAANATO(groupcoord,true,true) refBRAA = coordinate:ToStringBRAANATO(groupcoord,true,true)
@@ -2284,7 +2283,6 @@ function AWACS:_CreatePicture(AO,Callsign,GID,MaxEntries,IsGeneral)
text = text .. " "..refBRAATTS text = text .. " "..refBRAATTS
textScreen = textScreen .." "..refBRAA textScreen = textScreen .." "..refBRAA
end end
--]]
-- Aspect -- Aspect
local aspect = "" local aspect = ""
@@ -3143,6 +3141,7 @@ function AWACS:_CheckOut(Group,GID,dead)
-- delete open tasks -- delete open tasks
if managedgroup.CurrentTask and managedgroup.CurrentTask > 0 then if managedgroup.CurrentTask and managedgroup.CurrentTask > 0 then
self.ManagedTasks:PullByID(managedgroup.CurrentTask ) self.ManagedTasks:PullByID(managedgroup.CurrentTask )
self:_UpdateContactEngagementTag(managedgroup.ContactCID,"",false,false)
end end
self.ManagedGrps[GID] = nil self.ManagedGrps[GID] = nil
self:__CheckedOut(1,GID,Stack,Angels) self:__CheckedOut(1,GID,Stack,Angels)