From f1e0bacadbdaddef40a0c46315dede79c90683ad Mon Sep 17 00:00:00 2001
From: phr0gz <phr0gz@hotmail.com>
Date: Fri, 23 Dec 2022 13:44:38 +0100
Subject: [PATCH 1/2] CAPGROUP (#1853)

Fix help typo
---
 Moose Development/Moose/Ops/Auftrag.lua | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index 52904d0ec..9f4fe0d93 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -1312,13 +1312,13 @@ function AUFTRAG:NewCAP(ZoneCAP, Altitude, Speed, Coordinate, Heading, Leg, Targ
   return mission
 end
 
---- **[AIRPANE]** Create a CAP on group mission.
+--- **[AIR]** Create a CAP mission on a group.
 -- @param #AUFTRAG self
--- @param Wrapper.Group#GROUP group.
+-- @param Wrapper.Group#GROUP Grp.
 -- @param #number Altitude Orbit altitude in feet. Default is 6,000 ft.
 -- @param #number Speed Orbit speed in knots. Default 250 KIAS.
--- @param #number Leg Length of race-track in NM. Default 14 NM.
 -- @param #number RelHeading Relative heading [0, 360) of race-track pattern in degrees wrt heading of the carrier. Default is heading of the carrier.
+-- @param #number Leg Length of race-track in NM. Default 14 NM.
 -- @param #number OffsetDist Relative distance of the first race-track point wrt to the carrier. Default 6 NM.
 -- @param #number OffsetAngle Relative angle of the first race-track point wrt. to the carrier. Default 180 (behind the boat).
 -- @param #number UpdateDistance Threshold distance in NM before orbit pattern is updated. Default 5 NM.

From 820279151869dbacaf1fe8e011f73f846b4c1496 Mon Sep 17 00:00:00 2001
From: Applevangelist <post@tniedermeier.com>
Date: Thu, 29 Dec 2022 16:33:43 +0100
Subject: [PATCH 2/2] #AWACS * Added option for helos to sign-in

#ATIS
* Make SRS say TACAN and FARP and not spell the single characters
---
 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 657d4aca6..4b682296b 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