Merge branch 'develop' into FF/OpsStuff

Added parameter to delay init group

.github/workflows/build-includes.yml

@@ -95,6 +95,10 @@ jobs:
           export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
           lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic"
 
+      - name: Run LuaSrcDiet
+        run: |
+          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
+
       #########################################################################
       # Run LuaCheck
       #########################################################################
@@ -104,10 +108,6 @@ jobs:
         run: |
           luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
 
-      - name: Run LuaSrcDiet
-        run: |
-          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
-
       #########################################################################
       # Push to MOOSE_INCLUDE
       #########################################################################

.gitignore

@@ -228,9 +228,6 @@ pip-log.txt
 #Goodsync
 _gsdata_/
 
-# PyCharm
-.idea
-
 #GITHUB
 Moose Test Missions/MOOSE_Test_Template.miz
 Moose Development/Moose/.vscode/launch.json

Moose Development/Moose/AI/AI_A2A_Dispatcher.lua

@@ -23,7 +23,7 @@
 --
 -- ## Missions:
 --
--- [AID-A2A - AI A2A Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+-- [AID-A2A - AI A2A Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching)
 --
 -- ===
 --
@@ -310,7 +310,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to set a specific Engage Radius.
   -- **The Engage Radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-019%20-%20Engage%20Range%20Test)
+  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test)
   --
   -- In this example an Engage Radius is set to various values.
   --
@@ -333,7 +333,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius.
   -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-013%20-%20Intercept%20Test)
+  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test)
   --
   -- In these examples, the Gci Radius is set to various values:
   --
@@ -366,7 +366,7 @@ do -- AI_A2A_DISPATCHER
   -- it makes it easier sometimes for the mission maker to envisage where the red and blue territories roughly are.
   -- In a hot war the borders are effectively defined by the ground based radar coverage of a coalition.
   --
-  -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-009%20-%20Border%20Test)
+  -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-009%20-%20Border%20Test)
   --
   -- In this example a border is set for the CCCP A2A dispatcher:
   --
@@ -1233,7 +1233,7 @@ do -- AI_A2A_DISPATCHER
   --
   -- **Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to modify the default Engage Radius for ALL squadrons.**
   --
-  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-019%20-%20Engage%20Range%20Test)
+  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test)
   --
   -- @param #AI_A2A_DISPATCHER self
   -- @param #number EngageRadius (Optional, Default = 100000) The radius to report friendlies near the target.
@@ -1283,7 +1283,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius.
   -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-013%20-%20Intercept%20Test)
+  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test)
   --
   -- @param #AI_A2A_DISPATCHER self
   -- @param #number GciRadius (Optional, Default = 200000) The radius to ground control intercept detected targets from the nearest airbase.
@@ -3257,8 +3257,7 @@ do -- AI_A2A_DISPATCHER
             end
           end
 
-          --- AI_A2A_Fsm:onafterHome
-          -- @param #AI_A2A_DISPATCHER self
+          --- @param #AI_A2A_DISPATCHER self
           function AI_A2A_Fsm:onafterHome( Defender, From, Event, To, Action )
             if Defender and Defender:IsAlive() then
               self:F( { "CAP Home", Defender:GetName() } )
@@ -3506,8 +3505,7 @@ do -- AI_A2A_DISPATCHER
                     Dispatcher:ClearDefenderTaskTarget( DefenderGroup )
                   end
 
-                  --- function Fsm:onafterLostControl
-                  -- @param #AI_A2A_DISPATCHER self
+                  --- @param #AI_A2A_DISPATCHER self
                   function Fsm:onafterLostControl( Defender, From, Event, To )
                     self:F( { "GCI LostControl", Defender:GetName() } )
                     self:GetParent( self ).onafterHome( self, Defender, From, Event, To )
@@ -3520,8 +3518,7 @@ do -- AI_A2A_DISPATCHER
                     end
                   end
 
-                  --- function Fsm:onafterHome
-                  -- @param #AI_A2A_DISPATCHER self
+                  --- @param #AI_A2A_DISPATCHER self
                   function Fsm:onafterHome( DefenderGroup, From, Event, To, Action )
                     self:F( { "GCI Home", DefenderGroup:GetName() } )
                     self:GetParent( self ).onafterHome( self, DefenderGroup, From, Event, To )
@@ -3962,7 +3959,7 @@ do
   --
   -- # Demo Missions
   --
-  -- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+  -- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching)
   --
   -- ===
   --

Moose Development/Moose/AI/AI_A2G_Dispatcher.lua

@@ -24,7 +24,7 @@
 -- 
 -- ## Missions:
 -- 
--- [AID-A2G - AI A2G Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2G_Dispatcher)
+-- [AID-A2G - AI A2G Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2G%20-%20AI%20A2G%20Dispatching)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_Air_Dispatcher.lua

@@ -24,7 +24,7 @@
 -- 
 -- ## Missions:
 -- 
--- [AI_A2A_Dispatcher](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+-- [AID-AIR - AI AIR Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_BAI.lua

@@ -11,7 +11,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_BAI)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/BAI%20-%20Battlefield%20Air%20Interdiction)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_Balancer.lua

@@ -9,7 +9,7 @@
 -- 
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Balancer)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AIB%20-%20AI%20Balancing)
 -- 
 -- ===
 -- 
@@ -168,8 +168,7 @@ function AI_BALANCER:ReturnToHomeAirbase( ReturnThresholdRange )
   self.ReturnThresholdRange = ReturnThresholdRange
 end
 
---- AI_BALANCER:onenterSpawning
--- @param #AI_BALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param #string ClientName
 -- @param Wrapper.Group#GROUP AIGroup
@@ -191,8 +190,7 @@ function AI_BALANCER:onenterSpawning( SetGroup, From, Event, To, ClientName )
   end
 end
 
---- AI_BALANCER:onenterDestroying
--- @param #AI_BALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_BALANCER:onenterDestroying( SetGroup, From, Event, To, ClientName, AIGroup )
@@ -235,16 +233,15 @@ function AI_BALANCER:onenterReturning( SetGroup, From, Event, To, AIGroup )
 
 end
 
---- AI_BALANCER:onenterMonitoring
--- @param #AI_BALANCER self
+
+--- @param #AI_BALANCER self
 function AI_BALANCER:onenterMonitoring( SetGroup )
 
   self:T2( { self.SetClient:Count() } )
   --self.SetClient:Flush()
 
   self.SetClient:ForEachClient(
-    --- SetClient:ForEachClient
-    -- @param Wrapper.Client#CLIENT Client
+    --- @param Wrapper.Client#CLIENT Client
     function( Client )
       self:T3(Client.ClientName)
 
@@ -267,8 +264,7 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
             self:T2( RangeZone )
             
             _DATABASE:ForEachPlayerUnit(
-              --- Nameless function
-              -- @param Wrapper.Unit#UNIT RangeTestUnit
+              --- @param Wrapper.Unit#UNIT RangeTestUnit
               function( RangeTestUnit, RangeZone, AIGroup, PlayerInRange )
                 self:T2( { PlayerInRange, RangeTestUnit.UnitName, RangeZone.ZoneName } )
                 if RangeTestUnit:IsInZone( RangeZone ) == true then
@@ -280,8 +276,7 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
                 end
               end,
               
-              --- Nameless function
-              -- @param Core.Zone#ZONE_RADIUS RangeZone
+              --- @param Core.Zone#ZONE_RADIUS RangeZone
               -- @param Wrapper.Group#GROUP AIGroup
               function( RangeZone, AIGroup, PlayerInRange )
                 if PlayerInRange.Value == false then
@@ -312,3 +307,6 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
   
   self:__Monitor( 10 )
 end
+
+
+

Moose Development/Moose/AI/AI_CAP.lua

@@ -9,7 +9,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_CAP)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAP%20-%20Combat%20Air%20Patrol)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_CAS.lua

@@ -11,7 +11,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_CAS)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAS%20-%20Close%20Air%20Support)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua

@@ -18,7 +18,7 @@
 -- 
 -- Test missions can be located on the main GITHUB site.
 -- 
--- [FlightControl-Master/MOOSE_MISSIONS/AID - AI Dispatching/AID-CGO - AI Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Cargo_Dispatcher)
+-- [FlightControl-Master/MOOSE_MISSIONS/AID - AI Dispatching/AID-CGO - AI Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/AID%20-%20AI%20Dispatching/AID-CGO%20-%20AI%20Cargo%20Dispatching)
 -- 
 -- ===
 -- 
@@ -572,7 +572,7 @@
 -- A home zone can be specified to where the Carriers will move when there isn't any cargo left for pickup.
 -- Use @{#AI_CARGO_DISPATCHER.SetHomeZone}() to specify the home zone.
 -- 
--- If no home zone is specified, the carriers will wait near the deploy zone for a new pickup command.
+-- If no home zone is specified, the carriers will wait near the deploy zone for a new pickup command.   
 -- 
 -- ===
 --   
@@ -583,12 +583,10 @@ AI_CARGO_DISPATCHER = {
   PickupCargo = {}
 }
 
---- List of AI_Cargo
--- @field #list
+--- @field #list 
 AI_CARGO_DISPATCHER.AI_Cargo = {}
 
---- List of PickupCargo
--- @field #list
+--- @field #list
 AI_CARGO_DISPATCHER.PickupCargo = {}
 
 

Moose Development/Moose/AI/AI_Escort.lua

@@ -19,7 +19,7 @@
 -- 
 -- ## Missions:
 -- 
--- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Escort)
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_Escort_Request.lua

@@ -19,7 +19,7 @@
 -- 
 -- ## Missions:
 -- 
--- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Escort)
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
 -- 
 -- ===
 -- 

Moose Development/Moose/AI/AI_Formation.lua

@@ -7,13 +7,13 @@
 --   * Assign a group leader that will guide the large formation path.
 -- 
 -- ===
---
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Formation)
--- * **YouTube videos:** [Playlist](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0bFIJ9jIdYM22uaWmIN4oz)
--- * **Guides:** None
---
+-- 
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/FOR%20-%20AI%20Group%20Formation)
+-- 
+-- ===
+-- 
+-- ### [YouTube Playlist](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0bFIJ9jIdYM22uaWmIN4oz)
+-- 
 -- ===
 -- 
 -- ### Author: **FlightControl**

Moose Development/Moose/AI/AI_Patrol.lua

@@ -16,7 +16,7 @@
 --   
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Patrol)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/PAT%20-%20Patrolling)
 -- 
 -- ===
 -- 

Moose Development/Moose/Cargo/Cargo.lua

@@ -370,7 +370,7 @@ CARGOS = {}
 
 do -- CARGO
 
-  -- @type CARGO
+  --- @type CARGO
   -- @extends Core.Fsm#FSM_PROCESS
   -- @field #string Type A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.
   -- @field #string Name A string defining the name of the cargo. The name is the unique identifier of the cargo.
@@ -433,7 +433,7 @@ do -- CARGO
     Reported = {},
   }
 
-  -- @type CARGO.CargoObjects
+  --- @type CARGO.CargoObjects
   -- @map < #string, Wrapper.Positionable#POSITIONABLE > The alive POSITIONABLE objects representing the the cargo.
 
   --- CARGO Constructor. This class is an abstract class and should not be instantiated.
@@ -447,7 +447,7 @@ do -- CARGO
   function CARGO:New( Type, Name, Weight, LoadRadius, NearRadius ) --R2.1
 
     local self = BASE:Inherit( self, FSM:New() ) -- #CARGO
-    self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+    self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
     self:SetStartState( "UnLoaded" )
     self:AddTransition( { "UnLoaded", "Boarding" }, "Board", "Boarding" )
@@ -711,7 +711,7 @@ do -- CARGO
   -- @param #CARGO self
   -- @return #CARGO
   function CARGO:Spawn( PointVec2 )
-    self:T()
+    self:F()
 
   end
 
@@ -812,7 +812,7 @@ do -- CARGO
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the CargoGroup is within the loading radius.
   function CARGO:IsInLoadRadius( Coordinate )
-    self:T( { Coordinate, LoadRadius = self.LoadRadius } )
+    self:F( { Coordinate, LoadRadius = self.LoadRadius } )
 
     local Distance = 0
     if self:IsUnLoaded() then
@@ -832,7 +832,7 @@ do -- CARGO
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo can report itself.
   function CARGO:IsInReportRadius( Coordinate )
-    self:T( { Coordinate } )
+    self:F( { Coordinate } )
 
     local Distance = 0
     if self:IsUnLoaded() then
@@ -853,23 +853,23 @@ do -- CARGO
   -- @param #number NearRadius The radius when the cargo will board the Carrier (to avoid collision).
   -- @return #boolean
   function CARGO:IsNear( Coordinate, NearRadius )
-    --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius } )
+    --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius } )
 
     if self.CargoObject:IsAlive() then
       --local Distance = PointVec2:Get2DDistance( self.CargoObject:GetPointVec2() )
-      --self:T( { CargoObjectName = self.CargoObject:GetName() } )
-      --self:T( { CargoObjectVec2 = self.CargoObject:GetVec2() } )
-      --self:T( { PointVec2 = PointVec2:GetVec2() } )
+      --self:F( { CargoObjectName = self.CargoObject:GetName() } )
+      --self:F( { CargoObjectVec2 = self.CargoObject:GetVec2() } )
+      --self:F( { PointVec2 = PointVec2:GetVec2() } )
       local Distance = Coordinate:Get2DDistance( self.CargoObject:GetCoordinate() )
-      --self:T( { Distance = Distance, NearRadius = NearRadius or "nil" }  )
+      --self:F( { Distance = Distance, NearRadius = NearRadius or "nil" }  )
 
       if Distance <= NearRadius then
-        --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = true } )
+        --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = true } )
         return true
       end
     end
 
-    --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = false } )
+    --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = false } )
     return false
   end
 
@@ -878,12 +878,12 @@ do -- CARGO
   -- @param Core.Zone#ZONE_BASE Zone
   -- @return #boolean **true** if cargo is in the Zone, **false** if cargo is not in the Zone.
   function CARGO:IsInZone( Zone )
-    --self:T( { Zone } )
+    --self:F( { Zone } )
 
     if self:IsLoaded() then
       return Zone:IsPointVec2InZone( self.CargoCarrier:GetPointVec2() )
     else
-      --self:T( { Size = self.CargoObject:GetSize(), Units = self.CargoObject:GetUnits() } )
+      --self:F( { Size = self.CargoObject:GetSize(), Units = self.CargoObject:GetUnits() } )
       if self.CargoObject:GetSize() ~= 0 then
         return Zone:IsPointVec2InZone( self.CargoObject:GetPointVec2() )
       else
@@ -1034,7 +1034,7 @@ end -- CARGO
 
 do -- CARGO_REPRESENTABLE
 
-  -- @type CARGO_REPRESENTABLE
+  --- @type CARGO_REPRESENTABLE
   -- @extends #CARGO
   -- @field test
 
@@ -1056,7 +1056,7 @@ do -- CARGO_REPRESENTABLE
 
     -- Inherit CARGO.
     local self = BASE:Inherit( self, CARGO:New( Type, Name, 0, LoadRadius, NearRadius ) ) -- #CARGO_REPRESENTABLE
-    self:T( { Type, Name, LoadRadius, NearRadius } )
+    self:F( { Type, Name, LoadRadius, NearRadius } )
 
     -- Descriptors.
     local Desc=CargoObject:GetDesc()
@@ -1086,7 +1086,7 @@ do -- CARGO_REPRESENTABLE
   function CARGO_REPRESENTABLE:Destroy()
 
     -- Cargo objects are deleted from the _DATABASE and SET_CARGO objects.
-    self:T( { CargoName = self:GetName() } )
+    self:F( { CargoName = self:GetName() } )
     --_EVENTDISPATCHER:CreateEventDeleteCargo( self )
 
     return self
@@ -1123,12 +1123,12 @@ do -- CARGO_REPRESENTABLE
     CoordinateZone:Scan( { Object.Category.UNIT } )
     for _, DCSUnit in pairs( CoordinateZone:GetScannedUnits() ) do
       local NearUnit = UNIT:Find( DCSUnit )
-      self:T({NearUnit=NearUnit})
+      self:F({NearUnit=NearUnit})
       local NearUnitCoalition = NearUnit:GetCoalition()
       local CargoCoalition = self:GetCoalition()
       if NearUnitCoalition == CargoCoalition then
         local Attributes = NearUnit:GetDesc()
-        self:T({Desc=Attributes})
+        self:F({Desc=Attributes})
         if NearUnit:HasAttribute( "Trucks" ) then
           MESSAGE:New( Message, 20, NearUnit:GetCallsign() .. " reporting - Cargo " .. self:GetName() ):ToGroup( TaskGroup )
           break
@@ -1142,7 +1142,7 @@ end -- CARGO_REPRESENTABLE
 
 do -- CARGO_REPORTABLE
 
-    -- @type CARGO_REPORTABLE
+    --- @type CARGO_REPORTABLE
     -- @extends #CARGO
     CARGO_REPORTABLE = {
       ClassName = "CARGO_REPORTABLE"
@@ -1158,7 +1158,7 @@ do -- CARGO_REPORTABLE
   -- @return #CARGO_REPORTABLE
   function CARGO_REPORTABLE:New( Type, Name, Weight, LoadRadius, NearRadius )
     local self = BASE:Inherit( self, CARGO:New( Type, Name, Weight, LoadRadius, NearRadius ) ) -- #CARGO_REPORTABLE
-    self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+    self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
     return self
   end
@@ -1178,7 +1178,7 @@ end
 
 do -- CARGO_PACKAGE
 
-  -- @type CARGO_PACKAGE
+  --- @type CARGO_PACKAGE
   -- @extends #CARGO_REPRESENTABLE
   CARGO_PACKAGE = {
     ClassName = "CARGO_PACKAGE"
@@ -1195,7 +1195,7 @@ do -- CARGO_PACKAGE
 -- @return #CARGO_PACKAGE
 function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, LoadRadius, NearRadius )
   local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, LoadRadius, NearRadius ) ) -- #CARGO_PACKAGE
-  self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+  self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
   self:T( CargoCarrier )
   self.CargoCarrier = CargoCarrier
@@ -1213,7 +1213,7 @@ end
 -- @param #number BoardDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterOnBoard( From, Event, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
 
@@ -1246,7 +1246,7 @@ end
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @return #boolean
 function CARGO_PACKAGE:IsNear( CargoCarrier )
-  self:T()
+  self:F()
 
   local CargoCarrierPoint = CargoCarrier:GetCoordinate()
 
@@ -1271,7 +1271,7 @@ end
 -- @param #number LoadDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterOnBoarded( From, Event, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   if self:IsNear( CargoCarrier ) then
     self:__Load( 1, CargoCarrier, Speed, LoadDistance, Angle )
@@ -1292,7 +1292,7 @@ end
 -- @param #number Radius
 -- @param #number Angle
 function CARGO_PACKAGE:onafterUnBoard( From, Event, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
-  self:T()
+  self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
 
@@ -1331,7 +1331,7 @@ end
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #number Speed
 function CARGO_PACKAGE:onafterUnBoarded( From, Event, To, CargoCarrier, Speed )
-  self:T()
+  self:F()
 
   if self:IsNear( CargoCarrier ) then
     self:__UnLoad( 1, CargoCarrier, Speed )
@@ -1350,7 +1350,7 @@ end
 -- @param #number LoadDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterLoad( From, Event, To, CargoCarrier, Speed, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   self.CargoCarrier = CargoCarrier
 
@@ -1378,7 +1378,7 @@ end
 -- @param #number Distance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterUnLoad( From, Event, To, CargoCarrier, Speed, Distance, Angle )
-  self:T()
+  self:F()
 
   local StartPointVec2 = self.CargoCarrier:GetPointVec2()
   local CargoCarrierHeading = self.CargoCarrier:GetHeading() -- Get Heading of object in degrees.

Moose Development/Moose/Cargo/CargoCrate.lua

@@ -59,7 +59,7 @@ do -- CARGO_CRATE
   -- @return #CARGO_CRATE
   function CARGO_CRATE:New( CargoStatic, Type, Name, LoadRadius, NearRadius )
     local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoStatic, Type, Name, nil, LoadRadius, NearRadius ) ) -- #CARGO_CRATE
-    self:T( { Type, Name, NearRadius } )
+    self:F( { Type, Name, NearRadius } )
   
     self.CargoObject = CargoStatic -- Wrapper.Static#STATIC
  
@@ -116,7 +116,7 @@ do -- CARGO_CRATE
   -- @param #string To
   -- @param Core.Point#POINT_VEC2
   function CARGO_CRATE:onenterUnLoaded( From, Event, To, ToPointVec2 )
-    --self:T( { ToPointVec2, From, Event, To } )
+    --self:F( { ToPointVec2, From, Event, To } )
   
     local Angle = 180
     local Speed = 10
@@ -153,7 +153,7 @@ do -- CARGO_CRATE
   -- @param #string To
   -- @param Wrapper.Unit#UNIT CargoCarrier
   function CARGO_CRATE:onenterLoaded( From, Event, To, CargoCarrier )
-    --self:T( { From, Event, To, CargoCarrier } )
+    --self:F( { From, Event, To, CargoCarrier } )
   
     self.CargoCarrier = CargoCarrier
     
@@ -190,7 +190,7 @@ do -- CARGO_CRATE
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo Crate is within the report radius.
   function CARGO_CRATE:IsInReportRadius( Coordinate )
-    --self:T( { Coordinate, LoadRadius = self.LoadRadius } )
+    --self:F( { Coordinate, LoadRadius = self.LoadRadius } )
   
     local Distance = 0
     if self:IsUnLoaded() then
@@ -210,7 +210,7 @@ do -- CARGO_CRATE
   -- @param Core.Point#Coordinate Coordinate
   -- @return #boolean true if the Cargo Crate is within the loading radius.
   function CARGO_CRATE:IsInLoadRadius( Coordinate )
-    --self:T( { Coordinate, LoadRadius = self.NearRadius } )
+    --self:F( { Coordinate, LoadRadius = self.NearRadius } )
   
     local Distance = 0
     if self:IsUnLoaded() then
@@ -231,7 +231,7 @@ do -- CARGO_CRATE
   -- @return Core.Point#COORDINATE The current Coordinate of the first Cargo of the CargoGroup.
   -- @return #nil There is no valid Cargo in the CargoGroup.
   function CARGO_CRATE:GetCoordinate()
-    --self:T()
+    --self:F()
     
     return self.CargoObject:GetCoordinate()
   end
@@ -261,7 +261,7 @@ do -- CARGO_CRATE
   -- @param #CARGO_CRATE self
   -- @param Core.Point#COORDINATE Coordinate
   function CARGO_CRATE:RouteTo( Coordinate )
-    self:T( {Coordinate = Coordinate } )
+    self:F( {Coordinate = Coordinate } )
     
   end
 
@@ -274,7 +274,7 @@ do -- CARGO_CRATE
   -- @return #boolean The Cargo is near to the Carrier.
   -- @return #nil The Cargo is not near to the Carrier.
   function CARGO_CRATE:IsNear( CargoCarrier, NearRadius )
-    self:T( {NearRadius = NearRadius } )
+    self:F( {NearRadius = NearRadius } )
     
     return self:IsNear( CargoCarrier:GetCoordinate(), NearRadius )
   end
@@ -283,7 +283,7 @@ do -- CARGO_CRATE
   -- @param #CARGO_CRATE self
   function CARGO_CRATE:Respawn()
 
-    self:T( { "Respawning crate " .. self:GetName() } )
+    self:F( { "Respawning crate " .. self:GetName() } )
 
 
     -- Respawn the group...
@@ -300,7 +300,7 @@ do -- CARGO_CRATE
   -- @param #CARGO_CRATE self
   function CARGO_CRATE:onafterReset()
 
-    self:T( { "Reset crate " .. self:GetName() } )
+    self:F( { "Reset crate " .. self:GetName() } )
 
 
     -- Respawn the group...

Moose Development/Moose/Cargo/CargoGroup.lua

@@ -64,7 +64,7 @@ do -- CARGO_GROUP
   
     -- Inherit CAROG_REPORTABLE
     local self = BASE:Inherit( self, CARGO_REPORTABLE:New( Type, Name, 0, LoadRadius, NearRadius ) ) -- #CARGO_GROUP
-    self:T( { Type, Name, LoadRadius } )
+    self:F( { Type, Name, LoadRadius } )
   
     self.CargoSet = SET_CARGO:New()
     self.CargoGroup = CargoGroup
@@ -146,7 +146,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   function CARGO_GROUP:Respawn()
 
-    self:T( { "Respawning" } )
+    self:F( { "Respawning" } )
 
     for CargoID, CargoData in pairs( self.CargoSet:GetSet() ) do
       local Cargo = CargoData -- Cargo.Cargo#CARGO
@@ -227,7 +227,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   function CARGO_GROUP:Regroup()
   
-    self:T("Regroup")
+    self:F("Regroup")
 
     if self.Grouped == false then
     
@@ -241,7 +241,7 @@ do -- CARGO_GROUP
       for CargoUnitName, CargoUnit in pairs( self.CargoSet:GetSet() ) do
         local CargoUnit = CargoUnit -- Cargo.CargoUnit#CARGO_UNIT
 
-        self:T( { CargoUnit:GetName(), UnLoaded = CargoUnit:IsUnLoaded() } )
+        self:F( { CargoUnit:GetName(), UnLoaded = CargoUnit:IsUnLoaded() } )
 
         if CargoUnit:IsUnLoaded() then
     
@@ -258,7 +258,7 @@ do -- CARGO_GROUP
       -- Then we register the new group in the database
       self.CargoGroup = GROUP:NewTemplate( GroupTemplate, GroupTemplate.CoalitionID, GroupTemplate.CategoryID, GroupTemplate.CountryID )
 
-      self:T( { "Regroup", GroupTemplate } )
+      self:F( { "Regroup", GroupTemplate } )
         
       -- Now we spawn the new group based on the template created.
       self.CargoObject = _DATABASE:Spawn( GroupTemplate )
@@ -271,7 +271,7 @@ do -- CARGO_GROUP
   -- @param Core.Event#EVENTDATA EventData 
   function CARGO_GROUP:OnEventCargoDead( EventData )
   
-    self:T(EventData)
+    self:E(EventData)
 
     local Destroyed = false
   
@@ -296,7 +296,7 @@ do -- CARGO_GROUP
     
     if Destroyed then
       self:Destroyed()
-      self:T( { "Cargo group destroyed" } )
+      self:E( { "Cargo group destroyed" } )
     end
   
   end
@@ -309,14 +309,14 @@ do -- CARGO_GROUP
   -- @param Wrapper.Unit#UNIT CargoCarrier
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterBoard( From, Event, To, CargoCarrier, NearRadius, ... )
-    self:T( { CargoCarrier.UnitName, From, Event, To, NearRadius = NearRadius } )
+    self:F( { CargoCarrier.UnitName, From, Event, To, NearRadius = NearRadius } )
     
     NearRadius = NearRadius or self.NearRadius
     
     -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo, ... )
-        self:T( { "Board Unit", Cargo:GetName( ), Cargo:IsDestroyed(), Cargo.CargoObject:IsAlive() } )
+        self:F( { "Board Unit", Cargo:GetName( ), Cargo:IsDestroyed(), Cargo.CargoObject:IsAlive() } )
         local CargoGroup = Cargo.CargoObject --Wrapper.Group#GROUP
         CargoGroup:OptionAlarmStateGreen()
         Cargo:__Board( 1, CargoCarrier, NearRadius, ... )
@@ -334,7 +334,7 @@ do -- CARGO_GROUP
   -- @param #string To
   -- @param Wrapper.Unit#UNIT CargoCarrier
   function CARGO_GROUP:onafterLoad( From, Event, To, CargoCarrier, ... )
-    --self:T( { From, Event, To, CargoCarrier, ...} )
+    --self:F( { From, Event, To, CargoCarrier, ...} )
     
     if From == "UnLoaded" then
       -- For each Cargo object within the CARGO_GROUP, load each cargo to the CargoCarrier.
@@ -359,7 +359,7 @@ do -- CARGO_GROUP
   -- @param Wrapper.Unit#UNIT CargoCarrier
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterBoarding( From, Event, To, CargoCarrier, NearRadius, ... )
-    --self:T( { CargoCarrier.UnitName, From, Event, To } )
+    --self:F( { CargoCarrier.UnitName, From, Event, To } )
   
     local Boarded = true
     local Cancelled = false
@@ -393,7 +393,7 @@ do -- CARGO_GROUP
         if not Boarded then
           self:__Boarding( -5, CargoCarrier, NearRadius, ... )
         else
-          self:T("Group Cargo is loaded")
+          self:F("Group Cargo is loaded")
           self:__Load( 1, CargoCarrier, ... )
         end
       else
@@ -413,7 +413,7 @@ do -- CARGO_GROUP
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterUnBoard( From, Event, To, ToPointVec2, NearRadius, ... )
-    self:T( {From, Event, To, ToPointVec2, NearRadius } )
+    self:F( {From, Event, To, ToPointVec2, NearRadius } )
   
     NearRadius = NearRadius or 25
   
@@ -456,7 +456,7 @@ do -- CARGO_GROUP
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterUnBoarding( From, Event, To, ToPointVec2, NearRadius, ... )
-    --self:T( { From, Event, To, ToPointVec2, NearRadius } )
+    --self:F( { From, Event, To, ToPointVec2, NearRadius } )
   
     --local NearRadius = NearRadius or 25
   
@@ -493,7 +493,7 @@ do -- CARGO_GROUP
   -- @param #string To
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   function CARGO_GROUP:onafterUnLoad( From, Event, To, ToPointVec2, ... )
-    --self:T( { From, Event, To, ToPointVec2 } )
+    --self:F( { From, Event, To, ToPointVec2 } )
   
     if From == "Loaded" then
       
@@ -611,7 +611,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   -- @param Core.Point#COORDINATE Coordinate
   function CARGO_GROUP:RouteTo( Coordinate )
-    --self:T( {Coordinate = Coordinate } )
+    --self:F( {Coordinate = Coordinate } )
     
     -- For each Cargo within the CargoSet, route each object to the Coordinate
     self.CargoSet:ForEach(
@@ -629,13 +629,13 @@ do -- CARGO_GROUP
   -- @param #number NearRadius
   -- @return #boolean The Cargo is near to the Carrier or #nil if the Cargo is not near to the Carrier.
   function CARGO_GROUP:IsNear( CargoCarrier, NearRadius )
-    self:T( {NearRadius = NearRadius } )
+    self:F( {NearRadius = NearRadius } )
     
     for _, Cargo in pairs( self.CargoSet:GetSet() ) do
       local Cargo = Cargo -- Cargo.Cargo#CARGO
       if Cargo:IsAlive() then
         if Cargo:IsNear( CargoCarrier:GetCoordinate(), NearRadius ) then
-          self:T( "Near" )
+          self:F( "Near" )
           return true
         end
       end
@@ -649,7 +649,7 @@ do -- CARGO_GROUP
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo Group is within the load radius.
   function CARGO_GROUP:IsInLoadRadius( Coordinate )
-    --self:T( { Coordinate } )
+    --self:F( { Coordinate } )
   
     local Cargo = self:GetFirstAlive() -- Cargo.Cargo#CARGO
 
@@ -669,7 +669,7 @@ do -- CARGO_GROUP
         return false
       end
       
-      self:T( { Distance = Distance, LoadRadius = self.LoadRadius } )
+      self:F( { Distance = Distance, LoadRadius = self.LoadRadius } )
       if Distance <= self.LoadRadius then
         return true
       else
@@ -687,12 +687,12 @@ do -- CARGO_GROUP
   -- @param Core.Point#Coordinate Coordinate
   -- @return #boolean true if the Cargo Group is within the report radius.
   function CARGO_GROUP:IsInReportRadius( Coordinate )
-    --self:T( { Coordinate } )
+    --self:F( { Coordinate } )
   
     local Cargo = self:GetFirstAlive() -- Cargo.Cargo#CARGO
 
     if Cargo then
-      self:T( { Cargo } )
+      self:F( { Cargo } )
       local Distance = 0
       if Cargo:IsUnLoaded() then
         Distance = Coordinate:Get2DDistance( Cargo.CargoObject:GetCoordinate() )
@@ -738,7 +738,7 @@ do -- CARGO_GROUP
   -- @return #boolean **true** if the first element of the CargoGroup is in the Zone
   -- @return #boolean **false** if there is no element of the CargoGroup in the Zone.
   function CARGO_GROUP:IsInZone( Zone )
-    --self:T( { Zone } )
+    --self:F( { Zone } )
   
     local Cargo = self.CargoSet:GetFirst() -- Cargo.Cargo#CARGO
 

Moose Development/Moose/Cargo/CargoSlingload.lua

@@ -52,7 +52,7 @@ do -- CARGO_SLINGLOAD
   -- @return #CARGO_SLINGLOAD
   function CARGO_SLINGLOAD:New( CargoStatic, Type, Name, LoadRadius, NearRadius )
     local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoStatic, Type, Name, nil, LoadRadius, NearRadius ) ) -- #CARGO_SLINGLOAD
-    self:T( { Type, Name, NearRadius } )
+    self:F( { Type, Name, NearRadius } )
   
     self.CargoObject = CargoStatic
   
@@ -130,7 +130,7 @@ do -- CARGO_SLINGLOAD
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo Crate is within the report radius.
   function CARGO_SLINGLOAD:IsInReportRadius( Coordinate )
-    --self:T( { Coordinate, LoadRadius = self.LoadRadius } )
+    --self:F( { Coordinate, LoadRadius = self.LoadRadius } )
   
     local Distance = 0
     if self:IsUnLoaded() then
@@ -149,7 +149,7 @@ do -- CARGO_SLINGLOAD
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo Slingload is within the loading radius.
   function CARGO_SLINGLOAD:IsInLoadRadius( Coordinate )
-    --self:T( { Coordinate } )
+    --self:F( { Coordinate } )
   
     local Distance = 0
     if self:IsUnLoaded() then
@@ -169,7 +169,7 @@ do -- CARGO_SLINGLOAD
   -- @return Core.Point#COORDINATE The current Coordinate of the first Cargo of the CargoGroup.
   -- @return #nil There is no valid Cargo in the CargoGroup.
   function CARGO_SLINGLOAD:GetCoordinate()
-    --self:T()
+    --self:F()
     
     return self.CargoObject:GetCoordinate()
   end
@@ -199,7 +199,7 @@ do -- CARGO_SLINGLOAD
   -- @param #CARGO_SLINGLOAD self
   -- @param Core.Point#COORDINATE Coordinate
   function CARGO_SLINGLOAD:RouteTo( Coordinate )
-    --self:T( {Coordinate = Coordinate } )
+    --self:F( {Coordinate = Coordinate } )
     
   end
 
@@ -212,7 +212,7 @@ do -- CARGO_SLINGLOAD
   -- @return #boolean The Cargo is near to the Carrier.
   -- @return #nil The Cargo is not near to the Carrier.
   function CARGO_SLINGLOAD:IsNear( CargoCarrier, NearRadius )
-    --self:T( {NearRadius = NearRadius } )
+    --self:F( {NearRadius = NearRadius } )
     
     return self:IsNear( CargoCarrier:GetCoordinate(), NearRadius )
   end
@@ -222,7 +222,7 @@ do -- CARGO_SLINGLOAD
   -- @param #CARGO_SLINGLOAD self
   function CARGO_SLINGLOAD:Respawn()
 
-    --self:T( { "Respawning slingload " .. self:GetName() } )
+    --self:F( { "Respawning slingload " .. self:GetName() } )
 
 
     -- Respawn the group...
@@ -239,7 +239,7 @@ do -- CARGO_SLINGLOAD
   -- @param #CARGO_SLINGLOAD self
   function CARGO_SLINGLOAD:onafterReset()
 
-    --self:T( { "Reset slingload " .. self:GetName() } )
+    --self:F( { "Reset slingload " .. self:GetName() } )
 
 
     -- Respawn the group...

Moose Development/Moose/Cargo/CargoUnit.lua

@@ -75,7 +75,7 @@ do -- CARGO_UNIT
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius (optional) Defaut 25 m.
   function CARGO_UNIT:onenterUnBoarding( From, Event, To, ToPointVec2, NearRadius )
-    self:T( { From, Event, To, ToPointVec2, NearRadius } )
+    self:F( { From, Event, To, ToPointVec2, NearRadius } )
   
     local Angle = 180
     local Speed = 60
@@ -114,7 +114,7 @@ do -- CARGO_UNIT
             else
               self.CargoObject:ReSpawnAt( FromPointVec2, CargoDeployHeading )
             end
-            self:T( { "CargoUnits:", self.CargoObject:GetGroup():GetName() } )
+            self:F( { "CargoUnits:", self.CargoObject:GetGroup():GetName() } )
             self.CargoCarrier = nil
       
             local Points = {}
@@ -148,7 +148,7 @@ do -- CARGO_UNIT
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius (optional) Defaut 100 m.
   function CARGO_UNIT:onleaveUnBoarding( From, Event, To, ToPointVec2, NearRadius )
-    self:T( { From, Event, To, ToPointVec2, NearRadius } )
+    self:F( { From, Event, To, ToPointVec2, NearRadius } )
   
     local Angle = 180
     local Speed = 10
@@ -174,7 +174,7 @@ do -- CARGO_UNIT
   -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius (optional) Defaut 100 m.
   function CARGO_UNIT:onafterUnBoarding( From, Event, To, ToPointVec2, NearRadius )
-    self:T( { From, Event, To, ToPointVec2, NearRadius } )
+    self:F( { From, Event, To, ToPointVec2, NearRadius } )
   
     self.CargoInAir = self.CargoObject:InAir()
   
@@ -199,7 +199,7 @@ do -- CARGO_UNIT
   -- @param #string To
   -- @param Core.Point#POINT_VEC2
   function CARGO_UNIT:onenterUnLoaded( From, Event, To, ToPointVec2 )
-    self:T( { ToPointVec2, From, Event, To } )
+    self:F( { ToPointVec2, From, Event, To } )
   
     local Angle = 180
     local Speed = 10
@@ -236,7 +236,7 @@ do -- CARGO_UNIT
   -- @param Wrapper.Group#GROUP CargoCarrier
   -- @param #number NearRadius
   function CARGO_UNIT:onafterBoard( From, Event, To, CargoCarrier, NearRadius, ... )
-    self:T( { From, Event, To, CargoCarrier, NearRadius = NearRadius } )
+    self:F( { From, Event, To, CargoCarrier, NearRadius = NearRadius } )
   
     self.CargoInAir = self.CargoObject:InAir()
     
@@ -244,7 +244,7 @@ do -- CARGO_UNIT
     local MaxSpeed = Desc.speedMaxOffRoad
     local TypeName = Desc.typeName
     
-    --self:T({Unit=self.CargoObject:GetName()})
+    --self:F({Unit=self.CargoObject:GetName()})
     
     -- A cargo unit can only be boarded if it is not dead
     
@@ -298,9 +298,9 @@ do -- CARGO_UNIT
   -- @param Wrapper.Client#CLIENT CargoCarrier
   -- @param #number NearRadius Default 25 m.
   function CARGO_UNIT:onafterBoarding( From, Event, To, CargoCarrier, NearRadius, ... )
-    self:T( { From, Event, To, CargoCarrier:GetName(), NearRadius = NearRadius } )
+    self:F( { From, Event, To, CargoCarrier:GetName(), NearRadius = NearRadius } )
     
-    self:T( { IsAlive=self.CargoObject:IsAlive() }  )
+    self:F( { IsAlive=self.CargoObject:IsAlive() }  )
     
       if CargoCarrier and CargoCarrier:IsAlive() then -- and self.CargoObject and self.CargoObject:IsAlive() then 
         if (CargoCarrier:IsAir() and not CargoCarrier:InAir()) or true then
@@ -321,7 +321,7 @@ do -- CARGO_UNIT
               local Angle = 180
               local Distance = 0
               
-              --self:T({Unit=self.CargoObject:GetName()})
+              --self:F({Unit=self.CargoObject:GetName()})
   
               local CargoCarrierPointVec2 = CargoCarrier:GetPointVec2()
               local CargoCarrierHeading = CargoCarrier:GetHeading() -- Get Heading of object in degrees.
@@ -348,7 +348,7 @@ do -- CARGO_UNIT
           self.CargoObject:SetCommand( self.CargoObject:CommandStopRoute( true ) )
         end
     else
-      self:T("Something is wrong")
+      self:E("Something is wrong")
     end
     
   end
@@ -361,11 +361,11 @@ do -- CARGO_UNIT
   -- @param #string To
   -- @param Wrapper.Unit#UNIT CargoCarrier
   function CARGO_UNIT:onenterLoaded( From, Event, To, CargoCarrier )
-    self:T( { From, Event, To, CargoCarrier } )
+    self:F( { From, Event, To, CargoCarrier } )
   
     self.CargoCarrier = CargoCarrier
     
-    --self:T({Unit=self.CargoObject:GetName()})
+    --self:F({Unit=self.CargoObject:GetName()})
     
     -- Only destroy the CargoObject if there is a CargoObject (packages don't have CargoObjects).
     if self.CargoObject then

Moose Development/Moose/Core/Database.lua

@@ -449,10 +449,10 @@ do -- Zones and Pathlines
 
       -- Loop over layers.
       for layerID, layerData in pairs(env.mission.drawings.layers or {}) do
-        
+
         -- Loop over objects in layers.
         for objectID, objectData in pairs(layerData.objects or {}) do
-          
+
           -- Check for polygon which has at least 4 points (we would need 3 but the origin seems to be there twice)
           if objectData.polygonMode and (objectData.polygonMode=="free") and objectData.points and #objectData.points>=4 then
 
@@ -488,32 +488,10 @@ do -- Zones and Pathlines
 
             -- Create new polygon zone.
             local Zone=ZONE_POLYGON:NewFromPointsArray(ZoneName, points)
-            
-            --Zone.DrawID = objectID
-            
+
             -- Set color.
             Zone:SetColor({1, 0, 0}, 0.15)
-            Zone:SetFillColor({1, 0, 0}, 0.15)
-            
-            if objectData.colorString then 
-              -- eg colorString = 0xff0000ff
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetColor({r, g, b}, a)
-            end
-            if objectData.fillColorString then 
-              -- eg fillColorString = 0xff00004b
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetFillColor({r, g, b}, a)
-            end
-            
+
             -- Store in DB.
             self.ZONENAMES[ZoneName] = ZoneName
 
@@ -554,26 +532,7 @@ do -- Zones and Pathlines
 
             -- Set color.
             Zone:SetColor({1, 0, 0}, 0.15)
-            
-           if objectData.colorString then 
-              -- eg colorString = 0xff0000ff
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetColor({r, g, b}, a)
-            end
-            if objectData.fillColorString then 
-              -- eg fillColorString = 0xff00004b
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetFillColor({r, g, b}, a)
-            end
-            
+
             -- Store in DB.
             self.ZONENAMES[ZoneName] = ZoneName
 
@@ -797,7 +756,7 @@ end -- cargo
 
 --- Finds a CLIENT based on the ClientName.
 -- @param #DATABASE self
--- @param #string ClientName - Note this is the UNIT name of the client!
+-- @param #string ClientName
 -- @return Wrapper.Client#CLIENT The found CLIENT.
 function DATABASE:FindClient( ClientName )
 
@@ -1343,17 +1302,9 @@ function DATABASE:_RegisterAirbase(airbase)
 
     -- Unique ID.
     local airbaseUID=airbase:GetID(true)
-    
-    local typename = airbase:GetTypeName()
-    
-    local category = airbase.category
-    
-    if category == Airbase.Category.SHIP and typename == "FARP_SINGLE_01" then
-      category = Airbase.Category.HELIPAD
-    end
-    
+
     -- Debug output.
-    local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [", AIRBASE.CategoryName[category], tostring(DCSAirbaseName), airbaseUID, #airbase.runways, airbase.NparkingTotal)
+    local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [", AIRBASE.CategoryName[airbase.category], tostring(DCSAirbaseName), airbaseUID, #airbase.runways, airbase.NparkingTotal)
     for _,terminalType in pairs(AIRBASE.TerminalType) do
       if airbase.NparkingTerminal and airbase.NparkingTerminal[terminalType] then
         text=text..string.format("%d=%d ", terminalType, airbase.NparkingTerminal[terminalType])
@@ -1901,7 +1852,7 @@ end
 
 --- Add a flight control to the data base.
 -- @param #DATABASE self
--- @param OPS.FlightControl#FLIGHTCONTROL flightcontrol
+-- @param Ops.FlightControl#FLIGHTCONTROL flightcontrol
 function DATABASE:AddFlightControl(flightcontrol)
   self:F2( { flightcontrol } )
   self.FLIGHTCONTROLS[flightcontrol.airbasename]=flightcontrol
@@ -1910,7 +1861,7 @@ end
 --- Get a flight control object from the data base.
 -- @param #DATABASE self
 -- @param #string airbasename Name of the associated airbase.
--- @return OPS.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.s
+-- @return Ops.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.s
 function DATABASE:GetFlightControl(airbasename)
   return self.FLIGHTCONTROLS[airbasename]
 end

Moose Development/Moose/Core/Fsm.lua

@@ -249,7 +249,7 @@ do -- FSM
   --
   -- ### Linear Transition Example
   --
-  -- This example is fully implemented in the MOOSE test mission on GitHub: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Core/FSM/FSM-100%20-%20Transition%20Explanation)
+  -- This example is fully implemented in the MOOSE test mission on GITHUB: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/blob/master/FSM%20-%20Finite%20State%20Machine/FSM-100%20-%20Transition%20Explanation/FSM-100%20-%20Transition%20Explanation.lua)
   --
   -- It models a unit standing still near Batumi, and flaring every 5 seconds while switching between a Green flare and a Red flare.
   -- The purpose of this example is not to show how exciting flaring is, but it demonstrates how a Linear Transition FSM can be build.

Moose Development/Moose/Core/Message.lua

@@ -368,7 +368,7 @@ function MESSAGE:ToCoalition( CoalitionSide, Settings )
   if CoalitionSide then
     if self.MessageDuration ~= 0 then
       self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
-      trigger.action.outTextForCoalition( CoalitionSide, self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
+      trigger.action.outTextForCoalition( CoalitionSide, self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
     end
   end
   
@@ -459,14 +459,14 @@ end
 
 _MESSAGESRS = {}
 
---- Set up MESSAGE generally to allow Text-To-Speech via SRS and TTS functions. `SetMSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
--- @param #string PathToSRS (optional) Path to SRS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone" or your configuration file setting.
--- @param #number Port Port (optional) number of SRS, defaults to 5002 or your configuration file setting.
--- @param #string PathToCredentials (optional) Path to credentials file for Google.
+--- Set up MESSAGE generally to allow Text-To-Speech via SRS and TTS functions.
+-- @param #string PathToSRS Path to SRS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone".
+-- @param #number Port Port number of SRS, defaults to 5002.
+-- @param #string PathToCredentials (optional) Path to credentials file for e.g. Google.
 -- @param #number Frequency Frequency in MHz. Can also be given as a #table of frequencies.
 -- @param #number Modulation Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations.
--- @param #string Gender (optional) Gender, i.e. "male" or "female", defaults to "female" or your configuration file setting.
--- @param #string Culture (optional) Culture, e.g. "en-US", defaults to "en-GB" or your configuration file setting.
+-- @param #string Gender (optional) Gender, i.e. "male" or "female", defaults to "female".
+-- @param #string Culture (optional) Culture, e.g. "en-US", defaults to "en-GB"
 -- @param #string Voice (optional) Voice. Will override gender and culture settings, e.g. MSRS.Voices.Microsoft.Hazel or MSRS.Voices.Google.Standard.de_DE_Standard_D. Hint on Microsoft voices - working voices are limited to Hedda, Hazel, David, Zira and Hortense. **Must** be installed on your Desktop or Server!
 -- @param #number Coalition (optional) Coalition, can be coalition.side.RED, coalition.side.BLUE or coalition.side.NEUTRAL. Defaults to coalition.side.NEUTRAL.
 -- @param #number Volume (optional) Volume, can be between 0.0 and 1.0 (loudest).
@@ -480,51 +480,45 @@ _MESSAGESRS = {}
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
 --          
 function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate)
+  _MESSAGESRS.MSRS = MSRS:New(PathToSRS,Frequency or 243,Modulation or radio.modulation.AM,Volume)
   
-  _MESSAGESRS.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  _MESSAGESRS.frequency = Frequency
+  _MESSAGESRS.modulation = Modulation or radio.modulation.AM
   
-  _MESSAGESRS.frequency = Frequency or MSRS.frequencies or 243
-  _MESSAGESRS.modulation = Modulation or MSRS.modulations or radio.modulation.AM
+  _MESSAGESRS.MSRS:SetCoalition(Coalition or coalition.side.NEUTRAL)
+  _MESSAGESRS.coalition = Coalition or coalition.side.NEUTRAL
   
-  _MESSAGESRS.MSRS = MSRS:New(_MESSAGESRS.PathToSRS,_MESSAGESRS.frequency, _MESSAGESRS.modulation)
-
-  _MESSAGESRS.coalition = Coalition or MSRS.coalition or coalition.side.NEUTRAL    
-  _MESSAGESRS.MSRS:SetCoalition(_MESSAGESRS.coalition)
-
   _MESSAGESRS.coordinate = Coordinate
+  _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
   
-  if Coordinate then
-    _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
-  end
-  
-  _MESSAGESRS.Culture = Culture or MSRS.culture or "en-GB"
   _MESSAGESRS.MSRS:SetCulture(Culture)
+  _MESSAGESRS.Culture = Culture or "en-GB"
 
-  _MESSAGESRS.Gender = Gender or MSRS.gender or "female"
   _MESSAGESRS.MSRS:SetGender(Gender)
+  _MESSAGESRS.Gender = Gender or "female"
+
+  _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
+  _MESSAGESRS.google = PathToCredentials
 
-  if PathToCredentials then
-    _MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials)
-    _MESSAGESRS.MSRS:SetProvider(MSRS.Provider.GOOGLE)
-  end
-  
-  _MESSAGESRS.label = Label or MSRS.Label or "MESSAGE"
   _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE")
+  _MESSAGESRS.label = Label or "MESSAGE"
 
-  _MESSAGESRS.port = Port or MSRS.port or 5002
   _MESSAGESRS.MSRS:SetPort(Port or 5002)
-
-  _MESSAGESRS.volume = Volume or MSRS.volume or 1
+  _MESSAGESRS.port = Port or 5002
+  
+  _MESSAGESRS.volume = Volume or 1
   _MESSAGESRS.MSRS:SetVolume(_MESSAGESRS.volume)
   
   if Voice then _MESSAGESRS.MSRS:SetVoice(Voice) end
   
-  _MESSAGESRS.voice = Voice or MSRS.voice --or MSRS.Voices.Microsoft.Hedda
+  _MESSAGESRS.voice = Voice --or MSRS.Voices.Microsoft.Hedda
+  --if _MESSAGESRS.google and not Voice then _MESSAGESRS.Voice = MSRS.Voices.Google.Standard.en_GB_Standard_A end
+  --_MESSAGESRS.MSRS:SetVoice(Voice or _MESSAGESRS.voice)
   
-  _MESSAGESRS.SRSQ = MSRSQUEUE:New(_MESSAGESRS.label)
+  _MESSAGESRS.SRSQ = MSRSQUEUE:New(Label or "MESSAGE")
 end
 
---- Sends a message via SRS. `ToSRS()` will try to use as many attributes configured with @{Core.Message#MESSAGE.SetMSRS}() and @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
+--- Sends a message via SRS.
 -- @param #MESSAGE self
 -- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
 -- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
@@ -552,7 +546,7 @@ function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volum
         _MESSAGESRS.MSRS:SetCoordinate(coordinate)  
       end
       local category = string.gsub(self.MessageCategory,":","")
-      _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,0.5,1,nil,nil,nil,frequency or _MESSAGESRS.frequency,modulation or _MESSAGESRS.modulation, gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,nil,volume or _MESSAGESRS.volume,category,coordinate or _MESSAGESRS.coordinate)
+      _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency or _MESSAGESRS.frequency,modulation or _MESSAGESRS.modulation, gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,nil,volume or _MESSAGESRS.volume,category,coordinate or _MESSAGESRS.coordinate)
   end
   return self
 end

Moose Development/Moose/Core/Pathline.lua

@@ -73,7 +73,7 @@ PATHLINE = {
 
 --- PATHLINE class version.
 -- @field #string version
-PATHLINE.version="0.1.1"
+PATHLINE.version="0.1.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -237,14 +237,13 @@ end
 --- Get COORDINATES of pathline. Note that COORDINATE objects are created when calling this function. That does involve deep copy calls and can have an impact on performance if done too often.
 -- @param #PATHLINE self
 -- @return <Core.Point#COORDINATE> List of COORDINATES points.
-function PATHLINE:GetCoordinates()
+function PATHLINE:GetCoordinats()
 
   local vecs={}
   
   for _,_point in pairs(self.points) do
     local point=_point --#PATHLINE.Point
     local coord=COORDINATE:NewFromVec3(point.vec3)
-    table.insert(vecs,coord)
   end
 
   return vecs
@@ -263,7 +262,7 @@ function PATHLINE:GetPointFromIndex(n)
   local point=nil --#PATHLINE.Point
   
   if n>=1 and n<=N then
-    point=self.points[n]
+    point=self.point[n]
   else
     self:E(self.lid..string.format("ERROR: No point in pathline for N=%s", tostring(n)))
   end
@@ -368,4 +367,4 @@ end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Core/Point.lua

@@ -24,9 +24,8 @@
 
 
 do -- COORDINATE
-  
-  ---
-  -- @type COORDINATE
+
+  --- @type COORDINATE
   -- @field #string ClassName Name of the class
   -- @field #number x Component of the 3D vector.
   -- @field #number y Component of the 3D vector.
@@ -181,7 +180,7 @@ do -- COORDINATE
   --   * @{#COORDINATE.ToStringBR}(): Generates a Bearing & Range text in the format of DDD for DI where DDD is degrees and DI is distance.
   --   * @{#COORDINATE.ToStringBRA}(): Generates a Bearing, Range & Altitude text.
   --   * @{#COORDINATE.ToStringBRAANATO}(): Generates a Generates a Bearing, Range, Aspect & Altitude text in NATOPS.
-  --   * @{#COORDINATE.ToStringLL}(): Generates a Latitude & Longitude text.
+  --   * @{#COORDINATE.ToStringLL}(): Generates a Latutide & Longitude text.
   --   * @{#COORDINATE.ToStringLLDMS}(): Generates a Lat, Lon, Degree, Minute, Second text.
   --   * @{#COORDINATE.ToStringLLDDM}(): Generates a Lat, Lon, Degree, decimal Minute text.
   --   * @{#COORDINATE.ToStringMGRS}(): Generates a MGRS grid coordinate text.
@@ -2456,18 +2455,15 @@ do -- COORDINATE
         -- Write command as string and execute that. Idea by Grimes https://forum.dcs.world/topic/324201-mark-to-all-function/#comment-5273793
         local s=string.format("trigger.action.markupToAll(7, %d, %d,", Coalition, MarkID)
         for _,vec in pairs(vecs) do
-          --s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
-          s=s..string.format("{x=%.1f, y=%.1f, z=%.1f},", vec.x, vec.y, vec.z)
+          s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
         end
-        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", Color[1], Color[2], Color[3], Color[4])
-        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", FillColor[1], FillColor[2], FillColor[3], FillColor[4])
-        s=s..string.format("%d,", LineType or 1)
-        s=s..string.format("%s", tostring(ReadOnly))
-        if Text and type(Text)=="string" and string.len(Text)>0 then
-          s=s..string.format(", \"%s\"", tostring(Text))
+        s=s..string.format("%s, %s, %s, %s", UTILS._OneLineSerialize(Color), UTILS._OneLineSerialize(FillColor), tostring(LineType), tostring(ReadOnly))
+        if Text and Text~="" then
+          s=s..string.format(", \"%s\"", Text)
         end
         s=s..")"
         
+        
         -- Execute string command
         local success=UTILS.DoString(s)
                 
@@ -2555,7 +2551,7 @@ do -- COORDINATE
 
     Offset=Offset or 2
 
-    -- Measurement of visibility should not be from the ground, so Adding a hypothetical 2 meters to each Coordinate.
+    -- Measurement of visibility should not be from the ground, so Adding a hypotethical 2 meters to each Coordinate.
     local FromVec3 = self:GetVec3()
     FromVec3.y = FromVec3.y + Offset
 
@@ -2956,10 +2952,10 @@ do -- COORDINATE
     end
 
     -- corrected Track to be direction of travel of bogey (self in this case)
-    local track = "Maneuver"
-  
-  if self.Heading then
-    track = UTILS.BearingToCardinal(self.Heading) or "North"
+   	local track = "Maneuver"
+	
+	if self.Heading then
+		track = UTILS.BearingToCardinal(self.Heading) or "North"
     end
     
     if rangeNM > 3 then
@@ -3071,18 +3067,6 @@ do -- COORDINATE
     return coord.LOtoLL( self:GetVec3() )
   end
 
-  --- Get Latitude & Longitude text.
-  -- @param #COORDINATE self
-  -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
-  -- @return #string LLText
-  function COORDINATE:ToStringLL( Settings )
-  
-    local LL_Accuracy = Settings and Settings.LL_Accuracy or _SETTINGS.LL_Accuracy
-    local lat, lon = coord.LOtoLL( self:GetVec3() )
-    return string.format('%f', lat) .. ' ' .. string.format('%f', lon)
-  end
-
-  
   --- Provides a Lat Lon string in Degree Minute Second format.
   -- @param #COORDINATE self
   -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
@@ -3116,49 +3100,6 @@ do -- COORDINATE
     local MGRS = coord.LLtoMGRS( lat, lon )
     return "MGRS " .. UTILS.tostringMGRS( MGRS, MGRS_Accuracy )
   end
-  
-  --- Provides a COORDINATE from an MGRS String
-  -- @param #COORDINATE self
-  -- @param #string MGRSString MGRS String, e.g. "MGRS 37T DK 12345 12345"
-  -- @return #COORDINATE self
-  function COORDINATE:NewFromMGRSString( MGRSString )
-    local myparts = UTILS.Split(MGRSString," ")
-    local northing = tostring(myparts[5]) or ""
-    local easting = tostring(myparts[4]) or ""
-    if string.len(easting) < 5 then easting = easting..string.rep("0",5-string.len(easting)) end  
-    if string.len(northing) < 5 then northing = northing..string.rep("0",5-string.len(northing)) end
-    local MGRS = {
-            UTMZone = myparts[2],
-            MGRSDigraph = myparts[3],
-            Easting = easting,
-            Northing = northing,
-          } 
-    local lat, lon = coord.MGRStoLL(MGRS)
-    local point = coord.LLtoLO(lat, lon, 0)
-    local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z})
-    return coord
-  end
-  
-  --- Provides a COORDINATE from an MGRS Coordinate
-  -- @param #COORDINATE self
-  -- @param #string UTMZone UTM Zone, e.g. "37T"
-  -- @param #string MGRSDigraph Digraph, e.g. "DK"
-  -- @param #string Easting Meters easting - string in order to allow for leading zeros, e.g. "01234". Should be 5 digits.
-  -- @param #string Northing Meters northing - string in order to allow for leading zeros, e.g. "12340". Should be 5 digits.
-  -- @return #COORDINATE self
-  function COORDINATE:NewFromMGRS( UTMZone, MGRSDigraph, Easting, Northing )
-    if string.len(Easting) < 5 then Easting = Easting..string.rep("0",5-string.len(Easting) )end  
-    if string.len(Northing) < 5 then Northing = Northing..string.rep("0",5-string.len(Northing) )end
-    local MGRS = {
-            UTMZone = UTMZone,
-            MGRSDigraph = MGRSDigraph,
-            Easting = Easting,
-            Northing = Northing,
-          }
-    local lat, lon = coord.MGRStoLL(MGRS)
-    local point = coord.LLtoLO(lat, lon, 0)
-    local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z})
-  end
 
   --- Provides a coordinate string of the point, based on a coordinate format system:
   --   * Uses default settings in COORDINATE.
@@ -3672,7 +3613,7 @@ end
 
 do -- POINT_VEC2
 
-  -- @type POINT_VEC2
+  --- @type POINT_VEC2
   -- @field DCS#Distance x The x coordinate in meters.
   -- @field DCS#Distance y the y coordinate in meters.
   -- @extends Core.Point#COORDINATE

Moose Development/Moose/Core/Scheduler.lua

@@ -14,13 +14,17 @@
 --
 -- # Demo Missions
 -- 
--- ### [SCHEDULER Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Core/Scheduler)
+-- ### [SCHEDULER Demo Missions source code](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SCH%20-%20Scheduler)
+-- 
+-- ### [SCHEDULER Demo Missions, only for beta testers](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SCH%20-%20Scheduler)
+--
+-- ### [ALL Demo Missions pack of the last release](https://github.com/FlightControl-Master/MOOSE_MISSIONS/releases)
 --
 -- ===
 --
 -- # YouTube Channel
 --
--- ### None
+-- ### [SCHEDULER YouTube Channel (none)]()
 --
 -- ===
 --

Moose Development/Moose/Core/Set.lua

@@ -146,45 +146,7 @@ do -- SET_BASE
 
     return self
   end
-  
-  --- [Internal] Add a functional filter
-  -- @param #SET_BASE self
-  -- @param #function ConditionFunction If this function returns `true`, the object is added to the SET. The function needs to take a CONTROLLABLE object as first argument.
-  -- @param ... Condition function arguments, if any.
-  -- @return #boolean If true, at least one condition is true
-  function SET_BASE:FilterFunction(ConditionFunction, ...)
-  
-    local condition={}
-    condition.func=ConditionFunction
-    condition.arg={}
-    
-    if arg then
-      condition.arg=arg
-    end
-    
-    if not self.Filter.Functions then self.Filter.Functions = {} end
-    table.insert(self.Filter.Functions, condition)
-    
-    return self
-  end
-    
-  --- [Internal] Check if the condition functions returns true.
-  -- @param #SET_BASE self
-  -- @param Wrapper.Controllable#CONTROLLABLE Object The object to filter for
-  -- @return #boolean If true, if **all** conditions are true
-  function SET_BASE:_EvalFilterFunctions(Object) 
-    -- All conditions must be true.
-    for _,_condition in pairs(self.Filter.Functions or {}) do
-      local condition=_condition
-      -- Call function.
-      if condition.func(Object,unpack(condition.arg)) == false then
-        return false
-      end
-    end  
-    -- No condition was true.
-    return true
-  end
-  
+
   --- Clear the Objects in the Set.
   -- @param #SET_BASE self
   -- @param #boolean TriggerEvent If `true`, an event remove is triggered for each group that is removed from the set.
@@ -455,34 +417,13 @@ do -- SET_BASE
 
   --- Gets a random object from the @{Core.Set#SET_BASE} and derived classes.
   -- @param #SET_BASE self
-  -- @return Core.Base#BASE or nil if none found or the SET is empty!
+  -- @return Core.Base#BASE
   function SET_BASE:GetRandom()
-    local tablemax = 0
-    for _,_ind in pairs(self.Index) do
-      tablemax = tablemax + 1
-    end
-    --local tablemax = table.maxn(self.Index)
+    local tablemax = table.maxn(self.Index)
     local RandomItem = self.Set[self.Index[math.random(1,tablemax)]]
     self:T3( { RandomItem } )
     return RandomItem
   end
-  
-  --- Gets a random object from the @{Core.Set#SET_BASE} and derived classes. A bit slower than @{#SET_BASE.GetRandom}() but tries to ensure you get an object back if the SET is not empty. 
-  -- @param #SET_BASE self
-  -- @return Core.Base#BASE or nil if  the SET is empty!
-  function SET_BASE:GetRandomSurely()
-    local tablemax = 0
-    local sorted = {}
-    for _,_obj in pairs(self.Set) do
-      tablemax = tablemax + 1
-      sorted[tablemax] = _obj
-    end
-    --local tablemax = table.maxn(self.Index)
-    --local RandomItem = self.Set[self.Index[math.random(1,tablemax)]]
-    local RandomItem = sorted[math.random(1,tablemax)]
-    self:T3( { RandomItem } )
-    return RandomItem
-  end
 
   --- Retrieves the amount of objects in the @{Core.Set#SET_BASE} and derived classes.
   -- @param #SET_BASE self
@@ -620,12 +561,10 @@ do -- SET_BASE
     return self
   end
 
-  --- Iterate the SET_BASE while identifying the nearest object in the set from a @{Core.Point#POINT_VEC2}.
+  --- Iterate the SET_BASE while identifying the nearest object from a @{Core.Point#POINT_VEC2}.
   -- @param #SET_BASE self
-  -- @param Core.Point#POINT_VEC2 PointVec2 A @{Core.Point#COORDINATE} or @{Core.Point#POINT_VEC2} object (but **not** a simple DCS#Vec2!) from where to evaluate the closest object in the set.
+  -- @param Core.Point#POINT_VEC2 PointVec2 A @{Core.Point#POINT_VEC2} object from where to evaluate the closest object in the set.
   -- @return Core.Base#BASE The closest object.
-  -- @usage
-  --          myset:FindNearestObjectFromPointVec2( ZONE:New("Test Zone"):GetCoordinate() )
   function SET_BASE:FindNearestObjectFromPointVec2( PointVec2 )
     self:F2( PointVec2 )
 
@@ -1022,7 +961,6 @@ do
   --    * @{#SET_GROUP.FilterCategoryShip}: Builds the SET_GROUP from ships.
   --    * @{#SET_GROUP.FilterCategoryStructure}: Builds the SET_GROUP from structures.
   --    * @{#SET_GROUP.FilterZones}: Builds the SET_GROUP with the groups within a @{Core.Zone#ZONE}.
-  --    * @{#SET_GROUP.FilterFunction}: Builds the SET_GROUP with a custom condition.
   --
   -- Once the filter criteria have been set for the SET_GROUP, you can start filtering using:
   --
@@ -1096,7 +1034,6 @@ do
       Countries = nil,
       GroupPrefixes = nil,
       Zones = nil,
-      Functions = nil,
     },
     FilterMeta = {
       Coalitions = {
@@ -1204,7 +1141,7 @@ do
     if not DontSetCargoBayLimit then
       -- I set the default cargo bay weight limit each time a new group is added to the set.
       -- TODO Why is this here in the first place?
-      for UnitID, UnitData in pairs( group:GetUnits() or {} ) do
+      for UnitID, UnitData in pairs( group:GetUnits() ) do
         if UnitData and UnitData:IsAlive() then
           UnitData:SetCargoBayWeightLimit()
         end
@@ -1310,26 +1247,7 @@ do
     
     return self
   end
-  
-  --- [User] Add a custom condition function.
-  -- @function [parent=#SET_GROUP] FilterFunction
-  -- @param #SET_GROUP self
-  -- @param #function ConditionFunction If this function returns `true`, the object is added to the SET. The function needs to take a GROUP object as first argument.
-  -- @param ... Condition function arguments if any.
-  -- @return #SET_GROUP self
-  -- @usage
-  --          -- Image you want to exclude a specific GROUP from a SET:
-  --          local groundset = SET_GROUP:New():FilterCoalitions("blue"):FilterCategoryGround():FilterFunction(
-  --          -- The function needs to take a GROUP object as first - and in this case, only - argument.
-  --          function(grp)
-  --              local isinclude = true
-  --              if grp:GetName() == "Exclude Me" then isinclude = false end
-  --              return isinclude
-  --          end
-  --          ):FilterOnce()
-  --          BASE:I(groundset:Flush())
 
-  
   --- Builds a set of groups of coalitions.
   -- Possible current coalitions are red, blue and neutral.
   -- @param #SET_GROUP self
@@ -1578,7 +1496,7 @@ do
   function SET_GROUP:AddInDatabase( Event )
     self:F3( { Event } )
 
-    if Event.IniObjectCategory == Object.Category.UNIT then
+    if Event.IniObjectCategory == 1 then
       if not self.Database[Event.IniDCSGroupName] then
         self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName )
         self:T3( self.Database[Event.IniDCSGroupName] )
@@ -2003,7 +1921,7 @@ do
       MGroupInclude = MGroupInclude and MGroupActive
     end
 
-    if self.Filter.Coalitions and MGroupInclude then
+    if self.Filter.Coalitions then
       local MGroupCoalition = false
       for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
         self:T3( { "Coalition:", MGroup:GetCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
@@ -2014,7 +1932,7 @@ do
       MGroupInclude = MGroupInclude and MGroupCoalition
     end
 
-    if self.Filter.Categories and MGroupInclude then
+    if self.Filter.Categories then
       local MGroupCategory = false
       for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
         self:T3( { "Category:", MGroup:GetCategory(), self.FilterMeta.Categories[CategoryName], CategoryName } )
@@ -2025,7 +1943,7 @@ do
       MGroupInclude = MGroupInclude and MGroupCategory
     end
 
-    if self.Filter.Countries and MGroupInclude then
+    if self.Filter.Countries then
       local MGroupCountry = false
       for CountryID, CountryName in pairs( self.Filter.Countries ) do
         self:T3( { "Country:", MGroup:GetCountry(), CountryName } )
@@ -2036,7 +1954,7 @@ do
       MGroupInclude = MGroupInclude and MGroupCountry
     end
 
-    if self.Filter.GroupPrefixes and MGroupInclude then
+    if self.Filter.GroupPrefixes then
       local MGroupPrefix = false
       for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
         self:T3( { "Prefix:", string.find( MGroup:GetName(), GroupPrefix, 1 ), GroupPrefix } )
@@ -2047,7 +1965,7 @@ do
       MGroupInclude = MGroupInclude and MGroupPrefix
     end
     
-    if self.Filter.Zones and MGroupInclude then
+    if self.Filter.Zones then
       local MGroupZone = false
       for ZoneName, Zone in pairs( self.Filter.Zones ) do
         --self:T( "Zone:", ZoneName )
@@ -2057,12 +1975,6 @@ do
       end
       MGroupInclude = MGroupInclude and MGroupZone
     end
-    
-    if self.Filter.Functions and MGroupInclude then
-      local MGroupFunc = false
-      MGroupFunc = self:_EvalFilterFunctions(MGroup)
-      MGroupInclude = MGroupInclude and MGroupFunc
-    end
      
     self:T2( MGroupInclude )
     return MGroupInclude
@@ -2162,7 +2074,6 @@ do -- SET_UNIT
   -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
   --    * @{#SET_UNIT.FilterActive}: Builds the SET_UNIT with the units that are only active. Units that are inactive (late activation) won't be included in the set!
   --    * @{#SET_UNIT.FilterZones}: Builds the SET_UNIT with the units within a @{Core.Zone#ZONE}.
-  --    * @{#SET_UNIT.FilterFunction}: Builds the SET_UNIT with a custom condition.
   --    
   -- Once the filter criteria have been set for the SET_UNIT, you can start filtering using:
   --
@@ -2241,7 +2152,6 @@ do -- SET_UNIT
       Countries = nil,
       UnitPrefixes = nil,
       Zones = nil,
-      Functions = nil,
     },
     FilterMeta = {
       Coalitions = {
@@ -2613,25 +2523,6 @@ do -- SET_UNIT
     return self
   end
 
-  --- [User] Add a custom condition function.
-  -- @function [parent=#SET_UNIT] FilterFunction
-  -- @param #SET_UNIT self
-  -- @param #function ConditionFunction If this function returns `true`, the object is added to the SET. The function needs to take a UNIT object as first argument.
-  -- @param ... Condition function arguments if any.
-  -- @return #SET_UNIT self
-  -- @usage
-  --          -- Image you want to exclude a specific UNIT from a SET:
-  --          local groundset = SET_UNIT:New():FilterCoalitions("blue"):FilterCategories("ground"):FilterFunction(
-  --          -- The function needs to take a UNIT object as first - and in this case, only - argument.
-  --          function(unit)
-  --              local isinclude = true
-  --              if unit:GetName() == "Exclude Me" then isinclude = false end
-  --              return isinclude
-  --          end
-  --          ):FilterOnce()
-  --          BASE:I(groundset:Flush())
-
-
   --- Handles the Database to check on an event (birth) that the Object was added in the Database.
   -- This is required, because sometimes the _DATABASE birth event gets called later than the SET_BASE birth event!
   -- @param #SET_UNIT self
@@ -2641,7 +2532,7 @@ do -- SET_UNIT
   function SET_UNIT:AddInDatabase( Event )
     self:F3( { Event } )
 
-    if Event.IniObjectCategory == Object.Category.UNIT then
+    if Event.IniObjectCategory == 1 then
       if not self.Database[Event.IniDCSUnitName] then
         self.Database[Event.IniDCSUnitName] = UNIT:Register( Event.IniDCSUnitName )
         self:T3( self.Database[Event.IniDCSUnitName] )
@@ -2957,50 +2848,59 @@ do -- SET_UNIT
   -- @return Core.Point#COORDINATE The center coordinate of all the units in the set, including heading in degrees and speed in mps in case of moving units.
   function SET_UNIT:GetCoordinate()
     
-    local function GetSetVec3(units)
-      -- Init.
-      local x=0 
-      local y=0 
-      local z=0 
-      local n=0
-      -- Loop over all units.
-      for _,unit in pairs(units) do
-        local vec3=nil --DCS#Vec3
-        if unit and unit:IsAlive() then
-          vec3 = unit:GetVec3()
-        end
-        if vec3 then
-          -- Sum up posits.
-          x=x+vec3.x
-          y=y+vec3.y
-          z=z+vec3.z
-          -- Increase counter.
-          n=n+1
-        end
-      end
-      if n>0 then
-        -- Average.
-        local Vec3={x=x/n, y=y/n, z=z/n} --DCS#Vec3
-        return Vec3
-      end
-      return nil
-    end
-    
     local Coordinate = nil
-    local Vec3 = GetSetVec3(self.Set)
-    if Vec3 then
-      Coordinate = COORDINATE:NewFromVec3(Vec3)
+    local unit = self:GetRandom()
+    if self:Count() == 1 and unit then
+      return unit:GetCoordinate()
     end
-
-    if Coordinate then
-      local heading = self:GetHeading() or 0
-      local velocity = self:GetVelocity() or 0
-      Coordinate:SetHeading( heading )
-      Coordinate:SetVelocity( velocity )
-      self:I(UTILS.PrintTableToLog(Coordinate))
+    if unit then
+      local Coordinate = unit:GetCoordinate()
+      --self:F({Coordinate:GetVec3()})
+      
+      
+      local x1 = Coordinate.x
+      local x2 = Coordinate.x
+      local y1 = Coordinate.y
+      local y2 = Coordinate.y
+      local z1 = Coordinate.z
+      local z2 = Coordinate.z
+      local MaxVelocity = 0
+      local AvgHeading = nil
+      local MovingCount = 0
+  
+      for UnitName, UnitData in pairs( self:GetAliveSet() ) do
+  
+        local Unit = UnitData -- Wrapper.Unit#UNIT
+        local Coordinate = Unit:GetCoordinate()
+  
+        x1 = (Coordinate.x < x1) and Coordinate.x or x1
+        x2 = (Coordinate.x > x2) and Coordinate.x or x2
+        y1 = (Coordinate.y < y1) and Coordinate.y or y1
+        y2 = (Coordinate.y > y2) and Coordinate.y or y2
+        z1 = (Coordinate.y < z1) and Coordinate.z or z1
+        z2 = (Coordinate.y > z2) and Coordinate.z or z2
+  
+        local Velocity = Coordinate:GetVelocity()
+        if Velocity ~= 0 then
+          MaxVelocity = (MaxVelocity < Velocity) and Velocity or MaxVelocity
+          local Heading = Coordinate:GetHeading()
+          AvgHeading = AvgHeading and (AvgHeading + Heading) or Heading
+          MovingCount = MovingCount + 1
+        end
+      end
+  
+      AvgHeading = AvgHeading and (AvgHeading / MovingCount)
+  
+      Coordinate.x = (x2 - x1) / 2 + x1
+      Coordinate.y = (y2 - y1) / 2 + y1
+      Coordinate.z = (z2 - z1) / 2 + z1
+      Coordinate:SetHeading( AvgHeading )
+      Coordinate:SetVelocity( MaxVelocity )
+  
+      self:F( { Coordinate = Coordinate } )
     end
-
     return Coordinate
+
   end
 
   --- Get the maximum velocity of the SET_UNIT.
@@ -3209,7 +3109,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitActive
       end
 
-      if self.Filter.Coalitions and MUnitInclude then
+      if self.Filter.Coalitions then
         local MUnitCoalition = false
         for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
           self:F( { "Coalition:", MUnit:GetCoalition(), self.FilterMeta.Coalitions[CoalitionName], CoalitionName } )
@@ -3220,7 +3120,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitCoalition
       end
 
-      if self.Filter.Categories and MUnitInclude then
+      if self.Filter.Categories then
         local MUnitCategory = false
         for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
           self:T3( { "Category:", MUnit:GetDesc().category, self.FilterMeta.Categories[CategoryName], CategoryName } )
@@ -3231,7 +3131,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitCategory
       end
 
-      if self.Filter.Types and MUnitInclude then
+      if self.Filter.Types then
         local MUnitType = false
         for TypeID, TypeName in pairs( self.Filter.Types ) do
           self:T3( { "Type:", MUnit:GetTypeName(), TypeName } )
@@ -3242,7 +3142,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitType
       end
 
-      if self.Filter.Countries and MUnitInclude then
+      if self.Filter.Countries then
         local MUnitCountry = false
         for CountryID, CountryName in pairs( self.Filter.Countries ) do
           self:T3( { "Country:", MUnit:GetCountry(), CountryName } )
@@ -3253,7 +3153,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitCountry
       end
 
-      if self.Filter.UnitPrefixes and MUnitInclude then
+      if self.Filter.UnitPrefixes then
         local MUnitPrefix = false
         for UnitPrefixId, UnitPrefix in pairs( self.Filter.UnitPrefixes ) do
           self:T3( { "Prefix:", string.find( MUnit:GetName(), UnitPrefix, 1 ), UnitPrefix } )
@@ -3264,7 +3164,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitPrefix
       end
 
-      if self.Filter.RadarTypes and MUnitInclude then
+      if self.Filter.RadarTypes then
         local MUnitRadar = false
         for RadarTypeID, RadarType in pairs( self.Filter.RadarTypes ) do
           self:T3( { "Radar:", RadarType } )
@@ -3278,7 +3178,7 @@ do -- SET_UNIT
         MUnitInclude = MUnitInclude and MUnitRadar
       end
 
-      if self.Filter.SEAD and MUnitInclude then
+      if self.Filter.SEAD then
         local MUnitSEAD = false
         if MUnit:HasSEAD() == true then
           self:T3( "SEAD Found" )
@@ -3288,7 +3188,7 @@ do -- SET_UNIT
       end
     end
     
-    if self.Filter.Zones and MUnitInclude then
+    if self.Filter.Zones then
       local MGroupZone = false
       for ZoneName, Zone in pairs( self.Filter.Zones ) do
         self:T3( "Zone:", ZoneName )
@@ -3299,11 +3199,6 @@ do -- SET_UNIT
       MUnitInclude = MUnitInclude  and MGroupZone
     end
     
-    if self.Filter.Functions and MUnitInclude then
-      local MUnitFunc = self:_EvalFilterFunctions(MUnit)
-      MUnitInclude = MUnitInclude  and MUnitFunc
-    end
-    
     self:T2( MUnitInclude )
     return MUnitInclude
   end
@@ -3385,7 +3280,6 @@ do -- SET_STATIC
   --    * @{#SET_STATIC.FilterPrefixes}: Builds the SET_STATIC with the units containing the same string(s) in their name. **Attention!** LUA regular expression apply here, so special characters in names like minus, dot, hash (#) etc might lead to unexpected results. 
   -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
   --    * @{#SET_STATIC.FilterZones}: Builds the SET_STATIC with the units within a @{Core.Zone#ZONE}.
-  --    * @{#SET_STATIC.FilterFunction}: Builds the SET_STATIC with a custom condition.
   --    
   -- Once the filter criteria have been set for the SET_STATIC, you can start filtering using:
   --
@@ -3588,25 +3482,7 @@ do -- SET_STATIC
     end
     return self
   end
-  
-  --- [User] Add a custom condition function.
-  -- @function [parent=#SET_STATIC] FilterFunction
-  -- @param #SET_STATIC self
-  -- @param #function ConditionFunction If this function returns `true`, the object is added to the SET. The function needs to take a STATIC object as first argument.
-  -- @param ... Condition function arguments if any.
-  -- @return #SET_STATIC self
-  -- @usage
-  --          -- Image you want to exclude a specific CLIENT from a SET:
-  --          local groundset = SET_STATIC:New():FilterCoalitions("blue"):FilterActive(true):FilterFunction(
-  --          -- The function needs to take a STATIC object as first - and in this case, only - argument.
-  --          function(static)
-  --              local isinclude = true
-  --              if static:GetName() == "Exclude Me" then isinclude = false end
-  --              return isinclude
-  --          end
-  --          ):FilterOnce()
-  --          BASE:I(groundset:Flush())
-  
+
   --- Builds a set of units of defined countries.
   -- Possible current countries are those known within DCS world.
   -- @param #SET_STATIC self
@@ -4163,7 +4039,6 @@ do -- SET_CLIENT
   -- Have a read through here to understand the application of regular expressions: [LUA regular expressions](https://riptutorial.com/lua/example/20315/lua-pattern-matching)
   --    * @{#SET_CLIENT.FilterActive}: Builds the SET_CLIENT with the units that are only active. Units that are inactive (late activation) won't be included in the set!
   --    * @{#SET_CLIENT.FilterZones}: Builds the SET_CLIENT with the clients within a @{Core.Zone#ZONE}.
-  --    * @{#SET_CLIENT.FilterFunction}: Builds the SET_CLIENT with a custom condition.
   --    
   -- Once the filter criteria have been set for the SET_CLIENT, you can start filtering using:
   --
@@ -4518,7 +4393,7 @@ do -- SET_CLIENT
   function SET_CLIENT:_EventPlayerEnterUnit(Event)
     self:I( "_EventPlayerEnterUnit" )
     if Event.IniDCSUnit then
-      if Event.IniObjectCategory == Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround() then
+      if Event.IniObjectCategory == 1 and Event.IniGroup and Event.IniGroup:IsGround() then
         -- CA Slot entered
         local ObjectName, Object = self:AddInDatabase( Event )
         self:I( ObjectName, UTILS.PrintTableToLog(Object) )
@@ -4537,7 +4412,7 @@ do -- SET_CLIENT
   function SET_CLIENT:_EventPlayerLeaveUnit(Event)
     self:I( "_EventPlayerLeaveUnit" )
     if Event.IniDCSUnit then
-      if Event.IniObjectCategory == Object.Category.UNIT and Event.IniGroup and Event.IniGroup:IsGround() then
+      if Event.IniObjectCategory == 1 and Event.IniGroup and Event.IniGroup:IsGround() then
         -- CA Slot left
         local ObjectName, Object = self:FindInDatabase( Event )
         if ObjectName then
@@ -4666,25 +4541,6 @@ do -- SET_CLIENT
     return AliveSet.Set or {}
   end
 
-  --- [User] Add a custom condition function.
-  -- @function [parent=#SET_CLIENT] FilterFunction
-  -- @param #SET_CLIENT self
-  -- @param #function ConditionFunction If this function returns `true`, the object is added to the SET. The function needs to take a CLIENT object as first argument.
-  -- @param ... Condition function arguments if any.
-  -- @return #SET_CLIENT self
-  -- @usage
-  --          -- Image you want to exclude a specific CLIENT from a SET:
-  --          local groundset = SET_CLIENT:New():FilterCoalitions("blue"):FilterActive(true):FilterFunction(
-  --          -- The function needs to take a UNIT object as first - and in this case, only - argument.
-  --          function(client)
-  --              local isinclude = true
-  --              if client:GetPlayerName() == "Exclude Me" then isinclude = false end
-  --              return isinclude
-  --          end
-  --          ):FilterOnce()
-  --          BASE:I(groundset:Flush())
-
-
   ---
   -- @param #SET_CLIENT self
   -- @param Wrapper.Client#CLIENT MClient
@@ -4706,7 +4562,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientActive
       end
 
-      if self.Filter.Coalitions and MClientInclude then
+      if self.Filter.Coalitions then
         local MClientCoalition = false
         for CoalitionID, CoalitionName in pairs( self.Filter.Coalitions ) do
           local ClientCoalitionID = _DATABASE:GetCoalitionFromClientTemplate( MClientName )
@@ -4719,7 +4575,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientCoalition
       end
 
-      if self.Filter.Categories and MClientInclude then
+      if self.Filter.Categories then
         local MClientCategory = false
         for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
           local ClientCategoryID = _DATABASE:GetCategoryFromClientTemplate( MClientName )
@@ -4732,7 +4588,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientCategory
       end
 
-      if self.Filter.Types and MClientInclude then
+      if self.Filter.Types then
         local MClientType = false
         for TypeID, TypeName in pairs( self.Filter.Types ) do
           self:T3( { "Type:", MClient:GetTypeName(), TypeName } )
@@ -4744,7 +4600,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientType
       end
 
-      if self.Filter.Countries and MClientInclude then
+      if self.Filter.Countries then
         local MClientCountry = false
         for CountryID, CountryName in pairs( self.Filter.Countries ) do
           local ClientCountryID = _DATABASE:GetCountryFromClientTemplate( MClientName )
@@ -4757,7 +4613,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientCountry
       end
 
-      if self.Filter.ClientPrefixes and MClientInclude then
+      if self.Filter.ClientPrefixes then
         local MClientPrefix = false
         for ClientPrefixId, ClientPrefix in pairs( self.Filter.ClientPrefixes ) do
           self:T3( { "Prefix:", string.find( MClient.UnitName, ClientPrefix, 1 ), ClientPrefix } )
@@ -4769,7 +4625,7 @@ do -- SET_CLIENT
         MClientInclude = MClientInclude and MClientPrefix
       end
 
-    if self.Filter.Zones and MClientInclude then
+    if self.Filter.Zones then
       local MClientZone = false
       for ZoneName, Zone in pairs( self.Filter.Zones ) do
       self:T3( "Zone:", ZoneName )
@@ -4781,7 +4637,7 @@ do -- SET_CLIENT
       MClientInclude = MClientInclude and MClientZone
     end
     
-    if self.Filter.Playernames and MClientInclude then
+    if self.Filter.Playernames then
       local MClientPlayername = false
       local playername = MClient:GetPlayerName() or "Unknown"
       --self:T(playername)
@@ -4794,7 +4650,7 @@ do -- SET_CLIENT
       MClientInclude = MClientInclude and MClientPlayername
     end
     
-    if self.Filter.Callsigns and MClientInclude then
+    if self.Filter.Callsigns then
       local MClientCallsigns = false
       local callsign = MClient:GetCallsign()
       --self:I(callsign)
@@ -4807,11 +4663,6 @@ do -- SET_CLIENT
       MClientInclude = MClientInclude and MClientCallsigns
     end
     
-    if self.Filter.Functions and MClientInclude then
-      local MClientFunc = self:_EvalFilterFunctions(MClient)
-      MClientInclude = MClientInclude and MClientFunc
-    end
-    
   end
     self:T2( MClientInclude )
     return MClientInclude
@@ -5405,7 +5256,7 @@ do -- SET_AIRBASE
   function SET_AIRBASE:GetRandomAirbase()
 
     local RandomAirbase = self:GetRandom()
-    --self:F( { RandomAirbase = RandomAirbase:GetName() } )
+    self:F( { RandomAirbase = RandomAirbase:GetName() } )
 
     return RandomAirbase
   end
@@ -5571,7 +5422,7 @@ do -- SET_AIRBASE
         MAirbaseInclude = MAirbaseInclude and MAirbaseCoalition
       end
 
-      if self.Filter.Categories and MAirbaseInclude then
+      if self.Filter.Categories then
         local MAirbaseCategory = false
         for CategoryID, CategoryName in pairs( self.Filter.Categories ) do
           local AirbaseCategoryID = _DATABASE:GetCategoryFromAirbase( MAirbaseName )
@@ -7837,28 +7688,6 @@ do -- SET_OPSGROUP
     return self
   end  
 
-  --- Handles the OnBirth event for the Set.
-  -- @param #SET_OPSGROUP self
-  -- @param Core.Event#EVENTDATA Event Event data.
-  function SET_OPSGROUP:_EventOnBirth( Event )
-    self:F3( { Event } )
-
-    if Event.IniDCSUnit and Event.IniDCSGroup then
-      local DCSgroup=Event.IniDCSGroup --DCS#Group
-
-      if DCSgroup:getInitialSize() == DCSgroup:getSize() then -- This seems to be not a good check as even for the first birth event, getSize returns the total number of units in the group.
-
-        local groupname, group = self:AddInDatabase( Event )
-
-        if group and group:CountAliveUnits()==DCSgroup:getInitialSize() then
-          if group and self:IsIncludeObject( group ) then
-            self:Add( groupname, group )
-          end
-        end
-      end
-    end
-  end
-
   --- Handles the OnDead or OnCrash event for alive groups set.
   -- Note: The GROUP object in the SET_OPSGROUP collection will only be removed if the last unit is destroyed of the GROUP.
   -- @param #SET_OPSGROUP self
@@ -7879,12 +7708,12 @@ do -- SET_OPSGROUP
   --- Handles the Database to check on an event (birth) that the Object was added in the Database.
   -- This is required, because sometimes the _DATABASE birth event gets called later than the SET_BASE birth event!
   -- @param #SET_OPSGROUP self
-  -- @param Core.Event#EVENTDATA Event Event data.
-  -- @return #string The name of the GROUP.
-  -- @return Wrapper.Group#GROUP The GROUP object.
+  -- @param Core.Event#EVENTDATA Event
+  -- @return #string The name of the GROUP
+  -- @return #table The GROUP
   function SET_OPSGROUP:AddInDatabase( Event )
   
-    if Event.IniObjectCategory==Object.Category.UNIT then
+    if Event.IniObjectCategory==1 then
     
       if not self.Database[Event.IniDCSGroupName] then
         self.Database[Event.IniDCSGroupName] = GROUP:Register( Event.IniDCSGroupName )
@@ -7899,8 +7728,8 @@ do -- SET_OPSGROUP
   -- This is required, because sometimes the _DATABASE event gets called later than the SET_BASE event or vise versa!
   -- @param #SET_OPSGROUP self
   -- @param Core.Event#EVENTDATA Event Event data table.
-  -- @return #string The name of the GROUP.
-  -- @return Wrapper.Group#GROUP The GROUP object.
+  -- @return #string The name of the GROUP
+  -- @return #table The GROUP
   function SET_OPSGROUP:FindInDatabase(Event)
     return Event.IniDCSGroupName, self.Database[Event.IniDCSGroupName]
   end
@@ -7939,7 +7768,7 @@ do -- SET_OPSGROUP
     end
 
     -- Filter coalitions.
-    if self.Filter.Coalitions and MGroupInclude then
+    if self.Filter.Coalitions then
     
       local MGroupCoalition = false
       
@@ -7953,7 +7782,7 @@ do -- SET_OPSGROUP
     end
 
     -- Filter categories.
-    if self.Filter.Categories and MGroupInclude then
+    if self.Filter.Categories then
     
       local MGroupCategory = false
       
@@ -7967,7 +7796,7 @@ do -- SET_OPSGROUP
     end
 
     -- Filter countries.
-    if self.Filter.Countries and MGroupInclude then
+    if self.Filter.Countries then
       local MGroupCountry = false
       for CountryID, CountryName in pairs( self.Filter.Countries ) do
         if country.id[CountryName] == MGroup:GetCountry() then
@@ -7978,12 +7807,12 @@ do -- SET_OPSGROUP
     end
 
     -- Filter "prefixes".
-    if self.Filter.GroupPrefixes and MGroupInclude then
+    if self.Filter.GroupPrefixes then
     
       local MGroupPrefix = false
       
       for GroupPrefixId, GroupPrefix in pairs( self.Filter.GroupPrefixes ) do
-        if string.find( MGroup:GetName(), GroupPrefix:gsub ("-", "%%-"), 1 ) then --Not sure why "-" is replaced by "%-" ?! - So we can still match group names with a dash in them
+        if string.find( MGroup:GetName(), GroupPrefix:gsub ("-", "%%-"), 1 ) then --Not sure why "-" is replaced by "%-" ?!
           MGroupPrefix = true
         end
       end
@@ -8219,7 +8048,7 @@ do -- SET_SCENERY
   end
   
   --- Get a table of alive objects.
-  -- @param #SET_SCENERY self
+  -- @param #SET_GROUP self
   -- @return #table Table of alive objects
   -- @return Core.Set#SET_SCENERY SET of alive objects
   function SET_SCENERY:GetAliveSet()
@@ -8254,15 +8083,9 @@ do -- SET_SCENERY
   -- @param #SET_SCENERY self
   -- @return Core.Point#COORDINATE The center coordinate of all the objects in the set.
   function SET_SCENERY:GetCoordinate()
-    
-    local Coordinate = COORDINATE:New({0,0,0})
-    
-    local Item = self:GetRandomSurely()
-    
-    if Item then
-      Coordinate:GetCoordinate()
-    end
-    
+
+    local Coordinate = self:GetRandom():GetCoordinate()
+
     local x1 = Coordinate.x
     local x2 = Coordinate.x
     local y1 = Coordinate.y
@@ -8399,7 +8222,7 @@ do -- SET_SCENERY
   --- Calculate current relative lifepoints of the SET objects, i.e. Life divided by Life0 as percentage value, eg 75 meaning 75% alive. 
   -- **CAVEAT**: Some objects change their life value or "hitpoints" **after** the first hit. Hence we will adjust the Life0 value to 120% 
   -- of the last life value if life exceeds life0 ata any point.
-  -- Thus we will get a smooth percentage decrease, if you use this e.g. as success criteria for a bombing task.
+  -- Thus will will get a smooth percentage decrease, if you use this e.g. as success criteria for a bombing task.
   -- @param #SET_SCENERY self
   -- @return #number LifePoints
   function SET_SCENERY:GetRelativeLife()

Moose Development/Moose/Core/Spawn.lua

@@ -30,7 +30,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Core/Spawn)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SPA%20-%20Spawning)
 -- 
 -- ===
 --
@@ -1108,22 +1108,6 @@ function SPAWN:InitRandomizeCallsign()
   return self
 end
 
---- [BLUE AIR only!] This method sets a specific callsign for a spawned group. Use for a group with one unit only!
--- @param #SPAWN self
--- @param #number ID ID of the callsign enumerator, e.g. CALLSIGN.Tanker.Texaco - - resulting in e.g. Texaco-2-1
--- @param #string Name Name of this callsign as it cannot be determined from the ID because of the dependency on the task type of the plane, and the plane type. E.g. "Texaco"
--- @param #number Minor Minor number, i.e. the unit number within the group, e.g 2 - resulting in e.g. Texaco-2-1
--- @param #number Major Major number, i.e. the group number of this name, e.g. 1 - resulting in e.g. Texaco-2-1
--- @return #SPAWN self
-function SPAWN:InitCallSign(ID,Name,Minor,Major)
-  self.SpawnInitCallSign = true
-  self.SpawnInitCallSignID = ID or 1 
-  self.SpawnInitCallSignMinor = Minor or 1
-  self.SpawnInitCallSignMajor = Major or 1 
-  self.SpawnInitCallSignName = string.lower(Name) or "enfield"
-  return self
-end
-
 --- This method sets a spawn position for the group that is different from the location of the template.
 -- @param #SPAWN self
 -- @param Core.Point#COORDINATE Coordinate The position to spawn from
@@ -1458,7 +1442,6 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
     else
 
       local SpawnTemplate = self.SpawnGroups[self.SpawnIndex].SpawnTemplate
-      local SpawnZone = self.SpawnGroups[self.SpawnIndex].SpawnZone
       self:T( SpawnTemplate.name )
 
       if SpawnTemplate then
@@ -1484,23 +1467,6 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
         if self.SpawnRandomizeUnits then
           for UnitID = 1, #SpawnTemplate.units do
             local RandomVec2 = PointVec3:GetRandomVec2InRadius( self.SpawnOuterRadius, self.SpawnInnerRadius )
-            if (SpawnZone) then
-              local inZone = SpawnZone:IsVec2InZone(RandomVec2)
-              local numTries = 1
-              while (not inZone) and (numTries < 20) do
-                if not inZone then
-                  RandomVec2 = PointVec3:GetRandomVec2InRadius( self.SpawnOuterRadius, self.SpawnInnerRadius )
-                  numTries = numTries + 1
-                  inZone = SpawnZone:IsVec2InZone(RandomVec2)
-                  self:I("Retrying " .. numTries .. "spawn " .. SpawnTemplate.name .. " in Zone " .. SpawnZone:GetName() .. "!")
-                  self:I(SpawnZone)
-                end
-              end
-              if (not inZone) then
-                self:I("Could not place unit within zone and within radius!")
-                RandomVec2 = SpawnZone:GetRandomVec2()
-              end
-            end
             SpawnTemplate.units[UnitID].x = RandomVec2.x
             SpawnTemplate.units[UnitID].y = RandomVec2.y
             self:T( 'SpawnTemplate.units[' .. UnitID .. '].x = ' .. SpawnTemplate.units[UnitID].x .. ', SpawnTemplate.units[' .. UnitID .. '].y = ' .. SpawnTemplate.units[UnitID].y )
@@ -1552,14 +1518,12 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
 
           for UnitID = 1, #SpawnTemplate.units do
 
-            if not self.SpawnRandomizeUnits then
-              if UnitID > 1 then -- don't rotate position of unit #1
-                local unitXOff = SpawnTemplate.units[UnitID].x - pivotX -- rotate position offset around unit #1
-                local unitYOff = SpawnTemplate.units[UnitID].y - pivotY
+            if UnitID > 1 then -- don't rotate position of unit #1
+              local unitXOff = SpawnTemplate.units[UnitID].x - pivotX -- rotate position offset around unit #1
+              local unitYOff = SpawnTemplate.units[UnitID].y - pivotY
 
-                SpawnTemplate.units[UnitID].x = pivotX + (unitXOff * cosHeading) - (unitYOff * sinHeading)
-                SpawnTemplate.units[UnitID].y = pivotY + (unitYOff * cosHeading) + (unitXOff * sinHeading)
-              end
+              SpawnTemplate.units[UnitID].x = pivotX + (unitXOff * cosHeading) - (unitYOff * sinHeading)
+              SpawnTemplate.units[UnitID].y = pivotY + (unitYOff * cosHeading) + (unitXOff * sinHeading)
             end
 
             -- adjust heading of all units, including unit #1
@@ -1689,8 +1653,8 @@ function SPAWN:SpawnWithIndex( SpawnIndex, NoBirth )
 
       -- If there is a SpawnFunction hook defined, call it.
       if self.SpawnFunctionHook then
-        -- delay calling this for .3 seconds so that it hopefully comes after the BIRTH event of the group.
-        self.SpawnHookScheduler:Schedule( nil, self.SpawnFunctionHook, { self.SpawnGroups[self.SpawnIndex].Group, unpack( self.SpawnFunctionArguments ) }, 0.3 )
+        -- delay calling this for .1 seconds so that it hopefully comes after the BIRTH event of the group.
+        self.SpawnHookScheduler:Schedule( nil, self.SpawnFunctionHook, { self.SpawnGroups[self.SpawnIndex].Group, unpack( self.SpawnFunctionArguments ) }, 0.1 )
       end
       -- TODO: Need to fix this by putting an "R" in the name of the group when the group repeats.
       -- if self.Repeat then
@@ -3367,23 +3331,10 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
     end
   end
   
-  if self.SpawnInitCallSign then
-    for UnitID = 1, #SpawnTemplate.units do
-      local Callsign = SpawnTemplate.units[UnitID].callsign
-      if Callsign and type( Callsign ) ~= "number" then
-        SpawnTemplate.units[UnitID].callsign[1] = self.SpawnInitCallSignID 
-        SpawnTemplate.units[UnitID].callsign[2] = self.SpawnInitCallSignMinor
-        SpawnTemplate.units[UnitID].callsign[3] = self.SpawnInitCallSignMajor
-        SpawnTemplate.units[UnitID].callsign["name"] = string.format("%s%d%d",self.SpawnInitCallSignName,self.SpawnInitCallSignMinor,self.SpawnInitCallSignMajor)
-        --UTILS.PrintTableToLog(SpawnTemplate.units[UnitID].callsign,1)
-      end
-    end
-  end
-  
   for UnitID = 1, #SpawnTemplate.units do
     local Callsign = SpawnTemplate.units[UnitID].callsign
     if Callsign then
-      if type( Callsign ) ~= "number" and not self.SpawnInitCallSign then -- blue callsign
+      if type( Callsign ) ~= "number" then -- blue callsign
         -- UTILS.PrintTableToLog(Callsign,1)
         Callsign[2] = ((SpawnIndex - 1) % 10) + 1
         local CallsignName = SpawnTemplate.units[UnitID].callsign["name"] -- #string
@@ -3391,7 +3342,7 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
         local CallsignLen = CallsignName:len()
         SpawnTemplate.units[UnitID].callsign[2] = UnitID
         SpawnTemplate.units[UnitID].callsign["name"] = CallsignName:sub( 1, CallsignLen ) .. SpawnTemplate.units[UnitID].callsign[2] .. SpawnTemplate.units[UnitID].callsign[3]
-      elseif type( Callsign ) == "number" then
+      else
         SpawnTemplate.units[UnitID].callsign = Callsign + SpawnIndex
       end
     end
@@ -3426,11 +3377,11 @@ function SPAWN:_Prepare( SpawnTemplatePrefix, SpawnIndex ) -- R2.2
         end
       end
       -- VoiceCallsignNumber
-      if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignNumber and type( Callsign ) ~= "number" then
+      if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignNumber then
         SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignNumber = SpawnTemplate.units[UnitID].callsign[2] .. SpawnTemplate.units[UnitID].callsign[3]
       end
       -- VoiceCallsignLabel
-      if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignLabel and type( Callsign ) ~= "number" then
+      if SpawnTemplate.units[UnitID].AddPropAircraft.VoiceCallsignLabel then
         local CallsignName = SpawnTemplate.units[UnitID].callsign["name"] -- #string
         CallsignName = string.match(CallsignName,"^(%a+)") -- 2.8 - only the part w/o numbers
         local label = "NY" -- Navy One exception
@@ -3611,7 +3562,6 @@ function SPAWN:_RandomizeZones( SpawnIndex )
     self:T( { SpawnVec2 = SpawnVec2 } )
 
     local SpawnTemplate = self.SpawnGroups[SpawnIndex].SpawnTemplate
-    self.SpawnGroups[SpawnIndex].SpawnZone = SpawnZone
 
     self:T( { Route = SpawnTemplate.route } )
 

Moose Development/Moose/Core/SpawnStatic.lua

@@ -15,14 +15,14 @@
 -- 
 -- # Demo Missions
 -- 
--- ## [SPAWNSTATIC Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Core/SpawnStatic)
+-- ## [SPAWNSTATIC Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SPS%20-%20Spawning%20Statics)
 --
 -- 
 -- ===
 -- 
 -- # YouTube Channel
 -- 
--- ## No videos yet!
+-- ## [SPAWNSTATIC YouTube Channel]() [No videos yet!]
 -- 
 -- ===
 -- 

Moose Development/Moose/Functional/AICSAR.lua

@@ -16,9 +16,9 @@
 -- ===
 --
 -- ## Example Missions:
---
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/AICSAR).
---
+-- 
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/CSR-001%20-%20Basics).
+--       
 -- ===
 -- 
 -- ### Author: **Applevangelist**
@@ -527,7 +527,7 @@ end
 --- [User] Switch sound output on and use SRS output for sound files.
 -- @param #AICSAR self
 -- @param #boolean OnOff Switch on (true) or off (false).
--- @param #string Path Path to your SRS Server Component, e.g. "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone"
+-- @param #string Path Path to your SRS Server Component, e.g. "E:\\\\Program Files\\\\DCS-SimpleRadio-Standalone"
 -- @param #number Frequency Defaults to 243 (guard)
 -- @param #number Modulation Radio modulation. Defaults to radio.modulation.AM
 -- @param #string SoundPath Where to find the audio files. Defaults to nil, i.e. add messages via "Sound to..." in the Mission Editor.
@@ -538,13 +538,13 @@ function AICSAR:SetSRSRadio(OnOff,Path,Frequency,Modulation,SoundPath,Port)
   self.SRSRadio = OnOff and true
   self.SRSTTSRadio = false
   self.SRSFrequency = Frequency or 243
-  self.SRSPath = Path or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  self.SRSPath = Path or "c:\\"
   self.SRS:SetLabel("ACSR")
   self.SRS:SetCoalition(self.coalition)
   self.SRSModulation = Modulation or radio.modulation.AM
   local soundpath = os.getenv('TMP') .. "\\DCS\\Mission\\l10n\\DEFAULT" -- defaults to "l10n/DEFAULT/", i.e. add messages by "Sound to..." in the ME
   self.SRSSoundPath = SoundPath or soundpath
-  self.SRSPort = Port or MSRS.port or 5002
+  self.SRSPort = Port or 5002
   if OnOff then
     self.SRS = MSRS:New(Path,Frequency,Modulation)
     self.SRS:SetPort(self.SRSPort)
@@ -570,11 +570,11 @@ function AICSAR:SetSRSTTSRadio(OnOff,Path,Frequency,Modulation,Port,Voice,Cultur
   self.SRSTTSRadio = OnOff and true
   self.SRSRadio = false
   self.SRSFrequency = Frequency or 243
-  self.SRSPath = Path or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  self.SRSPath = Path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
   self.SRSModulation = Modulation or radio.modulation.AM
-  self.SRSPort = Port or MSRS.port or 5002
+  self.SRSPort = Port or 5002
   if OnOff then
-    self.SRS = MSRS:New(self.SRSPath,Frequency,Modulation)
+    self.SRS = MSRS:New(Path,Frequency,Modulation,1)
     self.SRS:SetPort(self.SRSPort)
     self.SRS:SetCoalition(self.coalition)
     self.SRS:SetLabel("ACSR")
@@ -582,8 +582,7 @@ function AICSAR:SetSRSTTSRadio(OnOff,Path,Frequency,Modulation,Port,Voice,Cultur
     self.SRS:SetCulture(Culture)
     self.SRS:SetGender(Gender)
     if GoogleCredentials then
-      self.SRS:SetProviderOptionsGoogle(GoogleCredentials,GoogleCredentials)
-      self.SRS:SetProvider(MSRS.Provider.GOOGLE)
+      self.SRS:SetGoogle(GoogleCredentials)
       self.SRSGoogle = true
     end
     self.SRSQ = MSRSQUEUE:New(self.alias)
@@ -601,16 +600,14 @@ end
 function AICSAR:SetPilotTTSVoice(Voice,Culture,Gender)
  self:T(self.lid .. "SetPilotTTSVoice")
  self.SRSPilotVoice = true
- self.SRSPilot = MSRS:New(self.SRSPath,self.SRSFrequency,self.SRSModulation)
+ self.SRSPilot = MSRS:New(self.SRSPath,self.SRSFrequency,self.SRSModulation,1)
  self.SRSPilot:SetCoalition(self.coalition)
  self.SRSPilot:SetVoice(Voice)
  self.SRSPilot:SetCulture(Culture or "en-US")
  self.SRSPilot:SetGender(Gender or "male")
  self.SRSPilot:SetLabel("PILOT")
- if self.SRSGoogle then
-  local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions
-  self.SRSPilot:SetProviderOptionsGoogle(poptions.credentials,poptions.key)
-  self.SRSPilot:SetProvider(MSRS.Provider.GOOGLE)
+ if self.SRS.google then
+  self.SRSPilot:SetGoogle(self.SRS.google)
  end
  return self
 end
@@ -625,16 +622,14 @@ end
 function AICSAR:SetOperatorTTSVoice(Voice,Culture,Gender)
  self:T(self.lid .. "SetOperatorTTSVoice")
  self.SRSOperatorVoice = true
- self.SRSOperator = MSRS:New(self.SRSPath,self.SRSFrequency,self.SRSModulation)
+ self.SRSOperator = MSRS:New(self.SRSPath,self.SRSFrequency,self.SRSModulation,1)
  self.SRSOperator:SetCoalition(self.coalition)
  self.SRSOperator:SetVoice(Voice)
  self.SRSOperator:SetCulture(Culture or "en-GB")
  self.SRSOperator:SetGender(Gender or "female")
- self.SRSOperator:SetLabel("RESCUE")
- if self.SRSGoogle then
-  local poptions = self.SRS:GetProviderOptions(MSRS.Provider.GOOGLE) -- Sound.SRS#MSRS.ProviderOptions
-  self.SRSOperator:SetProviderOptionsGoogle(poptions.credentials,poptions.key)
-  self.SRSOperator:SetProvider(MSRS.Provider.GOOGLE)
+ self.SRSPilot:SetLabel("RESCUE")
+ if self.SRS.google then
+  self.SRSOperator:SetGoogle(self.SRS.google)
  end
  return self
 end

Moose Development/Moose/Functional/ATC_Ground.lua

@@ -10,7 +10,9 @@
 -- 
 -- ===
 -- 
--- ## Missions: None
+-- ## Missions:
+-- 
+-- [ABP - Airbase Police](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ABP%20-%20Airbase%20Police)
 --
 -- ===
 --
@@ -697,8 +699,7 @@ end
 function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
   self:I("_AirbaseMonitor")
   self.SetClient:ForEachClient(
-    --- Nameless function
-    -- @param Wrapper.Client#CLIENT Client
+    --- @param Wrapper.Client#CLIENT Client
     function( Client )
 
       if Client:IsAlive() then

Moose Development/Moose/Functional/AmmoTruck.lua

@@ -8,7 +8,7 @@
 --
 -- ## Missions:
 --
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/AmmoTruck)
+-- ### [AmmoTruck](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/AMT%20-%20AmmoTruck/AmmoTruck%20100%20-%20NTTR%20-%20Basic)
 --
 -- ===
 --
@@ -20,7 +20,7 @@
 -- Last update: July 2023
 
 -------------------------------------------------------------------------
---- **AMMOTRUCK** class, extends Core.Fsm#FSM
+--- **AMMOTRUCK** class, extends Core.FSM#FSM
 -- @type AMMOTRUCK
 -- @field #string ClassName Class Name
 -- @field #string lid Lid for log entries
@@ -41,7 +41,7 @@
 -- @field #number waitingtime Max waiting time in seconds
 -- @field #boolean routeonroad Route truck on road if true (default)
 -- @field #number reloads Number of reloads a single truck can do before he must return home
--- @extends Core.Fsm#FSM
+-- @extends Core.FSM#FSM
 
 --- *Amateurs talk about tactics, but professionals study logistics.* - General Robert H Barrow, USMC
 --

Moose Development/Moose/Functional/Artillery.lua

@@ -3546,7 +3546,7 @@ end
 -- @param #string To To state.
 function ARTY:onafterRespawn(Controllable, From, Event, To)
   self:_EventFromTo("onafterRespawn", Event, From, To)
-  self:I("Respawning arty group")
+
   local group=self.Controllable --Wrapper.Group#GROUP
 
   -- Respawn group.

Moose Development/Moose/Functional/Autolase.lua

@@ -5,11 +5,11 @@
 -- **AUOTLASE** - Autolase targets in the field.
 -- 
 -- ===
---
+-- 
 -- ## Missions:
 --
--- None yet.
---
+-- ### [Autolase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/)
+-- 
 -- ===
 -- 
 -- **Main Features:**
@@ -74,7 +74,7 @@
 -- @image Designation.JPG
 --
 -- Date: 24 Oct 2021
--- Last Update: Jan 2024
+-- Last Update: Oct 2023
 --
 --- Class AUTOLASE
 -- @type AUTOLASE
@@ -87,7 +87,6 @@
 -- @field Core.Set#SET_GROUP RecceSet
 -- @field #table LaserCodes
 -- @field #table playermenus
--- @field #boolean smokemenu
 -- @extends Ops.Intel#INTEL
 
 ---
@@ -98,7 +97,6 @@ AUTOLASE = {
   verbose = 0,
   alias = "",
   debug = false,
-  smokemenu = true,
 }
 
 --- Laser spot info
@@ -117,7 +115,7 @@ AUTOLASE = {
 
 --- AUTOLASE class version.
 -- @field #string version
-AUTOLASE.version = "0.1.23"
+AUTOLASE.version = "0.1.22"
 
 -------------------------------------------------------------------
 -- Begin Functional.Autolase.lua
@@ -204,7 +202,6 @@ function AUTOLASE:New(RecceSet, Coalition, Alias, PilotSet)
   self.blacklistattributes = {}
   self:SetLaserCodes( { 1688, 1130, 4785, 6547, 1465, 4578 } ) -- set self.LaserCodes
   self.playermenus = {}
-  self.smokemenu = true
   
   -- Set some string id for output to DCS.log file.
   self.lid=string.format("AUTOLASE %s (%s) | ", self.alias, self.coalition and UTILS.GetCoalitionName(self.coalition) or "unknown")
@@ -332,11 +329,9 @@ function AUTOLASE:SetPilotMenu()
         local lasetopm = MENU_GROUP:New(Group,"Autolase",nil)
         self.playermenus[unitname] = lasetopm
         local lasemenu = MENU_GROUP_COMMAND:New(Group,"Status",lasetopm,self.ShowStatus,self,Group,Unit)
-        if self.smokemenu then
-          local smoke = (self.smoketargets == true) and "off" or "on"
-          local smoketext = string.format("Switch smoke targets to %s",smoke)
-          local smokemenu = MENU_GROUP_COMMAND:New(Group,smoketext,lasetopm,self.SetSmokeTargets,self,(not self.smoketargets))
-        end
+        local smoke = (self.smoketargets == true) and "off" or "on"
+        local smoketext = string.format("Switch smoke targets to %s",smoke)
+        local smokemenu = MENU_GROUP_COMMAND:New(Group,smoketext,lasetopm,self.SetSmokeTargets,self,(not self.smoketargets))
         for _,_grp in pairs(self.RecceSet.Set) do
           local grp = _grp -- Wrapper.Group#GROUP
           local unit = grp:GetUnit(1)
@@ -448,7 +443,7 @@ end
 -- @param #string Gender (Optional) Defaults to "male"
 -- @param #string Culture (Optional) Defaults to "en-US"
 -- @param #number Port (Optional) Defaults to 5002
--- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS#SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
+-- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
 -- Note that this must be installed on your windows system. Can also be Google voice types, if you are using Google TTS.
 -- @param #number Volume (Optional) Volume - between 0.0 (silent) and 1.0 (loudest)
 -- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS
@@ -456,18 +451,18 @@ end
 function AUTOLASE:SetUsingSRS(OnOff,Path,Frequency,Modulation,Label,Gender,Culture,Port,Voice,Volume,PathToGoogleKey)
   if OnOff then
     self.useSRS = true
-    self.SRSPath = Path or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+    self.SRSPath = Path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
     self.SRSFreq = Frequency or 271
     self.SRSMod = Modulation or radio.modulation.AM
-    self.Gender = Gender or MSRS.gender or "male"
-    self.Culture = Culture or MSRS.culture or "en-US"
-    self.Port = Port or MSRS.port or 5002
+    self.Gender = Gender or "male"
+    self.Culture = Culture or "en-US"
+    self.Port = Port or 5002
     self.Voice = Voice 
     self.PathToGoogleKey = PathToGoogleKey
     self.Volume = Volume or 1.0
     self.Label = Label
     -- set up SRS
-    self.SRS = MSRS:New(self.SRSPath,self.SRSFreq,self.SRSMod)
+    self.SRS = MSRS:New(self.SRSPath,self.SRSFreq,self.SRSMod,self.Volume)
     self.SRS:SetCoalition(self.coalition)
     self.SRS:SetLabel(self.MenuName or self.Name)
     self.SRS:SetGender(self.Gender)
@@ -475,10 +470,8 @@ function AUTOLASE:SetUsingSRS(OnOff,Path,Frequency,Modulation,Label,Gender,Cultu
     self.SRS:SetPort(self.Port)
     self.SRS:SetVoice(self.Voice)
     self.SRS:SetCoalition(self.coalition)
-    self.SRS:SetVolume(self.Volume)
     if self.PathToGoogleKey then
-      self.SRS:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-      self.SRS:SetProvider(MSRS.Provider.GOOGLE)
+      self.SRS:SetGoogle(self.PathToGoogleKey)
     end
     self.SRSQueue = MSRSQUEUE:New(self.alias)
   else
@@ -586,23 +579,6 @@ function AUTOLASE:SetSmokeTargets(OnOff,Color)
   return self
 end
 
---- (User) Show the "Switch smoke target..." menu entry for pilots. On by default.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:EnableSmokeMenu()
-  self.smokemenu = true
-  return self
-end
-
---- (User) Do not show the "Switch smoke target..." menu entry for pilots.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:DisableSmokeMenu()
-  self.smokemenu = false
-  return self
-end
-
-
 --- (Internal) Function to calculate line of sight.
 -- @param #AUTOLASE self
 -- @param Wrapper.Unit#UNIT Unit 

Moose Development/Moose/Functional/CleanUp.lua

@@ -14,7 +14,7 @@
 --
 -- ## Missions:
 --
--- [CLA - CleanUp Airbase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/CleanUp)
+-- [CLA - CleanUp Airbase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CLA%20-%20CleanUp%20Airbase)
 --
 -- ===
 --

Moose Development/Moose/Functional/Designate.lua

@@ -15,12 +15,10 @@
 --  
 -- ===
 -- 
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Designate)
--- * **YouTube videos:** None
--- * **Guides:** None
---
+-- ## Missions:
+-- 
+-- [DES - Designation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/DES%20-%20Designation)
+-- 
 -- ===
 --
 -- Targets detected by recce will be communicated to a group of attacking players.  

Moose Development/Moose/Functional/Detection.lua

@@ -15,7 +15,7 @@
 --
 -- ## Missions:
 --
--- [DET - Detection](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/Detection)
+-- [DET - Detection](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/DET%20-%20Detection)
 --
 -- ===
 --
@@ -38,9 +38,8 @@
 -- @image Detection.JPG
 
 do -- DETECTION_BASE
-  
-  ---
-  -- @type DETECTION_BASE
+
+  --- @type DETECTION_BASE
   -- @field Core.Set#SET_GROUP DetectionSetGroup The @{Core.Set} of GROUPs in the Forward Air Controller role.
   -- @field DCS#Distance DetectionRange The range till which targets are accepted to be detected.
   -- @field #DETECTION_BASE.DetectedObjects DetectedObjects The list of detected objects.
@@ -92,11 +91,6 @@ do -- DETECTION_BASE
   --
   --     DetectionObject:FilterCategories( { Unit.Category.AIRPLANE, Unit.Category.HELICOPTER } )
   --
-  -- 
-  -- ## Radar Blur - use to make the radar less exact, e.g. for WWII scenarios
-  -- 
-  --  * @{#DETECTION_BASE.SetRadarBlur}(): Set the radar blur to be used.
-  --  
   -- ## **DETECTION_ derived classes** group the detected units into a **DetectedItems[]** list
   --
   -- DETECTION_BASE derived classes build a list called DetectedItems[], which is essentially a first later
@@ -274,13 +268,11 @@ do -- DETECTION_BASE
     DetectedItems = {},
     DetectedItemsByIndex = {},
   }
-  
-  ---
-  -- @type DETECTION_BASE.DetectedObjects
+
+  --- @type DETECTION_BASE.DetectedObjects
   -- @list <#DETECTION_BASE.DetectedObject>
 
-  ---
-  -- @type DETECTION_BASE.DetectedObject
+  --- @type DETECTION_BASE.DetectedObject
   -- @field #string Name
   -- @field #boolean IsVisible
   -- @field #boolean KnowType
@@ -291,9 +283,8 @@ do -- DETECTION_BASE
   -- @field #number LastTime
   -- @field #boolean LastPos
   -- @field #number LastVelocity
-  
-  ---
-  -- @type DETECTION_BASE.DetectedItems
+
+  --- @type DETECTION_BASE.DetectedItems
   -- @list <#DETECTION_BASE.DetectedItem>
 
   --- Detected item data structure.
@@ -531,7 +522,7 @@ do -- DETECTION_BASE
 
   do -- State Transition Handling
 
-    -- @param #DETECTION_BASE self
+    --- @param #DETECTION_BASE self
     -- @param #string From The From State string.
     -- @param #string Event The Event string.
     -- @param #string To The To State string.
@@ -539,7 +530,7 @@ do -- DETECTION_BASE
       self:__Detect( 1 )
     end
 
-    -- @param #DETECTION_BASE self
+    --- @param #DETECTION_BASE self
     -- @param #string From The From State string.
     -- @param #string Event The Event string.
     -- @param #string To The To State string.
@@ -579,7 +570,7 @@ do -- DETECTION_BASE
 
     end
 
-    -- @param #DETECTION_BASE self
+    --- @param #DETECTION_BASE self
     -- @param #number The amount of alive recce.
     function DETECTION_BASE:CountAliveRecce()
 
@@ -587,7 +578,7 @@ do -- DETECTION_BASE
 
     end
 
-    -- @param #DETECTION_BASE self
+    --- @param #DETECTION_BASE self
     function DETECTION_BASE:ForEachAliveRecce( IteratorFunction, ... )
       self:F2( arg )
 
@@ -596,7 +587,7 @@ do -- DETECTION_BASE
       return self
     end
 
-    -- @param #DETECTION_BASE self
+    --- @param #DETECTION_BASE self
     -- @param #string From The From State string.
     -- @param #string Event The Event string.
     -- @param #string To The To State string.
@@ -721,31 +712,6 @@ do -- DETECTION_BASE
                 end
               end
               
-              -- Calculate radar blur probability
-              
-              if self.RadarBlur then
-                MESSAGE:New("Radar Blur",10):ToLogIf(self.debug):ToAllIf(self.verbose)
-                local minheight = self.RadarBlurMinHeight or 250 -- meters
-                local thresheight = self.RadarBlurThresHeight or 90 -- 10% chance to find a low flying group
-                local thresblur = self.RadarBlurThresBlur or 85 -- 25% chance to escape the radar overall
-                local dist = math.floor(Distance)
-                if dist <= self.RadarBlurClosing  then
-                  thresheight = (((dist*dist)/self.RadarBlurClosingSquare)*thresheight)
-                  thresblur = (((dist*dist)/self.RadarBlurClosingSquare)*thresblur)
-                end
-                local fheight = math.floor(math.random(1,10000)/100)
-                local fblur = math.floor(math.random(1,10000)/100)
-                local unit = UNIT:FindByName(DetectedObjectName)
-                if unit and unit:IsAlive() then
-                  local AGL = unit:GetAltitude(true)
-                  MESSAGE:New("Unit "..DetectedObjectName.." is at "..math.floor(AGL).."m. Distance "..math.floor(Distance).."km.",10):ToLogIf(self.debug):ToAllIf(self.verbose)
-                  MESSAGE:New(string.format("fheight = %d/%d | fblur = %d/%d",fheight,thresheight,fblur,thresblur),10):ToLogIf(self.debug):ToAllIf(self.verbose)
-                  if fblur > thresblur then DetectionAccepted = false end
-                  if AGL <= minheight and fheight < thresheight then DetectionAccepted = false end  
-                  MESSAGE:New("Detection Accepted = "..tostring(DetectionAccepted),10):ToLogIf(self.debug):ToAllIf(self.verbose)              
-                end
-              end
-              
               -- Calculate additional probabilities
               
               if not self.DetectedObjects[DetectedObjectName] and TargetIsVisible and self.DistanceProbability then
@@ -1045,24 +1011,7 @@ do -- DETECTION_BASE
       return self
 
     end
-    
-    --- Method to make the radar detection less accurate, e.g. for WWII scenarios.
-    -- @param #DETECTION_BASE self
-    -- @param #number minheight Minimum flight height to be detected, in meters AGL (above ground)
-    -- @param #number thresheight Threshold to escape the radar if flying below minheight, defaults to 90 (90% escape chance)
-    -- @param #number thresblur Threshold to be detected by the radar overall, defaults to 85 (85% chance to be found)
-    -- @param #number closing Closing-in in km - the limit of km from which on it becomes increasingly difficult to escape radar detection if flying towards the radar position. Should be about 1/3 of the radar detection radius in kilometers, defaults to 20.
-    -- @return #DETECTION_BASE self
-    function DETECTION_BASE:SetRadarBlur(minheight,thresheight,thresblur,closing)
-      self.RadarBlur = true
-      self.RadarBlurMinHeight = minheight or 250 -- meters
-      self.RadarBlurThresHeight = thresheight or 90 -- 10% chance to find a low flying group
-      self.RadarBlurThresBlur = thresblur or 85 -- 25% chance to escape the radar overall
-      self.RadarBlurClosing = closing or 20 -- 20km
-      self.RadarBlurClosingSquare = self.RadarBlurClosing * self.RadarBlurClosing 
-      return self
-    end
-    
+
   end
 
   do
@@ -1405,7 +1354,7 @@ do -- DETECTION_BASE
           }
         }
 
-        -- @param DCS#Unit FoundDCSUnit
+        --- @param DCS#Unit FoundDCSUnit
         -- @param Wrapper.Group#GROUP ReportGroup
         -- @param Core.Set#SET_GROUP ReportSetGroup
         local FindNearByFriendlies = function( FoundDCSUnit, ReportGroupData )
@@ -1470,7 +1419,7 @@ do -- DETECTION_BASE
         DetectedItem.PlayersNearBy = nil
 
         _DATABASE:ForEachPlayer(
-        -- @param Wrapper.Unit#UNIT PlayerUnit
+        --- @param Wrapper.Unit#UNIT PlayerUnit
         function( PlayerUnitName )
           local PlayerUnit = UNIT:FindByName( PlayerUnitName )
 
@@ -2026,9 +1975,8 @@ do -- DETECTION_BASE
 end
 
 do -- DETECTION_UNITS
-  
-  ---
-  -- @type DETECTION_UNITS
+
+  --- @type DETECTION_UNITS
   -- @field DCS#Distance DetectionRange The range till which targets are detected.
   -- @extends Functional.Detection#DETECTION_BASE
 
@@ -2283,9 +2231,8 @@ do -- DETECTION_UNITS
 end
 
 do -- DETECTION_TYPES
-  
-  ---
-  -- @type DETECTION_TYPES
+
+  --- @type DETECTION_TYPES
   -- @extends Functional.Detection#DETECTION_BASE
 
   --- Will detect units within the battle zone.
@@ -2487,9 +2434,8 @@ do -- DETECTION_TYPES
 end
 
 do -- DETECTION_AREAS
-  
-  ---
-  -- @type DETECTION_AREAS
+
+  --- @type DETECTION_AREAS
   -- @field DCS#Distance DetectionZoneRange The range till which targets are grouped upon the first detected target.
   -- @field #DETECTION_BASE.DetectedItems DetectedItems A list of areas containing the set of @{Wrapper.Unit}s, @{Core.Zone}s, the center @{Wrapper.Unit} within the zone, and ID of each area that was detected within a DetectionZoneRange.
   -- @extends Functional.Detection#DETECTION_BASE
@@ -3015,7 +2961,7 @@ do -- DETECTION_AREAS
 
       -- DetectedSet:Flush( self )
 
-      DetectedSet:ForEachUnit(  -- @param Wrapper.Unit#UNIT DetectedUnit
+      DetectedSet:ForEachUnit(  --- @param Wrapper.Unit#UNIT DetectedUnit
       function( DetectedUnit )
         if DetectedUnit:IsAlive() then
           -- self:T( "Detected Set #" .. DetectedItem.ID .. ":" .. DetectedUnit:GetName() )

Moose Development/Moose/Functional/Escort.lua

@@ -16,13 +16,11 @@
 --   * Escort tactical situation reporting.
 -- 
 -- ===
---
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Escort)
--- * **YouTube videos:** None
--- * **Guides:** None
---
+-- 
+-- ## Missions:
+-- 
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
+-- 
 -- ===
 -- 
 -- Allows you to interact with escorting AI on your flight and take the lead.

Moose Development/Moose/Functional/Mantis.lua

@@ -13,7 +13,7 @@
 --
 -- ## Missions:
 --
--- ### [MANTIS - Modular, Automatic and Network capable Targeting and Interception System](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Mantis)
+-- ### [MANTIS - Modular, Automatic and Network capable Targeting and Interception System](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/MTS%20-%20Mantis/MTS-010%20-%20Basic%20Mantis%20Demo)
 --
 -- ===
 --
@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
--- Last Update: Dec 2023
+-- Last Update: Nov 2023
 
 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -94,7 +94,7 @@
 -- Known SAM types at the time of writing are:
 -- 
 -- * Avenger
--- * Chaparral
+-- * Chaparrel
 -- * Hawk
 -- * Linebacker
 -- * NASAMS
@@ -365,7 +365,7 @@ MANTIS.SamData = {
   ["SA-15"] = { Range=11, Blindspot=0, Height=6, Type="Short", Radar="Tor 9A331" },
   ["SA-13"] = { Range=5, Blindspot=0, Height=3, Type="Short", Radar="Strela" },
   ["Avenger"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="Avenger" },
-  ["Chaparral"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Chaparral" },
+  ["Chaparrel"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Chaparral" },
   ["Linebacker"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="Linebacker" },
   ["Silkworm"] = { Range=90, Blindspot=1, Height=0.2, Type="Long", Radar="Silkworm" },
   -- units from HDS Mod, multi launcher options is tricky
@@ -631,7 +631,7 @@ do
     
     -- TODO Version
     -- @field #string version
-    self.version="0.8.16"
+    self.version="0.8.15"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
 
     --- FSM Functions ---
@@ -1149,7 +1149,7 @@ do
         --self:T(self.lid.." Relocating HQ")
         local text = self.lid.." Relocating HQ"
         --local m= MESSAGE:New(text,10,"MANTIS"):ToAll()
-          _hqgrp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
+          _hqgrp:RelocateGroundRandomInRadius(20,500,true,true)
       end
       --relocate EWR
       -- TODO: maybe dependent on AlarmState? Observed: SA11 SR only relocates if no objects in reach
@@ -1163,7 +1163,7 @@ do
               local text = self.lid.." Relocating EWR ".._grp:GetName()
               local m= MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
               if self.verbose then self:I(text) end
-              _grp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
+              _grp:RelocateGroundRandomInRadius(20,500,true,true)
              end
          end
       end

Moose Development/Moose/Functional/MissileTrainer.lua

@@ -14,7 +14,7 @@
 --
 -- ## Missions:
 --
--- [MIT - Missile Trainer](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/MissileTrainer)
+-- [MIT - Missile Trainer](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/MIT%20-%20Missile%20Trainer)
 --
 -- ===
 --

Moose Development/Moose/Functional/RAT.lua

@@ -33,11 +33,16 @@
 --
 -- ===
 --
--- ## Additional Material:
+-- ## Missions:
 --
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/RAT)
--- * **YouTube videos:** [Random Air Traffic](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0u4Zxywtg-mx_ov4vi68CO)
--- * **Guides:** None
+-- ### [RAT - Random Air Traffic](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/RAT%20-%20Random%20Air%20Traffic)
+--
+-- ===
+--
+-- # YouTube Channel
+--
+-- ### [MOOSE YouTube Channel](https://www.youtube.com/channel/UCjrA9j5LQoWsG4SpS8i79Qg)
+-- ### [MOOSE - RAT - Random Air Traffic](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0u4Zxywtg-mx_ov4vi68CO)
 --
 -- ===
 --
@@ -165,7 +170,7 @@
 --
 -- * A specific departure and/or destination airport can be chosen.
 -- * Valid coalitions can be set, e.g. only red, blue or neutral, all three "colours".
--- * It is possible to start in air within a zone or within a zone above an airport of the map.
+-- * It is possible to start in air within a zone defined in the mission editor or within a zone above an airport of the map.
 --
 -- ## Flight Plan
 --
@@ -1174,13 +1179,13 @@ function RAT:SetTakeoffAir()
   return self
 end
 
---- Set possible departure ports. This can be an airport or a zone.
+--- Set possible departure ports. This can be an airport or a zone defined in the mission editor.
 -- @param #RAT self
 -- @param #string departurenames Name or table of names of departure airports or zones.
 -- @return #RAT RAT self object.
 -- @usage RAT:SetDeparture("Sochi-Adler") will spawn RAT objects at Sochi-Adler airport.
 -- @usage RAT:SetDeparture({"Sochi-Adler", "Gudauta"}) will spawn RAT aircraft radomly at Sochi-Adler or Gudauta airport.
--- @usage RAT:SetDeparture({"Zone A", "Gudauta"}) will spawn RAT aircraft in air randomly within Zone A, or within a zone around Gudauta airport. Note that this also requires RAT:takeoff("air") to be set.
+-- @usage RAT:SetDeparture({"Zone A", "Gudauta"}) will spawn RAT aircraft in air randomly within Zone A, which has to be defined in the mission editor, or within a zone around Gudauta airport. Note that this also requires RAT:takeoff("air") to be set.
 function RAT:SetDeparture(departurenames)
   self:F2(departurenames)
 
@@ -2532,7 +2537,7 @@ function RAT:_SetRoute(takeoff, landing, _departure, _destination, _waypoint)
       end
     elseif self:_ZoneExists(_departure) then
       -- If it's not an airport, check whether it's a zone.
-      departure=ZONE:FindByName(_departure)
+      departure=ZONE:New(_departure)
     else
       local text=string.format("ERROR! Specified departure airport %s does not exist for %s.", _departure, self.alias)
       self:E(RAT.id..text)
@@ -2630,7 +2635,7 @@ function RAT:_SetRoute(takeoff, landing, _departure, _destination, _waypoint)
       end
 
     elseif self:_ZoneExists(_destination) then
-      destination=ZONE:FindByName(_destination)
+      destination=ZONE:New(_destination)
     else
       local text=string.format("ERROR: Specified destination airport/zone %s does not exist for %s!", _destination, self.alias)
       self:E(RAT.id.."ERROR: "..text)
@@ -3137,7 +3142,7 @@ function RAT:_PickDeparture(takeoff)
         end
       elseif self:_ZoneExists(name) then
         if takeoff==RAT.wp.air then
-          dep=ZONE:FindByName(name)
+          dep=ZONE:New(name)
         else
           self:E(RAT.id..string.format("ERROR! Takeoff is not in air. Cannot use %s as departure.", name))
         end
@@ -3249,7 +3254,7 @@ function RAT:_PickDestination(departure, q, minrange, maxrange, random, landing)
           end
         elseif self:_ZoneExists(name) then
           if landing==RAT.wp.air then
-            dest=ZONE:FindByName(name)
+            dest=ZONE:New(name)
           else
             self:E(RAT.id..string.format("ERROR! Landing is not in air. Cannot use zone %s as destination!", name))
           end
@@ -4925,12 +4930,12 @@ function RAT:_AirportExists(name)
   return false
 end
 
---- Test if a zone exists.
+--- Test if a trigger zone defined in the mission editor exists.
 -- @param #RAT self
 -- @param #string name
 -- @return #boolean True if zone exsits, false otherwise.
 function RAT:_ZoneExists(name)
-  local z=ZONE:FindByName(name) --trigger.misc.getZone(name) as suggested by @Viking on MOOSE discord #rat
+  local z=trigger.misc.getZone(name)
   if z then
     return true
   end

Moose Development/Moose/Functional/Range.lua

@@ -1207,29 +1207,25 @@ end
 -- @return #RANGE self
 function RANGE:SetSRS(PathToSRS, Port, Coalition, Frequency, Modulation, Volume, PathToGoogleKey)
 
-  if PathToSRS or MSRS.path then
+  if PathToSRS then
   
     self.useSRS=true
     
-    self.controlmsrs=MSRS:New(PathToSRS or MSRS.path, Frequency or 256, Modulation or radio.modulation.AM)
-    self.controlmsrs:SetPort(Port or MSRS.port)
+    self.controlmsrs=MSRS:New(PathToSRS, Frequency or 256, Modulation or radio.modulation.AM, Volume or 1.0)
+    self.controlmsrs:SetPort(Port)
     self.controlmsrs:SetCoalition(Coalition or coalition.side.BLUE)
     self.controlmsrs:SetLabel("RANGEC")
-    self.controlmsrs:SetVolume(Volume or 1.0)
     self.controlsrsQ = MSRSQUEUE:New("CONTROL")
 
-    self.instructmsrs=MSRS:New(PathToSRS or MSRS.path, Frequency or 305, Modulation or radio.modulation.AM)
-    self.instructmsrs:SetPort(Port or MSRS.port)
+    self.instructmsrs=MSRS:New(PathToSRS, Frequency or 305, Modulation or radio.modulation.AM, Volume or 1.0)
+    self.instructmsrs:SetPort(Port)
     self.instructmsrs:SetCoalition(Coalition or coalition.side.BLUE)
     self.instructmsrs:SetLabel("RANGEI")
-    self.instructmsrs:SetVolume(Volume or 1.0)
     self.instructsrsQ = MSRSQUEUE:New("INSTRUCT")
     
     if PathToGoogleKey then 
-      self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-      self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE)
-      self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-      self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE)
+      self.controlmsrs:SetGoogle(PathToGoogleKey)
+      self.instructmsrs:SetGoogle(PathToGoogleKey)
     end
     
   else
@@ -1741,9 +1737,7 @@ end
 -- @param Core.Event#EVENTDATA EventData
 function RANGE:OnEventBirth( EventData )
   self:F( { eventbirth = EventData } )
-  
-  if not EventData.IniPlayerName then return end
-  
+
   local _unitName = EventData.IniUnitName
   local _unit, _playername = self:_GetPlayerUnitAndName( _unitName )
 
@@ -2193,7 +2187,7 @@ function RANGE:onafterExitRange( From, Event, To, player )
     
       local text = "You left the bombing range zone. "
       
-      local r=math.random(5)
+      local r=math.random(2)
       
       if r==1 then
         text=text.."Have a nice day!"

Moose Development/Moose/Functional/Scoring.lua

@@ -19,7 +19,7 @@
 --
 -- ## Missions:
 --
--- [SCO - Scoring](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Scoring)
+-- [SCO - Scoring](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SCO%20-%20Scoring)
 --
 -- ===
 --
@@ -276,15 +276,9 @@ function SCORING:New( GameName )
   self:SetMessagesZone( true )
 
   -- Scales
-  
   self:SetScaleDestroyScore( 10 )
   self:SetScaleDestroyPenalty( 30 )
 
-  -- Hitting a target multiple times before destoying it should not result in a higger score
-  -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
-  -- Making this configurable to anyone can enable this anyway if they want
-  self:SetScoreIncrementOnHit(0)
-
   -- Default fratricide penalty level (maximum penalty that can be assigned to a player before he gets kicked).
   self:SetFratricide( self.ScaleDestroyPenalty * 3 )
   self.penaltyonfratricide = true
@@ -473,16 +467,6 @@ function SCORING:SetMessagesHit( OnOff )
   return self
 end
 
---- Configure to increment score after a target has been hit.
--- @param #SCORING self
--- @param #number score  amount of point to inclement score on each hit
--- @return #SCORING
-function SCORING:SetScoreIncrementOnHit( score )
-
-  self.ScoreIncrementOnHit = score
-  return self
-end
-
 --- If to send messages after a target has been hit.
 -- @param #SCORING self
 -- @return #boolean
@@ -901,7 +885,6 @@ function SCORING:OnEventBirth( Event )
       Event.IniUnit.BirthTime = timer.getTime()
       if PlayerName then
         self:_AddPlayerFromUnit( Event.IniUnit )
-        self.Players[PlayerName].PlayerKills = 0
         self:SetScoringMenu( Event.IniGroup )
       end
     end
@@ -1032,7 +1015,7 @@ function SCORING:_EventOnHit( Event )
         PlayerHit.UNIT = PlayerHit.UNIT or TargetUNIT
         -- After an instant kill we can't compute the thread level anymore. To fix this we compute at OnEventBirth
         if PlayerHit.UNIT.ThreatType == nil then
-          PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
+        PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
           -- if this fails for some reason, set a good default value
           if PlayerHit.ThreatType == nil then
             PlayerHit.ThreatLevel = 1
@@ -1042,7 +1025,7 @@ function SCORING:_EventOnHit( Event )
           PlayerHit.ThreatLevel = PlayerHit.UNIT.ThreatLevel
           PlayerHit.ThreatType = PlayerHit.UNIT.ThreatType
         end
-        
+
         -- Only grant hit scores if there was more than one second between the last hit.        
         if timer.getTime() - PlayerHit.TimeStamp > 1 then
           PlayerHit.TimeStamp = timer.getTime()
@@ -1077,8 +1060,10 @@ function SCORING:_EventOnHit( Event )
               end
               self:ScoreCSV( InitPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, InitUnitName, InitUnitCoalition, InitUnitCategory, InitUnitType, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType )
             else
-              Player.Score = Player.Score + self.ScoreIncrementOnHit
-              PlayerHit.Score = PlayerHit.Score + self.ScoreIncrementOnHit
+              -- Hitting a target multiple times before destoying it should not result in a higger score
+              -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
+              -- Player.Score = Player.Score + 1
+              -- PlayerHit.Score = PlayerHit.Score + 1
               PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1
               if TargetPlayerName ~= nil then -- It is a player hitting another player ...
                 MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit enemy player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " .. PlayerHit.ScoreHit .. " times. " ..
@@ -1143,7 +1128,7 @@ function SCORING:_EventOnHit( Event )
         PlayerHit.UNIT = PlayerHit.UNIT or TargetUNIT
         -- After an instant kill we can't compute the thread level anymore. To fix this we compute at OnEventBirth
         if PlayerHit.UNIT.ThreatType == nil then
-          PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
+        PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
           -- if this fails for some reason, set a good default value
           if PlayerHit.ThreatType == nil then
             PlayerHit.ThreatLevel = 1
@@ -1178,8 +1163,10 @@ function SCORING:_EventOnHit( Event )
                 :ToCoalitionIf( Event.WeaponCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )
               self:ScoreCSV( Event.WeaponPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, Event.WeaponName, Event.WeaponCoalition, Event.WeaponCategory, Event.WeaponTypeName, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType )
             else
-              Player.Score = Player.Score + self.ScoreIncrementOnHit
-              PlayerHit.Score = PlayerHit.Score + self.ScoreIncrementOnHit
+              -- Hitting a target multiple times before destoying it should not result in a higger score
+              -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
+              -- Player.Score = Player.Score + 1
+              -- PlayerHit.Score = PlayerHit.Score + 1
               PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. Event.WeaponPlayerName .. "' hit enemy target " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " ..
                                "Score: " .. PlayerHit.Score .. ".  Score Total:" .. Player.Score - Player.Penalty,
@@ -1287,18 +1274,13 @@ function SCORING:_EventOnDeadOrCrash( Event )
             TargetDestroy.Penalty = TargetDestroy.Penalty + ThreatPenalty
             TargetDestroy.PenaltyDestroy = TargetDestroy.PenaltyDestroy + 1
 
-
-            self:OnKillPvP(Player, TargetPlayerName, true, TargetThreatLevel, Player.ThreatLevel, ThreatPenalty)
-
             if Player.HitPlayers[TargetPlayerName] then -- A player destroyed another player
-              self:OnKillPvP(Player, TargetPlayerName, true)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed friendly player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Penalty: -" .. ThreatPenalty .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
                      :ToAllIf( self:IfMessagesDestroy() and self:IfMessagesToAll() )
                      :ToCoalitionIf( InitCoalition, self:IfMessagesDestroy() and self:IfMessagesToCoalition() )
             else
-              self:OnKillPvE(Player, TargetUnitName, true, TargetThreatLevel, Player.ThreatLevel, ThreatPenalty)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed friendly target " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Penalty: -" .. ThreatPenalty .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
@@ -1321,19 +1303,12 @@ function SCORING:_EventOnDeadOrCrash( Event )
             TargetDestroy.Score = TargetDestroy.Score + ThreatScore
             TargetDestroy.ScoreDestroy = TargetDestroy.ScoreDestroy + 1
             if Player.HitPlayers[TargetPlayerName] then -- A player destroyed another player
-              if Player.PlayerKills ~= nil then
-                Player.PlayerKills = Player.PlayerKills + 1
-              else
-                Player.PlayerKills = 1
-              end
-              self:OnKillPvP(Player, TargetPlayerName, false, TargetThreatLevel, Player.ThreatLevel, ThreatScore)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed enemy player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Score: +" .. ThreatScore .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
                      :ToAllIf( self:IfMessagesDestroy() and self:IfMessagesToAll() )
                      :ToCoalitionIf( InitCoalition, self:IfMessagesDestroy() and self:IfMessagesToCoalition() )
             else
-              self:OnKillPvE(Player, TargetUnitName, false, TargetThreatLevel, Player.ThreatLevel, ThreatScore)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed enemy " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Score: +" .. ThreatScore .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
@@ -1932,26 +1907,3 @@ function SCORING:SwitchAutoSave(OnOff)
   self.AutoSave = OnOff
   return self
 end
-
---- Handles the event when one player kill another player
--- @param #SCORING self
--- @param #PLAYER Player the ataching player
--- @param #string TargetPlayerName the name of the killed player
--- @param #bool IsTeamKill true if this kill was a team kill
--- @param #number TargetThreatLevel Thread level of the target
--- @param #number PlayerThreatLevelThread level of the player
--- @param #number Score The score based on both threat levels
-function SCORING:OnKillPvP(Player, TargetPlayerName, IsTeamKill, TargetThreatLevel, PlayerThreatLevel, Score)
-  
-end
---- Handles the event when one player kill another player
--- @param #SCORING self
--- @param #PLAYER Player the ataching player
--- @param #string TargetUnitName the name of the killed unit
--- @param #bool IsTeamKill true if this kill was a team kill
--- @param #number TargetThreatLevel Thread level of the target
--- @param #number PlayerThreatLevelThread level of the player
--- @param #number Score The score based on both threat levels
-function SCORING:OnKillPvE(Player, TargetUnitName, IsTeamKill, TargetThreatLevel, PlayerThreatLevel, Score)
-  
-end

Moose Development/Moose/Functional/Sead.lua

@@ -13,13 +13,13 @@
 --
 -- ## Missions:
 --
--- [SEV - SEAD Evasion](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Sead)
+-- [SEV - SEAD Evasion](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SEV%20-%20SEAD%20Evasion)
 --
 -- ===
 --
--- ### Authors: **applevangelist**, **FlightControl**
+-- ### Authors: **FlightControl**, **applevangelist**
 --
--- Last Update: Dec 2023
+-- Last Update: Oct 2023
 --
 -- ===
 --
@@ -144,7 +144,7 @@ function SEAD:New( SEADGroupPrefixes, Padding )
   self:AddTransition("*",             "ManageEvasion",                "*")
   self:AddTransition("*",             "CalculateHitZone",             "*")
   
-  self:I("*** SEAD - Started Version 0.4.6")
+  self:I("*** SEAD - Started Version 0.4.5")
   return self
 end
 
@@ -401,7 +401,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
             grp:EnableEmission(false)
           end
           grp:OptionAlarmStateGreen() -- needed else we cannot move around
-          grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond",true)
+          grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond")
           if self.UseCallBack then
             local object = self.CallBack
             object:SeadSuppressionStart(grp,name,attacker)

Moose Development/Moose/Functional/Shorad.lua

@@ -11,7 +11,7 @@
 -- 
 -- ## Missions:
 --
--- ### [SHORAD - Short Range Air Defense](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Shorad)
+-- ### [SHORAD - Short Range Air Defense](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SRD%20-%20SHORAD%20Defense)
 -- 
 -- ===
 -- 

Moose Development/Moose/Functional/Tiresias.lua

@@ -1,590 +0,0 @@
---- **Functional** - TIRESIAS - manages AI behaviour.
---
--- ===
--- 
--- The @{#TIRESIAS} class is working in the back to keep your large-scale ground units in check.
--- 
--- ## Features:
---
---  * Designed to keep CPU and Network usage lower on missions with a lot of ground units.
---  * Does not affect ships to keep the Navy guys happy.
---  * Does not affect OpsGroup type groups.
---  * Distinguishes between SAM groups, AAA groups and other ground groups.
---  * Exceptions can be defined to keep certain actions going.
---  * Works coalition-independent in the back
---  * Easy setup.
---
--- ===
---
--- ## Missions:
---
--- ### [TIRESIAS](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master)
---
--- ===
---
--- ### Author : **applevangelist **
---
--- @module Functional.Tiresias
--- @image Functional.Tiresias.jpg
---
--- Last Update: Dec 2023
-
--------------------------------------------------------------------------
---- **TIRESIAS** class, extends Core.Base#BASE
--- @type TIRESIAS
--- @field #string ClassName
--- @field #booelan debug
--- @field #string version
--- @field #number Interval
--- @field Core.Set#SET_GROUP GroundSet
--- @field #number Coalition
--- @field Core.Set#SET_GROUP VehicleSet
--- @field Core.Set#SET_GROUP AAASet
--- @field Core.Set#SET_GROUP SAMSet
--- @field Core.Set#SET_GROUP ExceptionSet
--- @field Core.Set#SET_OPSGROUP OpsGroupSet
--- @field #number AAARange
--- @field #number HeloSwitchRange
--- @field #number PlaneSwitchRange
--- @field Core.Set#SET_GROUP FlightSet
--- @field #boolean SwitchAAA 
--- @extends Core.Fsm#FSM
-
----
--- @type TIRESIAS.Data
--- @field #string type
--- @field #number range
--- @field #boolean invisible
--- @field #boolean AIOff
--- @field #boolean exception
-
-
---- *Tiresias, Greek demi-god and shapeshifter, blinded by the Gods, works as oracle for you.* (Wiki)
---
--- ===
---
--- ## TIRESIAS Concept
--- 
---  * Designed to keep CPU and Network usage lower on missions with a lot of ground units.
---  * Does not affect ships to keep the Navy guys happy.
---  * Does not affect OpsGroup type groups.
---  * Distinguishes between SAM groups, AAA groups and other ground groups.
---  * Exceptions can be defined in SET_GROUP objects to keep certain actions going.
---  * Works coalition-independent in the back
---  * Easy setup.
--- 
--- ## Setup
--- 
--- Setup is a one-liner:
--- 
---          local blinder = TIRESIAS:New()
---          
--- Optionally you can set up exceptions, e.g. for convoys driving around
--- 
---          local exceptionset = SET_GROUP:New():FilterCoalitions("red"):FilterPrefixes("Convoy"):FilterStart()
---          local blinder = TIRESIAS:New()
---          blinder:AddExceptionSet(exceptionset)
--- 
--- Options 
--- 
---          -- Setup different radius for activation around helo and airplane groups (applies to AI and humans)
---          blinder:SetActivationRanges(10,25) -- defaults are 10, and 25
---
---          -- Setup engagement ranges for AAA (non-advanced SAM units like Flaks etc) and if you want them to be AIOff
---          blinder:SetAAARanges(60,true) -- defaults are 60, and true
---
--- @field #TIRESIAS
-TIRESIAS = {
-  ClassName = "TIRESIAS",
-  debug = false,
-  version = "0.0.4",
-  Interval = 20,
-  GroundSet = nil,
-  VehicleSet = nil,
-  AAASet = nil,
-  SAMSet = nil,
-  ExceptionSet = nil,
-  AAARange = 60, -- 60%
-  HeloSwitchRange = 10, -- NM
-  PlaneSwitchRange = 25, -- NM
-  SwitchAAA = true,
-}
-
---- [USER] Create a new Tiresias object and start it up.
--- @param #TIRESIAS self
--- @return #TIRESIAS self 
-function TIRESIAS:New()
-  
-    -- Inherit everything from FSM class.
-    local self = BASE:Inherit(self, FSM:New()) -- #TIRESIAS
-    
-    --- FSM Functions ---
-
-    -- Start State.
-    self:SetStartState("Stopped")
-
-    -- Add FSM transitions.
-    --                 From State  -->   Event            -->     To State
-    self:AddTransition("Stopped",       "Start",                   "Running")     -- Start FSM.
-    self:AddTransition("*",             "Status",                  "*")           -- TIRESIAS status update.
-    self:AddTransition("*",             "Stop",                    "Stopped")     -- Stop FSM.
-    
-    self.ExceptionSet = SET_GROUP:New():Clear(false)
-    
-    self:HandleEvent(EVENTS.PlayerEnterAircraft,self._EventHandler)
-    
-    self.lid = string.format("TIRESIAS %s | ",self.version)
-    
-    self:I(self.lid.."Managing ground groups!")
-    
-    --- Triggers the FSM event "Stop". Stops TIRESIAS and all its event handlers.
-    -- @function [parent=#TIRESIAS] Stop
-    -- @param #TIRESIAS self
-
-    --- Triggers the FSM event "Stop" after a delay. Stops TIRESIAS and all its event handlers.
-    -- @function [parent=#TIRESIAS] __Stop
-    -- @param #TIRESIAS self
-    -- @param #number delay Delay in seconds.
-    
-    --- Triggers the FSM event "Start". Starts TIRESIAS and all its event handlers. Note - `:New()` already starts the instance.
-    -- @function [parent=#TIRESIAS] Start
-    -- @param #TIRESIAS self
-
-    --- Triggers the FSM event "Start" after a delay. Starts TIRESIAS and all its event handlers. Note - `:New()` already starts the instance.
-    -- @function [parent=#TIRESIAS] __Start
-    -- @param #TIRESIAS self
-    -- @param #number delay Delay in seconds.  
-    
-    self:__Start(1)
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------
---
--- Helper Functions
--- 
--------------------------------------------------------------------------------------------------------------
-
----[USER] Set activation radius for Helos and Planes in Nautical Miles.
--- @param #TIRESIAS self
--- @param #number HeloMiles Radius around a Helicopter in which AI ground units will be activated. Defaults to 10NM.
--- @param #number PlaneMiles Radius around an Airplane in which AI ground units will be activated. Defaults to 25NM.
--- @return #TIRESIAS self 
-function TIRESIAS:SetActivationRanges(HeloMiles,PlaneMiles)
-  self.HeloSwitchRange = HeloMiles or 10
-  self.PlaneSwitchRange = PlaneMiles or 25
-  return self
-end
-
----[USER] Set AAA Ranges - AAA equals non-SAM systems which qualify as AAA in DCS world.
--- @param #TIRESIAS self
--- @param #number FiringRange The engagement range that AAA units will be set to. Can be 0 to 100 (percent). Defaults to 60.
--- @param #boolean SwitchAAA Decide if these system will have their AI switched off, too. Defaults to true.
--- @return #TIRESIAS self 
-function TIRESIAS:SetAAARanges(FiringRange,SwitchAAA)
-  self.AAARange = FiringRange or 60
-  self.SwitchAAA = (SwitchAAA == false) and false or true
-  return self
-end
-
---- [USER] Add a SET_GROUP of GROUP objects as exceptions. Can be done multiple times.
--- @param #TIRESIAS self
--- @param Core.Set#SET_GROUP Set to add to the exception list.
--- @return #TIRESIAS self
-function TIRESIAS:AddExceptionSet(Set)
-  self:T(self.lid.."AddExceptionSet")
-  local exceptions = self.ExceptionSet
-  Set:ForEachGroupAlive(
-    function(grp)
-      if not grp.Tiresias then
-        grp.Tiresias = { -- #TIRESIAS.Data
-          type = "Exception",
-          exception = true,
-        }
-       exceptions:AddGroup(grp,true)
-      end
-      BASE:I("TIRESIAS: Added exception group: "..grp:GetName())
-    end
-  )  
-  return self
-end
-
---- [INTERNAL] Filter Function
--- @param Wrapper.Group#GROUP Group
--- @return #boolean isin
-function TIRESIAS._FilterNotAAA(Group)
-  local grp = Group -- Wrapper.Group#GROUP
-  local isaaa = grp:IsAAA()
-  if isaaa == true and grp:IsGround() and not grp:IsShip() then 
-    return false -- remove from SET
-  else
-    return true -- keep in SET
-  end
-end
-
---- [INTERNAL] Filter Function
--- @param Wrapper.Group#GROUP Group
--- @return #boolean isin
-function TIRESIAS._FilterNotSAM(Group)
-  local grp = Group -- Wrapper.Group#GROUP
-  local issam = grp:IsSAM()
-  if issam == true and grp:IsGround() and not grp:IsShip()  then 
-    return false -- remove from SET
-  else
-    return true -- keep in SET
-  end
-end
-
---- [INTERNAL] Filter Function
--- @param Wrapper.Group#GROUP Group
--- @return #boolean isin
-function TIRESIAS._FilterAAA(Group)
-  local grp = Group -- Wrapper.Group#GROUP
-  local isaaa = grp:IsAAA()
-  if isaaa == true and grp:IsGround() and not grp:IsShip() then 
-    return true -- remove from SET
-  else
-    return false -- keep in SET
-  end
-end
-
---- [INTERNAL] Filter Function
--- @param Wrapper.Group#GROUP Group
--- @return #boolean isin
-function TIRESIAS._FilterSAM(Group)
-  local grp = Group -- Wrapper.Group#GROUP
-  local issam = grp:IsSAM()
-  if issam == true and grp:IsGround() and not grp:IsShip()  then 
-    return true -- remove from SET
-  else
-    return false -- keep in SET
-  end
-end
-
---- [INTERNAL] Init Groups
--- @param #TIRESIAS self
--- @return #TIRESIAS self
-function TIRESIAS:_InitGroups()
-  self:T(self.lid.."_InitGroups")
-  -- Set all groups invisible/motionless
-  local EngageRange = self.AAARange
-  local SwitchAAA = self.SwitchAAA
-  --- AAA
-  self.AAASet:ForEachGroupAlive(
-    function(grp)
-      if not grp.Tiresias then 
-        grp:OptionEngageRange(EngageRange)
-        grp:SetCommandInvisible(true)
-        if SwitchAAA then
-          grp:SetAIOff()
-          grp:EnableEmission(false)
-        end
-        grp.Tiresias = { -- #TIRESIAS.Data
-          type = "AAA",
-          invisible = true,
-          range = EngageRange,
-          exception = false,
-          AIOff = SwitchAAA,
-        }
-      end
-      if grp.Tiresias and (not grp.Tiresias.exception == true) then
-        if  grp.Tiresias.invisible and grp.Tiresias.invisible == false then
-          grp:SetCommandInvisible(true)
-          grp.Tiresias.invisible = true
-          if SwitchAAA then
-            grp:SetAIOff()
-            grp:EnableEmission(false)
-            grp.Tiresias.AIOff = true
-          end
-        end
-      end
-      --BASE:I(string.format("Init/Switch off AAA %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
-    end
-  )
-  --- Vehicles
-  self.VehicleSet:ForEachGroupAlive(
-    function(grp)
-      if not grp.Tiresias then
-        grp:SetAIOff()
-        grp:SetCommandInvisible(true)
-        grp.Tiresias = { -- #TIRESIAS.Data
-          type = "Vehicle",
-          invisible = true,
-          AIOff = true,
-          exception = false,
-        }
-      end
-      if grp.Tiresias and (not grp.Tiresias.exception == true) then
-        if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
-          grp:SetCommandInvisible(true)
-          grp:SetAIOff()
-          grp.Tiresias.invisible = true
-        end
-      end     
-      --BASE:I(string.format("Init/Switch off Vehicle %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
-    end
-  )
-  --- SAM
-  self.SAMSet:ForEachGroupAlive(
-    function(grp)
-      if not grp.Tiresias then
-        grp:SetCommandInvisible(true)
-        grp.Tiresias = { -- #TIRESIAS.Data
-          type = "SAM",
-          invisible = true,
-          exception = false,
-        }
-      end
-      if grp.Tiresias and (not grp.Tiresias.exception == true) then
-        if grp.Tiresias and grp.Tiresias.invisible and grp.Tiresias.invisible == false then
-          grp:SetCommandInvisible(true)
-          grp.Tiresias.invisible = true
-        end
-      end
-      --BASE:I(string.format("Init/Switch off SAM %s (Exception %s)",grp:GetName(),tostring(grp.Tiresias.exception)))
-    end
-  )
-  return self
-end
-
---- [INTERNAL] Event handler function
--- @param #TIRESIAS self
--- @param Core.Event#EVENTDATA EventData
--- @return #TIRESIAS self
-function TIRESIAS:_EventHandler(EventData)
-  self:T(string.format("%s Event = %d",self.lid, EventData.id))
-  local event = EventData -- Core.Event#EVENTDATA
-  if event.id == EVENTS.PlayerEnterAircraft or event.id == EVENTS.PlayerEnterUnit then
-    --local _coalition = event.IniCoalition
-    --if _coalition ~= self.Coalition then
-      --  return --ignore!
-    --end
-    local unitname = event.IniUnitName or "none"
-    local _unit = event.IniUnit
-    local _group = event.IniGroup
-    if _group and _group:IsAlive() then
-      local radius = self.PlaneSwitchRange
-      if _group:IsHelicopter() then
-        radius = self.HeloSwitchRange
-      end
-      self:_SwitchOnGroups(_group,radius)
-    end
-  end
-  return self
-end
-
---- [INTERNAL] Switch Groups Behaviour
--- @param #TIRESIAS self
--- @param Wrapper.Group#GROUP group
--- @param #number radius Radius in NM
--- @return #TIRESIAS self
-function TIRESIAS:_SwitchOnGroups(group,radius)
-  self:T(self.lid.."_SwitchOnGroups "..group:GetName().." Radius "..radius.." NM")
-  local zone = ZONE_GROUP:New("Zone-"..group:GetName(),group,UTILS.NMToMeters(radius))
-  local ground = SET_GROUP:New():FilterCategoryGround():FilterZones({zone}):FilterOnce()
-  local count = ground:CountAlive()
-  if self.debug then
-    local text = string.format("There are %d groups around this plane or helo!",count)
-    self:I(text)
-  end
-  local SwitchAAA = self.SwitchAAA
-  if ground:CountAlive() > 0 then
-    ground:ForEachGroupAlive(
-      function(grp)
-        if grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
-          if grp.Tiresias.invisible == true then
-            grp:SetCommandInvisible(false)
-            grp.Tiresias.invisible = false
-          end
-          if grp.Tiresias.type == "Vehicle" and grp.Tiresias.AIOff and grp.Tiresias.AIOff == true then
-            grp:SetAIOn()
-            grp.Tiresias.AIOff = false
-          end
-          if SwitchAAA and grp.Tiresias.type == "AAA" and grp.Tiresias.AIOff and grp.Tiresias.AIOff == true then
-            grp:SetAIOn()
-            grp:EnableEmission(true)
-            grp.Tiresias.AIOff = false
-          end
-          --BASE:I(string.format("TIRESIAS - Switch on %s %s (Exception %s)",tostring(grp.Tiresias.type),grp:GetName(),tostring(grp.Tiresias.exception)))
-        else
-          BASE:E("TIRESIAS - This group has not been initialized or is an exception!")
-        end
-      end
-    )
-  end
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------
---
--- FSM Functions
--- 
--------------------------------------------------------------------------------------------------------------
-
---- [INTERNAL] FSM Function
--- @param #TIRESIAS self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #TIRESIAS self
-function TIRESIAS:onafterStart(From, Event, To)
-  self:T({From, Event, To})
-  
-  local VehicleSet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterNotAAA):FilterFunction(TIRESIAS._FilterNotSAM):FilterStart()
-  local AAASet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterAAA):FilterStart()
-  local SAMSet = SET_GROUP:New():FilterCategoryGround():FilterFunction(TIRESIAS._FilterSAM):FilterStart()
-  local OpsGroupSet = SET_OPSGROUP:New():FilterActive(true):FilterStart()
-  self.FlightSet = SET_GROUP:New():FilterCategories({"plane","helicopter"}):FilterStart()
-  
-  local EngageRange = self.AAARange
-  
-  local ExceptionSet = self.ExceptionSet
-  if self.ExceptionSet then   
-    function ExceptionSet:OnAfterAdded(From,Event,To,ObjectName,Object)
-      BASE:I("TIRESIAS: EXCEPTION Object Added: "..Object:GetName())
-      if Object and Object:IsAlive() then
-        Object.Tiresias = { -- #TIRESIAS.Data
-          type = "Exception",
-          exception = true,
-        }
-      Object:SetAIOn()
-      Object:SetCommandInvisible(false)
-      Object:EnableEmission(true)
-      end
-    end
-  
-    local OGS = OpsGroupSet:GetAliveSet()
-    for _,_OG in pairs(OGS or {}) do
-      local OG = _OG -- Ops.OpsGroup#OPSGROUP
-      local grp = OG:GetGroup()
-      ExceptionSet:AddGroup(grp,true)
-    end
-    
-    function OpsGroupSet:OnAfterAdded(From,Event,To,ObjectName,Object)
-      local grp = Object:GetGroup()
-      ExceptionSet:AddGroup(grp,true)
-    end
-  end
-  
-  function VehicleSet:OnAfterAdded(From,Event,To,ObjectName,Object)
-    BASE:I("TIRESIAS: VEHCILE Object Added: "..Object:GetName())
-    if Object and Object:IsAlive() then
-      Object:SetAIOff()
-      Object:SetCommandInvisible(true)
-      Object.Tiresias = { -- #TIRESIAS.Data
-        type = "Vehicle",
-        invisible = true,
-        AIOff = true,
-        exception = false,
-      }
-    end
-  end
-  
-  local SwitchAAA = self.SwitchAAA
-  
-  function AAASet:OnAfterAdded(From,Event,To,ObjectName,Object)
-    if Object and Object:IsAlive() then
-      BASE:I("TIRESIAS: AAA Object Added: "..Object:GetName())
-      Object:OptionEngageRange(EngageRange)
-      Object:SetCommandInvisible(true)
-      if SwitchAAA then
-          Object:SetAIOff()
-          Object:EnableEmission(false)
-      end
-      Object.Tiresias = { -- #TIRESIAS.Data
-          type = "AAA",
-          invisible = true,
-          range = EngageRange,
-          exception = false,
-          AIOff = SwitchAAA,
-        }
-    end
-  end
-  
-  function SAMSet:OnAfterAdded(From,Event,To,ObjectName,Object)
-    if Object and Object:IsAlive() then
-      BASE:I("TIRESIAS: SAM Object Added: "..Object:GetName())
-      Object:SetCommandInvisible(true)
-      Object.Tiresias = { -- #TIRESIAS.Data
-        type = "SAM",
-        invisible = true,
-        exception = false,
-      }
-    end
-  end
-  
-  self.VehicleSet = VehicleSet
-  self.AAASet = AAASet
-  self.SAMSet = SAMSet
-  self.OpsGroupSet = OpsGroupSet
-  
-  self:_InitGroups()
-  
-  self:__Status(1)    
-  return self
-end
-
---- [INTERNAL] FSM Function
--- @param #TIRESIAS self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #TIRESIAS self
-function TIRESIAS:onbeforeStatus(From, Event, To)
-  self:T({From, Event, To})
-  if self:GetState() == "Stopped" then
-    return false
-  end
-  return self
-end
-
---- [INTERNAL] FSM Function
--- @param #TIRESIAS self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #TIRESIAS self
-function TIRESIAS:onafterStatus(From, Event, To)
-  self:T({From, Event, To})
-    if self.debug then
-    local count = self.VehicleSet:CountAlive()
-    local AAAcount = self.AAASet:CountAlive()
-    local SAMcount = self.SAMSet:CountAlive()
-    local text = string.format("Overall: %d | Vehicles: %d | AAA: %d | SAM: %d",count+AAAcount+SAMcount,count,AAAcount,SAMcount)
-    self:I(text)
-  end
-  self:_InitGroups()
-  if self.FlightSet:CountAlive() > 0 then
-    local Set = self.FlightSet:GetAliveSet()
-    for _,_plane in pairs(Set) do
-      local plane = _plane -- Wrapper.Group#GROUP
-      local radius = self.PlaneSwitchRange
-      if plane:IsHelicopter() then
-        radius = self.HeloSwitchRange
-      end
-      self:_SwitchOnGroups(_plane,radius)
-    end
-  end
-  if self:GetState() ~= "Stopped" then
-    self:__Status(self.Interval)
-  end
-  return self
-end
-
---- [INTERNAL] FSM Function
--- @param #TIRESIAS self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #TIRESIAS self
-function TIRESIAS:onafterStop(From, Event, To)
-  self:T({From, Event, To})
-  self:UnHandleEvent(EVENTS.PlayerEnterAircraft)
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------
---
--- End
--- 
--------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Functional/Warehouse.lua

@@ -87,7 +87,7 @@
 -- @field #number respawndelay Delay before respawn in seconds.
 -- @field #number runwaydestroyed Time stamp timer.getAbsTime() when the runway was destroyed.
 -- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour).
--- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
+-- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
 -- @extends Core.Fsm#FSM
 
 --- Have your assets at the right place at the right time - or not!
@@ -3414,7 +3414,7 @@ end
 -- FSM states
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- On after Start event. Starts the warehouse. Adds event handlers and schedules status updates of reqests and queue.
+--- On after Start event. Starts the warehouse. Addes event handlers and schedules status updates of reqests and queue.
 -- @param #WAREHOUSE self
 -- @param #string From From state.
 -- @param #string Event Event.
@@ -3595,7 +3595,6 @@ function WAREHOUSE:onafterStatus(From, Event, To)
     local Trepair=self:GetRunwayRepairtime()
     self:I(self.lid..string.format("Runway destroyed! Will be repaired in %d sec", Trepair))
     if Trepair==0 then
-      self.runwaydestroyed = nil
       self:RunwayRepaired()
     end
   end
@@ -5393,8 +5392,7 @@ function WAREHOUSE:onafterRunwayDestroyed(From, Event, To)
   self:_InfoMessage(text)
 
   self.runwaydestroyed=timer.getAbsTime()
-  
-  return self
+
 end
 
 --- On after "RunwayRepaired" event.
@@ -5409,8 +5407,7 @@ function WAREHOUSE:onafterRunwayRepaired(From, Event, To)
   self:_InfoMessage(text)
 
   self.runwaydestroyed=nil
-  
-  return self
+
 end
 
 

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -12,7 +12,7 @@
 -- 
 -- ## Missions:
 -- 
--- [CAZ - Capture Zones](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/ZoneCaptureCoalition)
+-- [CAZ - Capture Zones](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAZ%20-%20Capture%20Zones)
 -- 
 -- ===
 -- 

Moose Development/Moose/Modules.lua

@@ -1,181 +1,180 @@
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' )
+__Moose.Include( 'Scripts/Moose/Utilities/Utils.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Base.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Astar.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Beacon.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Condition.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/UserFlag.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Report.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Scheduler.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ScheduleDispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Event.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Settings.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Menu.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone_Detection.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Database.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Set.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Point.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Velocity.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Message.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Fsm.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spawn.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/SpawnStatic.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Timer.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Goal.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spot.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/MarkerOps_Base.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/TextAndSound.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Pathline.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ClientMenu.lua')
+__Moose.Include( 'Scripts/Moose/Core/Base.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Positionable.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Controllable.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Group.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Unit.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Client.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Static.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Airbase.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Scenery.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Marker.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Weapon.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Net.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Storage.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Astar.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Beacon.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Condition.lua' )
+__Moose.Include( 'Scripts/Moose/Core/ClientMenu.lua') 
+__Moose.Include( 'Scripts/Moose/Core/Database.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Event.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Fsm.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Goal.lua' )
+__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Menu.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Message.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Point.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Report.lua' )
+__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Set.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Settings.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Spawn.lua' )
+__Moose.Include( 'Scripts/Moose/Core/SpawnStatic.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Spot.lua' )
+__Moose.Include( 'Scripts/Moose/Core/TextAndSound.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Timer.lua' )
+__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Zone.lua' )
+__Moose.Include( 'Scripts/Moose/Core/Pathline.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/Cargo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoUnit.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoSlingload.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoCrate.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Airbase.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Client.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Controllable.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Group.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Identifiable.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Object.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' )
+__Moose.Include( 'Scripts/Moose/Wrapper/Storage.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Scoring.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/CleanUp.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Movement.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Sead.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Escort.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/MissileTrainer.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ATC_Ground.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Detection.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/DetectionZones.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Designate.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/RAT.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Range.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoal.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCoalition.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneCaptureCoalition.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Artillery.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Suppression.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/PseudoATC.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Warehouse.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Fox.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Mantis.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Shorad.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AICSAR.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AmmoTruck.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' )
+__Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' )
+__Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' )
+__Moose.Include( 'Scripts/Moose/Cargo/CargoSlingload.lua' )
+__Moose.Include( 'Scripts/Moose/Cargo/CargoCrate.lua' )
+__Moose.Include( 'Scripts/Moose/Cargo/CargoGroup.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RescueHelo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ATIS.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CTLD.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CSAR.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/AirWing.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ArmyGroup.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Auftrag.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Awacs.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Brigade.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Chief.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Cohort.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Commander.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Fleet.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightControl.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightGroup.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Flotilla.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Intelligence.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Legion.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/NavyGroup.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Operation.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsGroup.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsTransport.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsZone.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Platoon.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerTask.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerRecce.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Squadron.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Target.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/EasyGCICAP.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/AICSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/AmmoTruck.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ATC_Ground.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Autolase.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Designate.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Detection.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/DetectionZones.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Escort.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Fox.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Mantis.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Range.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Scoring.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Shorad.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' )
+__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Balancer.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air_Patrol.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air_Engage.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Patrol.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Cap.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Gci.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_BAI.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_CAS.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_SEAD.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Patrol.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_CAP.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_CAS.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_BAI.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Formation.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Request.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Dispatcher_Request.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_APC.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Helicopter.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Airplane.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Ship.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_APC.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Ship.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Airboss.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/AirWing.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/ArmyGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Auftrag.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Awacs.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Brigade.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Chief.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Cohort.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Commander.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/CSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Fleet.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/FlightControl.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/FlightGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Flotilla.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Intelligence.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Legion.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/NavyGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Operation.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsGroup.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsTransport.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/OpsZone.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Platoon.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/PlayerTask.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/PlayerRecce.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/RecoveryTanker.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/RescueHelo.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Squadron.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/Target.lua' )
+__Moose.Include( 'Scripts/Moose/Ops/EasyGCICAP.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Assign.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Route.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Account.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Assist.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Balancer.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Air_Patrol.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Air_Engage.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Patrol.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Cap.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Gci.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2G_BAI.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2G_CAS.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2G_SEAD.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_A2G_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Patrol.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_CAP.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_CAS.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_BAI.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Formation.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Escort.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Request.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher_Request.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_APC.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Helicopter.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Airplane.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Ship.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_APC.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' )
+__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Ship.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/UserSound.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SoundOutput.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/Radio.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioQueue.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioSpeech.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SRS.lua' )
+__Moose.Include( 'Scripts/Moose/Actions/Act_Assign.lua' )
+__Moose.Include( 'Scripts/Moose/Actions/Act_Route.lua' )
+__Moose.Include( 'Scripts/Moose/Actions/Act_Account.lua' )
+__Moose.Include( 'Scripts/Moose/Actions/Act_Assist.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/CommandCenter.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Mission.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/TaskInfo.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Manager.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/DetectionManager.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2G_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2G.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2A_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2A.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_CARGO.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_Transport.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_CSAR.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_Dispatcher.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Zone.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/Radio.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/RadioQueue.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/RadioSpeech.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/SoundOutput.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/SRS.lua' )
+__Moose.Include( 'Scripts/Moose/Sound/UserSound.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Globals.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/CommandCenter.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Mission.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/TaskInfo.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Manager.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/DetectionManager.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_CARGO.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Transport.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_CSAR.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Dispatcher.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Capture_Zone.lua' )
+__Moose.Include( 'Scripts/Moose/Tasking/Task_Capture_Dispatcher.lua' )
+
+__Moose.Include( 'Scripts/Moose/Globals.lua' )

Moose Development/Moose/Ops/ATIS.lua

@@ -700,7 +700,7 @@ ATIS.Messages = {
   EN =
   {
     HOURS = "hours",
-    TIME = "Hours",
+    TIME = "hours",
     NOCLOUDINFO = "Cloud coverage information not available",
     OVERCAST = "Overcast",
     BROKEN = "Broken clouds",
@@ -890,7 +890,7 @@ _ATIS = {}
 
 --- ATIS class version.
 -- @field #string version
-ATIS.version = "1.0.0"
+ATIS.version = "0.10.4"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1526,62 +1526,34 @@ function ATIS:MarkRunways( markall )
   end
 end
 
---- Use SRS Simple-Text-To-Speech for transmissions. No sound files necessary.`SetSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
+--- Use SRS Simple-Text-To-Speech for transmissions. No sound files necessary.
 -- @param #ATIS self
--- @param #string PathToSRS Path to SRS directory (only necessary if SRS exe backend is used).
+-- @param #string PathToSRS Path to SRS directory.
 -- @param #string Gender Gender: "male" or "female" (default).
 -- @param #string Culture Culture, e.g. "en-GB" (default).
 -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`.
 -- @param #number Port SRS port. Default 5002.
--- @param #string GoogleKey Path to Google JSON-Key (SRS exe backend) or Google API key (DCS-gRPC backend).
+-- @param #string GoogleKey Path to Google JSON-Key.
 -- @return #ATIS self
 function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey)
-  --if PathToSRS or MSRS.path then
+  if PathToSRS or MSRS.path then
     self.useSRS=true
-    
-    local path = PathToSRS or MSRS.path
-    local gender = Gender or MSRS.gender
-    local culture = Culture or MSRS.culture
-    local voice = Voice or MSRS.voice
-    local port = Port or MSRS.port or 5002
-    
-    self.msrs=MSRS:New(path, self.frequency, self.modulation)
-    self.msrs:SetGender(gender)
-    self.msrs:SetCulture(culture)
-    self.msrs:SetPort(port)
+    self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation)
+    self.msrs:SetGender(Gender)
+    self.msrs:SetCulture(Culture)
+    self.msrs:SetVoice(Voice)
+    self.msrs:SetPort(Port)
     self.msrs:SetCoalition(self:GetCoalition())
     self.msrs:SetLabel("ATIS")
-    if GoogleKey then
-      self.msrs:SetProviderOptionsGoogle(GoogleKey,GoogleKey)
-      self.msrs:SetProvider(MSRS.Provider.GOOGLE)
-    end
-   -- Pre-configured Google?
-    if (not GoogleKey) and self.msrs:GetProvider() == MSRS.Provider.GOOGLE then
-      voice = Voice or MSRS.poptions.gcloud.voice
-    end
-    self.msrs:SetVoice(voice)
+    self.msrs:SetGoogle(GoogleKey)
     self.msrs:SetCoordinate(self.airbase:GetCoordinate())
     self.msrsQ = MSRSQUEUE:New("ATIS")
     self.msrsQ:SetTransmitOnlyWithPlayers(self.TransmitOnlyWithPlayers)
     if self.dTQueueCheck<=10 then
       self:SetQueueUpdateTime(90)
     end
-  --else
-    --self:E(self.lid..string.format("ERROR: No SRS path specified!"))
-  --end
-  return self
-end
-
---- Set an alternative provider to the one set in your MSRS configuration file.
--- @param #ATIS self
--- @param #string Provider The provider to use. Known providers are: `MSRS.Provider.WINDOWS` and `MSRS.Provider.GOOGLE`
--- @return #ATIS self
-function ATIS:SetSRSProvider(Provider)
-  self:T(self.lid.."SetSRSProvider")
-  if self.msrs then
-    self.msrs:SetProvider(Provider)
   else
-    MESSAGE:New(self.lid.."Set up SRS first before trying to change the provider!",30,"ATIS"):ToAll():ToLog()
+    self:E(self.lid..string.format("ERROR: No SRS path specified!"))
   end
   return self
 end

Moose Development/Moose/Ops/AirWing.lua

@@ -10,7 +10,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Airwing).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Airwing).
 --
 -- ===
 --
@@ -56,8 +56,6 @@
 -- @field #boolean despawnAfterHolding Aircraft are despawned after holding.
 -- @field #boolean capOptionPatrolRaceTrack Use closer patrol race track or standard orbit auftrag.
 -- @field #number capFormation If capOptionPatrolRaceTrack is true, set the formation, also.
--- @field #number capOptionVaryStartTime If set, vary mission start time for CAP missions generated random between capOptionVaryStartTime and capOptionVaryEndTime
--- @field #number capOptionVaryEndTime If set, vary mission start time for CAP missions generated random between capOptionVaryStartTime and capOptionVaryEndTime
 -- 
 -- @extends Ops.Legion#LEGION
 
@@ -134,8 +132,6 @@ AIRWING = {
   markpoints     =   false,
   capOptionPatrolRaceTrack = false,
   capFormation   =    nil,
-  capOptionVaryStartTime =    nil,
-  capOptionVaryEndTime =    nil,
 }
 
 --- Payload data.
@@ -187,7 +183,7 @@ AIRWING = {
 
 --- AIRWING class version.
 -- @field #string version
-AIRWING.version="0.9.5"
+AIRWING.version="0.9.4"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -725,17 +721,6 @@ function AIRWING:SetCapCloseRaceTrack(OnOff)
   return self
 end
 
---- Set CAP mission start to vary randomly between Start end End seconds.
--- @param #AIRWING self
--- @param #number Start
--- @param #number End 
--- @return #AIRWING self
-function AIRWING:SetCapStartTimeVariation(Start, End)
-  self.capOptionVaryStartTime = Start or 5
-  self.capOptionVaryEndTime = End or 60
-  return self
-end
-
 --- Set number of TANKER flights with Boom constantly in the air.
 -- @param #AIRWING self
 -- @param #number Nboom Number of flights. Default 1.
@@ -1180,14 +1165,6 @@ function AIRWING:CheckCAP()
     
     end
     
-    if self.capOptionVaryStartTime then
-    
-      local ClockStart = math.random(self.capOptionVaryStartTime, self.capOptionVaryEndTime)
-    
-      missionCAP:SetTime(ClockStart)
-    
-    end
-    
     missionCAP.patroldata=patrol
 
     patrol.noccupied=patrol.noccupied+1
@@ -1421,9 +1398,9 @@ function AIRWING:GetTankerForFlight(flightgroup)
   return nil
 end
 
---- Add the ability to call back an Ops.AWACS#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
+--- Add the ability to call back an Ops.Awacs#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
 -- @param #AIRWING self
--- @param Ops.AWACS#AWACS ConnectecdAwacs
+-- @param Ops.Awacs#AWACS ConnectecdAwacs
 -- @return #AIRWING self
 function AIRWING:SetUsingOpsAwacs(ConnectecdAwacs)
   self:I(self.lid .. "Added AWACS Object: "..ConnectecdAwacs:GetName() or "unknown")
@@ -1432,7 +1409,7 @@ function AIRWING:SetUsingOpsAwacs(ConnectecdAwacs)
   return self
 end
 
---- Remove the ability to call back an Ops.AWACS#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
+--- Remove the ability to call back an Ops.Awacs#AWACS object with an FSM call "FlightOnMission(FlightGroup, Mission)".
 -- @param #AIRWING self
 -- @return #AIRWING self
 function AIRWING:RemoveUsingOpsAwacs()

Moose Development/Moose/Ops/Airboss.lua

@@ -70,7 +70,7 @@
 --
 -- ## Example Missions
 --
--- Example missions can be found [here](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Ops/Airboss).
+-- Example missions can be found [here](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Airboss).
 -- They contain the latest development Moose.lua file.
 --
 -- ## IMPORTANT
@@ -3062,7 +3062,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
   -- SRS
   local Frequency = self.AirbossRadio.frequency
   local Modulation = self.AirbossRadio.modulation
-  self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,AltBackend)
+  self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
   self.SRS:SetCoalition(self:GetCoalition())
   self.SRS:SetCoordinate(self:GetCoordinate())
   self.SRS:SetCulture(Culture or "en-US")
@@ -3072,11 +3072,9 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
   self.SRS:SetPort(Port or 5002)
   self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
   self.SRS:SetCoordinate(self.carrier:GetCoordinate())
-  self.SRS:SetVolume(Volume or 1)
   --self.SRS:SetModulations(Modulations)
   if GoogleCreds then
-    self.SRS:SetProviderOptionsGoogle(GoogleCreds,GoogleCreds)
-    self.SRS:SetProvider(MSRS.Provider.GOOGLE)
+    self.SRS:SetGoogle(GoogleCreds)
   end
   if Voice then
     self.SRS:SetVoice(Voice)
@@ -8214,7 +8212,7 @@ function AIRBOSS:OnEventBirth( EventData )
     self:E( EventData )
     return
   end
-  if EventData.IniUnit == nil and (not EventData.IniObjectCategory == Object.Category.STATIC) then
+  if EventData.IniUnit == nil then
     self:E( self.lid .. "ERROR: EventData.IniUnit=nil in event BIRTH!" )
     self:E( EventData )
     return
@@ -11199,7 +11197,7 @@ function AIRBOSS:_AttitudeMonitor( playerData )
   end
   text = text .. string.format( "\nPitch=%.1f° | Roll=%.1f° | Yaw=%.1f°", pitch, roll, yaw )
   text = text .. string.format( "\nClimb Angle=%.1f° | Rate=%d ft/min", unit:GetClimbAngle(), velo.y * 196.85 )
-  local dist = self:_GetOptLandingCoordinate():Get3DDistance( playerData.unit:GetVec3() )
+  local dist = self:_GetOptLandingCoordinate():Get3DDistance( playerData.unit )
   -- Get player velocity in km/h.
   local vplayer = playerData.unit:GetVelocityKMH()
   -- Get carrier velocity in km/h.
@@ -12123,18 +12121,16 @@ function AIRBOSS:_LSOgrade( playerData )
   local GIC, nIC = self:_Flightdata2Text( playerData, AIRBOSS.GroovePos.IC )
   local GAR, nAR = self:_Flightdata2Text( playerData, AIRBOSS.GroovePos.AR )
 
-  -- VTOL approach, which is graded differently (currently only Harrier).
-  local vtol=playerData.actype==AIRBOSS.AircraftCarrier.AV8B
-
   -- Put everything together.
   local G = GXX .. " " .. GIM .. " " .. " " .. GIC .. " " .. GAR
 
-  -- Count number of minor/small nS, normal nN and major/large deviations nL.
+  -- Count number of minor, normal and major deviations.
   local N=nXX+nIM+nIC+nAR
+  local Nv=nXX+nIM
   local nL=count(G, '_')/2
   local nS=count(G, '%(')
   local nN=N-nS-nL
-
+  local nNv=Nv-nS-nL
 
   -- Groove time 15-18.99 sec for a unicorn. Or 60-65 for V/STOL unicorn.
   local Tgroove=playerData.Tgroove
@@ -12150,64 +12146,34 @@ function AIRBOSS:_LSOgrade( playerData )
     G = "Unicorn"
   else
 
-    if vtol then
-
-      -- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe.--Pene testing
+    -- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe.--Pene testing
       -- Large devaitions still result in a No Grade, A Unicorn still requires a clean pass with no deviation.
+  if nL > 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+      -- Larger deviations ==> "No grade" 2.0 points.
+      grade="--"
+      points=2.0
+  elseif nNv >= 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+      -- Only average deviations ==>  "Fair Pass" Pass with average deviations and corrections.
+      grade="(OK)"
+      points=3.0
+  elseif nNv < 1 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+      -- Only minor average deviations ==>  "OK" Pass with minor deviations and corrections. (test nNv<=1 and)
+      grade="OK"
+      points=4.0
+  elseif nL > 0 then
+      -- Larger deviations ==> "No grade" 2.0 points.
+      grade="--"
+      points=2.0
+  elseif nN> 0 then
+      -- No larger but average deviations ==>  "Fair Pass" Pass with average deviations and corrections.
+      grade="(OK)"
+      points=3.0
+  else
+      -- Only minor corrections
+      grade="OK"
+      points=4.0
+  end
 
-      -- Normal laning part at the beginning
-      local Gb = GXX .. " " .. GIM
-
-      -- Number of deviations that occurred at the the beginning of the landing (XX or IM). These are graded like in non-VTOL landings, i.e. on deviations is 
-      local N=nXX+nIM
-      local nL=count(Gb, '_')/2
-      local nS=count(Gb, '%(')
-      local nN=N-nS-nL
-
-
-      -- VTOL part of the landing
-      local Gv = GIC .. " " .. GAR
-
-      -- Number of deviations that occurred at the the end (VTOL part) of the landing (IC or AR).
-      local Nv=nIC+nAR
-      local nLv=count(Gv, '_')/2
-      local nSv=count(Gv, '%(')
-      local nNv=Nv-nSv-nLv
-
-      if nL>0 or nLv>1 then
-          -- Larger deviations at XX or IM or at least one larger deviation IC or AR==> "No grade" 2.0 points.
-          -- In other words, we allow one larger deviation at IC+AR 
-          grade="--"
-          points=2.0
-      elseif nN>0 or nNv>1 or nLv==1 then
-          -- Average deviations at XX+IM or more than one normal deviation IC or AR ==>  "Fair Pass" Pass with average deviations and corrections.
-          grade="(OK)"
-          points=3.0
-      else
-          -- Only minor corrections
-          grade="OK"
-          points=4.0
-      end
-
-    else
-
-      -- This is a normal (non-VTOL) landing.
-
-      if nL > 0 then
-          -- Larger deviations ==> "No grade" 2.0 points.
-          grade="--"
-          points=2.0
-      elseif nN> 0 then
-          -- No larger but average/normal deviations ==>  "Fair Pass" Pass with average deviations and corrections.
-          grade="(OK)"
-          points=3.0
-      else
-          -- Only minor corrections ==> "Okay pass" 4.0 points.
-          grade="OK"
-          points=4.0
-      end
-
-    end
   end
 
   -- Replace" )"( and "__"
@@ -14991,7 +14957,7 @@ function AIRBOSS:SetSRSPilotVoice( Voice, Gender, Culture )
   self.PilotRadio.gender = Gender or "male"
   self.PilotRadio.culture = Culture or "en-US"
   
-  if (not Voice) and self.SRS and self.SRS:GetProvider() == MSRS.Provider.GOOGLE then
+  if (not Voice) and self.SRS and self.SRS.google then
     self.PilotRadio.voice = MSRS.Voices.Google.Standard.en_US_Standard_J
   end
   
@@ -15640,11 +15606,6 @@ function AIRBOSS:_Number2Radio( radio, number, delay, interval, pilotcall )
     Sender = "PilotCall"
   end
 
-  if Sender=="" then
-    self:E( self.lid .. string.format( "ERROR: Sender unknown!") )
-    return
-  end
-
   -- Split string into characters.
   local numbers = _split( number )
 

Moose Development/Moose/Ops/ArmyGroup.lua

@@ -15,9 +15,9 @@
 -- ===
 --
 -- ## Example Missions:
---
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Armygroup).
---
+-- 
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Armygroup).
+--    
 -- ===
 --
 -- ### Author: **funkyfranky**
@@ -976,7 +976,8 @@ function ARMYGROUP:onafterSpawned(From, Event, To)
     -- Update route.
     if Nwp>1 and self.isMobile then
       self:T(self.lid..string.format("Got %d waypoints on spawn ==> Cruise in -1.0 sec!", Nwp))
-      self:__Cruise(-1, nil, self.option.Formation)
+      --self:__Cruise(-1, nil, self.option.Formation)
+      self:__Cruise(-1)
     else
       self:T(self.lid.."No waypoints on spawn ==> Full Stop!")
       self:FullStop()
@@ -1860,7 +1861,6 @@ function ARMYGROUP:_UpdateEngageTarget()
     else
 
       -- Could not get position of target (not alive any more?) ==> Disengage.
-      self:T(self.lid.."Could not get position of target ==> Disengage!")
       self:Disengage()
     
     end
@@ -1868,7 +1868,6 @@ function ARMYGROUP:_UpdateEngageTarget()
   else
   
     -- Target not alive any more ==> Disengage.
-    self:T(self.lid.."Target not ALIVE ==> Disengage!")
     self:Disengage()
     
   end
@@ -1950,7 +1949,7 @@ function ARMYGROUP:onafterCruise(From, Event, To, Speed, Formation)
   self.dTwait=nil
   
   -- Debug info.
-  self:T(self.lid.."Cruise ==> Update route in 0.01 sec")
+  self:T(self.lid..string.format("Cruise ==> Update route in 0.01 sec (speed=%s, formation=%s)", tostring(Speed), tostring(Formation)))
 
   -- Update route.
   self:__UpdateRoute(-0.01, nil, nil, Speed, Formation)
@@ -2005,7 +2004,7 @@ function ARMYGROUP:AddWaypoint(Coordinate, Speed, AfterWaypointWithID, Formation
     elseif self.optionDefault.Formation then
       Formation = self.optionDefault.Formation
     elseif self.option.Formation then
-      Formation = self.option.Formation      
+      Formation = self.option.Formation
     else
       -- Default formation is on road.
       Formation = ENUMS.Formation.Vehicle.OnRoad
@@ -2045,82 +2044,90 @@ end
 -- @param #ARMYGROUP self
 -- @param #table Template Template used to init the group. Default is `self.template`.
 -- @return #ARMYGROUP self
-function ARMYGROUP:_InitGroup(Template)
+function ARMYGROUP:_InitGroup(Template, Delay)
 
-  -- First check if group was already initialized.
-  if self.groupinitialized then
-    self:T(self.lid.."WARNING: Group was already initialized! Will NOT do it again!")
-    return
-  end
-
-  -- Get template of group.
-  local template=Template or self:_GetTemplate()
-  
-  -- Ground are always AI.
-  self.isAI=true
-  
-  -- Is (template) group late activated.
-  self.isLateActivated=template.lateActivation
-  
-  -- Ground groups cannot be uncontrolled.
-  self.isUncontrolled=false
-  
-  -- Max speed in km/h.
-  self.speedMax=self.group:GetSpeedMax()
-  
-  -- Is group mobile?
-  if self.speedMax>3.6 then
-    self.isMobile=true
+  if Delay and Delay>0 then
+    self:ScheduleOnce(Delay, ARMYGROUP._InitGroup, self, Template, 0)
   else
-    self.isMobile=false
-  end
-  
-  -- Cruise speed in km/h
-  self.speedCruise=self.speedMax*0.7
-  
-  -- Group ammo.
-  self.ammo=self:GetAmmoTot()
-  
-  -- Radio parameters from template.
-  self.radio.On=false  -- Radio is always OFF for ground.
-  self.radio.Freq=133
-  self.radio.Modu=radio.modulation.AM
-  
-  -- Set default radio.
-  self:SetDefaultRadio(self.radio.Freq, self.radio.Modu, self.radio.On)
-  
-  -- Get current formation from first waypoint.
-  self.option.Formation=template.route.points[1].action
-  
-  -- Set default formation to "on road".
-  self.optionDefault.Formation=ENUMS.Formation.Vehicle.OnRoad
 
-  -- Default TACAN off.
-  self:SetDefaultTACAN(nil, nil, nil, nil, true)
-  self.tacan=UTILS.DeepCopy(self.tacanDefault)
+    -- First check if group was already initialized.
+    if self.groupinitialized then
+      self:T(self.lid.."WARNING: Group was already initialized! Will NOT do it again!")
+      return
+    end
+    
+    self:I(self.lid.."FF Initializing Group")
   
-  -- Units of the group.
-  local units=self.group:GetUnits()
+    -- Get template of group.
+    local template=Template or self:_GetTemplate()
+    
+    -- Ground are always AI.
+    self.isAI=true
+    
+    -- Is (template) group late activated.
+    self.isLateActivated=template.lateActivation
+    
+    -- Ground groups cannot be uncontrolled.
+    self.isUncontrolled=false
+    
+    -- Max speed in km/h.
+    self.speedMax=self.group:GetSpeedMax()
+    
+    -- Is group mobile?
+    if self.speedMax>3.6 then
+      self.isMobile=true
+    else
+      self.isMobile=false
+    end
+    
+    -- Cruise speed in km/h
+    self.speedCruise=self.speedMax*0.7
+    
+    -- Group ammo.
+    self.ammo=self:GetAmmoTot()
+    
+    -- Radio parameters from template.
+    self.radio.On=false  -- Radio is always OFF for ground.
+    self.radio.Freq=133
+    self.radio.Modu=radio.modulation.AM
+    
+    -- Set default radio.
+    self:SetDefaultRadio(self.radio.Freq, self.radio.Modu, self.radio.On)
+    
+    -- Get current formation from first waypoint.
+    self.option.Formation=template.route.points[1].action
+    
+    -- Set default formation to "on road".
+    self.optionDefault.Formation=ENUMS.Formation.Vehicle.OnRoad
   
-  -- DCS group.
-  local dcsgroup=Group.getByName(self.groupname)
-  local size0=dcsgroup:getInitialSize()
+    -- Default TACAN off.
+    self:SetDefaultTACAN(nil, nil, nil, nil, true)
+    self.tacan=UTILS.DeepCopy(self.tacanDefault)
+    
+    -- Units of the group.
+    local units=self.group:GetUnits()
+    
+    -- DCS group.
+    local dcsgroup=Group.getByName(self.groupname)
+    local size0=dcsgroup:getInitialSize()
+    local u=dcsgroup:getUnits()
+    
+    -- Quick check.
+    if #units~=size0 then
+      self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units! u=%d", #units, size0, #u))
+    end
+    
+    -- Add elemets.
+    for _,unit in pairs(units) do
+      local unitname=unit:GetName()
+      self:_AddElementByName(unitname)
+    end
+    
   
-  -- Quick check.
-  if #units~=size0 then
-    self:T(self.lid..string.format("ERROR: Got #units=%d but group consists of %d units!", #units, size0))
+    -- Init done.
+    self.groupinitialized=true
   end
   
-  -- Add elemets.
-  for _,unit in pairs(units) do
-    local unitname=unit:GetName()
-    self:_AddElementByName(unitname)
-  end
-  
-
-  -- Init done.
-  self.groupinitialized=true
-  
   return self
 end
 

Moose Development/Moose/Ops/Auftrag.lua

@@ -434,7 +434,6 @@ _AUFTRAGSNR=0
 -- @field #string ARMORATTACK Armor attack.
 -- @field #string CASENHANCED Enhanced CAS.
 -- @field #string HOVER Hover.
--- @field #string LANDATCOORDINATE Land at coordinate.
 -- @field #string GROUNDATTACK Ground attack.
 -- @field #string CARGOTRANSPORT Cargo transport.
 -- @field #string RELOCATECOHORT Relocate a cohort from one legion to another.
@@ -481,7 +480,6 @@ AUFTRAG.Type={
   ARMORATTACK="Armor Attack",
   CASENHANCED="CAS Enhanced",
   HOVER="Hover",
-  LANDATCOORDINATE="Land at Coordinate",
   GROUNDATTACK="Ground Attack",
   CARGOTRANSPORT="Cargo Transport",
   RELOCATECOHORT="Relocate Cohort",
@@ -1054,42 +1052,6 @@ function AUFTRAG:NewHOVER(Coordinate, Altitude, Time, Speed, MissionAlt)
   return mission
 end
 
---- **[AIR ROTARY]** Create an LANDATCOORDINATE mission.
--- @param #AUFTRAG self
--- @param Core.Point#COORDINATE Coordinate Where to land.
--- @param #number OuterRadius (Optional) Vary the coordinate by this many feet, e.g. get a new random coordinate between OuterRadius and (optionally) avoiding InnerRadius of the coordinate.
--- @param #number InnerRadius (Optional) Vary the coordinate by this many feet, e.g. get a new random coordinate between OuterRadius and (optionally) avoiding InnerRadius of the coordinate.
--- @param #number Time Time in seconds to stay. Default 300 seconds.
--- @param #number Speed Speed in knots to fly to the target coordinate. Default 150kn.
--- @param #number MissionAlt Altitude to fly towards the mission in feet AGL. Default 1000ft.
--- @return #AUFTRAG self
-function AUFTRAG:NewLANDATCOORDINATE(Coordinate, OuterRadius, InnerRadius, Time, Speed, MissionAlt)
-
-  local mission=AUFTRAG:New(AUFTRAG.Type.LANDATCOORDINATE)
-
-  mission:_TargetFromObject(Coordinate)
-
-  mission.stayTime = Time or 300
-  mission.stayAt = Coordinate
-  self:SetMissionSpeed(Speed or 150)
-  self:SetMissionAltitude(MissionAlt or 1000)
-  
-  if OuterRadius then
-    mission.stayAt = Coordinate:GetRandomCoordinateInRadius(UTILS.FeetToMeters(OuterRadius),UTILS.FeetToMeters(InnerRadius or 0))  
-  end
-  
-  -- Mission options:
-  mission.missionFraction=0.9
-  mission.optionROE=ENUMS.ROE.ReturnFire
-  mission.optionROT=ENUMS.ROT.PassiveDefense
-
-  mission.categories={AUFTRAG.Category.HELICOPTER}
-
-  mission.DCStask=mission:GetDCSMissionTask()
-
-  return mission
-end
-
 --- **[AIR]** Create an enhanced orbit race track mission. Planes will keep closer to the track.
 -- @param #AUFTRAG self
 -- @param Core.Point#COORDINATE Coordinate Where to start the race track.
@@ -6481,19 +6443,7 @@ function AUFTRAG:GetDCSMissionTask()
     param.missionAltitude = self.missionAltitude
 
     DCStask.params=param
-  
-    table.insert(DCStasks, DCStask)
 
-  elseif self.type==AUFTRAG.Type.LANDATCOORDINATE then
-
-    ---------------------
-    -- LANDATCOORDINATE Mission
-    ---------------------
-
-    local DCStask={}
-    local Vec2 = self.stayAt:GetVec2()  
-    local DCStask = CONTROLLABLE.TaskLandAtVec2(nil,Vec2,self.stayTime)
-  
     table.insert(DCStasks, DCStask)
 
   elseif self.type==AUFTRAG.Type.ONGUARD or self.type==AUFTRAG.Type.ARMOREDGUARD then

Moose Development/Moose/Ops/Awacs.lua

@@ -7,9 +7,9 @@
 -- ===
 --
 -- ## Example Missions:
---
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Awacs/).
---
+-- 
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Awacs/).
+-- 
 -- ## Videos:
 -- 
 -- Demo videos can be found on [Youtube](https://www.youtube.com/watch?v=ocdy8QzTNN4&list=PLFxp425SeXnq-oS0DSjam1HtddywH8i_k)
@@ -17,7 +17,7 @@
 -- ===
 --
 -- ### Author: **applevangelist**
--- @date Last Update Jan 2024
+-- @date Last Update Nov 2023
 -- @module Ops.AWACS
 -- @image OPS_AWACS.jpg
 
@@ -121,7 +121,6 @@ do
 -- @field #number TacticalIncrFreq
 -- @field #number TacticalModulation
 -- @field #number TacticalInterval
--- @field Core.Set#SET_GROUP DetectionSet
 -- @extends Core.Fsm#FSM
 
 
@@ -508,7 +507,7 @@ do
 -- @field #AWACS
 AWACS = {
   ClassName = "AWACS", -- #string
-  version = "0.2.61", -- #string
+  version = "0.2.59", -- #string
   lid = "", -- #string
   coalition = coalition.side.BLUE, -- #number
   coalitiontxt = "blue", -- #string
@@ -604,7 +603,6 @@ AWACS = {
   TacticalIncrFreq = 0.5,
   TacticalModulation = radio.modulation.AM,
   TacticalInterval = 120,
-  DetectionSet = nil,
 }
 
 ---
@@ -1407,18 +1405,15 @@ function AWACS:SetTacticalRadios(BaseFreq,Increase,Modulation,Interval,Number)
     self.TacticalFrequencies[freq] = freq
   end
   if self.AwacsSRS then
-    self.TacticalSRS = MSRS:New(self.PathToSRS,self.TacticalBaseFreq,self.TacticalModulation)
+    self.TacticalSRS = MSRS:New(self.PathToSRS,self.TacticalBaseFreq,self.TacticalModulation,self.Volume)
     self.TacticalSRS:SetCoalition(self.coalition)
     self.TacticalSRS:SetGender(self.Gender)
     self.TacticalSRS:SetCulture(self.Culture)
     self.TacticalSRS:SetVoice(self.Voice)
     self.TacticalSRS:SetPort(self.Port)
     self.TacticalSRS:SetLabel("AWACS")
-    self.TacticalSRS:SetVolume(self.Volume)
     if self.PathToGoogleKey then
-      --self.TacticalSRS:SetGoogle(self.PathToGoogleKey)
-      self.TacticalSRS:SetProviderOptionsGoogle(self.PathToGoogleKey,self.AccessKey)
-      self.TacticalSRS:SetProvider(MSRS.Provider.GOOGLE)
+      self.TacticalSRS:SetGoogle(self.PathToGoogleKey)
     end
     self.TacticalSRSQ = MSRSQUEUE:New("Tactical AWACS")
   end
@@ -2074,48 +2069,38 @@ function AWACS:AddGroupToDetection(Group)
   return self
 end
 
---- [User] Set AWACS SRS TTS details - see @{Sound.SRS} for details. `SetSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
+--- [User] Set AWACS SRS TTS details - see @{Sound.SRS} for details
 -- @param #AWACS self
 -- @param #string PathToSRS Defaults to "C:\\Program Files\\DCS-SimpleRadio-Standalone"
 -- @param #string Gender Defaults to "male"
 -- @param #string Culture Defaults to "en-US"
 -- @param #number Port Defaults to 5002
--- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS#SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
+-- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
 -- Note that this must be installed on your windows system. Can also be Google voice types, if you are using Google TTS.
 -- @param #number Volume Volume - between 0.0 (silent) and 1.0 (loudest)
--- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS; if you use a config file for MSRS, hand in nil here.
--- @param #string AccessKey (Optional) Your Google API access key. This is necessary if DCS-gRPC is used as backend; if you use a config file for MSRS, hand in nil here.
+-- @param #string PathToGoogleKey Path to your google key if you want to use google TTS
 -- @return #AWACS self
-function AWACS:SetSRS(PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey,AccessKey)
+function AWACS:SetSRS(PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey)
   self:T(self.lid.."SetSRS")
-  self.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone" 
-  self.Gender = Gender or MSRS.gender or "male"
-  self.Culture = Culture or MSRS.culture or "en-US"
-  self.Port = Port or MSRS.port or 5002
-  self.Voice = Voice or MSRS.voice
+  self.PathToSRS = PathToSRS or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  self.Gender = Gender or "male"
+  self.Culture = Culture or "en-US"
+  self.Port = Port or 5002
+  self.Voice = Voice 
   self.PathToGoogleKey = PathToGoogleKey
-  self.AccessKey = AccessKey
   self.Volume = Volume or 1.0
   
-  self.AwacsSRS = MSRS:New(self.PathToSRS,self.MultiFrequency,self.MultiModulation)
+  self.AwacsSRS = MSRS:New(self.PathToSRS,self.MultiFrequency,self.MultiModulation,self.Volume)
   self.AwacsSRS:SetCoalition(self.coalition)
   self.AwacsSRS:SetGender(self.Gender)
   self.AwacsSRS:SetCulture(self.Culture)
+  self.AwacsSRS:SetVoice(self.Voice)
   self.AwacsSRS:SetPort(self.Port)
   self.AwacsSRS:SetLabel("AWACS")
-  self.AwacsSRS:SetVolume(Volume)
   if self.PathToGoogleKey then
-    --self.AwacsSRS:SetGoogle(self.PathToGoogleKey)
-    self.AwacsSRS:SetProviderOptionsGoogle(self.PathToGoogleKey,self.AccessKey)
-    self.AwacsSRS:SetProvider(MSRS.Provider.GOOGLE)
+    self.AwacsSRS:SetGoogle(self.PathToGoogleKey)
   end
-   -- Pre-configured Google?
-  if (not PathToGoogleKey) and self.AwacsSRS:GetProvider() == MSRS.Provider.GOOGLE then
-    self.PathToGoogleKey = MSRS.poptions.gcloud.credentials
-    self.Voice = Voice or MSRS.poptions.gcloud.voice
-    self.AccessKey = AccessKey or MSRS.poptions.gcloud.key
-  end
-  self.AwacsSRS:SetVoice(self.Voice)
+  
   return self
 end
 
@@ -2950,7 +2935,7 @@ function AWACS:_Picture(Group,IsGeneral)
   if not self.intel then
     -- no intel yet!
     local picclean = self.gettext:GetEntry("PICCLEAN",self.locale)
-    text = string.format(picclean,gcallsign,self.callsigntxt)
+    text = string.format(picclean,self.callsigntxt, gcallsign)
     textScreen = text
     
     self:_NewRadioEntry(text,text,GID,false,true,true,false)
@@ -3003,9 +2988,6 @@ function AWACS:_Picture(Group,IsGeneral)
     
     if clustersAO == 0 and clustersEWR == 0 then
       -- clean
-      local picclean = self.gettext:GetEntry("PICCLEAN",self.locale)
-      text = string.format(picclean,gcallsign,self.callsigntxt)
-      textScreen = text
       self:_NewRadioEntry(text,text,GID,Outcome,true,true,false)
     else
     
@@ -3681,7 +3663,7 @@ function AWACS:_CheckInAI(FlightGroup,Group,AuftragsNr)
       CAPVoice = self.CapVoices[math.floor(math.random(1,10))]
     end
     
-    FlightGroup:SetSRS(self.PathToSRS,self.CAPGender,self.CAPCulture,CAPVoice,self.Port,self.PathToGoogleKey,"FLIGHT",1)
+    FlightGroup:SetSRS(self.PathToSRS,self.CAPGender,self.CAPCulture,CAPVoice,self.Port,self.PathToGoogleKey,"FLIGHT")
     
     local checkai = self.gettext:GetEntry("CHECKINAI",self.locale)
     text = string.format(checkai,self.callsigntxt, managedgroup.CallSign, self.CAPTimeOnStation, self.AOName)
@@ -6613,7 +6595,7 @@ function AWACS:onafterCheckTacticalQueue(From,Event,To)
     if self.PathToGoogleKey then
       gtext = string.format("<speak><prosody rate='medium'>%s</prosody></speak>",gtext)
     end
-    self.TacticalSRSQ:NewTransmission(gtext,nil,self.TacticalSRS,nil,0.5,nil,nil,nil,frequency,self.TacticalModulation)
+    self.TacticalSRSQ:NewTransmission(gtext,nil,self.TacticalSRS,nil,0.5,nil,nil,nil,frequency,self.TacticalModulation,nil,nil,nil,nil,nil)
   
     self:T(RadioEntry.TextTTS)
     

Moose Development/Moose/Ops/Brigade.lua

@@ -10,7 +10,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Brigade).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Brigade).
 -- 
 -- ===
 --

Moose Development/Moose/Ops/CSAR.lua

@@ -16,7 +16,7 @@
 -- 
 -- ## Missions:
 --
--- ### [CSAR - Combat Search & Rescue](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/CSAR)
+-- ### [CSAR - Combat Search & Rescue](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20CSAR)
 -- 
 -- ===
 -- 
@@ -31,7 +31,7 @@
 -- @image OPS_CSAR.jpg
 
 -- Date: May 2023
--- Last: Update Dec 2024
+-- Last: Update Oct 2024
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -293,7 +293,7 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.19"
+CSAR.version="1.0.18"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -536,7 +536,6 @@ function CSAR:New(Coalition, Template, Alias)
   -- @param #number Frequency Beacon frequency in kHz.
   -- @param #string Leadername Name of the #UNIT of the downed pilot.
   -- @param #string CoordinatesText String of the position of the pilot. Format determined by self.coordtype.
-  -- @param #string Playername Player name if any given. Might be nil!
   
   --- On After "Aproach" event. Heli close to downed Pilot.
   -- @function [parent=#CSAR] OnAfterApproach
@@ -843,7 +842,7 @@ function CSAR:_AddCsar(_coalition , _country, _point, _typeName, _unitName, _pla
 
   self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet)
 
-  self:_InitSARForPilot(_spawnedGroup, _unitName, _freq, noMessage, _playerName) --shagrat use unitName to have the aircraft callsign / descriptive "name" etc.
+  self:_InitSARForPilot(_spawnedGroup, _unitName, _freq, noMessage) --shagrat use unitName to have the aircraft callsign / descriptive "name" etc.
   
   return self
 end
@@ -1225,8 +1224,7 @@ end
 -- @param #string _GroupName Name of the Group
 -- @param #number _freq Beacon frequency.
 -- @param #boolean _nomessage Send message true or false.
--- @param #string _playername Name of the downed pilot if any
-function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage, _playername)
+function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage)
   self:T(self.lid .. " _InitSARForPilot")
   local _leader = _downedGroup:GetUnit(1)
   local _groupName = _GroupName
@@ -1249,7 +1247,7 @@ function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage, _pla
   end
 
    -- trigger FSM event
-  self:__PilotDown(2,_downedGroup, _freqk, _groupName, _coordinatesText, _playername)
+  self:__PilotDown(2,_downedGroup, _freqk, _groupName, _coordinatesText)
   
   return self
 end
@@ -1925,7 +1923,7 @@ function CSAR:_DisplayToAllSAR(_message, _side, _messagetime)
   local messagetime = _messagetime or self.messageTime
   if self.msrs then
     local voice = self.CSARVoice or MSRS.Voices.Google.Standard.en_GB_Standard_F
-    if self.msrs:GetProvider() == MSRS.Provider.WINDOWS then
+    if self.msrs.google == nil then
       voice = self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda
     end
     self:I("Voice = "..voice)
@@ -2312,8 +2310,7 @@ function CSAR:onafterStart(From, Event, To)
     self.msrs:SetVoice(self.SRSVoice)
     self.msrs:SetGender(self.SRSGender)
     if self.SRSGPathToCredentials then
-      self.msrs:SetProviderOptionsGoogle(self.SRSGPathToCredentials,self.SRSGPathToCredentials)
-      self.msrs:SetProvider(MSRS.Provider.GOOGLE)
+      self.msrs:SetGoogle(self.SRSGPathToCredentials)
     end
     self.msrs:SetVolume(self.SRSVolume)
     self.msrs:SetLabel("CSAR")
@@ -2545,9 +2542,8 @@ end
 -- @param #number Frequency Beacon frequency in kHz.
 -- @param #string Leadername Name of the #UNIT of the downed pilot.
 -- @param #string CoordinatesText String of the position of the pilot. Format determined by self.coordtype.
--- @param #string Playername Player name if any given. Might be nil!
-function CSAR:onbeforePilotDown(From, Event, To, Group, Frequency, Leadername, CoordinatesText, Playername)
-  self:T({From, Event, To, Group, Frequency, Leadername, CoordinatesText, tostring(Playername)})
+function CSAR:onbeforePilotDown(From, Event, To, Group, Frequency, Leadername, CoordinatesText)
+  self:T({From, Event, To, Group, Frequency, Leadername, CoordinatesText})
   return self
 end
 

Moose Development/Moose/Ops/CTLD.lua

@@ -8,7 +8,7 @@
 -- 
 -- ## Missions:
 --
--- ### [CTLD - Combat Troop & Logistics Deployment](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/CTLD)
+-- ### [CTLD - Combat Troop & Logistics Deployment](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20CTLD)
 -- 
 -- ===
 -- 
@@ -24,7 +24,7 @@
 -- @module Ops.CTLD
 -- @image OPS_CTLD.jpg
 
--- Last Update December 2023
+-- Last Update November 2023
 
 do 
 
@@ -1228,7 +1228,7 @@ CTLD.UnitTypeCapabilities = {
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.45"
+CTLD.version="1.0.43"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self
@@ -1443,7 +1443,6 @@ function CTLD:New(Coalition, Prefixes, Alias)
   -- @param #number delay Delay in seconds.
 
   --- Triggers the FSM event "Stop". Stops the CTLD and all its event handlers.
-  -- @function [parent=#CTLD] Stop
   -- @param #CTLD self
 
   --- Triggers the FSM event "Stop" after a delay. Stops the CTLD and all its event handlers.
@@ -1744,7 +1743,7 @@ end
 function CTLD:_GenerateUHFrequencies()
   self:T(self.lid .. " _GenerateUHFrequencies")
     self.FreeUHFFrequencies = {}
-    self.FreeUHFFrequencies = UTILS.GenerateUHFrequencies(243,320)    
+    self.FreeUHFFrequencies = UTILS.GenerateUHFrequencies()    
     return self
 end
 
@@ -2455,13 +2454,11 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop, pack)
       realcargo = CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,true,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],true,cargotype.PerCrateMass,nil,subcat)
       table.insert(droppedcargo,realcargo)
     else
-      realcargo = CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,false,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],false,cargotype.PerCrateMass,nil,subcat)    
+      realcargo = CTLD_CARGO:New(self.CargoCounter,cratename,templ,sorte,false,false,cratesneeded,self.Spawned_Crates[self.CrateCounter],false,cargotype.PerCrateMass,nil,subcat)
+      Cargo:RemoveStock()
     end
     table.insert(self.Spawned_Cargo, realcargo)
   end
-  if not (drop or pack) then
-    Cargo:RemoveStock()
-  end
   local text = string.format("Crates for %s have been positioned near you!",cratename)
   if drop then
     text = string.format("Crates for %s have been dropped!",cratename)
@@ -3013,35 +3010,6 @@ function CTLD:IsHercules(Unit)
   end
 end
 
-
---- (Internal) Function to set troops positions of a template to a nice circle
--- @param #CTLD self
--- @param Core.Point#COORDINATE Coordinate Start coordinate to use
--- @param #number Radius Radius to be used
--- @param #number Heading Heading starting with
--- @param #string Template The group template name
--- @return #table Positions The positions table
-function CTLD:_GetUnitPositions(Coordinate,Radius,Heading,Template)
-  local Positions = {}
-  local template = _DATABASE:GetGroupTemplate(Template)
-  UTILS.PrintTableToLog(template)
-  local numbertroops = #template.units
-  local newcenter = Coordinate:Translate(Radius,((Heading+270)%360))
-  for i=1,360,math.floor(360/numbertroops) do
-    local phead = ((Heading+270+i)%360)
-    local post = newcenter:Translate(Radius,phead)
-    local pos1 = post:GetVec2()
-    local p1t = {
-    x = pos1.x,
-    y = pos1.y,
-    heading = phead,
-    }
-    table.insert(Positions,p1t)
-  end
-  UTILS.PrintTableToLog(Positions)
-  return Positions
-end
-
 --- (Internal) Function to unload troops from heli.
 -- @param #CTLD self
 -- @param Wrapper.Group#GROUP Group
@@ -3093,29 +3061,14 @@ function CTLD:_UnloadTroops(Group, Unit)
             zoneradius = Unit:GetVelocityMPS() or 100
           end
           local zone = ZONE_GROUP:New(string.format("Unload zone-%s",unitname),Group,zoneradius*factor)
-          local randomcoord = zone:GetRandomCoordinate(10,30*factor) --:GetVec2()
-          local heading = Group:GetHeading() or 0
-          -- Spawn troops left from us, closer when hovering, further off when landed
-          if hoverunload or grounded then
-            randomcoord = Group:GetCoordinate()
-            -- slightly left from us           
-            local Angle = (heading+270)%360
-            local offset = hoverunload and 1.5 or 5
-            randomcoord:Translate(offset,Angle,nil,true)
-          end
-          local tempcount = 0
+          local randomcoord = zone:GetRandomCoordinate(10,30*factor):GetVec2()
           for _,_template in pairs(temptable) do
             self.TroopCounter = self.TroopCounter + 1
-            tempcount = tempcount+1
             local alias = string.format("%s-%d", _template, math.random(1,100000))
-            local rad = 2.5+tempcount
-            local Positions = self:_GetUnitPositions(randomcoord,rad,heading,_template)
             self.DroppedTroops[self.TroopCounter] = SPAWN:NewWithAlias(_template,alias)
-              --:InitRandomizeUnits(true,20,2)
-              --:InitHeading(heading)
+              :InitRandomizeUnits(true,20,2)
               :InitDelayOff()
-              :InitSetUnitAbsolutePositions(Positions)
-              :SpawnFromVec2(randomcoord:GetVec2())
+              :SpawnFromVec2(randomcoord)
             self:__TroopsDeployed(1, Group, Unit, self.DroppedTroops[self.TroopCounter],type)
           end -- template loop
           cargo:SetWasDropped(true)
@@ -3718,7 +3671,6 @@ function CTLD:_RefreshF10Menus()
             local loadmenu = MENU_GROUP_COMMAND:New(_group,"Load crates",topcrates, self._LoadCratesNearby, self, _group, _unit)
             local cratesmenu = MENU_GROUP:New(_group,"Get Crates",topcrates)
             local packmenu = MENU_GROUP_COMMAND:New(_group, "Pack crates", topcrates, self._PackCratesNearby, self, _group, _unit)
-            local removecratesmenu = MENU_GROUP:New(_group, "Remove crates", topcrates)
             
             if self.usesubcats then
               local subcatmenus = {}
@@ -3754,7 +3706,7 @@ function CTLD:_RefreshF10Menus()
               end
             end
             listmenu = MENU_GROUP_COMMAND:New(_group,"List crates nearby",topcrates, self._ListCratesNearby, self, _group, _unit)
-            removecrates = MENU_GROUP_COMMAND:New(_group,"Remove crates nearby",removecratesmenu, self._RemoveCratesNearby, self, _group, _unit)
+            listmenu = MENU_GROUP_COMMAND:New(_group,"Remove crates nearby",topcrates, self._RemoveCratesNearby, self, _group, _unit)
             local unloadmenu = MENU_GROUP_COMMAND:New(_group,"Drop crates",topcrates, self._UnloadCrates, self, _group, _unit)
             if not self.nobuildmenu then
               local buildmenu = MENU_GROUP_COMMAND:New(_group,"Build crates",topcrates, self._BuildCrates, self, _group, _unit)
@@ -3827,7 +3779,7 @@ end
 -- @param #CTLD_CARGO.Enum Type Type of cargo. I.e. VEHICLE or FOB. VEHICLE will move to destination zones when dropped/build, FOB stays put.
 -- @param #number NoCrates Number of crates needed to build this cargo.
 -- @param #number PerCrateMass Mass in kg of each crate
--- @param #number Stock Number of buildable groups in stock. Nil for unlimited.
+-- @param #number Stock Number of groups in stock. Nil for unlimited.
 -- @param #string SubCategory Name of sub-category (optional).
 function CTLD:AddCratesCargo(Name,Templates,Type,NoCrates,PerCrateMass,Stock,SubCategory)
   self:T(self.lid .. " AddCratesCargo")

Moose Development/Moose/Ops/Chief.lua

@@ -34,7 +34,7 @@
 -- @field Ops.Commander#COMMANDER commander Commander of assigned legions.
 -- @field #number Nsuccess Number of successful missions.
 -- @field #number Nfailure Number of failed mission.
--- @extends Ops.Intel#INTEL
+-- @extends Ops.Intelligence#INTEL
 
 --- *In preparing for battle I have always found that plans are useless, but planning is indispensable* -- Dwight D Eisenhower
 --
@@ -126,7 +126,7 @@
 -- When the chief detects a valid target, he will launch a certain number of selected assets. Only whole groups from SQUADRONs, PLATOONs or FLOTILLAs can be selected.
 -- In other words, it is not possible to specify the abount of individual *units*.
 -- 
--- By default, one group is selected for any detected target. This can, however, be customized with the @{#CHIEF.SetResponseOnTarget}() function. The number of min and max
+-- By default, one group is selected for any detected target. This can, however, be customized with the @{CHIEF.SetResponseOnTarget}() function. The number of min and max
 -- asset groups can be specified depending on threatlevel, category, mission type, number of units, defcon and strategy.
 -- 
 -- For example:
@@ -311,7 +311,7 @@ CHIEF.Strategy = {
 
 --- Resource list.
 -- @type CHIEF.Resources
--- @field #CHIEF.Resource List of resources.
+-- @field <#CHIEF.Resource> List of resources.
 
 --- Resource.
 -- @type CHIEF.Resource
@@ -1096,7 +1096,7 @@ end
 
 --- Add an AIRWING to the chief's commander.
 -- @param #CHIEF self
--- @param Ops.Airwing#AIRWING Airwing The airwing to add.
+-- @param Ops.AirWing#AIRWING Airwing The airwing to add.
 -- @return #CHIEF self
 function CHIEF:AddAirwing(Airwing)
 
@@ -1460,7 +1460,7 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The CAP zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The CAP zone data.
 function CHIEF:AddCapZone(Zone, Altitude, Speed, Heading, Leg)
 
   -- Hand over to commander.
@@ -1476,7 +1476,7 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The CAP zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The CAP zone data.
 function CHIEF:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
 
   -- Hand over to commander.
@@ -1503,7 +1503,7 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The AWACS zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The AWACS zone data.
 function CHIEF:AddAwacsZone(Zone, Altitude, Speed, Heading, Leg)
 
   -- Hand over to commander.
@@ -1531,7 +1531,7 @@ end
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
 -- @param #number RefuelSystem Refuelling system.
--- @return Ops.Airwing#AIRWING.TankerZone The tanker zone data.
+-- @return Ops.AirWing#AIRWING.TankerZone The tanker zone data.
 function CHIEF:AddTankerZone(Zone, Altitude, Speed, Heading, Leg, RefuelSystem)
 
   -- Hand over to commander.
@@ -1785,7 +1785,7 @@ function CHIEF:onafterStatus(From, Event, To)
 
   -- Clean up missions where the contact was lost.
   for _,_contact in pairs(self.ContactsLost) do
-    local contact=_contact --Ops.Intel#INTEL.Contact
+    local contact=_contact --Ops.Intelligence#INTEL.Contact
     
     if contact.mission and contact.mission:IsNotOver() then
     
@@ -1813,7 +1813,7 @@ function CHIEF:onafterStatus(From, Event, To)
   -- Create TARGETs for all new contacts.
   self.Nborder=0 ; self.Nconflict=0 ; self.Nattack=0
   for _,_contact in pairs(self.Contacts) do
-    local contact=_contact    --Ops.Intel#INTEL.Contact
+    local contact=_contact    --Ops.Intelligence#INTEL.Contact
     local group=contact.group --Wrapper.Group#GROUP
     
     -- Check if contact inside of our borders.
@@ -1964,7 +1964,7 @@ function CHIEF:onafterStatus(From, Event, To)
   if self.verbose>=2 and #self.Contacts>0 then
     local text="Contacts:"
     for i,_contact in pairs(self.Contacts) do
-      local contact=_contact --Ops.Intel#INTEL.Contact
+      local contact=_contact --Ops.Intelligence#INTEL.Contact
       
       local mtext="N/A"
       if contact.mission then

Moose Development/Moose/Ops/Commander.lua

@@ -420,7 +420,7 @@ end
 
 --- Add an AIRWING to the commander.
 -- @param #COMMANDER self
--- @param Ops.Airwing#AIRWING Airwing The airwing to add.
+-- @param Ops.AirWing#AIRWING Airwing The airwing to add.
 -- @return #COMMANDER self
 function COMMANDER:AddAirwing(Airwing)
 
@@ -667,10 +667,10 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The CAP zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The CAP zone data.
 function COMMANDER:AddCapZone(Zone, Altitude, Speed, Heading, Leg)
 
-  local patrolzone={} --Ops.Airwing#AIRWING.PatrolZone
+  local patrolzone={} --Ops.AirWing#AIRWING.PatrolZone
   
   patrolzone.zone=Zone
   patrolzone.altitude=Altitude or 12000
@@ -692,10 +692,10 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The CAP zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The CAP zone data.
 function COMMANDER:AddGciCapZone(Zone, Altitude, Speed, Heading, Leg)
 
-  local patrolzone={} --Ops.Airwing#AIRWING.PatrolZone
+  local patrolzone={} --Ops.AirWing#AIRWING.PatrolZone
   
   patrolzone.zone=Zone
   patrolzone.altitude=Altitude or 12000
@@ -715,7 +715,7 @@ end
 -- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
 function COMMANDER:RemoveGciCapZone(Zone)
 
-  local patrolzone={} --Ops.Airwing#AIRWING.PatrolZone
+  local patrolzone={} --Ops.AirWing#AIRWING.PatrolZone
   
   patrolzone.zone=Zone
   for i,_patrolzone in pairs(self.gcicapZones) do
@@ -737,10 +737,10 @@ end
 -- @param #number Speed Orbit speed in KIAS. Default 350 kts.
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
--- @return Ops.Airwing#AIRWING.PatrolZone The AWACS zone data.
+-- @return Ops.AirWing#AIRWING.PatrolZone The AWACS zone data.
 function COMMANDER:AddAwacsZone(Zone, Altitude, Speed, Heading, Leg)
 
-  local awacszone={} --Ops.Airwing#AIRWING.PatrolZone
+  local awacszone={} --Ops.AirWing#AIRWING.PatrolZone
   
   awacszone.zone=Zone
   awacszone.altitude=Altitude or 12000
@@ -760,7 +760,7 @@ end
 -- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
 function COMMANDER:RemoveAwacsZone(Zone)
 
-  local awacszone={} --Ops.Airwing#AIRWING.PatrolZone
+  local awacszone={} --Ops.AirWing#AIRWING.PatrolZone
   
   awacszone.zone=Zone
   for i,_awacszone in pairs(self.awacsZones) do
@@ -783,10 +783,10 @@ end
 -- @param #number Heading Heading of race-track pattern in degrees. Default 270 (East to West).
 -- @param #number Leg Length of race-track in NM. Default 30 NM.
 -- @param #number RefuelSystem Refuelling system.
--- @return Ops.Airwing#AIRWING.TankerZone The tanker zone data.
+-- @return Ops.AirWing#AIRWING.TankerZone The tanker zone data.
 function COMMANDER:AddTankerZone(Zone, Altitude, Speed, Heading, Leg, RefuelSystem)
 
-  local tankerzone={} --Ops.Airwing#AIRWING.TankerZone
+  local tankerzone={} --Ops.AirWing#AIRWING.TankerZone
   
   tankerzone.zone=Zone
   tankerzone.altitude=Altitude or 12000
@@ -807,7 +807,7 @@ end
 -- @param Core.Zone#ZONE Zone Zone, where the flight orbits.
 function COMMANDER:RemoveTankerZone(Zone)
 
-  local tankerzone={} --Ops.Airwing#AIRWING.PatrolZone
+  local tankerzone={} --Ops.AirWing#AIRWING.PatrolZone
   
   tankerzone.zone=Zone
   for i,_tankerzone in pairs(self.tankerZones) do
@@ -997,7 +997,7 @@ function COMMANDER:onafterStatus(From, Event, To)
 
   -- Check CAP zones.
   for _,_patrolzone in pairs(self.capZones) do
-    local patrolzone=_patrolzone --Ops.Airwing#AIRWING.PatrolZone
+    local patrolzone=_patrolzone --Ops.AirWing#AIRWING.PatrolZone
     -- Check if mission is nil or over.
     if (not patrolzone.mission) or patrolzone.mission:IsOver() then
       local Coordinate=patrolzone.zone:GetCoordinate()
@@ -1008,7 +1008,7 @@ function COMMANDER:onafterStatus(From, Event, To)
 
   -- Check GCICAP zones.
   for _,_patrolzone in pairs(self.gcicapZones) do
-    local patrolzone=_patrolzone --Ops.Airwing#AIRWING.PatrolZone
+    local patrolzone=_patrolzone --Ops.AirWing#AIRWING.PatrolZone
     -- Check if mission is nil or over.
     if (not patrolzone.mission) or patrolzone.mission:IsOver() then
       local Coordinate=patrolzone.zone:GetCoordinate()
@@ -1019,7 +1019,7 @@ function COMMANDER:onafterStatus(From, Event, To)
   
   -- Check AWACS zones.
   for _,_awacszone in pairs(self.awacsZones) do
-    local awacszone=_awacszone --Ops.Airwing#AIRWING.Patrol
+    local awacszone=_awacszone --Ops.AirWing#AIRWING.Patrol
     -- Check if mission is nil or over.
     if (not awacszone.mission) or awacszone.mission:IsOver() then
       local Coordinate=awacszone.zone:GetCoordinate()
@@ -1030,7 +1030,7 @@ function COMMANDER:onafterStatus(From, Event, To)
 
   -- Check Tanker zones.
   for _,_tankerzone in pairs(self.tankerZones) do
-    local tankerzone=_tankerzone --Ops.Airwing#AIRWING.TankerZone
+    local tankerzone=_tankerzone --Ops.AirWing#AIRWING.TankerZone
     -- Check if mission is nil or over.
     if (not tankerzone.mission) or tankerzone.mission:IsOver() then
       local Coordinate=tankerzone.zone:GetCoordinate()

Moose Development/Moose/Ops/EasyGCICAP.lua

@@ -41,12 +41,13 @@
 -- @field #number coalition
 -- @field #string alias
 -- @field #table wings
--- @field Ops.Intel#INTEL Intel
+-- @field Ops.Intelligence#INTEL Intel
 -- @field #number resurrection
 -- @field #number capspeed
 -- @field #number capalt
 -- @field #number capdir
 -- @field #number capleg
+-- @field #number capgrouping
 -- @field #number maxinterceptsize
 -- @field #number missionrange
 -- @field #number noaltert5
@@ -64,7 +65,6 @@
 -- @field #boolean Monitor
 -- @field #boolean TankerInvisible
 -- @field #number CapFormation
--- @field #table ReadyFlightGroups
 -- @extends Core.Fsm#FSM
 
 --- *“Airspeed, altitude, and brains. Two are always needed to successfully complete the flight.”* -- Unknown.
@@ -141,14 +141,14 @@
 --        -- **Note** If you need different tanker types, i.e. Boom and Drogue, set them up at different AirWings!
 --        -- Add a tanker point
 --        mywing:AddPatrolPointTanker(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone Tanker"):GetCoordinate(),20000,280,270,50)
---        -- Add a tanker squad - Radio 251 AM, TACAN 51Y
+--        -- Add an AWACS squad - Radio 251 AM, TACAN 51Y
 --        mywing:AddTankerSquadron("Blue Tanker","Tanker Ops Kutaisi",AIRBASE.Caucasus.Kutaisi,20,AI.Skill.EXCELLENT,602,nil,251,radio.modulation.AM,51)
 --        
 -- ### Add an AWACS (optional)
 --        
 --        -- Add an AWACS point
 --        mywing:AddPatrolPointAwacs(AIRBASE.Caucasus.Kutaisi,ZONE:FindByName("Blue Zone AWACS"):GetCoordinate(),25000,300,270,50)
---        -- Add an AWACS squad - Radio 251 AM, TACAN 51Y
+--        -- Add a tanker squad - Radio 251 AM, TACAN 51Y
 --        mywing:AddAWACSSquadron("Blue AWACS","AWACS Ops Kutaisi",AIRBASE.Caucasus.Kutaisi,20,AI.Skill.AVERAGE,702,nil,271,radio.modulation.AM)        
 --
 -- # Fine-Tuning
@@ -190,6 +190,7 @@ EASYGCICAP = {
   capalt = 25000,
   capdir = 45,
   capleg = 15,
+  capgrouping = 2,
   maxinterceptsize = 2,
   missionrange = 100,
   noaltert5 = 4,
@@ -208,7 +209,6 @@ EASYGCICAP = {
   Monitor = false,
   TankerInvisible = true,
   CapFormation = nil,
-  ReadyFlightGroups = {},
 }
 
 --- Internal Squadron data type
@@ -244,7 +244,7 @@ EASYGCICAP = {
 
 --- EASYGCICAP class version.
 -- @field #string version
-EASYGCICAP.version="0.1.10"
+EASYGCICAP.version="0.0.9"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -258,10 +258,10 @@ EASYGCICAP.version="0.1.10"
 
 --- Create a new GCICAP Manager
 -- @param #EASYGCICAP self
--- @param #string Alias A Name for this GCICAP
--- @param #string AirbaseName Name of the Home Airbase
--- @param #string Coalition Coalition, e.g. "blue" or "red"
--- @param #string EWRName (Partial) group name of the EWR system of the coalition, e.g. "Red EWR"
+-- @param #string Alias
+-- @param #string AirbaseName
+-- @param #string Coalition
+-- @param #string EWRName
 -- @return #EASYGCICAP self
 function EASYGCICAP:New(Alias, AirbaseName, Coalition, EWRName)
   -- Inherit everything from FSM class.
@@ -321,7 +321,6 @@ end
 -- @param #number Formation Formation to fly, defaults to ENUMS.Formation.FixedWing.FingerFour.Group
 -- @return #EASYGCICAP self
 function EASYGCICAP:SetCAPFormation(Formation)
-  self:T(self.lid.."SetCAPFormation")
   self.CapFormation = Formation
   return self
 end
@@ -429,7 +428,7 @@ end
 --- Set default number of airframes standing by for intercept tasks (visible on the airfield)
 -- @param #EASYGCICAP self
 -- @param #number Airframes defaults to 2
--- @return #EASYGCICAP self
+-- @return #EASYGCICAP selfAirframes
 function EASYGCICAP:SetDefaultNumberAlter5Standby(Airframes)
   self:T(self.lid.."SetDefaultNumberAlter5Standby")
   self.noaltert5 = math.abs(Airframes) or 2
@@ -439,36 +438,13 @@ end
 --- Set default engage range for intruders detected by CAP flights in NM.
 -- @param #EASYGCICAP self
 -- @param #number Range defaults to 50NM
--- @return #EASYGCICAP self
+-- @return #EASYGCICAP selfAirframes
 function EASYGCICAP:SetDefaultEngageRange(Range)
   self:T(self.lid.."SetDefaultNumberAlter5Standby")
   self.engagerange = Range or 50
   return self
 end
 
---- Set default overhead for intercept calculations
--- @param #EASYGCICAP self
--- @param #number Overhead The overhead to use.
--- @return #EASYGCICAP self
--- @usage Either a CAP Plane or a newly spawned GCI plane will take care of intruders. Standard overhead is 0.75, i.e. a group of 3 intrudes will
--- be managed by 2 planes from the assigned AirWing. There is an maximum missions limitation per AirWing, so we do not spam the skies.
-function EASYGCICAP:SetDefaultOverhead(Overhead)
-  self:T(self.lid.."SetDefaultOverhead")
-  self.overhead = Overhead or 0.75
-  return self
-end
-
---- Set CAP mission start to vary randomly between Start end End seconds.
--- @param #EASYGCICAP self
--- @param #number Start
--- @param #number End 
--- @return #EASYGCICAP self
-function EASYGCICAP:SetCapStartTimeVariation(Start, End)
-  self.capOptionVaryStartTime = Start or 5
-  self.capOptionVaryEndTime = End or 60
-  return self
-end
-
 --- Add an AirWing to the manager
 -- @param #EASYGCICAP self
 -- @param #string Airbasename
@@ -515,18 +491,13 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
   
   -- Create Airwing
   local CAP_Wing = AIRWING:New(Airbasename,Alias)
-  CAP_Wing:SetVerbosityLevel(0)
+  CAP_Wing:SetVerbosityLevel(3)
   CAP_Wing:SetReportOff()
   CAP_Wing:SetMarker(false)
   CAP_Wing:SetAirbase(AIRBASE:FindByName(Airbasename))
   CAP_Wing:SetRespawnAfterDestroyed()
   CAP_Wing:SetNumberCAP(self.capgrouping)
   CAP_Wing:SetCapCloseRaceTrack(true)
-  
-  if self.capOptionVaryStartTime then
-    CAP_Wing:SetCapStartTimeVariation(self.capOptionVaryStartTime,self.capOptionVaryEndTime)
-  end
-  
   if CapFormation then
     CAP_Wing:SetCAPFormation(CapFormation)
   end
@@ -557,7 +528,6 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
     flightgroup:SetDespawnAfterHolding()
     flightgroup:SetDestinationbase(AIRBASE:FindByName(Airbasename))
     flightgroup:GetGroup():CommandEPLRS(true,5)
-    flightgroup:GetGroup():SetOptionRadarUsingForContinousSearch()
     if Mission.type ~= AUFTRAG.Type.TANKER and Mission.type ~= AUFTRAG.Type.AWACS and Mission.type ~= AUFTRAG.Type.RECON then
       flightgroup:SetDetection(true)
       flightgroup:SetEngageDetectedOn(self.engagerange,{"Air"},self.GoZoneSet,self.NoGoZoneSet)
@@ -578,7 +548,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
     flightgroup:SetFuelLowRTB(true)
     Intel:AddAgent(flightgroup)
     function flightgroup:OnAfterHolding(From,Event,To)
-      self:Despawn(1,true)
+      self:ClearToLand(5)
     end 
     
   end
@@ -1075,172 +1045,6 @@ function EASYGCICAP:AddRejectZone(Zone)
   return self
 end
 
---- (Internal) Try to assign the intercept to a FlightGroup already in air and ready.
--- @param #EASYGCICAP self
--- @param #table ReadyFlightGroups ReadyFlightGroups
--- @param Ops.Auftrag#AUFTRAG InterceptAuftrag The Auftrag
--- @param Wrapper.Group#GROUP Group The Target
--- @param #number WingSize Calculated number of Flights
--- @return #boolean assigned
--- @return #number leftover
-function EASYGCICAP:_TryAssignIntercept(ReadyFlightGroups,InterceptAuftrag,Group,WingSize)
-  self:I("_TryAssignIntercept for size "..WingSize or 1)
-  local assigned = false
-  local wingsize = WingSize or 1
-  local mindist = 0
-  local disttable = {}
-  if Group and Group:IsAlive() then
-    local gcoord = Group:GetCoordinate() or COORDINATE:New(0,0,0)
-    self:I(self.lid..string.format("Assignment for %s",Group:GetName()))
-    for _name,_FG in pairs(ReadyFlightGroups or {}) do
-      local FG = _FG -- Ops.FlightGroup#FLIGHTGROUP
-      local fcoord = FG:GetCoordinate()
-      local dist = math.floor(UTILS.Round(fcoord:Get2DDistance(gcoord)/1000,1))
-      self:I(self.lid..string.format("FG %s Distance %dkm",_name,dist))
-      disttable[#disttable+1] = { FG=FG, dist=dist}
-      if dist>mindist then mindist=dist end
-    end
-    
-    local function sortDistance(a, b)
-      return a.dist < b.dist
-    end
-    
-    table.sort(disttable, sortDistance)
-    
-    for _,_entry in ipairs(disttable) do
-      local FG = _entry.FG -- Ops.FlightGroup#FLIGHTGROUP
-      FG:AddMission(InterceptAuftrag)
-      local cm = FG:GetMissionCurrent()
-      if cm then cm:Cancel() end
-      wingsize = wingsize - 1
-      self:I(self.lid..string.format("Assigned to FG %s Distance %dkm",FG:GetName(),_entry.dist))
-      if wingsize == 0 then 
-        assigned = true
-        break 
-      end
-    end
-  end
-  
-  return assigned, wingsize
-end
-
---- Add a zone to the rejected zones set.
--- @param #EASYGCICAP self
--- @param Ops.Intelligence#INTEL.Cluster Cluster
--- @return #EASYGCICAP self 
-function EASYGCICAP:_AssignIntercept(Cluster)
-   -- Here, we'll decide if we need to launch an intercepting flight, and from where
-  local overhead = self.overhead
-  local capspeed = self.capspeed + 100
-  local capalt = self.capalt
-  local maxsize = self.maxinterceptsize
-  local repeatsonfailure = self.repeatsonfailure
-  
-  local wings = self.wings
-  local ctlpts = self.ManagedCP
-  local MaxAliveMissions = self.MaxAliveMissions * self.capgrouping
-  local nogozoneset = self.NoGoZoneSet
-  local ReadyFlightGroups = self.ReadyFlightGroups
-  
-    -- Aircraft?
-  if Cluster.ctype ~= INTEL.Ctype.AIRCRAFT then return end
-  -- Threatlevel 0..10
-  local contact = self.Intel:GetHighestThreatContact(Cluster)
-  local name = contact.groupname --#string
-  local threat = contact.threatlevel --#number
-  local position = self.Intel:CalcClusterFuturePosition(Cluster,300)
-  -- calculate closest zone
-  local bestdistance = 2000*1000 -- 2000km
-  local targetairwing = nil -- Ops.AirWing#AIRWING
-  local targetawname = "" -- #string
-  local clustersize = self.Intel:ClusterCountUnits(Cluster) or 1
-  local wingsize = math.abs(overhead * (clustersize+1))
-  if wingsize > maxsize then wingsize = maxsize end
-  -- existing mission, and if so - done?
-  local retrymission = true
-  if Cluster.mission and (not Cluster.mission:IsOver()) then 
-    retrymission = false
-  end
-  if (retrymission) and (wingsize >= 1) then
-   MESSAGE:New(string.format("**** %s Interceptors need wingsize %d", UTILS.GetCoalitionName(self.coalition), wingsize),15,"CAPGCI"):ToAllIf(self.debug):ToLog()
-    for _,_data in pairs (wings) do
-      local airwing = _data[1] -- Ops.AirWing#AIRWING
-      local zone = _data[2] -- Core.Zone#ZONE
-      local zonecoord = zone:GetCoordinate()
-      local name = _data[3] -- #string
-      local distance = position:DistanceFromPointVec2(zonecoord)
-      local airframes = airwing:CountAssets(true)
-      if distance < bestdistance and airframes >= wingsize then
-        bestdistance = distance
-        targetairwing = airwing
-        targetawname = name
-      end
-    end
-    for _,_data in pairs (ctlpts) do
-      --local airwing = _data[1] -- Ops.AirWing#AIRWING
-      --local zone = _data[2] -- Core.Zone#ZONE
-      --local zonecoord = zone:GetCoordinate()
-      --local name = _data[3] -- #string
-      
-      local data = _data -- #EASYGCICAP.CapPoint
-      local name = data.AirbaseName
-      local zonecoord = data.Coordinate
-      local airwing = wings[name][1]
-      
-      local distance = position:DistanceFromPointVec2(zonecoord)
-      local airframes = airwing:CountAssets(true)
-      if distance < bestdistance and airframes >= wingsize then
-        bestdistance = distance
-        targetairwing = airwing -- Ops.AirWing#AIRWING
-        targetawname = name
-      end
-    end
-    local text = string.format("Closest Airwing is %s", targetawname)
-    local m = MESSAGE:New(text,10,"CAPGCI"):ToAllIf(self.debug):ToLog()
-    -- Do we have a matching airwing?
-    if targetairwing then
-      local AssetCount = targetairwing:CountAssetsOnMission(MissionTypes,Cohort)
-      -- Enough airframes on mission already?
-      self:T(self.lid.." Assets on Mission "..AssetCount)
-      if AssetCount <= MaxAliveMissions then
-        local repeats = repeatsonfailure
-        local InterceptAuftrag = AUFTRAG:NewINTERCEPT(contact.group)
-          :SetMissionRange(150)
-          :SetPriority(1,true,1)
-          --:SetRequiredAssets(wingsize)
-          :SetRepeatOnFailure(repeats)
-          :SetMissionSpeed(UTILS.KnotsToAltKIAS(capspeed,capalt))
-          :SetMissionAltitude(capalt)
-          
-          if nogozoneset:Count() > 0 then
-            InterceptAuftrag:AddConditionSuccess(
-              function(group,zoneset)
-                local success = false
-                if group and group:IsAlive() then
-                  local coord = group:GetCoordinate()
-                  if coord and zoneset:IsCoordinateInZone(coord) then
-                    success = true
-                  end
-                end
-                return success
-              end,
-              contact.group,
-              nogozoneset
-            )
-          end
-        local assigned, rest = self:_TryAssignIntercept(ReadyFlightGroups,InterceptAuftrag,contact.group,wingsize)
-        if not assigned  then
-          InterceptAuftrag:SetRequiredAssets(rest)
-          targetairwing:AddMission(InterceptAuftrag)
-        end
-        Cluster.mission = InterceptAuftrag
-      end
-    else
-      MESSAGE:New("**** Not enough airframes available or max mission limit reached!",15,"CAPGCI"):ToAllIf(self.debug):ToLog()
-    end
-   end
-end
-
 --- (Internal) Start detection.
 -- @param #EASYGCICAP self
 -- @return #EASYGCICAP self
@@ -1264,16 +1068,131 @@ function EASYGCICAP:_StartIntel()
     BlueIntel.debug = true
   end
   
-  local function AssignCluster(Cluster)
-    self:_AssignIntercept(Cluster)
-  end
+  -- Here, we'll decide if we need to launch an intercepting flight, and from where
+  
+  local overhead = self.overhead
+  local capspeed = self.capspeed + 100
+  local capalt = self.capalt
+  local maxsize = self.maxinterceptsize
+  local repeatsonfailure = self.repeatsonfailure
+  
+  local wings = self.wings
+  local ctlpts = self.ManagedCP
+  local MaxAliveMissions = self.MaxAliveMissions * self.capgrouping
+  local nogozoneset = self.NoGoZoneSet
   
   function BlueIntel:OnAfterNewCluster(From,Event,To,Cluster)
-    AssignCluster(Cluster)
+    -- Aircraft?
+    if Cluster.ctype ~= INTEL.Ctype.AIRCRAFT then return end
+    -- Threatlevel 0..10
+    local contact = self:GetHighestThreatContact(Cluster)
+    local name = contact.groupname --#string
+    local threat = contact.threatlevel --#number
+    local position = self:CalcClusterFuturePosition(Cluster,300)
+    -- calculate closest zone
+    local bestdistance = 2000*1000 -- 2000km
+    local targetairwing = nil -- Ops.AirWing#AIRWING
+    local targetawname = "" -- #string
+    local clustersize = self:ClusterCountUnits(Cluster) or 1
+    local wingsize = math.abs(overhead * (clustersize+1))
+    if wingsize > maxsize then wingsize = maxsize end
+    -- existing mission, and if so - done?
+    local retrymission = true
+    if Cluster.mission and (not Cluster.mission:IsOver()) then 
+      retrymission = false
+    end
+    if (retrymission) and (wingsize >= 1) then
+     MESSAGE:New(string.format("**** %s Interceptors need wingsize %d", UTILS.GetCoalitionName(self.coalition), wingsize),15,"CAPGCI"):ToAllIf(self.debug):ToLog()
+      for _,_data in pairs (wings) do
+        local airwing = _data[1] -- Ops.AirWing#AIRWING
+        local zone = _data[2] -- Core.Zone#ZONE
+        local zonecoord = zone:GetCoordinate()
+        local name = _data[3] -- #string
+        local distance = position:DistanceFromPointVec2(zonecoord)
+        local airframes = airwing:CountAssets(true)
+        if distance < bestdistance and airframes >= wingsize then
+          bestdistance = distance
+          targetairwing = airwing
+          targetawname = name
+        end
+      end
+      for _,_data in pairs (ctlpts) do
+        --local airwing = _data[1] -- Ops.AirWing#AIRWING
+        --local zone = _data[2] -- Core.Zone#ZONE
+        --local zonecoord = zone:GetCoordinate()
+        --local name = _data[3] -- #string
+        
+        local data = _data -- #EASYGCICAP.CapPoint
+        local name = data.AirbaseName
+        local zonecoord = data.Coordinate
+        local airwing = wings[name][1]
+        
+        local distance = position:DistanceFromPointVec2(zonecoord)
+        local airframes = airwing:CountAssets(true)
+        if distance < bestdistance and airframes >= wingsize then
+          bestdistance = distance
+          targetairwing = airwing -- Ops.AirWing#AIRWING
+          targetawname = name
+        end
+      end
+      local text = string.format("Closest Airwing is %s", targetawname)
+      local m = MESSAGE:New(text,10,"CAPGCI"):ToAllIf(self.debug):ToLog()
+      -- Do we have a matching airwing?
+      if targetairwing then
+        local AssetCount = targetairwing:CountAssetsOnMission(MissionTypes,Cohort)
+        --[[
+        local Assets = targetairwing:GetAssetsOnMission(AUFTRAG.Type.GCICAP)
+        for _,_asset in pairs(Assets) do
+          local asset = _asset -- Functional.Warehouse#WAREHOUSE.Assetitem
+          local fg = asset.flightgroup
+          local name = asset.spawngroupname
+          local mission = fg:GetMissionCurrent()
+          local mtype = mission.type
+          local distance = position:Get3DDistance(fg:GetCoordinate()) or 1000*1000
+          distance = distance / 1000
+          local text = string.format("FlightGroup %s on mission %s with distance %d km",name,mtype,distance)
+          local m = MESSAGE:New(text,15,"GCICAP"):ToAllIf(self.debug):ToLog()
+        end
+        --]]
+        -- Enough airframes on mission already?
+        self:T(self.lid.." Assets on Mission "..AssetCount)
+        if AssetCount <= MaxAliveMissions then
+          local repeats = repeatsonfailure
+          local InterceptAuftrag = AUFTRAG:NewINTERCEPT(contact.group)
+            :SetMissionRange(150)
+            :SetPriority(1,true,1)
+            :SetRequiredAssets(wingsize)
+            :SetRepeatOnFailure(repeats)
+            :SetMissionSpeed(UTILS.KnotsToAltKIAS(capspeed,capalt))
+            :SetMissionAltitude(capalt)
+            
+            if nogozoneset:Count() > 0 then
+              InterceptAuftrag:AddConditionSuccess(
+                function(group,zoneset)
+                  local success = false
+                  if group and group:IsAlive() then
+                    local coord = group:GetCoordinate()
+                    if coord and zoneset:IsCoordinateInZone(coord) then
+                      success = true
+                    end
+                  end
+                  return success
+                end,
+                contact.group,
+                nogozoneset
+              )
+            end
+            
+          targetairwing:AddMission(InterceptAuftrag)
+          Cluster.mission = InterceptAuftrag
+        end
+      else
+        MESSAGE:New("**** Not enough airframes available or max mission limit reached!",15,"CAPGCI"):ToAllIf(self.debug):ToLog()
+      end
+   end
   end
-  
-  self.Intel = BlueIntel  
-  return self
+self.Intel = BlueIntel  
+return self
 end
 
 -------------------------------------------------------------------------
@@ -1347,24 +1266,6 @@ function EASYGCICAP:onafterStatus(From,Event,To)
     tankermission = tankermission + _wing[1]:CountMissionsInQueue({AUFTRAG.Type.TANKER})
     assets = assets + count
     instock = instock + count2
-    local assetsonmission = _wing[1]:GetAssetsOnMission({AUFTRAG.Type.GCICAP,AUFTRAG.Type.PATROLRACETRACK})
-    -- update ready groups
-    self.ReadyFlightGroups = nil
-    self.ReadyFlightGroups = {}
-    for _,_asset in pairs(assetsonmission or {}) do
-      local asset = _asset -- Functional.Warehouse#WAREHOUSE.Assetitem
-      local FG = asset.flightgroup -- Ops.FlightGroup#FLIGHTGROUP
-      if FG then
-        local name = FG:GetName()
-        local engage = FG:IsEngaging()
-        local hasmissiles = FG:IsOutOfMissiles() == nil and true or false
-        local ready = hasmissiles and FG:IsFuelGood() and FG:IsAirborne()
-        --self:I(string.format("Flightgroup %s Engaging = %s Ready = %s",tostring(name),tostring(engage),tostring(ready)))
-        if ready then
-          self.ReadyFlightGroups[name] = FG
-        end
-      end
-    end
   end
   if self.Monitor then
     local threatcount = #self.Intel.Clusters or 0

Moose Development/Moose/Ops/Fleet.lua

@@ -9,7 +9,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Fleet).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Fleet).
 -- 
 -- ===
 --

Moose Development/Moose/Ops/FlightControl.lua

@@ -12,7 +12,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions: None
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20FlightControl).
 --
 -- ===
 --
@@ -207,9 +207,9 @@
 -- landing is `21L`.
 -- 
 -- By default, the runways for landing and takeoff are determined from the wind direction as described above. For cases where this gives wrong results, you can set the active runways manually. This is
--- done via @{Wrapper.Airbase#AIRBASE} class.
+-- done via @{Wrappper.Airbase#AIRBASE} class.
 -- 
--- More specifically, you can use the @{Wrapper.Airbase#AIRBASE.SetActiveRunwayLanding} function to set the landing runway and the @{Wrapper.Airbase#AIRBASE.SetActiveRunwayTakeoff} function to set
+-- More specifically, you can use the @{Wrappper.Airbase#AIRBASE.SetActiveRunwayLanding} function to set the landing runway and the @{Wrappper.Airbase#AIRBASE.SetActiveRunwayTakeoff} function to set
 -- the runway for takeoff.
 -- 
 -- ## Example for Nellis AFB
@@ -223,7 +223,7 @@
 -- 
 -- # DCS ATC
 -- 
--- You can disable the DCS ATC with the @{Wrapper.Airbase#AIRBASE.SetRadioSilentMode}(*true*). This does not remove the DCS ATC airbase from the F10 menu but makes the ATC unresponsive.
+-- You can disable the DCS ATC with the @{Wrappper.Airbase#AIRBASE.SetRadioSilentMode}(*true*). This does not remove the DCS ATC airbase from the F10 menu but makes the ATC unresponsive.
 -- 
 -- 
 -- # Examples
@@ -411,36 +411,26 @@ function FLIGHTCONTROL:New(AirbaseName, Frequency, Modulation, PathToSRS, Port,
   self:SetRunwayRepairtime()
   self.nosubs = false
   
+  -- Set SRS Port
+  self:SetSRSPort(Port or 5002)
+  
   -- Set Callsign Options
   self:SetCallSignOptions(true,true)
   
   -- Init msrs queue.
   self.msrsqueue=MSRSQUEUE:New(self.alias)
   
-  -- Init msrs bases
-  local path = PathToSRS or MSRS.path
-  local port = Port or MSRS.port or 5002
-  
-  -- Set SRS Port
-  self:SetSRSPort(port)
-  
   -- SRS for Tower.
-  self.msrsTower=MSRS:New(path, Frequency, Modulation)
-  self.msrsTower:SetPort(port)
-  if GoogleKey then
-    self.msrsTower:SetProviderOptionsGoogle(GoogleKey,GoogleKey)
-    self.msrsTower:SetProvider(MSRS.Provider.GOOGLE)
-  end  
+  self.msrsTower=MSRS:New(PathToSRS, Frequency, Modulation)
+  self.msrsTower:SetPort(self.Port)
+  self.msrsTower:SetGoogle(GoogleKey)
   self.msrsTower:SetCoordinate(self:GetCoordinate())
   self:SetSRSTower()
   
   -- SRS for Pilot.
   self.msrsPilot=MSRS:New(PathToSRS, Frequency, Modulation)
   self.msrsPilot:SetPort(self.Port)
-  if GoogleKey then
-    self.msrsPilot:SetProviderOptionsGoogle(GoogleKey,GoogleKey)
-    self.msrsPilot:SetProvider(MSRS.Provider.GOOGLE)
-  end  
+  self.msrsPilot:SetGoogle(GoogleKey)
   self.msrsTower:SetCoordinate(self:GetCoordinate())
   self:SetSRSPilot()
   
@@ -643,6 +633,7 @@ function FLIGHTCONTROL:_SetSRSOptions(msrs, Gender, Culture, Voice, Volume, Labe
     msrs:SetVoice(Voice)
     msrs:SetVolume(Volume)
     msrs:SetLabel(Label)
+    msrs:SetGoogle(PathToGoogleCredentials)
     msrs:SetCoalition(self:GetCoalition())
     msrs:SetPort(Port or self.Port or 5002)
   end
@@ -657,11 +648,12 @@ end
 -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`. See [Google Voices](https://cloud.google.com/text-to-speech/docs/voices).
 -- @param #number Volume Volume. Default 1.0.
 -- @param #string Label Name under which SRS transmits. Default `self.alias`.
+-- @param #string PathToGoogleCredentials Path to google credentials json file.
 -- @return #FLIGHTCONTROL self
-function FLIGHTCONTROL:SetSRSTower(Gender, Culture, Voice, Volume, Label)
+function FLIGHTCONTROL:SetSRSTower(Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials)
 
   if self.msrsTower then
-    self:_SetSRSOptions(self.msrsTower, Gender or "female", Culture or "en-GB", Voice, Volume, Label or self.alias)
+    self:_SetSRSOptions(self.msrsTower, Gender or "female", Culture or "en-GB", Voice, Volume, Label or self.alias, PathToGoogleCredentials)
   end
 
   return self
@@ -674,11 +666,12 @@ end
 -- @param #string Voice Specific voice. Overrides `Gender` and `Culture`.
 -- @param #number Volume Volume. Default 1.0.
 -- @param #string Label Name under which SRS transmits. Default "Pilot".
+-- @param #string PathToGoogleCredentials Path to google credentials json file.
 -- @return #FLIGHTCONTROL self
-function FLIGHTCONTROL:SetSRSPilot(Gender, Culture, Voice, Volume, Label)
+function FLIGHTCONTROL:SetSRSPilot(Gender, Culture, Voice, Volume, Label, PathToGoogleCredentials)
 
   if self.msrsPilot then
-    self:_SetSRSOptions(self.msrsPilot, Gender or "male", Culture or "en-US", Voice, Volume, Label or "Pilot")
+    self:_SetSRSOptions(self.msrsPilot, Gender or "male", Culture or "en-US", Voice, Volume, Label or "Pilot", PathToGoogleCredentials)
   end
 
   return self
@@ -883,7 +876,7 @@ end
 
 --- Set ATIS.
 -- @param #FLIGHTCONTROL self
--- @param Ops.ATIS#ATIS Atis ATIS.
+-- @param Ops.Atis#ATIS Atis ATIS.
 -- @return #FLIGHTCONTROL self
 function FLIGHTCONTROL:SetATIS(Atis)
   self.atis=Atis
@@ -4431,11 +4424,14 @@ end
 -- Misc Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- [INTERNAL] Add parking guard in front of a parking aircraft - delayed for MP.
+--- Add parking guard in front of a parking aircraft.
 -- @param #FLIGHTCONTROL self
 -- @param Wrapper.Unit#UNIT unit The aircraft.
-function FLIGHTCONTROL:_SpawnParkingGuard(unit)
-      -- Position of the unit.
+function FLIGHTCONTROL:SpawnParkingGuard(unit)
+  
+  if unit and self.parkingGuard then
+  
+    -- Position of the unit.
     local coordinate=unit:GetCoordinate()
 
     -- Parking spot.
@@ -4482,17 +4478,6 @@ function FLIGHTCONTROL:_SpawnParkingGuard(unit)
     else
       self:E(self.lid.."ERROR: Parking Guard already exists!")
     end
-end
-
---- Add parking guard in front of a parking aircraft.
--- @param #FLIGHTCONTROL self
--- @param Wrapper.Unit#UNIT unit The aircraft.
-function FLIGHTCONTROL:SpawnParkingGuard(unit)
-  
-  if unit and self.parkingGuard then
-    
-    -- Schedule delay so in MP we get the heading of the client's plane
-    self:ScheduleOnce(1,FLIGHTCONTROL._SpawnParkingGuard,self,unit)
     
   end
     

Moose Development/Moose/Ops/FlightGroup.lua

@@ -18,7 +18,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Flightgroup).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Flightgroup).
 --
 -- ===
 --
@@ -2333,8 +2333,7 @@ function FLIGHTGROUP:onafterCruise(From, Event, To)
     -- CLIENT
     ---
   
-    -- Had this commented out (forgot why, probably because it was not necessary) but re-enabling it because of carrier launch.
-    self:_UpdateMenu(0.1)
+    --self:_UpdateMenu(0.1)
     
   end
     
@@ -3231,22 +3230,13 @@ function FLIGHTGROUP:_LandAtAirbase(airbase, SpeedTo, SpeedHold, SpeedLand)
     local TaskFinal = self.group:TaskFunction("FLIGHTGROUP._OnFinal", self)
 
     -- Final approach waypoint.
-    local rheading
-    if runway then
-      rheading = runway.heading-180
-    else
-      -- AB HeloBase w/o runway eg Naqoura
-      local wind = airbase:GetCoordinate():GetWind()
-      rheading = -wind
-    end
-    
-    local papp=airbase:GetCoordinate():Translate(x1, rheading):SetAltitude(h1)
+    local papp=airbase:GetCoordinate():Translate(x1, runway.heading-180):SetAltitude(h1)
     wp[#wp+1]=papp:WaypointAirTurningPoint("BARO", UTILS.KnotsToKmph(SpeedLand), {TaskFinal}, "Final Approach")
 
     -- Okay, it looks like it's best to specify the coordinates not at the airbase but a bit away. This causes a more direct landing approach.
-    local pland=airbase:GetCoordinate():Translate(x2, rheading):SetAltitude(h2)
+    local pland=airbase:GetCoordinate():Translate(x2, runway.heading-180):SetAltitude(h2)
     wp[#wp+1]=pland:WaypointAirLanding(UTILS.KnotsToKmph(SpeedLand), airbase, {}, "Landing")
-      
+
   elseif airbase:IsShip() or airbase:IsHelipad() then
 
     ---

Moose Development/Moose/Ops/Intelligence.lua

@@ -26,7 +26,6 @@
 -- @field #table filterCategoryGroup Filter for group categories.
 -- @field Core.Set#SET_ZONE acceptzoneset Set of accept zones. If defined, only contacts in these zones are considered.
 -- @field Core.Set#SET_ZONE rejectzoneset Set of reject zones. Contacts in these zones are not considered, even if they are in accept zones.
--- @field Core.Set#SET_ZONE conflictzoneset Set of conflict zones. Contacts in these zones are considered, even if they are not in accept zones or if they are in reject zones.
 -- @field #table Contacts Table of detected items.
 -- @field #table ContactsLost Table of lost detected items.
 -- @field #table ContactsUnknown Table of new detected items.
@@ -160,12 +159,13 @@ INTEL.Ctype={
 
 --- INTEL class version.
 -- @field #string version
-INTEL.version="0.3.6"
+INTEL.version="0.3.5"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+-- TODO: Make forget times user input. Currently these are hard coded.
 -- TODO: Add min cluster size. Only create new clusters if they have a certain group size.
 -- TODO: process detected set asynchroniously for better performance.
 -- DONE: Add statics.
@@ -266,7 +266,6 @@ function INTEL:New(DetectionSet, Coalition, Alias)
   self:SetForgetTime()
   self:SetAcceptZones()
   self:SetRejectZones()
-  self:SetConflictZones()
 
   ------------------------
   --- Pseudo Functions ---
@@ -417,7 +416,7 @@ function INTEL:RemoveAcceptZone(AcceptZone)
 end
 
 --- Set reject zones. Contacts detected in this/these zone(s) are rejected and not reported by the detection.
--- Note that reject zones overrule accept zones, i.e. if a unit is inside an accept zone and inside a reject zone, it is rejected.
+-- Note that reject zones overrule accept zones, i.e. if a unit is inside and accept zone and inside a reject zone, it is rejected.
 -- @param #INTEL self
 -- @param Core.Set#SET_ZONE RejectZoneSet Set of reject zone(s).
 -- @return #INTEL self
@@ -427,7 +426,7 @@ function INTEL:SetRejectZones(RejectZoneSet)
 end
 
 --- Add a reject zone. Contacts detected in this zone are rejected and not reported by the detection.
--- Note that reject zones overrule accept zones, i.e. if a unit is inside an accept zone and inside a reject zone, it is rejected.
+-- Note that reject zones overrule accept zones, i.e. if a unit is inside and accept zone and inside a reject zone, it is rejected.
 -- @param #INTEL self
 -- @param Core.Zone#ZONE RejectZone Add a zone to the reject zone set.
 -- @return #INTEL self
@@ -445,36 +444,6 @@ function INTEL:RemoveRejectZone(RejectZone)
   return self
 end
 
---- Set conflict zones. Contacts detected in this/these zone(s) are reported by the detection.
--- Note that conflict zones overrule all other zones, i.e. if a unit is outside of an accept zone and inside a reject zone, it is still reported if inside a conflict zone.
--- @param #INTEL self
--- @param Core.Set#SET_ZONE ConflictZoneSet Set of conflict zone(s).
--- @return #INTEL self
-function INTEL:SetConflictZones(ConflictZoneSet)
-  self.conflictzoneset=ConflictZoneSet or SET_ZONE:New()
-  return self
-end
-
---- Add a conflict zone. Contacts detected in this zone are conflicted and not reported by the detection.
--- Note that conflict zones overrule all other zones, i.e. if a unit is outside of an accept zone and inside a reject zone, it is still reported if inside a conflict zone.
--- @param #INTEL self
--- @param Core.Zone#ZONE ConflictZone Add a zone to the conflict zone set.
--- @return #INTEL self
-function INTEL:AddConflictZone(ConflictZone)
-  self.conflictzoneset:AddZone(ConflictZone)
-  return self
-end
-
---- Remove a conflict zone from the conflict zone set.
--- Note that conflict zones overrule all other zones, i.e. if a unit is outside of an accept zone and inside a reject zone, it is still reported if inside a conflict zone.
--- @param #INTEL self
--- @param Core.Zone#ZONE ConflictZone Remove a zone from the conflict zone set.
--- @return #INTEL self
-function INTEL:RemoveConflictZone(ConflictZone)
-  self.conflictzoneset:Remove(ConflictZone:GetName(), true)
-  return self
-end
-
 --- **OBSOLETE, will be removed in next version!**  Set forget contacts time interval.
 -- Previously known contacts that are not detected any more, are "lost" after this time.
 -- This avoids fast oscillations between a contact being detected and undetected.
@@ -512,33 +481,6 @@ function INTEL:SetFilterCategory(Categories)
   return self
 end
 
---- Method to make the radar detection less accurate, e.g. for WWII scenarios.
--- @param #INTEL self
--- @param #number minheight Minimum flight height to be detected, in meters AGL (above ground)
--- @param #number thresheight Threshold to escape the radar if flying below minheight, defaults to 90 (90% escape chance)
--- @param #number thresblur Threshold to be detected by the radar overall, defaults to 85 (85% chance to be found)
--- @param #number closing Closing-in in km - the limit of km from which on it becomes increasingly difficult to escape radar detection if flying towards the radar position. Should be about 1/3 of the radar detection radius in kilometers, defaults to 20.
--- @return #INTEL self
-function INTEL:SetRadarBlur(minheight,thresheight,thresblur,closing)
-  self.RadarBlur = true
-  self.RadarBlurMinHeight = minheight or 250 -- meters
-  self.RadarBlurThresHeight = thresheight or 90 -- 10% chance to find a low flying group
-  self.RadarBlurThresBlur = thresblur or 85 -- 25% chance to escape the radar overall
-  self.RadarBlurClosing = closing or 20 -- 20km
-  self.RadarBlurClosingSquare = self.RadarBlurClosing * self.RadarBlurClosing 
-  return self
-end
-
---- Set the accept range in kilometers from each of the recce. Only object closer than this range will be detected.
--- @param #INTEL self
--- @param #number Range Range in kilometers
--- @return #INTEL self
-function INTEL:SetAcceptRange(Range)
-  self.RadarAcceptRange = true
-  self.RadarAcceptRangeKilometers = Range or 75
-  return self
-end
-
 --- Filter group categories. Valid categories are:
 --
 -- * Group.Category.AIRPLANE
@@ -578,7 +520,7 @@ function INTEL:AddAgent(AgentGroup)
   end
 
   -- Add to detection set.
-  self.detectionset:AddGroup(AgentGroup,true)
+  self.detectionset:AddGroup(AgentGroup)
   return self
 end
 
@@ -838,19 +780,7 @@ function INTEL:UpdateIntel()
   local remove={}
   for unitname,_unit in pairs(DetectedUnits) do
     local unit=_unit --Wrapper.Unit#UNIT
-    
-    local inconflictzone=false
-    -- Check if unit is in any of the conflict zones.
-    if self.conflictzoneset:Count()>0 then
-      for _,_zone in pairs(self.conflictzoneset.Set) do
-        local zone=_zone --Core.Zone#ZONE
-        if unit:IsInZone(zone) then
-          inconflictzone=true
-          break
-        end
-      end
-    end
-    
+
     -- Check if unit is in any of the accept zones.
     if self.acceptzoneset:Count()>0 then
       local inzone=false
@@ -863,7 +793,7 @@ function INTEL:UpdateIntel()
       end
 
       -- Unit is not in accept zone ==> remove!
-      if (not inzone) and (not inconflictzone) then
+      if not inzone then
         table.insert(remove, unitname)
       end
     end
@@ -880,7 +810,7 @@ function INTEL:UpdateIntel()
       end
 
       -- Unit is inside a reject zone ==> remove!
-      if inzone and (not inconflictzone) then
+      if inzone then
         table.insert(remove, unitname)
       end
     end
@@ -1106,8 +1036,8 @@ function INTEL:CreateDetectedItems(DetectedGroups, DetectedStatics, RecceDetecti
   return self
 end
 
---- (Internal) Return the detected target groups of the controllable as a @{Core.Set#SET_GROUP}.
--- The optional parameters specify the detection methods that can be applied.
+--- (Internal) Return the detected target groups of the controllable as a @{SET_GROUP}.
+-- The optional parametes specify the detection methods that can be applied.
 -- If no detection method is given, the detection will use all the available methods by default.
 -- @param #INTEL self
 -- @param Wrapper.Unit#UNIT Unit The unit detecting.
@@ -1123,7 +1053,6 @@ function INTEL:GetDetectedUnits(Unit, DetectedUnits, RecceDetecting, DetectVisua
 
   -- Get detected DCS units.
   local reccename = Unit:GetName()
-
   local detectedtargets=Unit:GetDetectedTargets(DetectVisual, DetectOptical, DetectRadar, DetectIRST, DetectRWR, DetectDLINK)
 
   for DetectionObjectID, Detection in pairs(detectedtargets or {}) do
@@ -1142,47 +1071,11 @@ function INTEL:GetDetectedUnits(Unit, DetectedUnits, RecceDetecting, DetectVisua
       if status then
 
         local unit=UNIT:FindByName(name)
- 
+
         if unit and unit:IsAlive() then
-          local DetectionAccepted = true
-          
-          if self.RadarAcceptRange then
-            local reccecoord = Unit:GetCoordinate()
-            local coord = unit:GetCoordinate()
-            local dist = math.floor(coord:Get2DDistance(reccecoord)/1000) -- km
-            if dist > self.RadarAcceptRangeKilometers then DetectionAccepted = false end
-          end
-          
-          if self.RadarBlur then
-            local reccecoord = Unit:GetCoordinate()
-            local coord = unit:GetCoordinate()
-            local dist = math.floor(coord:Get2DDistance(reccecoord)/1000) -- km
-            local AGL = unit:GetAltitude(true)
-            local minheight = self.RadarBlurMinHeight or 250 -- meters
-            local thresheight = self.RadarBlurThresHeight or 90 -- 10% chance to find a low flying group
-            local thresblur = self.RadarBlurThresBlur or 85 -- 25% chance to escape the radar overall
-            --local dist = math.floor(Distance)
-            if dist <= self.RadarBlurClosing  then
-              thresheight = (((dist*dist)/self.RadarBlurClosingSquare)*thresheight)
-              thresblur = (((dist*dist)/self.RadarBlurClosingSquare)*thresblur)
-            end
-            local fheight = math.floor(math.random(1,10000)/100)
-            local fblur = math.floor(math.random(1,10000)/100)
-            if fblur > thresblur then DetectionAccepted = false end
-            if AGL <= minheight and fheight < thresheight then DetectionAccepted = false end
-            if self.debug or self.verbose > 1 then
-              MESSAGE:New("Radar Blur",10):ToLogIf(self.debug):ToAllIf(self.verbose>1)      
-              MESSAGE:New("Unit "..name.." is at "..math.floor(AGL).."m. Distance "..math.floor(dist).."km.",10):ToLogIf(self.debug):ToAllIf(self.verbose>1)
-              MESSAGE:New(string.format("fheight = %d/%d | fblur = %d/%d",fheight,thresheight,fblur,thresblur),10):ToLogIf(self.debug):ToAllIf(self.verbose>1)
-              MESSAGE:New("Detection Accepted = "..tostring(DetectionAccepted),10):ToLogIf(self.debug):ToAllIf(self.verbose>1)
-            end
-          end
-           
-          if DetectionAccepted then
-            DetectedUnits[name]=unit
-            RecceDetecting[name]=reccename
-            self:T(string.format("Unit %s detect by %s", name, reccename))
-          end
+          DetectedUnits[name]=unit
+          RecceDetecting[name]=reccename
+          self:T(string.format("Unit %s detect by %s", name, reccename))
         else
           if self.detectStatics then
             local static=STATIC:FindByName(name, false)
@@ -1200,6 +1093,7 @@ function INTEL:GetDetectedUnits(Unit, DetectedUnits, RecceDetecting, DetectVisua
       end
     end
   end
+
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Legion.lua

@@ -2265,7 +2265,7 @@ function LEGION:RecruitAssetsForMission(Mission)
       end
     end
     
-    self:T(self.lid..string.format("Largest cargo bay available=%.1f", MaxWeight or 0))
+    self:T(self.lid..string.format("Largest cargo bay available=%.1f", MaxWeight))
   end
   
   
@@ -2745,7 +2745,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
   end
   
   -- Now we have a long list with assets.
-  LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, false, TotalWeight)
+  LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, false)
   
   
   -- Get payloads for air assets.
@@ -2770,7 +2770,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
   end
     
   -- Now find the best asset for the given payloads.
-  LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, true, TotalWeight)
+  LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, true)
 
   -- Number of assets. At most NreqMax.
   local Nassets=math.min(#Assets, NreqMax)
@@ -3114,9 +3114,8 @@ end
 -- @param #string MissionType Mission type for which the best assets are desired.
 -- @param DCS#Vec2 TargetVec2 Target 2D vector.
 -- @param #boolean IncludePayload If `true`, include the payload in the calulation if the asset has one attached.
--- @param #number TotalWeight The total weight of the cargo to be transported, if applicable.
 -- @return #number Mission score.
-function LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, IncludePayload, TotalWeight)
+function LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, IncludePayload)
   
   -- Mission score.
   local score=0
@@ -3210,18 +3209,8 @@ function LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, Inclu
   
   -- TRANSPORT specific.
   if MissionType==AUFTRAG.Type.OPSTRANSPORT then
-    if TotalWeight then
-      -- Add 1 score point for each 10 kg of cargo bay capacity up to the total cargo weight,
-      -- and then subtract 1 score point for each excess 10kg of cargo bay capacity.
-      if asset.cargobaymax < TotalWeight then
-        score=score+UTILS.Round(asset.cargobaymax/10, 0)
-      else
-        score=score+UTILS.Round(TotalWeight/10, 0)
-      end
-    else
-      -- Add 1 score point for each 10 kg of cargo bay.
-      score=score+UTILS.Round(asset.cargobaymax/10, 0)
-    end
+    -- Add 1 score point for each 10 kg of cargo bay.
+    score=score+UTILS.Round(asset.cargobaymax/10, 0)
   end  
 
   -- TODO: This could be vastly improved. Need to gather ideas during testing.
@@ -3242,15 +3231,14 @@ end
 -- @param #string MissionType Mission type.
 -- @param DCS#Vec2 TargetVec2 Target position as 2D vector.
 -- @param #boolean IncludePayload If `true`, include the payload in the calulation if the asset has one attached.
--- @param #number TotalWeight The total weight of the cargo to be transported, if applicable.
-function LEGION._OptimizeAssetSelection(assets, MissionType, TargetVec2, IncludePayload, TotalWeight)
+function LEGION._OptimizeAssetSelection(assets, MissionType, TargetVec2, IncludePayload)
 
   -- Calculate the mission score of all assets.
   for _,_asset in pairs(assets) do
     local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
     
     -- Calculate the asset score.
-    asset.score=LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, IncludePayload, TotalWeight)
+    asset.score=LEGION.CalculateAssetMissionScore(asset, MissionType, TargetVec2, IncludePayload)
     
     if IncludePayload then
     

Moose Development/Moose/Ops/NavyGroup.lua

@@ -20,9 +20,9 @@
 -- ===
 -- 
 -- ## Example Missions:
---
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Navygroup)
---
+-- 
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Navygroup)
+-- 
 -- ===
 --
 -- ### Author: **funkyfranky**

Moose Development/Moose/Ops/Operation.lua

@@ -11,7 +11,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Operation).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Operation).
 --
 -- ===
 --

Moose Development/Moose/Ops/OpsGroup.lua

@@ -100,7 +100,7 @@
 --
 -- @field #OPSGROUP.Radio radio Current radio settings.
 -- @field #OPSGROUP.Radio radioDefault Default radio settings.
--- @field Sound.Radio#RADIOQUEUE radioQueue Radio queue.
+-- @field Core.RadioQueue#RADIOQUEUE radioQueue Radio queue.
 --
 -- @field #OPSGROUP.Beacon tacan Current TACAN settings.
 -- @field #OPSGROUP.Beacon tacanDefault Default TACAN settings.
@@ -1768,6 +1768,8 @@ function OPSGROUP:GetDCSUnit(UnitNumber)
   if DCSGroup then
     local unit=DCSGroup:getUnit(UnitNumber or 1)
     return unit
+  else
+    self:E(self.lid..string.format("ERROR: DCS group does not exist! Cannot get unit"))
   end
 
   return nil
@@ -2314,17 +2316,14 @@ end
 -- @return #OPSGROUP self
 function OPSGROUP:SetSRS(PathToSRS, Gender, Culture, Voice, Port, PathToGoogleKey, Label, Volume)
   self.useSRS=true
-  local path = PathToSRS or MSRS.path
-  local port = Port or MSRS.port
-  self.msrs=MSRS:New(path, self.frequency, self.modulation)
+  self.msrs=MSRS:New(PathToSRS, self.frequency, self.modulation)
   self.msrs:SetGender(Gender)
   self.msrs:SetCulture(Culture)
   self.msrs:SetVoice(Voice)
-  self.msrs:SetPort(port)
+  self.msrs:SetPort(Port)
   self.msrs:SetLabel(Label)
   if PathToGoogleKey then
-    self.msrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-    self.msrs:SetProvider(MSRS.Provider.GOOGLE)
+    self.msrs:SetGoogle(PathToGoogleKey)
   end
   self.msrs:SetCoalition(self:GetCoalition())
   self.msrs:SetVolume(Volume)
@@ -3523,9 +3522,11 @@ function OPSGROUP:OnEventBirth(EventData)
     local element=self:GetElementByName(unitname)
 
     if element and element.status~=OPSGROUP.ElementStatus.SPAWNED then
-
+    
       -- Debug info.
       self:T(self.lid..string.format("EVENT: Element %s born ==> spawned", unitname))
+      
+      self:T2(self.lid..string.format("DCS unit=%s isExist=%s", tostring(EventData.IniDCSUnit:getName()), tostring(EventData.IniDCSUnit:isExist()) ))
 
       -- Set element to spawned state.
       self:ElementSpawned(element)
@@ -7176,7 +7177,7 @@ function OPSGROUP:SetLaserTarget(Target)
 
       -- Scenery as target. Treat it like a coordinate. Set offset to 1 meter above ground.
       self.spot.TargetType=0
-      self.spot.offsetTarget={x=0, y=3, z=0}
+      self.spot.offsetTarget={x=0, y=1, z=0}
 
     elseif Target:IsInstanceOf("POSITIONABLE") then
 

Moose Development/Moose/Ops/OpsTransport.lua

@@ -12,7 +12,7 @@
 --
 -- ## Example Missions:
 -- 
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Transport).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20Transport).
 --    
 -- ===
 --
@@ -605,16 +605,6 @@ function OPSTRANSPORT:AddCargoGroups(GroupSet, TransportZoneCombo, DisembarkActi
       self:AddCargoGroups(group, TransportZoneCombo, DisembarkActivation)
       
     end
-    
-    -- Use FSM function to keep the SET up-to-date. Note that it overwrites the user FMS function, which cannot be used any more now.
-    local groupset=GroupSet --Core.Set#SET_OPSGROUP
-    function groupset.OnAfterAdded(groupset, From, Event, To, ObjectName, Object)
-    
-      self:T(self.lid..string.format("Adding Cargo Group %s", tostring(ObjectName)))
-      self:AddCargoGroups(Object, TransportZoneCombo, DisembarkActivation, DisembarkZone, DisembarkCarriers)
-    
-    end    
-    
   end
   
   -- Debug info.

Moose Development/Moose/Ops/OpsZone.lua

@@ -97,7 +97,7 @@ OPSZONE.ZoneType={
 
 --- OPSZONE class version.
 -- @field #string version
-OPSZONE.version="0.6.1"
+OPSZONE.version="0.6.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -1277,7 +1277,7 @@ function OPSZONE:EvaluateZone()
       
       if Nblu>0 then
       
-        if not self:IsAttacked() and self.Tnut>=self.threatlevelCapture then
+        if not self:IsAttacked() then
           self:Attacked(coalition.side.BLUE)
         end
         
@@ -1329,7 +1329,7 @@ function OPSZONE:EvaluateZone()
       
       if Nred>0 then
       
-        if not self:IsAttacked() and self.Tnut>=self.threatlevelCapture then
+        if not self:IsAttacked() then
           -- Red is attacking blue zone.
           self:Attacked(coalition.side.RED)
         end

Moose Development/Moose/Ops/PlayerRecce.lua

@@ -79,7 +79,6 @@
 -- @field Utilities.FiFo#FIFO TargetCache
 -- @field #boolean smokeownposition
 -- @field #table SmokeOwn
--- @field #boolean smokeaveragetargetpos
 -- @extends Core.Fsm#FSM
 
 ---
@@ -105,7 +104,7 @@ PLAYERRECCE = {
   ClassName          =   "PLAYERRECCE",
   verbose            =   true,
   lid                =   nil,
-  version            =   "0.1.23",
+  version            =   "0.0.22",
   ViewZone           =   {},
   ViewZoneVisual     =   {},
   ViewZoneLaser      =   {},
@@ -131,9 +130,8 @@ PLAYERRECCE = {
   ReferencePoint     =   nil,
   TForget            =   600,
   TargetCache        =   nil,
-  smokeownposition   =   false,
+  smokeownposition   =   true,
   SmokeOwn           =   {},
-  smokeaveragetargetpos = false,
 }
 
 --- 
@@ -1111,8 +1109,9 @@ function PLAYERRECCE:_SmokeTargets(client,group,playername)
   self:T(self.lid.."_SmokeTargets")
   local cameraset = self:_GetTargetSet(client,true) -- Core.Set#SET_UNIT
   local visualset = self:_GetTargetSet(client,false) -- Core.Set#SET_UNIT
+  cameraset:AddSet(visualset)
   
-  if cameraset:CountAlive() > 0 or visualset:CountAlive() > 0 then
+  if cameraset:CountAlive() > 0 then
     self:__TargetsSmoked(-1,client,playername,cameraset)
   else
     return self
@@ -1127,31 +1126,29 @@ function PLAYERRECCE:_SmokeTargets(client,group,playername)
   -- laser targer gets extra smoke
   if laser and laser.Target and laser.Target:IsAlive() then
     laser.Target:GetCoordinate():Smoke(lasersmoke)
-  end
-  
-  local coord = visualset:GetCoordinate()
-  if coord and self.smokeaveragetargetpos then
-    coord:SetAtLandheight()
-    coord:Smoke(medsmoke)
-  else
-    -- smoke everything 
-    for _,_unit in pairs(visualset.Set) do
-      local unit = _unit --Wrapper.Unit#UNIT
-      if unit and unit:IsAlive() then
-        local coord = unit:GetCoordinate()
-        local threat = unit:GetThreatLevel()
-        if coord then
-          local color = lowsmoke
-          if threat > 7 then
-            color = highsmoke
-          elseif threat > 2 then
-            color = medsmoke
-          end
-          coord:Smoke(color)
-        end
-      end
+    if cameraset:IsInSet(laser.Target) then
+      cameraset:Remove(laser.Target:GetName(),true)
     end
   end
+  
+  local coordinate = nil
+  local setthreat = 0
+  -- smoke everything else
+  if cameraset:CountAlive() > 1 then
+    local coordinate = cameraset:GetCoordinate()
+    local setthreat = cameraset:CalculateThreatLevelA2G()
+  end
+  
+  if coordinate then
+    local color = lowsmoke
+    if setthreat > 7 then
+      color = medsmoke
+    elseif setthreat > 2 then
+      color = lowsmoke
+    end
+    coordinate:Smoke(color)
+  end
+  
   if self.SmokeOwn[playername] then
     local cc = client:GetVec2()
     -- don't smoke mid-air
@@ -1192,15 +1189,15 @@ function PLAYERRECCE:_FlareTargets(client,group,playername)
   -- smoke everything else
   for _,_unit in pairs(cameraset.Set) do
     local unit = _unit --Wrapper.Unit#UNIT
-    if unit and unit:IsAlive() then
+    if unit then
       local coord = unit:GetCoordinate()
       local threat = unit:GetThreatLevel()
       if coord then
         local color = lowsmoke
         if threat > 7 then
-          color = highsmoke
-        elseif threat > 2 then
           color = medsmoke
+        elseif threat > 2 then
+          color = lowsmoke
         end
         coord:Flare(color)
       end
@@ -1488,43 +1485,36 @@ end
 -- @param #string Gender (Optional) Defaults to "male"
 -- @param #string Culture (Optional) Defaults to "en-US"
 -- @param #number Port (Optional) Defaults to 5002
--- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS#SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
+-- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
 -- Note that this must be installed on your windows system. Can also be Google voice types, if you are using Google TTS.
 -- @param #number Volume (Optional) Volume - between 0.0 (silent) and 1.0 (loudest)
 -- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS
 -- @return #PLAYERRECCE self
 function PLAYERRECCE:SetSRS(Frequency,Modulation,PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey)
   self:T(self.lid.."SetSRS")
-  self.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone" --
-  self.Gender = Gender or MSRS.gender or "male" --
-  self.Culture = Culture or MSRS.culture or "en-US" --
-  self.Port = Port or MSRS.port or 5002 --
-  self.Voice = Voice or MSRS.voice --
+  self.PathToSRS = PathToSRS or "C:\\Program Files\\DCS-SimpleRadio-Standalone" --
+  self.Gender = Gender or "male" --
+  self.Culture = Culture or "en-US" --
+  self.Port = Port or 5002 --
+  self.Voice = Voice --
   self.PathToGoogleKey = PathToGoogleKey --
-  self.Volume = Volume or 1.0 -- 
+  self.Volume = Volume or 1.0 --
   self.UseSRS = true
   self.Frequency = Frequency or {127,251} --
   self.BCFrequency = self.Frequency
   self.Modulation = Modulation or {radio.modulation.FM,radio.modulation.AM} --
   self.BCModulation = self.Modulation
   -- set up SRS 
-  self.SRS=MSRS:New(self.PathToSRS,self.Frequency,self.Modulation)
+  self.SRS=MSRS:New(self.PathToSRS,self.Frequency,self.Modulation,self.Volume)
   self.SRS:SetCoalition(self.Coalition)
   self.SRS:SetLabel(self.MenuName or self.Name)
   self.SRS:SetGender(self.Gender)
   self.SRS:SetCulture(self.Culture)
   self.SRS:SetPort(self.Port)
-  self.SRS:SetVolume(self.Volume)
-  if self.PathToGoogleKey then
-    self.SRS:SetProviderOptionsGoogle(self.PathToGoogleKey,self.PathToGoogleKey)
-    self.SRS:SetProvider(MSRS.Provider.GOOGLE)
-  end
-     -- Pre-configured Google?
-  if (not PathToGoogleKey) and self.SRS:GetProvider() == MSRS.Provider.GOOGLE then
-    self.PathToGoogleKey = MSRS.poptions.gcloud.credentials
-    self.Voice = Voice or MSRS.poptions.gcloud.voice
-  end
   self.SRS:SetVoice(self.Voice)
+  if self.PathToGoogleKey then
+    self.SRS:SetGoogle(self.PathToGoogleKey)
+  end
   self.SRSQueue = MSRSQUEUE:New(self.MenuName or self.Name)
   self.SRSQueue:SetTransmitOnlyWithPlayers(self.TransmitOnlyWithPlayers)
   return self
@@ -1556,7 +1546,7 @@ end
 -- @param #PLAYERRECCE self
 -- @return #PLAYERRECCE self
 function PLAYERRECCE:EnableSmokeOwnPosition()
-  self:T(self.lid.."EnableSmokeOwnPosition")
+  self:T(self.lid.."ENableSmokeOwnPosition")
   self.smokeownposition = true
   return self
 end
@@ -1570,24 +1560,6 @@ function PLAYERRECCE:DisableSmokeOwnPosition()
   return self
 end
 
---- [User] Enable smoking of average target positions, instead of all targets visible. Loses smoke per threatlevel -- each is med threat. Default is - smoke all positions.
--- @param #PLAYERRECCE self
--- @return #PLAYERRECCE self
-function PLAYERRECCE:EnableSmokeAverageTargetPosition()
-  self:T(self.lid.."ENableSmokeOwnPosition")
-  self.smokeaveragetargetpos = true
-  return self
-end
-
---- [User] Disable smoking of average target positions, instead of all targets visible. Default is - smoke all positions.
--- @param #PLAYERRECCE self
--- @return #PLAYERRECCE 
-function PLAYERRECCE:DisableSmokeAverageTargetPosition()
-  self:T(self.lid.."DisableSmokeAverageTargetPosition")
-  self.smokeaveragetargetpos = false
-  return self
-end
-
 --- [Internal] Get text for text-to-speech.
 -- Numbers are spaced out, e.g. "Heading 180" becomes "Heading 1 8 0 ".
 -- @param #PLAYERRECCE self

Moose Development/Moose/Ops/PlayerTask.lua

@@ -11,7 +11,7 @@
 --
 -- ## Example Missions:
 --
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/PlayerTask).
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/OPS%20-%20PlayerTask).
 --
 -- ===
 --
@@ -21,7 +21,7 @@
 -- ===
 -- @module Ops.PlayerTask
 -- @image OPS_PlayerTask.jpg
--- @date Last Update Jan 2024
+-- @date Last Update Oct 2023
 
 
 do
@@ -45,8 +45,8 @@ do
 -- @field Wrapper.Marker#MARKER TargetMarker
 -- @field #number SmokeColor
 -- @field #number FlareColor
--- @field #table conditionSuccess
--- @field #table conditionFailure
+-- @field #table conditionSuccess   =   {},
+-- @field #table conditionFailure   =   {},
 -- @field Ops.PlayerTask#PLAYERTASKCONTROLLER TaskController
 -- @field #number timestamp
 -- @field #number lastsmoketime
@@ -98,7 +98,7 @@ PLAYERTASK = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASK.version="0.1.24"
+PLAYERTASK.version="0.1.22"
 
 --- Generic task condition.
 -- @type PLAYERTASK.Condition
@@ -974,7 +974,7 @@ do
 -- @field #string locale
 -- @field #boolean precisionbombing
 -- @field Ops.FlightGroup#FLIGHTGROUP LasingDrone
--- @field Core.MarkerOps_Base#MARKEROPS_BASE MarkerOps
+-- @field Core.MarkerOps_BASE#MARKEROPS_BASE MarkerOps
 -- @field #boolean taskinfomenu
 -- @field #boolean MarkerReadOnly
 -- @field #table FlashPlayer List of player who switched Flashing Direction Info on
@@ -1028,7 +1028,7 @@ do
 -- ## 1 Overview
 -- 
 -- PLAYERTASKCONTROLLER is used to auto-create (optional) and control tasks for players. It can be set up as Air-to-Ground (A2G, main focus), Air-to-Ship (A2S) or Air-to-Air (A2A) controller.
--- For the latter task type, also have a look at the @{Ops.AWACS#AWACS} class which allows for more complex scenarios.
+-- For the latter task type, also have a look at the @{Ops.Awacs#AWACS} class which allows for more complex scenarios.
 -- One task at a time can be joined by the player from the F10 menu. A task can be joined by multiple players. Once joined, task information is available via the F10 menu, the task location
 -- can be marked on the map and for A2G/S targets, the target can be marked with smoke and flares.
 -- 
@@ -1552,7 +1552,7 @@ PLAYERTASKCONTROLLER.Messages = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASKCONTROLLER.version="0.1.64"
+PLAYERTASKCONTROLLER.version="0.1.63"
 
 --- Create and run a new TASKCONTROLLER instance.
 -- @param #PLAYERTASKCONTROLLER self
@@ -1965,9 +1965,6 @@ end
 -- @param Ops.FlightGroup#FLIGHTGROUP FlightGroup The FlightGroup (e.g. drone) to be used for lasing (one unit in one group only).
 -- Can optionally be handed as Ops.ArmyGroup#ARMYGROUP - **Note** might not find an LOS spot or get lost on the way. Cannot island-hop.
 -- @param #number LaserCode The lasercode to be used. Defaults to 1688.
--- @param Core.Point#COORDINATE HoldingPoint (Optional) Point where the drone should initially circle. If not set, defaults to BullsEye of the coalition.
--- @param #number Alt (Optional) Altitude in feet. Only applies if using a FLIGHTGROUP object! Defaults to 10000.
--- @param #number Speed (Optional) Speed in knots. Only applies if using a FLIGHTGROUP object! Defaults to 120.
 -- @return #PLAYERTASKCONTROLLER self
 -- @usage
 -- -- Set up precision bombing, FlightGroup as lasing unit
@@ -1982,7 +1979,7 @@ end
 --        ArmyGroup:Activate()
 --        taskmanager:EnablePrecisionBombing(ArmyGroup,1688)
 --
-function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,HoldingPoint, Alt, Speed)
+function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode)
   self:T(self.lid.."EnablePrecisionBombing")
   if FlightGroup then
     if FlightGroup.ClassName and (FlightGroup.ClassName == "FLIGHTGROUP" or FlightGroup.ClassName == "ARMYGROUP")then
@@ -1995,20 +1992,10 @@ function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,Holdi
       self.LasingDrone:SetLaser(LaserCode)
       self.LaserCode = LaserCode or 1688
       self.LasingDroneTemplate = self.LasingDrone:_GetTemplate(true)
-      self.LasingDroneAlt = Alt or 10000
-      self.LasingDroneSpeed = Speed or 120
       -- let it orbit the BullsEye if FG
       if self.LasingDrone:IsFlightgroup() then
-        self.LasingDroneIsFlightgroup = true
         local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition ))
-        if HoldingPoint then BullsCoordinate = HoldingPoint end
-        local Orbit = AUFTRAG:NewORBIT_CIRCLE(BullsCoordinate,self.LasingDroneAlt,self.LasingDroneSpeed)
-        self.LasingDrone:AddMission(Orbit)
-      elseif self.LasingDrone:IsArmygroup() then
-        self.LasingDroneIsArmygroup = true
-        local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition ))
-        if HoldingPoint then BullsCoordinate = HoldingPoint end
-        local Orbit = AUFTRAG:NewONGUARD(BullsCoordinate)
+        local Orbit = AUFTRAG:NewORBIT_CIRCLE(BullsCoordinate,10000,120)
         self.LasingDrone:AddMission(Orbit)
       end
     else
@@ -2547,16 +2534,10 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
     if self.LasingDrone then
       self.LasingDrone:_Respawn(1,nil,true)
     else
-      -- DONE: Handle ArmyGroup
-      if self.LasingDroneIsFlightgroup then
-        local FG = FLIGHTGROUP:New(self.LasingDroneTemplate)
-        FG:Activate()
-        self:EnablePrecisionBombing(FG,self.LaserCode or 1688)
-      else
-        local FG = ARMYGROUP:New(self.LasingDroneTemplate)
-        FG:Activate()
-        self:EnablePrecisionBombing(FG,self.LaserCode or 1688)
-      end
+      -- TODO: Handle ArmyGroup
+      local FG = FLIGHTGROUP:New(self.LasingDroneTemplate)
+      FG:Activate()
+      self:EnablePrecisionBombing(FG,self.LaserCode or 1688)
     end
     return self
    end
@@ -2571,11 +2552,12 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
       self.LasingDrone.playertask.inreach = false
       self.LasingDrone.playertask.reachmessage = false
       -- move the drone to target
-      if self.LasingDroneIsFlightgroup then
-        self.LasingDrone:CancelAllMissions()
-        local auftrag = AUFTRAG:NewORBIT_CIRCLE(task.Target:GetCoordinate(),self.LasingDroneAlt,self.LasingDroneSpeed)
-        self.LasingDrone:AddMission(auftrag)   
-      elseif self.LasingDroneIsArmygroup then
+      if self.LasingDrone:IsFlightgroup() then
+        local auftrag = AUFTRAG:NewORBIT_CIRCLE(task.Target:GetCoordinate(),10000,120)
+        local currmission = self.LasingDrone:GetMissionCurrent()
+        self.LasingDrone:AddMission(auftrag)
+        currmission:__Cancel(-2)
+      elseif self.LasingDrone:IsArmygroup() then
         local tgtcoord = task.Target:GetCoordinate()
         local tgtzone = ZONE_RADIUS:New("ArmyGroup-"..math.random(1,10000),tgtcoord:GetVec2(),3000)
         local finalpos=nil -- Core.Point#COORDINATE
@@ -2588,10 +2570,11 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
           end
         end
         if finalpos then
-          self.LasingDrone:CancelAllMissions()
           -- yeah we got one
           local auftrag = AUFTRAG:NewARMOREDGUARD(finalpos,"Off road")
+          local currmission = self.LasingDrone:GetMissionCurrent()
           self.LasingDrone:AddMission(auftrag)
+          if currmission then currmission:__Cancel(-2) end
         else
           -- could not find LOS position!
           self:E("***Could not find LOS position to post ArmyGroup for lasing!")
@@ -2623,7 +2606,6 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
         -- not done yet
         local dcoord = self.LasingDrone:GetCoordinate()
         local tcoord = task.Target:GetCoordinate()
-        tcoord.y = tcoord.y + 2 
         local dist = dcoord:Get2DDistance(tcoord)
         -- close enough?
         if dist < 3000 and not self.LasingDrone:IsLasing() then
@@ -3207,7 +3189,7 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
         local islasing = self.LasingDrone:IsLasing() == true and yes or no
         local prectext = self.gettext:GetEntry("POINTERTARGETREPORT",self.locale)
         prectext = string.format(prectext,inreach,islasing)
-        text = text .. prectext.." ("..self.LaserCode..")"
+        text = text .. prectext
       end
     end
     -- Buddylasing
@@ -4011,7 +3993,7 @@ function PLAYERTASKCONTROLLER:SetupIntel(RecceName)
   return self
 end
 
---- [User] Set SRS TTS details - see @{Sound.SRS} for details.`SetSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
+--- [User] Set SRS TTS details - see @{Sound.SRS} for details
 -- @param #PLAYERTASKCONTROLLER self
 -- @param #number Frequency Frequency to be used. Can also be given as a table of multiple frequencies, e.g. 271 or {127,251}. There needs to be exactly the same number of modulations!
 -- @param #number Modulation Modulation to be used. Can also be given as a table of multiple modulations, e.g. radio.modulation.AM or {radio.modulation.FM,radio.modulation.AM}. There needs to be exactly the same number of frequencies!
@@ -4019,22 +4001,20 @@ end
 -- @param #string Gender (Optional) Defaults to "male"
 -- @param #string Culture (Optional) Defaults to "en-US"
 -- @param #number Port (Optional) Defaults to 5002
--- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS#SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
+-- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
 -- Note that this must be installed on your windows system. Can also be Google voice types, if you are using Google TTS.
 -- @param #number Volume (Optional) Volume - between 0.0 (silent) and 1.0 (loudest)
--- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS; if you use a config file for MSRS, hand in nil here.
--- @param #string AccessKey (Optional) Your Google API access key. This is necessary if DCS-gRPC is used as backend; if you use a config file for MSRS, hand in nil here.
+-- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS
 -- @param Core.Point#COORDINATE Coordinate Coordinate from which the controller radio is sending
 -- @return #PLAYERTASKCONTROLLER self
-function PLAYERTASKCONTROLLER:SetSRS(Frequency,Modulation,PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey,AccessKey,Coordinate)
+function PLAYERTASKCONTROLLER:SetSRS(Frequency,Modulation,PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey,Coordinate)
   self:T(self.lid.."SetSRS")
-  self.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone" --
-  self.Gender = Gender or MSRS.gender or "male" --
-  self.Culture = Culture or MSRS.culture or "en-US" --
-  self.Port = Port or MSRS.port or 5002 --
-  self.Voice = Voice or MSRS.voice
+  self.PathToSRS = PathToSRS or "C:\\Program Files\\DCS-SimpleRadio-Standalone" --
+  self.Gender = Gender or "male" --
+  self.Culture = Culture or "en-US" --
+  self.Port = Port or 5002 --
+  self.Voice = Voice --
   self.PathToGoogleKey = PathToGoogleKey --
-  self.AccessKey = AccessKey
   self.Volume = Volume or 1.0 --
   self.UseSRS = true
   self.Frequency = Frequency or {127,251} --
@@ -4042,28 +4022,19 @@ function PLAYERTASKCONTROLLER:SetSRS(Frequency,Modulation,PathToSRS,Gender,Cultu
   self.Modulation = Modulation or {radio.modulation.FM,radio.modulation.AM} --
   self.BCModulation = self.Modulation
   -- set up SRS 
-  self.SRS=MSRS:New(self.PathToSRS,self.Frequency,self.Modulation)
+  self.SRS=MSRS:New(self.PathToSRS,self.Frequency,self.Modulation,self.Volume)
   self.SRS:SetCoalition(self.Coalition)
   self.SRS:SetLabel(self.MenuName or self.Name)
   self.SRS:SetGender(self.Gender)
   self.SRS:SetCulture(self.Culture)
   self.SRS:SetPort(self.Port)
-  self.SRS:SetVolume(self.Volume)
+  self.SRS:SetVoice(self.Voice)
   if self.PathToGoogleKey then
-    --self.SRS:SetGoogle(self.PathToGoogleKey)
-    self.SRS:SetProviderOptionsGoogle(self.PathToGoogleKey,self.AccessKey)
-    self.SRS:SetProvider(MSRS.Provider.GOOGLE)
-  end
-   -- Pre-configured Google?
-  if (not PathToGoogleKey) and self.SRS:GetProvider() == MSRS.Provider.GOOGLE then
-    self.PathToGoogleKey = MSRS.poptions.gcloud.credentials
-    self.Voice = Voice or MSRS.poptions.gcloud.voice
-    self.AccessKey = AccessKey or MSRS.poptions.gcloud.key
+    self.SRS:SetGoogle(self.PathToGoogleKey)
   end
   if Coordinate then
     self.SRS:SetCoordinate(Coordinate)
   end
-  self.SRS:SetVoice(self.Voice)
   self.SRSQueue = MSRSQUEUE:New(self.MenuName or self.Name)
   self.SRSQueue:SetTransmitOnlyWithPlayers(self.TransmitOnlyWithPlayers)
   return self

Moose Development/Moose/Ops/Target.lua

@@ -526,11 +526,11 @@ function TARGET:IsAlive()
 
   for _,_target in pairs(self.targets) do
     local target=_target --Ops.Target#TARGET.Object
-    if target.Status~=TARGET.ObjectStatus.DEAD then
+    if target.Status==TARGET.ObjectStatus.ALIVE then
       return true
     end
   end
-
+  
   return false
 end
 
@@ -1107,7 +1107,7 @@ function TARGET:GetTargetLife(Target)
 
   elseif Target.Type==TARGET.ObjectType.SCENERY then
   
-    if Target.Object and Target.Object:IsAlive(25)  then
+    if Target.Object and Target.Object:IsAlive()  then
       local life = Target.Object:GetLife()
       return life
     else

Moose Development/Moose/Sound/RadioQueue.lua

@@ -183,10 +183,8 @@ end
 -- @param #number Port SRS port. Default 5002.
 -- @return #RADIOQUEUE self The RADIOQUEUE object.
 function RADIOQUEUE:SetSRS(PathToSRS, Port)
-  local path = PathToSRS or MSRS.path
-  local port = Port or MSRS.port
-  self.msrs=MSRS:New(path, self.frequency/1000000, self.modulation)
-  self.msrs:SetPort(port)
+  self.msrs=MSRS:New(PathToSRS, self.frequency/1000000, self.modulation)
+  self.msrs:SetPort(Port)
   return self
 end
 

Moose Development/Moose/Sound/SoundOutput.lua

@@ -160,63 +160,52 @@ do -- Sound File
   -- @param #string FileName The name of the sound file, e.g. "Hello World.ogg".
   -- @param #string Path The path of the directory, where the sound file is located. Default is "l10n/DEFAULT/" within the miz file.
   -- @param #number Duration Duration in seconds, how long it takes to play the sound file. Default is 3 seconds.
-  -- @param #bolean UseSrs Set if SRS should be used to play this file. Default is false.
   -- @return #SOUNDFILE self
-  function SOUNDFILE:New(FileName, Path, Duration, UseSrs)
-
+  function SOUNDFILE:New(FileName, Path, Duration)
+  
     -- Inherit BASE.
     local self=BASE:Inherit(self, BASE:New()) -- #SOUNDFILE
 
-    -- Debug info:
-    self:F( {FileName, Path, Duration, UseSrs} )
-
     -- Set file name.
     self:SetFileName(FileName)
-
-    -- Set if SRS should be used to play this file
-    self:SetPlayWithSRS(UseSrs or false)
-
+    
     -- Set path.
     self:SetPath(Path)
-
+    
     -- Set duration.
     self:SetDuration(Duration)
+    
+    -- Debug info:
+    self:T(string.format("New SOUNDFILE: file name=%s, path=%s", self.filename, self.path))
 
     return self
   end
-
+  
   --- Set path, where the sound file is located.
   -- @param #SOUNDFILE self
   -- @param #string Path Path to the directory, where the sound file is located. In case this is nil, it defaults to the DCS mission temp directory.
   -- @return #SOUNDFILE self
   function SOUNDFILE:SetPath(Path)
-    self:F( {Path} )
-
+    
     -- Init path.
-    if not Path then
-      if self.useSRS then -- use path to mission temp dir
-        self.path = lfs.tempdir() .. "Mission\\l10n\\DEFAULT"
-      else -- use internal path in miz file
-        self.path="l10n/DEFAULT/"
-      end
-    else
-      self.path = Path
-    end
-
+    self.path=Path or "l10n/DEFAULT/"
+    
+    if not Path and self.useSRS then -- use path to mission temp dir
+      self.path = os.getenv('TMP') .. "\\DCS\\Mission\\l10n\\DEFAULT"
+    end    
+    
     -- Remove (back)slashes.
     local nmax=1000 ; local n=1
     while (self.path:sub(-1)=="/" or self.path:sub(-1)==[[\]]) and n<=nmax do
       self.path=self.path:sub(1,#self.path-1)
       n=n+1
     end
-
+    
     -- Append slash.
     self.path=self.path.."/"
-
-    self:T("self.path=".. self.path)
-
+          
     return self
-  end
+  end  
 
   --- Get path of the directory, where the sound file is located.
   -- @param #SOUNDFILE self
@@ -239,7 +228,7 @@ do -- Sound File
   --- Get the sound file name.
   -- @param #SOUNDFILE self
   -- @return #string Name of the soud file. This does *not* include its path.
-  function SOUNDFILE:GetFileName()
+  function SOUNDFILE:GetFileName()    
     return self.filename
   end
 
@@ -275,16 +264,14 @@ do -- Sound File
   -- @param #boolean Switch If true or nil, use SRS. If false, use DCS transmission.
   -- @return #SOUNDFILE self
   function SOUNDFILE:SetPlayWithSRS(Switch)
-    self:F( {Switch} )
     if Switch==true or Switch==nil then
       self.useSRS=true
     else
       self.useSRS=false
     end
-    self:T("self.useSRS=".. tostring(self.useSRS))
     return self
-  end
-
+  end  
+  
 end
 
 do -- Text-To-Speech

Moose Development/Moose/Sound/UserSound.lua

@@ -137,7 +137,7 @@ do -- UserSound
     return self
   end  
   
-  --- Play the usersound to the given @{Wrapper.Unit}.
+    --- Play the usersound to the given @{Wrapper.Unit}.
   -- @param #USERSOUND self
   -- @param Wrapper.Unit#UNIT Unit The @{Wrapper.Unit} to play the usersound to.
   -- @param #number Delay (Optional) Delay in seconds, before the sound is played. Default 0.
@@ -159,24 +159,4 @@ do -- UserSound
     return self
   end 
 
-
-  --- Play the usersound to the given @{Wrapper.Client}.
-  -- @param #USERSOUND self
-  -- @param Wrapper.Client#CLIENT The @{Wrapper.Client} to play the usersound to.
-  -- @param #number Delay (Optional) Delay in seconds, before the sound is played. Default 0.
-  -- @return #USERSOUND The usersound instance.
-  -- @usage
-  --   local BlueVictory = USERSOUND:New( "BlueVictory.ogg" )
-  --   local PlayerUnit = CLIENT:FindByPlayerName("Karl Heinz")-- Search for the active client with playername "Karl Heinz", a human player.
-  --   BlueVictory:ToClient( PlayerUnit ) -- Play the victory sound to the player unit.
-  --   
-  function USERSOUND:ToClient( Client, Delay ) 
-    Delay=Delay or 0
-    if Delay>0 then
-      SCHEDULER:New(nil, USERSOUND.ToClient,{self, Client}, Delay)      
-    else
-      trigger.action.outSoundForUnit( Client:GetID(), self.UserSoundFileName )
-    end
-    return self
-  end 
 end

Moose Development/Moose/Tasking/Task_CARGO.lua

@@ -13,9 +13,9 @@
 -- ## Test Missions:
 -- 
 -- Test missions can be located on the main GITHUB site.
---
--- [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Tasking/Task_Cargo_Dispatcher)
---
+-- 
+-- [FlightControl-Master/MOOSE_MISSIONS/TAD - Task Dispatching/CGO - Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/TAD%20-%20Task%20Dispatching/CGO%20-%20Cargo%20Task%20Dispatching)
+-- 
 -- ===
 --
 -- ## Tasking system.

Moose Development/Moose/Utilities/Enums.lua

@@ -523,7 +523,6 @@ ENUMS.ReportingName =
     Hawkeye = "E-2D",
     Sentry = "E-3A",
     Stratotanker = "KC-135",
-    Gasstation = "KC-135MPRS",
     Extender = "KC-10",
     Orion = "P-3C",
     Viking = "S-3B",

Moose Development/Moose/Utilities/Utils.lua

@@ -443,35 +443,22 @@ end
 
 --- Print a table to log in a nice format
 -- @param #table table The table to print
--- @param #number indent Number of indents
--- @return #string text Text created on the fly of the log output
+-- @param #number indent Number of idents
 function UTILS.PrintTableToLog(table, indent)
-  local text = "\n"
   if not table then
     env.warning("No table passed!")
-    return nil
+    return 
   end
   if not indent then indent = 0 end
   for k, v in pairs(table) do
-    if string.find(k," ") then k='"'..k..'"'end
     if type(v) == "table" then
       env.info(string.rep("  ", indent) .. tostring(k) .. " = {")
-      text = text ..string.rep("  ", indent) .. tostring(k) .. " = {\n"
-      text = text .. tostring(UTILS.PrintTableToLog(v, indent + 1)).."\n"
-      env.info(string.rep("  ", indent) .. "},")
-      text = text .. string.rep("  ", indent) .. "},\n"
+      UTILS.PrintTableToLog(v, indent + 1)
+      env.info(string.rep("  ", indent) .. "}")
     else
-      local value
-      if tostring(v) == "true" or tostring(v) == "false" or tonumber(v) ~= nil then
-        value=v
-      else
-        value = '"'..tostring(v)..'"'
-      end
-      env.info(string.rep("  ", indent) .. tostring(k) .. " = " .. tostring(value)..",\n")
-      text = text .. string.rep("  ", indent) .. tostring(k) .. " = " .. tostring(value)..",\n"
+      env.info(string.rep("  ", indent) .. tostring(k) .. " = " .. tostring(v))
     end
   end
-  return text
 end
 
 --- Returns table in a easy readable string representation.
@@ -825,64 +812,6 @@ UTILS.tostringLL = function( lat, lon, acc, DMS)
   end
 end
 
---[[acc:
-in DM: decimal point of minutes.
-In DMS: decimal point of seconds.
-position after the decimal of the least significant digit:
-So:
-42.32 - acc of 2.
-]]
-UTILS.tostringLLM2KData = function( lat, lon, acc)
-
-  local latHemi, lonHemi
-  if lat > 0 then
-    latHemi = 'N'
-  else
-    latHemi = 'S'
-  end
-
-  if lon > 0 then
-    lonHemi = 'E'
-  else
-    lonHemi = 'W'
-  end
-
-  lat = math.abs(lat)
-  lon = math.abs(lon)
-
-  local latDeg = math.floor(lat)
-  local latMin = (lat - latDeg)*60
-
-  local lonDeg = math.floor(lon)
-  local lonMin = (lon - lonDeg)*60
-
-  -- degrees, decimal minutes.
-  latMin = UTILS.Round(latMin, acc)
-  lonMin = UTILS.Round(lonMin, acc)
-  
-  if latMin == 60 then
-    latMin = 0
-    latDeg = latDeg + 1
-  end
-  
-  if lonMin == 60 then
-    lonMin = 0
-    lonDeg = lonDeg + 1
-  end
-  
-  local minFrmtStr -- create the formatting string for the minutes place
-  if acc <= 0 then  -- no decimal place.
-    minFrmtStr = '%02d'
-  else
-    local width = 3 + acc  -- 01.310 - that's a width of 6, for example.
-    minFrmtStr = '%0' .. width .. '.' .. acc .. 'f'
-  end
-  
-  -- 024 23'N or 024 23.123'N
-  return latHemi..string.format('%02d:', latDeg) .. string.format(minFrmtStr, latMin), lonHemi..string.format('%02d:', lonDeg) .. string.format(minFrmtStr, lonMin)
-
-end
-
 -- acc- the accuracy of each easting/northing.  0, 1, 2, 3, 4, or 5.
 UTILS.tostringMGRS = function(MGRS, acc) --R2.1
 
@@ -1122,9 +1051,9 @@ function UTILS.BeaufortScale(speed)
   return bn,bd
 end
 
---- Split string at separators. C.f. [split-string-in-lua](http://stackoverflow.com/questions/1426954/split-string-in-lua).
+--- Split string at seperators. C.f. [split-string-in-lua](http://stackoverflow.com/questions/1426954/split-string-in-lua).
 -- @param #string str Sting to split.
--- @param #string sep Separator for split.
+-- @param #string sep Speparator for split.
 -- @return #table Split text.
 function UTILS.Split(str, sep)
   local result = {}
@@ -2204,17 +2133,17 @@ function UTILS.IsLoadingDoorOpen( unit_name )
           return true
       end
 
-      if type_name == "Bell-47" then -- bell aint got no doors so always ready to load injured soldiers
+      if string.find(type_name, "Bell-47") then -- bell aint got no doors so always ready to load injured soldiers
           BASE:T(unit_name .. " door is open")
           return true
       end
-     
-      if type_name == "UH-60L" and (unit:getDrawArgumentValue(401) == 1 or unit:getDrawArgumentValue(402) == 1) then
+      
+      if string.find(type_name, "UH-60L") and (unit:getDrawArgumentValue(401) == 1 or unit:getDrawArgumentValue(402) == 1) then
           BASE:T(unit_name .. " cargo door is open")
           return true
       end
 
-      if type_name ==  "UH-60L" and (unit:getDrawArgumentValue(38) > 0 or unit:getDrawArgumentValue(400) == 1 ) then
+      if string.find(type_name, "UH-60L" ) and (unit:getDrawArgumentValue(38) == 1 or unit:getDrawArgumentValue(400) == 1 ) then
           BASE:T(unit_name .. " front door(s) are open")
           return true
       end
@@ -2329,37 +2258,20 @@ function UTILS.GenerateVHFrequencies()
   return FreeVHFFrequencies
 end
 
---- Function to generate valid UHF Frequencies in mHz (AM). Can be between 220 and 399 mHz. 243 is auto-excluded.
--- @param Start (Optional) Avoid frequencies between Start and End in mHz, e.g. 244
--- @param End (Optional) Avoid frequencies between Start and End in mHz, e.g. 320
+--- Function to generate valid UHF Frequencies in mHz (AM).
 -- @return #table UHF Frequencies
-function UTILS.GenerateUHFrequencies(Start,End)
+function UTILS.GenerateUHFrequencies()
 
     local FreeUHFFrequencies = {}
     local _start = 220000000
-    
-    if not Start then
-      while _start < 399000000 do
-      if _start ~= 243000000 then
-        table.insert(FreeUHFFrequencies, _start)
-      end
-          _start = _start + 500000
-      end
-    else
-      local myend = End*1000000 or 399000000
-      local mystart = Start*1000000 or 220000000
-      
-      while _start < 399000000 do
-      if _start ~= 243000000 and (_start < mystart or _start > myend) then
-        print(_start)
-        table.insert(FreeUHFFrequencies, _start)
-      end
-          _start = _start + 500000
-      end
-      
+
+    while _start < 399000000 do
+    if _start ~= 243000000 then
+      table.insert(FreeUHFFrequencies, _start)
     end
-    
-    
+        _start = _start + 500000
+    end
+
     return FreeUHFFrequencies
 end
 

Moose Development/Moose/Wrapper/Airbase.lua

@@ -1899,17 +1899,8 @@ function AIRBASE:_InitRunways(IncludeInverse)
     local heading=math.deg(bearing)
       
     -- Data table.
-    local runway={} --#AIRBASE.Runway
-    
-    local namefromheading = math.floor(heading/10)
-
-    if self.AirbaseName == AIRBASE.Syria.Beirut_Rafic_Hariri and math.abs(namefromheading-name) > 1 then
-      runway.name=string.format("%02d", tonumber(namefromheading))
-    else
-     runway.name=string.format("%02d", tonumber(name))
-    end
-       
-    --runway.name=string.format("%02d", tonumber(name))
+    local runway={} --#AIRBASE.Runway      
+    runway.name=string.format("%02d", tonumber(name))
     runway.magheading=tonumber(runway.name)*10
     runway.heading=heading
     runway.width=width or 0

Moose Development/Moose/Wrapper/Controllable.lua

@@ -99,7 +99,7 @@
 -- This method can also be used to **embed a function call when a certain waypoint has been reached**.
 -- See below the **Tasks at Waypoints** section.
 --
--- Demonstration Mission: [GRP-502 - Route at waypoint to random point](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Wrapper/Group/GRP-502%20-%20Route%20at%20waypoint%20to%20random%20point)
+-- Demonstration Mission: [GRP-502 - Route at waypoint to random point](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/GRP%20-%20Group%20Commands/GRP-502%20-%20Route%20at%20waypoint%20to%20random%20point)
 --
 -- ## 2.5) Tasks at Waypoints
 --
@@ -938,22 +938,20 @@ end
 -- @param #CONTROLLABLE self
 -- @param #number Frequency Radio frequency in MHz.
 -- @param #number Modulation Radio modulation. Default `radio.modulation.AM`.
--- @param #number Power (Optional) Power of the Radio in Watts. Defaults to 10.
 -- @param #number Delay (Optional) Delay in seconds before the frequency is set. Default is immediately.
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Power, Delay )
+function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Delay )
 
   local CommandSetFrequency = {
     id = 'SetFrequency',
     params = {
       frequency = Frequency * 1000000,
       modulation = Modulation or radio.modulation.AM,
-      power=Power or 10,
     },
   }
 
   if Delay and Delay > 0 then
-    SCHEDULER:New( nil, self.CommandSetFrequency, { self, Frequency, Modulation, Power } )
+    SCHEDULER:New( nil, self.CommandSetFrequency, { self, Frequency, Modulation }, Delay )
   else
     self:SetCommand( CommandSetFrequency )
   end
@@ -961,32 +959,6 @@ function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Power, Delay )
   return self
 end
 
---- [AIR] Set radio frequency. See [DCS command EPLRS](https://wiki.hoggitworld.com/view/DCS_command_setFrequencyForUnit)
--- @param #CONTROLLABLE self
--- @param #number Frequency Radio frequency in MHz.
--- @param #number Modulation Radio modulation. Default `radio.modulation.AM`.
--- @param #number Power (Optional) Power of the Radio in Watts. Defaults to 10.
--- @param #UnitID UnitID (Optional, if your object is a UNIT) The UNIT ID this is for. 
--- @param #number Delay (Optional) Delay in seconds before the frequency is set. Default is immediately.
--- @return #CONTROLLABLE self
-function CONTROLLABLE:CommandSetFrequencyForUnit(Frequency,Modulation,Power,UnitID,Delay)
-  local CommandSetFrequencyForUnit={
-    id='SetFrequencyForUnit',
-    params={
-        frequency=Frequency*1000000,
-        modulation=Modulation or radio.modulation.AM,
-        unitId=UnitID or self:GetID(),
-        power=Power or 10,
-    },
-  }
-  if Delay and Delay>0 then
-    SCHEDULER:New(nil,self.CommandSetFrequencyForUnit,{self,Frequency,Modulation,Power,UnitID})
-  else
-    self:SetCommand(CommandSetFrequencyForUnit)
-  end
-  return self
-end
-
 --- Set EPLRS data link on/off.
 -- @param #CONTROLLABLE self
 -- @param #boolean SwitchOnOff If true (or nil) switch EPLRS on. If false switch off.
@@ -2965,7 +2937,7 @@ function CONTROLLABLE:CopyRoute( Begin, End, Randomize, Radius )
 end
 
 --- Return the detected targets of the controllable.
--- The optional parameters specify the detection methods that can be applied.
+-- The optional parametes specify the detection methods that can be applied.
 -- If no detection method is given, the detection will use all the available methods by default.
 -- @param #CONTROLLABLE self
 -- @param #boolean DetectVisual (optional)
@@ -3800,66 +3772,54 @@ function CONTROLLABLE:OptionProhibitAfterburner( Prohibit )
   return self
 end
 
---- [Air] Defines the usage of Electronic Counter Measures by airborne forces. 
+--- Defines the usage of Electronic Counter Measures by airborne forces. Disables the ability for AI to use their ECM.
 -- @param #CONTROLLABLE self
--- @param #number ECMvalue Can be - 0=Never on, 1=if locked by radar, 2=if detected by radar, 3=always on, defaults to 1
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:OptionECM( ECMvalue )
+function CONTROLLABLE:OptionECM_Never()
   self:F2( { self.ControllableName } )
 
-  local DCSControllable = self:GetDCSObject()
-  if DCSControllable then
-    local Controller = self:_GetController()
-
-    if self:IsAir() then
-      Controller:setOption( AI.Option.Air.id.ECM_USING, ECMvalue or 1 )
-    end
-
+  if self:IsAir() then
+    self:SetOption( AI.Option.Air.id.ECM_USING, 0 )
   end
 
   return self
 end
 
---- [Air] Defines the usage of Electronic Counter Measures by airborne forces. Disables the ability for AI to use their ECM.
--- @param #CONTROLLABLE self
--- @return #CONTROLLABLE self
-function CONTROLLABLE:OptionECM_Never()
-  self:F2( { self.ControllableName } )
-  
-  self:OptionECM(0)
-
-  return self
-end
-
---- [Air] Defines the usage of Electronic Counter Measures by airborne forces. If the AI is actively being locked by an enemy radar they will enable their ECM jammer.
+--- Defines the usage of Electronic Counter Measures by airborne forces. If the AI is actively being locked by an enemy radar they will enable their ECM jammer.
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:OptionECM_OnlyLockByRadar()
   self:F2( { self.ControllableName } )
 
-  self:OptionECM(1)
+  if self:IsAir() then
+    self:SetOption( AI.Option.Air.id.ECM_USING, 1 )
+  end
 
   return self
 end
 
---- [Air] Defines the usage of Electronic Counter Measures by airborne forces. If the AI is being detected by a radar they will enable their ECM.
+--- Defines the usage of Electronic Counter Measures by airborne forces. If the AI is being detected by a radar they will enable their ECM.
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:OptionECM_DetectedLockByRadar()
   self:F2( { self.ControllableName } )
 
-  self:OptionECM(2)
+  if self:IsAir() then
+    self:SetOption( AI.Option.Air.id.ECM_USING, 2 )
+  end
 
   return self
 end
 
---- [Air] Defines the usage of Electronic Counter Measures by airborne forces. AI will leave their ECM on all the time.
+--- Defines the usage of Electronic Counter Measures by airborne forces. AI will leave their ECM on all the time.
 -- @param #CONTROLLABLE self
 -- @return #CONTROLLABLE self
 function CONTROLLABLE:OptionECM_AlwaysOn()
   self:F2( { self.ControllableName } )
 
-  self:OptionECM(3)
+  if self:IsAir() then
+    self:SetOption( AI.Option.Air.id.ECM_USING, 3 )
+  end
 
   return self
 end
@@ -4046,62 +4006,6 @@ function CONTROLLABLE:OptionEngageRange( EngageRange )
   return nil
 end
 
---- [AIR] Set how the AI uses the onboard radar.
--- @param #CONTROLLABLE self
--- @param #number Option Options are: `NEVER = 0, FOR_ATTACK_ONLY = 1,FOR_SEARCH_IF_REQUIRED = 2, FOR_CONTINUOUS_SEARCH = 3`
--- @return #CONTROLLABLE self
-function CONTROLLABLE:SetOptionRadarUsing(Option)
- self:F2( { self.ControllableName } )
-  if self:IsAir() then
-    self:SetOption(AI.Option.Air.id.RADAR_USING,Option)
-  end
-  return self
-end
-
---- [AIR] Set how the AI uses the onboard radar. Here: never.
--- @param #CONTROLLABLE self
--- @return #CONTROLLABLE self
-function CONTROLLABLE:SetOptionRadarUsingNever()
- self:F2( { self.ControllableName } )
-  if self:IsAir() then
-    self:SetOption(AI.Option.Air.id.RADAR_USING,0)
-  end
-  return self
-end
-
---- [AIR] Set how the AI uses the onboard radar, here: for attack only.
--- @param #CONTROLLABLE self
--- @return #CONTROLLABLE self
-function CONTROLLABLE:SetOptionRadarUsingForAttackOnly()
- self:F2( { self.ControllableName } )
-  if self:IsAir() then
-    self:SetOption(AI.Option.Air.id.RADAR_USING,1)
-  end
-  return self
-end
-
---- [AIR] Set how the AI uses the onboard radar, here: when required for searching.
--- @param #CONTROLLABLE self
--- @return #CONTROLLABLE self
-function CONTROLLABLE:SetOptionRadarUsingForSearchIfRequired()
- self:F2( { self.ControllableName } )
-  if self:IsAir() then
-    self:SetOption(AI.Option.Air.id.RADAR_USING,2)
-  end
-  return self
-end
-
---- [AIR] Set how the AI uses the onboard radar, here: always on.
--- @param #CONTROLLABLE self
--- @return #CONTROLLABLE self
-function CONTROLLABLE:SetOptionRadarUsingForContinousSearch()
- self:F2( { self.ControllableName } )
-  if self:IsAir() then
-    self:SetOption(AI.Option.Air.id.RADAR_USING,3)
-  end
-  return self
-end
-
 --- (GROUND) Relocate controllable to a random point within a given radius; use e.g.for evasive actions; Note that not all ground controllables can actually drive, also the alarm state of the controllable might stop it from moving.
 -- @param #CONTROLLABLE self
 -- @param #number speed Speed of the controllable, default 20
@@ -4109,22 +4013,14 @@ end
 -- @param #boolean onroad If true, route on road (less problems with AI way finding), default true
 -- @param #boolean shortcut If true and onroad is set, take a shorter route - if available - off road, default false
 -- @param #string formation Formation string as in the mission editor, e.g. "Vee", "Diamond", "Line abreast", etc. Defaults to "Off Road"
--- @param #boolean onland (optional) If true, try up to 50 times to get a coordinate on land.SurfaceType.LAND. Note - this descriptor value is not reliably implemented on all maps.
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:RelocateGroundRandomInRadius( speed, radius, onroad, shortcut, formation, onland )
+function CONTROLLABLE:RelocateGroundRandomInRadius( speed, radius, onroad, shortcut, formation )
   self:F2( { self.ControllableName } )
 
   local _coord = self:GetCoordinate()
   local _radius = radius or 500
   local _speed = speed or 20
   local _tocoord = _coord:GetRandomCoordinateInRadius( _radius, 100 )
-  if onland then
-    for i=1,50 do
-      local island = _tocoord:GetSurfaceType() == land.SurfaceType.LAND and true or false
-      if island then break end
-      _tocoord = _coord:GetRandomCoordinateInRadius( _radius, 100 )
-    end
-  end
   local _onroad = onroad or true
   local _grptsk = {}
   local _candoroad = false

Moose Development/Moose/Wrapper/Group.lua

@@ -302,7 +302,7 @@ end
 
 --- Find the first(!) GROUP matching using patterns. Note that this is **a lot** slower than `:FindByName()`!
 -- @param #GROUP self
--- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_\(Regular_Expressions\)) for regular expressions in LUA.
+-- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_(Regular_Expressions)) for regular expressions in LUA.
 -- @return #GROUP The GROUP.
 -- @usage
 --          -- Find a group with a partial group name
@@ -327,7 +327,7 @@ end
 
 --- Find all GROUP objects matching using patterns. Note that this is **a lot** slower than `:FindByName()`!
 -- @param #GROUP self
--- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_\(Regular_Expressions\)) for regular expressions in LUA.
+-- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_(Regular_Expressions)) for regular expressions in LUA.
 -- @return #table Groups Table of matching #GROUP objects found
 -- @usage
 --          -- Find all group with a partial group name
@@ -359,6 +359,8 @@ function GROUP:GetDCSObject()
 
   if DCSGroup then
     return DCSGroup
+  else
+    env.error("ERROR: Could not get DCS group object!")
   end
 
   return nil
@@ -689,15 +691,7 @@ function GROUP:GetUnits()
     local DCSUnits = DCSGroup:getUnits() or {}
     local Units = {}
     for Index, UnitData in pairs( DCSUnits ) do
-      
-      local unit=UNIT:Find( UnitData )
-      if unit then
-        Units[#Units+1] = UNIT:Find( UnitData )
-      else
-        local UnitName=UnitData:getName()
-        unit=_DATABASE:AddUnit(UnitName)
-        Units[#Units+1]=unit
-      end
+      Units[#Units+1] = UNIT:Find( UnitData )
     end
     self:T3( Units )
     return Units
@@ -1132,9 +1126,8 @@ function GROUP:GetAverageVec3()
     -- Average.
     local Vec3={x=x/n, y=y/n, z=z/n} --DCS#Vec3
     return Vec3
-  else
-    return self:GetVec3()
-  end 
+  end
+  return nil 
 end
 
 --- Returns a POINT_VEC2 object indicating the point in 2D of the first UNIT of the GROUP within the mission.
@@ -1166,15 +1159,9 @@ function GROUP:GetAverageCoordinate()
     local coord = COORDINATE:NewFromVec3(vec3)
     local Heading = self:GetHeading()
     coord.Heading = Heading
-    return coord
   else
-    local coord = self:GetCoordinate()
-    if coord then
-      return coord
-    else
-      BASE:E( { "Cannot GetAverageCoordinate", Group = self, Alive = self:IsAlive() } )
-      return nil
-    end
+    BASE:E( { "Cannot GetAverageCoordinate", Group = self, Alive = self:IsAlive() } )
+    return nil
   end
 end
 
@@ -2777,7 +2764,7 @@ end
 
 --- Switch on/off invisible flag for the group.
 -- @param #GROUP self
--- @param #boolean switch If true, Invisible is enabled. If false, Invisible is disabled.
+-- @param #boolean switch If true, emission is enabled. If false, emission is disabled.
 -- @return #GROUP self 
 function GROUP:SetCommandInvisible(switch)
   self:F2( self.GroupName )
@@ -2791,7 +2778,7 @@ end
 
 --- Switch on/off immortal flag for the group.
 -- @param #GROUP self
--- @param #boolean switch If true, Immortal is enabled. If false, Immortal is disabled.
+-- @param #boolean switch If true, emission is enabled. If false, emission is disabled.
 -- @return #GROUP self 
 function GROUP:SetCommandImmortal(switch)
   self:F2( self.GroupName )
@@ -2997,36 +2984,3 @@ function GROUP:GetGroupSTN()
   return tSTN,text
 end
 
---- [GROUND] Determine if a GROUP is a SAM unit, i.e. has radar or optical tracker and is no mobile AAA.
--- @param #GROUP self
--- @return #boolean IsSAM True if SAM, else false
-function GROUP:IsSAM()
-  local issam = false
-  local units = self:GetUnits()
-  for _,_unit in pairs(units or {}) do
-    local unit = _unit -- Wrapper.Unit#UNIT
-    if unit:HasSEAD() and unit:IsGround() and (not unit:HasAttribute("Mobile AAA")) then
-      issam = true
-      break
-    end
-  end
-  return issam
-end
-
---- [GROUND] Determine if a GROUP has a AAA unit, i.e. has no radar or optical tracker but the AAA = true or the "Mobile AAA" = true attribute.
--- @param #GROUP self
--- @return #boolean IsSAM True if AAA, else false
-function GROUP:IsAAA()
-  local issam = false
-  local units = self:GetUnits()
-  for _,_unit in pairs(units or {}) do
-    local unit = _unit -- Wrapper.Unit#UNIT
-    local desc = unit:GetDesc() or {}
-    local attr = desc.attributes or {}
-    if unit:HasSEAD() then return false end
-    if attr["AAA"] or attr["SAM related"] then 
-      issam = true 
-    end
-  end
-  return issam
-end

Moose Development/Moose/Wrapper/Scenery.lua

@@ -123,38 +123,18 @@ end
 
 --- Check if SCENERY Object is alive.
 --@param #SCENERY self
---@param #number Threshold (Optional) If given, SCENERY counts as alive above this relative life in percent (1..100).
 --@return #number life
-function SCENERY:IsAlive(Threshold)
-  if not Threshold then
-    return self:GetLife() >= 1 and true or false
-  else
-    return self:GetRelativeLife() > Threshold and true or false
-  end
+function SCENERY:IsAlive()
+  return self:GetLife() >= 1 and true or false
 end 
 
 --- Check if SCENERY Object is dead.
 --@param #SCENERY self
---@param #number Threshold (Optional) If given, SCENERY counts as dead below this relative life in percent (1..100).
 --@return #number life
-function SCENERY:IsDead(Threshold)
-  if not Threshold then
-    return self:GetLife() < 1 and true or false
-  else
-    return self:GetRelativeLife() <= Threshold and true or false
-  end
+function SCENERY:IsDead()
+  return self:GetLife() < 1 and true or false
 end 
 
---- Get SCENERY relative life in percent, e.g. 75.
---@param #SCENERY self
---@return #number rlife
-function SCENERY:GetRelativeLife()
-  local life = self:GetLife()
-  local life0 = self:GetLife0()
-  local rlife = math.floor((life/life0)*100)
-  return rlife
-end
-
 --- Get the threat level of a SCENERY object. Always 0 as scenery does not pose a threat to anyone.
 --@param #SCENERY self
 --@return #number Threat level 0.

Moose Development/Moose/Wrapper/Unit.lua

@@ -164,7 +164,7 @@ end
 
 --- Find the first(!) UNIT matching using patterns. Note that this is **a lot** slower than `:FindByName()`!
 -- @param #UNIT self
--- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_\(Regular_Expressions\)) for regular expressions in LUA.
+-- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_(Regular_Expressions)) for regular expressions in LUA.
 -- @return #UNIT The UNIT.
 -- @usage
 --          -- Find a group with a partial group name
@@ -189,7 +189,7 @@ end
 
 --- Find all UNIT objects matching using patterns. Note that this is **a lot** slower than `:FindByName()`!
 -- @param #UNIT self
--- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_\(Regular_Expressions\)) for regular expressions in LUA.
+-- @param #string Pattern The pattern to look for. Refer to [LUA patterns](http://www.easyuo.com/openeuo/wiki/index.php/Lua_Patterns_and_Captures_(Regular_Expressions)) for regular expressions in LUA.
 -- @return #table Units Table of matching #UNIT objects found
 -- @usage
 --          -- Find all group with a partial group name

Moose Development/Moose/Wrapper/Weapon.lua

@@ -12,11 +12,9 @@
 --
 -- ===
 --
--- ## Additional Material:
+-- ## Example Missions:
 --
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Wrapper/Weapon)
--- * **YouTube videos:** None
--- * **Guides:** None
+-- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/WRAPPER%20-%20Weapon).
 --
 -- ===
 --

Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua

@@ -18,7 +18,5 @@ __Moose.Include = function( IncludeFile )
 end
 
 __Moose.Includes = {}
-if not MOOSE_DEVELOPMENT_FOLDER then
-	MOOSE_DEVELOPMENT_FOLDER='Scripts'
-end
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )
+
+__Moose.Include( 'Scripts/Moose/Modules.lua' )

Moose Setup/Moose Templates/Moose_Static_Loader.lua

@@ -1,51 +1,2 @@
-
--- Automatic dynamic loading of development files, if they exists.
--- Try to load Moose as individual script files from <DcsInstallDir\Script\Moose
--- which should be a Junction link to the MOOSE repository subfolder "Moose Development\Moose".
--- This method is used by Moose developers and not mission builders.
-if not MOOSE_DEVELOPMENT_FOLDER then
-	MOOSE_DEVELOPMENT_FOLDER='Scripts'
-end
-
-ModuleLoader = MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua'
-
-if io then
-  local f=io.open(ModuleLoader,"r")
-  if f~=nil then
-    io.close(f)
-
-    env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
-
-    local base = _G
-
-    __Moose = {}
-
-    __Moose.Include = function( IncludeFile )
-      if not __Moose.Includes[ IncludeFile ] then
-        __Moose.Includes[IncludeFile] = IncludeFile
-        local f = assert( base.loadfile( IncludeFile ) )
-        if f == nil then
-          error ("Moose: Could not load Moose file " .. IncludeFile )
-        else
-          env.info( "Moose: " .. IncludeFile .. " dynamically loaded." )
-          return f()
-        end
-      end
-    end
-
-    __Moose.Includes = {}
-
-    __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )
-    BASE:TraceOnOff( true )
-    env.info( '*** MOOSE INCLUDE END *** ' )
-
-    -- Skip the static part of this file completly
-    do return end
-  end
-else
-  env.info( '*** MOOSE DYNAMIC INCLUDE NOT POSSIBLE (Desanitize io to use it) *** ' )
-end
-
--- Individual Moose files are not found. Use the static code below.
 env.info( '*** MOOSE STATIC INCLUDE START *** ' )
 

Moose Setup/Moose.files

@@ -5,7 +5,6 @@ Utilities/Profiler.lua
 Utilities/Templates.lua
 Utilities/STTS.lua
 Utilities/FiFo.lua
-Utilities/Socket.lua
 
 Core/Base.lua
 Core/Beacon.lua
@@ -33,8 +32,6 @@ Core/TextAndSound.lua
 Core/Condition.lua
 Core/Pathline.lua
 Core/ClientMenu.lua
-Core/Astar.lua
-Core/MarkerOps_Base.lua
 
 Wrapper/Object.lua
 Wrapper/Identifiable.lua
@@ -82,9 +79,6 @@ Functional/Shorad.lua
 Functional/Autolase.lua
 Functional/AICSAR.lua
 Functional/AmmoTruck.lua
-Functional/ZoneGoalCargo.lua
-Functional/Tiresias.lua
-Functional/Stratego.lua
 
 Ops/Airboss.lua
 Ops/RecoveryTanker.lua
@@ -113,10 +107,6 @@ Ops/FlightControl.lua
 Ops/PlayerTask.lua
 Ops/PlayerRecce.lua
 Ops/EasyGCICAP.lua
-Ops/OpsZone.lua
-Ops/ArmyGroup.lua
-Ops/OpsTransport.lua
-Ops/Target.lua
 
 AI/AI_Balancer.lua
 AI/AI_Air.lua

Moose Setup/Moose_Create.lua

@@ -59,7 +59,7 @@ while( MooseSource ) do
   MooseSource = string.gsub(MooseSource, "\r", "")
   
   if MooseSource ~= "" then
-    MooseSource = string.match( MooseSource, "/Moose/(.+)'" )
+    MooseSource = string.match( MooseSource, "Scripts/Moose/(.+)'" )
     local MooseFilePath = MooseDevelopmentPath .. "/" .. MooseSource
     if MooseDynamicStatic == "D" then
       print( "Load dynamic: " .. MooseFilePath )

docs/beginner/ask-for-help.md

@@ -1,77 +0,0 @@
----
-parent: Beginner
-nav_order: 06
----
-# How to ask for help
-{: .no_toc }
-
-1. Table of contents
-{:toc}
-
-After you have tried to solve the problem on your own, you can also get help
-from the community.
-
-{: .highlight }
-> But it is important to follow certain rules! Read them below.
-
-## Communities
-
-There are two ways to communicate with the community.
-The fastest way is to use Discord:
-
-- <https://discord.gg/gj68fm969S>{:target="_blank"}
-
-But if you don't like Discord, you are able to post in the DCS forum.
-Check out the MOOSE thread here:
-
-- <https://forums.eagle.ru/showthread.php?t=138043>
-
-## How to post requests
-
-MOOSE is a community project and support is community based.
-
-Please remember when posting a question:
-
-- Before posting anything follow the [troubleshooting steps].
-- **Read your logs**.
-
-A post should contain the following:
-
-1. A describtion what you expected to happen and what actually happened.
-    - Do not use vague words this stuff is hard to help with! Be specific.
-
-2. Describe what happens instead.
-    - The less detail you offer, the less chance you can be helped.
-    - Don’t say it doesn’t work. Or is it broken. Say what it actually does.
-
-3. Post your code in Discord as formatted code:
-
-  - Wrap a single line of code in backticks \` like this:
-
-    ![discord-single-line-code.png](../images/beginner/discord-single-line-code.png)
-
-  - Multiple lines of code should be posted like this:
-
-    ![discord-multi-line-code.png](../images/beginner/discord-multi-line-code.png)
-
-- Post your log lines with the error or warning messages. Format them like this:
-
-    ![discord-fomat-logs.png](../images/beginner/discord-fomat-logs.png)
-
-- Some complex problems need the mission (.miz file) also.
-
-  - But post your mission only when requested.
-  - Try to simplify your mission if it is complex!
-
-There are people in the Discord and in the forum, who spend their free time to
-help you. <br />
-It is your responsibility to make their "work" as easy as possible.
-
-Welcome to MOOSE and good luck!
-
-## Next step
-
-Last but not least some [tipps and tricks].
-
-[troubleshooting steps]: problems.md
-[tipps and tricks]: tipps-and-tricks.md

docs/beginner/demo-missions.md

@@ -1,58 +0,0 @@
----
-parent: Beginner
-nav_order: 04
----
-
-# Demo missions
-{: .no_toc }
-
-1. Table of contents
-{:toc}
-
-The best way to get comfortable with a Moose class is to try the demo missions
-of the class you want to learn. The Moose team created a lot of demo missions
-for most of the classes.
-
-## Download demo missions
-
-Go to the repository [MOOSE_MISSIONS]{:target="_blank"}, search the folder of
-the class, download the mission (`.miz`) and run them.
-
-## Read the mission script
-
-In the same folder a `.lua` file with the same name is placed which is the
-included mission script. You can watch these mission scripts easily online at
-GitHub to understand what is happening in the mission.
-
-## Read documentation
-
-Next step is to read the [documentation]{:target="_blank"} of the class to
-understand the code of the demo mission.
-
-{: .note }
-> The documentation is quite long and might be confusing for beginners.
-> Start by looking at the description at the top of the documentation of a
-> class. It often contains examples and explanations. <br /><br />
-> Then search for the function names and look at the description of the
-> functions and its parameters.
-
-## Make small changes to the script
-
-Download the `.lua` file, change the parameters to suit your needs in
-[Notepad++]{:target="_blank"}, add it to the mission and rerun the mission.
-Observe what happens and adapt the code.
-
-If you want to use more functions combine them all up.
-
-{: .note }
-> But it is wise to do this in small steps. So it is easier to find errors.
-
-## Next step
-
-If the mission does not show the expected behaviour take a look at section
-[problems].
-
-[MOOSE_MISSIONS]: https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop
-[documentation]: https://flightcontrol-master.github.io/MOOSE_DOCS_DEVELOP/Documentation/index.html
-[Notepad++]: https://notepad-plus-plus.org/downloads/
-[problems]: problems.md

docs/beginner/hello-world-build.md

@@ -4,178 +4,6 @@ nav_order: 03
 ---
 
 # Create your own Hello world
-{: .no_toc }
 
-1. Table of contents
-{:toc}
-
-This page will lead you step by step through the process of creating a mission
-with MOOSE. This time we include a simple mission script, which sends only
-a "Hello world" message to all players. But the steps are the same to add
-another mission script, which will do whatever class(es) you want to use.
-
-## Create Mission script
-
-At first we will create the mission script. It is a simple text file and can be
-changed with a lot of different tools. Theoretically even the Microsoft Notepad
-editor can be used. But it lacks a lot of features, which helps you to avoid
-errors.
-
-For this guide we suggest you to download, install and use [Notepad++]{:target="_blank"}.
-
-{: .important }
-> Windows hides filename extensions by default. So when you create a text file
-> and name it `hello-world.lua` it's name is `hello-world.lua.txt` in reality.
-> You must activate the display of the file name extension.
-> Open a `File Explorer`, switch to menu `View` and find the option
-> `File name extensions` in the section `Show/hide`. Activate it.
-
-- Open a File Explorer.
-- Go to the subfolder `Missions` of your [Saved Games folder]{:target="_blank"}.
-- Create a new text file and name it `hello-world.lua`.
-- Add the following content and save the file:
-
-  `MESSAGE:New( "Hello World! This messages is printed by MOOSE", 35, "INFO" ):ToAll()`
-
-## Get Moose
-
-To download Moose click on the following link:
-
-- [Moose_.lua from develop branch]{:target="_blank"}
-
-Press `Ctrl + S` to save the file on your hard disk next to your mission script.
-
-## Create the mission
-
-- Start DCS.
-- In the main menu choose `MISSION EDITOR`.
-- Click on `create new mission`.
-- In the dialog `NEW MISSION SETTINGS`:
-  - Choose map `Caucasus`.
-  - In the drop box upper left choose `Modern` as coalition preset.
-  - Click on `OK`.
-- The mission editor will load with a fresh new and empty mission.
-- Click on `File` in the menu bar and `SAVE` or Press `Ctrl + S`.
-- Open `My Missions` and save the file with the name `hello-world.miz`.
-
-## Add Moose to the mission
-
-- On the left side activate `TRIGGERS`:
-
-    ![dcs-triggers-toolbar.png](../images/beginner/dcs-triggers-toolbar.png)
-
-- On the right side the `TRIGGERS` dialog opens with a lot of options.
-- Click on `NEW`, choose `4 MISSION START` as **TYPE**.
-- Give it the `Load MOOSE` as **NAME**.
-- Leave the **EVENT** option set to `NO EVENT`.
-- Optional: Choose a color for easy recognition (e.g. yellow).
-
-    ![dcs-triggers-mission-start-conf.png](../images/beginner/dcs-triggers-mission-start-conf.png)
-
-- In the middle part the `CONDITIONS` will be shown.
-  For this trigger we do not configure any conditions.
-
-    ![dcs-triggers-mission-start-conditions.png](../images/beginner/dcs-triggers-mission-start-conditions.png)
-
-    {: .important }
-    > The trigger type `4 MISSION START` does not support `CONDITIONS`. <br />
-    > So `CONDITIONS` must left blank when using it. <br />
-    > **If you add a condition the trigger will never be executed!**
-
-    ![dcs-triggers-mission-start-actions-conf.png](../images/beginner/dcs-triggers-mission-start-actions-conf.png)
-
-- On the right side `ACTIONS` is shown.
-- We need to click on `NEW`.
-- Choose **ACTION** `Do SCRIPT FILE` and ignore all other actions.
-- Click **OPEN** and navigate to the downloaded `Moose_.lua` file.
-- The result should look like this:
-
-    ![dcs-triggers-mission-start-actions.png](../images/beginner/dcs-triggers-mission-start-actions.png)
-
-## Add the mission script
-
-- Click on `NEW`, choose `1 ONCE` as **TYPE**.
-- Give it the `Load Mission Script` as **NAME**.
-- Leave the **EVENT** option set to `NO EVENT`.
-- Optional: Choose a color for easy recognition (e.g. green).
-- The result should look like this:
-
-    ![dcs-triggers-once-conf.png](../images/beginner/dcs-triggers-once-conf.png)
-
-- Switch to the middle part, the `CONDITIONS` section. <br />
-  For this trigger we add one condition:
-
-    ![dcs-triggers-once-conditions.png](../images/beginner/dcs-triggers-once-conditions-conf.png)
-
-- The combination of `1 ONCE` with `TIME MORE(1)` will ensure, that the mission
-  script is executed 1 second after the mission is started.
-
-- On the right side under `ACTIONS` you need to add the script:
-- Click on `NEW`.
-- Choose **ACTION** `Do SCRIPT FILE`.
-- Click **OPEN** and navigate to the created `hello-world.lua` file.
-
-{: .important }
-> Most important is the fact, that the mission script (`hello-world.lua`)
-> is executed **after** `Moose_.lua`, because the mission script needs the
-> classes defined in `Moose_.lua`. And they are only available when `Moose_.lua`
-> is executed before the mission script.
-
-## Test the mission
-
-- Save the mission again.
-- Click on the green **Fly mission** cirlce on the left tool side bar.
-- It is an empty mission, so skip `BRIEFING` with `START` and then `FLY`.
-- You spawn as a spectator. After some seconds you will see this message in
-  the upper right corner:
-
-    ![dcs-message.jpg](../images/beginner/dcs-message.jpg)
-
-This is the same result as already seen in the last chapter, but this time you
-have create everything on your own.
-
-{: .note }
-> You can use this mission as a template for your own missions. So you don't
-> need to do alle these steps again and again.
-
-## Update mission script
-
-- Open the `hello-world.lua` with Notepad++ again.
-- Change the text a little bit, like `Hello Dude! ...` and save the file.
-- Run the mission again.
-- The text will not be changed in the mission. Why?
-
-{: .important }
-The mission editor copies the script into the mission file when you add it.
-Every change on the script file on your hard disk is not recognized by mission
-editor.  **You have to add the file after each change again!**
-
-There is also another method available to dynamically load mission scripts.
-But this method has some brawbacks and will be explained in the advanced section.
-
-Now we add the mission script again:
-
-- On the left side of the `TRIGGERS` dialog click on `Load Mission Script`.
-- On the right side under `ACTIONS` you need to add the script again:
-    - Click **OPEN** and navigate to the created `hello-world.lua` file.
-- Save the mission and test it again.
-- Now the new text should be shown.
-
-## Update Moose
-
-Moose is constantly being developed so that new functionallity is added or
-existing errors are corrected. Also from time to time changes of the DCS
-scripting engine comes with a new DCS version. It may therefore be useful or
-necessary to update Moose.
-
-- To update Moose download it again and add it again in the same way you did
-  with the mission script in the last step.
-
-## Next step
-
-Let's move on to the [demo missions].
-
-[Notepad++]: https://notepad-plus-plus.org/downloads/
-[Saved Games folder]: tipps-and-tricks.md#find-the-saved-games-folder
-[Moose_.lua from develop branch]: https://raw.githubusercontent.com/FlightControl-Master/MOOSE_INCLUDE/develop/Moose_Include_Static/Moose_.lua
-[demo missions]: demo-missions.md
+{: .warning }
+> THIS DOCUMENT IS STILL WORK IN PROGRESS!

docs/beginner/problems.md

@@ -1,46 +0,0 @@
----
-parent: Beginner
-nav_order: 05
----
-
-# Problems
-{: .no_toc }
-
-1. Table of contents
-{:toc}
-
-## Something went wrong
-
-If the mission shows not the expected behaviour do the following steps:
-
-1. Double check if you added the changed mission script to the mission again!
-1. Check if the triggers are configured as requested in the last sections.
-
-## Read the logs
-
-The DCS log is a super important and useful log for the entire of DCS World.
-All scripting and other errors are recorded here. It is the one stop shop for
-things that occurred in your mission. It will tell you if there was a mistake.
-
-1. Open the file `dcs.log` in the `Logs` subfolder in your DCS
-  [Saved Games folder].
-
-1. Search for the following line: `*** MOOSE INCLUDE END ***`
-  - If it is included in the log, Moose was loaded.
-  - If the line is not in the log check the triggers again!
-
-1. Search for lines with `SCRIPTING` and `WARNING` or `ERROR` and read them.
-  - This might help to find your error.
-
-    {: .note }
-    > You will find a lot of warning and error lines in the log which are not
-    > related to `SCRIPTING`. They are related to stuff from Eagle Dynamics or
-    > Third Parties and you have to ignore them. EA does the same. ;o)
-
-## Next step
-
-If you don't find the error and/or don't understand the messages in the log file
-you can [ask for help].
-
-[Saved Games folder]: tipps-and-tricks.md#find-the-saved-games-folder
-[ask for help]: ask-for-help.md

docs/beginner/tipps-and-tricks.md

@@ -33,9 +33,7 @@ This folder can be found in your userprofile as subfolder of `Saved Games`.
 The easiest way to find it, is to open search and paste the text below into it
 and press Enter:
 
-```
-%userprofile%\Saved Games
-```
+```%userprofile%\Saved Games```
 
 {: .note }
 > The text will work even if your Windows is installed with another language,