xx

Update Scoring.lua

.github/workflows/build-docs.yml

@@ -57,7 +57,6 @@ jobs:
 
       - name: Update apt-get (needed for act docker image)
         run: |
-          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get -qq update
 
       - name: Install tree

.gitignore

@@ -28,13 +28,6 @@ local.properties
 .buildpath
 
 
-#####################
-## Visual Studio Code
-#####################
-*.code-workspace
-.vscode/
-
-
 #################
 ## Visual Studio
 #################

Moose Development/Moose/.vscode/settings.json

@@ -1,17 +1,7 @@
 {
-    "Lua.workspace.preloadFileSize": 10000,
+    "Lua.workspace.preloadFileSize": 1000,
     "Lua.diagnostics.disable": [
-        "undefined-doc-name",
-        "duplicate-set-field",
-        "trailing-space",
-        "need-check-nil",
-        "ambiguity-1",
-        "undefined-doc-param",
-        "redundant-parameter",
-        "param-type-mismatch",
-        "deprecated",
-        "undefined-global",
-        "lowercase-global"
+        "undefined-doc-name"
     ],
     "Lua.diagnostics.globals": [
         "BASE",

Moose Development/Moose/AI/AI_A2A_Cap.lua

@@ -11,7 +11,7 @@
 -- @module AI.AI_A2A_Cap
 -- @image AI_Combat_Air_Patrol.JPG
 
--- @type AI_A2A_CAP
+--- @type AI_A2A_CAP
 -- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
 -- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 

Moose Development/Moose/AI/AI_A2A_Gci.lua

@@ -13,8 +13,8 @@
 
 
 
--- @type AI_A2A_GCI
--- @extends AI.AI_A2A#AI_A2A
+--- @type AI_A2A_GCI
+-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
@@ -41,8 +41,6 @@
 --
 -- ## 2. AI_A2A_GCI is a FSM
 --
--- ![Process](..\Presentations\AI_GCI\Dia2.JPG)
---
 -- ### 2.1 AI_A2A_GCI States
 --
 --   * **None** ( Group ): The process is not started yet.

Moose Development/Moose/AI/AI_A2A_Patrol.lua

@@ -10,8 +10,8 @@
 -- @image AI_Air_Patrolling.JPG
 
 
--- @type AI_A2A_PATROL
--- @extends AI.AI_A2A#AI_A2A
+--- @type AI_A2A_PATROL
+-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
 
 --- Implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} or @{Wrapper.Group}.
 -- 

Moose Development/Moose/AI/AI_A2G_BAI.lua

@@ -11,8 +11,9 @@
 -- @module AI.AI_A2G_BAI
 -- @image AI_Air_To_Ground_Engage.JPG
 
--- @type AI_A2G_BAI
--- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends.
+--- @type AI_A2G_BAI
+-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
 -- 
@@ -48,7 +49,7 @@ AI_A2G_BAI = {
 function AI_A2G_BAI:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
 
   local AI_Air = AI_AIR:New( AIGroup )
-  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
+  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
   local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
   local self = BASE:Inherit( self, AI_Air_Engage )
 

Moose Development/Moose/AI/AI_A2G_CAS.lua

@@ -11,8 +11,9 @@
 -- @module AI.AI_A2G_CAS
 -- @image AI_Air_To_Ground_Engage.JPG
 
--- @type AI_A2G_CAS
--- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends.
+--- @type AI_A2G_CAS
+-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
 --
@@ -48,7 +49,7 @@ AI_A2G_CAS = {
 function AI_A2G_CAS:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
 
   local AI_Air = AI_AIR:New( AIGroup )
-  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
+  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
   local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
   local self = BASE:Inherit( self, AI_Air_Engage )
 

Moose Development/Moose/AI/AI_A2G_SEAD.lua

@@ -13,8 +13,9 @@
 
 
 
--- @type AI_A2G_SEAD
--- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL
+--- @type AI_A2G_SEAD
+-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 
 --- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders.

Moose Development/Moose/AI/AI_Air_Patrol.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Air_Patrol
 -- @image AI_Air_To_Ground_Patrol.JPG
 
--- @type AI_AIR_PATROL
+--- @type AI_AIR_PATROL
 -- @extends AI.AI_Air#AI_AIR
 
 --- The AI_AIR_PATROL class implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group}

Moose Development/Moose/AI/AI_BAI.lua

@@ -409,7 +409,7 @@ function AI_BAI_ZONE:onafterStart( Controllable, From, Event, To )
   self:SetDetectionDeactivated() -- When not engaging, set the detection off.
 end
 
--- @param Wrapper.Controllable#CONTROLLABLE AIControllable
+--- @param Wrapper.Controllable#CONTROLLABLE AIControllable
 function _NewEngageRoute( AIControllable )
 
   AIControllable:T( "NewEngageRoute" )
@@ -418,7 +418,7 @@ function _NewEngageRoute( AIControllable )
 end
 
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -430,7 +430,7 @@ function AI_BAI_ZONE:onbeforeEngage( Controllable, From, Event, To )
   end
 end
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -479,7 +479,7 @@ function AI_BAI_ZONE:onafterTarget( Controllable, From, Event, To )
 end
 
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -489,7 +489,7 @@ function AI_BAI_ZONE:onafterAbort( Controllable, From, Event, To )
   self:__Route( 1 )
 end
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -613,7 +613,7 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To,
 end
 
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -624,7 +624,7 @@ function AI_BAI_ZONE:onafterAccomplish( Controllable, From, Event, To )
 end
 
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -638,7 +638,7 @@ function AI_BAI_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
 end
 
 
--- @param #AI_BAI_ZONE self
+--- @param #AI_BAI_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_BAI_ZONE:OnEventDead( EventData )
   self:F( { "EventDead", EventData } )

Moose Development/Moose/AI/AI_Balancer.lua

@@ -27,7 +27,7 @@
 -- @module AI.AI_Balancer
 -- @image AI_Balancing.JPG
 
--- @type AI_BALANCER
+--- @type AI_BALANCER
 -- @field Core.Set#SET_CLIENT SetClient
 -- @field Core.Spawn#SPAWN SpawnAI
 -- @field Wrapper.Group#GROUP Test

Moose Development/Moose/AI/AI_CAP.lua

@@ -31,7 +31,7 @@
 -- @module AI.AI_CAP
 -- @image AI_Combat_Air_Patrol.JPG
 
--- @type AI_CAP_ZONE
+--- @type AI_CAP_ZONE
 -- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Wrapper.Controllable} patrolling.
 -- @field Core.Zone#ZONE_BASE TargetZone The @{Core.Zone} where the patrol needs to be executed.
 -- @extends AI.AI_Patrol#AI_PATROL_ZONE
@@ -346,7 +346,7 @@ function AI_CAP_ZONE:onafterStart( Controllable, From, Event, To )
 
 end
 
--- @param AI.AI_CAP#AI_CAP_ZONE 
+--- @param AI.AI_CAP#AI_CAP_ZONE 
 -- @param Wrapper.Group#GROUP EngageGroup
 function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
 
@@ -357,7 +357,7 @@ function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
   end
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -369,7 +369,7 @@ function AI_CAP_ZONE:onbeforeEngage( Controllable, From, Event, To )
   end
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -397,7 +397,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
   end
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -407,7 +407,7 @@ function AI_CAP_ZONE:onafterAbort( Controllable, From, Event, To )
   self:__Route( 1 )
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -507,7 +507,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
   end
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -517,7 +517,7 @@ function AI_CAP_ZONE:onafterAccomplish( Controllable, From, Event, To )
   self:SetDetectionOff()
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -530,7 +530,7 @@ function AI_CAP_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
   end
 end
 
--- @param #AI_CAP_ZONE self
+--- @param #AI_CAP_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_CAP_ZONE:OnEventDead( EventData )
   self:F( { "EventDead", EventData } )

Moose Development/Moose/AI/AI_CAS.lua

@@ -165,6 +165,7 @@ function AI_CAS_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude
   -- @param #string From The From State string.
   -- @param #string Event The Event string.
   -- @param #string To The To State string.
+  
   -- @return #boolean Return false to cancel Transition.
   
   --- OnAfter Transition Handler for Event Engage.
@@ -365,7 +366,7 @@ function AI_CAS_ZONE:onafterStart( Controllable, From, Event, To )
   self:SetDetectionDeactivated() -- When not engaging, set the detection off.
 end
 
--- @param AI.AI_CAS#AI_CAS_ZONE 
+--- @param AI.AI_CAS#AI_CAS_ZONE 
 -- @param Wrapper.Group#GROUP EngageGroup
 function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
 
@@ -377,7 +378,7 @@ function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
 end
 
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -389,7 +390,7 @@ function AI_CAS_ZONE:onbeforeEngage( Controllable, From, Event, To )
   end
 end
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -422,7 +423,7 @@ function AI_CAS_ZONE:onafterTarget( Controllable, From, Event, To )
 end
 
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -432,7 +433,7 @@ function AI_CAS_ZONE:onafterAbort( Controllable, From, Event, To )
   self:__Route( 1 )
 end
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -532,7 +533,7 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To,
 end
 
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -543,7 +544,7 @@ function AI_CAS_ZONE:onafterAccomplish( Controllable, From, Event, To )
 end
 
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -557,7 +558,7 @@ function AI_CAS_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
 end
 
 
--- @param #AI_CAS_ZONE self
+--- @param #AI_CAS_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_CAS_ZONE:OnEventDead( EventData )
   self:F( { "EventDead", EventData } )

Moose Development/Moose/AI/AI_Cargo_APC.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo_APC
 -- @image AI_Cargo_Dispatching_For_APC.JPG
 
--- @type AI_CARGO_APC
+--- @type AI_CARGO_APC
 -- @extends AI.AI_Cargo#AI_CARGO
 
 

Moose Development/Moose/AI/AI_Cargo_Airplane.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo_Airplane
 -- @image AI_Cargo_Dispatching_For_Airplanes.JPG
 
--- @type AI_CARGO_AIRPLANE
+--- @type AI_CARGO_AIRPLANE
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 
 

Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua

@@ -30,7 +30,7 @@
 -- @module AI.AI_Cargo_Dispatcher_APC
 -- @image AI_Cargo_Dispatching_For_APC.JPG
 
--- @type AI_CARGO_DISPATCHER_APC
+--- @type AI_CARGO_DISPATCHER_APC
 -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
 
 

Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua

@@ -24,7 +24,7 @@
 -- @image AI_Cargo_Dispatching_For_Airplanes.JPG
 
 
--- @type AI_CARGO_DISPATCHER_AIRPLANE
+--- @type AI_CARGO_DISPATCHER_AIRPLANE
 -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
 
 

Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua

@@ -25,7 +25,7 @@
 -- @module AI.AI_Cargo_Dispatcher_Helicopter
 -- @image AI_Cargo_Dispatching_For_Helicopters.JPG
 
--- @type AI_CARGO_DISPATCHER_HELICOPTER
+--- @type AI_CARGO_DISPATCHER_HELICOPTER
 -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
 
 

Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua

@@ -23,7 +23,7 @@
 -- @module AI.AI_Cargo_Dispatcher_Ship
 -- @image AI_Cargo_Dispatcher.JPG
 
--- @type AI_CARGO_DISPATCHER_SHIP
+--- @type AI_CARGO_DISPATCHER_SHIP
 -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
 
 
@@ -162,7 +162,7 @@ AI_CARGO_DISPATCHER_SHIP = {
 --      local SetPickupZones = SET_ZONE:New():FilterPrefixes( "Pickup" ):FilterStart()
 --      local SetDeployZones = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart()
 --      NEED MORE THOUGHT - ShippingLane is part of Warehouse.......
---      local ShippingLane = SET_GROUP:New():FilterPrefixes( "ShippingLane" ):FilterOnce():GetSetObjects()
+--      local ShippingLane = GROUP:New():FilterPrefixes( "ShippingLane" ):FilterStart()
 -- 
 --      AICargoDispatcherShip = AI_CARGO_DISPATCHER_SHIP:New( SetShip, SetCargoInfantry, SetPickupZones, SetDeployZones, ShippingLane )
 --      AICargoDispatcherShip:Start()

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo_Helicopter
 -- @image AI_Cargo_Dispatching_For_Helicopters.JPG
 
--- @type AI_CARGO_HELICOPTER
+--- @type AI_CARGO_HELICOPTER
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 
 
@@ -289,7 +289,7 @@ function AI_CARGO_HELICOPTER:SetLandingSpeedAndHeight(speed, height)
   return self
 end
 
--- @param #AI_CARGO_HELICOPTER self
+--- @param #AI_CARGO_HELICOPTER self
 -- @param Wrapper.Group#GROUP Helicopter
 -- @param From
 -- @param Event
@@ -328,7 +328,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
   
 end
 
--- @param #AI_CARGO_HELICOPTER self
+--- @param #AI_CARGO_HELICOPTER self
 -- @param Wrapper.Group#GROUP Helicopter
 -- @param From
 -- @param Event
@@ -411,7 +411,7 @@ function AI_CARGO_HELICOPTER:onafterQueue( Helicopter, From, Event, To, Coordina
 end
 
 
--- @param #AI_CARGO_HELICOPTER self
+--- @param #AI_CARGO_HELICOPTER self
 -- @param Wrapper.Group#GROUP Helicopter
 -- @param From
 -- @param Event

Moose Development/Moose/AI/AI_Cargo_Ship.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo_Ship
 -- @image AI_Cargo_Dispatcher.JPG
 
--- @type AI_CARGO_SHIP
+--- @type AI_CARGO_SHIP
 -- @extends AI.AI_Cargo#AI_CARGO
 
 --- Brings a dynamic cargo handling capability for an AI naval group.

Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua

@@ -15,7 +15,7 @@
 -- @image MOOSE.JPG
 
 
--- @type AI_ESCORT_DISPATCHER_REQUEST
+--- @type AI_ESCORT_DISPATCHER_REQUEST
 -- @extends Core.Fsm#FSM
 
 
@@ -35,7 +35,7 @@ AI_ESCORT_DISPATCHER_REQUEST = {
   ClassName = "AI_ESCORT_DISPATCHER_REQUEST",
 }
 
--- @field #list 
+--- @field #list 
 AI_ESCORT_DISPATCHER_REQUEST.AI_Escorts = {}
 
 
@@ -82,7 +82,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:onafterStart( From, Event, To )
 
 end
 
--- @param #AI_ESCORT_DISPATCHER_REQUEST self
+--- @param #AI_ESCORT_DISPATCHER_REQUEST self
 -- @param Core.Event#EVENTDATA EventData
 function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
 
@@ -99,7 +99,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
       
 end
 
--- @param #AI_ESCORT_DISPATCHER_REQUEST self
+--- @param #AI_ESCORT_DISPATCHER_REQUEST self
 -- @param Core.Event#EVENTDATA EventData
 function AI_ESCORT_DISPATCHER_REQUEST:OnEventBirth( EventData )
 

Moose Development/Moose/AI/AI_Escort_Request.lua

@@ -138,12 +138,12 @@
 -- 
 -- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint.
 -- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission.
-  --
-  -- # Developer Note
-  -- 
-  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-  -- Therefore, this class is considered to be deprecated
-  --
+--
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+-- Therefore, this class is considered to be deprecated
+--
 -- ===
 -- 
 -- ### Authors: **FlightControl** 
@@ -155,7 +155,7 @@
 
 
 
--- @type AI_ESCORT_REQUEST
+--- @type AI_ESCORT_REQUEST
 -- @extends AI.AI_Escort#AI_ESCORT
 
 --- AI_ESCORT_REQUEST class
@@ -230,7 +230,7 @@ function AI_ESCORT_REQUEST:New( EscortUnit, EscortSpawn, EscortAirbase, EscortNa
   return self
 end
 
--- @param #AI_ESCORT_REQUEST self
+--- @param #AI_ESCORT_REQUEST self
 function AI_ESCORT_REQUEST:SpawnEscort()
 
   local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot )
@@ -255,7 +255,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
       self:_InitEscortMenus( EscortGroup )
       self:_InitEscortRoute( EscortGroup )
 
-      -- @param #AI_ESCORT self
+      --- @param #AI_ESCORT self
       -- @param Core.Event#EVENTDATA EventData
       function EscortGroup:OnEventDeadOrCrash( EventData )
         self:F( { "EventDead", EventData } )
@@ -270,7 +270,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
 
 end
 
--- @param #AI_ESCORT_REQUEST self
+--- @param #AI_ESCORT_REQUEST self
 -- @param Core.Set#SET_GROUP EscortGroupSet
 function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
 
@@ -292,14 +292,14 @@ function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
     
 end
 
--- @param #AI_ESCORT_REQUEST self
+--- @param #AI_ESCORT_REQUEST self
 -- @param Core.Set#SET_GROUP EscortGroupSet
 function AI_ESCORT_REQUEST:onafterStop( EscortGroupSet )
 
   self:F()
   
   EscortGroupSet:ForEachGroup(
-    -- @param Core.Group#GROUP EscortGroup
+    --- @param Wrapper.Group#GROUP EscortGroup
     function( EscortGroup )
       EscortGroup:WayPointInitialize()
     

Moose Development/Moose/AI/AI_Formation.lua

@@ -34,8 +34,8 @@
 -- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
 -- @field #number FollowDistance The current follow distance.
 -- @field #boolean ReportTargets If true, nearby targets are reported.
--- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
--- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
+-- @field DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
+-- @field DCS#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
 -- @field #number dtFollow Time step between position updates.
 
 
@@ -94,12 +94,12 @@
 -- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" )
 -- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 )
 -- LargeFormation:__Start( 1 )
-  --
-  -- # Developer Note
-  -- 
-  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-  -- Therefore, this class is considered to be deprecated
-  --
+--
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+-- Therefore, this class is considered to be deprecated
+--
 -- @field #AI_FORMATION 
 AI_FORMATION = {
   ClassName = "AI_FORMATION",
@@ -119,7 +119,7 @@ AI_FORMATION = {
 
 AI_FORMATION.__Enum = {}
 
--- @type AI_FORMATION.__Enum.Formation
+--- @type AI_FORMATION.__Enum.Formation
 -- @field #number None
 -- @field #number Line
 -- @field #number Trail
@@ -144,7 +144,7 @@ AI_FORMATION.__Enum.Formation = {
   Box = 10,
 }
 
--- @type AI_FORMATION.__Enum.Mode
+--- @type AI_FORMATION.__Enum.Mode
 -- @field #number Mission
 -- @field #number Formation
 AI_FORMATION.__Enum.Mode = {
@@ -154,13 +154,12 @@ AI_FORMATION.__Enum.Mode = {
   Reconnaissance = "R",
 }
 
--- @type AI_FORMATION.__Enum.ReportType
+--- @type AI_FORMATION.__Enum.ReportType
 -- @field #number All
 -- @field #number Airborne
 -- @field #number GroundRadar
 -- @field #number Ground
 AI_FORMATION.__Enum.ReportType = {
-  All = "*",
   Airborne = "A",
   GroundRadar = "R",
   Ground = "G",
@@ -998,7 +997,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
@@ -1022,7 +1021,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
@@ -1046,7 +1045,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
@@ -1224,7 +1223,6 @@ function AI_FORMATION:FollowMe(FollowGroup, ClientUnit, CT1, CV1, CT2, CV2)
         local CVI = { 
           x = CV2.x + CS * 10 * math.sin(Ca),
           y = GH2.y + Inclination, -- + FollowFormation.y,
-          --y = GH2.y,
           z = CV2.z + CS * 10 * math.cos(Ca),
         }
   

Moose Development/Moose/Actions/Act_Account.lua

@@ -276,7 +276,7 @@ do -- ACT_ACCOUNT_DEADS
 
   --- DCS Events
 
-  -- @param #ACT_ACCOUNT_DEADS self
+  --- @param #ACT_ACCOUNT_DEADS self
   -- @param Core.Event#EVENTDATA EventData
   function ACT_ACCOUNT_DEADS:OnEventHit( EventData )
     self:T( { "EventDead", EventData } )
@@ -287,7 +287,7 @@ do -- ACT_ACCOUNT_DEADS
     end
   end
 
-  -- @param #ACT_ACCOUNT_DEADS self
+  --- @param #ACT_ACCOUNT_DEADS self
   -- @param Core.Event#EVENTDATA EventData
   function ACT_ACCOUNT_DEADS:onfuncEventDead( EventData )
     self:T( { "EventDead", EventData } )
@@ -299,7 +299,7 @@ do -- ACT_ACCOUNT_DEADS
 
   --- DCS Events
 
-  -- @param #ACT_ACCOUNT_DEADS self
+  --- @param #ACT_ACCOUNT_DEADS self
   -- @param Core.Event#EVENTDATA EventData
   function ACT_ACCOUNT_DEADS:onfuncEventCrash( EventData )
     self:T( { "EventDead", EventData } )

Moose Development/Moose/Actions/Act_Assist.lua

@@ -201,7 +201,7 @@ do -- ACT_ASSIST_SMOKE_TARGETS_ZONE
   function ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking( ProcessUnit, From, Event, To )
 
     self.TargetSetUnit:ForEachUnit(
-      -- @param Wrapper.Unit#UNIT SmokeUnit
+      --- @param Wrapper.Unit#UNIT SmokeUnit
       function( SmokeUnit )
         if math.random( 1, ( 100 * self.TargetSetUnit:Count() ) / 4 ) <= 100 then
           SCHEDULER:New( self,

Moose Development/Moose/Cargo/CargoCrate.lua

@@ -81,7 +81,7 @@ do -- CARGO_CRATE
     return self
   end
   
-  -- @param #CARGO_CRATE self
+  --- @param #CARGO_CRATE self
   -- @param Core.Event#EVENTDATA EventData 
   function CARGO_CRATE:OnEventCargoDead( EventData )
 

Moose Development/Moose/Cargo/CargoGroup.lua

@@ -601,7 +601,7 @@ do -- CARGO_GROUP
   end
 
 
-  --- Get the underlying GROUP object from the CARGO_GROUP.
+  --- Get the amount of cargo units in the group.
   -- @param #CARGO_GROUP self
   -- @return #CARGO_GROUP
   function CARGO_GROUP:GetGroup( Cargo )

Moose Development/Moose/Cargo/CargoSlingload.lua

@@ -74,7 +74,7 @@ do -- CARGO_SLINGLOAD
   end
 
 
-  -- @param #CARGO_SLINGLOAD self
+  --- @param #CARGO_SLINGLOAD self
   -- @param Core.Event#EVENTDATA EventData 
   function CARGO_SLINGLOAD:OnEventCargoDead( EventData )
 

Moose Development/Moose/Core/ClientMenu.lua

@@ -1,924 +0,0 @@
---- **Core** - Client Menu Management.
---
--- **Main Features:**
---
---    * For complex, non-static menu structures
---    * Lightweigt implementation as alternative to MENU
---    * Separation of menu tree creation from menu on the clients's side
---    * Works with a SET_CLIENT set of clients
---    * Allow manipulation of the shadow tree in various ways
---    * Push to all or only one client
---    * Change entries' menu text
---    * Option to make an entry usable once only across all clients
---    * Auto appends GROUP and CLIENT objects to menu calls
---
--- ===
---
--- ### Author: **applevangelist**
--- 
--- ===
--- 
--- @module Core.ClientMenu
--- @image Core_Menu.JPG
--- last change: Jan 2025
-
--- TODO
-----------------------------------------------------------------------------------------------------------------
---
--- CLIENTMENU
---
-----------------------------------------------------------------------------------------------------------------
-
----
--- @type CLIENTMENU
--- @field #string ClassName Class Name
--- @field #string lid Lid for log entries
--- @field #string version Version string
--- @field #string name Name
--- @field #string groupname Group name
--- @field #table path
--- @field #table parentpath
--- @field #CLIENTMENU Parent
--- @field Wrapper.Client#CLIENT client
--- @field #number GroupID Group ID
--- @field #number ID Entry ID
--- @field Wrapper.Group#GROUP group
--- @field #string UUID Unique ID based on path+name
--- @field #string Function
--- @field #table Functionargs
--- @field #table Children
--- @field #boolean Once
--- @field #boolean Generic
--- @field #boolean debug
--- @field #CLIENTMENUMANAGER Controller
--- @field #active boolean
--- @extends Core.Base#BASE
-
----
--- @field #CLIENTMENU
-CLIENTMENU = {
-  ClassName = "CLIENTMENU",
-  lid = "",
-  version = "0.1.3",
-  name = nil,
-  path = nil,
-  group = nil,
-  client = nil,
-  GroupID = nil,
-  Children = {},
-  Once = false,
-  Generic = false,
-  debug = false,
-  Controller = nil,
-  groupname = nil,
-  active = false,
-}
-
----
--- @field #CLIENTMENU_ID
-CLIENTMENU_ID = 0
-
---- Create an new CLIENTMENU object.
--- @param #CLIENTMENU self
--- @param Wrapper.Client#CLIENT Client The client for whom this entry is. Leave as nil for a generic entry.
--- @param #string Text Text of the F10 menu entry.
--- @param #CLIENTMENU Parent The parent menu entry.
--- @param #string Function (optional) Function to call when the entry is used.
--- @param ... (optional) Arguments for the Function, comma separated
--- @return #CLIENTMENU self 
-function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
-  -- Inherit everything from BASE class.
-  local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENU
-  CLIENTMENU_ID = CLIENTMENU_ID + 1
-  self.ID = CLIENTMENU_ID
-  if Client then
-    self.group = Client:GetGroup()
-    self.client = Client
-    self.GroupID = self.group:GetID()
-    self.groupname = self.group:GetName() or "Unknown Groupname"
-  else
-    self.Generic = true
-  end
-  self.name = Text or "unknown entry"
-  if Parent then
-    if Parent:IsInstanceOf("MENU_BASE") then
-      self.parentpath = Parent.MenuPath
-    else
-      self.parentpath = Parent:GetPath()
-      Parent:AddChild(self)
-    end
-  end
-  self.Parent = Parent
-  self.Function = Function
-  self.Functionargs = arg or {}
-  table.insert(self.Functionargs,self.group)
-  table.insert(self.Functionargs,self.client)
-  if self.Functionargs and self.debug then
-    self:T({"Functionargs",self.Functionargs})
-  end
-  if not self.Generic and self.active == false then
-    if Function ~= nil then
-      local ErrorHandler = function( errmsg )
-        env.info( "MOOSE Error in CLIENTMENU COMMAND function: " .. errmsg )
-        if BASE.Debug ~= nil then
-          env.info( BASE.Debug.traceback() )
-        end
-        return errmsg
-      end
-      self.CallHandler = function()
-      local function MenuFunction() 
-        return self.Function( unpack( self.Functionargs ) )
-      end
-        local Status, Result = xpcall( MenuFunction, ErrorHandler)
-        if self.Once == true then
-          self:Clear()
-        end
-      end
-      self.path = missionCommands.addCommandForGroup(self.GroupID,Text,self.parentpath, self.CallHandler)
-      self.active = true
-    else
-      self.path = missionCommands.addSubMenuForGroup(self.GroupID,Text,self.parentpath)
-      self.active = true
-    end
-  else
-    if self.parentpath then
-      self.path = UTILS.DeepCopy(self.parentpath)
-    else
-      self.path = {}
-    end
-    self.path[#self.path+1] = Text
-  end
-  self.UUID = table.concat(self.path,";")
-  self:T({self.UUID})
-  self.Once = false
-  -- Log id.
-  self.lid=string.format("CLIENTMENU %s | %s | ", self.ID, self.name)
-  self:T(self.lid.."Created")
-  return self
-end
-
---- Create a UUID
--- @param #CLIENTMENU self
--- @param #CLIENTMENU Parent The parent object if any
--- @param #string Text The menu entry text
--- @return #string UUID
-function CLIENTMENU:CreateUUID(Parent,Text)
-  local path = {}
-  if Parent and Parent.path then
-    path = Parent.path
-  end
-  path[#path+1] = Text
-  local UUID = table.concat(path,";")
-  return UUID
-end
-
---- Set the CLIENTMENUMANAGER for this entry.
--- @param #CLIENTMENU self
--- @param #CLIENTMENUMANAGER Controller The controlling object.
--- @return #CLIENTMENU self 
-function CLIENTMENU:SetController(Controller)
-  self.Controller = Controller
-  return self
-end
-
---- The entry will be deleted after being used used - for menu entries with functions only.
--- @param #CLIENTMENU self
--- @return #CLIENTMENU self 
-function CLIENTMENU:SetOnce()
-  self:T(self.lid.."SetOnce")
-  self.Once = true
-  return self
-end
-
---- Remove the entry from the F10 menu.
--- @param #CLIENTMENU self
--- @return #CLIENTMENU self 
-function CLIENTMENU:RemoveF10()
-  self:T(self.lid.."RemoveF10")
-  if self.GroupID then
-    --self:I(self.lid.."Removing "..table.concat(self.path,";"))
-    local function RemoveFunction()
-      return missionCommands.removeItemForGroup(self.GroupID , self.path )
-    end
-    local status, err = pcall(RemoveFunction)
-    if not status then
-      self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
-    end
-    self.active = false
-  end
-  return self
-end
-
---- Get the menu path table.
--- @param #CLIENTMENU self
--- @return #table Path
-function CLIENTMENU:GetPath()
-  self:T(self.lid.."GetPath")
-  return self.path 
-end
-
---- Get the UUID.
--- @param #CLIENTMENU self
--- @return #string UUID
-function CLIENTMENU:GetUUID()
-  self:T(self.lid.."GetUUID")
-  return self.UUID
-end
-
---- Link a child entry.
--- @param #CLIENTMENU self
--- @param #CLIENTMENU Child The entry to link as a child.
--- @return #CLIENTMENU self
-function CLIENTMENU:AddChild(Child)
-  self:T(self.lid.."AddChild "..Child.ID)
-  table.insert(self.Children,Child.ID,Child)
-  return self
-end
-
---- Remove a child entry.
--- @param #CLIENTMENU self
--- @param #CLIENTMENU Child The entry to remove from the children.
--- @return #CLIENTMENU self
-function CLIENTMENU:RemoveChild(Child)
-  self:T(self.lid.."RemoveChild "..Child.ID)
-  table.remove(self.Children,Child.ID)
-  return self
-end
-
---- Remove all subentries (children) from this entry.
--- @param #CLIENTMENU self
--- @return #CLIENTMENU self
-function CLIENTMENU:RemoveSubEntries()
-  self:T(self.lid.."RemoveSubEntries")
-  self:T({self.Children})
-  for _id,_entry in pairs(self.Children) do
-    self:T("Removing ".._id)
-    if _entry then
-      _entry:RemoveSubEntries()
-      _entry:RemoveF10()
-      if _entry.Parent then
-        _entry.Parent:RemoveChild(self)
-      end
-      --if self.Controller then
-        --self.Controller:_RemoveByID(_entry.ID)
-      --end
-      --_entry = nil
-    end
-  end
-  return self
-end
-
---- Remove this entry and all subentries (children) from this entry.
--- @param #CLIENTMENU self
--- @return #CLIENTMENU self
-function CLIENTMENU:Clear()
-  self:T(self.lid.."Clear")
-  for _id,_entry in pairs(self.Children) do
-    if _entry then
-      _entry:RemoveSubEntries()
-      _entry = nil
-    end
-  end
-  self:RemoveF10()
-  if self.Parent then
-    self.Parent:RemoveChild(self)
-  end
-  --if self.Controller then
-    --self.Controller:_RemoveByID(self.ID)
-  --end
-  return self
-end
-
--- TODO
-----------------------------------------------------------------------------------------------------------------
---
--- CLIENTMENUMANAGER
---
-----------------------------------------------------------------------------------------------------------------
-
-
---- Class CLIENTMENUMANAGER              
--- @type CLIENTMENUMANAGER
--- @field #string ClassName Class Name
--- @field #string lid Lid for log entries
--- @field #string version Version string
--- @field #string name Name
--- @field Core.Set#SET_CLIENT clientset The set of clients this menu manager is for
--- @field #table flattree
--- @field #table rootentries
--- @field #table menutree
--- @field #number entrycount
--- @field #boolean debug
--- @field #table PlayerMenu
--- @field #number Coalition
--- @extends Core.Base#BASE
-
---- *As a child my family's menu consisted of two choices: take it, or leave it.*
---
--- ===
---
--- ## CLIENTMENU and CLIENTMENUMANAGER
--- 
--- Manage menu structures for a SET_CLIENT of clients.
--- 
--- ## Concept
--- 
--- Separate creation of a menu tree structure from pushing it to each client. Create a shadow "reference" menu structure tree for your client pilot's in a mission. 
--- This can then be propagated to all clients. Manipulate the entries in the structure with removing, clearing or changing single entries, create replacement sub-structures 
--- for entries etc, push to one or all clients.
--- 
--- Many functions can either change the tree for one client or for all clients.
--- 
--- ## Conceptual remarks
--- 
--- There's a couple of things to fully understand: 
--- 
--- 1) **CLIENTMENUMANAGER** manages a set of entries from **CLIENTMENU**, it's main purpose is to administer the *shadow menu tree*, ie. a menu structure which is not 
--- (yet) visible to any client   
--- 2) The entries are **CLIENTMENU** objects, which are linked in a tree form. There's two ways to create them:   
---          A) in the manager with ":NewEntry()" which initially 
---              adds it to the shadow menu **only**   
---          B) stand-alone directly as `CLIENTMENU:NewEntry()` - here it depends on whether or not you gave a CLIENT object if the entry is created as generic entry or pushed 
---              a **specific** client. **Be aware** though that the entries are not managed by the CLIENTMANAGER before the next step!   
--- A generic entry can be added to the manager (and the shadow tree) with `:AddEntry()` - this will also push it to all clients(!) if no client is given, or a specific client only.  
--- 3) Pushing only works for alive clients.   
--- 4) Live and shadow tree entries are managed via the CLIENTMENUMANAGER object.   
--- 5) `Propagate()`refreshes the menu tree for all, or a single client.   
--- 
--- ## Create a base reference tree and send to all clients
--- 
---            local clientset = SET_CLIENT:New():FilterStart()
---            
---            local menumgr = CLIENTMENUMANAGER:New(clientset,"Dayshift")
---            local mymenu = menumgr:NewEntry("Top")
---            local mymenu_lv1a = menumgr:NewEntry("Level 1 a",mymenu)
---            local mymenu_lv1b = menumgr:NewEntry("Level 1 b",mymenu)
---            -- next one is a command menu entry, which can only be used once
---            local mymenu_lv1c = menumgr:NewEntry("Action Level 1 c",mymenu, testfunction, "testtext"):SetOnce()
---            
---            local mymenu_lv2a = menumgr:NewEntry("Go here",mymenu_lv1a)
---            local mymenu_lv2b = menumgr:NewEntry("Level 2 ab",mymenu_lv1a)
---            local mymenu_lv2c = menumgr:NewEntry("Level 2 ac",mymenu_lv1a)
---            
---            local mymenu_lv2ba = menumgr:NewEntry("Level 2 ba",mymenu_lv1b)
---            local mymenu_lv2bb = menumgr:NewEntry("Level 2 bb",mymenu_lv1b)
---            local mymenu_lv2bc = menumgr:NewEntry("Level 2 bc",mymenu_lv1b)
---            
---            local mymenu_lv3a = menumgr:NewEntry("Level 3 aaa",mymenu_lv2a)
---            local mymenu_lv3b = menumgr:NewEntry("Level 3 aab",mymenu_lv2a)
---            local mymenu_lv3c = menumgr:NewEntry("Level 3 aac",mymenu_lv2a)
---            
---            menumgr:Propagate() -- propagate **once** to all clients in the SET_CLIENT
---            
--- ## Remove a single entry's subtree
--- 
---            menumgr:RemoveSubEntries(mymenu_lv3a)
---            
- -- ## Remove a single entry and also it's subtree
--- 
---            menumgr:DeleteEntry(mymenu_lv3a)
--- 
--- ## Add a single entry
--- 
---            local baimenu = menumgr:NewEntry("BAI",mymenu_lv1b)
---            
---            menumgr:AddEntry(baimenu)  
---            
--- ## Add an entry with a function 
--- 
---            local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, Argument1, Argument1)
---            
---  Now, the class will **automatically append the call with GROUP and CLIENT objects**, as this is can only be done when pushing the entry to the clients. So, the actual function implementation needs to look like this:
---  
---            function TestFunction( Argument1, Argument2, Group, Client)
---            
---  **Caveat is**, that you need to ensure your arguments are not **nil** or **false**, as LUA will optimize those away. You would end up having Group and Client in wrong places in the function call. Hence,
---  if you need/ want to send **nil** or **false**, send a place holder instead and ensure your function can handle this, e.g.
---  
---            local baimenu = menumgr:NewEntry("Task Action", mymenu_lv1b, TestFunction, "nil", Argument1)
---     
--- ## Change the text of a leaf entry in the menu tree          
---            
---            menumgr:ChangeEntryTextForAll(mymenu_lv1b,"Attack")
---            
--- ## Reset a single clients menu tree
--- 
---            menumgr:ResetMenu(client)
---            
--- ## Reset all and clear the reference tree
--- 
---            menumgr:ResetMenuComplete()
---            
--- ## Set to auto-propagate for CLIENTs joining the SET_CLIENT **after** the script is loaded - handy if you have a single menu tree.
--- 
---            menumgr:InitAutoPropagation()
---
--- @field #CLIENTMENUMANAGER
-CLIENTMENUMANAGER = {
-  ClassName = "CLIENTMENUMANAGER",
-  lid = "",
-  version = "0.1.6",
-  name = nil,
-  clientset = nil,
-  menutree = {},
-  flattree = {},
-  playertree = {},
-  entrycount = 0,
-  rootentries = {},
-  debug = true,
-  PlayerMenu = {},
-  Coalition = nil,
-}
-
---- Create a new ClientManager instance.
--- @param #CLIENTMENUMANAGER self
--- @param Core.Set#SET_CLIENT ClientSet The set of clients to manage.
--- @param #string Alias The name of this manager.
--- @param #number Coalition (Optional) Coalition of this Manager, defaults to coalition.side.BLUE
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:New(ClientSet, Alias, Coalition)
-  -- Inherit everything from FSM class.
-  local self=BASE:Inherit(self, BASE:New()) -- #CLIENTMENUMANAGER
-  self.clientset = ClientSet
-  self.PlayerMenu = {}
-  self.name = Alias or "Nightshift"
-  self.Coalition = Coalition or coalition.side.BLUE
-    -- Log id.
-  self.lid=string.format("CLIENTMENUMANAGER %s | %s | ", self.version, self.name)
-  if self.debug then
-    self:I(self.lid.."Created")
-  end
-  return self
-end
-
---- [Internal] Event handling
--- @param #CLIENTMENUMANAGER self
--- @param Core.Event#EVENTDATA EventData
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:_EventHandler(EventData,Retry)
-  self:T(self.lid.."_EventHandler: "..EventData.id)
-  --self:I(self.lid.."_EventHandler: "..tostring(EventData.IniPlayerName))
-  if EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then
-    self:T(self.lid.."Leave event for player: "..tostring(EventData.IniPlayerName)) 
-    local Client = _DATABASE:FindClient( EventData.IniUnitName )
-    if Client then
-      self:ResetMenu(Client)
-    end
-  elseif (EventData.id == EVENTS.PlayerEnterAircraft) and EventData.IniCoalition == self.Coalition then
-    if EventData.IniPlayerName and EventData.IniGroup then
-      if (not self.clientset:IsIncludeObject(_DATABASE:FindClient( EventData.IniUnitName ))) then
-        self:T(self.lid.."Client not in SET: "..EventData.IniPlayerName)
-        if not Retry then
-          -- try again in 2 secs
-          self:ScheduleOnce(2,CLIENTMENUMANAGER._EventHandler,self,EventData,true)
-        end
-        return self
-      end
-      --self:I(self.lid.."Join event for player: "..EventData.IniPlayerName)
-      local player = _DATABASE:FindClient( EventData.IniUnitName )
-      self:Propagate(player)
-    end
-  elseif EventData.id == EVENTS.PlayerEnterUnit then
-    -- special for CA slots
-    local grp = GROUP:FindByName(EventData.IniGroupName)
-    if grp:IsGround() then
-      self:T(string.format("Player %s entered GROUND unit %s!",EventData.IniPlayerName,EventData.IniUnitName))
-      local IsPlayer = EventData.IniDCSUnit:getPlayerName()
-      if IsPlayer then
-        
-        local client=_DATABASE.CLIENTS[EventData.IniDCSUnitName] --Wrapper.Client#CLIENT
-        
-        -- Add client in case it does not exist already.
-        if not client then
-          
-          -- Debug info.
-          self:I(string.format("Player '%s' joined ground unit '%s' of group '%s'", tostring(EventData.IniPlayerName), tostring(EventData.IniDCSUnitName), tostring(EventData.IniDCSGroupName)))
-        
-          client=_DATABASE:AddClient(EventData.IniDCSUnitName)
-            
-          -- Add player.
-          client:AddPlayer(EventData.IniPlayerName)
-          
-          -- Add player.
-          if not _DATABASE.PLAYERS[EventData.IniPlayerName] then
-            _DATABASE:AddPlayer( EventData.IniUnitName, EventData.IniPlayerName )
-          end
-          
-          -- Player settings.
-          local Settings = SETTINGS:Set( EventData.IniPlayerName )
-          Settings:SetPlayerMenu(EventData.IniUnit)
-        end
-        --local player = _DATABASE:FindClient( EventData.IniPlayerName )
-        self:Propagate(client)
-      end
-    end
-  end
-  
-  return self
-end
-
---- Set this Client Manager to auto-propagate menus **once** to newly joined players. Useful if you have **one** menu structure only. Does not automatically push follow-up changes to the client(s).
--- @param #CLIENTMENUMANAGER self
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:InitAutoPropagation()
-  -- Player Events
-  self:HandleEvent(EVENTS.PlayerLeaveUnit, self._EventHandler)
-  self:HandleEvent(EVENTS.Ejection, self._EventHandler)
-  self:HandleEvent(EVENTS.Crash, self._EventHandler)
-  self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
-  self:HandleEvent(EVENTS.PlayerEnterAircraft, self._EventHandler)
-  self:HandleEvent(EVENTS.PlayerEnterUnit, self._EventHandler)
-  self:SetEventPriority(6) 
-  return self 
-end
-
---- Create a new entry in the **generic** structure.
--- @param #CLIENTMENUMANAGER self
--- @param #string Text Text of the F10 menu entry.
--- @param #CLIENTMENU Parent The parent menu entry.
--- @param #string Function (optional) Function to call when the entry is used.
--- @param ... (optional) Arguments for the Function, comma separated.
--- @return #CLIENTMENU Entry
-function CLIENTMENUMANAGER:NewEntry(Text,Parent,Function,...)
-  self:T(self.lid.."NewEntry "..Text or "None")
-  self.entrycount = self.entrycount + 1
-  local entry = CLIENTMENU:NewEntry(nil,Text,Parent,Function,unpack(arg))
-  if not Parent then
-    self.rootentries[self.entrycount] = entry
-  end
-  local depth = #entry.path
-  if not self.menutree[depth] then self.menutree[depth] = {} end
-  table.insert(self.menutree[depth],entry.UUID)
-  self.flattree[entry.UUID] = entry
-  return entry
-end
-
---- Check matching entry in the generic structure by UUID.
--- @param #CLIENTMENUMANAGER self
--- @param #string UUID UUID of the menu entry.
--- @return #boolean Exists
-function CLIENTMENUMANAGER:EntryUUIDExists(UUID)
-  local exists = self.flattree[UUID] and true or false
-  return exists
-end
-
---- Find matching entry in the generic structure by UUID.
--- @param #CLIENTMENUMANAGER self
--- @param #string UUID UUID of the menu entry.
--- @return #CLIENTMENU Entry The #CLIENTMENU object found or nil.
-function CLIENTMENUMANAGER:FindEntryByUUID(UUID)
-  self:T(self.lid.."FindEntryByUUID "..UUID or "None")
-  local entry = nil
-  for _gid,_entry in pairs(self.flattree) do
-    local Entry = _entry -- #CLIENTMENU
-    if Entry and Entry.UUID == UUID then
-      entry = Entry
-    end
-  end
-  return entry
-end
-
---- Find matching entries by text in the generic structure by UUID.
--- @param #CLIENTMENUMANAGER self
--- @param #string Text Text or partial text of the menu entry to find.
--- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
--- @return #table Table of matching UUIDs of #CLIENTMENU objects
--- @return #table Table of matching #CLIENTMENU objects
--- @return #number Number of matches
-function CLIENTMENUMANAGER:FindUUIDsByText(Text,Parent)
-  self:T(self.lid.."FindUUIDsByText "..Text or "None")
-  local matches = {}
-  local entries = {}
-  local n = 0
-  for _uuid,_entry in pairs(self.flattree) do
-    local Entry = _entry -- #CLIENTMENU
-    if Parent then
-      if Entry and string.find(Entry.name,Text,1,true) and string.find(Entry.UUID,Parent.UUID,1,true) then
-        table.insert(matches,_uuid)
-        table.insert(entries,Entry )
-        n=n+1
-      end
-    else
-      if Entry and string.find(Entry.name,Text,1,true) then
-        table.insert(matches,_uuid)
-        table.insert(entries,Entry )
-        n=n+1
-      end
-    end
-  end
-  return matches, entries, n
-end
-
---- Find matching entries in the generic structure by the menu text.
--- @param #CLIENTMENUMANAGER self
--- @param #string Text Text or partial text of the F10 menu entry.
--- @param #CLIENTMENU Parent (Optional) Only find entries under this parent entry.
--- @return #table Table of matching #CLIENTMENU objects.
--- @return #number Number of matches
-function CLIENTMENUMANAGER:FindEntriesByText(Text,Parent)
-  self:T(self.lid.."FindEntriesByText "..Text or "None")
-  local matches, objects, number = self:FindUUIDsByText(Text, Parent)
-  return objects, number
-end
-
---- Find matching entries under a parent in the generic structure by UUID.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Parent Find entries under this parent entry.
--- @return #table Table of matching UUIDs of #CLIENTMENU objects
--- @return #table Table of matching #CLIENTMENU objects
--- @return #number Number of matches
-function CLIENTMENUMANAGER:FindUUIDsByParent(Parent)
-  self:T(self.lid.."FindUUIDsByParent")
-  local matches = {}
-  local entries = {}
-  local n = 0
-  for _uuid,_entry in pairs(self.flattree) do
-    local Entry = _entry -- #CLIENTMENU
-    if Parent then
-      if Entry and string.find(Entry.UUID,Parent.UUID,1,true) then
-        table.insert(matches,_uuid)
-        table.insert(entries,Entry )
-        n=n+1
-      end
-    end
-  end
-  return matches, entries, n
-end
-
---- Find matching entries in the generic structure under a parent.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Parent Find entries under this parent entry.
--- @return #table Table of matching #CLIENTMENU objects.
--- @return #number Number of matches
-function CLIENTMENUMANAGER:FindEntriesByParent(Parent)
-  self:T(self.lid.."FindEntriesByParent")
-  local matches, objects, number = self:FindUUIDsByParent(Parent)
-  return objects, number
-end
-
---- Alter the text of a leaf entry in the generic structure and push to one specific client's F10 menu.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The menu entry.
--- @param #string Text New Text of the F10 menu entry.
--- @param Wrapper.Client#CLIENT Client (optional) The client for whom to alter the entry, if nil done for all clients.
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:ChangeEntryText(Entry, Text, Client)
-  self:T(self.lid.."ChangeEntryText "..Text or "None")
-  local newentry = CLIENTMENU:NewEntry(nil,Text,Entry.Parent,Entry.Function,unpack(Entry.Functionargs))
-  self:DeleteF10Entry(Entry,Client)
-  self:DeleteGenericEntry(Entry)
-  if not Entry.Parent then
-    self.rootentries[self.entrycount] = newentry
-  end
-  local depth = #newentry.path
-  if not self.menutree[depth] then self.menutree[depth] = {} end
-  table.insert(self.menutree[depth],newentry.UUID)
-  self.flattree[newentry.UUID] = newentry
-  self:AddEntry(newentry,Client)
-  return self
-end
-
---- Push the complete menu structure to each of the clients in the set - refresh the menu tree of the clients.
--- @param #CLIENTMENUMANAGER self
--- @param Wrapper.Client#CLIENT Client (optional) If given, propagate only for this client.
--- @return #CLIENTMENU Entry
-function CLIENTMENUMANAGER:Propagate(Client)
-  self:T(self.lid.."Propagate")
-  --self:I(UTILS.PrintTableToLog(Client,1))
-  local knownunits = {} -- track so we can ID multi seated
-  local Set = self.clientset.Set
-  if Client then
-    Set = {Client}
-  end
-  self:ResetMenu(Client)
-  for _,_client in pairs(Set) do
-    local client = _client -- Wrapper.Client#CLIENT
-    if client and client:IsAlive() then
-      local playerunit = client:GetName()
-      --local playergroup = client:GetGroup()
-      local playername = client:GetPlayerName() or "none"
-      if not knownunits[playerunit] then
-        knownunits[playerunit] = true
-      else
-        self:I("Player in multi seat unit: "..playername)
-        break -- multi seat already build
-      end
-      if not self.playertree[playername] then
-        self.playertree[playername] = {}
-      end
-      for level,branch in pairs (self.menutree) do
-        self:T("Building branch:" .. level)
-        for _,leaf in pairs(branch) do
-          self:T("Building leaf:" .. leaf)
-          local entry = self:FindEntryByUUID(leaf)
-          if entry then
-            self:T("Found generic entry:" .. entry.UUID)
-            local parent = nil
-            if entry.Parent and entry.Parent.UUID then
-              parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
-            end
-            self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
-            self.playertree[playername][entry.UUID].Once = entry.Once
-          else
-            self:T("NO generic entry for:" .. leaf)
-          end  
-        end
-      end
-    end
-  end
-  return self
-end
-
---- Push a single previously created entry into the F10 menu structure of all clients.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The entry to add.
--- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. 
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:AddEntry(Entry,Client)
-  self:T(self.lid.."AddEntry")
-  local Set = self.clientset.Set
-  local knownunits = {}
-  if Client then
-    Set = {Client}
-  end
-  for _,_client in pairs(Set) do
-    local client = _client -- Wrapper.Client#CLIENT
-    if client and client:IsAlive() then
-      local playername = client:GetPlayerName() or "None"
-      local unitname = client:GetName()
-      if not knownunits[unitname] then
-        knownunits[unitname] = true
-      else
-        self:I("Player in multi seat unit: "..playername)  
-        break
-      end
-      if Entry then
-        self:T("Adding generic entry:" .. Entry.UUID)
-        local parent = nil
-        if not self.playertree[playername] then
-          self.playertree[playername] = {}
-        end
-        if Entry.Parent and Entry.Parent.UUID then
-          parent = self.playertree[playername][Entry.Parent.UUID] or self:FindEntryByUUID(Entry.Parent.UUID)
-        end
-        self.playertree[playername][Entry.UUID] = CLIENTMENU:NewEntry(client,Entry.name,parent,Entry.Function,unpack(Entry.Functionargs))
-        self.playertree[playername][Entry.UUID].Once = Entry.Once
-      else
-        self:T("NO generic entry given")
-      end 
-    end
-  end
-  return self
-end
-
---- Blank out the menu - remove **all root entries** and all entries below from the client's F10 menus, leaving the generic structure untouched.
--- @param #CLIENTMENUMANAGER self
--- @param Wrapper.Client#CLIENT Client (optional) If given, remove only for this client.
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:ResetMenu(Client)
-  self:T(self.lid.."ResetMenu")
-  for _,_entry in pairs(self.rootentries) do
-    --local RootEntry = self.structure.generic[_entry]
-    if _entry then
-      self:DeleteF10Entry(_entry,Client)
-    end
-  end
-  return self
-end
-
---- Blank out the menu - remove **all root entries** and all entries below from all clients' F10 menus, and **delete** the generic structure.
--- @param #CLIENTMENUMANAGER self
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:ResetMenuComplete()
-  self:T(self.lid.."ResetMenuComplete")
-  for _,_entry in pairs(self.rootentries) do
-    --local RootEntry = self.structure.generic[_entry]
-    if _entry then
-      self:DeleteF10Entry(_entry)
-    end
-  end
-  self.playertree = nil
-  self.playertree = {}
-  self.rootentries = nil
-  self.rootentries = {}
-  self.menutree = nil
-  self.menutree = {}
-  return self
-end
-
---- Remove the entry and all entries below the given entry from the client's F10 menus.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The entry to remove
--- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. 
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:DeleteF10Entry(Entry,Client)
-  self:T(self.lid.."DeleteF10Entry")
-  local Set = self.clientset.Set
-  if Client then
-    Set = {Client}
-  end
-  for _,_client in pairs(Set) do
-    if _client and _client:IsAlive() then
-      local playername = _client:GetPlayerName()
-      if self.playertree[playername] then
-        local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
-        if centry then
-          --self:I("Match for "..Entry.UUID)
-          centry:Clear()
-        end
-      end
-    end
-  end
-  return self
-end
-
---- Remove the entry and all entries below the given entry from the generic tree.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The entry to remove
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:DeleteGenericEntry(Entry)
-  self:T(self.lid.."DeleteGenericEntry")
-  
-  if Entry.Children and #Entry.Children > 0 then
-    self:RemoveGenericSubEntries(Entry)
-  end
-  
-  local depth = #Entry.path
-  local uuid = Entry.UUID
-  
-  local tbl = UTILS.DeepCopy(self.menutree)
-  
-  if tbl[depth] then
-    for i=depth,#tbl do
-      --self:I("Level = "..i)
-      for _id,_uuid in pairs(tbl[i]) do
-        self:T(_uuid)
-        if string.find(_uuid,uuid,1,true) or _uuid == uuid then
-          --self:I("Match for ".._uuid)
-          self.menutree[i][_id] = nil
-          self.flattree[_uuid] = nil
-        end  
-      end 
-    end
-  end
-  
-  return self
-end
-
---- Remove all entries below the given entry from the generic tree.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The entry where to start. This entry stays.
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:RemoveGenericSubEntries(Entry)
-  self:T(self.lid.."RemoveGenericSubEntries")
-  
-  local depth = #Entry.path + 1
-  local uuid = Entry.UUID
-  
-  local tbl = UTILS.DeepCopy(self.menutree)
-  
-  if tbl[depth] then
-    for i=depth,#tbl do
-      self:T("Level = "..i)
-      for _id,_uuid in pairs(tbl[i]) do
-        self:T(_uuid)
-        if string.find(_uuid,uuid,1,true) then
-          self:T("Match for ".._uuid)
-          self.menutree[i][_id] = nil
-          self.flattree[_uuid] = nil
-        end  
-      end 
-    end
-  end  
-  return self
-end
-
-
---- Remove all entries below the given entry from the client's F10 menus.
--- @param #CLIENTMENUMANAGER self
--- @param #CLIENTMENU Entry The entry where to start. This entry stays.
--- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. In this case the generic structure will not be touched.
--- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:RemoveF10SubEntries(Entry,Client)
-  self:T(self.lid.."RemoveSubEntries")
-  local Set = self.clientset.Set
-  if Client then
-    Set = {Client}
-  end
-  for _,_client in pairs(Set) do
-    if _client and _client:IsAlive() then
-      local playername = _client:GetPlayerName()
-      if self.playertree[playername] then
-        local centry = self.playertree[playername][Entry.UUID] -- #CLIENTMENU
-        centry:RemoveSubEntries()
-      end
-    end
-  end
-  return self
-end
-
-----------------------------------------------------------------------------------------------------------------
---
--- End ClientMenu
---
-----------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Core/Database.lua

@@ -1112,7 +1112,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
           self:E("WARNING: Invalid STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
         else
           self.STNS[stn] = UnitTemplate.name
-          self:I("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
+          self:T("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
         end
       end
       if UnitTemplate.AddPropAircraft.SADL_TN then
@@ -1121,7 +1121,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
           self:E("WARNING: Invalid SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
         else
           self.SADL[sadl] = UnitTemplate.name
-          self:I("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
+          self:T("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
         end
       end  
     end
@@ -1382,7 +1382,7 @@ function DATABASE:GetCoalitionFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CoalitionID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil
 end
 
@@ -1394,7 +1394,7 @@ function DATABASE:GetCategoryFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CategoryID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil
 end
 
@@ -1406,7 +1406,7 @@ function DATABASE:GetCountryFromClientTemplate( ClientName )
   if self.Templates.ClientsByName[ClientName] then  
     return self.Templates.ClientsByName[ClientName].CountryID
   end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  self:T("WARNING: Template does not exist for client "..tostring(ClientName))
   return nil  
 end
 

Moose Development/Moose/Core/Fsm.lua

@@ -79,7 +79,7 @@
 
 do -- FSM
 
-  -- @type FSM
+  --- @type FSM
   -- @field #string ClassName Name of the class.
   -- @field Core.Scheduler#SCHEDULER CallScheduler Call scheduler.
   -- @field #table options Options.
@@ -949,8 +949,7 @@ end
 
 do -- FSM_CONTROLLABLE
 
-  ---
-  -- @type FSM_CONTROLLABLE
+  --- @type FSM_CONTROLLABLE
   -- @field Wrapper.Controllable#CONTROLLABLE Controllable
   -- @extends Core.Fsm#FSM
 
@@ -1083,8 +1082,7 @@ end
 
 do -- FSM_PROCESS
 
-  ---
-  -- @type FSM_PROCESS
+  --- @type FSM_PROCESS
   -- @field Tasking.Task#TASK Task
   -- @extends Core.Fsm#FSM_CONTROLLABLE
 

Moose Development/Moose/Core/Goal.lua

@@ -24,7 +24,7 @@
 
 do -- Goal
 
-  -- @type GOAL
+  --- @type GOAL
   -- @extends Core.Fsm#FSM
 
   --- Models processes that have an objective with a defined achievement. Derived classes implement the ways how the achievements can be realized.
@@ -71,10 +71,10 @@ do -- Goal
     ClassName = "GOAL",
   }
 
-  -- @field #table GOAL.Players
+  --- @field #table GOAL.Players
   GOAL.Players = {}
 
-  -- @field #number GOAL.TotalContributions
+  --- @field #number GOAL.TotalContributions
   GOAL.TotalContributions = 0
 
   --- GOAL Constructor.
@@ -145,7 +145,7 @@ do -- Goal
     self.TotalContributions = self.TotalContributions + 1
   end
 
-  -- @param #GOAL self
+  --- @param #GOAL self
   -- @param #number Player contribution.
   function GOAL:GetPlayerContribution( PlayerName )
     return self.Players[PlayerName] or 0

Moose Development/Moose/Core/MarkerOps_Base.lua

@@ -50,7 +50,7 @@ MARKEROPS_BASE = {
   ClassName = "MARKEROPS",
   Tag = "mytag",
   Keywords = {},
-  version = "0.1.3",
+  version = "0.1.4",
   debug = false,
   Casesensitive = true,
 }
@@ -154,14 +154,7 @@ function MARKEROPS_BASE:OnEventMark(Event)
       self:E("Skipping onEvent. Event or Event.idx unknown.")
       return true
     end
-    --position
-    local vec3={y=Event.pos.y, x=Event.pos.x, z=Event.pos.z}
-    local coord=COORDINATE:NewFromVec3(vec3)
-    if self.debug then
-      local coordtext = coord:ToStringLLDDM()
-      local text = tostring(Event.text)
-      local m = MESSAGE:New(string.format("Mark added at %s with text: %s",coordtext,text),10,"Info",false):ToAll()
-    end
+
     local coalition = Event.MarkCoalition
     -- decision
     if Event.id==world.event.S_EVENT_MARK_ADDED then
@@ -170,8 +163,14 @@ function MARKEROPS_BASE:OnEventMark(Event)
       local Eventtext = tostring(Event.text)
       if Eventtext~=nil then
         if self:_MatchTag(Eventtext) then
-         local matchtable = self:_MatchKeywords(Eventtext)
-         self:MarkAdded(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
+          local coord=COORDINATE:NewFromVec3({y=Event.pos.y, x=Event.pos.x, z=Event.pos.z})
+          if self.debug then
+            local coordtext = coord:ToStringLLDDM()
+            local text = tostring(Event.text)
+            local m = MESSAGE:New(string.format("Mark added at %s with text: %s",coordtext,text),10,"Info",false):ToAll()
+          end
+          local matchtable = self:_MatchKeywords(Eventtext)
+          self:MarkAdded(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
         end
       end
     elseif Event.id==world.event.S_EVENT_MARK_CHANGE then
@@ -180,8 +179,14 @@ function MARKEROPS_BASE:OnEventMark(Event)
       local Eventtext = tostring(Event.text)
       if Eventtext~=nil then
         if self:_MatchTag(Eventtext) then
-         local matchtable = self:_MatchKeywords(Eventtext)
-         self:MarkChanged(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
+           local coord=COORDINATE:NewFromVec3({y=Event.pos.y, x=Event.pos.x, z=Event.pos.z})
+           if self.debug then
+              local coordtext = coord:ToStringLLDDM()
+              local text = tostring(Event.text)
+              local m = MESSAGE:New(string.format("Mark changed at %s with text: %s",coordtext,text),10,"Info",false):ToAll()
+           end
+           local matchtable = self:_MatchKeywords(Eventtext)
+           self:MarkChanged(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
         end
       end
     elseif Event.id==world.event.S_EVENT_MARK_REMOVED then

Moose Development/Moose/Core/Message.lua

@@ -452,7 +452,7 @@ 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 #string PathToSRS (optional) Path to SRS TTS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone\\ExternalAudio" 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.
 -- @param #number Frequency Frequency in MHz. Can also be given as a #table of frequencies.
@@ -468,13 +468,13 @@ _MESSAGESRS = {}
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
---          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
 --          
 function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate,Backend)
   
-  _MESSAGESRS.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  _MESSAGESRS.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio"
   
   _MESSAGESRS.frequency = Frequency or MSRS.frequencies or 243
   _MESSAGESRS.modulation = Modulation or MSRS.modulations or radio.modulation.AM
@@ -535,7 +535,7 @@ end
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
---          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
 --          
@@ -567,7 +567,7 @@ end
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
---          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.BLUE)
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSBlue()
 --          
@@ -589,7 +589,7 @@ end
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
---          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.RED)
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.RED)
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSRed()
 --          
@@ -611,7 +611,7 @@ end
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
---          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.NEUTRAL)
+--          MESSAGE.SetMSRS("D:\\Program Files\\DCS-SimpleRadio-Standalone\\ExternalAudio",5012,nil,127,radio.modulation.FM,"female","en-US",nil,coalition.side.NEUTRAL)
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRSAll()
 --          

Moose Development/Moose/Core/Point.lua

@@ -777,7 +777,9 @@ do -- COORDINATE
   -- @return DCS#Vec2 Vec2
   function COORDINATE:GetRandomVec2InRadius( OuterRadius, InnerRadius )
     self:F2( { OuterRadius, InnerRadius } )
-
+    math.random()
+    math.random()
+    math.random()
     local Theta = 2 * math.pi * math.random()
     local Radials = math.random() + math.random()
     if Radials > 1 then
@@ -837,6 +839,26 @@ do -- COORDINATE
     return land.getHeight( Vec2 )
   end
 
+  --- Returns a table of DCS#Vec3 points representing the terrain profile between two points.
+  -- @param #COORDINATE self
+  -- @param Destination DCS#Vec3 Ending point of the profile.
+  -- @return #table DCS#Vec3 table of the profile
+  function COORDINATE:GetLandProfileVec3(Destination)
+    return land.profile(self:GetVec3(), Destination)
+  end
+
+  --- Returns a table of #COORDINATE representing the terrain profile between two points.
+  -- @param #COORDINATE self
+  -- @param Destination #COORDINATE Ending coordinate of the profile.
+  -- @return #table #COORDINATE table of the profile
+  function COORDINATE:GetLandProfileCoordinates(Destination)
+    local points = self:GetLandProfileVec3(Destination:GetVec3())
+    local coords = {}
+    for _, point in ipairs(points) do
+      table.insert(coords, COORDINATE:NewFromVec3(point))
+    end
+    return coords
+  end
 
   --- Set the heading of the coordinate, if applicable.
   -- @param #COORDINATE self
@@ -3798,6 +3820,25 @@ do -- COORDINATE
     return COORDINATE:NewFromVec3( self:GetRandomVec3InRadius( OuterRadius, InnerRadius ) )
   end
 
+
+--- Search for clear zones in a given area. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #number SearchRadius Radius of the search area.
+-- @param #number PosRadius Required clear radius around each position.
+-- @param #number NumPositions Number of positions to find.
+-- @return #table A table of Core.Point#COORDINATE that are clear of map objects within the given PosRadius. nil if no positions are found.
+  function COORDINATE:GetSimpleZones(SearchRadius, PosRadius, NumPositions)
+    local clearPositions = UTILS.GetSimpleZones(self:GetVec3(), SearchRadius, PosRadius, NumPositions)
+    if clearPositions and #clearPositions > 0 then
+        local coords = {}
+        for _, pos in pairs(clearPositions) do
+          local coord = COORDINATE:NewFromVec2(pos)
+          table.insert(coords, coord)
+        end
+        return coords
+    end
+    return nil
+  end
+
 end
 
 do 

Moose Development/Moose/Core/Report.lua

@@ -15,8 +15,7 @@
 -- @module Core.Report
 -- @image Core_Report.JPG
 
----
--- @type REPORT
+--- @type REPORT
 -- @extends Core.Base#BASE
 
 --- Provides a handy means to create messages and reports.

Moose Development/Moose/Core/ScheduleDispatcher.lua

@@ -1,4 +1,4 @@
----- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
+--- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
 --
 -- ===
 --
@@ -175,7 +175,7 @@ function SCHEDULEDISPATCHER:AddSchedule( Scheduler, ScheduleFunction, ScheduleAr
     local Name = Info.name or "?"
 
     local ErrorHandler = function( errmsg )
-      env.info( "Error in timer function: " .. errmsg )
+      env.info( "Error in timer function: " .. errmsg or "" )
       if BASE.Debug ~= nil then
         env.info( BASE.Debug.traceback() )
       end

Moose Development/Moose/Core/Set.lua

@@ -959,6 +959,25 @@ do -- SET_BASE
     return ObjectNames
   end
   
+    --- Get a *new* set table that only contains alive objects.
+  -- @param #SET_BASE self
+  -- @return #table Set table of alive objects.
+  function SET_BASE:GetAliveSet()
+    --self:F2()
+
+    local AliveSet = {}
+    -- Clean the Set before returning with only the alive Objects.
+    for ObjectName, Object in pairs( self.Set ) do
+      if Object then
+        if Object:IsAlive() then
+          AliveSet[#AliveSet+1] = Object
+        end
+      end
+    end
+
+    return AliveSet or {}
+  end
+  
 end
 
 do 
@@ -1125,25 +1144,25 @@ do
     
   end
   
-  --- Get a *new* set that only contains alive groups.
+  --- Get a *new* set table that only contains alive groups.
   -- @param #SET_GROUP self
-  -- @return #SET_GROUP Set of alive groups.
+  -- @return #table Set of alive groups.
   function SET_GROUP:GetAliveSet()
     --self:F2()
 
-    local AliveSet = SET_GROUP:New()
-
+    --local AliveSet = SET_GROUP:New()
+    local AliveSet = {}
     -- Clean the Set before returning with only the alive Groups.
     for GroupName, GroupObject in pairs( self.Set ) do
       local GroupObject = GroupObject -- Wrapper.Group#GROUP
       if GroupObject then
         if GroupObject:IsAlive() then
-          AliveSet:Add( GroupName, GroupObject )
+          AliveSet[GroupName] = GroupObject
         end
       end
     end
 
-    return AliveSet.Set or {}
+    return AliveSet or {}
   end
 
   --- Returns a report of of unit types.
@@ -2595,7 +2614,7 @@ do -- SET_UNIT
   
   --- Gets the alive set.
   -- @param #SET_UNIT self
-  -- @return #table Table of SET objects
+  -- @return #table Table of alive UNIT objects
   -- @return #SET_UNIT AliveSet 
   function SET_UNIT:GetAliveSet()
 
@@ -2603,10 +2622,8 @@ do -- SET_UNIT
 
     -- Clean the Set before returning with only the alive Groups.
     for GroupName, GroupObject in pairs(self.Set) do       
-      local GroupObject=GroupObject --Wrapper.Client#CLIENT
-      
       if GroupObject and GroupObject:IsAlive() then      
-        AliveSet:Add(GroupName, GroupObject)
+        AliveSet[GroupName] = GroupObject
       end
     end
 
@@ -4784,18 +4801,16 @@ do -- SET_CLIENT
   -- @return #table Table of SET objects
   function SET_CLIENT:GetAliveSet()
 
-    local AliveSet = SET_CLIENT:New()
+    local AliveSet = {}
 
     -- Clean the Set before returning with only the alive Groups.
     for GroupName, GroupObject in pairs(self.Set) do      
-      local GroupObject=GroupObject --Wrapper.Client#CLIENT
-      
       if GroupObject and GroupObject:IsAlive() then      
-        AliveSet:Add(GroupName, GroupObject)
+        AliveSet[GroupName] = GroupObject
       end
     end
 
-    return AliveSet.Set or {}
+    return AliveSet or {}
   end
 
   --- [User] Add a custom condition function.
@@ -6676,6 +6691,8 @@ do -- SET_ZONE
   --          
   --          -- Stop watching after 1 hour
   --          zoneset:__TriggerStop(3600)
+  --          -- Call :SetPartlyInside() on any zone (or SET_ZONE) if you want GROUPs to count as inside when any of their units enters even if they are far apart.
+  --          -- Make sure to call :SetPartlyInside() before :Trigger()!.
   function SET_ZONE:Trigger(Objects)
     --self:I("Added Set_Zone Trigger")
     self:AddTransition("*","TriggerStart","TriggerRunning")
@@ -6726,6 +6743,20 @@ do -- SET_ZONE
     -- @param Core.Zone#ZONE_BASE Zone The zone left.
   end
   
+  --- Toggle “partly-inside” handling for every zone in the set when those zones are used with :Trigger().
+  -- * Call with no argument or **true** → enable for all.  
+  -- * Call with **false** → disable again (handy if it was enabled before).
+  -- @param #SET_ZONE self
+  -- @return #SET_ZONE self
+  function SET_ZONE:SetPartlyInside(state)
+    for _,Zone in pairs(self.Set) do
+        if Zone.SetPartlyInside then
+            Zone:SetPartlyInside(state)
+        end
+    end
+    return self
+  end
+  
   --- (Internal) Check the assigned objects for being in/out of the zone
   -- @param #SET_ZONE self
   -- @param #boolean fromstart If true, do the init of the objects
@@ -6761,8 +6792,13 @@ do -- SET_ZONE
               -- has not been tagged previously - wasn't in set! 
               obj.TriggerInZone[_zone.ZoneName] = false 
             end
-            -- is obj in zone?
-            local inzone = _zone:IsCoordinateInZone(obj:GetCoordinate())
+            -- is obj in this zone?
+            local inzone
+            if _zone.PartlyInside and obj.ClassName == "GROUP" then
+                inzone = obj:IsAnyInZone(_zone)                 -- TRUE as soon as any unit is inside
+            else
+                inzone = _zone:IsCoordinateInZone(obj:GetCoordinate())  -- original centroid test
+            end
             --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone))
             if inzone and not obj.TriggerInZone[_zone.ZoneName] then
               -- wasn't in zone before

Moose Development/Moose/Core/SpawnStatic.lua

@@ -149,6 +149,7 @@ function SPAWNSTATIC:NewFromStatic(SpawnTemplateName, SpawnCountryID)
     self.CategoryID          = CategoryID
     self.CoalitionID         = CoalitionID
     self.SpawnIndex          = 0
+    self.StaticCopyFrom      = SpawnTemplateName
   else
     error( "SPAWNSTATIC:New: There is no static declared in the mission editor with SpawnTemplatePrefix = '" .. tostring(SpawnTemplateName) .. "'" )
   end
@@ -302,12 +303,16 @@ end
 -- @param #number CallsignID Callsign ID. Default 1 (="London").
 -- @param #number Frequency Frequency in MHz. Default 127.5 MHz.
 -- @param #number Modulation Modulation 0=AM, 1=FM.
+-- @param #boolean DynamicSpawns If true, allow Dynamic Spawns
+-- @param #boolean DynamicHotStarts If true, and DynamicSpawns is true, then allow Dynamic Spawns with hot starts.
 -- @return #SPAWNSTATIC self
-function SPAWNSTATIC:InitFARP(CallsignID, Frequency, Modulation)
+function SPAWNSTATIC:InitFARP(CallsignID, Frequency, Modulation, DynamicSpawns,DynamicHotStarts)
   self.InitFarp=true
   self.InitFarpCallsignID=CallsignID or 1
   self.InitFarpFreq=Frequency or 127.5
   self.InitFarpModu=Modulation or 0
+  self.InitFarpDynamicSpawns = DynamicSpawns
+  self.InitFarpDynamicHotStarts = (DynamicSpawns == true and DynamicHotStarts == true) and true or nil
   return self
 end
 
@@ -551,12 +556,20 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     TemplateGroup.y=Template.y
     TemplateGroup.name=Template.name
     
+    if self.InitFarpDynamicSpawns == true then
+      TemplateGroup.units[1].dynamicSpawn = true
+      if self.InitFarpDynamicHotStarts == true then
+        TemplateGroup.units[1].allowHotStart = true
+      end
+    end
+
     self:T("Spawning FARP")
     self:T({Template=Template})
     self:T({TemplateGroup=TemplateGroup})
 
     -- ED's dirty way to spawn FARPS.
     Static=coalition.addGroup(CountryID, -1, TemplateGroup)
+    --Static=coalition.addStaticObject(CountryID, Template)
     
     -- Currently DCS 2.8 does not trigger birth events if FARPS are spawned!
     -- We create such an event. The airbase is registered in Core.Event
@@ -596,5 +609,18 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     self:ScheduleOnce(0.3, self.SpawnFunctionHook, mystatic, unpack(self.SpawnFunctionArguments))
   end
   
+  if self.StaticCopyFrom ~= nil then
+    mystatic.StaticCopyFrom = self.StaticCopyFrom
+    if not _DATABASE.Templates.Statics[Template.name] then
+      local TemplateGroup={}
+      TemplateGroup.units={}
+      TemplateGroup.units[1]=Template
+      TemplateGroup.x=Template.x
+      TemplateGroup.y=Template.y
+      TemplateGroup.name=Template.name
+      _DATABASE:_RegisterStaticTemplate( TemplateGroup, self.CoalitionID, self.CategoryID, CountryID )
+    end
+  end
+  
   return mystatic
 end

Moose Development/Moose/Core/UserFlag.lua

@@ -18,7 +18,7 @@
 
 do -- UserFlag
 
-  -- @type USERFLAG
+  --- @type USERFLAG
   -- @field #string ClassName Name of the class
   -- @field #string UserFlagName Name of the flag.
   -- @extends Core.Base#BASE

Moose Development/Moose/Core/Velocity.lua

@@ -20,7 +20,7 @@
 
 do -- Velocity
 
-  -- @type VELOCITY
+  --- @type VELOCITY
   -- @extends Core.Base#BASE
 
 
@@ -127,7 +127,7 @@ end
 
 do -- VELOCITY_POSITIONABLE
 
-  -- @type VELOCITY_POSITIONABLE
+  --- @type VELOCITY_POSITIONABLE
   -- @extends Core.Base#BASE
 
 

Moose Development/Moose/Core/Zone.lua

@@ -70,6 +70,7 @@
 -- @field #table Table of any trigger zone properties from the ME. The key is the Name of the property, and the value is the property's Value.
 -- @field #number Surface Type of surface. Only determined at the center of the zone!
 -- @field #number Checktime Check every Checktime seconds, used for ZONE:Trigger()
+-- @field #boolean PartlyInside When called, a GROUP is considered inside as soon as any of its units enters the zone even if they are far apart.
 -- @extends Core.Fsm#FSM
 
 
@@ -534,6 +535,19 @@ function ZONE_BASE:GetZoneProbability()
   return self.ZoneProbability
 end
 
+--- Get the coordinate on the radius of the zone nearest to Outsidecoordinate. Useto e.g. find an ingress point.
+-- @param #ZONE_BASE self
+-- @param Core.Point#COORDINATE Outsidecoordinate The coordinate outside of the zone from where to look.
+-- @return Core.Point#COORDINATE CoordinateOnRadius
+function ZONE_BASE:FindNearestCoordinateOnRadius(Outsidecoordinate)
+  local Vec1 = self:GetVec2()
+  local Radius = self:GetRadius()
+  local Vec2 = Outsidecoordinate:GetVec2()
+  local Point = UTILS.FindNearestPointOnCircle(Vec1,Radius,Vec2)
+  local rc = COORDINATE:NewFromVec2(Point)
+  return rc
+end
+
 --- Get the zone taking into account the randomization probability of a zone to be selected.
 -- @param #ZONE_BASE self
 -- @return #ZONE_BASE The zone is selected taking into account the randomization probability factor.
@@ -599,6 +613,8 @@ end
 --
 --            -- Stop watching the zone after 1 hour
 --           triggerzone:__TriggerStop(3600)
+--            -- Call :SetPartlyInside() if you use SET_GROUP to count as inside when any of their units enters even when they are far apart.
+--            -- Make sure to call :SetPartlyInside() before :Trigger()!
 function ZONE_BASE:Trigger(Objects)
   --self:I("Added Zone Trigger")
   self:SetStartState("TriggerStopped")
@@ -667,6 +683,16 @@ function ZONE_BASE:Trigger(Objects)
   
 end
 
+  --- Toggle “partly-inside” handling for this zone. To be used before :Trigger().
+  -- * Default:* flag is **false** until you call the method.  
+  -- * Call with no argument or with **true** → enable.  
+  -- * Call with **false** → disable again (handy if it was enabled before).
+  -- @param #ZONE_BASE self
+  -- @return #ZONE_BASE self
+  function ZONE_BASE:SetPartlyInside(state)
+  self.PartlyInside = state or not ( state == false )
+  return self
+  end
 --- (Internal) Check the assigned objects for being in/out of the zone
 -- @param #ZONE_BASE self
 -- @param #boolean fromstart If true, do the init of the objects
@@ -705,7 +731,12 @@ function ZONE_BASE:_TriggerCheck(fromstart)
           obj.TriggerInZone[self.ZoneName] = false
         end
         -- is obj in zone?
-        local inzone = self:IsCoordinateInZone(obj:GetCoordinate())
+        local inzone
+        if self.PartlyInside and obj.ClassName == "GROUP" then
+            inzone = obj:IsAnyInZone(self)                     -- TRUE if any unit is inside
+        else
+            inzone = self:IsCoordinateInZone(obj:GetCoordinate()) -- original barycentre test
+        end
         --self:I("Object "..obj:GetName().." is in zone: "..tostring(inzone))
         if inzone and obj.TriggerInZone[self.ZoneName] then
           -- just count
@@ -1509,6 +1540,26 @@ function ZONE_RADIUS:IsVec3InZone( Vec3 )
   return InZone
 end
 
+--- Search for clear ground spawn zones within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_RADIUS self
+-- @param #number PosRadius Required clear radius around each position.
+-- @param #number NumPositions Number of positions to find.
+-- @return #table A table of DCS#Vec2 positions that are clear of map objects within the given PosRadius. nil if no clear positions are found.
+function ZONE_RADIUS:GetClearZonePositions(PosRadius, NumPositions)
+    return UTILS.GetClearZonePositions(self, PosRadius, NumPositions)
+end
+
+
+--- Search for a random clear ground spawn coordinate within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_RADIUS self
+-- @param #number PosRadius (Optional) Required clear radius around each position. (Default is math.min(Radius/10, 200))
+-- @param #number NumPositions (Optional) Number of positions to find. (Default 50)
+-- @return Core.Point#COORDINATE A random coordinate for a clear zone. nil if no clear positions are found.
+-- @return #number Assigned radius for the found zones. nil if no clear positions are found.
+function ZONE_RADIUS:GetRandomClearZoneCoordinate(PosRadius, NumPositions)
+    return UTILS.GetRandomClearZoneCoordinate(self, PosRadius, NumPositions)
+end
+
 --- Returns a random Vec2 location within the zone.
 -- @param #ZONE_RADIUS self
 -- @param #number inner (Optional) Minimal distance from the center of the zone. Default is 0.
@@ -1521,6 +1572,10 @@ function ZONE_RADIUS:GetRandomVec2(inner, outer, surfacetypes)
   local _inner = inner or 0
   local _outer = outer or self:GetRadius()
   
+  math.random()
+  math.random()
+  math.random()
+
   if surfacetypes and type(surfacetypes)~="table" then
     surfacetypes={surfacetypes}
   end
@@ -2487,6 +2542,26 @@ function ZONE_POLYGON_BASE:Flush()
   return self
 end
 
+--- Search for clear ground spawn zones within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_POLYGON_BASE self
+-- @param #number PosRadius Required clear radius around each position.
+-- @param #number NumPositions Number of positions to find.
+-- @return #table A table of DCS#Vec2 positions that are clear of map objects within the given PosRadius. nil if no clear positions are found.
+function ZONE_POLYGON_BASE:GetClearZonePositions(PosRadius, NumPositions)
+    return UTILS.GetClearZonePositions(self, PosRadius, NumPositions)
+end
+
+
+--- Search for a random clear ground spawn coordinate within this zone. A powerful and efficient function using Disposition to find clear areas for spawning ground units avoiding trees, water and map scenery.
+-- @param #ZONE_POLYGON_BASE self
+-- @param #number PosRadius (Optional) Required clear radius around each position. (Default is math.min(Radius/10, 200))
+-- @param #number NumPositions (Optional) Number of positions to find. (Default 50)
+-- @return Core.Point#COORDINATE A random coordinate for a clear zone. nil if no clear positions are found.
+-- @return #number Assigned radius for the found zones. nil if no clear positions are found.
+function ZONE_POLYGON_BASE:GetRandomClearZoneCoordinate(PosRadius, NumPositions)
+    return UTILS.GetRandomClearZoneCoordinate(self, PosRadius, NumPositions)
+end
+
 --- Smokes the zone boundaries in a color.
 -- @param #ZONE_POLYGON_BASE self
 -- @param #boolean UnBound If true, the tyres will be destroyed.
@@ -2865,6 +2940,11 @@ end
 function ZONE_POLYGON_BASE:GetRandomVec2()
     -- make sure we assign weights to the triangles based on their surface area, otherwise
     -- we'll be more likely to generate random points in smaller triangles
+    
+    math.random()
+    math.random()
+    math.random()
+    
     local weights = {}
     for _, triangle in pairs(self._Triangles) do
         weights[triangle] = triangle.SurfaceArea / self.SurfaceArea
@@ -3204,12 +3284,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
 
   local vectors = self:GetBoundingSquare()
 
-  local minVec3 = {x=vectors.x1, y=0, z=vectors.y1}
-  local maxVec3 = {x=vectors.x2, y=0, z=vectors.y2}
-
-  local minmarkcoord = COORDINATE:NewFromVec3(minVec3)
-  local maxmarkcoord = COORDINATE:NewFromVec3(maxVec3)
-  local ZoneRadius = minmarkcoord:Get2DDistance(maxmarkcoord)/2
+  local ZoneRadius = UTILS.VecDist2D({x=vectors.x1, y=vectors.y1}, {x=vectors.x2, y=vectors.y2})/2
 --  self:I("Scan Radius:" ..ZoneRadius)
   local CenterVec3 = self:GetCoordinate():GetVec3()
 

Moose Development/Moose/Functional/AmmoTruck.lua

@@ -1,806 +0,0 @@
---- **Functional** -- Send a truck to supply artillery groups.
---
--- ===
---
--- **AMMOTRUCK** - Send a truck to supply artillery groups.
---
--- ===
---
--- ## Missions:
---
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/AmmoTruck)
---
--- ===
---
--- ### Author : **applevangelist**
---
--- @module Functional.AmmoTruck
--- @image Artillery.JPG
---
--- Last update: July 2023
-
--------------------------------------------------------------------------
---- **AMMOTRUCK** class, extends Core.Fsm#FSM
--- @type AMMOTRUCK
--- @field #string ClassName Class Name
--- @field #string lid Lid for log entries
--- @field #string version Version string
--- @field #string alias Alias name
--- @field #boolean debug Debug flag
--- @field #table trucklist List of (alive) #AMMOTRUCK.data trucks
--- @field #table targetlist  List of (alive) #AMMOTRUCK.data artillery
--- @field #number coalition Coalition this is for
--- @field Core.Set#SET_GROUP truckset SET of trucks
--- @field Core.Set#SET_GROUP targetset SET of artillery
--- @field #table remunitionqueue List of (alive) #AMMOTRUCK.data artillery to be reloaded
--- @field #table waitingtargets  List of (alive) #AMMOTRUCK.data artillery waiting
--- @field #number ammothreshold Threshold (min) ammo before sending a truck
--- @field #number remunidist Max distance trucks will go
--- @field #number monitor Monitor interval in seconds
--- @field #number unloadtime Unload time in seconds
--- @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
-
---- *Amateurs talk about tactics, but professionals study logistics.* - General Robert H Barrow, USMC
---
--- Simple Class to re-arm your artillery with trucks.
---
--- #AMMOTRUCK
--- 
--- * Controls a SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition. 
--- 
--- ## 1 The AMMOTRUCK concept
--- 
--- A SET\_GROUP of trucks which will re-arm a SET\_GROUP of artillery groups when they run out of ammunition. They will be based on a
--- homebase and drive from there to the artillery groups and then back home.
--- Trucks are the **only known in-game mechanic** to re-arm artillery and other units in DCS. Working units are e.g.: M-939 (blue), Ural-375 and ZIL-135 (both red).
--- 
--- ## 2 Set-up
---
--- Define a set of trucks and a set of artillery:  
--- 
---            local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
---            local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
---
--- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:  
--- 
---            local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone") 
---            
--- ## 2 Options and their default values
--- 
---            ammotruck.ammothreshold = 5 -- send a truck when down to this many rounds
---            ammotruck.remunidist = 20000 -- 20km - send trucks max this far from home
---            ammotruck.unloadtime = 600 -- 10 minutes - min time to unload ammunition
---            ammotruck.waitingtime = 1800 -- 30 mintes - wait max this long until remunition is done
---            ammotruck.monitor = -60 -- 1 minute - AMMOTRUCK checks run every one minute
---            ammotruck.routeonroad = true -- Trucks will **try** to drive on roads
---            ammotruck.usearmygroup = false -- If true, will make use of ARMYGROUP in the background (if used in DEV branch)
---            ammotruck.reloads = 5 -- Maxn re-arms a truck can do before he needs to go home and restock. Set to -1 for unlimited
--- 
--- ## 3 FSM Events to shape mission
--- 
--- Truck has been sent off:
--- 
---            function ammotruck:OnAfterRouteTruck(From, Event, To, Truckdata, Aridata)
---              ...
---            end
---            
--- Truck has arrived:
--- 
---            function ammotruck:OnAfterTruckArrived(From, Event, To, Truckdata)
---              ...
---            end 
--- 
--- Truck is unloading:
--- 
---            function ammotruck:OnAfterTruckUnloading(From, Event, To, Truckdata)
---              ...
---            end 
--- 
--- Truck is returning home:
--- 
---            function ammotruck:OnAfterTruckReturning(From, Event, To, Truckdata)
---              ...
---            end  
--- 
--- Truck is arrived at home:
--- 
---            function ammotruck:OnAfterTruckHome(From, Event, To, Truckdata)
---              ...
---            end 
---                        
--- @field #AMMOTRUCK
-AMMOTRUCK = {
-  ClassName = "AMMOTRUCK",
-  lid = "",
-  version = "0.0.12",
-  alias = "",
-  debug = false,
-  trucklist = {},
-  targetlist = {},
-  coalition = nil,
-  truckset = nil,
-  targetset = nil,
-  remunitionqueue = {},
-  waitingtargets = {},
-  ammothreshold = 5,
-  remunidist = 20000,
-  monitor = -60,
-  unloadtime = 600,
-  waitingtime = 1800,
-  routeonroad = true,
-  reloads = 5,
-}
-
----
--- @type AMMOTRUCK.State
-AMMOTRUCK.State = {
-  IDLE = "idle",
-  DRIVING = "driving",
-  ARRIVED = "arrived",
-  UNLOADING = "unloading",
-  RETURNING = "returning",
-  WAITING = "waiting",
-  RELOADING = "reloading",
-  OUTOFAMMO = "outofammo",
-  REQUESTED = "requested",
-}
-
----
---@type AMMOTRUCK.data
---@field Wrapper.Group#GROUP group
---@field #string name
---@field #AMMOTRUCK.State statusquo
---@field #number timestamp
---@field #number ammo
---@field Core.Point#COORDINATE coordinate
---@field #string targetname
---@field Wrapper.Group#GROUP targetgroup
---@field Core.Point#COORDINATE targetcoordinate
---@field #number reloads
-
----
--- @param #AMMOTRUCK self
--- @param Core.Set#SET_GROUP Truckset Set of truck groups
--- @param Core.Set#SET_GROUP Targetset Set of artillery groups
--- @param #number Coalition Coalition
--- @param #string Alias Alias Name
--- @param Core.Zone#ZONE Homezone Home, return zone for trucks 
--- @return #AMMOTRUCK self
--- @usage
--- Define a set of trucks and a set of artillery:  
---            local truckset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Ammo Truck"):FilterStart()
---            local ariset = SET_GROUP:New():FilterCoalitions("blue"):FilterActive(true):FilterCategoryGround():FilterPrefixes("Artillery"):FilterStart()
---
--- Create an AMMOTRUCK object to take care of the artillery using the trucks, with a homezone:  
---            local ammotruck = AMMOTRUCK:New(truckset,ariset,coalition.side.BLUE,"Logistics",ZONE:FindByName("HomeZone") 
-function AMMOTRUCK:New(Truckset,Targetset,Coalition,Alias,Homezone)
-  
-    -- Inherit everything from BASE class.
-  local self=BASE:Inherit(self, FSM:New()) -- #AMMOTRUCK
-  
-  self.truckset = Truckset -- Core.Set#SET_GROUP
-  self.targetset = Targetset -- Core.Set#SET_GROUP
-  self.coalition = Coalition -- #number
-  self.alias = Alias -- #string
-  self.debug = false
-  self.remunitionqueue = {}
-  self.trucklist = {}
-  self.targetlist = {}
-  self.ammothreshold = 5
-  self.remunidist = 20000
-  self.homezone = Homezone -- Core.Zone#ZONE
-  self.waitingtime = 1800
-  self.usearmygroup = false
-  self.hasarmygroup = false
-  
-  -- Log id.
-  self.lid=string.format("AMMOTRUCK %s | %s | ", self.version, self.alias)
-  
-  self:SetStartState("Stopped")
-  self:AddTransition("Stopped",     "Start",               "Running")
-  self:AddTransition("*",           "Monitor",             "*")
-  self:AddTransition("*",           "RouteTruck",          "*")
-  self:AddTransition("*",           "TruckArrived",        "*")
-  self:AddTransition("*",           "TruckUnloading",      "*")
-  self:AddTransition("*",           "TruckReturning",      "*")
-  self:AddTransition("*",           "TruckHome",           "*")
-  self:AddTransition("*",           "Stop",                "Stopped")
-  
-  self:__Start(math.random(5,10))
-  
-  self:I(self.lid .. "Started")
-  
-  ------------------------
-  --- Pseudo Functions ---
-  ------------------------
-
-  --- Triggers the FSM event "Stop". Stops the AMMOTRUCK and all its event handlers.
-  -- @function [parent=#AMMOTRUCK] Stop
-  -- @param #AMMOTRUCK self
-
-  --- Triggers the FSM event "Stop" after a delay. Stops the AMMOTRUCK and all its event handlers.
-  -- @function [parent=#AMMOTRUCK] __Stop
-  -- @param #AMMOTRUCK self
-  -- @param #number delay Delay in seconds.
-  
-  --- On after "RouteTruck" event.
-  -- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
-  -- @param #AMMOTRUCK self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AMMOTRUCK.data Truck
-  -- @param #AMMOTRUCK.data Artillery
-  
-    --- On after "TruckUnloading" event.
-  -- @function [parent=#AMMOTRUCK] OnAfterTruckUnloading
-  -- @param #AMMOTRUCK self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AMMOTRUCK.data Truck
-  
-    --- On after "TruckReturning" event.
-  -- @function [parent=#AMMOTRUCK] OnAfterTruckReturning
-  -- @param #AMMOTRUCK self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AMMOTRUCK.data Truck
-  
-    --- On after "RouteTruck" event.
-  -- @function [parent=#AMMOTRUCK] OnAfterRouteTruck
-  -- @param #AMMOTRUCK self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AMMOTRUCK.data Truck
-  
-    --- On after "TruckHome" event.
-  -- @function [parent=#AMMOTRUCK] OnAfterTruckHome
-  -- @param #AMMOTRUCK self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AMMOTRUCK.data Truck
-  
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #table dataset table of #AMMOTRUCK.data entries
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckDrivingTrucks(dataset)
-  self:T(self.lid .. " CheckDrivingTrucks")
-  local data = dataset 
-  for _,_data in pairs (data) do
-    local truck = _data -- #AMMOTRUCK.data
-    -- see if we arrived at destination
-    local coord = truck.group:GetCoordinate()
-    local tgtcoord = truck.targetcoordinate
-    local dist = coord:Get2DDistance(tgtcoord)
-    if dist <= 150 then
-      -- arrived
-      truck.statusquo = AMMOTRUCK.State.ARRIVED
-      truck.timestamp = timer.getAbsTime()
-      truck.coordinate = coord
-      self:__TruckArrived(1,truck)
-    end
-    -- still driving?
-    local Tnow = timer.getAbsTime()
-    if Tnow - truck.timestamp > 30 then
-      local group = truck.group
-      if self.usearmygroup then
-        group = truck.group:GetGroup()
-      end
-      local currspeed = group:GetVelocityKMH()
-      if truck.lastspeed then
-        if truck.lastspeed == 0 and currspeed == 0 then
-          self:T(truck.group:GetName().." Is not moving!")
-          -- try and move it
-          truck.timestamp = timer.getAbsTime()
-          if self.routeonroad then
-            group:RouteGroundOnRoad(truck.targetcoordinate,30,2,"Vee")
-          else
-            group:RouteGroundTo(truck.targetcoordinate,30,"Vee",2)
-          end
-        end
-        truck.lastspeed = currspeed
-      else
-        truck.lastspeed = currspeed
-        truck.timestamp = timer.getAbsTime()
-      end
-      self:I({truck=truck.group:GetName(),currspeed=currspeed,lastspeed=truck.lastspeed})
-    end
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param Wrapper.Group#GROUP Group
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:GetAmmoStatus(Group)
-  local ammotot, shells, rockets, bombs, missiles, narti = Group:GetAmmunition()
-  return rockets+missiles+narti
-end
-
----
--- @param #AMMOTRUCK self
--- @param #table dataset table of #AMMOTRUCK.data entries
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckWaitingTargets(dataset)
-  self:T(self.lid .. " CheckWaitingTargets")
-  local data = dataset 
-  for _,_data in pairs (data) do
-    local truck = _data -- #AMMOTRUCK.data
-    -- see how long we're waiting - maybe ammo truck is dead?
-    local Tnow = timer.getAbsTime()
-    local Tdiff = Tnow - truck.timestamp
-    if Tdiff > self.waitingtime then
-      local hasammo = self:GetAmmoStatus(truck.group)
-      if hasammo <= self.ammothreshold then
-        truck.statusquo = AMMOTRUCK.State.OUTOFAMMO
-      else
-        truck.statusquo = AMMOTRUCK.State.IDLE
-      end
-    end
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #table dataset table of #AMMOTRUCK.data entries
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckReturningTrucks(dataset)
-  self:T(self.lid .. " CheckReturningTrucks")
-  local data = dataset
-  local tgtcoord = self.homezone:GetCoordinate()
-  local radius = self.homezone:GetRadius()
-  for _,_data in pairs (data) do
-    local truck = _data -- #AMMOTRUCK.data
-    -- see if we arrived at destination
-    local coord = truck.group:GetCoordinate()
-    local dist = coord:Get2DDistance(tgtcoord)
-    self:T({name=truck.name,radius=radius,distance=dist})
-    if dist <= radius then
-      -- arrived
-      truck.statusquo = AMMOTRUCK.State.IDLE
-      truck.timestamp = timer.getAbsTime()
-      truck.coordinate = coord
-      truck.reloads = self.reloads or 5
-      self:__TruckHome(1,truck)
-    end
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string name Artillery group name to find
--- @return #AMMOTRUCK.data Data
-function AMMOTRUCK:FindTarget(name)
-  self:T(self.lid .. " FindTarget")
-  local data = nil
-  local dataset = self.targetlist
-  for _,_entry in pairs(dataset) do
-    local entry = _entry -- #AMMOTRUCK.data
-    if entry.name == name then
-      data = entry
-      break
-    end
-  end
-  return data
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string name Truck group name to find
--- @return #AMMOTRUCK.data Data
-function AMMOTRUCK:FindTruck(name)
-  self:T(self.lid .. " FindTruck")
-  local data = nil
-  local dataset = self.trucklist
-  for _,_entry in pairs(dataset) do
-    local entry = _entry -- #AMMOTRUCK.data
-    if entry.name == name then
-      data = entry
-      break
-    end
-  end
-  return data
-end
-
----
--- @param #AMMOTRUCK self
--- @param #table dataset table of #AMMOTRUCK.data entries
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckArrivedTrucks(dataset)
-  self:T(self.lid .. " CheckArrivedTrucks")
-  local data = dataset 
-  for _,_data in pairs (data) do
-    -- set to unloading
-    local truck = _data -- #AMMOTRUCK.data
-    truck.statusquo = AMMOTRUCK.State.UNLOADING
-    truck.timestamp = timer.getAbsTime()
-    self:__TruckUnloading(2,truck)
-    -- set target to reloading
-    local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
-    if aridata then
-      aridata.statusquo = AMMOTRUCK.State.RELOADING
-      aridata.timestamp = timer.getAbsTime()
-    end
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #table dataset table of #AMMOTRUCK.data entries
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckUnloadingTrucks(dataset)
-  self:T(self.lid .. " CheckUnloadingTrucks")
-  local data = dataset 
-  for _,_data in pairs (data) do
-    -- check timestamp
-    local truck = _data -- #AMMOTRUCK.data
-    local Tnow = timer.getAbsTime()
-    local Tpassed = Tnow - truck.timestamp
-    local hasammo = self:GetAmmoStatus(truck.targetgroup)
-    if Tpassed > self.unloadtime and hasammo > self.ammothreshold then
-      truck.statusquo = AMMOTRUCK.State.RETURNING
-      truck.timestamp = timer.getAbsTime()
-      self:__TruckReturning(2,truck)
-      -- set target to reloaded     
-      local aridata = self:FindTarget(truck.targetname) -- #AMMOTRUCK.data
-      if aridata then
-        aridata.statusquo = AMMOTRUCK.State.IDLE
-        aridata.timestamp = timer.getAbsTime()
-      end
-    end
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckTargetsAlive()
-  self:T(self.lid .. " CheckTargetsAlive")
-  local arilist = self.targetlist
-  for _,_ari in pairs(arilist) do
-    local ari = _ari -- #AMMOTRUCK.data
-    if ari.group and ari.group:IsAlive() then
-      -- everything fine
-    else
-      -- ari dead
-      self.targetlist[ari.name] = nil
-    end
-  end
-  -- new arrivals?
-  local aritable = self.targetset:GetSetObjects() --#table
-  for _,_ari in pairs(aritable) do
-    local ari = _ari -- Wrapper.Group#GROUP
-    if ari and ari:IsAlive() and not self.targetlist[ari:GetName()] then
-      local name = ari:GetName()
-      local newari = {} -- #AMMOTRUCK.data
-      newari.name = name
-      newari.group = ari
-      newari.statusquo = AMMOTRUCK.State.IDLE
-      newari.timestamp = timer.getAbsTime()
-      newari.coordinate = ari:GetCoordinate()
-      local hasammo = self:GetAmmoStatus(ari)
-      --newari.ammo = ari:GetAmmunition()
-      newari.ammo = hasammo
-      self.targetlist[name] = newari
-    end 
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:CheckTrucksAlive()
-  self:T(self.lid .. " CheckTrucksAlive")
-  local trucklist = self.trucklist
-  for _,_truck in pairs(trucklist) do
-    local truck = _truck -- #AMMOTRUCK.data
-    if truck.group and truck.group:IsAlive() then
-      -- everything fine
-    else
-      -- truck dead
-      local tgtname = truck.targetname
-      local targetdata = self:FindTarget(tgtname) -- #AMMOTRUCK.data
-      if targetdata then
-        if targetdata.statusquo ~= AMMOTRUCK.State.IDLE then
-          targetdata.statusquo = AMMOTRUCK.State.IDLE
-        end
-      end
-      self.trucklist[truck.name] = nil
-    end
-  end
-  -- new arrivals?
-  local trucktable = self.truckset:GetSetObjects() --#table
-  for _,_truck in pairs(trucktable) do
-    local truck = _truck -- Wrapper.Group#GROUP
-    if truck and truck:IsAlive() and not self.trucklist[truck:GetName()] then
-      local name = truck:GetName()
-      local newtruck = {} -- #AMMOTRUCK.data
-      newtruck.name = name
-      newtruck.group = truck
-      if self.hasarmygroup then
-        -- is (not) already ARMYGROUP?
-        if truck.ClassName and truck.ClassName == "GROUP" then
-          local trucker = ARMYGROUP:New(truck)
-          trucker:Activate()
-          newtruck.group = trucker
-        end
-      end
-      newtruck.statusquo = AMMOTRUCK.State.IDLE
-      newtruck.timestamp = timer.getAbsTime()
-      newtruck.coordinate = truck:GetCoordinate()
-      newtruck.reloads = self.reloads or 5
-      self.trucklist[name] = newtruck
-    end 
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:onafterStart(From, Event, To)
-  self:T({From, Event, To})
-  if ARMYGROUP and self.usearmygroup then
-    self.hasarmygroup = true
-  else
-   self.hasarmygroup = false
-  end
-  if self.debug then
-    BASE:TraceOn()
-    BASE:TraceClass("AMMOTRUCK")
-  end
-  self:CheckTargetsAlive()
-  self:CheckTrucksAlive() 
-  self:__Monitor(-30)
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:onafterMonitor(From, Event, To)
-  self:T({From, Event, To})
-  self:CheckTargetsAlive()
-  self:CheckTrucksAlive()
-  -- update ammo state
-  local remunition = false
-  local remunitionqueue = {}
-  local waitingtargets = {}
-  for _,_ari in pairs(self.targetlist) do
-    local data = _ari -- #AMMOTRUCK.data
-    if data.group and data.group:IsAlive() then
-      data.ammo = self:GetAmmoStatus(data.group)
-      data.timestamp = timer.getAbsTime()
-      local text = string.format("Ari %s | Ammo %d | State %s",data.name,data.ammo,data.statusquo)
-      self:T(text)
-      if data.ammo <= self.ammothreshold and (data.statusquo == AMMOTRUCK.State.IDLE or data.statusquo == AMMOTRUCK.State.OUTOFAMMO) then
-        -- add to remu queue
-        data.statusquo = AMMOTRUCK.State.OUTOFAMMO
-        remunitionqueue[#remunitionqueue+1] = data
-        remunition = true
-      elseif data.statusquo == AMMOTRUCK.State.WAITING then
-        waitingtargets[#waitingtargets+1] = data
-      end
-    else
-      self.targetlist[data.name] = nil
-    end
-  end
-  -- sort trucks in buckets
-  local idletrucks = {}
-  local drivingtrucks = {}
-  local unloadingtrucks = {}
-  local arrivedtrucks = {}
-  local returningtrucks = {}
-  local found = false
-  for _,_truckdata in pairs(self.trucklist) do
-    local data = _truckdata -- #AMMOTRUCK.data
-    if data.group and data.group:IsAlive() then
-        -- check state
-        local text = string.format("Truck %s | State %s",data.name,data.statusquo)
-        self:T(text)
-        if data.statusquo == AMMOTRUCK.State.IDLE then
-          idletrucks[#idletrucks+1] = data
-          found = true
-        elseif data.statusquo == AMMOTRUCK.State.DRIVING then
-          drivingtrucks[#drivingtrucks+1] = data
-        elseif data.statusquo == AMMOTRUCK.State.ARRIVED then
-          arrivedtrucks[#arrivedtrucks+1] = data
-        elseif data.statusquo == AMMOTRUCK.State.UNLOADING then
-          unloadingtrucks[#unloadingtrucks+1] = data
-        elseif data.statusquo == AMMOTRUCK.State.RETURNING then
-          returningtrucks[#returningtrucks+1] = data
-        if data.reloads > 0 or data.reloads == -1 then
-          idletrucks[#idletrucks+1] = data
-          found = true
-        end         
-        end
-    else
-      self.truckset[data.name] = nil
-    end
-  end
-  -- see if we can/need route one
-  local n=0
-  if found and remunition then
-    -- match
-    --local match = false
-    for _,_truckdata in pairs(idletrucks) do
-      local truckdata = _truckdata -- #AMMOTRUCK.data
-      local truckcoord = truckdata.group:GetCoordinate() -- Core.Point#COORDINATE
-      for _,_aridata in pairs(remunitionqueue) do
-        local aridata = _aridata -- #AMMOTRUCK.data
-        local aricoord = aridata.coordinate
-        local distance = truckcoord:Get2DDistance(aricoord)
-        if distance <= self.remunidist and aridata.statusquo == AMMOTRUCK.State.OUTOFAMMO and n <= #idletrucks then
-          n = n + 1
-          aridata.statusquo = AMMOTRUCK.State.REQUESTED
-          self:__RouteTruck(n*5,truckdata,aridata)
-          break
-        end
-      end
-    end
-  end
-  
-  -- check driving trucks
-  if #drivingtrucks > 0 then
-    self:CheckDrivingTrucks(drivingtrucks)
-  end
-  
-  -- check arrived trucks
-  if #arrivedtrucks > 0 then
-    self:CheckArrivedTrucks(arrivedtrucks)
-  end
-  
-  -- check unloading trucks
-  if #unloadingtrucks > 0 then
-    self:CheckUnloadingTrucks(unloadingtrucks)
-  end
-  
-  -- check returningtrucks trucks
-  if #returningtrucks > 0 then
-    self:CheckReturningTrucks(returningtrucks)
-  end
-  
-  -- check waiting targets
-  if #waitingtargets > 0 then
-    self:CheckWaitingTargets(waitingtargets)
-  end
-  
-  self:__Monitor(self.monitor)
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @param #AMMOTRUCK.data Truckdata
--- @param #AMMOTRUCK.data Aridata
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:onafterRouteTruck(From, Event, To, Truckdata, Aridata)
-  self:T({From, Event, To, Truckdata.name, Aridata.name})
-  local truckdata = Truckdata -- #AMMOTRUCK.data
-  local aridata = Aridata -- #AMMOTRUCK.data
-  local tgtgrp = aridata.group
-  local tgtzone = ZONE_GROUP:New(aridata.name,tgtgrp,30)
-  local tgtcoord = tgtzone:GetRandomCoordinate(15)
-  if self.hasarmygroup then
-    local mission = AUFTRAG:NewONGUARD(tgtcoord)
-    local oldmission = truckdata.group:GetMissionCurrent()
-    if oldmission then oldmission:Cancel() end
-    mission:SetTime(5)
-    mission:SetTeleport(false)
-    truckdata.group:AddMission(mission)
-  elseif self.routeonroad then
-    truckdata.group:RouteGroundOnRoad(tgtcoord,30)
-  else
-    truckdata.group:RouteGroundTo(tgtcoord,30)
-  end
-  truckdata.statusquo = AMMOTRUCK.State.DRIVING
-  truckdata.targetgroup = tgtgrp
-  truckdata.targetname = aridata.name
-  truckdata.targetcoordinate = tgtcoord
-  aridata.statusquo = AMMOTRUCK.State.WAITING
-  aridata.timestamp = timer.getAbsTime()
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @param #AMMOTRUCK.data Truckdata
--- @return #AMMOTRUCK self 
- function AMMOTRUCK:onafterTruckUnloading(From, Event, To, Truckdata)
-   local m = MESSAGE:New("Truck "..Truckdata.name.." unloading!",15,"AmmoTruck"):ToCoalitionIf(self.coalition,self.debug)
-   local truck = Truckdata -- Functional.AmmoTruck#AMMOTRUCK.data
-   local coord = truck.group:GetCoordinate()
-   local heading = truck.group:GetHeading()
-   heading = heading < 180 and (360-heading) or (heading - 180)
-   local cid = self.coalition == coalition.side.BLUE and country.id.USA or country.id.RUSSIA
-   cid = self.coalition == coalition.side.NEUTRAL and country.id.UN_PEACEKEEPERS or cid
-   
-   local ammo = {}
-   for i=1,5 do
-     ammo[i] = SPAWNSTATIC:NewFromType("ammo_cargo","Cargos",cid)
-      :InitCoordinate(coord:Translate((15+((i-1)*4)),heading))
-      :Spawn(0,"AmmoCrate-"..math.random(1,10000))
-    end
-    
-    local function destroyammo(ammo)
-      for _,_crate in pairs(ammo) do
-        _crate:Destroy(false)
-      end
-    end
-    
-    local scheduler = SCHEDULER:New(nil,destroyammo,{ammo},self.waitingtime)
-  
-  -- one reload less
-  if truck.reloads ~= -1 then
-    truck.reloads = truck.reloads - 1
-  end
-  return self
- end 
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @param #AMMOTRUCK.data Truck
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:onafterTruckReturning(From, Event, To, Truck)
-  self:T({From, Event, To, Truck.name})
-  -- route home
-  local truckdata = Truck -- #AMMOTRUCK.data
-  local tgtzone = self.homezone
-  local tgtcoord = tgtzone:GetRandomCoordinate()
-  if self.hasarmygroup then
-    local mission = AUFTRAG:NewONGUARD(tgtcoord)
-    local oldmission = truckdata.group:GetMissionCurrent()
-    if oldmission then oldmission:Cancel() end
-    mission:SetTime(5)
-    mission:SetTeleport(false)
-    truckdata.group:AddMission(mission)
-  elseif self.routeonroad then
-    truckdata.group:RouteGroundOnRoad(tgtcoord,30,1,"Cone")
-  else
-    truckdata.group:RouteGroundTo(tgtcoord,30,"Cone",1)
-  end
-  return self
-end
-
----
--- @param #AMMOTRUCK self
--- @param #string From
--- @param #string Event
--- @param #string To
--- @return #AMMOTRUCK self 
-function AMMOTRUCK:onafterStop(From, Event, To)
-  self:T({From, Event, To})
-  return self
-end

Moose Development/Moose/Functional/Artillery.lua

@@ -2386,12 +2386,12 @@ function ARTY:OnEventShot(EventData)
           self.Nukes=self.Nukes-1
         end
 
-        -- Decrease available illumination shells because we just fired one.
+        -- Decrease available illuminatin shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then
           self.Nillu=self.Nillu-1
         end
 
-        -- Decrease available smoke shells because we just fired one.
+        -- Decrease available illuminatin shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then
           self.Nsmoke=self.Nsmoke-1
         end
@@ -3804,6 +3804,51 @@ function ARTY:_NuclearBlast(_coord)
     ignite(_fires)
   end
 
+--[[
+  local ZoneNuke=ZONE_RADIUS:New("Nukezone", _coord:GetVec2(), 2000)
+
+  -- Scan for Scenery objects.
+  ZoneNuke:Scan(Object.Category.SCENERY)
+
+  -- Array with all possible hideouts, i.e. scenery objects in the vicinity of the group.
+  local scenery={}
+
+  for SceneryTypeName, SceneryData in pairs(ZoneNuke:GetScannedScenery()) do
+    for SceneryName, SceneryObject in pairs(SceneryData) do
+
+      local SceneryObject = SceneryObject -- Wrapper.Scenery#SCENERY
+
+      -- Position of the scenery object.
+      local spos=SceneryObject:GetCoordinate()
+
+      -- Distance from group to impact point.
+      local distance= spos:Get2DDistance(_coord)
+
+      -- Place markers on every possible scenery object.
+      if self.Debug then
+        local MarkerID=spos:MarkToAll(string.format("%s scenery object %s", self.Controllable:GetName(), SceneryObject:GetTypeName()))
+        local text=string.format("%s scenery: %s, Coord %s", self.Controllable:GetName(), SceneryObject:GetTypeName(), SceneryObject:GetCoordinate():ToStringLLDMS())
+        self:T2(SUPPRESSION.id..text)
+      end
+
+      -- Add to table.
+      table.insert(scenery, {object=SceneryObject, distance=distance})
+
+      --SceneryObject:Destroy()
+    end
+  end
+
+  -- Sort scenery wrt to distance from impact point.
+--  local _sort = function(a,b) return a.distance < b.distance end
+--  table.sort(scenery,_sort)
+
+--  for _,object in pairs(scenery) do
+--    local sobject=object -- Wrapper.Scenery#SCENERY
+--    sobject:Destroy()
+--  end
+
+]]
+
 end
 
 --- Route group to a certain point.

Moose Development/Moose/Functional/CleanUp.lua

@@ -52,13 +52,11 @@
 -- @module Functional.CleanUp
 -- @image CleanUp_Airbases.JPG
 
----
--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
+--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
 -- @field #map<#string,Wrapper.Airbase#AIRBASE> Airbases Map of Airbases.
 -- @extends Core.Base#BASE
 
----
--- @type CLEANUP_AIRBASE
+--- @type CLEANUP_AIRBASE
 -- @extends #CLEANUP_AIRBASE.__
 
 --- Keeps airbases clean, and tries to guarantee continuous airbase operations, even under combat.
@@ -95,7 +93,7 @@ CLEANUP_AIRBASE = {
 -- @field #CLEANUP_AIRBASE.__
 CLEANUP_AIRBASE.__ = {}
 
--- @field #CLEANUP_AIRBASE.__.Airbases
+--- @field #CLEANUP_AIRBASE.__.Airbases
 CLEANUP_AIRBASE.__.Airbases = {}
 
 --- Creates the main object which is handling the cleaning of the debris within the given Zone Names.
@@ -242,8 +240,7 @@ function CLEANUP_AIRBASE.__:DestroyMissile( MissileObject )
 	end
 end
 
----
--- @param #CLEANUP_AIRBASE self
+--- @param #CLEANUP_AIRBASE self
 -- @param Core.Event#EVENTDATA EventData
 function CLEANUP_AIRBASE.__:OnEventBirth( EventData )
   self:F( { EventData } )

Moose Development/Moose/Functional/DetectionZones.lua

@@ -4,7 +4,7 @@
 
 do -- DETECTION_ZONES
 
-  -- @type DETECTION_ZONES
+  --- @type DETECTION_ZONES
   -- @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
@@ -68,7 +68,7 @@ do -- DETECTION_ZONES
     return self
   end
 
-  -- @param #DETECTION_ZONES self
+  --- @param #DETECTION_ZONES self
   -- @param #number The amount of alive recce.
   function DETECTION_ZONES:CountAliveRecce()
 
@@ -76,7 +76,7 @@ do -- DETECTION_ZONES
 
   end    
   
-  -- @param #DETECTION_ZONES self
+  --- @param #DETECTION_ZONES self
   function DETECTION_ZONES:ForEachAliveRecce( IteratorFunction, ... )
     self:F2( arg )
     
@@ -352,7 +352,7 @@ do -- DETECTION_ZONES
       --DetectedSet:Flush( self )
       
       DetectedSet:ForEachUnit(
-        -- @param Wrapper.Unit#UNIT DetectedUnit
+        --- @param Wrapper.Unit#UNIT DetectedUnit
         function( DetectedUnit )
           if DetectedUnit:IsAlive() then
             --self:T( "Detected Set #" .. DetectedItem.ID .. ":" .. DetectedUnit:GetName() )
@@ -380,7 +380,7 @@ do -- DETECTION_ZONES
   
   end
 
-  -- @param #DETECTION_ZONES self
+  --- @param #DETECTION_ZONES self
   -- @param #string From The From State string.
   -- @param #string Event The Event string.
   -- @param #string To The To State string.

Moose Development/Moose/Functional/Fox.lua

@@ -141,7 +141,6 @@ FOX = {
   explosiondist  =   200,
   explosiondist2 =   500,
   bigmissilemass =    50,
-  --destroy        =   nil,
   dt50           =     5,
   dt10           =     1,
   dt05           =   0.5,

Moose Development/Moose/Functional/Mantis.lua

@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
--- Last Update: May 2025
+-- Last Update: August 2025
 
 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -108,10 +108,15 @@
 -- * Patriot
 -- * Rapier
 -- * Roland
+-- * IRIS-T SLM
+-- * Pantsir S1
+-- * TOR M2
+-- * C-RAM
 -- * Silkworm (though strictly speaking this is a surface to ship missile)
 -- * SA-2, SA-3, SA-5, SA-6, SA-7, SA-8, SA-9, SA-10, SA-11, SA-13, SA-15, SA-19
 -- * From IDF mod: STUNNER IDFA, TAMIR IDFA (Note all caps!)
--- * From HDS (see note on HDS below): SA-2, SA-3, SA-10B, SA-10C, SA-12, SA-17, SA-20A, SA-20B, SA-23, HQ-2
+-- * From HDS (see note on HDS below): SA-2, SA-3, SA-10B, SA-10C, SA-12, SA-17, SA-20A, SA-20B, SA-23, HQ-2, SAMP/T Block 1, SAMP/T Block 1INT,  SAMP/T Block2
+-- * Other Mods: Nike
 -- 
 -- * From SMA: RBS98M, RBS70, RBS90, RBS90M, RBS103A, RBS103B, RBS103AM, RBS103BM, Lvkv9040M 
 -- **NOTE** If you are using the Swedish Military Assets (SMA), please note that the **group name** for RBS-SAM types also needs to contain the keyword "SMA"
@@ -125,10 +130,11 @@
 -- * SA-2 (with V759 missile, e.g. "Red SAM SA-2 HDS")
 -- * SA-2 (with HQ-2 launcher, use HQ-2 in the group name, e.g. "Red SAM HQ-2" )
 -- * SA-3 (with V601P missile, e.g. "Red SAM SA-3 HDS")
--- * SA-10B (overlap with other SA-10 types, e.g. "Red SAM SA-10B HDS")
--- * SA-10C (overlap with other SA-10 types, e.g. "Red SAM SA-10C HDS")
--- * SA-12 (launcher dependent range, e.g. "Red SAM SA-12 HDS")
--- * SA-23 (launcher dependent range, e.g. "Red SAM SA-23 HDS") 
+-- * SA-10B (overlap with other SA-10 types, e.g. "Red SAM SA-10B HDS" with 5P85CE launcher)
+-- * SA-10C (overlap with other SA-10 types, e.g. "Red SAM SA-10C HDS" with 5P85SE launcher)
+-- * SA-12 (launcher dependent range, e.g. "Red SAM SA-12 HDS 2" for the 9A82 variant and "Red SAM SA-12 HDS 1" for the 9A83 variant)
+-- * SA-23 (launcher dependent range, e.g. "Red SAM SA-23 HDS 2" for the 9A82ME variant and "Red SAM SA-23 HDS 1" for the 9A83ME variant)
+-- * SAMP/T (launcher dependent range, e.g. "Blue SAM SAMPT Block 1 HDS" for Block 1, "Blue SAM SAMPT Block 1INT HDS", "Blue SAM SAMPT Block 2 HDS")
 -- 
 -- The other HDS types work like the rest of the known SAM systems.
 -- 
@@ -274,6 +280,7 @@
 MANTIS = {
   ClassName             = "MANTIS",
   name                  = "mymantis",
+  version               = "0.9.34",
   SAM_Templates_Prefix  = "",
   SAM_Group             = nil,
   EWR_Templates_Prefix  = "",
@@ -382,15 +389,21 @@ MANTIS.SamData = {
   ["Chaparral"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Chaparral" },
   ["Linebacker"] = { Range=4, Blindspot=0, Height=3, Type="Point", Radar="Linebacker", Point="true" },
   ["Silkworm"] = { Range=90, Blindspot=1, Height=0.2, Type="Long", Radar="Silkworm" },
-  ["HEMTT_C-RAM_Phalanx"] = { Range=2, Blindspot=0, Height=2, Type="Point", Radar="HEMTT_C-RAM_Phalanx", Point="true" },
+  ["C-RAM"] = { Range=2, Blindspot=0, Height=2, Type="Point", Radar="HEMTT_C-RAM_Phalanx", Point="true" },
   -- units from HDS Mod, multi launcher options is tricky
   ["SA-10B"] = { Range=75, Blindspot=0, Height=18, Type="Medium" , Radar="SA-10B"},
-  ["SA-17"] = { Range=50, Blindspot=3, Height=30, Type="Medium", Radar="SA-17" },
+  ["SA-17"] = { Range=50, Blindspot=3, Height=50, Type="Medium", Radar="SA-17" },
   ["SA-20A"] = { Range=150, Blindspot=5, Height=27, Type="Long" , Radar="S-300PMU1"},
   ["SA-20B"] = { Range=200, Blindspot=4, Height=27, Type="Long" , Radar="S-300PMU2"},
   ["HQ-2"] = { Range=50, Blindspot=6, Height=35, Type="Medium", Radar="HQ_2_Guideline_LN" },
   ["TAMIR IDFA"] = { Range=20, Blindspot=0.6, Height=12.3, Type="Short", Radar="IRON_DOME_LN" },
   ["STUNNER IDFA"] = { Range=250, Blindspot=1, Height=45, Type="Long", Radar="DAVID_SLING_LN" },
+  ["NIKE"] = { Range=155, Blindspot=6, Height=30, Type="Long", Radar="HIPAR" },
+  ["Dog Ear"] = { Range=11, Blindspot=0, Height=9, Type="Point", Radar="Dog Ear", Point="true" },
+  -- CH Added to DCS core 2.9.19.x
+  ["Pantsir S1"] = { Range=20, Blindspot=1.2, Height=15, Type="Point", Radar="PantsirS1" , Point="true" }, 
+  ["Tor M2"] = { Range=12, Blindspot=1, Height=10, Type="Point", Radar="TorM2", Point="true"  },
+  ["IRIS-T SLM"] = { Range=40, Blindspot=0.5, Height=20, Type="Medium", Radar="CH_IRIST_SLM" }, 
 }
 
 --- SAM data HDS
@@ -406,13 +419,17 @@ MANTIS.SamDataHDS = {
   -- group name MUST contain HDS to ID launcher type correctly!
   ["SA-2 HDS"] = { Range=56, Blindspot=7, Height=30, Type="Medium", Radar="V759" }, 
   ["SA-3 HDS"] = { Range=20, Blindspot=6, Height=30, Type="Short", Radar="V-601P" },  
-  ["SA-10C HDS 2"] = { Range=90, Blindspot=5, Height=25, Type="Long" , Radar="5P85DE ln"}, -- V55RUD
-  ["SA-10C HDS 1"] = { Range=90, Blindspot=5, Height=25, Type="Long" , Radar="5P85CE ln"}, -- V55RUD
-  ["SA-12 HDS 2"] = { Range=100, Blindspot=10, Height=25, Type="Long" , Radar="S-300V 9A82 l"},
-  ["SA-12 HDS 1"] = { Range=75, Blindspot=1, Height=25, Type="Long" , Radar="S-300V 9A83 l"},
+  ["SA-10B HDS"] = { Range=90, Blindspot=5, Height=25, Type="Long" , Radar="5P85CE ln"}, -- V55RUD
+  ["SA-10C HDS"] = { Range=75, Blindspot=5, Height=25, Type="Long" , Radar="5P85SE ln"}, -- V55RUD
+  ["SA-17 HDS"] = { Range=50, Blindspot=3, Height=50, Type="Medium", Radar="SA-17 " },
+  ["SA-12 HDS 2"] = { Range=100, Blindspot=13, Height=30, Type="Long" , Radar="S-300V 9A82 l"},
+  ["SA-12 HDS 1"] = { Range=75, Blindspot=6, Height=25, Type="Long" , Radar="S-300V 9A83 l"},
   ["SA-23 HDS 2"] = { Range=200, Blindspot=5, Height=37, Type="Long", Radar="S-300VM 9A82ME" },
   ["SA-23 HDS 1"] = { Range=100, Blindspot=1, Height=50, Type="Long", Radar="S-300VM 9A83ME" },
   ["HQ-2 HDS"] = { Range=50, Blindspot=6, Height=35, Type="Medium", Radar="HQ_2_Guideline_LN" },
+  ["SAMPT Block 1 HDS"] = { Range=120, Blindspot=1, Height=20, Type="long", Radar="SAMPT_MLT_Blk1" }, -- Block 1 Launcher
+  ["SAMPT Block 1INT HDS"] = { Range=150, Blindspot=1, Height=25, Type="long", Radar="SAMPT_MLT_Blk1NT" }, -- Block 1-INT Launcher
+  ["SAMPT Block 2 HDS"] = { Range=200, Blindspot=10, Height=70, Type="long", Radar="SAMPT_MLT_Blk2" }, -- Block 2 Launcher
 }
 
 --- SAM data SMA
@@ -452,15 +469,15 @@ MANTIS.SamDataCH = {
     -- https://www.currenthill.com/
     -- group name MUST contain CHM to ID launcher type correctly!
    ["2S38 CHM"] = { Range=6, Blindspot=0.1, Height=4.5, Type="Short", Radar="2S38" },
-   ["PantsirS1 CHM"] = { Range=20, Blindspot=1.2, Height=15, Type="Short", Radar="PantsirS1" }, 
+   ["PantsirS1 CHM"] = { Range=20, Blindspot=1.2, Height=15, Type="Point", Radar="PantsirS1", Point="true"  }, 
    ["PantsirS2 CHM"] = { Range=30, Blindspot=1.2, Height=18, Type="Medium", Radar="PantsirS2" }, 
    ["PGL-625 CHM"] = { Range=10, Blindspot=1, Height=5, Type="Short", Radar="PGL_625" }, 
    ["HQ-17A CHM"] = { Range=15, Blindspot=1.5, Height=10, Type="Short", Radar="HQ17A" }, 
    ["M903PAC2 CHM"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="MIM104_M903_PAC2" },
    ["M903PAC3 CHM"] = { Range=160, Blindspot=1, Height=40, Type="Long", Radar="MIM104_M903_PAC3" }, 
-   ["TorM2 CHM"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2" },
-   ["TorM2K CHM"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2K" },
-   ["TorM2M CHM"] = { Range=16, Blindspot=1, Height=10, Type="Short", Radar="TorM2M" }, 
+   ["TorM2 CHM"] = { Range=12, Blindspot=1, Height=10, Type="Point", Radar="TorM2", Point="true"  },
+   ["TorM2K CHM"] = { Range=12, Blindspot=1, Height=10, Type="Point", Radar="TorM2K", Point="true"  },
+   ["TorM2M CHM"] = { Range=16, Blindspot=1, Height=10, Type="Point", Radar="TorM2M", Point="true"  }, 
    ["NASAMS3-AMRAAMER CHM"] = { Range=50, Blindspot=2, Height=35.7, Type="Medium", Radar="CH_NASAMS3_LN_AMRAAM_ER" }, 
    ["NASAMS3-AIM9X2 CHM"] = { Range=20, Blindspot=0.2, Height=18, Type="Short", Radar="CH_NASAMS3_LN_AIM9X2" },
    ["C-RAM CHM"] = { Range=2, Blindspot=0, Height=2, Type="Point", Radar="CH_Centurion_C_RAM", Point="true" }, 
@@ -680,9 +697,6 @@ do
     -- counter for SAM table updates
     self.checkcounter = 1
     
-    -- TODO Version
-    -- @field #string version
-    self.version="0.9.30"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
 
     --- FSM Functions ---
@@ -879,7 +893,11 @@ do
     self.AcceptZones = AcceptZones or {}
     self.RejectZones = RejectZones or {}
     self.ConflictZones = ConflictZones or {}
-    if #self.AcceptZones > 0 or #self.RejectZones > 0 or #self.ConflictZones > 0 then
+    self.AcceptZonesNo = UTILS.TableLength(self.AcceptZones)
+    self.RejectZonesNo = UTILS.TableLength(self.RejectZones)
+    self.ConflictZonesNo = UTILS.TableLength(self.ConflictZones)
+    self:T(string.format("AcceptZonesNo = %d | RejectZonesNo = %d | ConflictZonesNo = %d",self.AcceptZonesNo,self.RejectZonesNo,self.ConflictZonesNo))
+    if self.AcceptZonesNo > 0 or self.RejectZonesNo > 0 or self.ConflictZonesNo > 0 then
       self.usezones = true
     end
     return self
@@ -1271,7 +1289,8 @@ do
     self:T(self.lid.."_CheckCoordinateInZones")
     local inzone = false
     -- acceptzones
-    if #self.AcceptZones > 0 then
+    self:T(string.format("AcceptZonesNo = %d | RejectZonesNo = %d | ConflictZonesNo = %d",self.AcceptZonesNo,self.RejectZonesNo,self.ConflictZonesNo))
+    if self.AcceptZonesNo > 0 then
       for _,_zone in pairs(self.AcceptZones) do
         local zone = _zone -- Core.Zone#ZONE
         if zone:IsCoordinateInZone(coord) then
@@ -1282,7 +1301,7 @@ do
       end
     end
     -- rejectzones
-    if #self.RejectZones > 0 and inzone then -- maybe in accept zone, but check the overlaps
+    if self.RejectZonesNo > 0 then 
       for _,_zone in pairs(self.RejectZones) do
         local zone = _zone -- Core.Zone#ZONE
         if zone:IsCoordinateInZone(coord) then
@@ -1293,7 +1312,7 @@ do
       end
     end
     -- conflictzones
-    if #self.ConflictZones > 0 and not inzone then -- if not already accepted, might be in conflict zones
+    if self.ConflictZonesNo > 0 then
       for _,_zone in pairs(self.ConflictZones) do
         local zone = _zone -- Core.Zone#ZONE
         if zone:IsCoordinateInZone(coord) then
@@ -1359,6 +1378,7 @@ do
       end
       -- check accept/reject zones
       local zonecheck = true
+      self:T("self.usezones = "..tostring(self.usezones))
       if self.usezones then
         -- DONE
         zonecheck = self:_CheckCoordinateInZones(coord)
@@ -1798,7 +1818,7 @@ do
       if self.Shorad and self.Shorad.ActiveGroups and self.Shorad.ActiveGroups[name] then
        activeshorad = true
       end
-      if IsInZone and not suppressed and not activeshorad then --check any target in zone and not currently managed by SEAD
+      if IsInZone and (not suppressed) and (not activeshorad) then --check any target in zone and not currently managed by SEAD
         if samgroup:IsAlive() then
           -- switch on SAM
           local switch = false
@@ -1830,7 +1850,7 @@ do
           -- link in to SHORAD if available
           -- DONE: Test integration fully
           if self.ShoradLink and (Distance < self.ShoradActDistance or Distance < blind ) then -- don't give SHORAD position away too early
-            local Shorad = self.Shorad
+            local Shorad = self.Shorad  --Functional.Shorad#SHORAD
             local radius = self.checkradius
             local ontime = self.ShoradTime
             Shorad:WakeUpShorad(name, radius, ontime)
@@ -2110,7 +2130,7 @@ do
     if self.debug and self.verbose then
       self:I(self.lid .. "Status Report")
       for _name,_state in pairs(self.SamStateTracker) do
-        self:I(string.format("Site %s\tStatus %s",_name,_state))
+        self:I(string.format("Site %s | Status %s",_name,_state))
       end
     end
     local interval = self.detectinterval * -1

Moose Development/Moose/Functional/Range.lua

@@ -603,7 +603,7 @@ RANGE.MenuF10Root = nil
 
 --- Range script version.
 -- @field #string version
-RANGE.version = "2.8.1"
+RANGE.version = "2.8.0"
 
 -- TODO list:
 -- TODO: Verbosity level for messages.
@@ -2032,10 +2032,10 @@ function RANGE._OnImpact(weapon, self, playerData, attackHdg, attackAlt, attackV
 
   -- Smoke impact point of bomb.
   if playerData and playerData.smokebombimpact and insidezone then
-    if playerData.delaysmoke then
-      impactcoord:Smoke(playerData.smokecolor, 30, self.TdelaySmoke)
+    if playerData and playerData.delaysmoke then
+      timer.scheduleFunction( self._DelayedSmoke, { coord = impactcoord, color = playerData.smokecolor }, timer.getTime() + self.TdelaySmoke )
     else
-      impactcoord:Smoke(playerData.smokecolor, 30)
+      impactcoord:Smoke( playerData.smokecolor )
     end
   end
 
@@ -2640,6 +2640,13 @@ end
 -- Display Messages
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+--- Start smoking a coordinate with a delay.
+-- @param #table _args Argements passed.
+function RANGE._DelayedSmoke( _args )
+  _args.coord:Smoke(_args.color)
+  --trigger.action.smoke( _args.coord:GetVec3(), _args.color )
+end
+
 --- Display top 10 stafing results of a specific player.
 -- @param #RANGE self
 -- @param #string _unitName Name of the player unit.

Moose Development/Moose/Functional/Scoring.lua

@@ -985,6 +985,7 @@ function SCORING:_EventOnHit( Event )
   local TargetUnitCoalition = nil
   local TargetUnitCategory = nil
   local TargetUnitType = nil
+  local TargetIsScenery = false
 
   if Event.IniDCSUnit then
 
@@ -1025,6 +1026,12 @@ function SCORING:_EventOnHit( Event )
     TargetCategory = Event.TgtCategory
     TargetType = Event.TgtTypeName
 
+    -- Scenery hit
+    if (not TargetCategory) and TargetUNIT ~= nil and TargetUnit:IsInstanceOf("SCENERY") then
+        TargetCategory = Unit.Category.STRUCTURE
+        TargetIsScenery = true
+    end
+    
     TargetUnitCoalition = _SCORINGCoalition[TargetCoalition]
     TargetUnitCategory = _SCORINGCategory[TargetCategory]
     TargetUnitType = TargetType
@@ -1117,17 +1124,22 @@ function SCORING:_EventOnHit( Event )
                                  MESSAGE.Type.Update )
                        :ToAllIf( self:IfMessagesHit() and self:IfMessagesToAll() )
                        :ToCoalitionIf( InitCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )
-              else
+              elseif TargetIsScenery ~= true then
                 MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit enemy target " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " .. PlayerHit.ScoreHit .. " times. " ..
                                  "Score: " .. PlayerHit.Score .. ".  Score Total:" .. Player.Score - Player.Penalty,
                                  MESSAGE.Type.Update )
                        :ToAllIf( self:IfMessagesHit() and self:IfMessagesToAll() )
                        :ToCoalitionIf( InitCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )
+              elseif TargetIsScenery == true then
+                MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit scenery object." .. " Score: " .. PlayerHit.Score .. ".  Score Total:" .. Player.Score - Player.Penalty,
+                             MESSAGE.Type.Update )
+                   :ToAllIf( self:IfMessagesHit() and self:IfMessagesToAll() )
+                   :ToCoalitionIf( InitCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )
               end
               self:ScoreCSV( InitPlayerName, TargetPlayerName, "HIT_SCORE", 1, 1, InitUnitName, InitUnitCoalition, InitUnitCategory, InitUnitType, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType )
             end
           else -- A scenery object was hit.
-            MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit scenery object.",
+            MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit nothing special.",
                              MESSAGE.Type.Update )
                    :ToAllIf( self:IfMessagesHit() and self:IfMessagesToAll() )
                    :ToCoalitionIf( InitCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )

Moose Development/Moose/Functional/Tiresias.lua

@@ -1,593 +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.5",
-  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. Does **not** work work for GROUP objects spawned into the SET after start, i.e. the groups need to exist in the game already.
--- @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:T("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 == 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 == false then
-          grp:SetCommandInvisible(true)
-          grp:SetAIOff()
-          grp.Tiresias.invisible = true
-          grp.Tiresias.AIOff = 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 == 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)
-        local name = grp:GetName()
-        if grp:GetCoalition() ~= group:GetCoalition()
-                            and 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:T("TIRESIAS - This group "..tostring(name).. " 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

@@ -3153,7 +3153,7 @@ end
 -- @param #WAREHOUSE self
 -- @return Core.Point#COORDINATE The coordinate of the warehouse.
 function WAREHOUSE:GetCoordinate()
-  return self.warehouse:GetCoordinate()
+  return self.warehouse:GetCoord()
 end
 
 --- Get 3D vector of warehouse static.
@@ -6893,7 +6893,7 @@ function WAREHOUSE:_CheckConquered()
     for _,_unit in pairs(units) do
       local unit=_unit --Wrapper.Unit#UNIT
 
-      local distance=coord:Get2DDistance(unit:GetCoordinate())
+      local distance=coord:Get2DDistance(unit:GetCoord())
 
       -- Filter only alive groud units. Also check distance again, because the scan routine might give some larger distances.
       if unit:IsGround() and unit:IsAlive() and distance <= radius then

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -48,7 +48,7 @@
 
 do -- ZONE_CAPTURE_COALITION
 
-  -- @type ZONE_CAPTURE_COALITION
+  --- @type ZONE_CAPTURE_COALITION
   -- @field #string ClassName Name of the class.
   -- @field #number MarkBlue ID of blue F10 mark.
   -- @field #number MarkRed ID of red F10 mark.
@@ -161,7 +161,7 @@ do -- ZONE_CAPTURE_COALITION
   -- The mission designer can use these values to alter the logic.
   -- For example:
   -- 
-  --     -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
+  --     --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
   --     function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
   --       if From ~= "Empty" then
   --         -- Display a message
@@ -172,7 +172,7 @@ do -- ZONE_CAPTURE_COALITION
   -- 
   -- ## Example Event Handler.
   -- 
-  --     -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
+  --     --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
   --     function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
   --       if From ~= To then
   --         local Coalition = self:GetCoalition()
@@ -273,7 +273,7 @@ do -- ZONE_CAPTURE_COALITION
   -- Depending on the zone ownership, different messages are sent.
   -- Note the methods `ZoneCaptureCoalition:GetZoneName()`.
   --      
-  --      -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
+  --      --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
   --      function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
   --        if From ~= To then
   --          local Coalition = self:GetCoalition()
@@ -294,7 +294,7 @@ do -- ZONE_CAPTURE_COALITION
   -- Next is the Event Handler when the **Empty** state transition is triggered.
   -- Now we smoke the ZoneCaptureCoalition with a green color, using `self:Smoke( SMOKECOLOR.Green )`.
   --      
-  --      -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
+  --      --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
   --      function ZoneCaptureCoalition:OnEnterEmpty()
   --        self:Smoke( SMOKECOLOR.Green )
   --        US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCaptureCoalition:GetZoneName() ), MESSAGE.Type.Information )
@@ -304,7 +304,7 @@ do -- ZONE_CAPTURE_COALITION
   -- The next Event Handlers speak for itself.
   -- When the zone is Attacked, we smoke the zone white and send some messages to each coalition.     
   --      
-  --      -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
+  --      --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
   --      function ZoneCaptureCoalition:OnEnterAttacked()
   --        ZoneCaptureCoalition:Smoke( SMOKECOLOR.White )
   --        local Coalition = self:GetCoalition()
@@ -321,7 +321,7 @@ do -- ZONE_CAPTURE_COALITION
   -- When the zone is Captured, we send some victory or loss messages to the correct coalition.
   -- And we add some score.
   -- 
-  --      -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
+  --      --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
   --      function ZoneCaptureCoalition:OnEnterCaptured()
   --        local Coalition = self:GetCoalition()
   --        self:E({Coalition = Coalition})
@@ -641,7 +641,7 @@ do -- ZONE_CAPTURE_COALITION
   -- 
   -- @usage
   -- -- For example, one could stop the monitoring when the zone was captured!
-  -- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
+  -- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self
   -- function ZoneCaptureCoalition:OnEnterCaptured()
   --   local Coalition = self:GetCoalition()
   --   self:E({Coalition = Coalition})

Moose Development/Moose/Functional/ZoneGoal.lua

@@ -17,7 +17,7 @@
 
 do -- Zone
 
-  -- @type ZONE_GOAL
+  --- @type ZONE_GOAL
   -- @field #string ClassName Name of the class.
   -- @field Core.Goal#GOAL Goal The goal object.
   -- @field #number SmokeTime Time stamp in seconds when the last smoke of the zone was triggered.
@@ -178,7 +178,7 @@ do -- Zone
 
   end
 
-  -- @param #ZONE_GOAL self
+  --- @param #ZONE_GOAL self
   -- @param Core.Event#EVENTDATA EventData Event data table.
   function ZONE_GOAL:__Destroyed( EventData )
     self:F( { "EventDead", EventData } )

Moose Development/Moose/Functional/ZoneGoalCargo.lua

@@ -23,7 +23,7 @@
 
 do -- ZoneGoal
 
-  -- @type ZONE_GOAL_CARGO
+  --- @type ZONE_GOAL_CARGO
   -- @extends Functional.ZoneGoal#ZONE_GOAL
 
 
@@ -57,7 +57,7 @@ do -- ZoneGoal
     ClassName = "ZONE_GOAL_CARGO",
   }
   
-  -- @field #table ZONE_GOAL_CARGO.States
+  --- @field #table ZONE_GOAL_CARGO.States
   ZONE_GOAL_CARGO.States = {}
   
   --- ZONE_GOAL_CARGO Constructor.

Moose Development/Moose/Functional/ZoneGoalCoalition.lua

@@ -1,4 +1,4 @@
---- **Functional (WIP)** - Base class modeling processes to achieve goals involving coalition zones.
+--- **Functional** - Base class that models processes to achieve goals involving a Zone for a Coalition.
 --
 -- ===
 --
@@ -16,7 +16,7 @@
 
 do -- ZoneGoal
 
-  -- @type ZONE_GOAL_COALITION
+  --- @type ZONE_GOAL_COALITION
   -- @field #string ClassName Name of the Class.
   -- @field #number Coalition The current coalition ID of the zone owner.
   -- @field #number PreviousCoalition The previous owner of the zone.
@@ -48,7 +48,7 @@ do -- ZoneGoal
     ObjectCategories = nil,
   }
 
-  -- @field #table ZONE_GOAL_COALITION.States
+  --- @field #table ZONE_GOAL_COALITION.States
   ZONE_GOAL_COALITION.States = {}
 
   --- ZONE_GOAL_COALITION Constructor.

Moose Development/Moose/Modules.lua

@@ -31,8 +31,6 @@ __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( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Vector.lua')
 
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' )
@@ -78,13 +76,7 @@ __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( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua')
+__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua' )
 
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )
@@ -92,31 +84,6 @@ __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( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Balancer.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air.lua' )
@@ -187,9 +154,4 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_Dispatcher
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Zone.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Dispatcher.lua' )
 
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Navigation/Point.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Navigation/Beacons.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Navigation/Radios.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Navigation/Towns.lua' )
-
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Globals.lua' )

Moose Development/Moose/Modules_local.lua

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

Moose Development/Moose/Navigation/Beacons.lua

@@ -1,395 +0,0 @@
---- **NAVIGATION** - Beacons of the map/theatre.
---
--- **Main Features:**
---
---    * Access beacons of the map
---    * Find closest beacon
---    * Get frequencies and channels
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20Beacons).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Navigation.Beacons
--- @image NAVIGATION_Beacons.png
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- BEACONS class.
--- @type BEACONS
--- 
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field #table beacons Beacons.
--- 
--- @extends Core.Base#BASE
-
---- *Hope is the beacon that guides lost ships back to the shore.*
---
--- ===
---
--- # The BEACONS Concept
---
--- This class is desinged to make information about beacons of a map/theatre easier accessible. The information contains location, type and frequencies of all or specific beacons of the map.
--- 
--- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `beacons.lua` that can be
--- found in the installation directory of DCS for each map or a table that the user needs to provide.
--- 
--- # Basic Setup
--- 
--- A new `BEACONS` object can be created with the @{#BEACONS.NewFromFile}(*beacons_lua_file*) function.
--- 
---     local beacons=BEACONS:NewFromFile("<DCS_Install_Directory>\Mods\terrains\<Map_Name>\beacons.lua")
---     beacons:MarkerShow()
--- 
--- This will load the beacons from the `<DCS_Install_Directory>` for the specific map and place markers on the F10 map. This is the first step you should do to ensure that the file
--- you provided is correct and all relevant beacons are present.
--- 
--- # User Functions
--- 
--- ## F10 Map Markers
--- 
--- ## Position
--- 
--- ## Get Closest Beacon
--- 
---
--- @field #BEACONS
-BEACONS = {
-  ClassName  = "BEACONS",
-  verbose    =         1,
-  beacons    =        {},
-}
-
---- Mission capability.
--- @type BEACONS.Beacon
--- @field #function display_name Function that returns the localized name.
--- @field #number type Beacon type.
--- @field #string beaconId Beacon ID.
--- @field #string callsign Call sign.
--- @field #number frequency Frequency in Hz.
--- @field #number channel TACAN, RSBN or PRMG channel depending on type.
--- @field #table position Position table.
--- @field #number direction Direction in degrees.
--- @field #table positionGeo Table with latitude and longitude.
--- @field #table sceneObjects Table with scenery objects, e.g. `{t:393396742}`.
--- @field #number chartOffsetX No idea what this offset is?!
--- @field DCS#Vec3 vec3 Position vector 3D.
--- @field #number markerID ID for the F10 marker.
--- @field #string typeName Name of becon type.
--- @field Wrapper.Scenery#SCENERY scenery The scenery object.
-
---- BEACONS class version.
--- @field #string version
-BEACONS.version="0.0.4"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot...
--- DONE: TACAN channel from frequency (was already in beacon.lua as channel)
--- DONE: Scenery object
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor(s)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new BECAONS class instance from a given table.
--- @param #BEACONS self
--- @param #table BeaconTable Table with beacon info.
--- @return #BEACONS self
-function BEACONS:NewFromTable(BeaconTable)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #BEACONS
-  
-  for _,_beacon in pairs(BeaconTable) do
-    local beacon=_beacon --#BEACONS.Beacon
-    
-    -- Get 3D vector
-    beacon.vec3={x=beacon.position[1], y=beacon.position[2], z=beacon.position[3]}
-    
-    -- Get coordinate
-    beacon.coordinate=COORDINATE:NewFromVec3(beacon.vec3)
-    
-    -- Get type name
-    beacon.typeName=self:_GetTypeName(beacon.type)
-    
-    -- Find closest scenery object from scan
-    beacon.scenery=beacon.coordinate:FindClosestScenery(20)
-    
-    -- Debug stuff for scenery object
-    if false then
-      if beacon.scenery then
-        env.info(string.format("FF Beacon %s %s %s got scenery object %s, %s", beacon.callsign, beacon.beaconId, beacon.typeName, beacon.scenery:GetName(), beacon.scenery:GetTypeName() ))
-        UTILS.PrintTableToLog(beacon.scenery.SceneryObject)
-        UTILS.PrintTableToLog(beacon.sceneObjects)
-      else
-        env.info(string.format("FF NO scenery object  %s %s %s ", beacon.callsign, beacon.beaconId, beacon.typeName))
-      end
-    end
-    
-    -- Add to table
-    table.insert(self.beacons, beacon)
-  end
-  
-  -- Debug output
-  self:I(string.format("Added %d beacons", #self.beacons))
-  
-  if self.verbose > 0 then
-    local text="Beacon types:"
-    for typeName,typeID in pairs(BEACON.Type) do
-      local n=self:CountBeacons(typeID)
-      text=text..string.format("\n%s = %d", typeName, n)      
-    end
-    self:I(text)
-  end
-  
-  return self
-end
-
-
---- Create a new BECAONS class instance from a given file.
--- @param #BEACONS self
--- @param #string FileName Full path to the file containing the map beacons.
--- @return #BEACONS self
-function BEACONS:NewFromFile(FileName)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #BEACONS
-  
-  local exists=UTILS.FileExists(FileName)
-  
-  if exists==false then
-    self:E(string.format("ERROR: file with beacon info does not exist!"))
-    return nil
-  end
-
-  -- This will create a global table `beacons`  
-  dofile(FileName)
-
-  -- Get beacons from table.
-  self=self:NewFromTable(beacons)
-  
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get 3D position vector of a specific beacon.
--- @param #BEACONS self
--- @param #BEACONS.Beacon beacon The beacon data structure.
--- @return DCS#Vec3 Position vector.
-function BEACONS:GetVec3(beacon)
-  return beacon.vec3
-end
-
---- Get COORDINATE of a specific beacon.
--- @param #BEACONS self
--- @param #BEACONS.Beacon beacon The beacon data structure.
--- @return Core.Point#COORDINATE The coordinate.
-function BEACONS:GetCoordinate(beacon)
-  local coordinate=COORDINATE:NewFromVec3(beacon.vec3)
-  return coordinate
-end
-
---- Find closest beacon to a given coordinate.
--- @param #BEACONS self
--- @param Core.Point#COORDINATE Coordinate The reference coordinate.
--- @param #number TypeID (Optional) Only search for specific beacon types, *e.g.* `BEACON.Type.TACAN`.
--- @param #number DistMax (Optional) Max search distance in meters.
--- @param #table ExcludeList (Optional) List of beacons to exclude.
--- @return #BEACONS.Beacon The closest beacon.
-function BEACONS:GetClosestBeacon(Coordinate, TypeID, DistMax, ExcludeList)
-
-  local beacon=nil --#BEACONS.Beacon
-  local distmin=math.huge
-  
-  ExcludeList=ExcludeList or {}
-  
-  for _,_beacon in pairs(self.beacons) do
-    local bc=_beacon --#BEACONS.Beacon
-    
-    if (TypeID==nil or TypeID==bc.type) and (not UTILS.IsInTable(ExcludeList, bc, "beaconId")) then
-    
-      local dist=Coordinate:Get2DDistance(bc.vec3)
-      
-      if dist<distmin and (DistMax==nil or dist<=DistMax) then
-        distmin=dist
-        beacon=bc
-      end
-      
-    end
-    
-  end  
-  
-  return beacon
-end
-
---- Get table of all beacons, optionally of a given type.
--- @param #BEACONS self
--- @param #number TypeID (Optional) Only return specific beacon types, *e.g.* `BEACON.Type.TACAN`.
--- @return #table Table of beacons. Each element is of type #BEACON.Beacon.
-function BEACONS:GetBeacons(TypeID)
-  
-  local beacons={}
-  
-  for _,_beacon in pairs(self.beacons) do
-    local bc=_beacon --#BEACONS.Beacon
-    
-    if TypeID==nil or TypeID==bc.type then
-      table.insert(beacons, bc)
-    end
-    
-  end  
-
-  return beacons
-end
-
---- Count beacons, optionally of a given type.
--- @param #BEACONS self
--- @param #number TypeID (Optional) Only count specific beacon types, *e.g.* `BEACON.Type.TACAN`.
--- @return #number Number of beacons.
-function BEACONS:CountBeacons(TypeID)
-
-  local n=0
-  
-  if TypeID then
-    for _,_beacon in pairs(self.beacons) do
-      local bc=_beacon --#BEACONS.Beacon
-      
-      if TypeID==bc.type then
-        n=n+1
-      end 
-    end
-  else
-    n=#self.beacons
-  end
-
-  return n
-end
-
---- Add markers for all beacons on the F10 map. Optionally, only a specific beacon or a certain beacon type can be marked.
--- @param #BEACONS self
--- @param #BEACONS.Beacon Beacon (Optional) Only this specifc beacon.
--- @param #number TypeID (Optional) Only show specific beacon types, *e.g.* `BEACON.Type.TACAN`.
--- @return #BEACONS self
-function BEACONS:MarkerShow(Beacon, TypeID)
-
-  for _,_beacon in pairs(self.beacons) do
-    local beacon=_beacon --#BEACONS.Beacon
-    if Beacon==nil or Beacon.beaconId==beacon.beaconId then
-      if TypeID==nil or beacon.type==TypeID then
-        local text=self:_GetMarkerText(beacon)
-        local coord=COORDINATE:NewFromVec3(beacon.vec3)
-        if beacon.markerID then
-          UTILS.RemoveMark(beacon.markerID)
-        end
-        beacon.markerID=coord:MarkToAll(text)
-      end
-    end
-  end
-
-  return self
-end
-
---- Remove markers of all beacons from the F10 map. Optionally, remove only marker of a specific beacon or a certain beacon type.
--- @param #BEACONS self
--- @param #BEACONS.Beacon Beacon (Optional) Only this specifc beacon.
--- @param #number TypeID (Optional) Only show specific beacon types, *e.g.* `BEACON.Type.TACAN`.
--- @return #BEACONS self
-function BEACONS:MarkerRemove(Beacon, TypeID)
-
-  for _,_beacon in pairs(self.beacons) do
-    local beacon=_beacon --#BEACONS.Beacon
-    if Beacon==nil or Beacon.beaconId==beacon.beaconId then    
-      if TypeID==nil or beacon.type==TypeID then    
-        if beacon.markerID then
-          UTILS.RemoveMark(beacon.markerID)
-          beacon.markerID=nil
-        end
-      end
-    end
-  end
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Private Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get text displayed in the F10 marker.
--- @param #BEACONS self
--- @param #BEACONS.Beacon beacon The beacon data structure.
--- @return #string Marker text.
-function BEACONS:_GetMarkerText(beacon)
-
-  local frequency, funit=self:_GetFrequency(beacon.frequency)
-  local direction=beacon.direction~=nil and beacon.direction or -1
-
-  local text=string.format("Beacon %s [ID=%s]", tostring(beacon.typeName), tostring(beacon.beaconId))  
-  text=text..string.format("\nCallsign: %s", tostring(beacon.callsign))
-  if UTILS.IsInTable({BEACON.Type.TACAN, BEACON.Type.RSBN, BEACON.Type.PRMG_GLIDESLOPE, BEACON.Type.PRMG_LOCALIZER}, beacon.type) then
-    text=text..string.format("\nChannel: %s", tostring(beacon.channel))
-  end
-  text=text..string.format("\nFrequency: %.3f %s", frequency, funit)
-  text=text..string.format("\nDirection: %.1f°", direction)
-  
-  return text
-end
-
-
---- Get converted frequency.
--- @param #BEACONS self
--- @param #number freq Frequency in Hz.
--- @return #number Frequency in better unit.
--- @return #string Unit ("Hz", "kHz", "MHz").
-function BEACONS:_GetFrequency(freq)
-
-  freq=freq or 0
-  local unit="Hz"
-  
-  if freq>=1e6 then
-    freq=freq/1e6
-    unit="MHz"
-  elseif freq>=1e3 then
-    freq=freq/1e3
-    unit="kHz"
-  end
-
-  return freq, unit
-end
-
---- Get name of beacon type.
--- @param #BEACONS self
--- @param #number typeID Beacon type number.
--- @return #string Type name.
-function BEACONS:_GetTypeName(typeID)
-
-  if typeID~=nil then  
-    for typeName,_typeID in pairs(BEACON.Type) do
-      if _typeID==typeID then
-        return typeName
-      end  
-    end
-  end
-
-  return "Unknown"
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Navigation/Point.lua

@@ -1,587 +0,0 @@
---- **NAVIGATION** - Navigation Airspace Points, Fixes and Aids.
---
--- **Main Features:**
---
---    * Stuff
---    * More Stuff
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20NavFix).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Navigation.Point
--- @image NAVIGATION_Point.png
-
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- NAVFIX class.
--- @type NAVFIX
--- 
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field #string name Name of the point.
--- @field #string typePoint Type of the point, *e.g. "Intersection", "VOR", "Airport".
--- @field Core.Vector#VECTOR vector Position vector of the fix.
--- @field Wrapper.Marker#MARKER marker Marker on F10 map.
--- @field #number altMin Minimum altitude in meters.
--- @field #number altMax Maximum altitude in meters.
--- @field #number speedMin Minimum speed in knots.
--- @field #number speedMax Maximum speed in knots.
--- 
--- @field #boolean isCompulsory Is this a compulsory fix.
--- @field #boolean isFlyover Is this a flyover fix (`true`) or turning point otherwise.
--- @field #boolean isFAF Is this a final approach fix.
--- @field #boolean isIAF Is this an initial approach fix.
--- @field #boolean isIF Is this an initial fix.
--- @field #boolean isMAF Is this an initial fix.
--- 
--- @extends Core.Base#BASE
-
---- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
---
--- ===
---
--- # The NAVFIX Concept
---
--- The NAVFIX class has a great concept!
--- 
--- A NAVFIX describes a geo position and can, *e.g.*, be part of a FLIGHTPLAN. It has a unique name and is of a certain type, *e.g.* "Intersection", "VOR", "Airbase" etc.
--- It can also have further properties as min/max altitudes and speeds that aircraft need to obey when they pass the point.
--- 
--- # Basic Setup
--- 
--- A new `NAVFIX` object can be created with the @{#NAVFIX.New}() function.
--- 
---     myNavPoint=NAVFIX:New()
---     myTemplate:SetXYZ(X, Y, Z)
---     
--- This is how it works.
---
--- @field #NAVFIX
-NAVFIX = {
-  ClassName       = "NAVFIX",
-  verbose         =          0,
-}
-
---- Type of point.
--- @type NAVFIX.Type
--- @field #string POINT Waypoint.
--- @field #string INTERSECTION Intersection of airway.
--- @field #string AIRPORT Airport.
--- @field #string VOR Very High Frequency Omnidirectional Range Station.
--- @field #string DME Distance Measuring Equipment.
--- @field #string NDB Non-Directional Beacon.
--- @field #string VORDME Combined VHF omnidirectional range (VOR) with a distance-measuring equipment (DME).
--- @field #string LOC Localizer.
--- @field #string ILS Instrument Landing System.
--- @field #string TACAN TACtical Air Navigation System (TACAN).
-NAVFIX.Type={
-  POINT="Point",
-  INTERSECTION="Intersection",
-  AIRPORT="Airport",
-  NDB="NDB",
-  VOR="VOR",
-  DME="DME",
-  VORDME="VOR/DME",
-  LOC="Localizer",
-  ILS="ILS",
-  TACAN="TACAN"
-}
-
---- NAVFIX class version.
--- @field #string version
-NAVFIX.version="0.0.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot...
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor(s)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new NAVFIX class instance from a given VECTOR.
--- @param #NAVFIX self
--- @param #string Name Name/ident of the point. Should be unique!
--- @param #string Type Type of the point. Default `NAVFIX.Type.POINT`.
--- @param Core.Vector#VECTOR Vector Position vector of the navpoint.
--- @return #NAVFIX self
-function NAVFIX:NewFromVector(Name, Type, Vector)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #NAVFIX
-  
-  -- Vector of point.
-  self.vector=Vector
-  
-  -- Name of point.
-  self.name=Name
-  
-  -- Type of the point.
-  self.typePoint=Type or NAVFIX.Type.POINT
-  
-  local coord=COORDINATE:NewFromVec3(self.vector)
-  
-  -- Marker on F10.
-  self.marker=MARKER:New(coord, self:_GetMarkerText())
-  
-  -- Log ID string.
-  self.lid=string.format("NAVFIX %s [%s] | ", tostring(self.name), tostring(self.typePoint))
-  
-  -- Debug info.
-  self:I(self.lid..string.format("Created NAVFIX"))
-
-  return self
-end
-
-
---- Create a new NAVFIX class instance from a given COORDINATE.
--- @param #NAVFIX self
--- @param #string Name Name of the fix. Should be unique!
--- @param #string Type Type of the point. Default `NAVFIX.Type.POINT`.
--- @param Core.Point#COORDINATE Coordinate Coordinate of the point.
--- @return #NAVFIX self
-function NAVFIX:NewFromCoordinate(Name, Type, Coordinate)
-
-  -- Create a VECTOR from the coordinate.
-  local Vector=VECTOR:NewFromVec(Coordinate)
-  
-  -- Create NAVFIX.
-  self=NAVFIX:NewFromVector(Name, Type, Vector)
-  
-  return self
-end
-
-
---- Create a new NAVFIX instance from given latitude and longitude in degrees, minutes and seconds (DMS).
--- @param #NAVFIX self
--- @param #string Name Name of the fix. Should be unique!
--- @param #string Type Type of the point. Default `NAVFIX.Type.POINT`.
--- @param #string Latitude Latitude in DMS as string.
--- @param #string Longitude Longitude in DMS as string.
--- @return #NAVFIX self
-function NAVFIX:NewFromLLDMS(Name, Type, Latitude, Longitude)
-
-  -- Create a VECTOR from the coordinate.
-  local Vector=VECTOR:NewFromLLDMS(Latitude, Longitude)
-
-  -- Create NAVFIX.
-  self=NAVFIX:NewFromVector(Name, Type, Vector)
-  
-  return self  
-end
-
---- Create a new NAVFIX instance from given latitude and longitude in decimal degrees (DD).
--- @param #NAVFIX self
--- @param #string Name Name of the fix. Should be unique!
--- @param #string Type Type of the point. Default `NAVFIX.Type.POINT`.
--- @param #number Latitude Latitude in DD.
--- @param #number Longitude Longitude in DD.
--- @return #NAVFIX self
-function NAVFIX:NewFromLLDD(Name, Type, Latitude, Longitude)
-
-  -- Create a VECTOR from the coordinate.
-  local Vector=VECTOR:NewFromLLDD(Latitude, Longitude)
-
-  -- Create NAVFIX.
-  self=NAVFIX:NewFromVector(Name, Type, Vector)
-  
-  return self  
-end
-
-
---- Create a new NAVFIX class instance relative to a given other NAVFIX.
--- You have to specify the distance and bearing from the new point to the given point. *E.g.*, for a distance of 5 NM and a bearing of 090° (West), the
--- new nav point is created 5 NM East of the given nav point. The reason is that this corresponts to convention used in most maps.
--- You can, however, use the `Reciprocal` switch to create the new point in the direction you specify.
--- @param #NAVFIX self
--- @param #string Name Name of the fix. Should be unique!
--- @param #string Type Type of navfix.
--- @param #NAVFIX NavFix The given/existing navigation fix relative to which the new fix is created.
--- @param #number Distance Distance from the given to the new point in nautical miles.
--- @param #number Bearing Bearing [Deg] from the new point to the given one.
--- @param #boolean Reciprocal If `true` the reciprocal `Bearing` is taken so it specifies the direction from the given point to the new one. 
--- @return #NAVFIX self
-function NAVFIX:NewFromNavFix(Name, Type, NavFix, Distance, Bearing, Reciprocal)
-
-  -- Convert magnetic to true bearing by adding magnetic declination, e.g. mag. bearing 10°M ==> true bearing 16°M (for 6° variation on Caucasus map)
-  Bearing=Bearing+UTILS.GetMagneticDeclination()
-
-  if Reciprocal then
-    Bearing=Bearing-180
-  end
-  
-  -- Translate.
-  local Vector=NavFix.vector:Translate(UTILS.NMToMeters(Distance), Bearing, true)
-  
-  self=NAVFIX:NewFromVector(Name, Type, Vector)
-  
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Set whether this is the intermediate fix (IF).
--- @param #NAVFIX self
--- @return #NAVFIX self
-function NAVFIX:SetIntermediateFix(IntermediateFix)
-  self.isIF=IntermediateFix
-  return self
-end
-
---- Set whether this is an initial approach fix (IAF).
--- The IAF is the point where the initial approach segment of an instrument approach begins.
--- It is usually a designated intersection, VHF omidirectional range (VOR) non-directional beacon (NDB)
--- or distance measuring equipment (DME) fix.
--- The IAF may be collocated with the intermediate fix (IF) of the instrument apprach an in such case they designate the
--- beginning of the intermediate segment of the approach. When the IAF and the IF are combined, there is no inital approach segment.
--- @param #NAVFIX self
--- @param #boolean IntermediateFix If `true`, this is an intermediate fix.
--- @return #NAVFIX self
-function NAVFIX:SetInitialApproachFix(IntermediateFix)
-  self.isIAF=IntermediateFix
-  return self
-end
-
-
---- Set whether this is the final approach fix (FAF).
--- @param #NAVFIX self
--- @param #boolean FinalApproachFix If `true`, this is a final approach fix.
--- @return #NAVFIX self
-function NAVFIX:SetFinalApproachFix(FinalApproachFix)
-  self.isFAF=FinalApproachFix
-  return self
-end
-
---- Set whether this is the final approach fix (FAF).
--- @param #NAVFIX self
--- @param #boolean FinalApproachFix If `true`, this is a final approach fix.
--- @return #NAVFIX self
-function NAVFIX:SetMissedApproachFix(MissedApproachFix)
-  self.isMAF=MissedApproachFix
-  return self
-end
-
-
---- Set minimum altitude.
--- @param #NAVFIX self
--- @param #number Altitude Min altitude in feet.
--- @return #NAVFIX self
-function NAVFIX:SetAltMin(Altitude)
-
-  self.altMin=Altitude
-
-  return self
-end
-
---- Set maximum altitude.
--- @param #NAVFIX self
--- @param #number Altitude Max altitude in feet.
--- @return #NAVFIX self
-function NAVFIX:SetAltMax(Altitude)
-
-  self.altMax=Altitude
-
-  return self
-end
-
---- Set mandatory altitude (min alt = max alt).
--- @param #NAVFIX self
--- @param #number Altitude Altitude in feet.
--- @return #NAVFIX self
-function NAVFIX:SetAltMandatory(Altitude)
-
-  self.altMin=Altitude
-  self.altMax=Altitude
-
-  return self
-end
-
---- Set minimum allowed speed at this fix.
--- @param #NAVFIX self
--- @param #number Speed Min speed in knots.
--- @return #NAVFIX self
-function NAVFIX:SetSpeedMin(Speed)
-
-  self.speedMin=Speed
-
-  return self
-end
-
---- Set maximum allowed speed at this fix.
--- @param #NAVFIX self
--- @param #number Speed Max speed in knots.
--- @return #NAVFIX self
-function NAVFIX:SetSpeedMax(Speed)
-
-  self.speedMax=Speed
-
-  return self
-end
-
---- Set mandatory speed (min speed = max speed) at this fix.
--- @param #NAVFIX self
--- @param #number Speed Mandatory speed in knots.
--- @return #NAVFIX self
-function NAVFIX:SetSpeedMandatory(Speed)
-
-  self.speedMin=Speed
-  self.speedMax=Speed
-
-  return self
-end
-
-
---- Set whether this fix is compulsory.
--- @param #NAVFIX self
--- @param #boolean Compulsory If `true`, this is a compusory fix. If `false` or nil, it is non-compulsory.
--- @return #NAVFIX self
-function NAVFIX:SetCompulsory(Compulsory)
-  self.isCompulsory=Compulsory
-  return self
-end
-
---- Set whether this is a fly-over fix fix.
--- @param #NAVFIX self
--- @param #boolean FlyOver If `true`, this is a fly over fix. If `false` or nil, it is not.
--- @return #NAVFIX self
-function NAVFIX:SetFlyOver(FlyOver)
-  self.isFlyover=FlyOver
-  return self
-end
-
-
---- Get the altitude in feet MSL. If min and max altitudes are set, it will return a random altitude between min and max.
--- @param #NAVFIX self
--- @return #number Altitude in feet MSL. Can be `nil`, if neither min nor max altitudes have beeen set. 
-function NAVFIX:GetAltitude()
-
-  local alt=nil
-  if self.altMin and self.altMax and self.altMin~=self.altMax then
-    alt=math.random(self.altMin, self.altMax)
-  elseif self.altMin then
-    alt=self.altMin
-  elseif self.altMax then
-    alt=self.altMax
-  end
-
-  return alt
-end
-
-
---- Get the speed. If min and max speeds are set, it will return a random speed between min and max.
--- @param #NAVFIX self
--- @return #number Speed in knots. Can be `nil`, if neither min nor max speeds have beeen set. 
-function NAVFIX:GetSpeed()
-
-  local speed=nil
-  if self.speedMin and self.speedMax and self.speedMin~=self.speedMax then
-    speed=math.random(self.speedMin, self.speedMax)
-  elseif self.speedMin then
-    speed=self.speedMin
-  elseif self.speedMax then
-    speed=self.speedMax
-  end
-
-  return speed
-end
-
-
-
---- Add marker the NAVFIX on the F10 map.
--- @param #NAVFIX self
--- @return #NAVFIX self
-function NAVFIX:MarkerShow()
-
-  self.marker:ToAll()
-
-  return self
-end
-
---- Remove marker of the NAVFIX from the F10 map.
--- @param #NAVFIX self
--- @return #NAVFIX self
-function NAVFIX:MarkerRemove()
-
-  self.marker:Remove()
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Private Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get text displayed in the F10 marker.
--- @param #NAVFIX self
--- @return #string Marker text.
-function NAVFIX:_GetMarkerText()
-
-  local altmin=self.altMin and tostring(self.altMin) or ""
-  local altmax=self.altMax and tostring(self.altMax) or ""
-  local speedmin=self.speedMin and tostring(self.speedMin) or ""
-  local speedmax=self.speedMax and tostring(self.speedMax) or ""
-
-
-  local text=string.format("NAVFIX %s", self.name)
-  if self.isIAF then
-    text=text..string.format(" (IAF)")
-  end
-  if self.isIF then
-    text=text..string.format(" (IF)")
-  end
-  text=text..string.format("\nAltitude [ft]: %s - %s", altmin, altmax)
-  text=text..string.format("\nSpeed [knots]: %s - %s", speedmin, speedmax)
-  text=text..string.format("\nCompulsory: %s", tostring(self.isCompulsory))
-  text=text..string.format("\nFly Over: %s", tostring(self.isFlyover))
-  
-  return text
-end
-
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- NAVAID class.
--- @type NAVAID
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @extends Navigation.Point#NAVFIX
-
---- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
---
--- ===
---
--- # The NAVAID Concept
---
--- A NAVAID consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
--- 
--- # Basic Setup
--- 
--- A new `NAVAID` object can be created with the @{#NAVAID.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
--- and `FleetName` is the name you want to give the fleet. This must be *unique*!
--- 
---     myFleet=NAVAID:New("myWarehouseName", "1st Fleet")
---     myFleet:SetPortZone(ZonePort1stFleet)
---     myFleet:Start()
---     
--- A fleet needs a *port zone*, which is set via the @{#NAVAID.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
--- 
--- Finally, the fleet needs to be started using the @{#NAVAID.Start}() function. If the fleet is not started, it will not process any requests.
---
--- @field #NAVAID
-NAVAID = {
-  ClassName       = "NAVAID",
-  verbose         =       0,
-}
-  
---- NAVAID class version.
--- @field #string version
-NAVAID.version="0.0.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: Add frequencies. Which unit MHz, kHz, Hz?
--- TODO: Add radial function
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new NAVAID class instance.
--- @param #NAVAID self
--- @param #string Name Name/ident of this navaid.
--- @param #string Type Type of the point. Default `NAVFIX.Type.POINT`.
--- @param #string ZoneName Name of the zone to scan the scenery.
--- @param #string SceneryName Name of the scenery object.
--- @return #NAVAID self
-function NAVAID:NewFromScenery(Name, Type, ZoneName, SceneryName)
-
-  -- Get the zone.
-  local zone=ZONE:FindByName(ZoneName)
-  
-  -- Get coordinate.
-  local Coordinate=zone:GetCoordinate()
-
-  -- Inherit everything from NAVFIX class.
-  self=BASE:Inherit(self, NAVFIX:NewFromCoordinate(Name, Type, Coordinate)) -- #NAVAID
-
-  -- Set zone.
-  self.zone=ZONE:FindByName(ZoneName)
-
-  -- Try to get the scenery object. Note not all can be found unfortunately.
-  if SceneryName then
-    self.scenery=SCENERY:FindByNameInZone(SceneryName, ZoneName)
-    if not self.scenery then
-      self:E(string.format("ERROR: Could not find scenery object %s in zone %s", SceneryName, ZoneName))
-    end
-  end
-  
-  -- Alias.  
-  self.alias=string.format("%s %s %s", tostring(ZoneName), tostring(SceneryName), tostring(Type))
-  
-  -- Set some string id for output to DCS.log file.
-  self.lid=string.format("NAVAID %s | ", self.alias)
-  
-  -- Debug info.
-  self:I(self.lid..string.format("Created NAVAID!"))
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Set frequency the beacon transmits on.
--- @param #NAVAID self
--- @param #number Frequency Frequency in Hz.
--- @return #NAVAID self
-function NAVAID:SetFrequency(Frequency)
-
-  self.frequency=Frequency
-
-  return self
-end
-
---- Set channel of, *e.g.*, TACAN beacons.
--- @param #NAVAID self
--- @param #number Channel The channel.
--- @param #string Band The band either `"X"` (default) or `"Y"`. 
--- @return #NAVAID self
-function NAVAID:SetChannel(Channel, Band)
-
-  self.channel=Channel
-  self.band=Band or "X"
-
-  return self
-end
-
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Private Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- Add private CLASS functions here.
--- No private NAVAID functions yet.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Navigation/Radios.lua

@@ -1,324 +0,0 @@
---- **NAVIGATION** - Airbase radios.
---
--- **Main Features:**
---
---    * Get radio frequencies of airbases
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20Radios).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Navigation.Radios
--- @image NAVIGATION_Radios.png
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- RADIOS class.
--- @type RADIOS
--- 
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field #table radios Radios.
--- 
--- @extends Core.Base#BASE
-
---- *It's not true I had nothing on, I had the radio on.* -- *Marilyn Monroe*
---
--- ===
---
--- # The RADIOS Concept
---
--- This class is desinged to make information about radios of a map/theatre easier accessible. The information contains mostly the frequencies of airbases of the map.
--- 
--- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `radio.lua` that can be
--- found in the installation directory of DCS for each map or a table that the user needs to provide.
--- 
--- # Basic Setup
--- 
--- A new `RADIOS` object can be created with the @{#RADIOS.NewFromFile}(*radio_lua_file*) function.
--- 
---     local radios=RADIOS:NewFromFile("<DCS_Install_Directory>\Mods\terrains\<Map_Name>\radios.lua")
---     radios:MarkerShow()
--- 
--- This will load the radios from the `<DCS_Install_Directory>` for the specific map and place markers on the F10 map. This is the first step you should do to ensure that the file
--- you provided is correct and all relevant radios are present.
--- 
--- # User Functions
--- 
--- ## F10 Map Markers
--- 
--- ## Position
--- 
--- ## Closest Radio
--- 
---
--- @field #RADIOS
-RADIOS = {
-  ClassName  = "RADIOS",
-  verbose    =         0,
-  radios    =        {},
-}
-
---- Radio item data structure.
--- @type RADIOS.Radio
--- @field #string radioId Radio ID.
--- @field #table role Roles of the radio (usually {"ground", "tower", "approach"}).
--- @field #table callsign Callsigns of the radio (usually the airbase name).
--- @field #table frequency Frequencies of the radios.
--- @field #table position Position table.
--- @field #table sceneObjects Scenery objects.
--- @field #string name Name of the airbase.
--- @field Wrapper.Airbase#AIRBASE airbase Airbase.
-
---- Radio item data structure.
--- @type RADIOS.Frequency
--- @field #number modu Modulation type.
--- @field #number freq Frequency in Hz.
-
-
---- RADIOS class version.
--- @field #string version
-RADIOS.version="0.0.0"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot...
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor(s)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new RADIOS class instance from a given table.
--- @param #RADIOS self
--- @param #table RadioTable Table with radios info.
--- @return #RADIOS self
-function RADIOS:NewFromTable(RadioTable)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #RADIOS
-  
-  local airbasenames=AIRBASE.GetAllAirbaseNames()
-  
-  for _,_radio in pairs(RadioTable) do
-    local radio=_radio --#RADIOS.Radio
-    
-    --UTILS.PrintTableToLog(radio)
-    --UTILS.PrintTableToLog(radio.callsign)
-    
-    -- The table structure of callsign is a bit awkward. We need to get the airbase name.
-    local cs=radio.callsign[1]
-    if cs and cs.common then
-      radio.name=cs.common[1]
-    elseif cs and cs.nato then
-      radio.name=cs.nato[1]
-    else
-      radio.name="Unknown"
-    end
-    
-    --UTILS.PrintTableToLog(radio.callsign)
-    
-    radio.name=self:_GetAirbaseName(airbasenames, radio.name)
-    
-    radio.airbase=AIRBASE:FindByName(radio.name)
-    
-    if radio.airbase then
-      radio.coordinate=radio.airbase:GetCoordinate()
-    end
-    
-    -- Add to table
-    table.insert(self.radios, radio)
-  end
-  
-  -- Debug output
-  self:I(string.format("Added %d radios", #self.radios))
-  
-  return self
-end
-
-
---- Create a new RADIOS class instance from a given file.
--- @param #RADIOS self
--- @param #string FileName Full path to the file containing the map radios.
--- @return #RADIOS self
-function RADIOS:NewFromFile(FileName)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #RADIOS
-  
-  local exists=UTILS.FileExists(FileName)
-  
-  if exists==false then
-    self:E(string.format("ERROR: file with radios info does not exist! File=%s", tostring(FileName)))
-    return nil
-  end
-
-  -- This will create a global table `radio`  
-  dofile(FileName)
-
-  -- Get radios from table.
-  self=self:NewFromTable(radio)
-  
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get 3D position vector of a specific radio.
--- @param #RADIOS self
--- @param #RADIOS.Radio radio The radio data structure.
--- @return DCS#Vec3 Position vector.
-function RADIOS:GetVec3(radio)
-  return radio.vec3
-end
-
---- Get COORDINATE of a specific radio.
--- @param #RADIOS self
--- @param #RADIOS.Radio radio The radio data structure.
--- @return Core.Point#COORDINATE The coordinate.
-function RADIOS:GetCoordinate(radio)
-  return radio.coordinate
-end
-
---- Add markers for all radios on the F10 map.
--- @param #RADIOS self
--- @param #RADIOS.Radio Radio (Optional) Only this specifc radio.
--- @return #RADIOS self
-function RADIOS:MarkerShow(Radio)
-
-  for _,_radio in pairs(self.radios) do
-    local radio=_radio --#RADIOS.Radio
-    if Radio==nil or Radio.radioId==radio.radioId then
-      local coord=self:GetCoordinate(radio)
-      if coord then
-        local text=self:_GetMarkerText(radio)
-        if radio.markerID then
-          UTILS.RemoveMark(radio.markerID)
-        end
-        radio.markerID=coord:MarkToAll(text)
-      end
-    end
-  end
-
-  return self
-end
-
---- Remove markers of all radios from the F10 map.
--- @param #RADIOS self
--- @param #RADIOS.Radio Radio (Optional) Only this specifc radio.
--- @return #RADIOS self
-function RADIOS:MarkerRemove(Radio)
-
-  for _,_radio in pairs(self.radios) do
-    local radio=_radio --#RADIOS.Radio
-    if Radio==nil or Radio.radioId==radio.radioId then    
-      if radio.markerID then
-        UTILS.RemoveMark(radio.markerID)
-        radio.markerID=nil
-      end
-    end
-  end
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Private Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get text displayed in the F10 marker.
--- @param #RADIOS self
--- @param #RADIOS.Radio radio The radio data structure.
--- @return #string Marker text.
-function RADIOS:_GetMarkerText(radio)
-
-  local text=string.format("Radio %s", tostring(radio.name))
-  for b,f in pairs(radio.frequency) do
-    local frequency=f --#RADIOS.Frequency
-    local mod=frequency[1]
-    local fre=frequency[2]
-    local freq, funit=self:_GetFrequency(fre)
-    --UTILS.PrintTableToLog(frequency)
-    local band=self:_GetBandName(b)
-    text=text..string.format("\n%s: %.3f %s", band, freq, funit)
-  end
-    
-  return text
-end
-
-
---- Get converted frequency.
--- @param #RADIOS self
--- @param #number freq Frequency in Hz.
--- @return #number Frequency in better unit.
--- @return #string Unit ("Hz", "kHz", "MHz").
-function RADIOS:_GetFrequency(freq)
-
-  freq=freq or 0
-  local unit="Hz"
-  
-  if freq>=1e6 then
-    freq=freq/1e6
-    unit="MHz"
-  elseif freq>=1e3 then
-    freq=freq/1e3
-    unit="kHz"
-  end
-
-  return freq, unit
-end
-
---- Get name of frequency band.
--- @param #RADIOS self
--- @param #number BandNumber Band as number.
--- @return #string Band name.
-function RADIOS:_GetBandName(BandNumber)
-
-  if BandNumber~=nil then  
-    for bandName,bandNumber in pairs(ENUMS.FrequencyBand) do
-      if bandNumber==BandNumber then
-        return bandName
-      end  
-    end
-  end
-
-  return "Unknown"
-end
-
---- Get name of frequency band.
--- @param #RADIOS self
--- @param #table airbasenames Names of all airbases.
--- @param #string name Name of airbase.
--- @return #string Name of airbase
-function RADIOS:_GetAirbaseName(airbasenames, name)
-
-  local airbase=AIRBASE:FindByName(name)
-  
-  if airbase then
-    return name    
-  else
-    for _,airbasename in pairs(airbasenames) do
-      if string.find(airbasename, name) then
-        return airbasename
-      end    
-    end
-  end
-
-  return "Unknown"
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Navigation/Towns.lua

@@ -1,296 +0,0 @@
---- **NAVIGATION** - Beacons of the map/theatre.
---
--- **Main Features:**
---
---    * Find towns of map
---    * Road and rail connections
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Navigation%20-%20Towns).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Navigation.Towns
--- @image NAVIGATION_Towns.png
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- TOWNS class.
--- @type TOWNS
--- 
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field #table towns Towns.
--- 
--- @extends Core.Base#BASE
-
---- *Hope is the beacon that guides lost ships back to the shore.*
---
--- ===
---
--- # The TOWNS Concept
---
--- This class is desinged to make information about towns of a map/theatre easier accessible. The information contains location and road/rail connections of the towns.
--- 
--- **Note** that try to avoid hard coding stuff in Moose since DCS is updated frequently and things change. Therefore, the main source of information is either a file `towns.lua` that can be
--- found in the installation directory of DCS for each map or a table that the user needs to provide.
--- 
--- # Basic Setup
--- 
--- A new `TOWNS` object can be created with the @{#TOWNS.NewFromFile}(*towns_lua_file*) function.
--- 
---     local towns=TOWNS:NewFromFile("<DCS_Install_Directory>\Mods\terrains\<Map_Name>\towns.lua")
---     towns:MarkerShow()
--- 
--- This will load the towns from the `<DCS_Install_Directory>` for the specific map and place markers on the F10 map. This is the first step you should do to ensure that the file
--- you provided is correct and all relevant towns are present.
--- 
--- # User Functions
--- 
--- ## F10 Map Markers
--- 
--- ## Position
--- 
--- ## Get Closest Town
--- 
---
--- @field #TOWNS
-TOWNS = {
-  ClassName  =   "TOWNS",
-  verbose    =         0,
-  towns      =        {},
-}
-
---- Town data.
--- @type TOWNS.Town
--- @field #string display_name Displayed name.
--- @field #string name Name of the town.
--- @field #number latitude Latitude.
--- @field #number longitude Longitude
--- @field DCS#Vec3 vec3 Position vector 3D.
--- @field Core.Point#COORDINATE coordinate The coordinate.
--- @field Core.Point#COORDINATE coordRoad The coordinate of the closest road.
--- @field Core.Point#COORDINATE coordRail The coordinate of the closest railway.
--- @field #number markerID ID for the F10 marker.
-
---- TOWNS class version.
--- @field #string version
-TOWNS.version="0.0.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot...
--- TODO: Road connection
--- TODO: Rail connection
--- TODO: Connection between towns
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor(s)
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new TOWNS class instance from a given table.
--- @param #TOWNS self
--- @param #table TownTable Table with all towns data.
--- @return #TOWNS self
-function TOWNS:NewFromTable(TownTable)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #TOWNS
-  
-  for TownName,_town in pairs(TownTable) do
-    local town=_town --#TOWNS.Town
-    
-    town.name=TownName    
-
-    -- Get coordinate
-    town.coordinate=COORDINATE:NewFromLLDD(town.latitude, town.longitude)
-    
-    -- Get coordinate of closest road
-    town.coordRoad=town.coordinate:GetClosestPointToRoad()
-    
-    -- Get coordinate of closest rail
-    town.coordRail=town.coordinate:GetClosestPointToRoad(true)
-    
-    -- Add to table
-    table.insert(self.towns, town)
-  end
-  
-  -- Debug output
-  self:I(string.format("Added %d towns", #self.towns))
-  
-  return self
-end
-
-
---- Create a new TOWNS class instance from a given file.
--- @param #TOWNS self
--- @param #string FileName Full path to the file containing the towns data.
--- @return #TOWNS self
-function TOWNS:NewFromFile(FileName)
-
-  -- Inherit everything from BASE class.
-  self=BASE:Inherit(self, BASE:New()) -- #TOWNS
-  
-  local exists=UTILS.FileExists(FileName)
-  
-  if exists==false then
-    self:E(string.format("ERROR: file with towns info does not exist!"))
-    return nil
-  end
-
-  -- This will create a global table `towns`  
-  dofile(FileName)
-
-  -- Get towns from table.
-  self=self:NewFromTable(towns)
-  
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get 3D position vector of a specific town.
--- @param #TOWNS self
--- @param #TOWNS.Town town The town data structure.
--- @return DCS#Vec3 Position vector.
-function TOWNS:GetVec3(town)
-  return town.vec3
-end
-
---- Get COORDINATE of a specific town.
--- @param #TOWNS self
--- @param #TOWNS.Town town The town data structure.
--- @return Core.Point#COORDINATE The coordinate.
-function TOWNS:GetCoordinate(town)
-  return town.coordinate
-end
-
---- Get closest road coordinate of a town.
--- @param #TOWNS self
--- @param #TOWNS.Town town The town data structure.
--- @return Core.Point#COORDINATE The closest road coordinate.
-function TOWNS:GetCoordRoad(town)
-  return town.coordRoad
-end
-
---- Get closest rail coordinate of a town.
--- @param #TOWNS self
--- @param #TOWNS.Town town The town data structure.
--- @return Core.Point#COORDINATE The closest rail coordinate.
-function TOWNS:GetCoordRail(town)
-  return town.coordRail
-end
-
---- Get road connection between two towns.
--- @param #TOWNS self
--- @param #TOWNS.Town townA The town data structure.
--- @param #TOWNS.Town townB The town data structure.
--- @return #table Table containing path coordinates.
-function TOWNS:GetConnectionRoad(townA, townB)
-
-  local path=townA.coordRoad:GetPathOnRoad(townB.coordRoad)
-
-  return path
-end
-
---- Find closest town to a given coordinate.
--- @param #TOWNS self
--- @param Core.Point#COORDINATE Coordinate The reference coordinate.
--- @return #TOWNS.Town The closest town.
-function TOWNS:GetClosestTown(Coordinate)
-
-  local Town=nil --#TOWNS.Town
-  local distmin=math.huge
-  
-  for _,_town in pairs(self.towns) do
-    local town=_town --#TOWNS.Town
-    
-    local dist=Coordinate:Get2DDistance(town.coordinate)
-    
-    if dist<distmin then
-      distmin=dist
-      Town=town
-    end    
-  end
-  
-  return Town
-end
-
---- Get table of all towns, optionally of a given type.
--- @param #TOWNS self
--- @return #table Table of towns. Each element is of type #TOWN.Town.
-function TOWNS:GetTowns()
-  return self.towns
-end
-
---- Add markers for all towns on the F10 map.
--- @param #TOWNS self
--- @param #TOWNS.Town Town (Optional) Only this specifc town.
--- @return #TOWNS self
-function TOWNS:MarkerShow(Town)
-
-  for _,_town in pairs(self.towns) do
-    local town=_town --#TOWNS.Town
-    if Town==nil or Town.name==town.name then
-      local text=self:_GetMarkerText(town)
-      local coord=town.coordinate
-      if town.markerID then
-        UTILS.RemoveMark(town.markerID)
-      end
-      town.markerID=coord:MarkToAll(text)
-    end
-  end
-
-  return self
-end
-
---- Remove markers of all towns from the F10 map.
--- @param #TOWNS self
--- @param #TOWNS.Town Town (Optional) Only this specifc town.
--- @return #TOWNS self
-function TOWNS:MarkerRemove(Town)
-
-  for _,_town in pairs(self.towns) do
-    local town=_town --#TOWNS.Town
-    if Town==nil or Town.name==town.name then    
-      if town.markerID then
-        UTILS.RemoveMark(town.markerID)
-        town.markerID=nil
-      end
-    end
-  end
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Private Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Get text displayed in the F10 marker.
--- @param #TOWNS self
--- @param #TOWNS.Town town The town data structure.
--- @return #string Marker text.
-function TOWNS:_GetMarkerText(town)
-
-  local text=string.format("Town %s", town.name)  
-  --text=text..string.format("\nCallsign: %s", tostring(beacon.callsign))
-  
-  return text
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Brigade.lua

@@ -1,697 +0,0 @@
---- **Ops** - Brigade Warehouse.
---
--- **Main Features:**
---
---    * Manage platoons
---    * Carry out ARTY and PATROLZONE missions (AUFTRAG)
---    * Define rearming zones
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Brigade).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Ops.Brigade
--- @image OPS_Brigade_.png
-
-
---- BRIGADE class.
--- @type BRIGADE
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field #table rearmingZones Rearming zones. Each element is of type `#BRIGADE.SupplyZone`.
--- @field #table refuellingZones Refuelling zones. Each element is of type `#BRIGADE.SupplyZone`.
--- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
--- @extends Ops.Legion#LEGION
-
---- *I am not afraid of an Army of lions lead by a sheep; I am afraid of sheep lead by a lion* -- Alexander the Great
---
--- ===
---
--- # The BRIGADE Concept
---
--- A BRIGADE consists of one or multiple PLATOONs. These platoons "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
---
---
--- @field #BRIGADE
-BRIGADE = {
-  ClassName       = "BRIGADE",
-  verbose         =     0,
-  rearmingZones   =    {},
-  refuellingZones =    {}, 
-}
-
---- Supply Zone.
--- @type BRIGADE.SupplyZone
--- @field Core.Zone#ZONE zone The zone.
--- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
--- @field #boolean markerOn If `true`, marker is on.
--- @field Wrapper.Marker#MARKER marker F10 marker.
-
---- BRIGADE class version.
--- @field #string version
-BRIGADE.version="0.1.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: Spawn when hosting warehouse is a ship or oil rig or gas platform.
--- TODO: Rearming zones.
--- TODO: Retreat zones.
--- DONE: Add weapon range.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new BRIGADE class object.
--- @param #BRIGADE self
--- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
--- @param #string BrigadeName Name of the brigade.
--- @return #BRIGADE self
-function BRIGADE:New(WarehouseName, BrigadeName)
-
-  -- Inherit everything from LEGION class.
-  local self=BASE:Inherit(self, LEGION:New(WarehouseName, BrigadeName)) -- #BRIGADE
-
-  -- Nil check.
-  if not self then
-    BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
-    return nil
-  end
-
-  -- Set some string id for output to DCS.log file.
-  self.lid=string.format("BRIGADE %s | ", self.alias)
-  
-  -- Defaults
-  self:SetRetreatZones()
-  
-  -- Turn ship into NAVYGROUP.
-  if self:IsShip() then
-    local wh=self.warehouse --Wrapper.Unit#UNIT
-    local group=wh:GetGroup()
-    self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
-    self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
-  end
-  
-  -- Add FSM transitions.
-  --                 From State  -->   Event         -->      To State
-  self:AddTransition("*",             "ArmyOnMission",       "*")           -- An ARMYGROUP was send on a Mission (AUFTRAG).
-
-  ------------------------
-  --- Pseudo Functions ---
-  ------------------------
-
-  --- Triggers the FSM event "Start". Starts the BRIGADE. Initializes parameters and starts event handlers.
-  -- @function [parent=#BRIGADE] Start
-  -- @param #BRIGADE self
-
-  --- Triggers the FSM event "Start" after a delay. Starts the BRIGADE. Initializes parameters and starts event handlers.
-  -- @function [parent=#BRIGADE] __Start
-  -- @param #BRIGADE self
-  -- @param #number delay Delay in seconds.
-
-
-  --- Triggers the FSM event "Stop". Stops the BRIGADE and all its event handlers.
-  -- @param #BRIGADE self
-
-  --- Triggers the FSM event "Stop" after a delay. Stops the BRIGADE and all its event handlers.
-  -- @function [parent=#BRIGADE] __Stop
-  -- @param #BRIGADE self
-  -- @param #number delay Delay in seconds.
-
-
-  --- Triggers the FSM event "ArmyOnMission".
-  -- @function [parent=#BRIGADE] ArmyOnMission
-  -- @param #BRIGADE self
-  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  --- Triggers the FSM event "ArmyOnMission" after a delay.
-  -- @function [parent=#BRIGADE] __ArmyOnMission
-  -- @param #BRIGADE self
-  -- @param #number delay Delay in seconds.
-  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  --- On after "ArmyOnMission" event.
-  -- @function [parent=#BRIGADE] OnAfterArmyOnMission
-  -- @param #BRIGADE self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Add a platoon to the brigade.
--- @param #BRIGADE self
--- @param Ops.Platoon#PLATOON Platoon The platoon object.
--- @return #BRIGADE self
-function BRIGADE:AddPlatoon(Platoon)
-
-  -- Add platoon to brigade.
-  table.insert(self.cohorts, Platoon)
-
-  -- Add assets to platoon.
-  self:AddAssetToPlatoon(Platoon, Platoon.Ngroups)
-
-  -- Set brigade of platoon.
-  Platoon:SetBrigade(self)
-
-  -- Start platoon.
-  if Platoon:IsStopped() then
-    Platoon:Start()
-  end
-
-  return self
-end
-
---- Add asset group(s) to platoon.
--- @param #BRIGADE self
--- @param Ops.Platoon#PLATOON Platoon The platoon object.
--- @param #number Nassets Number of asset groups to add.
--- @return #BRIGADE self
-function BRIGADE:AddAssetToPlatoon(Platoon, Nassets)
-
-  if Platoon then
-
-    -- Get the template group of the platoon.
-    local Group=GROUP:FindByName(Platoon.templatename)
-
-    if Group then
-
-      -- Debug text.
-      local text=string.format("Adding asset %s to platoon %s", Group:GetName(), Platoon.name)
-      self:T(self.lid..text)
-
-      -- Add assets to airwing warehouse.
-      self:AddAsset(Group, Nassets, nil, nil, nil, nil, Platoon.skill, Platoon.livery, Platoon.name)
-
-    else
-      self:E(self.lid.."ERROR: Group does not exist!")
-    end
-
-  else
-    self:E(self.lid.."ERROR: Platoon does not exit!")
-  end
-
-  return self
-end
-
---- Define a set of retreat zones.
--- @param #BRIGADE self
--- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
--- @return #BRIGADE self
-function BRIGADE:SetRetreatZones(RetreatZoneSet)
-  self.retreatZones=RetreatZoneSet or SET_ZONE:New()
-  return self
-end
-
---- Add a retreat zone.
--- @param #BRIGADE self
--- @param Core.Zone#ZONE RetreatZone Retreat zone.
--- @return #BRIGADE self
-function BRIGADE:AddRetreatZone(RetreatZone)
-  self.retreatZones:AddZone(RetreatZone)
-  return self
-end
-
---- Get retreat zones.
--- @param #BRIGADE self
--- @return Core.Set#SET_ZONE Set of retreat zones.
-function BRIGADE:GetRetreatZones()
-  return self.retreatZones
-end
-
---- Add a rearming zone.
--- @param #BRIGADE self
--- @param Core.Zone#ZONE RearmingZone Rearming zone.
--- @return #BRIGADE.SupplyZone The rearming zone data.
-function BRIGADE:AddRearmingZone(RearmingZone)
-
-  local rearmingzone={} --#BRIGADE.SupplyZone
-  
-  rearmingzone.zone=RearmingZone
-  rearmingzone.mission=nil
-  rearmingzone.marker=MARKER:New(rearmingzone.zone:GetCoordinate(), "Rearming Zone"):ToCoalition(self:GetCoalition())
-
-  table.insert(self.rearmingZones, rearmingzone)
-
-  return rearmingzone
-end
-
-
---- Add a refuelling zone.
--- @param #BRIGADE self
--- @param Core.Zone#ZONE RefuellingZone Refuelling zone.
--- @return #BRIGADE.SupplyZone The refuelling zone data.
-function BRIGADE:AddRefuellingZone(RefuellingZone)
-
-  local supplyzone={} --#BRIGADE.SupplyZone
-  
-  supplyzone.zone=RefuellingZone
-  supplyzone.mission=nil
-  supplyzone.marker=MARKER:New(supplyzone.zone:GetCoordinate(), "Refuelling Zone"):ToCoalition(self:GetCoalition())
-
-  table.insert(self.refuellingZones, supplyzone)
-
-  return supplyzone
-end
-
-
---- Get platoon by name.
--- @param #BRIGADE self
--- @param #string PlatoonName Name of the platoon.
--- @return Ops.Platoon#PLATOON The Platoon object.
-function BRIGADE:GetPlatoon(PlatoonName)
-  local platoon=self:_GetCohort(PlatoonName)
-  return platoon
-end
-
---- Get platoon of an asset.
--- @param #BRIGADE self
--- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
--- @return Ops.Platoon#PLATOON The platoon object.
-function BRIGADE:GetPlatoonOfAsset(Asset)
-  local platoon=self:GetPlatoon(Asset.squadname)
-  return platoon
-end
-
---- Remove asset from platoon.
--- @param #BRIGADE self
--- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The platoon asset.
-function BRIGADE:RemoveAssetFromPlatoon(Asset)
-  local platoon=self:GetPlatoonOfAsset(Asset)
-  if platoon then
-    platoon:DelAsset(Asset)
-  end
-end
-
-
---- [ GROUND ] Function to load back an asset in the field that has been filed before.
--- @param #BRIGADE self
--- @param #string Templatename e.g."1 PzDv LogRg I\_AID-976" - that's the alias (name) of an platoon spawned as `"platoon - alias"_AID-"asset-ID"`
--- @param Core.Point#COORDINATE Position where to spawn the platoon
--- @return #BRIGADE self
--- @usage
--- Prerequisites:
--- Save the assets spawned by BRIGADE/CHIEF regularly (~every 5 mins) into a file, e.g. like this: 
---   
---              local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
---              local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename 
---              local BlueSaveOps = SET_OPSGROUP:New():FilterCoalitions("blue"):FilterCategoryGround():FilterOnce()
---              UTILS.SaveSetOfOpsGroups(BlueSaveOps,Path,BlueOpsFilename)
---          
--- where Path and Filename are strings, as chosen by you.
--- You can then load back the assets at the start of your next mission run. Be aware that it takes a couple of seconds for the 
--- platoon data to arrive in brigade, so make this an action after ~20 seconds, e.g. like so:
--- 
---            function LoadBackAssets()
---              local Path = FilePath or "C:\\Users\\<yourname>\\Saved Games\\DCS\\Missions\\" -- example path
---              local BlueOpsFilename = BlueFileName or "ExamplePlatoonSave.csv" -- example filename  
---              if UTILS.CheckFileExists(Path,BlueOpsFilename) then
---                local loadback = UTILS.LoadSetOfOpsGroups(Path,BlueOpsFilename,false)
---                for _,_platoondata in pairs (loadback) do
---                  local groupname = _platoondata.groupname -- #string
---                  local coordinate = _platoondata.coordinate -- Core.Point#COORDINATE
---                  Your_Brigade:LoadBackAssetInPosition(groupname,coordinate)
---                end
---              end
---            end
---  
---            local AssetLoader = TIMER:New(LoadBackAssets)
---            AssetLoader:Start(20)
--- 
--- The assets loaded back into the mission will be considered for AUFTRAG type missions from CHIEF and BRIGADE.
-function BRIGADE:LoadBackAssetInPosition(Templatename,Position)
-  self:T(self.lid .. "LoadBackAssetInPosition: " .. tostring(Templatename))
-  
-  -- get Platoon alias from Templatename
-  local nametbl = UTILS.Split(Templatename,"_")
-
-  local name = nametbl[1]
-  
-  self:T(string.format("*** Target Platoon = %s ***",name))
-  
-  -- find a matching asset table from BRIGADE
-  local cohorts = self.cohorts or {}
-  local thisasset = nil --Functional.Warehouse#WAREHOUSE.Assetitem
-  local found = false
-  
-  for _,_cohort in pairs(cohorts) do
-    local asset = _cohort:GetName()
-    self:T(string.format("*** Looking at Platoon = %s ***",asset))
-    if asset == name then
-      self:T("**** Found Platoon ****")
-      local cohassets = _cohort.assets or {}
-      for _,_zug in pairs (cohassets) do
-        local zug = _zug -- Functional.Warehouse#WAREHOUSE.Assetitem   
-        if zug.assignment == name and zug.requested == false then
-          self:T("**** Found Asset ****")
-          found = true
-          thisasset = zug --Functional.Warehouse#WAREHOUSE.Assetitem         
-        break
-        end
-      end
-    end
-  end
-  
-  if found then
-  
-    -- prep asset
-    thisasset.rid = thisasset.uid
-    thisasset.requested = false
-    thisasset.score=100
-    thisasset.missionTask="CAS"
-    thisasset.spawned = true
-    local template = thisasset.templatename
-    local alias = thisasset.spawngroupname
-            
-    -- Spawn group
-    local spawnasset = SPAWN:NewWithAlias(template,alias)
-      :InitDelayOff()
-      :SpawnFromCoordinate(Position)
-    
-    -- build a new self request
-    local request = {} --Functional.Warehouse#WAREHOUSE.Pendingitem
-    request.assignment = name
-    request.warehouse = self
-    request.assets = {thisasset}
-    request.ntransporthome = 0
-    request.ndelivered = 0
-    request.ntransport = 0
-    request.cargoattribute = thisasset.attribute
-    request.category = thisasset.category
-    request.cargoassets = {thisasset}
-    request.assetdesc = WAREHOUSE.Descriptor.ASSETLIST
-    request.cargocategory = thisasset.category
-    request.toself = true
-    request.transporttype = WAREHOUSE.TransportType.SELFPROPELLED
-    request.assetproblem = {}
-    request.born = true
-    request.prio = 50
-    request.uid = thisasset.uid
-    request.airbase = nil
-    request.timestamp = timer.getAbsTime()
-    request.assetdescval = {thisasset}
-    request.nasset = 1
-    request.cargogroupset = SET_GROUP:New()
-    request.cargogroupset:AddGroup(spawnasset)
-    request.iscargo = true
-    
-    -- Call Brigade self
-    self:__AssetSpawned(2, spawnasset, thisasset, request) 
-     
-  end
-  return self
-end
-
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- FSM Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Start BRIGADE FSM.
--- @param #BRIGADE self
-function BRIGADE:onafterStart(From, Event, To)
-
-  -- Start parent Warehouse.
-  self:GetParent(self, BRIGADE).onafterStart(self, From, Event, To)
-
-  -- Info.
-  self:I(self.lid..string.format("Starting BRIGADE v%s", BRIGADE.version))
-
-end
-
---- Update status.
--- @param #BRIGADE self
-function BRIGADE:onafterStatus(From, Event, To)
-
-  -- Status of parent Warehouse.
-  self:GetParent(self).onafterStatus(self, From, Event, To)
-
-  -- FSM state.
-  local fsmstate=self:GetState()
-  
-  ----------------
-  -- Transport ---
-  ----------------
-  
-  self:CheckTransportQueue()
-
-  --------------
-  -- Mission ---
-  --------------
-
-  -- Check if any missions should be cancelled.
-  self:CheckMissionQueue()
-
-  ---------------------
-  -- Rearming Zones ---
-  ---------------------
-
-  for _,_rearmingzone in pairs(self.rearmingZones) do
-    local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
-    if (not rearmingzone.mission) or rearmingzone.mission:IsOver() then
-      rearmingzone.mission=AUFTRAG:NewAMMOSUPPLY(rearmingzone.zone)
-      self:AddMission(rearmingzone.mission)
-    end
-  end
-
-  -----------------------
-  -- Refuelling Zones ---
-  -----------------------
-
-  -- Check refuelling zones.
-  for _,_supplyzone in pairs(self.refuellingZones) do
-    local supplyzone=_supplyzone --#BRIGADE.SupplyZone
-    -- Check if mission is nil or over.      
-    if (not supplyzone.mission) or supplyzone.mission:IsOver() then
-      supplyzone.mission=AUFTRAG:NewFUELSUPPLY(supplyzone.zone)
-      self:AddMission(supplyzone.mission)
-    end
-  end    
-
-
-  -----------
-  -- Info ---
-  -----------    
-
-  -- Display tactival overview.
-  self:_TacticalOverview()
-
-  -- General info:
-  if self.verbose>=1 then
-
-    -- Count missions not over yet.
-    local Nmissions=self:CountMissionsInQueue()
-
-    -- Asset count.
-    local Npq, Np, Nq=self:CountAssetsOnMission()
-
-    -- Asset string.
-    local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
-
-    -- Output.
-    local text=string.format("%s: Missions=%d, Platoons=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
-    self:I(self.lid..text)
-  end
-
-  ------------------
-  -- Mission Info --
-  ------------------
-  if self.verbose>=2 then
-    local text=string.format("Missions Total=%d:", #self.missionqueue)
-    for i,_mission in pairs(self.missionqueue) do
-      local mission=_mission --Ops.Auftrag#AUFTRAG
-
-      local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
-      local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
-      local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
-
-      text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
-    end
-    self:I(self.lid..text)
-  end
-
-  --------------------
-  -- Transport Info --
-  --------------------
-  if self.verbose>=2 then
-    local text=string.format("Transports Total=%d:", #self.transportqueue)
-    for i,_transport in pairs(self.transportqueue) do
-      local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
-
-      local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
-      local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
-
-      text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
-    end
-    self:I(self.lid..text)
-  end
-
-  -------------------
-  -- Platoon Info --
-  -------------------
-  if self.verbose>=3 then
-    local text="Platoons:"
-    for i,_platoon in pairs(self.cohorts) do
-      local platoon=_platoon --Ops.Platoon#PLATOON
-
-      local callsign=platoon.callsignName and UTILS.GetCallsignName(platoon.callsignName) or "N/A"
-      local modex=platoon.modex and platoon.modex or -1
-      local skill=platoon.skill and tostring(platoon.skill) or "N/A"
-
-      -- Platoon text.
-      text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", platoon.name, platoon:GetState(), platoon.aircrafttype, platoon:CountAssets(true), #platoon.assets, callsign, modex, skill)
-    end
-    self:I(self.lid..text)
-  end
-
-  -------------------
-  -- Rearming Info --
-  -------------------
-  if self.verbose>=4 then
-    local text="Rearming Zones:"
-    for i,_rearmingzone in pairs(self.rearmingZones) do
-      local rearmingzone=_rearmingzone --#BRIGADE.SupplyZone
-      -- Info text.
-      text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", rearmingzone.zone:GetName(), rearmingzone.mission:GetState(), rearmingzone.mission:CountOpsGroups())      
-    end
-    self:I(self.lid..text)
-  end
-  
-  ---------------------
-  -- Refuelling Info --
-  ---------------------
-  if self.verbose>=4 then
-    local text="Refuelling Zones:"
-    for i,_refuellingzone in pairs(self.refuellingZones) do
-      local refuellingzone=_refuellingzone --#BRIGADE.SupplyZone
-      -- Info text.
-      text=text..string.format("\n* %s: Mission status=%s, suppliers=%d", refuellingzone.zone:GetName(), refuellingzone.mission:GetState(), refuellingzone.mission:CountOpsGroups())      
-    end
-    self:I(self.lid..text)
-  end
-  
-  ----------------
-  -- Asset Info --
-  ----------------
-  if self.verbose>=5 then
-    local text="Assets in stock:"
-    for i,_asset in pairs(self.stock) do
-      local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
-      -- Info text.
-      text=text..string.format("\n* %s: spawned=%s", asset.spawngroupname, tostring(asset.spawned))      
-    end
-    self:I(self.lid..text)
-  end
-
-  if self.verbose>=3 then
-  
-    -- Count numbers
-    local Ntotal=0
-    local Nspawned=0
-    local Nrequested=0
-    local Nreserved=0
-    local Nstock=0
-    
-    local text="\n===========================================\n"
-    text=text.."Assets:"
-    local legion=self --Ops.Legion#LEGION
-
-    for _,_cohort in pairs(legion.cohorts) do
-      local cohort=_cohort --Ops.Cohort#COHORT
-      
-      for _,_asset in pairs(cohort.assets) do
-        local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
-
-        local state="In Stock"
-        if asset.flightgroup then
-          state=asset.flightgroup:GetState()
-          local mission=legion:GetAssetCurrentMission(asset)
-          if mission then
-            state=state..string.format(", Mission \"%s\" [%s]", mission:GetName(), mission:GetType())
-          end
-        else
-          if asset.spawned then
-            env.info("FF ERROR: asset has opsgroup but is NOT spawned!")
-          end
-          if asset.requested and asset.isReserved then
-            env.info("FF ERROR: asset is requested and reserved. Should not be both!")
-            state="Reserved+Requested!"
-          elseif asset.isReserved then
-            state="Reserved"
-          elseif asset.requested then
-            state="Requested"
-          end
-        end
-                    
-        -- Text.
-        text=text..string.format("\n[UID=%03d] %s Legion=%s [%s]: State=%s [RID=%s]", 
-        asset.uid, asset.spawngroupname, legion.alias, cohort.name, state, tostring(asset.rid))
-        
-        
-        if asset.spawned then
-          Nspawned=Nspawned+1
-        end            
-        if asset.requested then
-          Nrequested=Nrequested+1
-        end  
-        if asset.isReserved then
-          Nreserved=Nreserved+1
-        end                      
-        if not (asset.spawned or asset.requested or asset.isReserved) then
-          Nstock=Nstock+1
-        end
-        
-        Ntotal=Ntotal+1
-        
-      end
-  
-    end
-    text=text.."\n-------------------------------------------"
-    text=text..string.format("\nNstock     = %d", Nstock)
-    text=text..string.format("\nNreserved  = %d", Nreserved)
-    text=text..string.format("\nNrequested = %d", Nrequested)
-    text=text..string.format("\nNspawned   = %d", Nspawned)
-    text=text..string.format("\nNtotal     = %d (=%d)", Ntotal, Nstock+Nspawned+Nrequested+Nreserved)
-    text=text.."\n==========================================="
-    self:I(self.lid..text)
-  end  
-
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- FSM Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- On after "ArmyOnMission".
--- @param #BRIGADE self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
--- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
--- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
-function BRIGADE:onafterArmyOnMission(From, Event, To, ArmyGroup, Mission)
-  -- Debug info.
-  self:T(self.lid..string.format("Group %s on %s mission %s", ArmyGroup:GetName(), Mission:GetType(), Mission:GetName()))  
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/CTLD.lua

@@ -25,7 +25,7 @@
 -- @module Ops.CTLD
 -- @image OPS_CTLD.jpg
 
--- Last Update May 2025
+-- Last Update July 2025
 
 
 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -867,6 +867,7 @@ do
 --          my_ctld.TroopUnloadDistHoverHook = 5 -- When hovering, unload troops this far behind the Chinook
 --          my_ctld.showstockinmenuitems = false -- When set to true, the menu lines will also show the remaining items in stock (that is, if you set any), downside is that the menu for all will be build every 30 seconds anew.
 --          my_ctld.onestepmenu = false -- When set to true, the menu will create Drop and build, Get and load, Pack and remove, Pack and load, Pack. it will be a 1 step solution.
+--          my_ctld.VehicleMoveFormation = AI.Task.VehicleFormation.VEE -- When a group moves to a MOVE zone, then it takes this formation. Can be a table of formations, which are then randomly chosen. Defaults to "Vee".
 -- 
 -- ## 2.1 CH-47 Chinook support
 -- 
@@ -1294,6 +1295,7 @@ CTLD = {
   LoadedGroupsTable = {},
   keeploadtable = true,
   allowCATransport = false,
+  VehicleMoveFormation = AI.Task.VehicleFormation.VEE,
 }
 
 ------------------------------
@@ -1414,7 +1416,7 @@ CTLD.FixedWingTypes = {
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.3.35"
+CTLD.version="1.3.37"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self
@@ -1481,6 +1483,7 @@ function CTLD:New(Coalition, Prefixes, Alias)
   self:AddTransition("*",             "CratesRepaired",      "*")           -- CTLD repair  event.
   self:AddTransition("*",             "CratesBuildStarted",  "*")           -- CTLD build  event.
   self:AddTransition("*",             "CratesRepairStarted", "*")           -- CTLD repair  event.
+  self:AddTransition("*",             "CratesPacked",        "*")           -- CTLD repack  event.
   self:AddTransition("*",             "HelicopterLost",      "*")           -- CTLD lost  event.
   self:AddTransition("*",             "Load",                "*")           -- CTLD load  event.
   self:AddTransition("*",             "Loaded",              "*")           -- CTLD load  event.   
@@ -1553,6 +1556,8 @@ function CTLD:New(Coalition, Prefixes, Alias)
   self.movetroopsdistance = 5000
   self.troopdropzoneradius = 100
   
+  self.VehicleMoveFormation = AI.Task.VehicleFormation.VEE
+  
   -- added support Hercules Mod
   self.enableHercules = false -- deprecated
   self.enableFixedWing = false
@@ -1760,6 +1765,17 @@ function CTLD:New(Coalition, Prefixes, Alias)
   -- @param Wrapper.Group#GROUP Vehicle The #GROUP object of the vehicle or FOB repaired.
   -- @return #CTLD self
         
+  --- FSM Function OnBeforeCratesPacked.
+  -- @function [parent=#CTLD] OnBeforeCratesPacked
+  -- @param #CTLD self
+  -- @param #string From State.
+  -- @param #string Event Trigger.
+  -- @param #string To State.
+  -- @param Wrapper.Group#GROUP Group Group Object.
+  -- @param Wrapper.Unit#UNIT Unit Unit Object.
+  -- @param #CTLD_CARGO Cargo Cargo crate that was repacked.
+  -- @return #CTLD self
+    
   --- FSM Function OnBeforeTroopsRTB.
   -- @function [parent=#CTLD] OnBeforeTroopsRTB
   -- @param #CTLD self
@@ -1846,6 +1862,7 @@ function CTLD:New(Coalition, Prefixes, Alias)
   -- @param #string To State.
   -- @param Wrapper.Group#GROUP Group Group Object.
   -- @param Wrapper.Unit#UNIT Unit Unit Object.
+  -- @param CargoName The name of the cargo being built.
   -- @return #CTLD self
 
   --- FSM Function OnAfterCratesRepairStarted. Info event that a repair has been started.
@@ -1889,6 +1906,17 @@ function CTLD:New(Coalition, Prefixes, Alias)
   -- @param Wrapper.Group#GROUP Vehicle The #GROUP object of the vehicle or FOB repaired.
   -- @return #CTLD self
   
+  --- FSM Function OnAfterCratesPacked.
+  -- @function [parent=#CTLD] OnAfterCratesPacked
+  -- @param #CTLD self
+  -- @param #string From State.
+  -- @param #string Event Trigger.
+  -- @param #string To State.
+  -- @param Wrapper.Group#GROUP Group Group Object.
+  -- @param Wrapper.Unit#UNIT Unit Unit Object.
+  -- @param #CTLD_CARGO Cargo Cargo crate that was repacked.
+  -- @return #CTLD self
+    
   --- FSM Function OnAfterTroopsRTB.
   -- @function [parent=#CTLD] OnAfterTroopsRTB
   -- @param #CTLD self
@@ -2827,8 +2855,12 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop, pack)
       if cratedistance > self.CrateDistance then cratedistance = self.CrateDistance end
       -- altered heading logic
       -- DONE: right standard deviation?
-      rheading = UTILS.RandomGaussian(0,30,-90,90,100)
-      rheading = math.fmod((heading + rheading), 360)
+        if self:IsUnitInAir(Unit) and self:IsFixedWing(Unit) then
+          rheading = math.random(20,60)
+        else
+          rheading = UTILS.RandomGaussian(0, 30, -90, 90, 100)
+        end
+      rheading=math.fmod((heading+rheading),360)
       cratecoord = position:Translate(cratedistance,rheading)
     else
       cratedistance = (row-1)*6
@@ -3965,7 +3997,7 @@ function CTLD:_BuildCrates(Group, Unit,Engineering,MultiDrop)
               local buildtimer = TIMER:New(self._BuildObjectFromCrates,self,Group,Unit,build,false,Group:GetCoordinate(),MultiDrop)
               buildtimer:Start(self.buildtime)
               self:_SendMessage(string.format("Build started, ready in %d seconds!",self.buildtime),15,false,Group)
-              self:__CratesBuildStarted(1,Group,Unit)
+              self:__CratesBuildStarted(1,Group,Unit,build.Name) 
               self:_RefreshDropTroopsMenu(Group,Unit)
           else
             self:_BuildObjectFromCrates(Group,Unit,build,false,nil,MultiDrop)
@@ -4007,6 +4039,7 @@ function CTLD:_PackCratesNearby(Group, Unit)
             _Group:Destroy() -- if a match is found destroy the Wrapper.Group#GROUP near the player
             self:_GetCrates(Group, Unit, _entry, nil, false, true) -- spawn the appropriate crates near the player
             self:_RefreshLoadCratesMenu(Group,Unit) -- call the refresher to show the crates in the menu
+            self:__CratesPacked(1,Group,Unit,_entry)
             return true
           end
         end
@@ -4168,6 +4201,17 @@ function CTLD:_BuildObjectFromCrates(Group,Unit,Build,Repair,RepairLocation,Mult
   return self
 end
 
+--- (Internal) Function to get a vehicle formation for a moving group
+-- @param #CTLD self
+-- @return #string Formation
+function CTLD:_GetVehicleFormation()
+  local VehicleMoveFormation = self.VehicleMoveFormation or AI.Task.VehicleFormation.VEE
+  if type(self.VehicleMoveFormation)=="table" then
+    VehicleMoveFormation = self.VehicleMoveFormation[math.random(1,#self.VehicleMoveFormation)]
+  end
+  return VehicleMoveFormation
+end
+
 --- (Internal) Function to move group to WP zone.
 -- @param #CTLD self
 -- @param Wrapper.Group#GROUP Group The Group to move.
@@ -4182,18 +4226,20 @@ function CTLD:_MoveGroupToZone(Group)
     -- yes, we can ;)
     local groupname = Group:GetName()
     local zonecoord = zone:GetRandomCoordinate(20,125) -- Core.Point#COORDINATE
-    local coordinate = zonecoord:GetVec2()
+    local formation = self:_GetVehicleFormation()
+    --local coordinate = zonecoord:GetVec2()
     Group:SetAIOn()
     Group:OptionAlarmStateAuto()
     Group:OptionDisperseOnAttack(30)
-    Group:OptionROEOpenFirePossible()
-    Group:RouteToVec2(coordinate,5)
+    Group:OptionROEOpenFire()
+    Group:RouteGroundTo(zonecoord,25,formation)
     end
   return self
 end
 
 --- (Internal) Housekeeping - Cleanup crates when build
 -- @param #CTLD self
+-- 
 -- @param #table Crates Table of #CTLD_CARGO objects near the unit.
 -- @param #CTLD.Buildable Build Table build object.
 -- @param #number Number Number of objects in Crates (found) to limit search.
@@ -7105,6 +7151,16 @@ end
       local filepath = self.filepath
       self:__Save(interval,filepath,filename)
     end
+    
+    if type(self.VehicleMoveFormation) == "table" then
+      local Formations = {}
+      for _,_formation in pairs(self.VehicleMoveFormation) do
+        table.insert(Formations,_formation)
+      end
+      self.VehicleMoveFormation = nil
+      self.VehicleMoveFormation = Formations
+    end
+  
     return self
   end
 

Moose Development/Moose/Ops/Fleet.lua

@@ -1,428 +0,0 @@
---- **Ops** - Fleet Warehouse.
---
--- **Main Features:**
---
---    * Manage flotillas
---    * Carry out ARTY and PATROLZONE missions (AUFTRAG)
--- 
--- ===
---
--- ## Example Missions:
---
--- Demo missions can be found on [github](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Ops/Fleet).
--- 
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Ops.Fleet
--- @image OPS_Fleet.png
-
-
---- FLEET class.
--- @type FLEET
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity of output.
--- @field Core.Set#SET_ZONE retreatZones Retreat zone set.
--- @field #boolean pathfinding Set pathfinding on for all spawned navy groups.
--- @extends Ops.Legion#LEGION
-
---- *A fleet of British ships at war are the best negotiators.* -- Horatio Nelson
---
--- ===
---
--- # The FLEET Concept
---
--- A FLEET consists of one or multiple FLOTILLAs. These flotillas "live" in a WAREHOUSE that has a phyiscal struction (STATIC or UNIT) and can be captured or destroyed.
--- 
--- # Basic Setup
--- 
--- A new `FLEET` object can be created with the @{#FLEET.New}(`WarehouseName`, `FleetName`) function, where `WarehouseName` is the name of the static or unit object hosting the fleet
--- and `FleetName` is the name you want to give the fleet. This must be *unique*!
--- 
---     myFleet=FLEET:New("myWarehouseName", "1st Fleet")
---     myFleet:SetPortZone(ZonePort1stFleet)
---     myFleet:Start()
---     
--- A fleet needs a *port zone*, which is set via the @{#FLEET.SetPortZone}(`PortZone`) function. This is the zone where the naval assets are spawned and return to.
--- 
--- Finally, the fleet needs to be started using the @{#FLEET.Start}() function. If the fleet is not started, it will not process any requests.
--- 
--- ## Adding Flotillas
--- 
--- Flotillas can be added via the @{#FLEET.AddFlotilla}(`Flotilla`) function. See @{Ops.Flotilla#FLOTILLA} for how to create a flotilla.
--- 
---     myFleet:AddFlotilla(FlotillaTiconderoga)
---     myFleet:AddFlotilla(FlotillaPerry)
---     
---
---
--- @field #FLEET
-FLEET = {
-  ClassName       = "FLEET",
-  verbose         =       0,
-  pathfinding     =   false,
-}
-
---- Supply Zone.
--- @type FLEET.SupplyZone
--- @field Core.Zone#ZONE zone The zone.
--- @field Ops.Auftrag#AUFTRAG mission Mission assigned to supply ammo or fuel.
--- @field #boolean markerOn If `true`, marker is on.
--- @field Wrapper.Marker#MARKER marker F10 marker.
-
---- FLEET class version.
--- @field #string version
-FLEET.version="0.0.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- ToDo list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: Add routes?
--- DONE: Add weapon range.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new FLEET class object.
--- @param #FLEET self
--- @param #string WarehouseName Name of the warehouse STATIC or UNIT object representing the warehouse.
--- @param #string FleetName Name of the fleet.
--- @return #FLEET self
-function FLEET:New(WarehouseName, FleetName)
-
-  -- Inherit everything from LEGION class.
-  local self=BASE:Inherit(self, LEGION:New(WarehouseName, FleetName)) -- #FLEET
-
-  -- Nil check.
-  if not self then
-    BASE:E(string.format("ERROR: Could not find warehouse %s!", WarehouseName))
-    return nil
-  end
-
-  -- Set some string id for output to DCS.log file.
-  self.lid=string.format("FLEET %s | ", self.alias)
-  
-  -- Defaults
-  self:SetRetreatZones()
-  
-  -- Turn ship into NAVYGROUP.
-  if self:IsShip() then
-    local wh=self.warehouse --Wrapper.Unit#UNIT
-    local group=wh:GetGroup()
-    self.warehouseOpsGroup=NAVYGROUP:New(group) --Ops.NavyGroup#NAVYGROUP
-    self.warehouseOpsElement=self.warehouseOpsGroup:GetElementByName(wh:GetName())
-  end
-
-
-  -- Add FSM transitions.
-  --                 From State  -->   Event         -->      To State
-  self:AddTransition("*",             "NavyOnMission",        "*")           -- An NAVYGROUP was send on a Mission (AUFTRAG).
-
-  ------------------------
-  --- Pseudo Functions ---
-  ------------------------
-
-  --- Triggers the FSM event "Start". Starts the FLEET. Initializes parameters and starts event handlers.
-  -- @function [parent=#FLEET] Start
-  -- @param #FLEET self
-
-  --- Triggers the FSM event "Start" after a delay. Starts the FLEET. Initializes parameters and starts event handlers.
-  -- @function [parent=#FLEET] __Start
-  -- @param #FLEET self
-  -- @param #number delay Delay in seconds.
-
-
-  --- Triggers the FSM event "Stop". Stops the FLEET and all its event handlers.
-  -- @param #FLEET self
-
-  --- Triggers the FSM event "Stop" after a delay. Stops the FLEET and all its event handlers.
-  -- @function [parent=#FLEET] __Stop
-  -- @param #FLEET self
-  -- @param #number delay Delay in seconds.
-
-
-  --- Triggers the FSM event "NavyOnMission".
-  -- @function [parent=#FLEET] NavyOnMission
-  -- @param #FLEET self
-  -- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  --- Triggers the FSM event "NavyOnMission" after a delay.
-  -- @function [parent=#FLEET] __NavyOnMission
-  -- @param #FLEET self
-  -- @param #number delay Delay in seconds.
-  -- @param Ops.NavyGroup#NAVYGROUP ArmyGroup The NAVYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  --- On after "NavyOnMission" event.
-  -- @function [parent=#FLEET] OnAfterNavyOnMission
-  -- @param #FLEET self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param Ops.NavyGroup#NAVYGROUP NavyGroup The NAVYGROUP on mission.
-  -- @param Ops.Auftrag#AUFTRAG Mission The mission.
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Add a flotilla to the fleet.
--- @param #FLEET self
--- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
--- @return #FLEET self
-function FLEET:AddFlotilla(Flotilla)
-
-  -- Add flotilla to fleet.
-  table.insert(self.cohorts, Flotilla)
-
-  -- Add assets to flotilla.
-  self:AddAssetToFlotilla(Flotilla, Flotilla.Ngroups)
-
-  -- Set fleet of flotilla.
-  Flotilla:SetFleet(self)
-
-  -- Start flotilla.
-  if Flotilla:IsStopped() then
-    Flotilla:Start()
-  end
-
-  return self
-end
-
---- Add asset group(s) to flotilla.
--- @param #FLEET self
--- @param Ops.Flotilla#FLOTILLA Flotilla The flotilla object.
--- @param #number Nassets Number of asset groups to add.
--- @return #FLEET self
-function FLEET:AddAssetToFlotilla(Flotilla, Nassets)
-
-  if Flotilla then
-
-    -- Get the template group of the flotilla.
-    local Group=GROUP:FindByName(Flotilla.templatename)
-
-    if Group then
-
-      -- Debug text.
-      local text=string.format("Adding asset %s to flotilla %s", Group:GetName(), Flotilla.name)
-      self:T(self.lid..text)
-
-      -- Add assets to airwing warehouse.
-      self:AddAsset(Group, Nassets, nil, nil, nil, nil, Flotilla.skill, Flotilla.livery, Flotilla.name)
-
-    else
-      self:E(self.lid.."ERROR: Group does not exist!")
-    end
-
-  else
-    self:E(self.lid.."ERROR: Flotilla does not exit!")
-  end
-
-  return self
-end
-
---- Set pathfinding for all spawned naval groups.
--- @param #FLEET self
--- @param #boolean Switch If `true`, pathfinding is used.
--- @return #FLEET self
-function FLEET:SetPathfinding(Switch)
-  self.pathfinding=Switch
-  return self
-end
-
---- Define a set of retreat zones.
--- @param #FLEET self
--- @param Core.Set#SET_ZONE RetreatZoneSet Set of retreat zones.
--- @return #FLEET self
-function FLEET:SetRetreatZones(RetreatZoneSet)
-  self.retreatZones=RetreatZoneSet or SET_ZONE:New()
-  return self
-end
-
---- Add a retreat zone.
--- @param #FLEET self
--- @param Core.Zone#ZONE RetreatZone Retreat zone.
--- @return #FLEET self
-function FLEET:AddRetreatZone(RetreatZone)
-  self.retreatZones:AddZone(RetreatZone)
-  return self
-end
-
---- Get retreat zones.
--- @param #FLEET self
--- @return Core.Set#SET_ZONE Set of retreat zones.
-function FLEET:GetRetreatZones()
-  return self.retreatZones
-end
-
---- Get flotilla by name.
--- @param #FLEET self
--- @param #string FlotillaName Name of the flotilla.
--- @return Ops.Flotilla#FLOTILLA The Flotilla object.
-function FLEET:GetFlotilla(FlotillaName)
-  local flotilla=self:_GetCohort(FlotillaName)
-  return flotilla
-end
-
---- Get flotilla of an asset.
--- @param #FLEET self
--- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
--- @return Ops.Flotilla#FLOTILLA The flotilla object.
-function FLEET:GetFlotillaOfAsset(Asset)
-  local flotilla=self:GetFlotilla(Asset.squadname)
-  return flotilla
-end
-
---- Remove asset from flotilla.
--- @param #FLEET self
--- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The flotilla asset.
-function FLEET:RemoveAssetFromFlotilla(Asset)
-  local flotilla=self:GetFlotillaOfAsset(Asset)
-  if flotilla then
-    flotilla:DelAsset(Asset)
-  end
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- FSM Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Start FLEET FSM.
--- @param #FLEET self
-function FLEET:onafterStart(From, Event, To)
-
-  -- Start parent Warehouse.
-  self:GetParent(self, FLEET).onafterStart(self, From, Event, To)
-
-  -- Info.
-  self:I(self.lid..string.format("Starting FLEET v%s", FLEET.version))
-
-end
-
---- Update status.
--- @param #FLEET self
-function FLEET:onafterStatus(From, Event, To)
-
-  -- Status of parent Warehouse.
-  self:GetParent(self).onafterStatus(self, From, Event, To)
-
-  -- FSM state.
-  local fsmstate=self:GetState()
-  
-  ----------------
-  -- Transport ---
-  ----------------
-  
-  self:CheckTransportQueue()
-
-  --------------
-  -- Mission ---
-  --------------
-
-  -- Check if any missions should be cancelled.
-  self:CheckMissionQueue()
-
-  -----------
-  -- Info ---
-  -----------    
-
-  -- Display tactival overview.
-  self:_TacticalOverview()
-
-  -- General info:
-  if self.verbose>=1 then
-
-    -- Count missions not over yet.
-    local Nmissions=self:CountMissionsInQueue()
-
-    -- Asset count.
-    local Npq, Np, Nq=self:CountAssetsOnMission()
-
-    -- Asset string.
-    local assets=string.format("%d [OnMission: Total=%d, Active=%d, Queued=%d]", self:CountAssets(), Npq, Np, Nq)
-
-    -- Output.
-    local text=string.format("%s: Missions=%d, Flotillas=%d, Assets=%s", fsmstate, Nmissions, #self.cohorts, assets)
-    self:I(self.lid..text)
-  end
-
-  ------------------
-  -- Mission Info --
-  ------------------
-  if self.verbose>=2 then
-    local text=string.format("Missions Total=%d:", #self.missionqueue)
-    for i,_mission in pairs(self.missionqueue) do
-      local mission=_mission --Ops.Auftrag#AUFTRAG
-
-      local prio=string.format("%d/%s", mission.prio, tostring(mission.importance)) ; if mission.urgent then prio=prio.." (!)" end
-      local assets=string.format("%d/%d", mission:CountOpsGroups(), mission.Nassets or 0)
-      local target=string.format("%d/%d Damage=%.1f", mission:CountMissionTargets(), mission:GetTargetInitialNumber(), mission:GetTargetDamage())
-
-      text=text..string.format("\n[%d] %s %s: Status=%s, Prio=%s, Assets=%s, Targets=%s", i, mission.name, mission.type, mission.status, prio, assets, target)
-    end
-    self:I(self.lid..text)
-  end
-
-  --------------------
-  -- Transport Info --
-  --------------------
-  if self.verbose>=2 then
-    local text=string.format("Transports Total=%d:", #self.transportqueue)
-    for i,_transport in pairs(self.transportqueue) do
-      local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
-
-      local prio=string.format("%d/%s", transport.prio, tostring(transport.importance)) ; if transport.urgent then prio=prio.." (!)" end
-      local carriers=string.format("Ncargo=%d/%d, Ncarriers=%d", transport.Ncargo, transport.Ndelivered, transport.Ncarrier)
-
-      text=text..string.format("\n[%d] UID=%d: Status=%s, Prio=%s, Cargo: %s", i, transport.uid, transport:GetState(), prio, carriers)
-    end
-    self:I(self.lid..text)
-  end
-
-  -------------------
-  -- Flotilla Info --
-  -------------------
-  if self.verbose>=3 then
-    local text="Flotillas:"
-    for i,_flotilla in pairs(self.cohorts) do
-      local flotilla=_flotilla --Ops.Flotilla#FLOTILLA
-
-      local callsign=flotilla.callsignName and UTILS.GetCallsignName(flotilla.callsignName) or "N/A"
-      local modex=flotilla.modex and flotilla.modex or -1
-      local skill=flotilla.skill and tostring(flotilla.skill) or "N/A"
-
-      -- Flotilla text.
-      text=text..string.format("\n* %s %s: %s*%d/%d, Callsign=%s, Modex=%d, Skill=%s", flotilla.name, flotilla:GetState(), flotilla.aircrafttype, flotilla:CountAssets(true), #flotilla.assets, callsign, modex, skill)
-    end
-    self:I(self.lid..text)
-  end
-  
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- FSM Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- On after "NavyOnMission".
--- @param #FLEET self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
--- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup Ops army group on mission.
--- @param Ops.Auftrag#AUFTRAG Mission The requested mission.
-function FLEET:onafterNavyOnMission(From, Event, To, NavyGroup, Mission)
-  -- Debug info.
-  self:T(self.lid..string.format("Group %s on %s mission %s", NavyGroup:GetName(), Mission:GetType(), Mission:GetName()))  
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Flotilla.lua

@@ -1,175 +0,0 @@
---- **Ops** - Flotilla is a small naval group belonging to a fleet.
---
--- **Main Features:**
---
---    * Set parameters like livery, skill valid for all flotilla members.
---    * Define mission types, this flotilla can perform (see Ops.Auftrag#AUFTRAG).
---    * Pause/unpause flotilla operations.
---
--- ===
---
--- ### Author: **funkyfranky**
--- 
--- ===
--- @module Ops.Flotilla
--- @image OPS_Flotilla.png
-
-
---- FLOTILLA class.
--- @type FLOTILLA
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity level.
--- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
--- @extends Ops.Cohort#COHORT
-
---- *No captain can do very wrong if he places his ship alongside that of an enemy.* -- Horation Nelson
---
--- ===
---
--- # The FLOTILLA Concept
--- 
--- A FLOTILLA is an essential part of a FLEET.
---
---
---
--- @field #FLOTILLA
-FLOTILLA = {
-  ClassName      = "FLOTILLA",
-  verbose        =     0,
-  weaponData     =    {},
-}
-
---- FLOTILLA class version.
--- @field #string version
-FLOTILLA.version="0.1.0"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- TODO list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new FLOTILLA object and start the FSM.
--- @param #FLOTILLA self
--- @param #string TemplateGroupName Name of the template group.
--- @param #number Ngroups Number of asset groups of this flotilla. Default 3.
--- @param #string FlotillaName Name of the flotilla. Must be **unique**!
--- @return #FLOTILLA self
-function FLOTILLA:New(TemplateGroupName, Ngroups, FlotillaName)
-
-  -- Inherit everything from COHORT class.
-  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, FlotillaName)) -- #FLOTILLA
-  
-  -- All flotillas get mission type Nothing.
-  self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
-  
-  -- Is naval.
-  self.isNaval=true
-
-  -- Get initial ammo.
-  self.ammo=self:_CheckAmmo()
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-  -- TODO: Flotilla specific user functions.
-
---- Set fleet of this flotilla.
--- @param #FLOTILLA self
--- @param Ops.Fleet#FLEET Fleet The fleet.
--- @return #FLOTILLA self
-function FLOTILLA:SetFleet(Fleet)
-  self.legion=Fleet
-  return self
-end
-
---- Get fleet of this flotilla.
--- @param #FLOTILLA self
--- @return Ops.Fleet#FLEET The fleet.
-function FLOTILLA:GetFleet()
-  return self.legion
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start & Status
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
--- @param #FLOTILLA self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function FLOTILLA:onafterStart(From, Event, To)
-
-  -- Short info.
-  local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
-  self:I(self.lid..text)
-
-  -- Start the status monitoring.
-  self:__Status(-1)
-end
-
---- On after "Status" event.
--- @param #FLOTILLA self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function FLOTILLA:onafterStatus(From, Event, To)
-
-  if self.verbose>=1 then
-
-    -- FSM state.
-    local fsmstate=self:GetState()
-  
-    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
-    local skill=self.skill and tostring(self.skill) or "N/A"
-    
-    local NassetsTot=#self.assets
-    local NassetsInS=self:CountAssets(true)
-    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
-    if self.legion then
-      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
-    end
-    
-    -- Short info.
-    local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
-    fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
-    self:T(self.lid..text)
-    
-    -- Weapon data info.
-    if self.verbose>=3 and self.weaponData then
-      local text="Weapon Data:"
-      for bit,_weapondata in pairs(self.weaponData) do
-        local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
-        text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
-      end
-      self:I(self.lid..text)
-    end
-    
-    -- Check if group has detected any units.
-    self:_CheckAssetStatus()
-    
-  end  
-  
-  if not self:IsStopped() then
-    self:__Status(-60)
-  end
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Misc Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Platoon.lua

@@ -1,175 +0,0 @@
---- **Ops** - Brigade Platoon.
---
--- **Main Features:**
---
---    * Set parameters like livery, skill valid for all platoon members.
---    * Define modex and callsigns.
---    * Define mission types, this platoon can perform (see Ops.Auftrag#AUFTRAG).
---    * Pause/unpause platoon operations.
---
--- ===
---
--- ### Author: **funkyfranky**
--- @module Ops.Platoon
--- @image OPS_Platoon.png
-
-
---- PLATOON class.
--- @type PLATOON
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity level.
--- @field Ops.OpsGroup#OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
--- @extends Ops.Cohort#COHORT
-
---- *Some cool cohort quote* -- Known Author
---
--- ===
---
--- # The PLATOON Concept
--- 
--- A PLATOON is essential part of an BRIGADE.
---
---
---
--- @field #PLATOON
-PLATOON = {
-  ClassName      = "PLATOON",
-  verbose        =     0,
-  weaponData     =    {},
-}
-
---- PLATOON class version.
--- @field #string version
-PLATOON.version="0.1.0"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- TODO list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: A lot.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new PLATOON object and start the FSM.
--- @param #PLATOON self
--- @param #string TemplateGroupName Name of the template group.
--- @param #number Ngroups Number of asset groups of this platoon. Default 3.
--- @param #string PlatoonName Name of the platoon. Must be **unique**!
--- @return #PLATOON self
-function PLATOON:New(TemplateGroupName, Ngroups, PlatoonName)
-
-  -- Inherit everything from COHORT class.
-  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, PlatoonName)) -- #PLATOON
-  
-  -- All platoons get mission type Nothing.
-  self:AddMissionCapability(AUFTRAG.Type.NOTHING, 50)
-  
-  -- Is ground.
-  self.isGround=true
-
-  -- Get ammo.
-  self.ammo=self:_CheckAmmo()
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-  -- TODO: Platoon specific user functions.
-
---- Set brigade of this platoon.
--- @param #PLATOON self
--- @param Ops.Brigade#BRIGADE Brigade The brigade.
--- @return #PLATOON self
-function PLATOON:SetBrigade(Brigade)
-  self.legion=Brigade
-  return self
-end
-
---- Get brigade of this platoon.
--- @param #PLATOON self
--- @return Ops.Brigade#BRIGADE The brigade.
-function PLATOON:GetBrigade()
-  return self.legion
-end
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start & Status
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---[[
---- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
--- @param #PLATOON self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function PLATOON:onafterStart(From, Event, To)
-
-  -- Short info.
-  local text=string.format("Starting %s v%s %s", self.ClassName, self.version, self.name)
-  self:I(self.lid..text)
-
-  -- Start the status monitoring.
-  self:__Status(-1)
-end
-]]
-
---- On after "Status" event.
--- @param #PLATOON self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function PLATOON:onafterStatus(From, Event, To)
-
-  if self.verbose>=1 then
-
-    -- FSM state.
-    local fsmstate=self:GetState()
-  
-    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
-    local skill=self.skill and tostring(self.skill) or "N/A"
-    
-    local NassetsTot=#self.assets
-    local NassetsInS=self:CountAssets(true)
-    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
-    if self.legion then
-      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
-    end
-    
-    -- Short info.
-    local text=string.format("%s [Type=%s, Call=%s, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
-    fsmstate, self.aircrafttype, callsign, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
-    self:T(self.lid..text)
-    
-    -- Weapon data info.
-    if self.verbose>=3 and self.weaponData then
-      local text="Weapon Data:"
-      for bit,_weapondata in pairs(self.weaponData) do
-        local weapondata=_weapondata --Ops.OpsGroup#OPSGROUP.WeaponData
-        text=text..string.format("\n- Bit=%s: Rmin=%.1f km, Rmax=%.1f km", bit, weapondata.RangeMin/1000, weapondata.RangeMax/1000)
-      end
-      self:I(self.lid..text)
-    end
-    
-    -- Check if group has detected any units.
-    self:_CheckAssetStatus()
-    
-  end  
-  
-  if not self:IsStopped() then
-    self:__Status(-60)
-  end
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Misc Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- TODO: Misc functions.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Ops/Squadron.lua

@@ -1,324 +0,0 @@
---- **Ops** - Airwing Squadron.
---
--- **Main Features:**
---
---    * Set parameters like livery, skill valid for all squadron members.
---    * Define modex and callsigns.
---    * Define mission types, this squadron can perform (see Ops.Auftrag#AUFTRAG).
---    * Pause/unpause squadron operations.
---
--- ===
---
--- ### Author: **funkyfranky**
--- @module Ops.Squadron
--- @image OPS_Squadron.png
-
-
---- SQUADRON class.
--- @type SQUADRON
--- @field #string ClassName Name of the class.
--- @field #number verbose Verbosity level.
--- @field #string lid Class id string for output to DCS log file.
--- @field #string name Name of the squadron.
--- @field #string templatename Name of the template group.
--- @field #string aircrafttype Type of the airframe the squadron is using.
--- @field Wrapper.Group#GROUP templategroup Template group.
--- @field #number ngrouping User defined number of units in the asset group.
--- @field #table assets Squadron assets.
--- @field #table missiontypes Capabilities (mission types and performances) of the squadron.
--- @field #number fuellow Low fuel threshold.
--- @field #boolean fuellowRefuel If `true`, flight tries to refuel at the nearest tanker.
--- @field #number maintenancetime Time in seconds needed for maintenance of a returned flight.
--- @field #number repairtime Time in seconds for each
--- @field #string livery Livery of the squadron.
--- @field #number skill Skill of squadron members.
--- @field #number modex Modex.
--- @field #number modexcounter Counter to incease modex number for assets.
--- @field #string callsignName Callsign name.
--- @field #number callsigncounter Counter to increase callsign names for new assets.
--- @field #number Ngroups Number of asset flight groups this squadron has. 
--- @field #number engageRange Mission range in meters.
--- @field #string attribute Generalized attribute of the squadron template group.
--- @field #number tankerSystem For tanker squads, the refuel system used (boom=0 or probpe=1). Default nil.
--- @field #number refuelSystem For refuelable squads, the refuel system used (boom=0 or probe=1). Default nil.
--- @field #table tacanChannel List of TACAN channels available to the squadron.
--- @field #number radioFreq Radio frequency in MHz the squad uses.
--- @field #number radioModu Radio modulation the squad uses.
--- @field #string takeoffType Take of type.
--- @field #table parkingIDs Parking IDs for this squadron.
--- @field #boolean despawnAfterLanding Aircraft are despawned after landing.
--- @field #boolean despawnAfterHolding Aircraft are despawned after holding.
--- @extends Ops.Cohort#COHORT
-
---- *It is unbelievable what a squadron of twelve aircraft did to tip the balance* -- Adolf Galland
---
--- ===
---
--- # The SQUADRON Concept
--- 
--- A SQUADRON is essential part of an @{Ops.Airwing#AIRWING} and consists of **one** type of aircraft.
--- 
--- 
---
--- @field #SQUADRON
-SQUADRON = {
-  ClassName      = "SQUADRON",
-  verbose        =     0,
-  modex          =   nil,
-  modexcounter   =     0,
-  callsignName   =   nil,
-  callsigncounter=    11,
-  tankerSystem   =   nil,
-  refuelSystem   =   nil,
-}
-
---- SQUADRON class version.
--- @field #string version
-SQUADRON.version="0.8.1"
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- TODO list
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--- DONE: Parking spots for squadrons?
--- DONE: Engage radius.
--- DONE: Modex.
--- DONE: Call signs.
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new SQUADRON object and start the FSM.
--- @param #SQUADRON self
--- @param #string TemplateGroupName Name of the template group.
--- @param #number Ngroups Number of asset groups of this squadron. Default 3.
--- @param #string SquadronName Name of the squadron, e.g. "VFA-37". Must be **unique**!
--- @return #SQUADRON self
-function SQUADRON:New(TemplateGroupName, Ngroups, SquadronName)
-
-  -- Inherit everything from FSM class.
-  local self=BASE:Inherit(self, COHORT:New(TemplateGroupName, Ngroups, SquadronName)) -- #SQUADRON
-
-  -- Everyone can ORBIT.
-  self:AddMissionCapability(AUFTRAG.Type.ORBIT)
-  
-  -- Is air.
-  self.isAir=true
-
-  -- Refueling system.
-  self.refuelSystem=select(2, self.templategroup:GetUnit(1):IsRefuelable())
-  self.tankerSystem=select(2, self.templategroup:GetUnit(1):IsTanker())
-
-  ------------------------
-  --- Pseudo Functions ---
-  ------------------------
-
-  -- See COHORT class
-
-  return self
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- User functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Set number of units in groups.
--- @param #SQUADRON self
--- @param #number nunits Number of units. Must be >=1 and <=4. Default 2.
--- @return #SQUADRON self
-function SQUADRON:SetGrouping(nunits)
-  self.ngrouping=nunits or 2
-  if self.ngrouping<1 then self.ngrouping=1 end
-  if self.ngrouping>4 then self.ngrouping=4 end
-  return self
-end
-
---- Set valid parking spot IDs. Assets of this squad are only allowed to be spawned at these parking spots. **Note** that the IDs are different from the ones displayed in the mission editor!
--- @param #SQUADRON self
--- @param #table ParkingIDs Table of parking ID numbers or a single `#number`.
--- @return #SQUADRON self
-function SQUADRON:SetParkingIDs(ParkingIDs)
-  if type(ParkingIDs)~="table" then
-    ParkingIDs={ParkingIDs}
-  end
-  self.parkingIDs=ParkingIDs
-  return self
-end
-
-
---- Set takeoff type. All assets of this squadron will be spawned with cold (default) or hot engines.
--- Spawning on runways is not supported.
--- @param #SQUADRON self
--- @param #string TakeoffType Take off type: "Cold" (default) or "Hot" with engines on or "Air" for spawning in air.
--- @return #SQUADRON self
-function SQUADRON:SetTakeoffType(TakeoffType)
-  TakeoffType=TakeoffType or "Cold"
-  if TakeoffType:lower()=="hot" then
-    self.takeoffType=COORDINATE.WaypointType.TakeOffParkingHot
-  elseif TakeoffType:lower()=="cold" then
-    self.takeoffType=COORDINATE.WaypointType.TakeOffParking
-  elseif TakeoffType:lower()=="air" then
-    self.takeoffType=COORDINATE.WaypointType.TurningPoint    
-  else
-    self.takeoffType=COORDINATE.WaypointType.TakeOffParking
-  end
-  return self
-end
-
---- Set takeoff type cold (default). All assets of this squadron will be spawned with engines off (cold).
--- @param #SQUADRON self
--- @return #SQUADRON self
-function SQUADRON:SetTakeoffCold()
-  self:SetTakeoffType("Cold")
-  return self
-end
-
---- Set takeoff type hot. All assets of this squadron will be spawned with engines on (hot).
--- @param #SQUADRON self
--- @return #SQUADRON self
-function SQUADRON:SetTakeoffHot()
-  self:SetTakeoffType("Hot")
-  return self
-end
-
---- Set takeoff type air. All assets of this squadron will be spawned in air above the airbase.
--- @param #SQUADRON self
--- @return #SQUADRON self
-function SQUADRON:SetTakeoffAir()
-  self:SetTakeoffType("Air")
-  return self
-end
-
---- Set despawn after landing. Aircraft will be despawned after the landing event.
--- Can help to avoid DCS AI taxiing issues.
--- @param #SQUADRON self
--- @param #boolean Switch If `true` (default), activate despawn after landing.
--- @return #SQUADRON self
-function SQUADRON:SetDespawnAfterLanding(Switch)
-  if Switch then
-    self.despawnAfterLanding=Switch
-  else
-    self.despawnAfterLanding=true
-  end
-  return self
-end
-
---- Set despawn after holding. Aircraft will be despawned when they arrive at their holding position at the airbase.
--- Can help to avoid DCS AI taxiing issues.
--- @param #SQUADRON self
--- @param #boolean Switch If `true` (default), activate despawn after holding.
--- @return #SQUADRON self
-function SQUADRON:SetDespawnAfterHolding(Switch)
-  if Switch then
-    self.despawnAfterHolding=Switch
-  else
-    self.despawnAfterHolding=true
-  end
-  return self
-end
-
-
---- Set low fuel threshold.
--- @param #SQUADRON self
--- @param #number LowFuel Low fuel threshold in percent. Default 25.
--- @return #SQUADRON self
-function SQUADRON:SetFuelLowThreshold(LowFuel)
-  self.fuellow=LowFuel or 25
-  return self
-end
-
---- Set if low fuel threshold is reached, flight tries to refuel at the neares tanker.
--- @param #SQUADRON self
--- @param #boolean switch If true or nil, flight goes for refuelling. If false, turn this off.
--- @return #SQUADRON self
-function SQUADRON:SetFuelLowRefuel(switch)
-  if switch==false then
-    self.fuellowRefuel=false
-  else
-    self.fuellowRefuel=true
-  end
-  return self
-end
-
---- Set airwing.
--- @param #SQUADRON self
--- @param Ops.Airwing#AIRWING Airwing The airwing.
--- @return #SQUADRON self
-function SQUADRON:SetAirwing(Airwing)
-  self.legion=Airwing
-  return self
-end
-
---- Get airwing.
--- @param #SQUADRON self
--- @return Ops.Airwing#AIRWING The airwing.
-function SQUADRON:GetAirwing(Airwing)
-  return self.legion
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Start & Status
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- On after Start event. Starts the FLIGHTGROUP FSM and event handlers.
--- @param #SQUADRON self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function SQUADRON:onafterStart(From, Event, To)
-
-  -- Short info.
-  local text=string.format("Starting SQUADRON", self.name)
-  self:T(self.lid..text)
-
-  -- Start the status monitoring.
-  self:__Status(-1)
-end
-
---- On after "Status" event.
--- @param #SQUADRON self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
-function SQUADRON:onafterStatus(From, Event, To)
-
-  if self.verbose>=1 then
-
-    -- FSM state.
-    local fsmstate=self:GetState()
-  
-    local callsign=self.callsignName and UTILS.GetCallsignName(self.callsignName) or "N/A"
-    local modex=self.modex and self.modex or -1
-    local skill=self.skill and tostring(self.skill) or "N/A"
-    
-    local NassetsTot=#self.assets
-    local NassetsInS=self:CountAssets(true)
-    local NassetsQP=0 ; local NassetsP=0 ; local NassetsQ=0  
-    if self.legion then
-      NassetsQP, NassetsP, NassetsQ=self.legion:CountAssetsOnMission(nil, self)
-    end
-    
-    -- Short info.
-    local text=string.format("%s [Type=%s, Call=%s, Modex=%d, Skill=%s]: Assets Total=%d, Stock=%d, Mission=%d [Active=%d, Queue=%d]", 
-    fsmstate, self.aircrafttype, callsign, modex, skill, NassetsTot, NassetsInS, NassetsQP, NassetsP, NassetsQ)
-    self:I(self.lid..text)
-    
-    -- Check if group has detected any units.
-    self:_CheckAssetStatus()
-    
-  end  
-  
-  if not self:IsStopped() then
-    self:__Status(-60)
-  end
-end
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Misc Functions
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-

Moose Development/Moose/Shapes/Circle.lua

@@ -72,7 +72,7 @@ end
 
 --- Checks if a point is contained within the circle.
 -- @param #table point The point to check
--- @return #bool True if the point is contained, false otherwise
+-- @return #boolean True if the point is contained, false otherwise
 function CIRCLE:ContainsPoint(point)
     if ((point.x - self.CenterVec2.x) ^ 2 + (point.y - self.CenterVec2.y) ^ 2) ^ 0.5 <= self.Radius then
         return true
@@ -226,6 +226,11 @@ end
 --- Returns a random Vec2 within the circle.
 -- @return #table The random Vec2
 function CIRCLE:GetRandomVec2()
+
+    math.random()
+    math.random()
+    math.random()
+    
     local angle = math.random() * 2 * math.pi
 
     local rx = math.random(0, self.Radius) * math.cos(angle) + self.CenterVec2.x
@@ -237,6 +242,11 @@ end
 --- Returns a random Vec2 on the border of the circle.
 -- @return #table The random Vec2
 function CIRCLE:GetRandomVec2OnBorder()
+    
+    math.random()
+    math.random()
+    math.random()
+
     local angle = math.random() * 2 * math.pi
 
     local rx = self.Radius * math.cos(angle) + self.CenterVec2.x

Moose Development/Moose/Shapes/Polygon.lua

@@ -352,6 +352,7 @@ end
 --- Returns a random Vec2 within the polygon. The Vec2 is weighted by the areas of the triangles that make up the polygon.
 -- @return #table The random Vec2
 function POLYGON:GetRandomVec2()
+
     local weights = {}
     for _, triangle in pairs(self.Triangles) do
         weights[triangle] = triangle.SurfaceArea / self.SurfaceArea

Moose Development/Moose/Shapes/Triangle.lua

@@ -73,6 +73,11 @@ end
 -- @param #table points The points of the triangle, or 3 other points if you're just using the TRIANGLE class without an object of it
 -- @return #table The random Vec2
 function TRIANGLE:GetRandomVec2(points)
+
+    math.random()
+    math.random()
+    math.random()
+    
     points = points or self.Points
     local pt = {math.random(), math.random()}
     table.sort(pt)