From 193f83fcc3e38eb590c91c55b14dd4f381aa3997 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 29 Dec 2022 11:57:18 +0100 Subject: [PATCH] #AWACS * Added option for helos --- Moose Development/Moose/Ops/Awacs.lua | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index a9fd58387..cf6dfe67f 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -112,6 +112,7 @@ do -- @field #boolean GCI Act as GCI -- @field Wrapper.Group#GROUP GCIGroup EWR group object for GCI ops -- @field #string locale Localization +-- @field #boolean IncludeHelicopters -- @extends Core.Fsm#FSM @@ -365,6 +366,7 @@ do -- testawacs.GoogleTTSPadding = 1 -- seconds -- testawacs.WindowsTTSPadding = 2.5 -- seconds -- testawacs.PikesSpecialSwitch = false -- if set to true, AWACS will omit the "doing xy knots" on the station assignement callout +-- testawacs.IncludeHelicopters = false -- if set to true, Helicopter pilots will also get the AWACS Menu and options -- -- ## 9.2 Bespoke random voices for AI CAP (Google TTS only) -- @@ -497,7 +499,7 @@ do -- @field #AWACS AWACS = { ClassName = "AWACS", -- #string - version = "0.2.50", -- #string + version = "0.2.51", -- #string lid = "", -- #string coalition = coalition.side.BLUE, -- #number coalitiontxt = "blue", -- #string @@ -584,6 +586,7 @@ AWACS = { GCI = false, GCIGroup = nil, locale = "en", + IncludeHelicopters = false, } --- @@ -914,13 +917,13 @@ AWACS.TaskStatus = { --@field #boolean FromAI ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- --- TODO-List 0.2.50 +-- TODO-List 0.2.51 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- -- DONE - WIP - Player tasking, VID -- DONE - Localization (sensible?) -- TODO - (LOW) LotATC --- TODO - SW Optimization +-- DONE - SW Optimization -- WONTDO - Maybe check in AI only when airborne -- DONE - remove SSML tag when not on google (currently sometimes spoken) -- DONE - Maybe - Assign specific number of AI CAP to a station @@ -951,6 +954,7 @@ AWACS.TaskStatus = { -- DONE - Shift Length AWACS/AI -- DONE - (WIP) Reporting -- DONE - Do not report non-airborne groups +-- DONE - Added option for helos ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Constructor @@ -5534,6 +5538,20 @@ end -- FSM Functions ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +--- [Internal] onbeforeStart +-- @param #AWACS self +-- @param #string From +-- @param #string Event +-- @param #string To +-- @return #AWACS self +function AWACS:onbeforeStart(From,Event,to) + self:T({From, Event, To}) + if self.IncludeHelicopters then + self.clientset:FilterCategories("helicopter") + end + return self +end + --- [Internal] onafterStart -- @param #AWACS self -- @param #string From