Merge remote-tracking branch 'origin/master' into develop

#CSAR - add option for IR strobe

.github/workflows/build-includes.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
       - develop
+      - Apple/Develop
+      
     paths:
       - 'Moose Setup/**/*.lua'
       - 'Moose Development/**/*.lua'

Moose Development/Moose/.vscode/settings.json

@@ -1,7 +1,17 @@
 {
-    "Lua.workspace.preloadFileSize": 1000,
+    "Lua.workspace.preloadFileSize": 10000,
     "Lua.diagnostics.disable": [
-        "undefined-doc-name"
+        "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"
     ],
     "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
+-- @type AI_A2A_GCI
--- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
+-- @extends AI.AI_A2A#AI_A2A
 
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
@@ -39,6 +39,8 @@
 --
 -- ## 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
+-- @type AI_A2A_PATROL
--- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_A2A#AI_A2A
 
 --- 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,9 +11,8 @@
 -- @module AI.AI_A2G_BAI
 -- @image AI_Air_To_Ground_Engage.JPG
 
---- @type AI_A2G_BAI
+-- @type AI_A2G_BAI
--- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends.
--- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
 --
@@ -47,7 +46,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 )
+  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
   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,9 +11,8 @@
 -- @module AI.AI_A2G_CAS
 -- @image AI_Air_To_Ground_Engage.JPG
 
---- @type AI_A2G_CAS
+-- @type AI_A2G_CAS
--- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends.
--- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
 --
@@ -47,7 +46,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 )
+  local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
   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_Dispatcher.lua

@@ -3895,10 +3895,14 @@ do -- AI_A2G_DISPATCHER
         
         if Squadron then
           local FirstUnit = AttackSetUnit:GetRandomSurely()
+          if FirstUnit then
           local Coordinate = FirstUnit:GetCoordinate() -- Core.Point#COORDINATE
            if self.SetSendPlayerMessages then
             Dispatcher:MessageToPlayers( Squadron,  DefenderName .. ", on route to ground target at " .. Coordinate:ToStringA2G( DefenderGroup ), DefenderGroup )
            end
+          else
+            return
+          end
         end
         self:GetParent(self).onafterEngageRoute( self, DefenderGroup, From, Event, To, AttackSetUnit )
       end
@@ -4784,4 +4788,5 @@ end
       Squadron.ResourceCount = Squadron.ResourceCount - Amount
     end
     self:T({Squadron = Squadron.Name,SquadronResourceCount = Squadron.ResourceCount})
-  end
+  end
+  

Moose Development/Moose/AI/AI_A2G_SEAD.lua

@@ -13,9 +13,8 @@
 
 
 
---- @type AI_A2G_SEAD
+-- @type AI_A2G_SEAD
--- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_A2G_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.lua

@@ -9,6 +9,7 @@
 -- @module AI.AI_Air
 -- @image MOOSE.JPG
 
+---
 -- @type AI_AIR
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 

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

@@ -408,7 +408,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" )
@@ -417,7 +417,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.
@@ -429,7 +429,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.
@@ -478,7 +478,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.
@@ -488,7 +488,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.
@@ -612,7 +612,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.
@@ -623,7 +623,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.
@@ -637,7 +637,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
@@ -344,7 +344,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 )
 
@@ -355,7 +355,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.
@@ -367,7 +367,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.
@@ -395,7 +395,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.
@@ -405,7 +405,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.
@@ -505,7 +505,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.
@@ -515,7 +515,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.
@@ -528,7 +528,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

@@ -363,7 +363,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 )
 
@@ -375,7 +375,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.
@@ -387,7 +387,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.
@@ -420,7 +420,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.
@@ -430,7 +430,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.
@@ -530,7 +530,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.
@@ -541,7 +541,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.
@@ -555,7 +555,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
 
 
@@ -160,7 +160,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 = GROUP:New():FilterPrefixes( "ShippingLane" ):FilterStart()
+--      local ShippingLane = SET_GROUP:New():FilterPrefixes( "ShippingLane" ):FilterOnce():GetSetObjects()
 -- 
 --      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
 
 
@@ -287,7 +287,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
@@ -326,7 +326,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
@@ -409,7 +409,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
 
 
@@ -33,7 +33,7 @@ AI_ESCORT_DISPATCHER_REQUEST = {
   ClassName = "AI_ESCORT_DISPATCHER_REQUEST",
 }
 
---- @field #list 
+-- @field #list 
 AI_ESCORT_DISPATCHER_REQUEST.AI_Escorts = {}
 
 
@@ -80,7 +80,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 )
 
@@ -97,7 +97,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

@@ -136,12 +136,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
+  -- # Developer Note
--- 
+  -- 
--- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- 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
+  -- Therefore, this class is considered to be deprecated
---
+  --
 -- ===
 -- 
 -- ### Authors: **FlightControl** 
@@ -153,7 +153,7 @@
 
 
 
---- @type AI_ESCORT_REQUEST
+-- @type AI_ESCORT_REQUEST
 -- @extends AI.AI_Escort#AI_ESCORT
 
 --- AI_ESCORT_REQUEST class
@@ -228,7 +228,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 )
@@ -253,7 +253,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 } )
@@ -268,7 +268,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 )
 
@@ -290,14 +290,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 Wrapper.Group#GROUP EscortGroup
+    -- @param Core.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 DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
+-- @Field DCSTypes#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 DCSTypes#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.
 
 
@@ -92,12 +92,12 @@
 -- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" )
 -- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 )
 -- LargeFormation:__Start( 1 )
---
+  --
--- # Developer Note
+  -- # Developer Note
--- 
+  -- 
--- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+  -- 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
+  -- Therefore, this class is considered to be deprecated
---
+  --
 -- @field #AI_FORMATION 
 AI_FORMATION = {
   ClassName = "AI_FORMATION",
@@ -117,7 +117,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
@@ -142,7 +142,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 = {
@@ -152,13 +152,13 @@ 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 = {
-  Airborne = "*",
+  All = "*",
   Airborne = "A",
   GroundRadar = "R",
   Ground = "G",
@@ -996,7 +996,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      --- @param Wrapper.Group#GROUP EscortGroup
+      -- @param Core.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
@@ -1020,7 +1020,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      --- @param Wrapper.Group#GROUP EscortGroup
+      -- @param Core.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
@@ -1044,7 +1044,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      --- @param Wrapper.Group#GROUP EscortGroup
+      -- @param Core.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
@@ -1222,7 +1222,7 @@ 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,
+          --y = GH2.y,
           z = CV2.z + CS * 10 * math.cos(Ca),
         }
   

Moose Development/Moose/Actions/Act_Account.lua

@@ -274,7 +274,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 } )
@@ -285,7 +285,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 } )
@@ -297,7 +297,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

@@ -200,7 +200,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

@@ -78,7 +78,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

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

Moose Development/Moose/Cargo/CargoSlingload.lua

@@ -72,7 +72,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/Base.lua

@@ -26,7 +26,7 @@
 -- @module Core.Base
 -- @image Core_Base.JPG
 
-local _TraceOnOff = true
+local _TraceOnOff = false -- default to no tracing
 local _TraceLevel = 1
 local _TraceAll = false
 local _TraceClass = {}
@@ -741,7 +741,31 @@ do -- Event Handling
   -- @function [parent=#BASE] OnEventPlayerEnterAircraft
   -- @param #BASE self
   -- @param Core.Event#EVENTDATA EventData The EventData structure.
-
+  
+  --- Occurs when a player creates a dynamic cargo object from the F8 ground crew menu.
+  -- *** NOTE *** this is a workarounf for DCS not creating these events as of Aug 2024.
+  -- @function [parent=#BASE] OnEventNewDynamicCargo
+  -- @param #BASE self
+  -- @param Core.Event#EVENTDATA EventData The EventData structure.
+  
+    --- Occurs when a player loads a dynamic cargo object with the F8 ground crew menu into a helo.
+  -- *** NOTE *** this is a workarounf for DCS not creating these events as of Aug 2024.
+  -- @function [parent=#BASE] OnEventDynamicCargoLoaded
+  -- @param #BASE self
+  -- @param Core.Event#EVENTDATA EventData The EventData structure.
+  
+  --- Occurs when a player unloads a dynamic cargo object with the F8 ground crew menu from a helo.
+  -- *** NOTE *** this is a workarounf for DCS not creating these events as of Aug 2024.
+  -- @function [parent=#BASE] OnEventDynamicCargoUnloaded
+  -- @param #BASE self
+  -- @param Core.Event#EVENTDATA EventData The EventData structure.
+  
+  --- Occurs when a dynamic cargo crate is removed.
+  -- *** NOTE *** this is a workarounf for DCS not creating these events as of Aug 2024.
+  -- @function [parent=#BASE] OnEventDynamicCargoRemoved
+  -- @param #BASE self
+  -- @param Core.Event#EVENTDATA EventData The EventData structure.
+  
 end
 
 --- Creation of a Birth Event.
@@ -862,6 +886,62 @@ end
   
     world.onEvent(Event)
   end  
+  
+    --- Creation of a S_EVENT_NEW_DYNAMIC_CARGO event.
+  -- @param #BASE self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function BASE:CreateEventNewDynamicCargo(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.NewDynamicCargo,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_LOADED event.
+  -- @param #BASE self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function BASE:CreateEventDynamicCargoLoaded(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoLoaded,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_UNLOADED event.
+  -- @param #BASE self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function BASE:CreateEventDynamicCargoUnloaded(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoUnloaded,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_REMOVED event.
+  -- @param #BASE self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function BASE:CreateEventDynamicCargoRemoved(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoRemoved,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
                   
 --- The main event handling function... This function captures all events generated for the class.
 -- @param #BASE self
@@ -1200,7 +1280,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1215,7 +1295,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F2( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1230,7 +1310,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F3( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1274,7 +1354,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1289,7 +1369,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T2( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1304,7 +1384,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T3( Arguments )
 
-  if BASE.Debug and _TraceOnOff then
+  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 

Moose Development/Moose/Core/ClientMenu.lua

@@ -417,7 +417,7 @@ end
 CLIENTMENUMANAGER = {
   ClassName = "CLIENTMENUMANAGER",
   lid = "",
-  version = "0.1.5a",
+  version = "0.1.6",
   name = nil,
   clientset = nil,
   menutree = {},
@@ -740,7 +740,7 @@ function CLIENTMENUMANAGER:AddEntry(Entry,Client)
   for _,_client in pairs(Set) do
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
-      local playername = client:GetPlayerName()
+      local playername = client:GetPlayerName() or "None"
       local unitname = client:GetName()
       if not knownunits[unitname] then
         knownunits[unitname] = true

Moose Development/Moose/Core/Database.lua

@@ -20,6 +20,7 @@
 --   * Manage database of hits to units and statics.
 --   * Manage database of destroys of units and statics.
 --   * Manage database of @{Core.Zone#ZONE_BASE} objects.
+--   * Manage database of @{Wrapper.DynamicCargo#DYNAMICCARGO} objects alive in the mission.
 --
 -- ===
 --
@@ -39,6 +40,7 @@
 -- @field #table STORAGES DCS warehouse storages.
 -- @field #table STNS Used Link16 octal numbers for F16/15/18/AWACS planes.
 -- @field #table SADL Used Link16 octal numbers for A10/C-II planes.
+-- @field #table DYNAMICCARGO Dynamic Cargo objects.
 -- @extends Core.Base#BASE
 
 --- Contains collections of wrapper objects defined within MOOSE that reflect objects within the simulator.
@@ -54,6 +56,7 @@
 --  * PLAYERS
 --  * CARGOS
 --  * STORAGES (DCS warehouses)
+--  * DYNAMICCARGO
 --
 -- On top, for internal MOOSE administration purposes, the DATABASE administers the Unit and Group TEMPLATES as defined within the Mission Editor.
 --
@@ -97,6 +100,7 @@ DATABASE = {
   STORAGES = {},
   STNS={},
   SADL={},
+  DYNAMICCARGO={},
 }
 
 local _DATABASECoalition =
@@ -135,7 +139,7 @@ function DATABASE:New()
   self:HandleEvent( EVENTS.Dead, self._EventOnDeadOrCrash )
   self:HandleEvent( EVENTS.Crash, self._EventOnDeadOrCrash )
   self:HandleEvent( EVENTS.RemoveUnit, self._EventOnDeadOrCrash )
-  --self:HandleEvent( EVENTS.UnitLost, self._EventOnDeadOrCrash )  -- DCS 2.7.1 for Aerial units no dead event ATM
+  self:HandleEvent( EVENTS.UnitLost, self._EventOnDeadOrCrash )  -- DCS 2.7.1 for Aerial units no dead event ATM
   self:HandleEvent( EVENTS.Hit, self.AccountHits )
   self:HandleEvent( EVENTS.NewCargo )
   self:HandleEvent( EVENTS.DeleteCargo )
@@ -143,6 +147,8 @@ function DATABASE:New()
   self:HandleEvent( EVENTS.DeleteZone )
   --self:HandleEvent( EVENTS.PlayerEnterUnit, self._EventOnPlayerEnterUnit ) -- This is not working anymore!, handling this through the birth event.
   self:HandleEvent( EVENTS.PlayerLeaveUnit, self._EventOnPlayerLeaveUnit )
+  -- DCS 2.9.7 Moose own dynamic cargo events
+  self:HandleEvent( EVENTS.DynamicCargoRemoved, self._EventOnDynamicCargoRemoved)
 
   self:_RegisterTemplates()
   self:_RegisterGroupsAndUnits()
@@ -170,24 +176,30 @@ end
 --- Adds a Unit based on the Unit Name in the DATABASE.
 -- @param #DATABASE self
 -- @param #string DCSUnitName Unit name.
+-- @param #boolean force
 -- @return Wrapper.Unit#UNIT The added unit.
-function DATABASE:AddUnit( DCSUnitName )
+function DATABASE:AddUnit( DCSUnitName, force )
-
+  
-  if not self.UNITS[DCSUnitName] then
+  local DCSunitName = DCSUnitName
+  
+  if type(DCSunitName) == "number" then DCSunitName = string.format("%d",DCSUnitName) end
+  
+  if not self.UNITS[DCSunitName] or force == true then
     -- Debug info.
-    self:T( { "Add UNIT:", DCSUnitName } )
+    self:T( { "Add UNIT:", DCSunitName } )
 
     -- Register unit
-    self.UNITS[DCSUnitName]=UNIT:Register(DCSUnitName)
+    self.UNITS[DCSunitName]=UNIT:Register(DCSunitName)
   end
 
-  return self.UNITS[DCSUnitName]
+  return self.UNITS[DCSunitName]
 end
 
 
 --- Deletes a Unit from the DATABASE based on the Unit Name.
 -- @param #DATABASE self
 function DATABASE:DeleteUnit( DCSUnitName )
+  self:T("DeleteUnit "..tostring(DCSUnitName))
   self.UNITS[DCSUnitName] = nil
 end
 
@@ -222,6 +234,34 @@ function DATABASE:FindStatic( StaticName )
   return StaticFound
 end
 
+--- Add a DynamicCargo to the database.
+-- @param #DATABASE self
+-- @param #string Name Name of the dynamic cargo.
+-- @return Wrapper.DynamicCargo#DYNAMICCARGO The dynamic cargo object.
+function DATABASE:AddDynamicCargo( Name )
+  if not self.DYNAMICCARGO[Name] then
+    self.DYNAMICCARGO[Name] = DYNAMICCARGO:Register(Name)
+    return self.DYNAMICCARGO[Name]
+  end
+  return nil
+end
+
+--- Finds a DYNAMICCARGO based on the Dynamic Cargo Name.
+-- @param #DATABASE self
+-- @param #string DynamicCargoName
+-- @return Wrapper.DynamicCargo#DYNAMICCARGO The found DYNAMICCARGO.
+function DATABASE:FindDynamicCargo( DynamicCargoName )
+  local StaticFound = self.DYNAMICCARGO[DynamicCargoName]
+  return StaticFound
+end
+
+--- Deletes a DYNAMICCARGO from the DATABASE based on the Dynamic Cargo Name.
+-- @param #DATABASE self
+function DATABASE:DeleteDynamicCargo( DynamicCargoName )
+  self.DYNAMICCARGO[DynamicCargoName] = nil
+  return self
+end
+
 --- Adds a Airbase based on the Airbase Name in the DATABASE.
 -- @param #DATABASE self
 -- @param #string AirbaseName The name of the airbase.
@@ -813,14 +853,19 @@ end
 --- Adds a CLIENT based on the ClientName in the DATABASE.
 -- @param #DATABASE self
 -- @param #string ClientName Name of the Client unit.
+-- @param #boolean Force (optional) Force registration of client.
 -- @return Wrapper.Client#CLIENT The client object.
-function DATABASE:AddClient( ClientName )
+function DATABASE:AddClient( ClientName, Force )
-
+  
-  if not self.CLIENTS[ClientName] then
+  local DCSUnitName = ClientName
-    self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
+  
+  if type(DCSUnitName) == "number" then DCSUnitName = string.format("%d",ClientName) end
+  
+  if not self.CLIENTS[DCSUnitName] or Force == true then
+    self.CLIENTS[DCSUnitName] = CLIENT:Register( DCSUnitName )
   end
 
-  return self.CLIENTS[ClientName]
+  return self.CLIENTS[DCSUnitName]
 end
 
 
@@ -831,15 +876,25 @@ end
 function DATABASE:FindGroup( GroupName )
 
   local GroupFound = self.GROUPS[GroupName]
+  
+  if GroupFound == nil and GroupName ~= nil and self.Templates.Groups[GroupName] == nil then
+    -- see if the group exists in the API, maybe a dynamic slot
+    self:_RegisterDynamicGroup(GroupName)
+    return self.GROUPS[GroupName]
+  end
+  
   return GroupFound
 end
 
 
 --- Adds a GROUP based on the GroupName in the DATABASE.
 -- @param #DATABASE self
-function DATABASE:AddGroup( GroupName )
+-- @param #string GroupName
+-- @param #boolean force
+-- @return Wrapper.Group#GROUP The Group
+function DATABASE:AddGroup( GroupName, force )
 
-  if not self.GROUPS[GroupName] then
+  if not self.GROUPS[GroupName] or force == true then
     self:T( { "Add GROUP:", GroupName } )
     self.GROUPS[GroupName] = GROUP:Register( GroupName )
   end
@@ -850,9 +905,11 @@ end
 --- Adds a player based on the Player Name in the DATABASE.
 -- @param #DATABASE self
 function DATABASE:AddPlayer( UnitName, PlayerName )
-
+  
+  if type(UnitName) == "number" then UnitName = string.format("%d",UnitName) end
+  
   if PlayerName then
-    self:T( { "Add player for unit:", UnitName, PlayerName } )
+    self:I( { "Add player for unit:", UnitName, PlayerName } )
     self.PLAYERS[PlayerName] = UnitName
     self.PLAYERUNITS[PlayerName] = self:FindUnit( UnitName )
     self.PLAYERSJOINED[PlayerName] = PlayerName
@@ -860,6 +917,21 @@ function DATABASE:AddPlayer( UnitName, PlayerName )
   
 end
 
+--- Get a PlayerName by UnitName from PLAYERS in DATABASE.
+-- @param #DATABASE self
+-- @return #string PlayerName
+-- @return Wrapper.Unit#UNIT PlayerUnit
+function DATABASE:_FindPlayerNameByUnitName(UnitName)
+  if UnitName then
+    for playername,unitname in pairs(self.PLAYERS) do
+      if unitname == UnitName and self.PLAYERUNITS[playername] and self.PLAYERUNITS[playername]:IsAlive() then
+        return playername, self.PLAYERUNITS[playername]
+      end
+    end
+  end
+  return nil
+end
+
 --- Deletes a player from the DATABASE based on the Player Name.
 -- @param #DATABASE self
 function DATABASE:DeletePlayer( UnitName, PlayerName )
@@ -1198,6 +1270,43 @@ function DATABASE:_RegisterStaticTemplate( StaticTemplate, CoalitionID, Category
   return self
 end
 
+--- Get a generic static cargo group template from scratch for dynamic cargo spawns register. Does not register the template!
+-- @param #DATABASE self
+-- @param #string Name Name of the static.
+-- @param #string Typename Typename of the static. Defaults to "container_cargo".
+-- @param #number Mass Mass of the static. Defaults to 0.
+-- @param #number Coalition Coalition of the static. Defaults to coalition.side.BLUE.
+-- @param #number Country Country of the static. Defaults to country.id.GERMANY.
+-- @return #table Static template table.
+function DATABASE:_GetGenericStaticCargoGroupTemplate(Name,Typename,Mass,Coalition,Country)
+  local StaticTemplate = {}
+  StaticTemplate.name = Name or "None"
+  StaticTemplate.units = { [1] = { 
+    name = Name, 
+    resourcePayload = {
+      ["weapons"] = {},
+      ["aircrafts"] = {},
+      ["gasoline"] = 0,
+      ["diesel"] = 0,
+      ["methanol_mixture"] = 0,
+      ["jet_fuel"] = 0,   
+    },
+    ["mass"] = Mass or 0,
+    ["category"] = "Cargos",
+    ["canCargo"] = true,
+    ["type"] = Typename or "container_cargo",
+    ["rate"] = 100,
+    ["y"] = 0,
+    ["x"] = 0,
+    ["heading"] = 0,
+  }}
+  StaticTemplate.CategoryID = "static"
+  StaticTemplate.CoalitionID = Coalition or coalition.side.BLUE
+  StaticTemplate.CountryID = Country or country.id.GERMANY
+  --UTILS.PrintTableToLog(StaticTemplate)
+  return StaticTemplate
+end
+
 --- Get static group template.
 -- @param #DATABASE self
 -- @param #string StaticName Name of the static.
@@ -1271,7 +1380,11 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Coalition ID.
 function DATABASE:GetCoalitionFromClientTemplate( ClientName )
-  return self.Templates.ClientsByName[ClientName].CoalitionID
+  if self.Templates.ClientsByName[ClientName] then  
+    return self.Templates.ClientsByName[ClientName].CoalitionID
+  end
+  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  return nil
 end
 
 --- Get category ID from client name.
@@ -1279,7 +1392,11 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Category ID.
 function DATABASE:GetCategoryFromClientTemplate( ClientName )
-  return self.Templates.ClientsByName[ClientName].CategoryID
+  if self.Templates.ClientsByName[ClientName] then  
+    return self.Templates.ClientsByName[ClientName].CategoryID
+  end
+  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  return nil
 end
 
 --- Get country ID from client name.
@@ -1287,7 +1404,11 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Country ID.
 function DATABASE:GetCountryFromClientTemplate( ClientName )
-  return self.Templates.ClientsByName[ClientName].CountryID
+  if self.Templates.ClientsByName[ClientName] then  
+    return self.Templates.ClientsByName[ClientName].CountryID
+  end
+  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
+  return nil  
 end
 
 --- Airbase
@@ -1333,6 +1454,36 @@ function DATABASE:_RegisterPlayers()
   return self
 end
 
+--- Private method that registers a single dynamic slot Group and Units within in the mission.
+-- @param #DATABASE self
+-- @return #DATABASE self
+function DATABASE:_RegisterDynamicGroup(Groupname)
+  local DCSGroup = Group.getByName(Groupname)
+  if DCSGroup and DCSGroup:isExist() then
+  
+    -- Group name.
+    local DCSGroupName = DCSGroup:getName()
+  
+    -- Add group.
+    self:I(string.format("Register Group: %s", tostring(DCSGroupName)))
+    self:AddGroup( DCSGroupName, true )
+  
+    -- Loop over units in group.
+    for DCSUnitId, DCSUnit in pairs( DCSGroup:getUnits() ) do
+  
+      -- Get unit name.
+      local DCSUnitName = DCSUnit:getName()
+  
+      -- Add unit.
+      self:I(string.format("Register Unit: %s", tostring(DCSUnitName)))
+      self:AddUnit( tostring(DCSUnitName), true )
+  
+    end
+  else
+    self:E({"Group does not exist: ", DCSGroup})
+  end
+  return self
+end
 
 --- Private method that registers all Groups and Units within in the mission.
 -- @param #DATABASE self
@@ -1476,7 +1627,7 @@ end
 -- @param #DATABASE self
 -- @param Core.Event#EVENTDATA Event
 function DATABASE:_EventOnBirth( Event )
-  self:F( { Event } )
+  self:T( { Event } )
 
   if Event.IniDCSUnit then
 
@@ -1484,7 +1635,17 @@ function DATABASE:_EventOnBirth( Event )
 
       -- Add static object to DB.
       self:AddStatic( Event.IniDCSUnitName )
+    
+    elseif Event.IniObjectCategory == Object.Category.CARGO and string.match(Event.IniUnitName,".+|%d%d:%d%d|PKG%d+") then
 
+      -- Add dynamic cargo object to DB
+      
+      local cargo = self:AddDynamicCargo(Event.IniDCSUnitName)
+      
+      self:I(string.format("Adding dynamic cargo %s", tostring(Event.IniDCSUnitName)))
+      
+      self:CreateEventNewDynamicCargo( cargo )
+        
     else
 
       if Event.IniObjectCategory == Object.Category.UNIT then
@@ -1505,9 +1666,9 @@ function DATABASE:_EventOnBirth( Event )
     end
 
     if Event.IniObjectCategory == Object.Category.UNIT then
-
+      
-      Event.IniUnit = self:FindUnit( Event.IniDCSUnitName )
       Event.IniGroup = self:FindGroup( Event.IniDCSGroupName )
+      Event.IniUnit = self:FindUnit( Event.IniDCSUnitName )
 
       -- Client
       local client=self.CLIENTS[Event.IniDCSUnitName] --Wrapper.Client#CLIENT
@@ -1523,10 +1684,10 @@ function DATABASE:_EventOnBirth( Event )
 
         -- Debug info.
         self:I(string.format("Player '%s' joined unit '%s' of group '%s'", tostring(PlayerName), tostring(Event.IniDCSUnitName), tostring(Event.IniDCSGroupName)))
-
+              
         -- Add client in case it does not exist already.
-        if not client then
+        if client == nil or (client and client:CountPlayers() == 0) then
-          client=self:AddClient(Event.IniDCSUnitName)
+          client=self:AddClient(Event.IniDCSUnitName, true)
         end
 
         -- Add player.
@@ -1536,14 +1697,19 @@ function DATABASE:_EventOnBirth( Event )
         if not self.PLAYERS[PlayerName] then
           self:AddPlayer( Event.IniUnitName, PlayerName )
         end
-
+        
-        -- Player settings.
+        local function SetPlayerSettings(self,PlayerName,IniUnit)
-        local Settings = SETTINGS:Set( PlayerName )
+          -- Player settings.
-        Settings:SetPlayerMenu(Event.IniUnit)
+          local Settings = SETTINGS:Set( PlayerName )
-
+          --Settings:SetPlayerMenu(Event.IniUnit)
-        -- Create an event.
+          Settings:SetPlayerMenu(IniUnit)
-        self:CreateEventPlayerEnterAircraft(Event.IniUnit)
+          -- Create an event.
-
+          self:CreateEventPlayerEnterAircraft(IniUnit)
+          --self:CreateEventPlayerEnterAircraft(Event.IniUnit)
+        end
+        
+        self:ScheduleOnce(1,SetPlayerSettings,self,PlayerName,Event.IniUnit)
+        
       end
 
     end
@@ -1557,7 +1723,6 @@ end
 -- @param #DATABASE self
 -- @param Core.Event#EVENTDATA Event
 function DATABASE:_EventOnDeadOrCrash( Event )
-
   if Event.IniDCSUnit then
 
     local name=Event.IniDCSUnitName
@@ -1565,7 +1730,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
     if Event.IniObjectCategory == 3 then
 
       ---
-      -- STATICS
+      -- STATICS 
       ---
 
       if self.STATICS[Event.IniDCSUnitName] then
@@ -1575,7 +1740,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
       ---
       -- Maybe a UNIT?
       ---
-
+ 
       -- Delete unit.
       if self.UNITS[Event.IniDCSUnitName] then
         self:T("STATIC Event for UNIT "..tostring(Event.IniDCSUnitName))
@@ -1598,7 +1763,8 @@ function DATABASE:_EventOnDeadOrCrash( Event )
 
         -- Delete unit.
         if self.UNITS[Event.IniDCSUnitName] then
-          self:DeleteUnit(Event.IniDCSUnitName)
+          self:ScheduleOnce(1,self.DeleteUnit,self,Event.IniDCSUnitName)
+          --self:DeleteUnit(Event.IniDCSUnitName)
         end
 
         -- Remove client players.
@@ -1665,6 +1831,15 @@ function DATABASE:_EventOnPlayerEnterUnit( Event )
   end
 end
 
+--- Handles the OnDynamicCargoRemoved event to clean the active dynamic cargo table.
+-- @param #DATABASE self
+-- @param Core.Event#EVENTDATA Event
+function DATABASE:_EventOnDynamicCargoRemoved( Event )
+  self:T( { Event } )
+  if Event.IniDynamicCargoName then
+    self:DeleteDynamicCargo(Event.IniDynamicCargoName)
+  end
+end
 
 --- Handles the OnPlayerLeaveUnit event to clean the active players table.
 -- @param #DATABASE self
@@ -1706,6 +1881,7 @@ function DATABASE:_EventOnPlayerLeaveUnit( Event )
         local client=self.CLIENTS[Event.IniDCSUnitName] --Wrapper.Client#CLIENT
         if client then
           client:RemovePlayer(PlayerName)
+          --self.PLAYERSETTINGS[PlayerName] = nil
         end
 
       end

Moose Development/Moose/Core/Event.lua

@@ -194,6 +194,11 @@ world.event.S_EVENT_NEW_ZONE_GOAL = world.event.S_EVENT_MAX + 1004
 world.event.S_EVENT_DELETE_ZONE_GOAL = world.event.S_EVENT_MAX + 1005
 world.event.S_EVENT_REMOVE_UNIT = world.event.S_EVENT_MAX + 1006
 world.event.S_EVENT_PLAYER_ENTER_AIRCRAFT = world.event.S_EVENT_MAX + 1007
+-- dynamic cargo
+world.event.S_EVENT_NEW_DYNAMIC_CARGO = world.event.S_EVENT_MAX + 1008
+world.event.S_EVENT_DYNAMIC_CARGO_LOADED = world.event.S_EVENT_MAX + 1009
+world.event.S_EVENT_DYNAMIC_CARGO_UNLOADED = world.event.S_EVENT_MAX + 1010
+world.event.S_EVENT_DYNAMIC_CARGO_REMOVED = world.event.S_EVENT_MAX + 1011
 
 
 --- The different types of events supported by MOOSE.
@@ -261,17 +266,29 @@ EVENTS = {
   SimulationStart           = world.event.S_EVENT_SIMULATION_START or -1,
   WeaponRearm               = world.event.S_EVENT_WEAPON_REARM or -1,
   WeaponDrop                = world.event.S_EVENT_WEAPON_DROP or -1,
-  -- Added with DCS 2.9.0
+  -- Added with DCS 2.9.x
-  UnitTaskTimeout           = world.event.S_EVENT_UNIT_TASK_TIMEOUT or -1,
+  --UnitTaskTimeout           = world.event.S_EVENT_UNIT_TASK_TIMEOUT or -1,
+  UnitTaskComplete          = world.event.S_EVENT_UNIT_TASK_COMPLETE or -1,
   UnitTaskStage             = world.event.S_EVENT_UNIT_TASK_STAGE or -1,
-  MacSubtaskScore           = world.event.S_EVENT_MAC_SUBTASK_SCORE or -1, 
+  --MacSubtaskScore           = world.event.S_EVENT_MAC_SUBTASK_SCORE or -1, 
   MacExtraScore             = world.event.S_EVENT_MAC_EXTRA_SCORE or -1,
   MissionRestart            = world.event.S_EVENT_MISSION_RESTART or -1,
   MissionWinner             = world.event.S_EVENT_MISSION_WINNER or -1, 
-  PostponedTakeoff          = world.event.S_EVENT_POSTPONED_TAKEOFF or -1, 
+  RunwayTakeoff             = world.event.S_EVENT_RUNWAY_TAKEOFF or -1, 
-  PostponedLand             = world.event.S_EVENT_POSTPONED_LAND or -1, 
+  RunwayTouch               = world.event.S_EVENT_RUNWAY_TOUCH or -1,
+  MacLMSRestart             = world.event.S_EVENT_MAC_LMS_RESTART or -1,
+  SimulationFreeze          = world.event.S_EVENT_SIMULATION_FREEZE or -1, 
+  SimulationUnfreeze        = world.event.S_EVENT_SIMULATION_UNFREEZE or -1, 
+  HumanAircraftRepairStart  = world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_START or -1, 
+  HumanAircraftRepairFinish = world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH or -1,
+  -- dynamic cargo
+  NewDynamicCargo           = world.event.S_EVENT_NEW_DYNAMIC_CARGO or -1,
+  DynamicCargoLoaded        = world.event.S_EVENT_DYNAMIC_CARGO_LOADED or -1,
+  DynamicCargoUnloaded      = world.event.S_EVENT_DYNAMIC_CARGO_UNLOADED or -1,
+  DynamicCargoRemoved       = world.event.S_EVENT_DYNAMIC_CARGO_REMOVED or -1,
 }
 
+
 --- The Event structure
 -- Note that at the beginning of each field description, there is an indication which field will be populated depending on the object type involved in the Event:
 --
@@ -327,6 +344,9 @@ EVENTS = {
 --
 -- @field Core.Zone#ZONE Zone The zone object.
 -- @field #string ZoneName The name of the zone.
+-- 
+-- @field Wrapper.DynamicCargo#DYNAMICCARGO IniDynamicCargo The dynamic cargo object.
+-- @field #string IniDynamicCargoName The dynamic cargo unit name.
 
 
 
@@ -646,24 +666,24 @@ local _EVENTMETA = {
      Text = "S_EVENT_WEAPON_DROP"
    },
    -- DCS 2.9
-  [EVENTS.UnitTaskTimeout] = {
+  --[EVENTS.UnitTaskTimeout] = {
-     Order = 1,
+    -- Order = 1,
-     Side = "I",
+    -- Side = "I",
-     Event = "OnEventUnitTaskTimeout",
+    -- Event = "OnEventUnitTaskTimeout",
-     Text = "S_EVENT_UNIT_TASK_TIMEOUT "
+    -- Text = "S_EVENT_UNIT_TASK_TIMEOUT "
-   },
+   --},
   [EVENTS.UnitTaskStage] = {
      Order = 1,
      Side = "I",
      Event = "OnEventUnitTaskStage",
      Text = "S_EVENT_UNIT_TASK_STAGE "
    },
-  [EVENTS.MacSubtaskScore] = {
+  --[EVENTS.MacSubtaskScore] = {
-     Order = 1,
+    -- Order = 1,
-     Side = "I",
+     --Side = "I",
-     Event = "OnEventMacSubtaskScore",
+     --Event = "OnEventMacSubtaskScore",
-     Text = "S_EVENT_MAC_SUBTASK_SCORE"
+     --Text = "S_EVENT_MAC_SUBTASK_SCORE"
-   },
+   --},
   [EVENTS.MacExtraScore] = {
      Order = 1,
      Side = "I",
@@ -682,20 +702,76 @@ local _EVENTMETA = {
      Event = "OnEventMissionWinner",
      Text = "S_EVENT_MISSION_WINNER"
    },
-  [EVENTS.PostponedTakeoff] = {
+  [EVENTS.RunwayTakeoff] = {
      Order = 1,
      Side = "I",
-     Event = "OnEventPostponedTakeoff",
+     Event = "OnEventRunwayTakeoff",
-     Text = "S_EVENT_POSTPONED_TAKEOFF"
+     Text = "S_EVENT_RUNWAY_TAKEOFF"
    },
-  [EVENTS.PostponedLand] = {
+  [EVENTS.RunwayTouch] = {
      Order = 1,
      Side = "I",
-     Event = "OnEventPostponedLand",
+     Event = "OnEventRunwayTouch",
-     Text = "S_EVENT_POSTPONED_LAND"
+     Text = "S_EVENT_RUNWAY_TOUCH"
+   }, 
+     [EVENTS.MacLMSRestart] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventMacLMSRestart",
+     Text = "S_EVENT_MAC_LMS_RESTART"
+   }, 
+     [EVENTS.SimulationFreeze] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventSimulationFreeze",
+     Text = "S_EVENT_SIMULATION_FREEZE"
+   }, 
+     [EVENTS.SimulationUnfreeze] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventSimulationUnfreeze",
+     Text = "S_EVENT_SIMULATION_UNFREEZE"
+   }, 
+     [EVENTS.HumanAircraftRepairStart] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventHumanAircraftRepairStart",
+     Text = "S_EVENT_HUMAN_AIRCRAFT_REPAIR_START"
+   }, 
+     [EVENTS.HumanAircraftRepairFinish] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventHumanAircraftRepairFinish",
+     Text = "S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH"
+   },
+   -- dynamic cargo
+     [EVENTS.NewDynamicCargo] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventNewDynamicCargo",
+     Text = "S_EVENT_NEW_DYNAMIC_CARGO"
+   },
+     [EVENTS.DynamicCargoLoaded] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventDynamicCargoLoaded",
+     Text = "S_EVENT_DYNAMIC_CARGO_LOADED"
+   },
+     [EVENTS.DynamicCargoUnloaded] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventDynamicCargoUnloaded",
+     Text = "S_EVENT_DYNAMIC_CARGO_UNLOADED"
+   },
+     [EVENTS.DynamicCargoRemoved] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventDynamicCargoRemoved",
+     Text = "S_EVENT_DYNAMIC_CARGO_REMOVED"
    }, 
 }
 
+
 --- The Events structure
 -- @type EVENT.Events
 -- @field #number IniUnit
@@ -1108,7 +1184,63 @@ do -- Event Creation
 
     world.onEvent( Event )
   end
-
+  
+  --- Creation of a S_EVENT_NEW_DYNAMIC_CARGO event.
+  -- @param #EVENT self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function EVENT:CreateEventNewDynamicCargo(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.NewDynamicCargo,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_LOADED event.
+  -- @param #EVENT self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function EVENT:CreateEventDynamicCargoLoaded(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoLoaded,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_UNLOADED event.
+  -- @param #EVENT self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function EVENT:CreateEventDynamicCargoUnloaded(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoUnloaded,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
+  --- Creation of a S_EVENT_DYNAMIC_CARGO_REMOVED event.
+  -- @param #EVENT self
+  -- @param Wrapper.DynamicCargo#DYNAMICCARGO DynamicCargo the dynamic cargo object
+  function EVENT:CreateEventDynamicCargoRemoved(DynamicCargo)
+    self:F({DynamicCargo})
+    local Event = {
+      id = EVENTS.DynamicCargoRemoved,
+      time = timer.getTime(),
+      dynamiccargo = DynamicCargo,
+      initiator = DynamicCargo:GetDCSObject(),
+    }
+    world.onEvent( Event )
+  end
+  
 end
 
 --- Main event function.
@@ -1223,7 +1355,13 @@ function EVENT:onEvent( Event )
           Event.IniDCSUnit = Event.initiator
           Event.IniDCSUnitName = Event.IniDCSUnit:getName()
           Event.IniUnitName = Event.IniDCSUnitName
-          Event.IniUnit = CARGO:FindByName( Event.IniDCSUnitName )
+          if string.match(Event.IniUnitName,".+|%d%d:%d%d|PKG%d+") then
+            Event.IniDynamicCargo = DYNAMICCARGO:FindByName(Event.IniUnitName)
+            Event.IniDynamicCargoName = Event.IniUnitName
+            Event.IniPlayerName = string.match(Event.IniUnitName,"^(.+)|%d%d:%d%d|PKG%d+")
+          else
+            Event.IniUnit = CARGO:FindByName( Event.IniDCSUnitName )
+          end
           Event.IniCoalition = Event.IniDCSUnit:getCoalition()
           Event.IniCategory = Event.IniDCSUnit:getDesc().category
           Event.IniTypeName = Event.IniDCSUnit:getTypeName()
@@ -1344,15 +1482,15 @@ function EVENT:onEvent( Event )
       end
 
       -- Weapon.
-      if Event.weapon then
+      if Event.weapon and type(Event.weapon) == "table" and Event.weapon.isExist and Event.weapon:isExist() then
         Event.Weapon = Event.weapon
-        Event.WeaponName = Event.Weapon:getTypeName()
+        Event.WeaponName = Event.weapon:isExist() and Event.weapon:getTypeName() or "Unknown Weapon"
         Event.WeaponUNIT = CLIENT:Find( Event.Weapon, '', true ) -- Sometimes, the weapon is a player unit!
         Event.WeaponPlayerName = Event.WeaponUNIT and Event.Weapon.getPlayerName and Event.Weapon:getPlayerName()
         --Event.WeaponPlayerName = Event.WeaponUNIT and Event.Weapon:getPlayerName()
-        Event.WeaponCoalition = Event.WeaponUNIT and Event.Weapon:getCoalition()
+        Event.WeaponCoalition = Event.WeaponUNIT and Event.Weapon.getCoalition and Event.Weapon:getCoalition()
-        Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon:getDesc().category
+        Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon.getDesc and Event.Weapon:getDesc().category
-        Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon:getTypeName()
+        Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon.getTypeName  and Event.Weapon:getTypeName()
         --Event.WeaponTgtDCSUnit = Event.Weapon:getTarget()
       end
 
@@ -1387,6 +1525,15 @@ function EVENT:onEvent( Event )
         Event.Cargo = Event.cargo
         Event.CargoName = Event.cargo.Name
       end
+      
+      -- Dynamic cargo Object
+      if Event.dynamiccargo then
+        Event.IniDynamicCargo = Event.dynamiccargo
+        Event.IniDynamicCargoName = Event.IniDynamicCargo.StaticName
+        if Event.IniDynamicCargo.Owner or Event.IniUnitName then
+          Event.IniPlayerName = Event.IniDynamicCargo.Owner or string.match(Event.IniUnitName or "None|00:00|PKG00","^(.+)|%d%d:%d%d|PKG%d+")
+        end
+      end
 
       -- Zone object.
       if Event.zone then

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,7 +949,7 @@ end
 
 do -- FSM_CONTROLLABLE
 
-  --- @type FSM_CONTROLLABLE
+  -- @type FSM_CONTROLLABLE
   -- @field Wrapper.Controllable#CONTROLLABLE Controllable
   -- @extends Core.Fsm#FSM
 
@@ -1082,7 +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/Message.lua

@@ -177,40 +177,22 @@ end
 --
 --   -- Send the 2 messages created with the @{New} method to the Client Group.
 --   -- Note that the Message of MessageClient2 is overwriting the Message of MessageClient1.
---   ClientGroup = Group.getByName( "ClientGroup" )
+--   Client = CLIENT:FindByName("NameOfClientUnit")
 --
---   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25, "Score" ):ToClient( ClientGroup )
+--   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score" ):ToClient( Client )
---   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25, "Score" ):ToClient( ClientGroup )
+--   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score" ):ToClient( Client )
 --   or
---   MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25 ):ToClient( ClientGroup )
+--   MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score"):ToClient( Client )
---   MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25 ):ToClient( ClientGroup )
+--   MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score"):ToClient( Client )
 --   or
---   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25 )
+--   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score")
---   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25 )
+--   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score")
---   MessageClient1:ToClient( ClientGroup )
+--   MessageClient1:ToClient( Client )
---   MessageClient2:ToClient( ClientGroup )
+--   MessageClient2:ToClient( Client )
 --
 function MESSAGE:ToClient( Client, Settings )
   self:F( Client )
-
+  self:ToUnit(Client,Settings)
-  if Client and Client:GetClientGroupID() then
-
-    if self.MessageType then
-      local Settings = Settings or ( Client and _DATABASE:GetPlayerSettings( Client:GetPlayerName() ) ) or _SETTINGS -- Core.Settings#SETTINGS
-      self.MessageDuration = Settings:GetMessageTime( self.MessageType )
-      self.MessageCategory = "" -- self.MessageType .. ": "
-    end
-    
-    local Unit = Client:GetClient()
-    
-    if self.MessageDuration ~= 0 then
-      local ClientGroupID = Client:GetClientGroupID()
-      self:T( self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$","") .. " / " .. self.MessageDuration )
-      --trigger.action.outTextForGroup( ClientGroupID, self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$",""), self.MessageDuration , self.ClearScreen)
-      trigger.action.outTextForUnit( Unit:GetID(), self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$",""), self.MessageDuration , self.ClearScreen)
-    end
-  end
-  
   return self
 end
 
@@ -257,6 +239,7 @@ function MESSAGE:ToUnit( Unit, Settings )
 
     if self.MessageDuration ~= 0 then
       self:T( self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$","") .. " / " .. self.MessageDuration )
+      local ID = Unit:GetID()
       trigger.action.outTextForUnit( Unit:GetID(), self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$",""), self.MessageDuration, self.ClearScreen )
     end
   end
@@ -305,11 +288,11 @@ end
 -- @usage
 --
 --   -- Send a message created with the @{New} method to the BLUE coalition.
---   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25):ToBlue()
+--   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToBlue()
 --   or
---   MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToBlue()
+--   MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToBlue()
 --   or
---   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
+--   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
 --   MessageBLUE:ToBlue()
 --
 function MESSAGE:ToBlue()
@@ -326,11 +309,11 @@ end
 -- @usage
 --
 --   -- Send a message created with the @{New} method to the RED coalition.
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToRed()
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToRed()
 --   or
---   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToRed()
+--   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToRed()
 --   or
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
 --   MessageRED:ToRed()
 --
 function MESSAGE:ToRed()
@@ -349,11 +332,11 @@ end
 -- @usage
 --
 --   -- Send a message created with the @{New} method to the RED coalition.
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToCoalition( coalition.side.RED )
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToCoalition( coalition.side.RED )
 --   or
---   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToCoalition( coalition.side.RED )
+--   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToCoalition( coalition.side.RED )
 --   or
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
 --   MessageRED:ToCoalition( coalition.side.RED )
 --
 function MESSAGE:ToCoalition( CoalitionSide, Settings )
@@ -399,13 +382,13 @@ end
 -- @return #MESSAGE self
 -- @usage
 --
--- -- Send a message created to all players.
+--   -- Send a message created to all players.
--- MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
+--   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission"):ToAll()
--- or
+--   or
--- MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
+--   MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission"):ToAll()
--- or
+--   or
--- MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 )
+--   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission")
--- MessageAll:ToAll()
+--   MessageAll:ToAll()
 --
 function MESSAGE:ToAll( Settings, Delay )
   self:F()

Moose Development/Moose/Core/Point.lua

@@ -2233,7 +2233,7 @@ do -- COORDINATE
     --   local MarkGroup = GROUP:FindByName( "AttackGroup" )
     --   local MarkID = TargetCoord:MarkToGroup( "This is a target for the attack group", AttackGroup )
     --   <<< logic >>>
-    --   RemoveMark( MarkID ) -- The mark is now removed
+    --   TargetCoord:RemoveMark( MarkID ) -- The mark is now removed
     function COORDINATE:RemoveMark( MarkID )
       trigger.action.removeMark( MarkID )
     end
@@ -2669,9 +2669,9 @@ do -- COORDINATE
     local date=UTILS.GetDCSMissionDate()
 
     -- Debug output.
-    --self:I(string.format("Sun rise at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff))
+    --self:I(string.format("Sun rise at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%s sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), tonumber(sunrise) or "0", Tdiff))
 
-    if InSeconds then
+    if InSeconds or type(sunrise) == "string" then
       return sunrise
     else
       return UTILS.SecondsToClock(sunrise, true)
@@ -2747,7 +2747,10 @@ do -- COORDINATE
 
       local sunrise=UTILS.GetSunRiseAndSet(DayOfYear, Latitude, Longitude, true, Tdiff)
       local sunset=UTILS.GetSunRiseAndSet(DayOfYear, Latitude, Longitude, false, Tdiff)
-
+      
+      if sunrise == "N/R" then return false end
+      if sunrise == "N/S" then return true end
+      
       local time=UTILS.ClockToSeconds(clock)
 
       -- Check if time is between sunrise and sunset.
@@ -2834,9 +2837,9 @@ do -- COORDINATE
     local date=UTILS.GetDCSMissionDate()
 
     -- Debug output.
-    --self:I(string.format("Sun set at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%d sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), sunrise, Tdiff))
+    --self:I(string.format("Sun set at lat=%.3f long=%.3f on %s (DayOfYear=%d): %s (%s sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), tostring(sunrise) or "0", Tdiff))
 
-    if InSeconds then
+    if InSeconds or type(sunrise) == "string" then
       return sunrise
     else
       return UTILS.SecondsToClock(sunrise, true)
@@ -3411,7 +3414,7 @@ do -- COORDINATE
   -- @param #COORDINATE self
   -- @param #number Radius (Optional) Radius to check around the coordinate, defaults to 50m (100m diameter)
   -- @param #number Minelevation (Optional) Elevation from which on a area is defined as steep, defaults to 8% (8m height gain across 100 meters)
-  -- @return #boolen IsSteep If true, area is steep
+  -- @return #boolean IsSteep If true, area is steep
   -- @return #number MaxElevation Elevation in meters measured over 100m
   function COORDINATE:IsInSteepArea(Radius,Minelevation)
     local steep = false
@@ -3443,7 +3446,7 @@ do -- COORDINATE
   -- @param #COORDINATE self
   -- @param #number Radius (Optional) Radius to check around the coordinate, defaults to 50m (100m diameter)
   -- @param #number Minelevation (Optional) Elevation from which on a area is defined as steep, defaults to 8% (8m height gain across 100 meters)
-  -- @return #boolen IsFlat If true, area is flat
+  -- @return #boolean IsFlat If true, area is flat
   -- @return #number MaxElevation Elevation in meters measured over 100m
   function COORDINATE:IsInFlatArea(Radius,Minelevation)
     local steep, elev = self:IsInSteepArea(Radius,Minelevation)

Moose Development/Moose/Core/Report.lua

@@ -15,7 +15,8 @@
 -- @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.
 --
 -- ===
 --

Moose Development/Moose/Core/Settings.lua

@@ -29,7 +29,9 @@
 -- @module Core.Settings
 -- @image Core_Settings.JPG
 
---- @type SETTINGS
+
+---
+-- @type SETTINGS
 -- @extends Core.Base#BASE
 
 --- Takes care of various settings that influence the behavior of certain functionalities and classes within the MOOSE framework.
@@ -218,7 +220,8 @@ SETTINGS = {
 
 SETTINGS.__Enum = {}
 
---- @type SETTINGS.__Enum.Era
+---
+-- @type SETTINGS.__Enum.Era
 -- @field #number WWII
 -- @field #number Korea
 -- @field #number Cold
@@ -491,7 +494,7 @@ do -- SETTINGS
     return (self.A2ASystem and self.A2ASystem == "MGRS") or (not self.A2ASystem and _SETTINGS:IsA2A_MGRS())
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   -- @param Wrapper.Group#GROUP MenuGroup Group for which to add menus.
   -- @param #table RootMenu Root menu table
   -- @return #SETTINGS
@@ -737,8 +740,8 @@ do -- SETTINGS
     if _SETTINGS.ShowPlayerMenu == true then
 
       local PlayerGroup = PlayerUnit:GetGroup()
-      local PlayerName = PlayerUnit:GetPlayerName()
+      local PlayerName = PlayerUnit:GetPlayerName() or "None"
-      local PlayerNames = PlayerGroup:GetPlayerNames()
+      --local PlayerNames = PlayerGroup:GetPlayerNames()
 
       local PlayerMenu = MENU_GROUP:New( PlayerGroup, 'Settings "' .. PlayerName .. '"' )
 
@@ -945,49 +948,49 @@ do -- SETTINGS
     return self
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:A2GMenuSystem( MenuGroup, RootMenu, A2GSystem )
     self.A2GSystem = A2GSystem
     MESSAGE:New( string.format( "Settings: Default A2G coordinate system set to %s for all players!", A2GSystem ), 5 ):ToAll()
     self:SetSystemMenu( MenuGroup, RootMenu )
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:A2AMenuSystem( MenuGroup, RootMenu, A2ASystem )
     self.A2ASystem = A2ASystem
     MESSAGE:New( string.format( "Settings: Default A2A coordinate system set to %s for all players!", A2ASystem ), 5 ):ToAll()
     self:SetSystemMenu( MenuGroup, RootMenu )
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:MenuLL_DDM_Accuracy( MenuGroup, RootMenu, LL_Accuracy )
     self.LL_Accuracy = LL_Accuracy
     MESSAGE:New( string.format( "Settings: Default LL accuracy set to %s for all players!", LL_Accuracy ), 5 ):ToAll()
     self:SetSystemMenu( MenuGroup, RootMenu )
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:MenuMGRS_Accuracy( MenuGroup, RootMenu, MGRS_Accuracy )
     self.MGRS_Accuracy = MGRS_Accuracy
     MESSAGE:New( string.format( "Settings: Default MGRS accuracy set to %s for all players!", MGRS_Accuracy ), 5 ):ToAll()
     self:SetSystemMenu( MenuGroup, RootMenu )
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:MenuMWSystem( MenuGroup, RootMenu, MW )
     self.Metric = MW
     MESSAGE:New( string.format( "Settings: Default measurement format set to %s for all players!", MW and "Metric" or "Imperial" ), 5 ):ToAll()
     self:SetSystemMenu( MenuGroup, RootMenu )
   end
 
-  --- @param #SETTINGS self
+  -- @param #SETTINGS self
   function SETTINGS:MenuMessageTimingsSystem( MenuGroup, RootMenu, MessageType, MessageTime )
     self:SetMessageTime( MessageType, MessageTime )
     MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToAll()
   end
 
   do
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupA2GSystem( PlayerUnit, PlayerGroup, PlayerName, A2GSystem )
       --BASE:E( {PlayerUnit:GetName(), A2GSystem } )
       self.A2GSystem = A2GSystem
@@ -998,7 +1001,7 @@ do -- SETTINGS
       end
     end
 
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupA2ASystem( PlayerUnit, PlayerGroup, PlayerName, A2ASystem )
       self.A2ASystem = A2ASystem
       MESSAGE:New( string.format( "Settings: A2A format set to %s for player %s.", A2ASystem, PlayerName ), 5 ):ToGroup( PlayerGroup )
@@ -1008,7 +1011,7 @@ do -- SETTINGS
       end
     end
 
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupLL_DDM_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, LL_Accuracy )
       self.LL_Accuracy = LL_Accuracy
       MESSAGE:New( string.format( "Settings: LL format accuracy set to %d decimal places for player %s.", LL_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
@@ -1018,7 +1021,7 @@ do -- SETTINGS
       end
     end
 
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupMGRS_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, MGRS_Accuracy )
       self.MGRS_Accuracy = MGRS_Accuracy
       MESSAGE:New( string.format( "Settings: MGRS format accuracy set to %d for player %s.", MGRS_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
@@ -1028,7 +1031,7 @@ do -- SETTINGS
       end
     end
 
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupMWSystem( PlayerUnit, PlayerGroup, PlayerName, MW )
       self.Metric = MW
       MESSAGE:New( string.format( "Settings: Measurement format set to %s for player %s.", MW and "Metric" or "Imperial", PlayerName ), 5 ):ToGroup( PlayerGroup )
@@ -1038,7 +1041,7 @@ do -- SETTINGS
       end
     end
 
-    --- @param #SETTINGS self
+    -- @param #SETTINGS self
     function SETTINGS:MenuGroupMessageTimingsSystem( PlayerUnit, PlayerGroup, PlayerName, MessageType, MessageTime )
       self:SetMessageTime( MessageType, MessageTime )
       MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToGroup( PlayerGroup )

Moose Development/Moose/Core/SpawnStatic.lua

@@ -189,6 +189,7 @@ function SPAWNSTATIC:NewFromType(StaticType, StaticCategory, CountryID)
   self.InitStaticCategory=StaticCategory
   self.CountryID=CountryID or country.id.USA
   self.SpawnTemplatePrefix=self.InitStaticType
+  self.TemplateStaticUnit = {}
 
   self.InitStaticCoordinate=COORDINATE:New(0, 0, 0)
   self.InitStaticHeading=0
@@ -196,6 +197,61 @@ function SPAWNSTATIC:NewFromType(StaticType, StaticCategory, CountryID)
   return self
 end
 
+--- (Internal/Cargo) Init the resource table for STATIC object that should be spawned containing storage objects.
+-- NOTE that you have to init many other parameters as the resources.
+-- @param #SPAWNSTATIC self
+-- @param #number CombinedWeight The weight this cargo object should have (some have fixed weights!), defaults to 1kg.
+-- @return #SPAWNSTATIC self
+function SPAWNSTATIC:_InitResourceTable(CombinedWeight)
+  if not self.TemplateStaticUnit.resourcePayload then
+    self.TemplateStaticUnit.resourcePayload = {
+      ["weapons"] = {},
+      ["aircrafts"] = {},
+      ["gasoline"] = 0,
+      ["diesel"] = 0,
+      ["methanol_mixture"] = 0,
+      ["jet_fuel"] = 0,   
+    }
+  end
+  self:InitCargo(true)
+  self:InitCargoMass(CombinedWeight or 1)
+  return self
+end
+
+--- (User/Cargo) Add to resource table for STATIC object that should be spawned containing storage objects. Inits the object table if necessary and sets it to be cargo for helicopters.
+-- @param #SPAWNSTATIC self
+-- @param #string Type Type of cargo. Known types are: STORAGE.Type.WEAPONS, STORAGE.Type.LIQUIDS, STORAGE.Type.AIRCRAFT. Liquids are fuel.
+-- @param #string Name Name of the cargo type. Liquids can be STORAGE.LiquidName.JETFUEL, STORAGE.LiquidName.GASOLINE, STORAGE.LiquidName.MW50 and STORAGE.LiquidName.DIESEL. The currently available weapon items are available in the `ENUMS.Storage.weapons`, e.g. `ENUMS.Storage.weapons.bombs.Mk_82Y`. Aircraft go by their typename.
+-- @param #number Amount of tons (liquids) or number (everything else) to add.
+-- @param #number CombinedWeight Combined weight to be set to this static cargo object. NOTE - some static cargo objects have fixed weights!
+-- @return #SPAWNSTATIC self
+function SPAWNSTATIC:AddCargoResource(Type,Name,Amount,CombinedWeight)
+  if not self.TemplateStaticUnit.resourcePayload then
+    self:_InitResourceTable(CombinedWeight)
+  end
+  if Type == STORAGE.Type.LIQUIDS and type(Name) == "string" then
+    self.TemplateStaticUnit.resourcePayload[Name] = Amount
+  else
+  self.TemplateStaticUnit.resourcePayload[Type] = {
+    [Name] = {
+      ["amount"] = Amount,
+      }
+  }
+  end
+  UTILS.PrintTableToLog(self.TemplateStaticUnit)
+  return self
+end
+
+--- (User/Cargo) Resets resource table to zero for STATIC object that should be spawned containing storage objects. Inits the object table if necessary and sets it to be cargo for helicopters.
+-- Handy if you spawn from cargo statics which have resources already set.
+-- @param #SPAWNSTATIC self
+-- @return #SPAWNSTATIC self 
+function SPAWNSTATIC:ResetCargoResources()
+  self.TemplateStaticUnit.resourcePayload = nil
+  self:_InitResourceTable()
+  return self
+end
+
 --- Initialize heading of the spawned static.
 -- @param #SPAWNSTATIC self
 -- @param Core.Point#COORDINATE Coordinate Position where the static is spawned.
@@ -317,6 +373,25 @@ function SPAWNSTATIC:InitLinkToUnit(Unit, OffsetX, OffsetY, OffsetAngle)
   return self
 end
 
+--- Allows to place a CallFunction hook when a new static spawns.
+-- The provided method will be called when a new group is spawned, including its given parameters.
+-- The first parameter of the SpawnFunction is the @{Wrapper.Static#STATIC} that was spawned.
+-- @param #SPAWNSTATIC self
+-- @param #function SpawnCallBackFunction The function to be called when a group spawns.
+-- @param SpawnFunctionArguments A random amount of arguments to be provided to the function when the group spawns.
+-- @return #SPAWNSTATIC self
+function SPAWNSTATIC:OnSpawnStatic( SpawnCallBackFunction, ... )
+  self:F( "OnSpawnStatic" )
+
+  self.SpawnFunctionHook = SpawnCallBackFunction
+  self.SpawnFunctionArguments = {}
+  if arg then
+    self.SpawnFunctionArguments = arg
+  end
+
+  return self
+end
+
 --- Spawn a new STATIC object.
 -- @param #SPAWNSTATIC self
 -- @param #number Heading (Optional) The heading of the static, which is a number in degrees from 0 to 360. Default is the heading of the template.
@@ -488,7 +563,7 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     -- ED's dirty way to spawn FARPS.
     Static=coalition.addGroup(CountryID, -1, TemplateGroup)
 
-    -- Currently DCS 2.8 does not trigger birth events if FAPRS are spawned!
+    -- 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
     local Event = {
       id = EVENTS.Birth,
@@ -503,6 +578,12 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     self:T2({Template=Template})
     Static=coalition.addStaticObject(CountryID, Template)
   end
+  
+  -- If there is a SpawnFunction hook defined, call it.
+  if self.SpawnFunctionHook then
+    -- delay calling this for .3 seconds so that it hopefully comes after the BIRTH event of the group.
+    self:ScheduleOnce(0.3,self.SpawnFunctionHook,mystatic, unpack(self.SpawnFunctionArguments))
+  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
@@ -58,7 +58,7 @@ do -- UserFlag
 
   --- Set the userflag to a given Number.
   -- @param #USERFLAG self
-  -- @param #number Number The number value to be checked if it is the same as the userflag.
+  -- @param #number Number The number value to set the flag to.
   -- @param #number Delay Delay in seconds, before the flag is set.
   -- @return #USERFLAG The userflag instance.
   -- @usage
@@ -104,4 +104,4 @@ do -- UserFlag
 
   end
 
-end
+end

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

@@ -144,7 +144,7 @@ ZONE_BASE = {
 -- @return #ZONE_BASE self
 function ZONE_BASE:New( ZoneName )
   local self = BASE:Inherit( self, FSM:New() )
-  self:F( ZoneName )
+  --self:F( ZoneName )
 
   self.ZoneName = ZoneName
 
@@ -157,7 +157,7 @@ end
 -- @param #ZONE_BASE self
 -- @return #string The name of the zone.
 function ZONE_BASE:GetName()
-  self:F2()
+  --self:F2()
 
   return self.ZoneName
 end
@@ -167,7 +167,7 @@ end
 -- @param #string ZoneName The name of the zone.
 -- @return #ZONE_BASE
 function ZONE_BASE:SetName( ZoneName )
-  self:F2()
+  --self:F2()
 
   self.ZoneName = ZoneName
 end
@@ -177,7 +177,7 @@ end
 -- @param DCS#Vec2 Vec2 The Vec2 to test.
 -- @return #boolean true if the Vec2 is within the zone.
 function ZONE_BASE:IsVec2InZone( Vec2 )
-  self:F2( Vec2 )
+ --self:F2( Vec2 )
 
   return false
 end
@@ -232,13 +232,13 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return Core.Point#POINT_VEC2 The PointVec2 of the zone.
 function ZONE_BASE:GetPointVec2()
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   local Vec2 = self:GetVec2()
 
   local PointVec2 = POINT_VEC2:NewFromVec2( Vec2 )
 
-  self:T2( { PointVec2 } )
+  --self:T2( { PointVec2 } )
 
   return PointVec2
 end
@@ -248,7 +248,7 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return DCS#Vec3 The Vec3 of the zone.
 function ZONE_BASE:GetVec3( Height )
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   Height = Height or 0
 
@@ -256,7 +256,7 @@ function ZONE_BASE:GetVec3( Height )
 
   local Vec3 = { x = Vec2.x, y = Height and Height or land.getHeight( self:GetVec2() ), z = Vec2.y }
 
-  self:T2( { Vec3 } )
+  --self:T2( { Vec3 } )
 
   return Vec3
 end
@@ -266,13 +266,13 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return Core.Point#POINT_VEC3 The PointVec3 of the zone.
 function ZONE_BASE:GetPointVec3( Height )
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   local Vec3 = self:GetVec3( Height )
 
   local PointVec3 = POINT_VEC3:NewFromVec3( Vec3 )
 
-  self:T2( { PointVec3 } )
+  --self:T2( { PointVec3 } )
 
   return PointVec3
 end
@@ -282,7 +282,7 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return Core.Point#COORDINATE The Coordinate of the zone.
 function ZONE_BASE:GetCoordinate( Height ) --R2.1
-  self:F2(self.ZoneName)
+  --self:F2(self.ZoneName)
 
   local Vec3 = self:GetVec3( Height )
 
@@ -363,7 +363,7 @@ end
 --- Bound the zone boundaries with a tires.
 -- @param #ZONE_BASE self
 function ZONE_BASE:BoundZone()
-  self:F2()
+  --self:F2()
 end
 
 --- Set draw coalition of zone.
@@ -510,7 +510,7 @@ end
 -- @param #ZONE_BASE self
 -- @param Utilities.Utils#SMOKECOLOR SmokeColor The smoke color.
 function ZONE_BASE:SmokeZone( SmokeColor )
-  self:F2( SmokeColor )
+  --self:F2( SmokeColor )
 
 end
 
@@ -519,7 +519,7 @@ end
 -- @param #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability.
 -- @return #ZONE_BASE self
 function ZONE_BASE:SetZoneProbability( ZoneProbability )
-  self:F( { self:GetName(), ZoneProbability = ZoneProbability } )
+  --self:F( { self:GetName(), ZoneProbability = ZoneProbability } )
 
   self.ZoneProbability = ZoneProbability or 1
   return self
@@ -529,7 +529,7 @@ end
 -- @param #ZONE_BASE self
 -- @return #number A value between 0 and 1. 0 = 0% and 1 = 100% probability.
 function ZONE_BASE:GetZoneProbability()
-  self:F2()
+  --self:F2()
 
   return self.ZoneProbability
 end
@@ -560,7 +560,7 @@ end
 -- -- The result should be that Zone1 would be more probable selected than Zone2.
 --
 function ZONE_BASE:GetZoneMaybe()
-  self:F2()
+  --self:F2()
 
   local Randomization = math.random()
   if Randomization <= self.ZoneProbability then
@@ -791,7 +791,7 @@ function ZONE_RADIUS:New( ZoneName, Vec2, Radius, DoNotRegisterZone )
 
   -- Inherit ZONE_BASE.
   local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) ) -- #ZONE_RADIUS
-  self:F( { ZoneName, Vec2, Radius } )
+  --self:F( { ZoneName, Vec2, Radius } )
 
   self.Radius = Radius
   self.Vec2 = Vec2
@@ -947,7 +947,7 @@ end
 -- @param #number AddOffSet (optional) The angle to be added for the smoking start position.
 -- @return #ZONE_RADIUS self
 function ZONE_RADIUS:SmokeZone( SmokeColor, Points, AddHeight, AngleOffset )
-  self:F2( SmokeColor )
+  --self:F2( SmokeColor )
 
   local Point = {}
   local Vec2 = self:GetVec2()
@@ -978,7 +978,7 @@ end
 -- @param #number AddHeight (optional) The height to be added for the smoke.
 -- @return #ZONE_RADIUS self
 function ZONE_RADIUS:FlareZone( FlareColor, Points, Azimuth, AddHeight )
-  self:F2( { FlareColor, Azimuth } )
+  --self:F2( { FlareColor, Azimuth } )
 
   local Point = {}
   local Vec2 = self:GetVec2()
@@ -1004,9 +1004,9 @@ end
 -- @param #ZONE_RADIUS self
 -- @return DCS#Distance The radius of the zone.
 function ZONE_RADIUS:GetRadius()
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
-  self:T2( { self.Radius } )
+  --self:T2( { self.Radius } )
 
   return self.Radius
 end
@@ -1016,10 +1016,10 @@ end
 -- @param DCS#Distance Radius The radius of the zone.
 -- @return DCS#Distance The radius of the zone.
 function ZONE_RADIUS:SetRadius( Radius )
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   self.Radius = Radius
-  self:T2( { self.Radius } )
+  --self:T2( { self.Radius } )
 
   return self.Radius
 end
@@ -1028,9 +1028,9 @@ end
 -- @param #ZONE_RADIUS self
 -- @return DCS#Vec2 The location of the zone.
 function ZONE_RADIUS:GetVec2()
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
-  self:T2( { self.Vec2 } )
+  --self:T2( { self.Vec2 } )
 
   return self.Vec2
 end
@@ -1040,11 +1040,11 @@ end
 -- @param DCS#Vec2 Vec2 The new location of the zone.
 -- @return DCS#Vec2 The new location of the zone.
 function ZONE_RADIUS:SetVec2( Vec2 )
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   self.Vec2 = Vec2
 
-  self:T2( { self.Vec2 } )
+  --self:T2( { self.Vec2 } )
 
   return self.Vec2
 end
@@ -1054,14 +1054,14 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return DCS#Vec3 The point of the zone.
 function ZONE_RADIUS:GetVec3( Height )
-  self:F2( { self.ZoneName, Height } )
+  --self:F2( { self.ZoneName, Height } )
 
   Height = Height or 0
   local Vec2 = self:GetVec2()
 
   local Vec3 = { x = Vec2.x, y = land.getHeight( self:GetVec2() ) + Height, z = Vec2.y }
 
-  self:T2( { Vec3 } )
+  --self:T2( { Vec3 } )
 
   return Vec3
 end
@@ -1138,7 +1138,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
 
           self.ScanData.Units[ZoneObject] = ZoneObject
 
-          self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
+          --self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
         end
       end
 
@@ -1149,7 +1149,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
         self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
         self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( tostring(SceneryName), ZoneObject)
         table.insert(self.ScanData.SceneryTable,self.ScanData.Scenery[SceneryType][SceneryName] )
-        self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
+        --self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
       end
 
     end
@@ -1203,7 +1203,7 @@ function ZONE_RADIUS:GetScannedSetUnit()
         if FoundUnit then
           SetUnit:AddUnit( FoundUnit )
         else
-          local FoundStatic = STATIC:FindByName( UnitObject:getName() )
+          local FoundStatic = STATIC:FindByName( UnitObject:getName(), false )
           if FoundStatic then
             SetUnit:AddUnit( FoundStatic )
           end
@@ -1409,7 +1409,7 @@ function ZONE_RADIUS:SearchZone( EvaluateFunction, ObjectCategories )
   local ZoneCoord = self:GetCoordinate()
   local ZoneRadius = self:GetRadius()
 
-  self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
+  --self:F({ZoneCoord = ZoneCoord, ZoneRadius = ZoneRadius, ZoneCoordLL = ZoneCoord:ToStringLLDMS()})
 
   local SphereSearch = {
     id = world.VolumeType.SPHERE,
@@ -1436,7 +1436,7 @@ end
 -- @param DCS#Vec2 Vec2 The location to test.
 -- @return #boolean true if the location is within the zone.
 function ZONE_RADIUS:IsVec2InZone( Vec2 )
-  self:F2( Vec2 )
+  --self:F2( Vec2 )
 
   if not Vec2 then return false end
 
@@ -1456,7 +1456,7 @@ end
 -- @param DCS#Vec3 Vec3 The point to test.
 -- @return #boolean true if the point is within the zone.
 function ZONE_RADIUS:IsVec3InZone( Vec3 )
-  self:F2( Vec3 )
+  --self:F2( Vec3 )
   if not Vec3 then return false end
   local InZone = self:IsVec2InZone( { x = Vec3.x, y = Vec3.z } )
 
@@ -1521,11 +1521,11 @@ end
 -- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
 -- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
 function ZONE_RADIUS:GetRandomPointVec2( inner, outer )
-  self:F( self.ZoneName, inner, outer )
+  --self:F( self.ZoneName, inner, outer )
 
   local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2( inner, outer ) )
 
-  self:T3( { PointVec2 } )
+  --self:T3( { PointVec2 } )
 
   return PointVec2
 end
@@ -1536,11 +1536,11 @@ end
 -- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
 -- @return DCS#Vec3 The random location within the zone.
 function ZONE_RADIUS:GetRandomVec3( inner, outer )
-  self:F( self.ZoneName, inner, outer )
+  --self:F( self.ZoneName, inner, outer )
 
   local Vec2 = self:GetRandomVec2( inner, outer )
 
-  self:T3( { x = Vec2.x, y = self.y, z = Vec2.y } )
+  --self:T3( { x = Vec2.x, y = self.y, z = Vec2.y } )
 
   return { x = Vec2.x, y = self.y, z = Vec2.y }
 end
@@ -1552,11 +1552,11 @@ end
 -- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
 -- @return Core.Point#POINT_VEC3 The @{Core.Point#POINT_VEC3} object reflecting the random 3D location within the zone.
 function ZONE_RADIUS:GetRandomPointVec3( inner, outer )
-  self:F( self.ZoneName, inner, outer )
+  --self:F( self.ZoneName, inner, outer )
 
   local PointVec3 = POINT_VEC3:NewFromVec2( self:GetRandomVec2( inner, outer ) )
 
-  self:T3( { PointVec3 } )
+  --self:T3( { PointVec3 } )
 
   return PointVec3
 end
@@ -1685,7 +1685,7 @@ function ZONE_RADIUS:GetRandomCoordinateWithoutBuildings(inner,outer,distance,ma
 
   T1=timer.getTime()
 
-  self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %.3f",tostring(found),iterations,T1-T0))
+  --self:T(string.format("Found a coordinate: %s | Iterations: %d | Time: %.3f",tostring(found),iterations,T1-T0))
 
   if found then return rcoord else return nil end
 
@@ -1754,7 +1754,7 @@ function ZONE:New( ZoneName )
 
   -- Create a new ZONE_RADIUS.
   local self=BASE:Inherit( self, ZONE_RADIUS:New(ZoneName, {x=Zone.point.x, y=Zone.point.z}, Zone.radius, true))
-  self:F(ZoneName)
+  --self:F(ZoneName)
 
   -- Color of zone.
   self.Color={1, 0, 0, 0.15}
@@ -1824,7 +1824,7 @@ function ZONE_UNIT:New( ZoneName, ZoneUNIT, Radius, Offset)
     self.relative_to_unit = Offset.relative_to_unit or false
   end
 
-  self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )
+  --self:F( { ZoneName, ZoneUNIT:GetVec2(), Radius } )
 
   self.ZoneUNIT = ZoneUNIT
   self.LastVec2 = ZoneUNIT:GetVec2()
@@ -1840,7 +1840,7 @@ end
 -- @param #ZONE_UNIT self
 -- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Unit#UNIT}location and the offset, if any.
 function ZONE_UNIT:GetVec2()
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   local ZoneVec2 = self.ZoneUNIT:GetVec2()
   if ZoneVec2 then
@@ -1873,7 +1873,7 @@ function ZONE_UNIT:GetVec2()
     return self.LastVec2
   end
 
-  self:T2( { ZoneVec2 } )
+  --self:T2( { ZoneVec2 } )
 
   return nil
 end
@@ -1882,7 +1882,7 @@ end
 -- @param #ZONE_UNIT self
 -- @return DCS#Vec2 The random location within the zone.
 function ZONE_UNIT:GetRandomVec2()
-  self:F( self.ZoneName )
+  --self:F( self.ZoneName )
 
   local RandomVec2 = {}
   --local Vec2 = self.ZoneUNIT:GetVec2()  -- FF: This does not take care of the new offset feature!
@@ -1896,7 +1896,7 @@ function ZONE_UNIT:GetRandomVec2()
   RandomVec2.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius();
   RandomVec2.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius();
 
-  self:T( { RandomVec2 } )
+  --self:T( { RandomVec2 } )
 
   return RandomVec2
 end
@@ -1906,7 +1906,7 @@ end
 -- @param DCS#Distance Height The height to add to the land height where the center of the zone is located.
 -- @return DCS#Vec3 The point of the zone.
 function ZONE_UNIT:GetVec3( Height )
-  self:F2( self.ZoneName )
+  --self:F2( self.ZoneName )
 
   Height = Height or 0
 
@@ -1914,7 +1914,7 @@ function ZONE_UNIT:GetVec3( Height )
 
   local Vec3 = { x = Vec2.x, y = land.getHeight( self:GetVec2() ) + Height, z = Vec2.y }
 
-  self:T2( { Vec3 } )
+  --self:T2( { Vec3 } )
 
   return Vec3
 end
@@ -1940,7 +1940,7 @@ ZONE_GROUP = {
 -- @return #ZONE_GROUP self
 function ZONE_GROUP:New( ZoneName, ZoneGROUP, Radius )
   local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetVec2(), Radius, true ) )
-  self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } )
+  --self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } )
 
   self._.ZoneGROUP = ZoneGROUP
   self._.ZoneVec2Cache = self._.ZoneGROUP:GetVec2()
@@ -1956,7 +1956,7 @@ end
 -- @param #ZONE_GROUP self
 -- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Group} location.
 function ZONE_GROUP:GetVec2()
-  self:F( self.ZoneName )
+  --self:F( self.ZoneName )
 
   local ZoneVec2 = nil
 
@@ -1967,7 +1967,7 @@ function ZONE_GROUP:GetVec2()
     ZoneVec2 = self._.ZoneVec2Cache
   end
 
-  self:T( { ZoneVec2 } )
+  --self:T( { ZoneVec2 } )
 
   return ZoneVec2
 end
@@ -1976,7 +1976,7 @@ end
 -- @param #ZONE_GROUP self
 -- @return DCS#Vec2 The random location of the zone based on the @{Wrapper.Group} location.
 function ZONE_GROUP:GetRandomVec2()
-  self:F( self.ZoneName )
+  --self:F( self.ZoneName )
 
   local Point = {}
   local Vec2 = self._.ZoneGROUP:GetVec2()
@@ -1985,7 +1985,7 @@ function ZONE_GROUP:GetRandomVec2()
   Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius();
   Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius();
 
-  self:T( { Point } )
+  --self:T( { Point } )
 
   return Point
 end
@@ -1996,11 +1996,11 @@ end
 -- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
 -- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
 function ZONE_GROUP:GetRandomPointVec2( inner, outer )
-  self:F( self.ZoneName, inner, outer )
+  --self:F( self.ZoneName, inner, outer )
 
   local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
 
-  self:T3( { PointVec2 } )
+  --self:T3( { PointVec2 } )
 
   return PointVec2
 end
@@ -2183,7 +2183,7 @@ function ZONE_POLYGON_BASE:New( ZoneName, PointsArray )
 
   -- Inherit ZONE_BASE.
   local self = BASE:Inherit( self, ZONE_BASE:New( ZoneName ) )
-  self:F( { ZoneName, PointsArray } )
+  --self:F( { ZoneName, PointsArray } )
 
   if PointsArray then
 
@@ -2351,7 +2351,7 @@ end
 -- @param #ZONE_POLYGON_BASE self
 -- @return DCS#Vec2 The location of the zone based on the @{Wrapper.Group} location.
 function ZONE_POLYGON_BASE:GetVec2()
-  self:F( self.ZoneName )
+  --self:F( self.ZoneName )
 
   local Bounds = self:GetBoundingSquare()
 
@@ -2434,9 +2434,9 @@ end
 -- @param #ZONE_POLYGON_BASE self
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:Flush()
-  self:F2()
+  --self:F2()
 
-  self:F( { Polygon = self.ZoneName, Coordinates = self._.Polygon } )
+  --self:F( { Polygon = self.ZoneName, Coordinates = self._.Polygon } )
 
   return self
 end
@@ -2455,7 +2455,7 @@ function ZONE_POLYGON_BASE:BoundZone( UnBound )
   j = #self._.Polygon
 
   while i <= #self._.Polygon do
-    self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
+    --self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
 
     local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
     local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2707,7 +2707,7 @@ end
 -- @param #number Segments (Optional) Number of segments within boundary line. Default 10.
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:SmokeZone( SmokeColor, Segments )
-  self:F2( SmokeColor )
+  --self:F2( SmokeColor )
 
   Segments=Segments or 10
 
@@ -2715,7 +2715,7 @@ function ZONE_POLYGON_BASE:SmokeZone( SmokeColor, Segments )
   local j=#self._.Polygon
 
   while i <= #self._.Polygon do
-    self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
+    --self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
 
     local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
     local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2740,7 +2740,7 @@ end
 -- @param #number AddHeight (optional) The height to be added for the smoke.
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:FlareZone( FlareColor, Segments, Azimuth, AddHeight )
-  self:F2(FlareColor)
+  --self:F2(FlareColor)
 
   Segments=Segments or 10
 
@@ -2750,7 +2750,7 @@ function ZONE_POLYGON_BASE:FlareZone( FlareColor, Segments, Azimuth, AddHeight )
   local j=#self._.Polygon
 
   while i <= #self._.Polygon do
-    self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
+    --self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
 
     local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
     local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -2773,7 +2773,7 @@ end
 -- @param DCS#Vec2 Vec2 The location to test.
 -- @return #boolean true if the location is within the zone.
 function ZONE_POLYGON_BASE:IsVec2InZone( Vec2 )
-  self:F2( Vec2 )
+  --self:F2( Vec2 )
   if not Vec2 then return false end
   local Next
   local Prev
@@ -2783,18 +2783,18 @@ function ZONE_POLYGON_BASE:IsVec2InZone( Vec2 )
   Prev = #self._.Polygon
 
   while Next <= #self._.Polygon do
-    self:T( { Next, Prev, self._.Polygon[Next], self._.Polygon[Prev] } )
+    --self:T( { Next, Prev, self._.Polygon[Next], self._.Polygon[Prev] } )
     if ( ( ( self._.Polygon[Next].y > Vec2.y ) ~= ( self._.Polygon[Prev].y > Vec2.y ) ) and
          ( Vec2.x < ( self._.Polygon[Prev].x - self._.Polygon[Next].x ) * ( Vec2.y - self._.Polygon[Next].y ) / ( self._.Polygon[Prev].y - self._.Polygon[Next].y ) + self._.Polygon[Next].x )
        ) then
        InPolygon = not InPolygon
     end
-    self:T2( { InPolygon = InPolygon } )
+    --self:T2( { InPolygon = InPolygon } )
     Prev = Next
     Next = Next + 1
   end
 
-  self:T( { InPolygon = InPolygon } )
+  --self:T( { InPolygon = InPolygon } )
   return InPolygon
 end
 
@@ -2803,7 +2803,7 @@ end
 -- @param DCS#Vec3 Vec3 The point to test.
 -- @return #boolean true if the point is within the zone.
 function ZONE_POLYGON_BASE:IsVec3InZone( Vec3 )
-  self:F2( Vec3 )
+  --self:F2( Vec3 )
 
   if not Vec3 then return false end
 
@@ -2838,11 +2838,11 @@ end
 -- @param #ZONE_POLYGON_BASE self
 -- @return @{Core.Point#POINT_VEC2}
 function ZONE_POLYGON_BASE:GetRandomPointVec2()
-  self:F2()
+  --self:F2()
 
   local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
 
-  self:T2( PointVec2 )
+  --self:T2( PointVec2 )
 
   return PointVec2
 end
@@ -2851,11 +2851,11 @@ end
 -- @param #ZONE_POLYGON_BASE self
 -- @return @{Core.Point#POINT_VEC3}
 function ZONE_POLYGON_BASE:GetRandomPointVec3()
-  self:F2()
+  --self:F2()
 
   local PointVec3 = POINT_VEC3:NewFromVec2( self:GetRandomVec2() )
 
-  self:T2( PointVec3 )
+  --self:T2( PointVec3 )
 
   return PointVec3
 end
@@ -2865,11 +2865,11 @@ end
 -- @param #ZONE_POLYGON_BASE self
 -- @return Core.Point#COORDINATE
 function ZONE_POLYGON_BASE:GetRandomCoordinate()
-  self:F2()
+  --self:F2()
 
   local Coordinate = COORDINATE:NewFromVec2( self:GetRandomVec2() )
 
-  self:T2( Coordinate )
+  --self:T2( Coordinate )
 
   return Coordinate
 end
@@ -2886,7 +2886,7 @@ function ZONE_POLYGON_BASE:GetBoundingSquare()
   local y2 = self._.Polygon[1].y
 
   for i = 2, #self._.Polygon do
-    self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
+    --self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
     x1 = ( x1 > self._.Polygon[i].x ) and self._.Polygon[i].x or x1
     x2 = ( x2 < self._.Polygon[i].x ) and self._.Polygon[i].x or x2
     y1 = ( y1 > self._.Polygon[i].y ) and self._.Polygon[i].y or y1
@@ -2909,7 +2909,7 @@ function ZONE_POLYGON_BASE:GetBoundingVec2()
   local y2 = self._.Polygon[1].y
 
   for i = 2, #self._.Polygon do
-    self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
+    --self:T2( { self._.Polygon[i], x1, y1, x2, y2 } )
     x1 = ( x1 > self._.Polygon[i].x ) and self._.Polygon[i].x or x1
     x2 = ( x2 < self._.Polygon[i].x ) and self._.Polygon[i].x or x2
     y1 = ( y1 > self._.Polygon[i].y ) and self._.Polygon[i].y or y1
@@ -2948,7 +2948,7 @@ function ZONE_POLYGON_BASE:Boundary(Coalition, Color, Radius, Alpha, Segments, C
         Limit = #self._.Polygon
     end
     while i <= #self._.Polygon do
-        self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
+        --self:T( { i, j, self._.Polygon[i], self._.Polygon[j] } )
         if j ~= Limit then
             local DeltaX = self._.Polygon[j].x - self._.Polygon[i].x
             local DeltaY = self._.Polygon[j].y - self._.Polygon[i].y
@@ -3019,7 +3019,7 @@ function ZONE_POLYGON:New( ZoneName, ZoneGroup )
   local GroupPoints = ZoneGroup:GetTaskRoute()
 
   local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( ZoneName, GroupPoints ) )
-  self:F( { ZoneName, ZoneGroup, self._.Polygon } )
+  --self:F( { ZoneName, ZoneGroup, self._.Polygon } )
 
   -- Zone objects are added to the _DATABASE and SET_ZONE objects.
   _EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3035,7 +3035,7 @@ end
 function ZONE_POLYGON:NewFromPointsArray( ZoneName, PointsArray )
 
   local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( ZoneName, PointsArray ) )
-  self:F( { ZoneName, self._.Polygon } )
+  --self:F( { ZoneName, self._.Polygon } )
 
   -- Zone objects are added to the _DATABASE and SET_ZONE objects.
   _EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3055,7 +3055,7 @@ function ZONE_POLYGON:NewFromGroupName( GroupName )
   local GroupPoints = ZoneGroup:GetTaskRoute()
 
   local self = BASE:Inherit( self, ZONE_POLYGON_BASE:New( GroupName, GroupPoints ) )
-  self:F( { GroupName, ZoneGroup, self._.Polygon } )
+  --self:F( { GroupName, ZoneGroup, self._.Polygon } )
 
   -- Zone objects are added to the _DATABASE and SET_ZONE objects.
   _EVENTDISPATCHER:CreateEventNewZone( self )
@@ -3221,7 +3221,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
 
           self.ScanData.Units[ZoneObject] = ZoneObject
 
-          self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
+          --self:F2( { Name = ZoneObject:getName(), Coalition = CoalitionDCSUnit } )
         end
       end
 
@@ -3232,7 +3232,7 @@ function ZONE_POLYGON:Scan( ObjectCategories, UnitCategories )
         self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
         self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( SceneryName, ZoneObject )
         table.insert(self.ScanData.SceneryTable,self.ScanData.Scenery[SceneryType][SceneryName])
-        self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
+        --self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
       end
 
     end
@@ -3573,7 +3573,7 @@ do -- ZONE_ELASTIC
   function ZONE_ELASTIC:Update(Delay, Draw)
 
     -- Debug info.
-    self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
+    --self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
 
     -- Copy all points.
     local points=UTILS.DeepCopy(self.points or {})
@@ -3641,7 +3641,7 @@ do -- ZONE_ELASTIC
   end
 
 
-  --- Create a convec hull.
+  --- Create a convex hull.
   -- @param #ZONE_ELASTIC self
   -- @param #table pl Points
   -- @return #table Points
@@ -3987,7 +3987,7 @@ do -- ZONE_AIRBASE
   -- @param #ZONE_AIRBASE self
   -- @return DCS#Vec2 The location of the zone based on the AIRBASE location.
   function ZONE_AIRBASE:GetVec2()
-    self:F( self.ZoneName )
+    --self:F( self.ZoneName )
 
     local ZoneVec2 = nil
 
@@ -3998,7 +3998,7 @@ do -- ZONE_AIRBASE
       ZoneVec2 = self._.ZoneVec2Cache
     end
 
-    self:T( { ZoneVec2 } )
+    --self:T( { ZoneVec2 } )
 
     return ZoneVec2
   end
@@ -4009,11 +4009,11 @@ do -- ZONE_AIRBASE
   -- @param #number outer (optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
   -- @return Core.Point#POINT_VEC2 The @{Core.Point#POINT_VEC2} object reflecting the random 3D location within the zone.
   function ZONE_AIRBASE:GetRandomPointVec2( inner, outer )
-    self:F( self.ZoneName, inner, outer )
+    --self:F( self.ZoneName, inner, outer )
 
     local PointVec2 = POINT_VEC2:NewFromVec2( self:GetRandomVec2() )
 
-    self:T3( { PointVec2 } )
+    --self:T3( { PointVec2 } )
 
     return PointVec2
   end

Moose Development/Moose/Core/Zone_Detection.lua

@@ -2,7 +2,8 @@
 -- @module Core.Zone_Detection
 -- @image MOOSE.JPG
 
---- @type ZONE_DETECTION
+---
+-- @type ZONE_DETECTION
 -- @field DCS#Vec2 Vec2 The current location of the zone.
 -- @field DCS#Distance Radius The radius of the zone.
 -- @extends #ZONE_BASE

Moose Development/Moose/DCS.lua

@@ -25,38 +25,68 @@ do -- world
   
   --- [https://wiki.hoggitworld.com/view/DCS_enum_world](https://wiki.hoggitworld.com/view/DCS_enum_world)
   -- @type world.event
-  -- @field S_EVENT_INVALID 
+  -- @field S_EVENT_INVALID = 0
-  -- @field S_EVENT_SHOT [https://wiki.hoggitworld.com/view/DCS_event_shot](https://wiki.hoggitworld.com/view/DCS_event_shot)
+  -- @field S_EVENT_SHOT = 1
-  -- @field S_EVENT_HIT [https://wiki.hoggitworld.com/view/DCS_event_hit](https://wiki.hoggitworld.com/view/DCS_event_hit)
+  -- @field S_EVENT_HIT = 2
-  -- @field S_EVENT_TAKEOFF [https://wiki.hoggitworld.com/view/DCS_event_takeoff](https://wiki.hoggitworld.com/view/DCS_event_takeoff)
+  -- @field S_EVENT_TAKEOFF = 3
-  -- @field S_EVENT_LAND [https://wiki.hoggitworld.com/view/DCS_event_land](https://wiki.hoggitworld.com/view/DCS_event_land)
+  -- @field S_EVENT_LAND = 4
-  -- @field S_EVENT_CRASH [https://wiki.hoggitworld.com/view/DCS_event_crash](https://wiki.hoggitworld.com/view/DCS_event_crash)
+  -- @field S_EVENT_CRASH = 5
-  -- @field S_EVENT_EJECTION [https://wiki.hoggitworld.com/view/DCS_event_ejection](https://wiki.hoggitworld.com/view/DCS_event_ejection)
+  -- @field S_EVENT_EJECTION = 6
-  -- @field S_EVENT_REFUELING [https://wiki.hoggitworld.com/view/DCS_event_refueling](https://wiki.hoggitworld.com/view/DCS_event_refueling)
+  -- @field S_EVENT_REFUELING = 7
-  -- @field S_EVENT_DEAD [https://wiki.hoggitworld.com/view/DCS_event_dead](https://wiki.hoggitworld.com/view/DCS_event_dead)
+  -- @field S_EVENT_DEAD = 8
-  -- @field S_EVENT_PILOT_DEAD [https://wiki.hoggitworld.com/view/DCS_event_pilot_dead](https://wiki.hoggitworld.com/view/DCS_event_pilot_dead)
+  -- @field S_EVENT_PILOT_DEAD = 9
-  -- @field S_EVENT_BASE_CAPTURED [https://wiki.hoggitworld.com/view/DCS_event_base_captured](https://wiki.hoggitworld.com/view/DCS_event_base_captured)
+  -- @field S_EVENT_BASE_CAPTURED = 10
-  -- @field S_EVENT_MISSION_START [https://wiki.hoggitworld.com/view/DCS_event_mission_start](https://wiki.hoggitworld.com/view/DCS_event_mission_start)
+  -- @field S_EVENT_MISSION_START = 11
-  -- @field S_EVENT_MISSION_END [https://wiki.hoggitworld.com/view/DCS_event_mission_end](https://wiki.hoggitworld.com/view/DCS_event_mission_end)
+  -- @field S_EVENT_MISSION_END = 12
-  -- @field S_EVENT_TOOK_CONTROL 
+  -- @field S_EVENT_TOOK_CONTROL = 13
-  -- @field S_EVENT_REFUELING_STOP [https://wiki.hoggitworld.com/view/DCS_event_refueling_stop](https://wiki.hoggitworld.com/view/DCS_event_refueling_stop)
+  -- @field S_EVENT_REFUELING_STOP = 14
-  -- @field S_EVENT_BIRTH [https://wiki.hoggitworld.com/view/DCS_event_birth](https://wiki.hoggitworld.com/view/DCS_event_birth)
+  -- @field S_EVENT_BIRTH = 15
-  -- @field S_EVENT_HUMAN_FAILURE [https://wiki.hoggitworld.com/view/DCS_event_human_failure](https://wiki.hoggitworld.com/view/DCS_event_human_failure)
+  -- @field S_EVENT_HUMAN_FAILURE = 16
-  -- @field S_EVENT_ENGINE_STARTUP [https://wiki.hoggitworld.com/view/DCS_event_engine_startup](https://wiki.hoggitworld.com/view/DCS_event_engine_startup)
+  -- @field S_EVENT_DETAILED_FAILURE = 17
-  -- @field S_EVENT_ENGINE_SHUTDOWN [https://wiki.hoggitworld.com/view/DCS_event_engine_shutdown](https://wiki.hoggitworld.com/view/DCS_event_engine_shutdown)
+  -- @field S_EVENT_ENGINE_STARTUP = 18
-  -- @field S_EVENT_PLAYER_ENTER_UNIT [https://wiki.hoggitworld.com/view/DCS_event_player_enter_unit](https://wiki.hoggitworld.com/view/DCS_event_player_enter_unit)
+  -- @field S_EVENT_ENGINE_SHUTDOWN = 19
-  -- @field S_EVENT_PLAYER_LEAVE_UNIT [https://wiki.hoggitworld.com/view/DCS_event_player_leave_unit](https://wiki.hoggitworld.com/view/DCS_event_player_leave_unit)
+  -- @field S_EVENT_PLAYER_ENTER_UNIT = 20
-  -- @field S_EVENT_PLAYER_COMMENT 
+  -- @field S_EVENT_PLAYER_LEAVE_UNIT = 21
-  -- @field S_EVENT_SHOOTING_START [https://wiki.hoggitworld.com/view/DCS_event_shooting_start](https://wiki.hoggitworld.com/view/DCS_event_shooting_start)
+  -- @field S_EVENT_PLAYER_COMMENT = 22
-  -- @field S_EVENT_SHOOTING_END [https://wiki.hoggitworld.com/view/DCS_event_shooting_end](https://wiki.hoggitworld.com/view/DCS_event_shooting_end)
+  -- @field S_EVENT_SHOOTING_START = 23
-  -- @field S_EVENT_MARK ADDED [https://wiki.hoggitworld.com/view/DCS_event_mark_added](https://wiki.hoggitworld.com/view/DCS_event_mark_added) DCS>=2.5.1
+  -- @field S_EVENT_SHOOTING_END = 24
-  -- @field S_EVENT_MARK CHANGE [https://wiki.hoggitworld.com/view/DCS_event_mark_change](https://wiki.hoggitworld.com/view/DCS_event_mark_change) DCS>=2.5.1
+  -- @field S_EVENT_MARK_ADDED  = 25 
-  -- @field S_EVENT_MARK REMOVE [https://wiki.hoggitworld.com/view/DCS_event_mark_remove](https://wiki.hoggitworld.com/view/DCS_event_mark_remove) DCS>=2.5.1
+  -- @field S_EVENT_MARK_CHANGE = 26
-  -- @field S_EVENT_KILL [https://wiki.hoggitworld.com/view/DCS_event_kill](https://wiki.hoggitworld.com/view/DCS_event_kill) DCS>=2.5.6
+  -- @field S_EVENT_MARK_REMOVED = 27
-  -- @field S_EVENT_SCORE [https://wiki.hoggitworld.com/view/DCS_event_score](https://wiki.hoggitworld.com/view/DCS_event_score) DCS>=2.5.6
+  -- @field S_EVENT_KILL = 28
-  -- @field S_EVENT_UNIT_LOST [https://wiki.hoggitworld.com/view/DCS_event_unit_lost](https://wiki.hoggitworld.com/view/DCS_event_unit_lost) DCS>=2.5.6
+  -- @field S_EVENT_SCORE = 29
-  -- @field S_EVENT_LANDING_AFTER_EJECTION [https://wiki.hoggitworld.com/view/DCS_event_landing_after_ejection](https://wiki.hoggitworld.com/view/DCS_event_landing_after_ejection) DCS>=2.5.6
+  -- @field S_EVENT_UNIT_LOST = 30
-  -- @field S_EVENT_MAX
+  -- @field S_EVENT_LANDING_AFTER_EJECTION = 31
+  -- @field S_EVENT_PARATROOPER_LENDING = 32 -- who's lending whom what? ;)
+  -- @field S_EVENT_DISCARD_CHAIR_AFTER_EJECTION = 33 
+  -- @field S_EVENT_WEAPON_ADD = 34
+  -- @field S_EVENT_TRIGGER_ZONE = 35
+  -- @field S_EVENT_LANDING_QUALITY_MARK = 36
+  -- @field S_EVENT_BDA = 37 -- battle damage assessment
+  -- @field S_EVENT_AI_ABORT_MISSION = 38 
+  -- @field S_EVENT_DAYNIGHT = 39 
+  -- @field S_EVENT_FLIGHT_TIME = 40 
+  -- @field S_EVENT_PLAYER_SELF_KILL_PILOT = 41 
+  -- @field S_EVENT_PLAYER_CAPTURE_AIRFIELD = 42 
+  -- @field S_EVENT_EMERGENCY_LANDING = 43
+  -- @field S_EVENT_UNIT_CREATE_TASK = 44
+  -- @field S_EVENT_UNIT_DELETE_TASK = 45
+  -- @field S_EVENT_SIMULATION_START = 46
+  -- @field S_EVENT_WEAPON_REARM = 47
+  -- @field S_EVENT_WEAPON_DROP = 48
+  -- @field S_EVENT_UNIT_TASK_COMPLETE = 49
+  -- @field S_EVENT_UNIT_TASK_STAGE = 50
+  -- @field S_EVENT_MAC_EXTRA_SCORE= 51 -- not sure what this is
+  -- @field S_EVENT_MISSION_RESTART= 52
+  -- @field S_EVENT_MISSION_WINNER = 53
+  -- @field S_EVENT_RUNWAY_TAKEOFF= 54 
+  -- @field S_EVENT_RUNWAY_TOUCH= 55 
+  -- @field S_EVENT_MAC_LMS_RESTART= 56 -- not sure what this is
+  -- @field S_EVENT_SIMULATION_FREEZE = 57 
+  -- @field S_EVENT_SIMULATION_UNFREEZE = 58 
+  -- @field S_EVENT_HUMAN_AIRCRAFT_REPAIR_START = 59 
+  -- @field S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH = 60   
+  -- @field S_EVENT_MAX = 61
   
   --- The birthplace enumerator is used to define where an aircraft or helicopter has spawned in association with birth events.
   -- @type world.BirthPlace
@@ -1665,6 +1695,7 @@ do -- AI
   -- @field ALARM_STATE @{#AI.Option.Ground.val.ALARM_STATE}
   -- @field ENGAGE_AIR_WEAPONS
   -- @field AC_ENGAGEMENT_RANGE_RESTRICTION
+  -- @field EVASION_OF_ARM
   
   ---
   -- @type AI.Option.Ground.mid -- Moose added

Moose Development/Moose/Functional/AmmoTruck.lua

@@ -77,7 +77,7 @@
 --            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
+--            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
 -- 

Moose Development/Moose/Functional/Artillery.lua

@@ -45,6 +45,7 @@
 -- @field #table currentMove Holds the current commanded move, if there is one assigned.
 -- @field #number Nammo0 Initial amount total ammunition (shells+rockets+missiles) of the whole group.
 -- @field #number Nshells0 Initial amount of shells of the whole group.
+-- @field #number Narty0 Initial amount of artillery shells of the whole group.
 -- @field #number Nrockets0 Initial amount of rockets of the whole group.
 -- @field #number Nmissiles0 Initial amount of missiles of the whole group.
 -- @field #number Nukes0 Initial amount of tactical nukes of the whole group. Default is 0.
@@ -415,7 +416,7 @@
 --      arty set, battery "Paladin Alpha", rearming place
 --
 -- Setting the rearming group is independent of the position of the mark. Just create one anywhere on the map and type
---      arty set, battery "Mortar Bravo", rearming group "Ammo Truck M818"
+--      arty set, battery "Mortar Bravo", rearming group "Ammo Truck M939"
 -- Note that the name of the rearming group has to be given in quotation marks and spelt exactly as the group name defined in the mission editor.
 --
 -- ## Transporting
@@ -453,7 +454,7 @@
 --     -- Creat a new ARTY object from a Paladin group.
 --     paladin=ARTY:New(GROUP:FindByName("Blue Paladin"))
 --
---     -- Define a rearming group. This is a Transport M818 truck.
+--     -- Define a rearming group. This is a Transport M939 truck.
 --     paladin:SetRearmingGroup(GROUP:FindByName("Blue Ammo Truck"))
 --
 --     -- Set the max firing range. A Paladin unit has a range of 20 km.
@@ -694,7 +695,7 @@ ARTY.db={
 
 --- Arty script version.
 -- @field #string version
-ARTY.version="1.3.0"
+ARTY.version="1.3.1"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -707,7 +708,7 @@ ARTY.version="1.3.0"
 -- DONE: Add user defined rearm weapon types.
 -- DONE: Check if target is in range. Maybe this requires a data base with the ranges of all arty units. <solved by user function>
 -- DONE: Make ARTY move to rearming position.
--- DONE: Check that right rearming vehicle is specified. Blue M818, Red Ural-375. Are there more? <user needs to know!>
+-- DONE: Check that right rearming vehicle is specified. Blue M939, Red Ural-375. Are there more? <user needs to know!>
 -- DONE: Check if ARTY group is still alive.
 -- DONE: Handle dead events.
 -- DONE: Abort firing task if no shooting event occured with 5(?) minutes. Something went wrong then. Min/max range for example.
@@ -1532,7 +1533,7 @@ end
 
 --- Assign a group, which is responsible for rearming the ARTY group. If the group is too far away from the ARTY group it will be guided towards the ARTY group.
 -- @param #ARTY self
--- @param Wrapper.Group#GROUP group Group that is supposed to rearm the ARTY group. For the blue coalition, this is often a unarmed M818 transport whilst for red an unarmed Ural-375 transport can be used.
+-- @param Wrapper.Group#GROUP group Group that is supposed to rearm the ARTY group. For the blue coalition, this is often a unarmed M939 transport whilst for red an unarmed Ural-375 transport can be used.
 -- @return self
 function ARTY:SetRearmingGroup(group)
   self:F({group=group})
@@ -1887,7 +1888,7 @@ function ARTY:onafterStart(Controllable, From, Event, To)
   MESSAGE:New(text, 5):ToAllIf(self.Debug)
 
   -- Get Ammo.
-  self.Nammo0, self.Nshells0, self.Nrockets0, self.Nmissiles0=self:GetAmmo(self.Debug)
+  self.Nammo0, self.Nshells0, self.Nrockets0, self.Nmissiles0, self.Narty0=self:GetAmmo(self.Debug)
 
   -- Init nuclear explosion parameters if they were not set by user.
   if self.nukerange==nil then
@@ -2093,7 +2094,7 @@ function ARTY:_StatusReport(display)
   end
 
   -- Get Ammo.
-  local Nammo, Nshells, Nrockets, Nmissiles=self:GetAmmo()
+  local Nammo, Nshells, Nrockets, Nmissiles, Narty=self:GetAmmo()
   local Nnukes=self.Nukes
   local Nillu=self.Nillu
   local Nsmoke=self.Nsmoke
@@ -2106,7 +2107,7 @@ function ARTY:_StatusReport(display)
   text=text..string.format("Clock               = %s\n", Clock)
   text=text..string.format("FSM state           = %s\n", self:GetState())
   text=text..string.format("Total ammo count    = %d\n", Nammo)
-  text=text..string.format("Number of shells    = %d\n", Nshells)
+  text=text..string.format("Number of shells    = %d\n", Narty)
   text=text..string.format("Number of rockets   = %d\n", Nrockets)
   text=text..string.format("Number of missiles  = %d\n", Nmissiles)
   text=text..string.format("Number of nukes     = %d\n", Nnukes)
@@ -2293,19 +2294,19 @@ function ARTY:OnEventShot(EventData)
         end
 
         -- Get current ammo.
-        local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()
+        local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
 
         -- Decrease available nukes because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.TacticalNukes then
           self.Nukes=self.Nukes-1
         end
 
-        -- Decrease available illuminatin shells because we just fired one.
+        -- Decrease available illumination shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then
           self.Nillu=self.Nillu-1
         end
 
-        -- Decrease available illuminatin shells because we just fired one.
+        -- Decrease available smoke shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then
           self.Nsmoke=self.Nsmoke-1
         end
@@ -2323,7 +2324,7 @@ function ARTY:OnEventShot(EventData)
 
         -- Weapon type name for current target.
         local _weapontype=self:_WeaponTypeName(self.currentTarget.weapontype)
-        self:T(self.lid..string.format("Group %s ammo: total=%d, shells=%d, rockets=%d, missiles=%d", self.groupname, _nammo, _nshells, _nrockets, _nmissiles))
+        self:T(self.lid..string.format("Group %s ammo: total=%d, shells=%d, rockets=%d, missiles=%d", self.groupname, _nammo, _narty, _nrockets, _nmissiles))
         self:T(self.lid..string.format("Group %s uses weapontype %s for current target.", self.groupname, _weapontype))
 
         -- Default switches for cease fire and relocation.
@@ -2771,7 +2772,7 @@ function ARTY:onafterStatus(Controllable, From, Event, To)
   self:_EventFromTo("onafterStatus", Event, From, To)
   
   -- Get ammo.
-  local nammo, nshells, nrockets, nmissiles=self:GetAmmo()
+  local nammo, nshells, nrockets, nmissiles, narty=self:GetAmmo()
   
   -- We have a cargo group ==> check if group was loaded into a carrier.
   if self.iscargo and self.cargogroup then
@@ -2788,7 +2789,7 @@ function ARTY:onafterStatus(Controllable, From, Event, To)
 
   -- FSM state.
   local fsmstate=self:GetState()
-  self:T(self.lid..string.format("Status %s, Ammo total=%d: shells=%d [smoke=%d, illu=%d, nukes=%d*%.3f kT], rockets=%d, missiles=%d", fsmstate, nammo, nshells, self.Nsmoke, self.Nillu, self.Nukes, self.nukewarhead/1000000, nrockets, nmissiles))
+  self:T(self.lid..string.format("Status %s, Ammo total=%d: shells=%d [smoke=%d, illu=%d, nukes=%d*%.3f kT], rockets=%d, missiles=%d", fsmstate, nammo, narty, self.Nsmoke, self.Nillu, self.Nukes, self.nukewarhead/1000000, nrockets, nmissiles))
 
   if self.Controllable and self.Controllable:IsAlive() then
 
@@ -2871,20 +2872,19 @@ function ARTY:onafterStatus(Controllable, From, Event, To)
       if self.currentTarget then
         self:CeaseFire(self.currentTarget)
       end
-
+      
-      -- Open fire on timed target.
+      if self:is("CombatReady") then
-      self:OpenFire(_timedTarget)
+        -- Open fire on timed target.
-
+        self:OpenFire(_timedTarget)
+      end
     elseif _normalTarget then
-
+      
-      -- Open fire on normal target.
+      if self:is("CombatReady") then  
-      self:OpenFire(_normalTarget)
+        -- Open fire on normal target.
-
+        self:OpenFire(_normalTarget)
+      end
     end
 
-    -- Get ammo.
-    --local nammo, nshells, nrockets, nmissiles=self:GetAmmo()
-
     -- Check if we have a target in the queue for which weapons are still available.
     local gotsome=false
     if #self.targets>0 then
@@ -3045,14 +3045,14 @@ function ARTY:onafterOpenFire(Controllable, From, Event, To, target)
   local range=Controllable:GetCoordinate():Get2DDistance(target.coord)
 
   -- Get ammo.
-  local Nammo, Nshells, Nrockets, Nmissiles=self:GetAmmo()
+  local Nammo, Nshells, Nrockets, Nmissiles, Narty=self:GetAmmo()
-  local nfire=Nammo
+  local nfire=Narty
   local _type="shots"
   if target.weapontype==ARTY.WeaponType.Auto then
-    nfire=Nammo
+    nfire=Narty
     _type="shots"
   elseif target.weapontype==ARTY.WeaponType.Cannon then
-    nfire=Nshells
+    nfire=Narty
     _type="shells"
   elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
     nfire=self.Nukes
@@ -3337,7 +3337,7 @@ function ARTY:_CheckRearmed()
   self:F2()
 
   -- Get current ammo.
-  local nammo,nshells,nrockets,nmissiles=self:GetAmmo()
+  local nammo,nshells,nrockets,nmissiles,narty=self:GetAmmo()
 
   -- Number of units still alive.
   local units=self.Controllable:GetUnits()
@@ -3603,7 +3603,11 @@ function ARTY:_FireAtCoord(coord, radius, nshells, weapontype)
   if weapontype==ARTY.WeaponType.TacticalNukes or weapontype==ARTY.WeaponType.IlluminationShells or weapontype==ARTY.WeaponType.SmokeShells then
     weapontype=ARTY.WeaponType.Cannon
   end
-
+  
+  if group:HasTask() then
+    group:ClearTasks()
+  end
+  
   -- Set ROE to weapon free.
   group:OptionROEOpenFire()
 
@@ -3614,7 +3618,7 @@ function ARTY:_FireAtCoord(coord, radius, nshells, weapontype)
   local fire=group:TaskFireAtPoint(vec2, radius, nshells, weapontype)
 
   -- Execute task.
-  group:SetTask(fire)
+  group:SetTask(fire,1)
 end
 
 --- Set task for attacking a group.
@@ -3631,7 +3635,11 @@ function ARTY:_AttackGroup(target)
   if weapontype==ARTY.WeaponType.TacticalNukes or weapontype==ARTY.WeaponType.IlluminationShells or weapontype==ARTY.WeaponType.SmokeShells then
     weapontype=ARTY.WeaponType.Cannon
   end
-
+  
+  if group:HasTask() then
+    group:ClearTasks()
+  end
+    
   -- Set ROE to weapon free.
   group:OptionROEOpenFire()
 
@@ -3642,7 +3650,7 @@ function ARTY:_AttackGroup(target)
   local fire=group:TaskAttackGroup(targetgroup, weapontype, AI.Task.WeaponExpend.ONE, 1)
 
   -- Execute task.
-  group:SetTask(fire)
+  group:SetTask(fire,1)
 end
 
 
@@ -3709,51 +3717,6 @@ 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.
@@ -3915,6 +3878,7 @@ end
 -- @return #number Number of shells the group has left.
 -- @return #number Number of rockets the group has left.
 -- @return #number Number of missiles the group has left.
+-- @return #number Number of artillery shells the group has left.
 function ARTY:GetAmmo(display)
   self:F3({display=display})
 
@@ -3928,6 +3892,7 @@ function ARTY:GetAmmo(display)
   local nshells=0
   local nrockets=0
   local nmissiles=0
+  local nartyshells=0
 
   -- Get all units.
   local units=self.Controllable:GetUnits()
@@ -4030,7 +3995,8 @@ function ARTY:GetAmmo(display)
 
             -- Add up all shells.
             nshells=nshells+Nammo
-
+            local _,_,_,_,_,shells = unit:GetAmmunition()
+            nartyshells=nartyshells+shells
             -- Debug info.
             text=text..string.format("- %d shells of type %s\n", Nammo, _weaponName)
 
@@ -4076,7 +4042,7 @@ function ARTY:GetAmmo(display)
   -- Total amount of ammunition.
   nammo=nshells+nrockets+nmissiles
 
-  return nammo, nshells, nrockets, nmissiles
+  return nammo, nshells, nrockets, nmissiles, nartyshells
 end
 
 --- Returns a name of a missile category.
@@ -4827,7 +4793,10 @@ function ARTY:_CheckShootingStarted()
 
     -- Check if we waited long enough and no shot was fired.
     --if dt > self.WaitForShotTime and self.Nshots==0 then
-    if dt > self.WaitForShotTime and (self.Nshots==0 or self.currentTarget.nshells >= self.Nshots) then  --https://github.com/FlightControl-Master/MOOSE/issues/1356
+    
+    self:T(string.format("dt = %d WaitTime = %d | shots = %d TargetShells = %d",dt,self.WaitForShotTime,self.Nshots,self.currentTarget.nshells))
+    
+    if (dt > self.WaitForShotTime and self.Nshots==0) or (self.currentTarget.nshells <= self.Nshots) then  --https://github.com/FlightControl-Master/MOOSE/issues/1356
 
       -- Debug info.
       self:T(self.lid..string.format("%s, no shot event after %d seconds. Removing current target %s from list.", self.groupname, self.WaitForShotTime, name))
@@ -4889,7 +4858,7 @@ end
 function ARTY:_CheckOutOfAmmo(targets)
 
   -- Get current ammo.
-  local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()
+  local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
 
    -- Special weapon type requested ==> Check if corresponding ammo is empty.
   local _partlyoutofammo=false
@@ -4901,7 +4870,7 @@ function ARTY:_CheckOutOfAmmo(targets)
       self:T(self.lid..string.format("Group %s, auto weapon requested for target %s but all ammo is empty.", self.groupname, Target.name))
       _partlyoutofammo=true
 
-    elseif Target.weapontype==ARTY.WeaponType.Cannon and _nshells==0 then
+    elseif Target.weapontype==ARTY.WeaponType.Cannon and _narty==0 then
 
       self:T(self.lid..string.format("Group %s, cannons requested for target %s but shells empty.", self.groupname, Target.name))
       _partlyoutofammo=true
@@ -4945,14 +4914,14 @@ end
 function ARTY:_CheckWeaponTypeAvailable(target)
 
   -- Get current ammo of group.
-  local Nammo, Nshells, Nrockets, Nmissiles=self:GetAmmo()
+  local Nammo, Nshells, Nrockets, Nmissiles, Narty=self:GetAmmo()
 
   -- Check if enough ammo is there for the selected weapon type.
   local nfire=Nammo
   if target.weapontype==ARTY.WeaponType.Auto then
     nfire=Nammo
   elseif target.weapontype==ARTY.WeaponType.Cannon then
-    nfire=Nshells
+    nfire=Narty
   elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
     nfire=self.Nukes
   elseif target.weapontype==ARTY.WeaponType.IlluminationShells then

Moose Development/Moose/Functional/CleanUp.lua

@@ -52,11 +52,13 @@
 -- @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.
@@ -93,7 +95,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.
@@ -240,7 +242,8 @@ 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/ClientWatch.lua

@@ -0,0 +1,687 @@
+--- **Functional** - Manage and track client slots easily to add your own client-based menus and modules to.
+-- 
+-- The @{#CLIENTWATCH} class adds a simplified way to create scripts and menus for individual clients. Instead of creating large algorithms and juggling multiple event handlers, you can simply provide one or more prefixes to the class and use the callback functions on spawn, despawn, and any aircraft related events to script to your hearts content.
+-- 
+-- ===
+-- 
+-- ## Features:
+-- 
+--   * Find clients by prefixes or by providing a Wrapper.CLIENT object
+--   * Trigger functions when the client spawns and despawns
+--   * Create multiple client instances without overwriting event handlers between instances
+--   * More reliable aircraft lost events for when DCS thinks the aircraft id dead but a dead event fails to trigger
+--   * Easily manage clients spawned in dynamic slots
+--
+-- ====
+-- 
+-- ### Author: **Statua**
+-- 
+-- ### Contributions: **FlightControl**: Wrapper.CLIENT
+-- 
+-- ====
+-- @module Functional.ClientWatch
+-- @image clientwatch.jpg
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+--- CLIENTWATCH class
+-- @type CLIENTWATCH
+-- @field #string ClassName Name of the class.
+-- @field #boolean Debug Write Debug messages to DCS log file and send Debug messages to all players.
+-- @field #string lid String for DCS log file.
+-- @field #number FilterCoalition If not nil, will only activate for aircraft of the given coalition value.
+-- @field #number FilterCategory If not nil, will only activate for aircraft of the given category value.
+-- @extends Core.Fsm#FSM_CONTROLLABLE
+
+--- Manage and track client slots easily to add your own client-based menus and modules to.
+-- 
+-- ## Creating a new instance
+-- 
+-- To start, you must first create a new instance of the client manager and provide it with either a Wrapper.Client#CLIENT object, a string prefix of the unit name, or a table of string prefixes for unit names. These are used to capture the client unit when it spawns and apply your scripted functions to it. Only fixed wing and rotary wing aircraft controlled by players can be used by this class.
+-- **This will not work if the client aircraft is alive!**
+-- 
+-- ### Examples
+--
+--          -- Create an instance with a Wrapper.Client#CLIENT object
+--          local heliClient = CLIENT:FindByName('Rotary1-1')
+--          local clientInstance = CLIENTWATCH:New(heliClient)
+--  
+--          -- Create an instance with part of the unit name in the Mission Editor
+--          local clientInstance = CLIENTWATCH:New("Rotary")
+--  
+--          -- Create an instance using prefixes for a few units as well as a FARP name for any dynamic spawns coming out of it
+--          local clientInstance = CLIENTWATCH:New({"Rescue","UH-1H","FARP ALPHA"})
+--
+-- ## Applying functions and methods to client aircraft when they spawn
+-- 
+-- Once the instance is created, it will watch for birth events. If the unit name of the client aircraft matches the one provided in the instance, the callback method @{#CLIENTWATCH:OnAfterSpawn}() can be used to apply functions and methods to the client object.
+--
+-- In the OnAfterSpawn() callback method are four values. From, Event, To, and ClientObject. From,Event,To are standard FSM strings for the state changes. ClientObject is where the magic happens. This is a special object which you can use to access all the data of the client aircraft. The following entries in ClientObject are available for you to use:
+--
+--   * **ClientObject.Unit**: The Moose @{Wrapper.Unit#UNIT} of the client aircraft
+--   * **ClientObject.Group**: The Moose @{Wrapper.Group#GRUP} of the client aircraft
+--   * **ClientObject.Client**: The Moose @{Wrapper.Client#CLIENT} of the client aircraft
+--   * **ClientObject.PlayerName**: A #string of the player controlling the aircraft
+--   * **ClientObject.UnitName**: A #string of the client aircraft unit.
+--   * **ClientObject.GroupName**: A #string of the client aircraft group.
+-- 
+-- ### Examples
+--
+--          -- Create an instance with a client unit prefix and send them a message when they spawn
+--          local clientInstance = CLIENTWATCH:New("Rotary")
+--          function clientInstance:OnAfterSpawn(From,Event,To,ClientObject,EventData)
+--              MESSAGE:New("Welcome to your aircraft!",10):ToUnit(ClientObject.Unit)
+--          end
+--
+-- ## Using event callbacks
+-- 
+-- In a normal setting, you can only use a callback function for a specific option in one location. If you have multiple scripts that rely on the same callback from the same object, this can get quite messy. With the ClientWatch module, these callbacks are isolated t the instances and therefore open the possibility to use many instances with the same callback doing different things. ClientWatch instances subscribe to all events that are applicable to player controlled aircraft and provides callbacks for each, forwarding the EventData in the callback function.
+--
+-- The following event callbacks can be used inside the OnAfterSpawn() callback:
+--
+--   * **:OnAfterDespawn(From,Event,To)**: Triggers whenever DCS no longer sees the aircraft as 'alive'. No event data is given in this callback as it is derived from other events
+--   * **:OnAfterHit(From,Event,To,EventData)**: Triggers every time the aircraft takes damage or is struck by a weapon/explosion
+--   * **:OnAfterKill(From,Event,To,EventData)**: Triggers after the aircraft kills something with its weapons
+--   * **:OnAfterScore(From,Event,To,EventData)**: Triggers after accumulating score
+--   * **:OnAfterShot(From,Event,To,EventData)**: Triggers after a single-shot weapon is released
+--   * **:OnAfterShootingStart(From,Event,To,EventData)**: Triggers when an automatic weapon begins firing
+--   * **:OnAfterShootingEnd(From,Event,To,EventData)**: Triggers when an automatic weapon stops firing
+--   * **:OnAfterLand(From,Event,To,EventData)**: Triggers when an aircraft transitions from being airborne to on the ground
+--   * **:OnAfterTakeoff(From,Event,To,EventData)**: Triggers when an aircraft transitions from being on the ground to airborne
+--   * **:OnAfterRunwayTakeoff(From,Event,To,EventData)**: Triggers after lifting off from a runway
+--   * **:OnAfterRunwayTouch(From,Event,To,EventData)**: Triggers when an aircraft's gear makes contact with a runway
+--   * **:OnAfterRefueling(From,Event,To,EventData)**: Triggers when an aircraft begins taking on fuel
+--   * **:OnAfterRefuelingStop(From,Event,To,EventData)**: Triggers when an aircraft stops taking on fuel
+--   * **:OnAfterPlayerLeaveUnit(From,Event,To,EventData)**: Triggers when a player leaves an operational aircraft
+--   * **:OnAfterCrash(From,Event,To,EventData)**: Triggers when an aircraft is destroyed (may fail to trigger if the aircraft is only partially destroyed)
+--   * **:OnAfterDead(From,Event,To,EventData)**: Triggers when an aircraft is considered dead (may fail to trigger if the aircraft was partially destroyed first)
+--   * **:OnAfterPilotDead(From,Event,To,EventData)**: Triggers when the pilot is killed (may fail to trigger if the aircraft was partially destroyed first)
+--   * **:OnAfterUnitLost(From,Event,To,EventData)**: Triggers when an aircraft is lost for any reason (may fail to trigger if the aircraft was partially destroyed first)
+--   * **:OnAfterEjection(From,Event,To,EventData)**: Triggers when a pilot ejects from an aircraft
+--   * **:OnAfterHumanFailure(From,Event,To,EventData)**: Triggers when an aircraft or system is damaged from any source or action by the player
+--   * **:OnAfterHumanAircraftRepairStart(From,Event,To,EventData)**: Triggers when an aircraft repair is started
+--   * **:OnAfterHumanAircraftRepairFinish(From,Event,To,EventData)**: Triggers when an aircraft repair is completed
+--   * **:OnAfterEngineStartup(From,Event,To,EventData)**: Triggers when the engine enters what DCS considers to be a started state. Parameters vary by aircraft
+--   * **:OnAfterEngineShutdown(From,Event,To,EventData)**: Triggers when the engine enters what DCS considers to be a stopped state. Parameters vary by aircraft
+--   * **:OnAfterWeaponAdd(From,Event,To,EventData)**: Triggers when an item is added to an aircraft's payload
+--   * **:OnAfterWeaponDrop(From,Event,To,EventData)**: Triggers when an item is jettisoned or dropped from an aircraft (unconfirmed)
+--   * **:OnAfterWeaponRearm(From,Event,To,EventData)**: Triggers when an item with internal supply is restored (unconfirmed)
+-- 
+-- ### Examples
+--
+--          -- Show a message to player when they take damage from a weapon
+--          local clientInstance = CLIENTWATCH:New("Rotary")
+--              function clientInstance:OnAfterSpawn(From,Event,To,ClientObject,EventData)
+--              function ClientObject:OnAfterHit(From,Event,To,EventData)
+--                 local typeShooter = EventData.IniTypeName
+--                 local nameWeapon = EventData.weapon_name
+--                 MESSAGE:New("A "..typeShooter.." hit you with a "..nameWeapon,20):ToUnit(ClientObject.Unit)
+--              end
+--          end
+-- 
+-- @field #CLIENTWATCH
+CLIENTWATCH = {}
+CLIENTWATCH.ClassName = "CLIENTWATCH"
+CLIENTWATCH.Debug = false
+CLIENTWATCH.DebugEventData = false
+CLIENTWATCH.lid = nil
+
+-- @type CLIENTWATCHTools
+-- @field #table Unit Wrapper.UNIT of the cient object
+-- @field #table Group Wrapper.GROUP of the cient object
+-- @field #table Client Wrapper.CLIENT of the cient object
+-- @field #string PlayerName Name of the player controlling the client object
+-- @field #string UnitName Name of the unit that is the client object
+-- @field #string GroupName Name of the group the client object belongs to
+CLIENTWATCHTools = {}
+  
+--- CLIENTWATCH version
+-- @field #string version
+CLIENTWATCH.version="1.0.1"
+
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Creates a new instance of CLIENTWATCH to add scripts to. Can be used multiple times with the same client/prefixes if you need it for multiple scripts.
+-- @param #CLIENTWATCH self
+-- @param #string Will watch for clients whos UNIT NAME or GROUP NAME matches part of the #string as a prefix.
+-- @param #table Put strings in a table to use multiple prefixes for the above method.
+-- @param Wrapper.Client#CLIENT Provide a Moose CLIENT object to apply to that specific aircraft slot (static slots only!)
+-- @param #nil Leave blank to activate for ALL CLIENTS
+-- @return #CLIENTWATCH self
+function CLIENTWATCH:New(client)
+    --Init FSM
+    local self=BASE:Inherit(self, FSM:New())
+    self:SetStartState( "Idle" )
+    self:AddTransition( "*", "Spawn", "*" )
+
+    self.FilterCoalition = nil
+    self.FilterCategory = nil
+
+    --- User function for OnAfter "Spawn" event.
+  -- @function [parent=#CLIENTWATCH] OnAfterSpawn
+  -- @param #CLIENTWATCH self
+  -- @param Wrapper.Controllable#CONTROLLABLE Controllable Controllable of the group.
+  -- @param #string From From state.
+  -- @param #string Event Event.
+  -- @param #string To To state.
+  -- @param #table clientObject Custom object that handles events and stores Moose object data. See top documentation for more details.
+  -- @param #table eventdata Data from EVENTS.Birth.
+
+    --Set up spawn tracking
+    if not client then
+        if self.Debug then self:I({"New client instance created. ClientType = All clients"}) end
+        self:HandleEvent(EVENTS.Birth)
+        function self:OnEventBirth(eventdata)
+            if (eventdata.IniCategory == 0 or eventdata.IniCategory == 1) and eventdata.IniPlayerName 
+            and (not self.FilterCoalition or self.FilterCoalition == eventdata.IniCoalition) 
+            and (not self.FilterCategory or self.FilterCategory == eventdata.IniCategory) then
+                if self.Debug then 
+                    self:I({"Client spawned in.",IniCategory = eventdata.IniCategory})
+                end
+                local clientWatchDebug = self.Debug
+                local clientObject = CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+                self:Spawn(clientObject,eventdata)
+            end
+        end
+    elseif type(client) == "table" or type(client) == "string" then
+        if type(client) == "table" then 
+
+            --CLIENT TABLE
+            if client.ClassName == "CLIENT" then
+                if self.Debug then self:I({"New client instance created. ClientType = Wrapper.CLIENT",client}) end
+                self.ClientName = client:GetName()
+                self:HandleEvent(EVENTS.Birth)
+                function self:OnEventBirth(eventdata)
+                    if (eventdata.IniCategory == 0 or eventdata.IniCategory == 1) and eventdata.IniPlayerName 
+                    and (not self.FilterCoalition or self.FilterCoalition == eventdata.IniCoalition) 
+                    and (not self.FilterCategory or self.FilterCategory == eventdata.IniCategory) then
+                        if self.ClientName == eventdata.IniUnitName then
+                            if self.Debug then 
+                                self:I({"Client spawned in.",IniCategory = eventdata.IniCategory})
+                            end
+                            local clientWatchDebug = self.Debug
+                            local clientObject = CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+                            self:Spawn(clientObject,eventdata)
+                        end
+                    end
+                end
+
+            --STRING TABLE
+            else
+                if self.Debug then self:I({"New client instance created. ClientType = Multiple Prefixes",client}) end
+                local tableValid = true
+                for _,entry in pairs(client) do
+                    if type(entry) ~= "string" then
+                        tableValid = false
+                        self:E({"The base handler failed to start because at least one entry in param1's table is not a string!",InvalidEntry = entry})
+                        return nil
+                    end
+                end
+                if tableValid then
+                    self:HandleEvent(EVENTS.Birth)
+                    function self:OnEventBirth(eventdata)
+                        for _,entry in pairs(client) do
+                            if (eventdata.IniCategory == 0 or eventdata.IniCategory == 1) and eventdata.IniPlayerName 
+                            and (not self.FilterCoalition or self.FilterCoalition == eventdata.IniCoalition) 
+                            and (not self.FilterCategory or self.FilterCategory == eventdata.IniCategory) then
+                                if string.match(eventdata.IniUnitName,entry) or string.match(eventdata.IniGroupName,entry) then
+                                    if self.Debug then 
+                                        self:I({"Client spawned in.",IniCategory = eventdata.IniCategory})
+                                    end
+                                    local clientWatchDebug = self.Debug
+                                    local clientObject = CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+                                    self:Spawn(clientObject,eventdata)
+                                    break
+                                end
+                            end
+                        end
+                    end
+                end
+            end
+        else
+            if self.Debug then self:I({"New client instance created. ClientType = Single Prefix",client}) end
+
+            --SOLO STRING
+            self:HandleEvent(EVENTS.Birth)
+            function self:OnEventBirth(eventdata)
+                if (eventdata.IniCategory == 0 or eventdata.IniCategory == 1) and eventdata.IniPlayerName 
+                and (not self.FilterCoalition or self.FilterCoalition == eventdata.IniCoalition) 
+                and (not self.FilterCategory or self.FilterCategory == eventdata.IniCategory) then
+                    if string.match(eventdata.IniUnitName,client) or string.match(eventdata.IniGroupName,client) then
+                        if self.Debug then 
+                            self:I({"Client spawned in.",IniCategory = eventdata.IniCategory})
+                        end
+                        local clientWatchDebug = self.Debug
+                        local clientObject = CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+                        self:Spawn(clientObject,eventdata)
+                    end
+                end
+            end
+        end
+    else
+        self:E({"The base handler failed to start because param1 is not a CLIENT object or a prefix string!",param1 = client})
+        return nil
+    end
+
+    return self
+end
+
+
+--- Filter out all clients not belonging to the provided coalition
+-- @param #CLIENTWATCH self
+-- @param #number Coalition number (1 = red, 2 = blue)
+-- @param #string Coalition string ('red' or 'blue')
+function CLIENTWATCH:FilterByCoalition(value)
+    if value == 1 or value == "red" then
+        self.FilterCoalition = 1
+    else
+        self.FilterCoalition = 2
+    end
+    return self
+end
+
+
+--- Filter out all clients that are not of the given category
+-- @param #CLIENTWATCH self
+-- @param #number Category number (0 = airplane, 1 = helicopter)
+-- @param #string Category string ('airplane' or 'helicopter')
+function CLIENTWATCH:FilterByCategory(value)
+    if value == 1 or value == "helicopter" then
+        self.FilterCategory = 1
+    else
+        self.FilterCategory = 0
+    end
+    return self
+end
+
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+--- Internal function for creating a new client on birth. Do not use!!!.
+-- @param #CLIENTWATCHTools self
+-- @param #EVENTS.Birth EventData
+-- @return #CLIENTWATCHTools self
+function CLIENTWATCHTools:_newClient(clientWatchDebug,eventdata)
+    --Init FSM
+    local self=BASE:Inherit(self, FSM:New())
+    self:SetStartState( "Alive" )
+    self:AddTransition( "Alive", "Despawn", "Dead" )
+
+    self.Unit = eventdata.IniUnit
+    self.Group = self.Unit:GetGroup()
+    self.Client = self.Unit:GetClient()
+    self.PlayerName = self.Unit:GetPlayerName()
+    self.UnitName = self.Unit:GetName()
+    self.GroupName = self.Group:GetName()
+
+    --Event events
+    self:AddTransition( "*", "Hit", "*" )
+    self:AddTransition( "*", "Kill", "*" )
+    self:AddTransition( "*", "Score", "*" )
+    self:AddTransition( "*", "Shot", "*" )
+    self:AddTransition( "*", "ShootingStart", "*" )
+    self:AddTransition( "*", "ShootingEnd", "*" )
+    self:AddTransition( "*", "Land", "*" )
+    self:AddTransition( "*", "Takeoff", "*" )
+    self:AddTransition( "*", "RunwayTakeoff", "*" )
+    self:AddTransition( "*", "RunwayTouch", "*" )
+    self:AddTransition( "*", "Refueling", "*" )
+    self:AddTransition( "*", "RefuelingStop", "*" )
+    self:AddTransition( "*", "PlayerLeaveUnit", "*" )
+    self:AddTransition( "*", "Crash", "*" )
+    self:AddTransition( "*", "Dead", "*" )
+    self:AddTransition( "*", "PilotDead", "*" )
+    self:AddTransition( "*", "UnitLost", "*" )
+    self:AddTransition( "*", "Ejection", "*" )
+    self:AddTransition( "*", "HumanFailure", "*" )
+    self:AddTransition( "*", "HumanAircraftRepairFinish", "*" )
+    self:AddTransition( "*", "HumanAircraftRepairStart", "*" )
+    self:AddTransition( "*", "EngineShutdown", "*" )
+    self:AddTransition( "*", "EngineStartup", "*" )
+    self:AddTransition( "*", "WeaponAdd", "*" )
+    self:AddTransition( "*", "WeaponDrop", "*" )
+    self:AddTransition( "*", "WeaponRearm", "*" )
+
+    --Event Handlers
+    self:HandleEvent( EVENTS.Hit )
+    self:HandleEvent( EVENTS.Kill )
+    self:HandleEvent( EVENTS.Score )
+    self:HandleEvent( EVENTS.Shot )
+    self:HandleEvent( EVENTS.ShootingStart )
+    self:HandleEvent( EVENTS.ShootingEnd )
+    self:HandleEvent( EVENTS.Land )
+    self:HandleEvent( EVENTS.Takeoff )
+    self:HandleEvent( EVENTS.RunwayTakeoff )
+    self:HandleEvent( EVENTS.RunwayTouch )
+    self:HandleEvent( EVENTS.Refueling )
+    self:HandleEvent( EVENTS.RefuelingStop )
+    self:HandleEvent( EVENTS.PlayerLeaveUnit )
+    self:HandleEvent( EVENTS.Crash )
+    self:HandleEvent( EVENTS.Dead )
+    self:HandleEvent( EVENTS.PilotDead )
+    self:HandleEvent( EVENTS.UnitLost )
+    self:HandleEvent( EVENTS.Ejection )
+    self:HandleEvent( EVENTS.HumanFailure )
+    self:HandleEvent( EVENTS.HumanAircraftRepairFinish )
+    self:HandleEvent( EVENTS.HumanAircraftRepairStart )
+    self:HandleEvent( EVENTS.EngineShutdown )
+    self:HandleEvent( EVENTS.EngineStartup )
+    self:HandleEvent( EVENTS.WeaponAdd )
+    self:HandleEvent( EVENTS.WeaponDrop )
+    self:HandleEvent( EVENTS.WeaponRearm )
+
+    function self:OnEventHit(EventData)
+        if EventData.TgtUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered hit event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Hit(EventData)
+        end
+    end
+
+    function self:OnEventKill(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered kill event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Kill(EventData)
+        end
+    end
+
+    function self:OnEventScore(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered score event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Score(EventData)
+        end
+    end
+
+    function self:OnEventShot(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered shot event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Shot(EventData)
+        end
+    end
+
+    function self:OnEventShootingStart(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered shooting start event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:ShootingStart(EventData)
+        end
+    end
+
+    function self:OnEventShootingEnd(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered shooting end event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:ShootingEnd(EventData)
+        end
+    end
+
+    function self:OnEventLand(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered land event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Land(EventData)
+        end
+    end
+
+    function self:OnEventTakeoff(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered takeoff event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Takeoff(EventData)
+        end
+    end
+
+    function self:OnEventRunwayTakeoff(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered runway takeoff event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:RunwayTakeoff(EventData)
+        end
+    end
+
+    function self:OnEventRunwayTouch(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered runway touch event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:RunwayTouch(EventData)
+        end
+    end
+
+    function self:OnEventRefueling(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered refueling event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Refueling(EventData)
+        end
+    end
+
+    function self:OnEventRefuelingStop(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered refueling event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:RefuelingStop(EventData)
+        end
+    end
+
+    function self:OnEventPlayerLeaveUnit(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered leave unit event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:PlayerLeaveUnit(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventCrash(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered crash event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Crash(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventDead(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered dead event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Dead(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventPilotDead(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered pilot dead event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:PilotDead(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventUnitLost(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered unit lost event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:UnitLost(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventEjection(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered ejection event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:Ejection(EventData)
+            self._deadRoutine()
+        end
+    end
+
+    function self:OnEventHumanFailure(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered human failure event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:HumanFailure(EventData)
+            if not self.Unit:IsAlive() then
+                self._deadRoutine()
+            end
+        end
+    end
+
+    function self:OnEventHumanAircraftRepairFinish(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered repair finished event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:HumanAircraftRepairFinish(EventData)
+        end
+    end
+
+    function self:OnEventHumanAircraftRepairStart(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered repair start event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:HumanAircraftRepairStart(EventData)
+        end
+    end
+
+    function self:OnEventEngineShutdown(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered engine shutdown event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:EngineShutdown(EventData)
+        end
+    end
+
+    function self:OnEventEngineStartup(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered engine startup event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:EngineStartup(EventData)
+        end
+    end
+
+    function self:OnEventWeaponAdd(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered weapon add event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:WeaponAdd(EventData)
+        end
+    end
+
+    function self:OnEventWeaponDrop(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered weapon drop event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:WeaponDrop(EventData)
+        end
+    end
+
+    function self:OnEventWeaponRearm(EventData)
+        if EventData.IniUnitName == self.UnitName then
+            if clientWatchDebug then
+                self:I({"Client triggered weapon rearm event.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+                
+            end
+            self:WeaponRearm(EventData)
+        end
+    end
+
+
+    --Fallback timer
+    self.FallbackTimer = TIMER:New(function()
+        if not self.Unit:IsAlive() then
+            if clientWatchDebug then
+                self:I({"Client is registered as dead without an event trigger. Running fallback dead routine.",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName})
+            end
+            self._deadRoutine()
+        end
+    end)
+    self.FallbackTimer:Start(5,5)
+
+    --Stop event handlers and trigger Despawn
+    function self._deadRoutine()
+        if clientWatchDebug then self:I({"Client dead routine triggered. Shutting down tracking...",Player = self.PlayerName,Group = self.GroupName,Unit = self.UnitName}) end
+        self:UnHandleEvent( EVENTS.Hit )
+        self:UnHandleEvent( EVENTS.Kill )
+        self:UnHandleEvent( EVENTS.Score )
+        self:UnHandleEvent( EVENTS.Shot )
+        self:UnHandleEvent( EVENTS.ShootingStart )
+        self:UnHandleEvent( EVENTS.ShootingEnd )
+        self:UnHandleEvent( EVENTS.Land )
+        self:UnHandleEvent( EVENTS.Takeoff )
+        self:UnHandleEvent( EVENTS.RunwayTakeoff )
+        self:UnHandleEvent( EVENTS.RunwayTouch )
+        self:UnHandleEvent( EVENTS.Refueling )
+        self:UnHandleEvent( EVENTS.RefuelingStop )
+        self:UnHandleEvent( EVENTS.PlayerLeaveUnit )
+        self:UnHandleEvent( EVENTS.Crash )
+        self:UnHandleEvent( EVENTS.Dead )
+        self:UnHandleEvent( EVENTS.PilotDead )
+        self:UnHandleEvent( EVENTS.UnitLost )
+        self:UnHandleEvent( EVENTS.Ejection )
+        self:UnHandleEvent( EVENTS.HumanFailure )
+        self:UnHandleEvent( EVENTS.HumanAircraftRepairFinish )
+        self:UnHandleEvent( EVENTS.HumanAircraftRepairStart )
+        self:UnHandleEvent( EVENTS.EngineShutdown )
+        self:UnHandleEvent( EVENTS.EngineStartup )
+        self:UnHandleEvent( EVENTS.WeaponAdd )
+        self:UnHandleEvent( EVENTS.WeaponDrop )
+        self:UnHandleEvent( EVENTS.WeaponRearm )
+        self.FallbackTimer:Stop()
+        self:Despawn()
+    end
+    
+    self:I({"Detected client spawn and applied internal functions and events.", PlayerName = self.PlayerName, UnitName = self.UnitName, GroupName = self.GroupName})
+    return self
+end

Moose Development/Moose/Functional/Detection.lua

@@ -595,7 +595,8 @@ do -- DETECTION_BASE
 
       return self
     end
-
+    
+    ---
     -- @param #DETECTION_BASE self
     -- @param #string From The From State string.
     -- @param #string Event The Event string.
@@ -604,7 +605,7 @@ do -- DETECTION_BASE
     -- @param #number DetectionTimeStamp Time stamp of detection event.
     function DETECTION_BASE:onafterDetection( From, Event, To, Detection, DetectionTimeStamp )
 
-      self:I( { DetectedObjects = self.DetectedObjects } )
+      self:T( { DetectedObjects = self.DetectedObjects } )
 
       self.DetectionRun = self.DetectionRun + 1
 
@@ -612,10 +613,10 @@ do -- DETECTION_BASE
 
       if Detection and Detection:IsAlive() then
 
-        self:I( { "DetectionGroup is Alive", Detection:GetName() } )
+        self:T( { "DetectionGroup is Alive", Detection:GetName() } )
 
         local DetectionGroupName = Detection:GetName()
-        local DetectionUnit = Detection:GetUnit( 1 )
+        local DetectionUnit = Detection:GetFirstUnitAlive()
 
         local DetectedUnits = {}
 
@@ -628,24 +629,24 @@ do -- DETECTION_BASE
           self.DetectDLINK
         )
 
-        --self:I( { DetectedTargets = DetectedTargets } )
+        --self:T( { DetectedTargets = DetectedTargets } )
-        --self:I(UTILS.PrintTableToLog(DetectedTargets))
+        --self:T(UTILS.PrintTableToLog(DetectedTargets))
         
         
-        for DetectionObjectID, Detection in pairs( DetectedTargets ) do
+        for DetectionObjectID, Detection in pairs( DetectedTargets or {}) do
           local DetectedObject = Detection.object -- DCS#Object
 
           if DetectedObject and DetectedObject:isExist() and DetectedObject.id_ < 50000000 then -- and ( DetectedObject:getCategory() == Object.Category.UNIT or DetectedObject:getCategory() == Object.Category.STATIC ) then
             local DetectedObjectName = DetectedObject:getName()
             if not self.DetectedObjects[DetectedObjectName] then
               self.DetectedObjects[DetectedObjectName] = self.DetectedObjects[DetectedObjectName] or {}
-              self.DetectedObjects[DetectedObjectName].Name = DetectedObjectName
+              self.DetectedObjects[DetectedObjectName].Name = DetectedObjectName 
               self.DetectedObjects[DetectedObjectName].Object = DetectedObject
             end
           end
         end
 
-        for DetectionObjectName, DetectedObjectData in pairs( self.DetectedObjects ) do
+        for DetectionObjectName, DetectedObjectData in pairs( self.DetectedObjects or {}) do
 
           local DetectedObject = DetectedObjectData.Object
 

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,7 @@ FOX = {
   explosiondist  =   200,
   explosiondist2 =   500,
   bigmissilemass =    50,
-  destroy        =   nil,
+  --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 2024
+-- Last Update: July 2024
 
 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -59,6 +59,7 @@
 -- @field #number ShoradTime Timer in seconds, how long #SHORAD will be active after a detection inside of the defense range
 -- @field #number ShoradActDistance Distance of an attacker in meters from a Mantis SAM site, on which Shorad will be switched on. Useful to not give away Shorad sites too early. Default 15km. Should be smaller than checkradius.
 -- @field #boolean checkforfriendlies If true, do not activate a SAM installation if a friendly aircraft is in firing range.
+-- @field #table FilterZones Table of Core.Zone#ZONE Zones Consider SAM groups in this zone(s) only for this MANTIS instance, must be handed as #table of Zone objects.
 -- @extends Core.Base#BASE
 
 
@@ -239,7 +240,7 @@
 --
 --  Use this option if you want to make use of or allow advanced SEAD tactics.
 --
--- # 5. Integrate SHORAD [classic mode]
+-- # 5. Integrate SHORAD [classic mode, not necessary in automode]
 --
 --  You can also choose to integrate Mantis with @{Functional.Shorad#SHORAD} for protection against HARMs and AGMs. When SHORAD detects a missile fired at one of MANTIS' SAM sites, it will activate SHORAD systems in
 --  the given defense checkradius around that SAM site. Create a SHORAD object first, then integrate with MANTIS like so:

Moose Development/Moose/Functional/RAT.lua

@@ -1,4 +1,4 @@
---- **Functional** - Create random airtraffic in your missions.
+--- **Functional** - Create random air traffic in your missions.
 --
 -- ===
 --
@@ -179,8 +179,8 @@
 -- * Climb rate is set to a moderate value of ~1500 ft/min.
 -- * The standard descent rate follows the 3:1 rule, i.e. 1000 ft decent per 3 miles of travel. Hence, angle of descent is ~3.6 degrees.
 -- * A holding point is randomly selected at a distance between 5 and 10 km away from destination airport.
--- * The altitude of theholding point is ~1200 m AGL. Holding patterns might or might not happen with variable duration.
+-- * The altitude of the holding point is ~1200 m AGL. Holding patterns might or might not happen with variable duration.
--- * If an aircraft is spawned in air, the procedure omitts taxi and take-off and starts with the climb/cruising part.
+-- * If an aircraft is spawned in air, the procedure omits taxi and take-off and starts with the climb/cruising part.
 -- * All values are randomized for each spawned aircraft.
 --
 -- ## Mission Editor Setup
@@ -196,13 +196,13 @@
 -- Voilà, your already done!
 --
 -- Optionally, you can set a specific livery for the aircraft or give it some weapons.
--- However, the aircraft will by default not engage any enemies. Think of them as beeing on a peaceful or ferry mission.
+-- However, the aircraft will by default not engage any enemies. Think of them as being on a peaceful or ferry mission.
 --
 -- ## Basic Lua Script
 --
 -- ![Process](..\Presentations\RAT\RAT_Basic_Lua_Script.png)
 --
--- The basic Lua script for one template group consits of two simple lines as shown in the picture above.
+-- The basic Lua script for one template group consists of two simple lines as shown in the picture above.
 --
 -- * **Line 2** creates a new RAT object "yak". The only required parameter for the constructor @{#RAT.New}() is the name of the group as defined in the mission editor. In this example it is "RAT_YAK".
 -- * **Line 5** trigger the command to spawn the aircraft. The (optional) parameter for the @{#RAT.Spawn}() function is the number of aircraft to be spawned of this object.
@@ -216,9 +216,9 @@
 -- ## Parking Problems
 --
 -- One big issue in DCS is that not all aircraft can be spawned on every airport or airbase. In particular, bigger aircraft might not have a valid parking spot at smaller airports and
--- airstripes. This can lead to multiple problems in DCS.
+-- airstrips. This can lead to multiple problems in DCS.
 --
--- * Landing: When an aircraft tries to land at an airport where it does not have a valid parking spot, it is immidiately despawned the moment its wheels touch the runway, i.e.
+-- * Landing: When an aircraft tries to land at an airport where it does not have a valid parking spot, it is immediately despawned the moment its wheels touch the runway, i.e.
 -- when a landing event is triggered. This leads to the loss of the RAT aircraft. On possible way to circumvent the this problem is to let another RAT aircraft spawn at landing
 -- and not when it shuts down its engines. See the @{#RAT.RespawnAfterLanding}() function.
 -- * Spawning: When a big aircraft is dynamically spawned on a small airbase a few things can go wrong. For example, it could be spawned at a parking spot with a shelter.
@@ -246,9 +246,9 @@
 --      c17:Spawn(5)
 --
 -- This would randomly spawn five C-17s but only on airports which have big open air parking spots. Note that also only destination airports are allowed
--- which do have this type of parking spot. This should ensure that the aircraft is able to land at the destination without beeing despawned immidiately.
+-- which do have this type of parking spot. This should ensure that the aircraft is able to land at the destination without being despawned immediately.
 --
--- Also, the aircraft are spawned only on the requested parking spot types and not on any other type. If no parking spot of this type is availabe at the
+-- Also, the aircraft are spawned only on the requested parking spot types and not on any other type. If no parking spot of this type is available at the
 -- moment of spawning, the group is automatically spawned in air above the selected airport.
 --
 -- ## Examples
@@ -274,7 +274,7 @@
 --
 -- It is also possible to make aircraft "commute" between two airports, i.e. flying from airport A to B and then back from B to A, etc.
 -- This can be done by the @{#RAT.Commute}() function. Note that if no departure or destination airports are specified, the first departure and destination are chosen randomly.
--- Then the aircraft will fly back and forth between those two airports indefinetly.
+-- Then the aircraft will fly back and forth between those two airports indefinitely.
 --
 --
 -- ### Spawn in Air
@@ -302,7 +302,7 @@
 -- *  @{#RAT.SetTakeoff}("cold"), which means that all aircraft are spawned with their engines off,
 -- *  @{#RAT.SetTakeoff}("hot"), which means that all aircraft are spawned with their engines on,
 -- *  @{#RAT.SetTakeoff}("runway"), which means that all aircraft are spawned already at the runway ready to takeoff.
--- Note that in this case the default spawn intervall is set to 180 seconds in order to avoid aircraft jamms on the runway. Generally, this takeoff at runways should be used with care and problems are to be expected.
+-- Note that in this case the default spawn intervall is set to 180 seconds in order to avoid aircraft jams on the runway. Generally, this takeoff at runways should be used with care and problems are to be expected.
 --
 --
 -- The options @{#RAT.SetMinDistance}() and @{#RAT.SetMaxDistance}() can be used to restrict the range from departure to destination. For example
@@ -325,7 +325,7 @@
 --
 -- * @{#RAT.SetFLcruise}(300) will cause most planes fly around FL300.
 -- * @{#RAT.SetFLmin}(100) restricts the cruising alt such that no plane will fly below FL100. Note that this automatically changes the minimum distance from departure to destination.
--- That means that only destinations are possible for which the aircraft has had enought time to reach that flight level and descent again.
+-- That means that only destinations are possible for which the aircraft has had enough time to reach that flight level and descent again.
 -- * @{#RAT.SetFLmax}(200) will restrict the cruise alt to maximum FL200, i.e. no aircraft will travel above this height.
 --
 --
@@ -762,10 +762,10 @@ function RAT:Spawn(naircraft)
     -- Set the coalition table based on choice of self.coalition and self.friendly.
   self:_SetCoalitionTable()
 
-  -- Get all airports of this map beloning to friendly coalition(s).
+  -- Get all airports of this map belonging to friendly coalition(s).
   self:_GetAirportsOfCoalition()
 
-  -- Set submenuname if it has not been set by user.
+  -- Set sub-menu name if it has not been set by user.
   if not self.SubMenuName then
     self.SubMenuName=self.alias
   end
@@ -1302,9 +1302,9 @@ end
 
 --- Set name of destination airports or zones for the AI aircraft.
 -- @param #RAT self
--- @param #string destinationnames Name of the destination airport or table of destination airports.
+-- @param #string destinationnames Name of the destination airport or #table of destination airports.
 -- @return #RAT RAT self object.
--- @usage RAT:SetDestination("Krymsk") makes all aircraft of this RAT oject fly to Krymsk airport.
+-- @usage RAT:SetDestination("Krymsk") makes all aircraft of this RAT object fly to Krymsk airport.
 function RAT:SetDestination(destinationnames)
   self:F2(destinationnames)
 
@@ -1564,7 +1564,7 @@ function RAT:NoRespawn()
   return self
 end
 
---- Number of tries to respawn an aircraft in case it has accitentally been spawned on runway.
+--- Number of tries to respawn an aircraft in case it has accidentally been spawned on runway.
 -- @param #RAT self
 -- @param #number n Number of retries. Default is 3.
 -- @return #RAT RAT self object.
@@ -1621,7 +1621,7 @@ function RAT:RespawnInAirNotAllowed()
   return self
 end
 
---- Check if aircraft have accidentally been spawned on the runway. If so they will be removed immediatly.
+--- Check if aircraft have accidentally been spawned on the runway. If so they will be removed immediately.
 -- @param #RAT self
 -- @param #boolean switch If true, check is performed. If false, this check is omitted.
 -- @param #number radius Distance in meters until a unit is considered to have spawned accidentally on the runway. Default is 75 m.
@@ -2135,7 +2135,12 @@ function RAT:_InitAircraft(DCSgroup)
     self.aircraft.length=16
     self.aircraft.height=5
     self.aircraft.width=9
+  elseif DCStype == "Saab340" then      --   <- These lines added
+    self.aircraft.length=19.73          --   <- These lines added
+    self.aircraft.height=6.97           --   <- These lines added
+    self.aircraft.width=21.44           --   <- These lines added
   end
+
   self.aircraft.box=math.max(self.aircraft.length,self.aircraft.width)
 
   -- info message

Moose Development/Moose/Functional/Range.lua

@@ -106,6 +106,7 @@
 -- @field Sound.SRS#MSRS instructmsrs SRS wrapper for range instructor.
 -- @field Sound.SRS#MSRSQUEUE instructsrsQ SRS queue for range instructor.
 -- @field #number Coalition Coalition side for the menu, if any.
+-- @field Core.Menu#MENU_MISSION menuF10root Specific user defined root F10 menu.
 -- @extends Core.Fsm#FSM
 
 --- *Don't only practice your art, but force your way into its secrets; art deserves that, for it and knowledge can raise man to the Divine.* - Ludwig van Beethoven
@@ -593,13 +594,14 @@ RANGE.MenuF10Root = nil
 
 --- Range script version.
 -- @field #string version
-RANGE.version = "2.7.3"
+RANGE.version = "2.8.0"
 
 -- TODO list:
 -- TODO: Verbosity level for messages.
 -- TODO: Add option for default settings such as smoke off.
 -- TODO: Add custom weapons, which can be specified by the user.
 -- TODO: Check if units are still alive.
+-- TODO: Option for custom sound files.
 -- DONE: Scenery as targets.
 -- DONE: Add statics for strafe pits.
 -- DONE: Add missiles.
@@ -858,16 +860,16 @@ function RANGE:onafterStart()
     self.rangecontrol.schedonce = true
 
     -- Init numbers.
-    self.rangecontrol:SetDigit( 0, RANGE.Sound.RC0.filename, RANGE.Sound.RC0.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 0, self.Sound.RC0.filename, self.Sound.RC0.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 1, RANGE.Sound.RC1.filename, RANGE.Sound.RC1.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 1, self.Sound.RC1.filename, self.Sound.RC1.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 2, RANGE.Sound.RC2.filename, RANGE.Sound.RC2.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 2, self.Sound.RC2.filename, self.Sound.RC2.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 3, RANGE.Sound.RC3.filename, RANGE.Sound.RC3.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 3, self.Sound.RC3.filename, self.Sound.RC3.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 4, RANGE.Sound.RC4.filename, RANGE.Sound.RC4.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 4, self.Sound.RC4.filename, self.Sound.RC4.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 5, RANGE.Sound.RC5.filename, RANGE.Sound.RC5.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 5, self.Sound.RC5.filename, self.Sound.RC5.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 6, RANGE.Sound.RC6.filename, RANGE.Sound.RC6.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 6, self.Sound.RC6.filename, self.Sound.RC6.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 7, RANGE.Sound.RC7.filename, RANGE.Sound.RC7.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 7, self.Sound.RC7.filename, self.Sound.RC7.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 8, RANGE.Sound.RC8.filename, RANGE.Sound.RC8.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 8, self.Sound.RC8.filename, self.Sound.RC8.duration, self.soundpath )
-    self.rangecontrol:SetDigit( 9, RANGE.Sound.RC9.filename, RANGE.Sound.RC9.duration, self.soundpath )
+    self.rangecontrol:SetDigit( 9, self.Sound.RC9.filename, self.Sound.RC9.duration, self.soundpath )
 
     -- Set location where the messages are transmitted from.
     self.rangecontrol:SetSenderCoordinate( self.location )
@@ -884,16 +886,16 @@ function RANGE:onafterStart()
       self.instructor.schedonce = true
 
       -- Init numbers.
-      self.instructor:SetDigit( 0, RANGE.Sound.IR0.filename, RANGE.Sound.IR0.duration, self.soundpath )
+      self.instructor:SetDigit( 0, self.Sound.IR0.filename, self.Sound.IR0.duration, self.soundpath )
-      self.instructor:SetDigit( 1, RANGE.Sound.IR1.filename, RANGE.Sound.IR1.duration, self.soundpath )
+      self.instructor:SetDigit( 1, self.Sound.IR1.filename, self.Sound.IR1.duration, self.soundpath )
-      self.instructor:SetDigit( 2, RANGE.Sound.IR2.filename, RANGE.Sound.IR2.duration, self.soundpath )
+      self.instructor:SetDigit( 2, self.Sound.IR2.filename, self.Sound.IR2.duration, self.soundpath )
-      self.instructor:SetDigit( 3, RANGE.Sound.IR3.filename, RANGE.Sound.IR3.duration, self.soundpath )
+      self.instructor:SetDigit( 3, self.Sound.IR3.filename, self.Sound.IR3.duration, self.soundpath )
-      self.instructor:SetDigit( 4, RANGE.Sound.IR4.filename, RANGE.Sound.IR4.duration, self.soundpath )
+      self.instructor:SetDigit( 4, self.Sound.IR4.filename, self.Sound.IR4.duration, self.soundpath )
-      self.instructor:SetDigit( 5, RANGE.Sound.IR5.filename, RANGE.Sound.IR5.duration, self.soundpath )
+      self.instructor:SetDigit( 5, self.Sound.IR5.filename, self.Sound.IR5.duration, self.soundpath )
-      self.instructor:SetDigit( 6, RANGE.Sound.IR6.filename, RANGE.Sound.IR6.duration, self.soundpath )
+      self.instructor:SetDigit( 6, self.Sound.IR6.filename, self.Sound.IR6.duration, self.soundpath )
-      self.instructor:SetDigit( 7, RANGE.Sound.IR7.filename, RANGE.Sound.IR7.duration, self.soundpath )
+      self.instructor:SetDigit( 7, self.Sound.IR7.filename, self.Sound.IR7.duration, self.soundpath )
-      self.instructor:SetDigit( 8, RANGE.Sound.IR8.filename, RANGE.Sound.IR8.duration, self.soundpath )
+      self.instructor:SetDigit( 8, self.Sound.IR8.filename, self.Sound.IR8.duration, self.soundpath )
-      self.instructor:SetDigit( 9, RANGE.Sound.IR9.filename, RANGE.Sound.IR9.duration, self.soundpath )
+      self.instructor:SetDigit( 9, self.Sound.IR9.filename, self.Sound.IR9.duration, self.soundpath )
 
       -- Set location where the messages are transmitted from.
       self.instructor:SetSenderCoordinate( self.location )
@@ -920,13 +922,23 @@ function RANGE:onafterStart()
     self.rangezone:SmokeZone( SMOKECOLOR.White )
   end
 
-  self:__Status( -60 )
+  self:__Status( -10 )
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- User Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+--- Set the root F10 menu under which the range F10 menu is created.
+-- @param #RANGE self
+-- @param Core.Menu#MENU_MISSION menu The root F10 menu.
+-- @return #RANGE self
+function RANGE:SetMenuRoot(menu)
+  self.menuF10root=menu
+  return self
+end
+
+
 --- Set maximal strafing altitude. Player entering a strafe pit above that altitude are not registered for a valid pass.
 -- @param #RANGE self
 -- @param #number maxalt Maximum altitude in meters AGL. Default is 914 m = 3000 ft.
@@ -1066,6 +1078,9 @@ end
 -- @param Core.Zone#ZONE zone MOOSE zone defining the range perimeters.
 -- @return #RANGE self
 function RANGE:SetRangeZone( zone )
+  if zone and type(zone)=="string" then
+    zone=ZONE:FindByName(zone)
+  end
   self.rangezone = zone
   return self
 end
@@ -1224,10 +1239,12 @@ function RANGE:SetSRS(PathToSRS, Port, Coalition, Frequency, Modulation, Volume,
     self.instructmsrs:SetLabel("RANGEI")
     self.instructmsrs:SetVolume(Volume or 1.0)
     self.instructsrsQ = MSRSQUEUE:New("INSTRUCT")
-
+    
-    if PathToGoogleKey then
+    if PathToGoogleKey then 
-      self.controlmsrs:SetGoogle(PathToGoogleKey)
+      self.controlmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-      self.instructmsrs:SetGoogle(PathToGoogleKey)
+      self.controlmsrs:SetProvider(MSRS.Provider.GOOGLE)
+      self.instructmsrs:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
+      self.instructmsrs:SetProvider(MSRS.Provider.GOOGLE)
     end
 
   else
@@ -1323,10 +1340,57 @@ end
 -- @return #RANGE self
 function RANGE:SetSoundfilesPath( path )
   self.soundpath = tostring( path or "Range Soundfiles/" )
-  self:I( self.lid .. string.format( "Setting sound files path to %s", self.soundpath ) )
+  self:T2( self.lid .. string.format( "Setting sound files path to %s", self.soundpath ) )
   return self
 end
 
+--- Set the path to the csv file that contains information about the used sound files.
+-- The parameter file has to be located on your local disk (**not** inside the miz file).
+-- @param #RANGE self
+-- @param #string csvfile Full path to the csv file on your local disk.
+-- @return #RANGE self
+function RANGE:SetSoundfilesInfo( csvfile )
+
+  --- Local function to return the ATIS.Soundfile for a given file name
+  local function getSound(filename)
+    for key,_soundfile in pairs(self.Sound) do
+      local soundfile=_soundfile --#RANGE.Soundfile
+      if filename==soundfile.filename then
+        return soundfile
+      end
+    end
+    return nil
+  end
+
+  -- Read csv file
+  local data=UTILS.ReadCSV(csvfile)
+
+  if data then
+
+    for i,sound in pairs(data) do
+
+      -- Get the ATIS.Soundfile
+      local soundfile=getSound(sound.filename..".ogg") --#RANGE.Soundfile
+
+      if soundfile then
+
+        -- Set duration
+        soundfile.duration=tonumber(sound.duration)
+
+      else
+        self:E(string.format("ERROR: Could not get info for sound file %s", sound.filename))
+      end
+
+    end
+  else
+    self:E(string.format("ERROR: Could not read sound csv file!"))
+  end
+
+
+  return self
+end
+
+
 --- Add new strafe pit. For a strafe pit, hits from guns are counted. One pit can consist of several units.
 -- A strafe run approach is only valid if the player enters via a zone in front of the pit, which is defined by boxlength, boxwidth, and heading.
 -- Furthermore, the player must not be too high and fly in the direction of the pit to make a valid target apporoach.
@@ -1572,9 +1636,9 @@ function RANGE:AddBombingTargetUnit( unit, goodhitrange, randommove )
 
   -- Debug or error output.
   if _isstatic == true then
-    self:I( self.lid .. string.format( "Adding STATIC bombing target %s with good hit range %d. Random move = %s.", name, goodhitrange, tostring( randommove ) ) )
+    self:T( self.lid .. string.format( "Adding STATIC bombing target %s with good hit range %d. Random move = %s.", name, goodhitrange, tostring( randommove ) ) )
   elseif _isstatic == false then
-    self:I( self.lid .. string.format( "Adding UNIT bombing target %s with good hit range %d. Random move = %s.", name, goodhitrange, tostring( randommove ) ) )
+    self:T( self.lid .. string.format( "Adding UNIT bombing target %s with good hit range %d. Random move = %s.", name, goodhitrange, tostring( randommove ) ) )
   else
     self:E( self.lid .. string.format( "ERROR! No bombing target with name %s could be found. Carefully check all UNIT and STATIC names defined in the mission editor!", name ) )
   end
@@ -1642,7 +1706,7 @@ function RANGE:AddBombingTargetScenery( scenery, goodhitrange)
 
   -- Debug or error output.
   if name then
-    self:I( self.lid .. string.format( "Adding SCENERY bombing target %s with good hit range %d", name, goodhitrange) )
+    self:T( self.lid .. string.format( "Adding SCENERY bombing target %s with good hit range %d", name, goodhitrange) )
   else
     self:E( self.lid .. string.format( "ERROR! No bombing target with name %s could be found!", name ) )
   end
@@ -1665,12 +1729,16 @@ end
 
 --- Add all units of a group as bombing targets.
 -- @param #RANGE self
--- @param Wrapper.Group#GROUP group Group of bombing targets.
+-- @param Wrapper.Group#GROUP group Group of bombing targets. Can also be given as group name.
 -- @param #number goodhitrange Max distance from unit which is considered as a good hit.
 -- @param #boolean randommove If true, unit will move randomly within the range. Default is false.
 -- @return #RANGE self
 function RANGE:AddBombingTargetGroup( group, goodhitrange, randommove )
   self:F( { group = group, goodhitrange = goodhitrange, randommove = randommove } )
+  
+  if group and type(group)=="string" then
+    group=GROUP:FindByName(group)
+  end
 
   if group then
 
@@ -1743,7 +1811,7 @@ function RANGE:OnEventBirth( EventData )
   if not EventData.IniPlayerName then return end
 
   local _unitName = EventData.IniUnitName
-  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName )
+  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName, EventData.IniPlayerName )
 
   self:T3( self.lid .. "BIRTH: unit   = " .. tostring( EventData.IniUnitName ) )
   self:T3( self.lid .. "BIRTH: group  = " .. tostring( EventData.IniGroupName ) )
@@ -1899,7 +1967,9 @@ end
 -- @param #number attackAlt Attack altitude.
 -- @param #number attackVel Attack velocity.
 function RANGE._OnImpact(weapon, self, playerData, attackHdg, attackAlt, attackVel)
-
+  
+  if not playerData then return end
+  
   -- Get closet target to last position.
   local _closetTarget = nil -- #RANGE.BombTarget
   local _distance = nil
@@ -1916,13 +1986,13 @@ function RANGE._OnImpact(weapon, self, playerData, attackHdg, attackAlt, attackV
   -- Coordinate of impact point.
   local impactcoord = weapon:GetImpactCoordinate()
 
-  -- Check if impact happened in range zone.
+  -- Check if impact happened in range zone.+
   local insidezone = self.rangezone:IsCoordinateInZone( impactcoord )
 
 
   -- Smoke impact point of bomb.
-  if playerData.smokebombimpact and insidezone then
+  if playerData and playerData.smokebombimpact and insidezone then
-    if playerData.delaysmoke then
+    if playerData and playerData.delaysmoke then
       timer.scheduleFunction( self._DelayedSmoke, { coord = impactcoord, color = playerData.smokecolor }, timer.getTime() + self.TdelaySmoke )
     else
       impactcoord:Smoke( playerData.smokecolor )
@@ -2016,7 +2086,7 @@ function RANGE._OnImpact(weapon, self, playerData, attackHdg, attackAlt, attackV
       if self.useSRS then
         self.controlsrsQ:NewTransmission(_message,nil,self.controlmsrs,nil,1)
       else
-        self.rangecontrol:NewTransmission( RANGE.Sound.RCWeaponImpactedTooFar.filename, RANGE.Sound.RCWeaponImpactedTooFar.duration, self.soundpath, nil, nil, _message, self.subduration )
+        self.rangecontrol:NewTransmission( self.Sound.RCWeaponImpactedTooFar.filename, self.Sound.RCWeaponImpactedTooFar.duration, self.soundpath, nil, nil, _message, self.subduration )
       end
     end
 
@@ -2047,7 +2117,7 @@ function RANGE:OnEventShot( EventData )
   local _unitName = EventData.IniUnitName
 
   -- Get player unit and name.
-  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName )
+  local _unit, _playername = self:_GetPlayerUnitAndName( _unitName, EventData.IniPlayerName )
 
   -- Distance Player-to-Range. Set this to larger value than the threshold.
   local dPR = self.BombtrackThreshold * 2
@@ -2059,11 +2129,13 @@ function RANGE:OnEventShot( EventData )
   end
 
   -- Only track if distance player to range is < 25 km. Also check that a player shot. No need to track AI weapons.
-  if _track and dPR <= self.BombtrackThreshold and _unit and _playername then
+  if _track and dPR <= self.BombtrackThreshold and _unit and _playername and self.PlayerSettings[_playername] then
 
     -- Player data.
     local playerData = self.PlayerSettings[_playername] -- #RANGE.PlayerData
-
+    
+    if not playerData then return end
+    
     -- Attack parameters.
     local attackHdg=_unit:GetHeading()
     local attackAlt=_unit:GetHeight()
@@ -2124,7 +2196,7 @@ function RANGE:onafterStatus( From, Event, To )
     end
 
     -- Check range status.
-    self:I( self.lid .. text )
+    self:T( self.lid .. text )
 
   end
 
@@ -2163,15 +2235,15 @@ function RANGE:onafterEnterRange( From, Event, To, player )
       -- Radio message that player entered the range
 
       -- You entered the bombing range. For hit assessment, contact the range controller at xy MHz
-      self.instructor:NewTransmission( RANGE.Sound.IREnterRange.filename, RANGE.Sound.IREnterRange.duration, self.soundpath )
+      self.instructor:NewTransmission( self.Sound.IREnterRange.filename, self.Sound.IREnterRange.duration, self.soundpath )
       self.instructor:Number2Transmission( RF[1] )
 
       if tonumber( RF[2] ) > 0 then
-        self.instructor:NewTransmission( RANGE.Sound.IRDecimal.filename, RANGE.Sound.IRDecimal.duration, self.soundpath )
+        self.instructor:NewTransmission( self.Sound.IRDecimal.filename, self.Sound.IRDecimal.duration, self.soundpath )
         self.instructor:Number2Transmission( RF[2] )
       end
 
-      self.instructor:NewTransmission( RANGE.Sound.IRMegaHertz.filename, RANGE.Sound.IRMegaHertz.duration, self.soundpath )
+      self.instructor:NewTransmission( self.Sound.IRMegaHertz.filename, self.Sound.IRMegaHertz.duration, self.soundpath )
     end
   end
 
@@ -2207,7 +2279,7 @@ function RANGE:onafterExitRange( From, Event, To, player )
 
       self.instructsrsQ:NewTransmission(text, nil, self.instructmsrs, nil, 1, {player.client:GetGroup()}, text, 10)
     else
-      self.instructor:NewTransmission( RANGE.Sound.IRExitRange.filename, RANGE.Sound.IRExitRange.duration, self.soundpath )
+      self.instructor:NewTransmission( self.Sound.IRExitRange.filename, self.Sound.IRExitRange.duration, self.soundpath )
     end
   end
 
@@ -2243,20 +2315,20 @@ function RANGE:onafterImpact( From, Event, To, result, player )
       local group = player.client:GetGroup()
       self.controlsrsQ:NewTransmission(text,nil,self.controlmsrs,nil,1,{group},text,10)
     else
-      self.rangecontrol:NewTransmission( RANGE.Sound.RCImpact.filename, RANGE.Sound.RCImpact.duration, self.soundpath, nil, nil, text, self.subduration )
+      self.rangecontrol:NewTransmission( self.Sound.RCImpact.filename, self.Sound.RCImpact.duration, self.soundpath, nil, nil, text, self.subduration )
       self.rangecontrol:Number2Transmission( string.format( "%03d", result.radial ), nil, 0.1 )
-      self.rangecontrol:NewTransmission( RANGE.Sound.RCDegrees.filename, RANGE.Sound.RCDegrees.duration, self.soundpath )
+      self.rangecontrol:NewTransmission( self.Sound.RCDegrees.filename, self.Sound.RCDegrees.duration, self.soundpath )
-      self.rangecontrol:NewTransmission( RANGE.Sound.RCFor.filename, RANGE.Sound.RCFor.duration, self.soundpath )
+      self.rangecontrol:NewTransmission( self.Sound.RCFor.filename, self.Sound.RCFor.duration, self.soundpath )
       self.rangecontrol:Number2Transmission( string.format( "%d", UTILS.MetersToFeet( result.distance ) ) )
-      self.rangecontrol:NewTransmission( RANGE.Sound.RCFeet.filename, RANGE.Sound.RCFeet.duration, self.soundpath )
+      self.rangecontrol:NewTransmission( self.Sound.RCFeet.filename, self.Sound.RCFeet.duration, self.soundpath )
       if result.quality == "POOR" then
-        self.rangecontrol:NewTransmission( RANGE.Sound.RCPoorHit.filename, RANGE.Sound.RCPoorHit.duration, self.soundpath, nil, 0.5 )
+        self.rangecontrol:NewTransmission( self.Sound.RCPoorHit.filename, self.Sound.RCPoorHit.duration, self.soundpath, nil, 0.5 )
       elseif result.quality == "INEFFECTIVE" then
-        self.rangecontrol:NewTransmission( RANGE.Sound.RCIneffectiveHit.filename, RANGE.Sound.RCIneffectiveHit.duration, self.soundpath, nil, 0.5 )
+        self.rangecontrol:NewTransmission( self.Sound.RCIneffectiveHit.filename, self.Sound.RCIneffectiveHit.duration, self.soundpath, nil, 0.5 )
       elseif result.quality == "GOOD" then
-        self.rangecontrol:NewTransmission( RANGE.Sound.RCGoodHit.filename, RANGE.Sound.RCGoodHit.duration, self.soundpath, nil, 0.5 )
+        self.rangecontrol:NewTransmission( self.Sound.RCGoodHit.filename, self.Sound.RCGoodHit.duration, self.soundpath, nil, 0.5 )
       elseif result.quality == "EXCELLENT" then
-        self.rangecontrol:NewTransmission( RANGE.Sound.RCExcellentHit.filename, RANGE.Sound.RCExcellentHit.duration, self.soundpath, nil, 0.5 )
+        self.rangecontrol:NewTransmission( self.Sound.RCExcellentHit.filename, self.Sound.RCExcellentHit.duration, self.soundpath, nil, 0.5 )
       end
     end
   end
@@ -2325,14 +2397,14 @@ function RANGE:onafterSave( From, Event, To )
     if f then
       f:write( data )
       f:close()
-      self:I( self.lid .. string.format( "Saving player results to file %s", tostring( filename ) ) )
+      self:T( self.lid .. string.format( "Saving player results to file %s", tostring( filename ) ) )
     else
       self:E( self.lid .. string.format( "ERROR: Could not save results to file %s", tostring( filename ) ) )
     end
   end
 
   -- Path.
-  local path = lfs.writedir() .. [[Logs\]]
+  local path = self.targetpath or lfs.writedir() .. [[Logs\]]
 
   -- Set file name.
   local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename )
@@ -2397,14 +2469,14 @@ function RANGE:onafterLoad( From, Event, To )
   end
 
   -- Path in DCS log file.
-  local path = lfs.writedir() .. [[Logs\]]
+  local path = self.targetpath or lfs.writedir() .. [[Logs\]]
 
   -- Set file name.
   local filename = path .. string.format( "RANGE-%s_BombingResults.csv", self.rangename )
 
   -- Info message.
   local text = string.format( "Loading player bomb results from file %s", filename )
-  self:I( self.lid .. text )
+  self:T( self.lid .. text )
 
   -- Load asset data from file.
   local data = _loadfile( filename )
@@ -2777,7 +2849,7 @@ function RANGE:_DisplayRangeInfo( _unitname )
 
   -- Check if we have a player.
   if unit and playername then
-    self:I(playername)
+    --self:I(playername)
     -- Message text.
     local text = ""
 
@@ -3152,7 +3224,7 @@ function RANGE:_CheckInZone( _unitName )
               self.controlsrsQ:NewTransmission(text,nil,self.controlmsrs,nil,1)
             else
               -- You left the strafing zone too quickly! No score!
-              self.rangecontrol:NewTransmission( RANGE.Sound.RCLeftStrafePitTooQuickly.filename, RANGE.Sound.RCLeftStrafePitTooQuickly.duration, self.soundpath )
+              self.rangecontrol:NewTransmission( self.Sound.RCLeftStrafePitTooQuickly.filename, self.Sound.RCLeftStrafePitTooQuickly.duration, self.soundpath )
             end
           end
         else
@@ -3179,23 +3251,23 @@ function RANGE:_CheckInZone( _unitName )
           local resulttext=""
           if _result.pastfoulline == true then --
             resulttext = "* INVALID - PASSED FOUL LINE *"
-            _sound = RANGE.Sound.RCPoorPass --
+            _sound = self.Sound.RCPoorPass --
           else
             if accur >= 90 then
               resulttext = "DEADEYE PASS"
-              _sound = RANGE.Sound.RCExcellentPass
+              _sound = self.Sound.RCExcellentPass
             elseif accur >= 75 then
               resulttext = "EXCELLENT PASS"
-              _sound = RANGE.Sound.RCExcellentPass
+              _sound = self.Sound.RCExcellentPass
             elseif accur >= 50 then
               resulttext = "GOOD PASS"
-              _sound = RANGE.Sound.RCGoodPass
+              _sound = self.Sound.RCGoodPass
             elseif accur >= 25 then
               resulttext = "INEFFECTIVE PASS"
-              _sound = RANGE.Sound.RCIneffectivePass
+              _sound = self.Sound.RCIneffectivePass
             else
               resulttext = "POOR PASS"
-              _sound = RANGE.Sound.RCPoorPass
+              _sound = self.Sound.RCPoorPass
             end
           end
 
@@ -3242,14 +3314,14 @@ function RANGE:_CheckInZone( _unitName )
             if self.useSRS then
               self.controlsrsQ:NewTransmission(ttstext,nil,self.controlmsrs,nil,1)
             else
-              self.rangecontrol:NewTransmission( RANGE.Sound.RCHitsOnTarget.filename, RANGE.Sound.RCHitsOnTarget.duration, self.soundpath )
+              self.rangecontrol:NewTransmission( self.Sound.RCHitsOnTarget.filename, self.Sound.RCHitsOnTarget.duration, self.soundpath )
               self.rangecontrol:Number2Transmission( string.format( "%d", _result.hits ) )
               if shots and accur then
-                self.rangecontrol:NewTransmission( RANGE.Sound.RCTotalRoundsFired.filename, RANGE.Sound.RCTotalRoundsFired.duration, self.soundpath, nil, 0.2 )
+                self.rangecontrol:NewTransmission( self.Sound.RCTotalRoundsFired.filename, self.Sound.RCTotalRoundsFired.duration, self.soundpath, nil, 0.2 )
                 self.rangecontrol:Number2Transmission( string.format( "%d", shots ), nil, 0.2 )
-                self.rangecontrol:NewTransmission( RANGE.Sound.RCAccuracy.filename, RANGE.Sound.RCAccuracy.duration, self.soundpath, nil, 0.2 )
+                self.rangecontrol:NewTransmission( self.Sound.RCAccuracy.filename, self.Sound.RCAccuracy.duration, self.soundpath, nil, 0.2 )
                 self.rangecontrol:Number2Transmission( string.format( "%d", UTILS.Round( accur, 0 ) ) )
-                self.rangecontrol:NewTransmission( RANGE.Sound.RCPercent.filename, RANGE.Sound.RCPercent.duration, self.soundpath )
+                self.rangecontrol:NewTransmission( self.Sound.RCPercent.filename, self.Sound.RCPercent.duration, self.soundpath )
               end
               self.rangecontrol:NewTransmission( _sound.filename, _sound.duration, self.soundpath, nil, 0.5 )
             end
@@ -3294,7 +3366,7 @@ function RANGE:_CheckInZone( _unitName )
             if self.useSRS then
               self.controlsrsQ:NewTransmission(_msg,nil,self.controlmsrs,nil,1)
             else
-              self.rangecontrol:NewTransmission( RANGE.Sound.RCRollingInOnStrafeTarget.filename, RANGE.Sound.RCRollingInOnStrafeTarget.duration, self.soundpath )
+              self.rangecontrol:NewTransmission( self.Sound.RCRollingInOnStrafeTarget.filename, self.Sound.RCRollingInOnStrafeTarget.duration, self.soundpath )
             end
           end
 
@@ -3343,16 +3415,23 @@ function RANGE:_AddF10Commands( _unitName )
         self.MenuAddedTo[_gid] = true
 
         -- Range root menu path.
-        local _rangePath = nil
+        local _rootMenu = nil
-
-        if RANGE.MenuF10Root then
 
+        if self.menuF10root then
+        
           -------------------
           -- MISSION LEVEL --
-          -------------------
+          -------------------        
+        
+          --_rootMenu = MENU_GROUP:New( group, self.rangename, self.menuF10root )
+          _rootMenu = self.menuF10root
+          self:T2(self.lid..string.format("Creating F10 menu for group %s", group:GetName()))
 
-          -- _rangePath = missionCommands.addSubMenuForGroup(_gid, self.rangename, RANGE.MenuF10Root)
+        elseif RANGE.MenuF10Root then
-          _rangePath = MENU_GROUP:New( group, "On the Range" )
+
+          -- Main F10 menu: F10/<RANGE.MenuF10Root>/<Range Name>
+          --_rootMenu = MENU_GROUP:New( group, self.rangename, RANGE.MenuF10Root )
+          _rootMenu = RANGE.MenuF10Root
 
         else
 
@@ -3362,12 +3441,17 @@ function RANGE:_AddF10Commands( _unitName )
 
           -- Main F10 menu: F10/On the Range/<Range Name>/
           if RANGE.MenuF10[_gid] == nil then
-            -- RANGE.MenuF10[_gid]=missionCommands.addSubMenuForGroup(_gid, "On the Range")
+            self:T2(self.lid..string.format("Creating F10 menu 'On the Range' for group %s", group:GetName()))
-            RANGE.MenuF10[_gid] = MENU_GROUP:New( group, "On the Range" )
+          else
+            self:T2(self.lid..string.format("F10 menu 'On the Range' already EXISTS for group %s", group:GetName()))
           end
-          -- _rangePath = missionCommands.addSubMenuForGroup(_gid, self.rangename, RANGE.MenuF10[_gid])
+          
-          _rangePath = MENU_GROUP:New( group, self.rangename, RANGE.MenuF10[_gid] )
+          _rootMenu=RANGE.MenuF10[_gid] or MENU_GROUP:New( group, "On the Range" )
+                    
         end
+        
+        -- Range menu
+        local _rangePath = MENU_GROUP:New( group, self.rangename, _rootMenu )
 
         local _statsPath = MENU_GROUP:New( group, "Statistics", _rangePath )
         local _markPath = MENU_GROUP:New( group, "Mark Targets", _rangePath )
@@ -3776,13 +3860,13 @@ function RANGE:_TargetsheetOnOff( _unitname )
 
         -- Inform player.
         if playerData and playerData.targeton == true then
-          text = string.format( "roger, your targetsheets are now SAVED." )
+          text = string.format( "Roger, your targetsheets are now SAVED." )
         else
-          text = string.format( "affirm, your targetsheets are NOT SAVED." )
+          text = string.format( "Affirm, your targetsheets are NOT SAVED." )
         end
 
       else
-        text = "negative, target sheet data recorder is broken on this range."
+        text = "Negative, target sheet data recorder is broken on this range."
       end
 
       -- Message to player.
@@ -4019,8 +4103,8 @@ end
 -- @return Wrapper.Unit#UNIT Unit of player.
 -- @return #string Name of the player.
 -- @return #boolean If true, group has > 1 player in it
-function RANGE:_GetPlayerUnitAndName( _unitName )
+function RANGE:_GetPlayerUnitAndName( _unitName, PlayerName )
-  self:F2( _unitName )
+  --self:I( _unitName )
 
   if _unitName ~= nil then
 
@@ -4029,9 +4113,9 @@ function RANGE:_GetPlayerUnitAndName( _unitName )
     -- Get DCS unit from its name.
     local DCSunit = Unit.getByName( _unitName )
 
-    if DCSunit then
+    if DCSunit and DCSunit.getPlayerName then
 
-      local playername = DCSunit:getPlayerName()
+      local playername = DCSunit:getPlayerName() or PlayerName or "None"
       local unit = UNIT:Find( DCSunit )
 
       self:T2( { DCSunit = DCSunit, unit = unit, playername = playername } )

Moose Development/Moose/Functional/Tiresias.lua

@@ -97,7 +97,7 @@
 TIRESIAS = {
   ClassName = "TIRESIAS",
   debug = false,
-  version = "0.0.4",
+  version = "0.0.5",
   Interval = 20,
   GroundSet = nil,
   VehicleSet = nil,
@@ -187,7 +187,7 @@ function TIRESIAS:SetAAARanges(FiringRange,SwitchAAA)
   return self
 end
 
---- [USER] Add a SET_GROUP of GROUP objects as exceptions. Can be done multiple times.
+--- [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
@@ -203,7 +203,7 @@ function TIRESIAS:AddExceptionSet(Set)
         }
        exceptions:AddGroup(grp,true)
       end
-      BASE:I("TIRESIAS: Added exception group: "..grp:GetName())
+      BASE:T("TIRESIAS: Added exception group: "..grp:GetName())
     end
   )  
   return self
@@ -391,6 +391,7 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
   if ground:CountAlive() > 0 then
     ground:ForEachGroupAlive(
       function(grp)
+        local name = grp:GetName()
         if grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
           if grp.Tiresias.invisible == true then
             grp:SetCommandInvisible(false)
@@ -407,7 +408,7 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
           end
           --BASE:I(string.format("TIRESIAS - Switch on %s %s (Exception %s)",tostring(grp.Tiresias.type),grp:GetName(),tostring(grp.Tiresias.exception)))
         else
-          BASE:E("TIRESIAS - This group has not been initialized or is an exception!")
+          BASE:T("TIRESIAS - This group "..tostring(name).. " has not been initialized or is an exception!")
         end
       end
     )

Moose Development/Moose/Functional/Warehouse.lua

@@ -6732,7 +6732,7 @@ end
 -- @param Wrapper.Group#GROUP deadgroup Group of unit that died.
 -- @param #WAREHOUSE.Pendingitem request Request that needs to be updated.
 function WAREHOUSE:_UnitDead(deadunit, deadgroup, request)
-  self:F(self.lid.."FF unit dead "..deadunit:GetName())
+  --self:F(self.lid.."FF unit dead "..deadunit:GetName())
 
   -- Find opsgroup.
   local opsgroup=_DATABASE:FindOpsGroup(deadgroup)
@@ -7946,10 +7946,12 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
       local clients=_DATABASE.CLIENTS
       for clientname, client in pairs(clients) do
         local template=_DATABASE:GetGroupTemplateFromUnitName(clientname)
-        local units=template.units
+        if template then
-        for i,unit in pairs(units) do
+          local units=template.units
-          local coord=COORDINATE:New(unit.x, unit.alt, unit.y)
+          for i,unit in pairs(units) do
-          coords[unit.name]=coord
+            local coord=COORDINATE:New(unit.x, unit.alt, unit.y)
+            coords[unit.name]=coord
+          end
         end
       end
     end

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

@@ -21,7 +21,7 @@
 
 do -- ZoneGoal
 
-  --- @type ZONE_GOAL_CARGO
+  -- @type ZONE_GOAL_CARGO
   -- @extends Functional.ZoneGoal#ZONE_GOAL
 
 
@@ -55,7 +55,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

@@ -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

@@ -2,7 +2,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' )
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
+--__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' )
 
@@ -49,6 +49,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Marker.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Weapon.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Net.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Storage.lua' )
+__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/DynamicCargo.lua' )
 
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/Cargo.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoUnit.lua' )
@@ -84,6 +85,7 @@ __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/Ops/Airboss.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )

Moose Development/Moose/Modules_local.lua

@@ -1,9 +1,7 @@
 __Moose.Include( 'Utilities\\Enums.lua' )
-__Moose.Include( 'Utilities\\Routines.lua' )
 __Moose.Include( 'Utilities\\Utils.lua' )
 __Moose.Include( 'Utilities\\Profiler.lua' )
-__Moose.Include( 'Utilities\\Templates.lua' )
+--__Moose.Include( 'Utilities\\STTS.lua' )
-__Moose.Include( 'Utilities\\STTS.lua' )
 __Moose.Include( 'Utilities\\FiFo.lua' )
 __Moose.Include( 'Utilities\\Socket.lua' )
 
@@ -17,11 +15,11 @@ __Moose.Include( 'Core\\Event.lua' )
 __Moose.Include( 'Core\\Settings.lua' )
 __Moose.Include( 'Core\\Menu.lua' )
 __Moose.Include( 'Core\\Zone.lua' )
-__Moose.Include( 'Core\\Zone_Detection.lua' )
+__Moose.Include( 'Core\\Velocity.lua' )
 __Moose.Include( 'Core\\Database.lua' )
 __Moose.Include( 'Core\\Set.lua' )
 __Moose.Include( 'Core\\Point.lua' )
-__Moose.Include( 'Core\\Velocity.lua' )
+__Moose.Include( 'Core\\Pathline.lua' )
 __Moose.Include( 'Core\\Message.lua' )
 __Moose.Include( 'Core\\Fsm.lua' )
 __Moose.Include( 'Core\\Spawn.lua' )
@@ -46,6 +44,10 @@ __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' )
@@ -77,6 +79,10 @@ __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' )
@@ -107,6 +113,9 @@ __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 Development/Moose/Ops/ATIS.lua

@@ -63,6 +63,8 @@
 -- @field #number power Radio power in Watts. Default 100 W.
 -- @field Sound.RadioQueue#RADIOQUEUE radioqueue Radio queue for broadcasing messages.
 -- @field #string soundpath Path to sound files.
+-- @field #string soundpathAirports Path to airport names sound files.
+-- @field #string soundpathNato Path to NATO alphabet sound files.
 -- @field #string relayunitname Name of the radio relay unit.
 -- @field #table towerfrequency Table with tower frequencies.
 -- @field #string activerunway The active runway specified by the user.
@@ -315,18 +317,18 @@
 --     atis:Start()
 --
 -- This uses a male voice with US accent. It requires SRS to be installed in the `D:\DCS\_SRS\` directory. Note that backslashes need to be escaped or simply use slashes (as in linux).
--- 
+--
--- ### SRS can use multiple frequencies: 
+-- ### SRS can use multiple frequencies:
--- 
+--
 --     atis=ATIS:New("Batumi", {305,103.85}, {radio.modulation.AM,radio.modulation.FM})
 --     atis:SetSRS("D:\\DCS\\_SRS\\", "male", "en-US")
 --     atis:Start()
--- 
+--
 -- ### SRS Localization
--- 
+--
 --  You can localize the SRS output, all you need is to provide a table of translations and set the `locale` of your instance. You need to provide the translations in your script **before you instantiate your ATIS**.
 --  The German localization (already provided in the code) e.g. looks like follows:
---  
+--
 --          ATIS.Messages.DE =
 --            {
 --              HOURS = "Uhr",
@@ -387,13 +389,13 @@
 --              FARP = "Farp",
 --              DELIMITER = "Komma", -- decimal delimiter
 --            }
--- 
+--
 -- Then set up your ATIS and set the locale:
---   
+--
 --          atis=ATIS:New("Batumi", 305, radio.modulation.AM)
 --          atis:SetSRS("D:\\DCS\\_SRS\\", "female", "de_DE")
 --          atis:SetLocale("de") -- available locales from source are "en", "de" and "es"
---          atis:Start()    
+--          atis:Start()
 --
 -- ## FARPS
 --
@@ -495,7 +497,7 @@ ATIS.Alphabet = {
 -- @field #number TheChannel -10° (West).
 -- @field #number Syria +5° (East).
 -- @field #number MarianaIslands +2° (East).
--- @field #number SinaiMao +5° (East).
+-- @field #number SinaiMap +5° (East).
 ATIS.RunwayM2T = {
   Caucasus = 0,
   Nevada = 12,
@@ -618,6 +620,8 @@ ATIS.ICAOPhraseology = {
 -- @field #ATIS.Soundfile VORFrequency
 ATIS.Sound = {
   ActiveRunway = { filename = "ActiveRunway.ogg", duration = 0.99 },
+  ActiveRunwayDeparture = { filename = "ActiveRunwayDeparture.ogg", duration = 0.99 },
+  ActiveRunwayArrival = { filename = "ActiveRunwayArrival.ogg", duration = 0.99 },
   AdviceOnInitial = { filename = "AdviceOnInitial.ogg", duration = 3.00 },
   Airport = { filename = "Airport.ogg", duration = 0.66 },
   Altimeter = { filename = "Altimeter.ogg", duration = 0.68 },
@@ -878,6 +882,66 @@ ATIS.Messages = {
     FARP = "Farp",
     DELIMITER = "Punto", -- decimal delimiter
   },
+  -- French messages thanks to @Wojtech and Bing
+  FR = {
+    HOURS = "Heures",
+    TIME = "Temps",
+    NOCLOUDINFO = "Informations sur la couverture nuageuse non disponibles",
+    OVERCAST = "Ciel couvert",
+    BROKEN = "Nuages fragmentés",
+    SCATTERED = "Nuages épars",
+    FEWCLOUDS = "Nuages rares",
+    NOCLOUDS = "Clair",
+    AIRPORT = "Aéroport",
+    INFORMATION ="Information",
+    SUNRISEAT = "Levé du soleil à %s heure locale",
+    SUNSETAT = "Couché du soleil à %s heure locale",
+    WINDFROMMS = "Vent du %s pour %s mètres par seconde",
+    WINDFROMKNOTS = "Vent du %s pour %s noeuds",
+    GUSTING = "Rafale de vent",
+    VISIKM = "Visibilité %s kilomètres",
+    VISISM = "Visibilité %s Miles",
+    RAIN = "Pluie",
+    TSTORM = "Orage",
+    SNOW = "Neige",
+    SSTROM = "Tempête de neige",
+    FOG = "Brouillard",
+    DUST = "Poussière",
+    PHENOMENA = "Phénomène météorologique",
+    CLOUDBASEM = "Couverture nuageuse de %s à %s mètres",
+    CLOUDBASEFT = "Couverture nuageuse de %s à %s pieds",
+    TEMPERATURE = "Température",
+    DEWPOINT = "Point de rosée",
+    ALTIMETER = "Altimètre",
+    ACTIVERUN = "Décollages piste",
+    ACTIVELANDING = "Atterrissages piste",
+    LEFT = "Gauche",
+    RIGHT = "Droite",
+    RWYLENGTH = "Longueur de piste",
+    METERS = "Mètre",
+    FEET = "Pieds",
+    ELEVATION = "Hauteur",
+    TOWERFREQ = "Fréquences de la tour",
+    ILSFREQ = "Fréquences ILS",
+    OUTERNDB = "Fréquences Outer NDB",
+    INNERNDB = "Fréquences Inner NDB",
+    VORFREQ = "Fréquences VOR",
+    VORFREQTTS = "Fréquences V O R",
+    TACANCH = "Canal TACAN %d",
+    RSBNCH = "Canal RSBN",
+    PRMGCH = "Canal PRMG",
+    ADVISE = "Informez le contrôle que vous avez copié l'information",
+    STATUTE = "Statute Miles",
+    DEGREES = "Degré celcius",
+    FAHRENHEIT = "Degré Fahrenheit",
+    INCHHG = "Pouces de mercure",
+    MMHG = "Millimètres de mercure",
+    HECTO = "Hectopascals",
+    METERSPER = "Mètres par seconde",
+    TACAN = "TAKAN",
+    FARP = "FARPE",
+    DELIMITER = "Décimal", -- decimal delimiter
+  }
 }
 
 ---
@@ -897,6 +961,7 @@ ATIS.version = "1.0.0"
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- TODO: Correct fog for elevation.
+-- TODO: Generalize sound files input to be able to use custom made sounds.
 -- DONE: Option to add multiple frequencies for SRS
 -- DONE: Zulu time --> Zulu in output.
 -- DONE: Fix for AB not having a runway - Helopost like Naqoura
@@ -1056,7 +1121,7 @@ end
 -- @return #ATIS self
 function ATIS:_InitLocalization()
   self:T(self.lid.."_InitLocalization")
-  self.gettext = TEXTANDSOUND:New("AWACS","en") -- Core.TextAndSound#TEXTANDSOUND
+  self.gettext = TEXTANDSOUND:New("ATIS","en") -- Core.TextAndSound#TEXTANDSOUND
   self.locale = "en"
   for locale,table in pairs(self.Messages) do
     local Locale = string.lower(tostring(locale))
@@ -1078,16 +1143,74 @@ function ATIS:SetLocale(locale)
   return self
 end
 
---- Set sound files folder within miz file.
+--- Set sound files folder within miz file (not your local hard drive!).
 -- @param #ATIS self
--- @param #string path Path for sound files. Default "ATIS Soundfiles/". Mind the slash "/" at the end!
+-- @param #string pathMain Path to folder containing main sound files. Default "ATIS Soundfiles/". Mind the slash "/" at the end!
+-- @param #string pathAirports Path folder containing the airport names sound files. Default is `"ATIS Soundfiles/<Map Name>"`, *e.g.* `"ATIS Soundfiles/Caucasus/"`.
+-- @param #string pathNato Path folder containing the NATO alphabet sound files. Default is "ATIS Soundfiles/NATO Alphabet/".
 -- @return #ATIS self
-function ATIS:SetSoundfilesPath( path )
+function ATIS:SetSoundfilesPath( pathMain, pathAirports, pathNato )
-  self.soundpath = tostring( path or "ATIS Soundfiles/" )
+  self.soundpath = tostring( pathMain or "ATIS Soundfiles/" )
+  if pathAirports==nil then
+    self.soundpathAirports=self.soundpath..env.mission.theatre.."/"
+  else
+    self.soundpathAirports=pathAirports
+  end
+  if pathNato==nil then
+    self.soundpathNato=self.soundpath.."NATO Alphabet/"
+  else
+    self.soundpathNato=pathNato
+  end
   self:T( self.lid .. string.format( "Setting sound files path to %s", self.soundpath ) )
   return self
 end
 
+--- Set the path to the csv file that contains information about the used sound files.
+-- The parameter file has to be located on your local disk (**not** inside the miz file).
+-- @param #ATIS self
+-- @param #string csvfile Full path to the csv file on your local disk.
+-- @return #ATIS self
+function ATIS:SetSoundfilesInfo( csvfile )
+
+  --- Local function to return the ATIS.Soundfile for a given file name
+  local function getSound(filename)
+    for key,_soundfile in pairs(self.Sound) do
+      local soundfile=_soundfile --#ATIS.Soundfile
+      if filename==soundfile.filename then
+        return soundfile
+      end
+    end
+    return nil
+  end
+
+  -- Read csv file
+  local data=UTILS.ReadCSV(csvfile)
+
+  if data then
+
+    for i,sound in pairs(data) do
+
+      -- Get the ATIS.Soundfile
+      local soundfile=getSound(sound.filename..".ogg") --#ATIS.Soundfile
+
+      if soundfile then
+
+        -- Set duration
+        soundfile.duration=tonumber(sound.duration)
+
+      else
+        self:E(string.format("ERROR: Could not get info for sound file %s", sound.filename))
+      end
+
+    end
+  else
+    self:E(string.format("ERROR: Could not read sound csv file!"))
+  end
+
+
+  return self
+end
+
 --- Set airborne unit (airplane or helicopter), used to transmit radio messages including subtitles.
 -- Best is to place the unit on a parking spot of the airbase and set it to *uncontrolled* in the mission editor.
 -- @param #ATIS self
@@ -1538,13 +1661,13 @@ end
 function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port, GoogleKey)
   --if PathToSRS or MSRS.path then
     self.useSRS=true
-    
+
     local path = PathToSRS or MSRS.path
     local gender = Gender or MSRS.gender
     local culture = Culture or MSRS.culture
     local voice = Voice or MSRS.voice
     local port = Port or MSRS.port or 5002
-    
+
     self.msrs=MSRS:New(path, self.frequency, self.modulation)
     self.msrs:SetGender(gender)
     self.msrs:SetCulture(culture)
@@ -1653,16 +1776,16 @@ function ATIS:onafterStart( From, Event, To )
     self.radioqueue:SetRadioPower( self.power )
 
     -- Init numbers.
-    self.radioqueue:SetDigit( 0, ATIS.Sound.N0.filename, ATIS.Sound.N0.duration, self.soundpath )
+    self.radioqueue:SetDigit( 0, self.Sound.N0.filename, self.Sound.N0.duration, self.soundpath )
-    self.radioqueue:SetDigit( 1, ATIS.Sound.N1.filename, ATIS.Sound.N1.duration, self.soundpath )
+    self.radioqueue:SetDigit( 1, self.Sound.N1.filename, self.Sound.N1.duration, self.soundpath )
-    self.radioqueue:SetDigit( 2, ATIS.Sound.N2.filename, ATIS.Sound.N2.duration, self.soundpath )
+    self.radioqueue:SetDigit( 2, self.Sound.N2.filename, self.Sound.N2.duration, self.soundpath )
-    self.radioqueue:SetDigit( 3, ATIS.Sound.N3.filename, ATIS.Sound.N3.duration, self.soundpath )
+    self.radioqueue:SetDigit( 3, self.Sound.N3.filename, self.Sound.N3.duration, self.soundpath )
-    self.radioqueue:SetDigit( 4, ATIS.Sound.N4.filename, ATIS.Sound.N4.duration, self.soundpath )
+    self.radioqueue:SetDigit( 4, self.Sound.N4.filename, self.Sound.N4.duration, self.soundpath )
-    self.radioqueue:SetDigit( 5, ATIS.Sound.N5.filename, ATIS.Sound.N5.duration, self.soundpath )
+    self.radioqueue:SetDigit( 5, self.Sound.N5.filename, self.Sound.N5.duration, self.soundpath )
-    self.radioqueue:SetDigit( 6, ATIS.Sound.N6.filename, ATIS.Sound.N6.duration, self.soundpath )
+    self.radioqueue:SetDigit( 6, self.Sound.N6.filename, self.Sound.N6.duration, self.soundpath )
-    self.radioqueue:SetDigit( 7, ATIS.Sound.N7.filename, ATIS.Sound.N7.duration, self.soundpath )
+    self.radioqueue:SetDigit( 7, self.Sound.N7.filename, self.Sound.N7.duration, self.soundpath )
-    self.radioqueue:SetDigit( 8, ATIS.Sound.N8.filename, ATIS.Sound.N8.duration, self.soundpath )
+    self.radioqueue:SetDigit( 8, self.Sound.N8.filename, self.Sound.N8.duration, self.soundpath )
-    self.radioqueue:SetDigit( 9, ATIS.Sound.N9.filename, ATIS.Sound.N9.duration, self.soundpath )
+    self.radioqueue:SetDigit( 9, self.Sound.N9.filename, self.Sound.N9.duration, self.soundpath )
 
     -- Start radio queue.
     self.radioqueue:Start( 1, 0.1 )
@@ -1909,20 +2032,28 @@ function ATIS:onafterBroadcast( From, Event, To )
   --------------------------
   --- Sunrise and Sunset ---
   --------------------------
-  
+
   local hours = self.gettext:GetEntry("HOURS",self.locale)
   local sunrise = coord:GetSunrise()
-  sunrise = UTILS.Split( sunrise, ":" )
+  --self:I(sunrise)
-  local SUNRISE = string.format( "%s%s", sunrise[1], sunrise[2] )
+  local SUNRISE = "no time"
-  if self.useSRS then
+  if tostring(sunrise) ~= "N/S" and tostring(sunrise) ~= "N/R" then
-    SUNRISE = string.format( "%s %s %s", sunrise[1], sunrise[2], hours )
+    sunrise = UTILS.Split( sunrise, ":" )
+    SUNRISE = string.format( "%s%s", sunrise[1], sunrise[2] )
+    if self.useSRS then
+      SUNRISE = string.format( "%s %s %s", sunrise[1], sunrise[2], hours )
+    end
   end
-
+  
   local sunset = coord:GetSunset()
-  sunset = UTILS.Split( sunset, ":" )
+  --self:I(sunset)
-  local SUNSET = string.format( "%s%s", sunset[1], sunset[2] )
+  local SUNSET = "no time"
-  if self.useSRS then
+  if tostring(sunset) ~= "N/S" and tostring(sunset) ~= "N/R" then
-    SUNSET = string.format( "%s %s %s", sunset[1], sunset[2], hours )
+    sunset = UTILS.Split( sunset, ":" )
+    SUNSET = string.format( "%s%s", sunset[1], sunset[2] )
+    if self.useSRS then
+      SUNSET = string.format( "%s %s %s", sunset[1], sunset[2], hours )
+    end
   end
 
   ---------------------------------
@@ -2006,14 +2137,79 @@ function ATIS:onafterBroadcast( From, Event, To )
   local cloudbase = clouds.base
   local cloudceil = clouds.base + clouds.thickness
   local clouddens = clouds.density
-
+    
   -- Cloud preset (DCS 2.7)
   local cloudspreset = clouds.preset or "Nothing"
 
   -- Precepitation: 0=None, 1=Rain, 2=Thunderstorm, 3=Snow, 4=Snowstorm.
   local precepitation = 0
 
-  if cloudspreset:find( "Preset10" ) then
+  if cloudspreset:find( "RainyPreset1" ) then
+    -- Overcast + Rain
+    clouddens = 9
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset2" ) then
+    -- Overcast + Rain
+    clouddens = 9
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset3" ) then
+    -- Overcast + Rain
+    clouddens = 9
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset4" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset5" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset6" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+    -- NEWRAINPRESET4
+  elseif cloudspreset:find( "NEWRAINPRESET4" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset" ) then
+    -- Overcast + Rain
+    clouddens = 9
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "Preset10" ) then
     -- Scattered 5
     clouddens = 4
   elseif cloudspreset:find( "Preset11" ) then
@@ -2094,38 +2290,8 @@ function ATIS:onafterBroadcast( From, Event, To )
   elseif cloudspreset:find( "Preset9" ) then
     -- Scattered 4
     clouddens = 4
-  elseif cloudspreset:find( "RainyPreset" ) then
+  else
-    -- Overcast + Rain
+    self:E(string.format("WARNING! Unknown weather preset: %s", tostring(cloudspreset)))
-    clouddens = 9
-    if temperature > 5 then
-      precepitation = 1 -- rain
-    else
-      precepitation = 3 -- snow
-    end
-  elseif cloudspreset:find( "RainyPreset1" ) then
-    -- Overcast + Rain
-    clouddens = 9
-    if temperature > 5 then
-      precepitation = 1 -- rain
-    else
-      precepitation = 3 -- snow
-    end
-  elseif cloudspreset:find( "RainyPreset2" ) then
-    -- Overcast + Rain
-    clouddens = 9
-    if temperature > 5 then
-      precepitation = 1 -- rain
-    else
-      precepitation = 3 -- snow
-    end
-  elseif cloudspreset:find( "RainyPreset3" ) then
-    -- Overcast + Rain
-    clouddens = 9
-    if temperature > 5 then
-      precepitation = 1 -- rain
-    else
-      precepitation = 3 -- snow
-    end
   end
 
   local CLOUDBASE = string.format( "%d", UTILS.MetersToFeet( cloudbase ) )
@@ -2147,36 +2313,36 @@ function ATIS:onafterBroadcast( From, Event, To )
 
   -- No cloud info for dynamic weather.
   local CloudCover = {} -- #ATIS.Soundfile
-  CloudCover = ATIS.Sound.CloudsNotAvailable
+  CloudCover = self.Sound.CloudsNotAvailable
   --local CLOUDSsub = "Cloud coverage information not available"
   local CLOUDSsub = self.gettext:GetEntry("NOCLOUDINFO",self.locale)
   -- Only valid for static weather.
   if static then
     if clouddens >= 9 then
       -- Overcast 9,10
-      CloudCover = ATIS.Sound.CloudsOvercast
+      CloudCover = self.Sound.CloudsOvercast
       --CLOUDSsub = "Overcast"
       CLOUDSsub = self.gettext:GetEntry("OVERCAST",self.locale)
     elseif clouddens >= 7 then
       -- Broken 7,8
-      CloudCover = ATIS.Sound.CloudsBroken
+      CloudCover = self.Sound.CloudsBroken
       --CLOUDSsub = "Broken clouds"
       CLOUDSsub = self.gettext:GetEntry("BROKEN",self.locale)
     elseif clouddens >= 4 then
       -- Scattered 4,5,6
-      CloudCover = ATIS.Sound.CloudsScattered
+      CloudCover = self.Sound.CloudsScattered
       --CLOUDSsub = "Scattered clouds"
       CLOUDSsub = self.gettext:GetEntry("SCATTERED",self.locale)
     elseif clouddens >= 1 then
       -- Few 1,2,3
-      CloudCover = ATIS.Sound.CloudsFew
+      CloudCover = self.Sound.CloudsFew
       --CLOUDSsub = "Few clouds"
       CLOUDSsub = self.gettext:GetEntry("FEWCLOUDS",self.locale)
     else
       -- No clouds
       CLOUDBASE = nil
       CLOUDCEIL = nil
-      CloudCover = ATIS.Sound.CloudsNo
+      CloudCover = self.Sound.CloudsNo
       --CLOUDSsub = "No clouds"
       CLOUDSsub = self.gettext:GetEntry("NOCLOUDS",self.locale)
     end
@@ -2200,7 +2366,7 @@ function ATIS:onafterBroadcast( From, Event, To )
   end
   if not self.useSRS then
     --self:I(string.format( "%s/%s.ogg", self.theatre, self.airbasename ))
-    self.radioqueue:NewTransmission( string.format( "%s/%s.ogg", self.theatre, self.airbasename ), 3.0, self.soundpath, nil, nil, subtitle, self.subduration )
+    self.radioqueue:NewTransmission( string.format( "%s.ogg", self.airbasename ), 3.0, self.soundpathAirports, nil, nil, subtitle, self.subduration )
   end
   local alltext = subtitle
 
@@ -2210,8 +2376,8 @@ function ATIS:onafterBroadcast( From, Event, To )
   subtitle = string.format( "%s %s", information, NATO )
   local _INFORMATION = subtitle
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.Information, 0.5, subtitle )
+    self:Transmission( self.Sound.Information, 0.5, subtitle )
-    self.radioqueue:NewTransmission( string.format( "NATO Alphabet/%s.ogg", NATO ), 0.75, self.soundpath )
+    self.radioqueue:NewTransmission( string.format( "%s.ogg", NATO ), 0.75, self.soundpathNato )
   end
   alltext = alltext .. ";\n" .. subtitle
 
@@ -2219,7 +2385,7 @@ function ATIS:onafterBroadcast( From, Event, To )
   subtitle = string.format( "%s Zulu", ZULU )
   if not self.useSRS then
     self.radioqueue:Number2Transmission( ZULU, nil, 0.5 )
-    self:Transmission( ATIS.Sound.Zulu, 0.2, subtitle )
+    self:Transmission( self.Sound.Zulu, 0.2, subtitle )
   end
   alltext = alltext .. ";\n" .. subtitle
 
@@ -2230,9 +2396,9 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Sunrise at %s local time", SUNRISE )
     subtitle = string.format( sunrise, SUNRISE )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.SunriseAt, 0.5, subtitle )
+      self:Transmission( self.Sound.SunriseAt, 0.5, subtitle )
       self.radioqueue:Number2Transmission( SUNRISE, nil, 0.2 )
-      self:Transmission( ATIS.Sound.TimeLocal, 0.2 )
+      self:Transmission( self.Sound.TimeLocal, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
 
@@ -2241,9 +2407,9 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Sunset at %s local time", SUNSET )
     subtitle = string.format( sunset, SUNSET )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.SunsetAt, 0.5, subtitle )
+      self:Transmission( self.Sound.SunsetAt, 0.5, subtitle )
       self.radioqueue:Number2Transmission( SUNSET, nil, 0.5 )
-      self:Transmission( ATIS.Sound.TimeLocal, 0.2 )
+      self:Transmission( self.Sound.TimeLocal, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2268,17 +2434,17 @@ function ATIS:onafterBroadcast( From, Event, To )
   end
   local _WIND = subtitle
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.WindFrom, 1.0, subtitle )
+    self:Transmission( self.Sound.WindFrom, 1.0, subtitle )
     self.radioqueue:Number2Transmission( WINDFROM )
-    self:Transmission( ATIS.Sound.At, 0.2 )
+    self:Transmission( self.Sound.At, 0.2 )
     self.radioqueue:Number2Transmission( WINDSPEED )
     if self.metric then
-      self:Transmission( ATIS.Sound.MetersPerSecond, 0.2 )
+      self:Transmission( self.Sound.MetersPerSecond, 0.2 )
     else
-      self:Transmission( ATIS.Sound.Knots, 0.2 )
+      self:Transmission( self.Sound.Knots, 0.2 )
     end
     if turbulence > 0 then
-      self:Transmission( ATIS.Sound.Gusting, 0.2 )
+      self:Transmission( self.Sound.Gusting, 0.2 )
     end
   end
   alltext = alltext .. ";\n" .. subtitle
@@ -2294,12 +2460,12 @@ function ATIS:onafterBroadcast( From, Event, To )
     subtitle = string.format( visi, VISIBILITY )
   end
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.Visibilty, 1.0, subtitle )
+    self:Transmission( self.Sound.Visibilty, 1.0, subtitle )
     self.radioqueue:Number2Transmission( VISIBILITY )
     if self.metric then
-      self:Transmission( ATIS.Sound.Kilometers, 0.2 )
+      self:Transmission( self.Sound.Kilometers, 0.2 )
     else
-      self:Transmission( ATIS.Sound.StatuteMiles, 0.2 )
+      self:Transmission( self.Sound.StatuteMiles, 0.2 )
     end
   end
   alltext = alltext .. ";\n" .. subtitle
@@ -2350,21 +2516,21 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Weather phenomena: %s", wpsub )
     subtitle = string.format( "%s: %s", phenos, wpsub )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.WeatherPhenomena, 1.0, subtitle )
+      self:Transmission( self.Sound.WeatherPhenomena, 1.0, subtitle )
       if precepitation == 1 then
-        self:Transmission( ATIS.Sound.Rain, 0.5 )
+        self:Transmission( self.Sound.Rain, 0.5 )
       elseif precepitation == 2 then
-        self:Transmission( ATIS.Sound.ThunderStorm, 0.5 )
+        self:Transmission( self.Sound.ThunderStorm, 0.5 )
       elseif precepitation == 3 then
-        self:Transmission( ATIS.Sound.Snow, 0.5 )
+        self:Transmission( self.Sound.Snow, 0.5 )
       elseif precepitation == 4 then
-        self:Transmission( ATIS.Sound.SnowStorm, 0.5 )
+        self:Transmission( self.Sound.SnowStorm, 0.5 )
       end
       if fog then
-        self:Transmission( ATIS.Sound.Fog, 0.5 )
+        self:Transmission( self.Sound.Fog, 0.5 )
       end
       if dust then
-        self:Transmission( ATIS.Sound.Dust, 0.5 )
+        self:Transmission( self.Sound.Dust, 0.5 )
       end
     end
     alltext = alltext .. ";\n" .. subtitle
@@ -2390,29 +2556,29 @@ function ATIS:onafterBroadcast( From, Event, To )
       subtitle = string.format( cloudbase, cbase, cceil )
     end
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.CloudBase, 1.0, subtitle )
+      self:Transmission( self.Sound.CloudBase, 1.0, subtitle )
       if tonumber( CLOUDBASE1000 ) > 0 then
         self.radioqueue:Number2Transmission( CLOUDBASE1000 )
-        self:Transmission( ATIS.Sound.Thousand, 0.1 )
+        self:Transmission( self.Sound.Thousand, 0.1 )
       end
       if tonumber( CLOUDBASE0100 ) > 0 then
         self.radioqueue:Number2Transmission( CLOUDBASE0100 )
-        self:Transmission( ATIS.Sound.Hundred, 0.1 )
+        self:Transmission( self.Sound.Hundred, 0.1 )
       end
       -- Ceiling
-      self:Transmission( ATIS.Sound.CloudCeiling, 0.5 )
+      self:Transmission( self.Sound.CloudCeiling, 0.5 )
       if tonumber( CLOUDCEIL1000 ) > 0 then
         self.radioqueue:Number2Transmission( CLOUDCEIL1000 )
-        self:Transmission( ATIS.Sound.Thousand, 0.1 )
+        self:Transmission( self.Sound.Thousand, 0.1 )
       end
       if tonumber( CLOUDCEIL0100 ) > 0 then
         self.radioqueue:Number2Transmission( CLOUDCEIL0100 )
-        self:Transmission( ATIS.Sound.Hundred, 0.1 )
+        self:Transmission( self.Sound.Hundred, 0.1 )
       end
       if self.metric then
-        self:Transmission( ATIS.Sound.Meters, 0.1 )
+        self:Transmission( self.Sound.Meters, 0.1 )
       else
-        self:Transmission( ATIS.Sound.Feet, 0.1 )
+        self:Transmission( self.Sound.Feet, 0.1 )
       end
     end
   end
@@ -2440,15 +2606,15 @@ function ATIS:onafterBroadcast( From, Event, To )
   end
   local _TEMPERATURE = subtitle
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.Temperature, 1.0, subtitle )
+    self:Transmission( self.Sound.Temperature, 1.0, subtitle )
     if temperature < 0 then
-      self:Transmission( ATIS.Sound.Minus, 0.2 )
+      self:Transmission( self.Sound.Minus, 0.2 )
     end
     self.radioqueue:Number2Transmission( TEMPERATURE )
     if self.TDegF then
-      self:Transmission( ATIS.Sound.DegreesFahrenheit, 0.2 )
+      self:Transmission( self.Sound.DegreesFahrenheit, 0.2 )
     else
-      self:Transmission( ATIS.Sound.DegreesCelsius, 0.2 )
+      self:Transmission( self.Sound.DegreesCelsius, 0.2 )
     end
   end
   alltext = alltext .. ";\n" .. subtitle
@@ -2474,15 +2640,15 @@ function ATIS:onafterBroadcast( From, Event, To )
   end
   local _DEWPOINT = subtitle
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.DewPoint, 1.0, subtitle )
+    self:Transmission( self.Sound.DewPoint, 1.0, subtitle )
     if dewpoint < 0 then
-      self:Transmission( ATIS.Sound.Minus, 0.2 )
+      self:Transmission( self.Sound.Minus, 0.2 )
     end
     self.radioqueue:Number2Transmission( DEWPOINT )
     if self.TDegF then
-      self:Transmission( ATIS.Sound.DegreesFahrenheit, 0.2 )
+      self:Transmission( self.Sound.DegreesFahrenheit, 0.2 )
     else
-      self:Transmission( ATIS.Sound.DegreesCelsius, 0.2 )
+      self:Transmission( self.Sound.DegreesCelsius, 0.2 )
     end
   end
   alltext = alltext .. ";\n" .. subtitle
@@ -2529,33 +2695,33 @@ function ATIS:onafterBroadcast( From, Event, To )
 
   local _ALTIMETER = subtitle
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.Altimeter, 1.0, subtitle )
+    self:Transmission( self.Sound.Altimeter, 1.0, subtitle )
     if not self.qnhonly then
-      self:Transmission( ATIS.Sound.QNH, 0.5 )
+      self:Transmission( self.Sound.QNH, 0.5 )
     end
     self.radioqueue:Number2Transmission( QNH[1] )
 
     if ATIS.ICAOPhraseology[UTILS.GetDCSMap()] then
-      self:Transmission( ATIS.Sound.Decimal, 0.2 )
+      self:Transmission( self.Sound.Decimal, 0.2 )
     end
     self.radioqueue:Number2Transmission( QNH[2] )
 
     if not self.qnhonly then
-      self:Transmission( ATIS.Sound.QFE, 0.75 )
+      self:Transmission( self.Sound.QFE, 0.75 )
       self.radioqueue:Number2Transmission( QFE[1] )
       if ATIS.ICAOPhraseology[UTILS.GetDCSMap()] then
-        self:Transmission( ATIS.Sound.Decimal, 0.2 )
+        self:Transmission( self.Sound.Decimal, 0.2 )
       end
       self.radioqueue:Number2Transmission( QFE[2] )
     end
 
     if self.PmmHg then
-      self:Transmission( ATIS.Sound.MillimetersOfMercury, 0.1 )
+      self:Transmission( self.Sound.MillimetersOfMercury, 0.1 )
     else
       if self.metric then
-        self:Transmission( ATIS.Sound.HectoPascal, 0.1 )
+        self:Transmission( self.Sound.HectoPascal, 0.1 )
       else
-        self:Transmission( ATIS.Sound.InchesOfMercury, 0.1 )
+        self:Transmission( self.Sound.InchesOfMercury, 0.1 )
       end
     end
   end
@@ -2566,41 +2732,55 @@ function ATIS:onafterBroadcast( From, Event, To )
   if not self.ATISforFARPs then
     -- Active runway.
     local subtitle = ""
-    if runwayLanding then
+    if runwayLanding and runwayLanding ~= runwayTakeoff then
+
       local actrun = self.gettext:GetEntry("ACTIVELANDING",self.locale)
-      --subtitle=string.format("Active runway landing %s", runwayLanding)
+
       subtitle=string.format("%s %s", actrun, runwayLanding)
       if rwyLandingLeft==true then
-        --subtitle=subtitle.." Left"
         subtitle=subtitle.." "..self.gettext:GetEntry("LEFT",self.locale)
       elseif rwyLandingLeft==false then
-        --subtitle=subtitle.." Right"
         subtitle=subtitle.." "..self.gettext:GetEntry("RIGHT",self.locale)
       end
       alltext = alltext .. ";\n" .. subtitle
-    end    
+
+      if not self.useSRS then
+        self:Transmission(self.Sound.ActiveRunwayArrival, 1.0, subtitle)
+        self.radioqueue:Number2Transmission(runwayLanding)
+        if rwyLandingLeft==true then
+          self:Transmission(self.Sound.Left, 0.2)
+        elseif rwyLandingLeft==false then
+          self:Transmission(self.Sound.Right, 0.2)
+        end
+      end
+
+    end
+
     if runwayTakeoff then
+
       local actrun = self.gettext:GetEntry("ACTIVERUN",self.locale)
-      --subtitle=string.format("Active runway %s", runwayLanding)
+
       subtitle=string.format("%s %s", actrun, runwayTakeoff)
       if rwyTakeoffLeft==true then
-        --subtitle=subtitle.." Left"
         subtitle=subtitle.." "..self.gettext:GetEntry("LEFT",self.locale)
       elseif rwyTakeoffLeft==false then
-        --subtitle=subtitle.." Right"
         subtitle=subtitle.." "..self.gettext:GetEntry("RIGHT",self.locale)
       end
+      alltext = alltext .. ";\n" .. subtitle
+
+      if not self.useSRS then
+        self:Transmission(self.Sound.ActiveRunwayDeparture, 1.0, subtitle)
+        self.radioqueue:Number2Transmission(runwayTakeoff)
+        if rwyTakeoffLeft==true then
+          self:Transmission(self.Sound.Left, 0.2)
+        elseif rwyTakeoffLeft==false then
+          self:Transmission(self.Sound.Right, 0.2)
+        end
+      end
+
+
     end
     _RUNACT = subtitle
-    if not self.useSRS then
-      self:Transmission(ATIS.Sound.ActiveRunway, 1.0, subtitle)
-      self.radioqueue:Number2Transmission(runwayLanding)
-      if rwyLandingLeft==true then
-        self:Transmission(ATIS.Sound.Left, 0.2)
-      elseif rwyLandingLeft==false then
-        self:Transmission(ATIS.Sound.Right, 0.2)
-      end
-    end
     alltext = alltext .. ";\n" .. subtitle
 
     -- Runway length.
@@ -2629,31 +2809,32 @@ function ATIS:onafterBroadcast( From, Event, To )
 
       -- Transmit.
       if not self.useSRS then
-        self:Transmission( ATIS.Sound.RunwayLength, 1.0, subtitle )
+        self:Transmission( self.Sound.RunwayLength, 1.0, subtitle )
         if tonumber( L1000 ) > 0 then
           self.radioqueue:Number2Transmission( L1000 )
-          self:Transmission( ATIS.Sound.Thousand, 0.1 )
+          self:Transmission( self.Sound.Thousand, 0.1 )
         end
         if tonumber( L0100 ) > 0 then
           self.radioqueue:Number2Transmission( L0100 )
-          self:Transmission( ATIS.Sound.Hundred, 0.1 )
+          self:Transmission( self.Sound.Hundred, 0.1 )
         end
         if self.metric then
-          self:Transmission( ATIS.Sound.Meters, 0.1 )
+          self:Transmission( self.Sound.Meters, 0.1 )
         else
-          self:Transmission( ATIS.Sound.Feet, 0.1 )
+          self:Transmission( self.Sound.Feet, 0.1 )
         end
       end
       alltext = alltext .. ";\n" .. subtitle
     end
   end
+
   -- Airfield elevation
   if self.elevation then
-    
+
     local elev = self.gettext:GetEntry("ELEVATION",self.locale)
     local meters = self.gettext:GetEntry("METERS",self.locale)
     local feet = self.gettext:GetEntry("FEET",self.locale)
-    
+
     local elevation = self.airbase:GetHeight()
     if not self.metric then
       elevation = UTILS.MetersToFeet( elevation )
@@ -2673,19 +2854,19 @@ function ATIS:onafterBroadcast( From, Event, To )
 
     -- Transmit.
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.Elevation, 1.0, subtitle )
+      self:Transmission( self.Sound.Elevation, 1.0, subtitle )
       if tonumber( L1000 ) > 0 then
         self.radioqueue:Number2Transmission( L1000 )
-        self:Transmission( ATIS.Sound.Thousand, 0.1 )
+        self:Transmission( self.Sound.Thousand, 0.1 )
       end
       if tonumber( L0100 ) > 0 then
         self.radioqueue:Number2Transmission( L0100 )
-        self:Transmission( ATIS.Sound.Hundred, 0.1 )
+        self:Transmission( self.Sound.Hundred, 0.1 )
       end
       if self.metric then
-        self:Transmission( ATIS.Sound.Meters, 0.1 )
+        self:Transmission( self.Sound.Meters, 0.1 )
       else
-        self:Transmission( ATIS.Sound.Feet, 0.1 )
+        self:Transmission( self.Sound.Feet, 0.1 )
       end
     end
     alltext = alltext .. ";\n" .. subtitle
@@ -2704,16 +2885,16 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Tower frequency %s", freqs )
     subtitle = string.format( "%s %s", twrfrq, freqs )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.TowerFrequency, 1.0, subtitle )
+      self:Transmission( self.Sound.TowerFrequency, 1.0, subtitle )
       for _, freq in pairs( self.towerfrequency ) do
         local f = string.format( "%.3f", freq )
         f = UTILS.Split( f, "." )
         self.radioqueue:Number2Transmission( f[1], nil, 0.5 )
         if tonumber( f[2] ) > 0 then
-          self:Transmission( ATIS.Sound.Decimal, 0.2 )
+          self:Transmission( self.Sound.Decimal, 0.2 )
           self.radioqueue:Number2Transmission( f[2] )
         end
-        self:Transmission( ATIS.Sound.MegaHertz, 0.2 )
+        self:Transmission( self.Sound.MegaHertz, 0.2 )
       end
     end
     alltext = alltext .. ";\n" .. subtitle
@@ -2726,15 +2907,15 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "ILS frequency %.2f MHz", ils.frequency )
     subtitle = string.format( "%s %.2f MHz", ilstxt, ils.frequency )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.ILSFrequency, 1.0, subtitle )
+      self:Transmission( self.Sound.ILSFrequency, 1.0, subtitle )
       local f = string.format( "%.2f", ils.frequency )
       f = UTILS.Split( f, "." )
       self.radioqueue:Number2Transmission( f[1], nil, 0.5 )
       if tonumber( f[2] ) > 0 then
-        self:Transmission( ATIS.Sound.Decimal, 0.2 )
+        self:Transmission( self.Sound.Decimal, 0.2 )
         self.radioqueue:Number2Transmission( f[2] )
       end
-      self:Transmission( ATIS.Sound.MegaHertz, 0.2 )
+      self:Transmission( self.Sound.MegaHertz, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2746,15 +2927,15 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Outer NDB frequency %.2f MHz", ndb.frequency )
     subtitle = string.format( "%s %.2f MHz", ndbtxt, ndb.frequency )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.OuterNDBFrequency, 1.0, subtitle )
+      self:Transmission( self.Sound.OuterNDBFrequency, 1.0, subtitle )
       local f = string.format( "%.2f", ndb.frequency )
       f = UTILS.Split( f, "." )
       self.radioqueue:Number2Transmission( f[1], nil, 0.5 )
       if tonumber( f[2] ) > 0 then
-        self:Transmission( ATIS.Sound.Decimal, 0.2 )
+        self:Transmission( self.Sound.Decimal, 0.2 )
         self.radioqueue:Number2Transmission( f[2] )
       end
-      self:Transmission( ATIS.Sound.MegaHertz, 0.2 )
+      self:Transmission( self.Sound.MegaHertz, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2766,15 +2947,15 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "Inner NDB frequency %.2f MHz", ndb.frequency )
     subtitle = string.format( "%s %.2f MHz", ndbtxt, ndb.frequency )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.InnerNDBFrequency, 1.0, subtitle )
+      self:Transmission( self.Sound.InnerNDBFrequency, 1.0, subtitle )
       local f = string.format( "%.2f", ndb.frequency )
       f = UTILS.Split( f, "." )
       self.radioqueue:Number2Transmission( f[1], nil, 0.5 )
       if tonumber( f[2] ) > 0 then
-        self:Transmission( ATIS.Sound.Decimal, 0.2 )
+        self:Transmission( self.Sound.Decimal, 0.2 )
         self.radioqueue:Number2Transmission( f[2] )
       end
-      self:Transmission( ATIS.Sound.MegaHertz, 0.2 )
+      self:Transmission( self.Sound.MegaHertz, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2790,15 +2971,15 @@ function ATIS:onafterBroadcast( From, Event, To )
       subtitle = string.format( "%s %.2f MHz", vorttstxt, self.vor )
     end
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.VORFrequency, 1.0, subtitle )
+      self:Transmission( self.Sound.VORFrequency, 1.0, subtitle )
       local f = string.format( "%.2f", self.vor )
       f = UTILS.Split( f, "." )
       self.radioqueue:Number2Transmission( f[1], nil, 0.5 )
       if tonumber( f[2] ) > 0 then
-        self:Transmission( ATIS.Sound.Decimal, 0.2 )
+        self:Transmission( self.Sound.Decimal, 0.2 )
         self.radioqueue:Number2Transmission( f[2] )
       end
-      self:Transmission( ATIS.Sound.MegaHertz, 0.2 )
+      self:Transmission( self.Sound.MegaHertz, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2809,9 +2990,9 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle=string.format("TACAN channel %dX Ray", self.tacan)
     subtitle=string.format(tactxt, self.tacan)
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.TACANChannel, 1.0, subtitle )
+      self:Transmission( self.Sound.TACANChannel, 1.0, subtitle )
       self.radioqueue:Number2Transmission( tostring( self.tacan ), nil, 0.2 )
-      self.radioqueue:NewTransmission( "NATO Alphabet/Xray.ogg", 0.75, self.soundpath, nil, 0.2 )
+      self.radioqueue:NewTransmission( "Xray.ogg", 0.75, self.soundpathNato, nil, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
   end
@@ -2822,7 +3003,7 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "RSBN channel %d", self.rsbn )
     subtitle = string.format( "%s %d", rsbntxt, self.rsbn )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.RSBNChannel, 1.0, subtitle )
+      self:Transmission( self.Sound.RSBNChannel, 1.0, subtitle )
       self.radioqueue:Number2Transmission( tostring( self.rsbn ), nil, 0.2 )
     end
     alltext = alltext .. ";\n" .. subtitle
@@ -2835,7 +3016,7 @@ function ATIS:onafterBroadcast( From, Event, To )
     --subtitle = string.format( "PRMG channel %d", ndb.frequency )
     subtitle = string.format( "%s %d", prmtxt, ndb.frequency )
     if not self.useSRS then
-      self:Transmission( ATIS.Sound.PRMGChannel, 1.0, subtitle )
+      self:Transmission( self.Sound.PRMGChannel, 1.0, subtitle )
       self.radioqueue:Number2Transmission( tostring( ndb.frequency ), nil, 0.5 )
     end
     alltext = alltext .. ";\n" .. subtitle
@@ -2851,8 +3032,8 @@ function ATIS:onafterBroadcast( From, Event, To )
   --subtitle = string.format( "Advise on initial contact, you have information %s", NATO )
   subtitle = string.format( "%s %s", advtxt, NATO )
   if not self.useSRS then
-    self:Transmission( ATIS.Sound.AdviceOnInitial, 0.5, subtitle )
+    self:Transmission( self.Sound.AdviceOnInitial, 0.5, subtitle )
-    self.radioqueue:NewTransmission( string.format( "NATO Alphabet/%s.ogg", NATO ), 0.75, self.soundpath )
+    self.radioqueue:NewTransmission( string.format( "%s.ogg", NATO ), 0.75, self.soundpathNato )
   end
   alltext = alltext .. ";\n" .. subtitle
 
@@ -2891,8 +3072,8 @@ function ATIS:onafterReport( From, Event, To, Text )
     local emes = self.gettext:GetEntry("METERSPER",self.locale)
     local tacan = self.gettext:GetEntry("TACAN",self.locale)
     local farp = self.gettext:GetEntry("FARP",self.locale)
-    
+
-    
+
     local text = string.gsub( text, "SM", statute )
     text = string.gsub( text, "°C", degc )
     text = string.gsub( text, "°F", degf )
@@ -2902,13 +3083,13 @@ function ATIS:onafterReport( From, Event, To, Text )
     text = string.gsub( text, "m/s", emes )
     text = string.gsub( text, "TACAN", tacan )
     text = string.gsub( text, "FARP", farp )
-    
+
     local delimiter = self.gettext:GetEntry("DELIMITER",self.locale)
-    
+
     if string.lower(self.locale) ~= "en" then
       text = string.gsub(text,"(%d+)(%.)(%d+)","%1 "..delimiter.." %3")
     end
-    
+
     -- Replace ";" by "."
     local text = string.gsub( text, ";", " . " )
 
@@ -2916,7 +3097,7 @@ function ATIS:onafterReport( From, Event, To, Text )
     self:T( "SRS TTS: " .. text )
 
     -- Play text-to-speech report.
-    local duration = STTS.getSpeechTime(text,0.95)
+    local duration = MSRS.getSpeechTime(text,0.95)
     self.msrsQ:NewTransmission(text,duration,self.msrs,nil,2)
     --self.msrs:PlayText( text )
     self.SRSText = text
@@ -3107,7 +3288,7 @@ end
 -- @param #ATIS.Soundfile sound ATIS sound object.
 -- @param #number interval Interval in seconds after the last transmission finished.
 -- @param #string subtitle Subtitle of the transmission.
--- @param #string path Path to sound file. Default self.soundpath.
+-- @param #string path Path to sound file. Default `self.soundpath`.
 function ATIS:Transmission( sound, interval, subtitle, path )
   self.radioqueue:NewTransmission( sound.filename, sound.duration, path or self.soundpath, nil, interval, subtitle, self.subduration )
 end

Moose Development/Moose/Ops/AirWing.lua

@@ -1041,6 +1041,9 @@ function AIRWING:onafterStatus(From, Event, To)
 
   -- Check Recon missions.
   self:CheckRECON()
+  
+  -- Display tactival overview.
+  self:_TacticalOverview()  
 
   ----------------
   -- Transport ---

Moose Development/Moose/Ops/Airboss.lua

@@ -3623,6 +3623,7 @@ function AIRBOSS:onafterStart( From, Event, To )
   self:HandleEvent( EVENTS.PlayerLeaveUnit, self._PlayerLeft )
   self:HandleEvent( EVENTS.MissionEnd )
   self:HandleEvent( EVENTS.RemoveUnit )
+  self:HandleEvent( EVENTS.UnitLost, self.OnEventRemoveUnit )
 
   -- self.StatusScheduler=SCHEDULER:New(self)
   -- self.StatusScheduler:Schedule(self, self._Status, {}, 1, 0.5)
@@ -14679,7 +14680,7 @@ function AIRBOSS:_GetPlayerUnitAndName( _unitName )
     -- Get DCS unit from its name.
     local DCSunit = Unit.getByName( _unitName )
 
-    if DCSunit then
+    if DCSunit and DCSunit.getPlayerName then
 
       -- Get player name if any.
       local playername = DCSunit:getPlayerName()
@@ -15650,7 +15651,7 @@ function AIRBOSS:_Number2Sound( playerData, sender, number, delay )
   end
 
   -- Split string into characters.
-  local numbers = _split( number )
+  local numbers = _split( tostring(number) )
 
   local wait = 0
   for i = 1, #numbers do
@@ -15718,7 +15719,7 @@ function AIRBOSS:_Number2Radio( radio, number, delay, interval, pilotcall )
   end
 
   -- Split string into characters.
-  local numbers = _split( number )
+  local numbers = _split( tostring(number) )
 
   local wait = 0
   for i = 1, #numbers do
@@ -18086,7 +18087,7 @@ function AIRBOSS:_MarkCaseZones( _unitName, flare )
             self:_GetZoneArcIn( case ):FlareZone( FLARECOLOR.White, 45 )
             text = text .. "\n* arc turn in with WHITE flares"
             self:_GetZoneArcOut( case ):FlareZone( FLARECOLOR.White, 45 )
-            text = text .. "\n* arc trun out with WHITE flares"
+            text = text .. "\n* arc turn out with WHITE flares"
           end
         end
 
@@ -18138,7 +18139,7 @@ function AIRBOSS:_MarkCaseZones( _unitName, flare )
             self:_GetZoneArcIn( case ):SmokeZone( SMOKECOLOR.Blue, 45 )
             text = text .. "\n* arc turn in with BLUE smoke"
             self:_GetZoneArcOut( case ):SmokeZone( SMOKECOLOR.Blue, 45 )
-            text = text .. "\n* arc trun out with BLUE smoke"
+            text = text .. "\n* arc turn out with BLUE smoke"
           end
         end
 

Moose Development/Moose/Ops/ArmyGroup.lua

@@ -403,6 +403,7 @@ function ARMYGROUP:New(group)
   self:HandleEvent(EVENTS.Birth,      self.OnEventBirth)
   self:HandleEvent(EVENTS.Dead,       self.OnEventDead)
   self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit)
+  self:HandleEvent(EVENTS.UnitLost,   self.OnEventRemoveUnit)
   self:HandleEvent(EVENTS.Hit,        self.OnEventHit)
 
   -- Start the status monitoring.

Moose Development/Moose/Ops/Auftrag.lua

@@ -93,6 +93,7 @@
 -- @field #number engageWeaponType Weapon type used.
 -- @field #number engageWeaponExpend How many weapons are used.
 -- @field #boolean engageAsGroup Group attack.
+-- @field #number engageLength Length of engage (carpet or strafing) in meters.
 -- @field #number engageMaxDistance Max engage distance.
 -- @field #number refuelSystem Refuel type (boom or probe) for TANKER missions.
 --
@@ -239,6 +240,10 @@
 -- ## Bombing Carpet
 --
 -- A carpet bombing mission can be created with the @{#AUFTRAG.NewBOMBCARPET}() function.
+-- 
+-- ## Strafing
+--
+-- A strafing mission can be created with the @{#AUFTRAG.NewSTRAFING}() function.
 --
 -- ## CAP
 --
@@ -445,6 +450,7 @@ _AUFTRAGSNR=0
 -- @field #string CAPTUREZONE Capture zone mission.
 -- @field #string NOTHING Nothing.
 -- @field #string PATROLRACETRACK Patrol Racetrack.
+-- @field #string STRAFING Strafing run.
 AUFTRAG.Type={
   ANTISHIP="Anti Ship",
   AWACS="AWACS",
@@ -491,6 +497,7 @@ AUFTRAG.Type={
   CAPTUREZONE="Capture Zone",
   NOTHING="Nothing",
   PATROLRACETRACK="Patrol Racetrack",
+  STRAFING="Strafing",
 }
 
 --- Special task description.
@@ -1062,8 +1069,10 @@ end
 -- @param #number Time Time in seconds to stay. Default 300 seconds.
 -- @param #number Speed Speed in knots to fly to the target coordinate. Default 150kn.
 -- @param #number MissionAlt Altitude to fly towards the mission in feet AGL. Default 1000ft.
+-- @param #boolean CombatLanding (Optional) If true, set the Combat Landing option.
+-- @param #number DirectionAfterLand (Optional) Heading after landing in degrees.
 -- @return #AUFTRAG self
-function AUFTRAG:NewLANDATCOORDINATE(Coordinate, OuterRadius, InnerRadius, Time, Speed, MissionAlt)
+function AUFTRAG:NewLANDATCOORDINATE(Coordinate, OuterRadius, InnerRadius, Time, Speed, MissionAlt, CombatLanding, DirectionAfterLand)
 
   local mission=AUFTRAG:New(AUFTRAG.Type.LANDATCOORDINATE)
 
@@ -1071,6 +1080,8 @@ function AUFTRAG:NewLANDATCOORDINATE(Coordinate, OuterRadius, InnerRadius, Time,
 
   mission.stayTime = Time or 300
   mission.stayAt = Coordinate
+  mission.combatLand = CombatLanding
+  mission.directionAfter = DirectionAfterLand
   self:SetMissionSpeed(Speed or 150)
   self:SetMissionAltitude(MissionAlt or 1000)
   
@@ -1734,6 +1745,7 @@ function AUFTRAG:NewSTRIKE(Target, Altitude)
 end
 
 --- **[AIR]** Create a BOMBING mission. Flight will drop bombs a specified coordinate.
+-- See [DCS task bombing](https://wiki.hoggitworld.com/view/DCS_task_bombing).
 -- @param #AUFTRAG self
 -- @param Core.Point#COORDINATE Target Target coordinate. Can also be specified as a GROUP, UNIT, STATIC or TARGET object.
 -- @param #number Altitude Engage altitude in feet. Default 25000 ft.
@@ -1767,6 +1779,44 @@ function AUFTRAG:NewBOMBING(Target, Altitude)
   return mission
 end
 
+--- **[AIR]** Create a STRAFING mission. Assigns a point on the ground for which the AI will do a strafing run with guns or rockets.
+-- See [DCS task strafing](https://wiki.hoggitworld.com/view/DCS_task_strafing).
+-- @param #AUFTRAG self
+-- @param Core.Point#COORDINATE Target Target coordinate. Can also be specified as a GROUP, UNIT, STATIC or TARGET object.
+-- @param #number Altitude Engage altitude in feet. Default 1000 ft.
+-- @param #number Length The total length of the strafing target in meters. Default `nil`.
+-- @return #AUFTRAG self
+function AUFTRAG:NewSTRAFING(Target, Altitude, Length)
+
+  local mission=AUFTRAG:New(AUFTRAG.Type.STRAFING)
+
+  mission:_TargetFromObject(Target)
+
+  -- DCS task options:
+  mission.engageWeaponType=805337088 -- Corresponds to guns/cannons (805306368) + any rocket (30720). This is the default when selecting this task in the ME.
+  mission.engageWeaponExpend=AI.Task.WeaponExpend.ALL
+  mission.engageAltitude=UTILS.FeetToMeters(Altitude or 1000)
+  mission.engageLength=Length
+
+  -- Mission options:
+  mission.missionTask=ENUMS.MissionTask.GROUNDATTACK
+  mission.missionAltitude=mission.engageAltitude*0.8
+  mission.missionFraction=0.5
+  mission.optionROE=ENUMS.ROE.OpenFire
+  mission.optionROT=ENUMS.ROT.NoReaction   -- No reaction is better.
+
+  -- Evaluate result after 5 min. We might need time until the bombs have dropped and targets have been detroyed.
+  mission.dTevaluate=5*60
+
+  mission.categories={AUFTRAG.Category.AIRCRAFT}
+
+  -- Get DCS task.
+  mission.DCStask=mission:GetDCSMissionTask()
+
+  return mission
+end
+
+
 --- **[AIR]** Create a BOMBRUNWAY mission.
 -- @param #AUFTRAG self
 -- @param Wrapper.Airbase#AIRBASE Airdrome The airbase to bomb. This must be an airdrome (not a FARP or ship) as these to not have a runway.
@@ -1821,7 +1871,7 @@ function AUFTRAG:NewBOMBCARPET(Target, Altitude, CarpetLength)
   mission.engageWeaponType=ENUMS.WeaponFlag.Auto
   mission.engageWeaponExpend=AI.Task.WeaponExpend.ALL
   mission.engageAltitude=UTILS.FeetToMeters(Altitude or 25000)
-  mission.engageCarpetLength=CarpetLength or 500
+  mission.engageLength=CarpetLength or 500
   mission.engageAsGroup=false  -- Looks like this must be false or the task is not executed. It is not available in the ME anyway but in the task of the mission file.
   mission.engageDirection=nil  -- This is also not available in the ME.
 
@@ -2611,6 +2661,8 @@ function AUFTRAG:NewFromTarget(Target, MissionType)
     mission=self:NewBOMBING(Target, Altitude)
   elseif MissionType==AUFTRAG.Type.BOMBRUNWAY then
     mission=self:NewBOMBRUNWAY(Target, Altitude)
+  elseif MissionType==AUFTRAG.Type.STRAFING then
+    mission=self:NewSTRAFING(Target, Altitude)    
   elseif MissionType==AUFTRAG.Type.CAS then
     mission=self:NewCAS(ZONE_RADIUS:New(Target:GetName(),Target:GetVec2(),1000), Altitude, Speed, Target:GetAverageCoordinate(), Heading, Leg, TargetTypes)
   elseif MissionType==AUFTRAG.Type.CASENHANCED then
@@ -5952,6 +6004,16 @@ function AUFTRAG:GetDCSMissionTask()
     local DCStask=CONTROLLABLE.TaskBombing(nil, self:GetTargetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType, Divebomb)
 
     table.insert(DCStasks, DCStask)
+    
+  elseif self.type==AUFTRAG.Type.STRAFING then
+
+    ----------------------
+    -- STRAFING Mission --
+    ----------------------
+
+    local DCStask=CONTROLLABLE.TaskStrafing(nil,self:GetTargetVec2(), self.engageQuantity, self.engageLength,self.engageWeaponType,self.engageWeaponExpend,self.engageDirection,self.engageAsGroup)
+
+    table.insert(DCStasks, DCStask)    
 
   elseif self.type==AUFTRAG.Type.BOMBRUNWAY then
 
@@ -5969,7 +6031,7 @@ function AUFTRAG:GetDCSMissionTask()
     -- BOMBCARPET Mission --
     ------------------------
 
-    local DCStask=CONTROLLABLE.TaskCarpetBombing(nil, self:GetTargetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType, self.engageCarpetLength)
+    local DCStask=CONTROLLABLE.TaskCarpetBombing(nil, self:GetTargetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType, self.engageLength)
 
     table.insert(DCStasks, DCStask)
 
@@ -6492,8 +6554,7 @@ function AUFTRAG:GetDCSMissionTask()
 
     local DCStask={}
     local Vec2 = self.stayAt:GetVec2()  
-    local DCStask = CONTROLLABLE.TaskLandAtVec2(nil,Vec2,self.stayTime)
+    local DCStask = CONTROLLABLE.TaskLandAtVec2(nil,Vec2,self.stayTime, self.combatLand, self.directionAfter)
-  
     table.insert(DCStasks, DCStask)
 
   elseif self.type==AUFTRAG.Type.ONGUARD or self.type==AUFTRAG.Type.ARMOREDGUARD then

Moose Development/Moose/Ops/Awacs.lua

@@ -17,7 +17,7 @@
 -- ===
 --
 -- ### Author: **applevangelist**
--- @date Last Update Jan 2024
+-- @date Last Update July 2024
 -- @module Ops.AWACS
 -- @image OPS_AWACS.jpg
 
@@ -508,7 +508,7 @@ do
 -- @field #AWACS
 AWACS = {
   ClassName = "AWACS", -- #string
-  version = "0.2.64", -- #string
+  version = "0.2.65", -- #string
   lid = "", -- #string
   coalition = coalition.side.BLUE, -- #number
   coalitiontxt = "blue", -- #string
@@ -935,7 +935,7 @@ AWACS.TaskStatus = {
 --@field #boolean FromAI
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- TODO-List 0.2.53
+-- TODO-List 0.2.54
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 --
 -- DONE - WIP - Player tasking, VID
@@ -1626,7 +1626,7 @@ function AWACS:_NewRadioEntry(TextTTS, TextScreen,GID,IsGroup,ToScreen,IsNew,Fro
   RadioEntry.TextScreen = TextScreen or TextTTS
   RadioEntry.GroupID = GID
   RadioEntry.ToScreen = ToScreen 
-  RadioEntry.Duration = STTS.getSpeechTime(TextTTS,0.95,false) or 8
+  RadioEntry.Duration = MSRS.getSpeechTime(TextTTS,0.95,false) or 8
   RadioEntry.FromAI = FromAI
   RadioEntry.IsGroup = IsGroup
   if Tactical then
@@ -5585,6 +5585,12 @@ function AWACS:_ThreatRangeCall(GID,Contact)
       local grptxt = self.gettext:GetEntry("GROUP",self.locale)
       local thrt = self.gettext:GetEntry("THREAT",self.locale)
       local text = string.format("%s. %s. %s %s, %s. %s",self.callsigntxt,pilotcallsign,contacttag,grptxt, thrt, BRATExt)
+      -- DONE MS TTS - fix spelling out B-R-A in this case
+      if string.find(text,"BRAA",1,true) then
+        text = string.gsub(text,"BRAA","brah")
+      elseif string.find(text,"BRA",1,true) then
+       text = string.gsub(text,"BRA","brah")
+      end
       if IsSub == false then
         self:_NewRadioEntry(text,text,GID,true,self.debug,true,false,true)
       end

Moose Development/Moose/Ops/Brigade.lua

@@ -491,6 +491,9 @@ function BRIGADE:onafterStatus(From, Event, To)
   -- Info ---
   -----------    
 
+  -- Display tactival overview.
+  self:_TacticalOverview()
+
   -- General info:
   if self.verbose>=1 then
 

Moose Development/Moose/Ops/CSAR.lua

@@ -31,7 +31,7 @@
 -- @image OPS_CSAR.jpg
 
 ---
--- Last Update April 2024
+-- Last Update Sep 2024
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -41,6 +41,7 @@
 -- @field #string lid Class id string for output to DCS log file.
 -- @field #number coalition Coalition side number, e.g. `coalition.side.RED`.
 -- @field Core.Set#SET_GROUP allheligroupset Set of CSAR heli groups.
+-- @field Core.Set#SET_GROUP UserSetGroup Set of CSAR heli groups as designed by the mission designer (if any set).
 -- @extends Core.Fsm#FSM
 
 --- *Combat search and rescue (CSAR) are search and rescue operations that are carried out during war that are within or near combat zones.* (Wikipedia)
@@ -116,8 +117,17 @@
 --         mycsar.topmenuname = "CSAR" -- set the menu entry name
 --         mycsar.ADFRadioPwr = 1000 -- ADF Beacons sending with 1KW as default
 --         mycsar.PilotWeight = 80 --  Loaded pilots weigh 80kgs each
+--         mycsar.AllowIRStrobe = false -- Allow a menu item to request an IR strobe to find a downed pilot at night (requires NVGs to see it).
+--         mycsar.IRStrobeRuntime = 300 -- If an IR Strobe is activated, it runs for 300 seconds (5 mins).
+--  
+-- ## 2.1 Create own SET_GROUP to manage CTLD Pilot groups
+-- 
+--         -- Parameter: Set The SET_GROUP object created by the mission designer/user to represent the CSAR pilot groups.
+--         -- Needs to be set before starting the CSAR instance.
+--         local myset = SET_GROUP:New():FilterPrefixes("Helikopter"):FilterCoalitions("red"):FilterStart()
+--         mycsar:SetOwnSetPilotGroups(myset)
 --         
--- ## 2.1 SRS Features and Other Features
+-- ## 2.2 SRS Features and Other Features
 -- 
 --       mycsar.useSRS = false -- Set true to use FF\'s SRS integration
 --       mycsar.SRSPath = "C:\\Progra~1\\DCS-SimpleRadio-Standalone\\" -- adjust your own path in your SRS installation -- server(!)
@@ -136,6 +146,7 @@
 --       mycsar.csarUsePara = false -- If set to true, will use the LandingAfterEjection Event instead of Ejection. Requires mycsar.enableForAI to be set to true. --shagrat
 --       mycsar.wetfeettemplate = "man in floating thingy" -- if you use a mod to have a pilot in a rescue float, put the template name in here for wet feet spawns. Note: in conjunction with csarUsePara this might create dual ejected pilots in edge cases.
 --       mycsar.allowbronco = false  -- set to true to use the Bronco mod as a CSAR plane
+--       mycsar.CreateRadioBeacons = true -- set to false to disallow creating ADF radio beacons.
 --        
 -- ## 3. Results
 -- 
@@ -256,6 +267,10 @@ CSAR = {
   topmenuname = "CSAR",
   ADFRadioPwr = 1000,
   PilotWeight = 80,
+  CreateRadioBeacons = true,
+  UserSetGroup = nil,
+  AllowIRStrobe = false,
+  IRStrobeRuntime = 300,
 }
 
 --- Downed pilots info.
@@ -272,6 +287,7 @@ CSAR = {
 -- @field #number timestamp Timestamp for approach process.
 -- @field #boolean alive Group is alive or dead/rescued.
 -- @field #boolean wetfeet Group is spawned over (deep) water.
+-- @field #string BeaconName Name of radio beacon - if any.
 
 --- All slot / Limit settings
 -- @type CSAR.AircraftType
@@ -292,11 +308,12 @@ CSAR.AircraftType["AH-64D_BLK_II"] = 2
 CSAR.AircraftType["Bronco-OV-10A"] = 2
 CSAR.AircraftType["MH-60R"] = 10
 CSAR.AircraftType["OH-6A"] = 2
-CSAR.AircraftType["OH58D"] = 2
+CSAR.AircraftType["OH-58D"] = 2
+CSAR.AircraftType["CH-47Fbl1"] = 31
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.24"
+CSAR.version="1.0.29"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -455,6 +472,9 @@ function CSAR:New(Coalition, Template, Alias)
   
   -- added 1.0.16
   self.PilotWeight = 80
+  
+  -- Own SET_GROUP if any
+  self.UserSetGroup = nil
       
   -- WARNING - here\'ll be dragons
   -- for this to work you need to de-sanitize your mission environment in <DCS root>\Scripts\MissionScripting.lua
@@ -633,7 +653,7 @@ end
 -- @param #string Playername Name of Player (if applicable)
 -- @param #boolean Wetfeet Ejected over water
 -- @return #CSAR self.
-function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername,Wetfeet)
+function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername,Wetfeet,BeaconName)
   self:T({"_CreateDownedPilotTrack",Groupname,Side,OriginalUnit,Description,Typename,Frequency,Playername})
   
   -- create new entry
@@ -641,7 +661,7 @@ function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Descript
   DownedPilot.desc = Description or ""
   DownedPilot.frequency = Frequency or 0
   DownedPilot.index = self.downedpilotcounter
-  DownedPilot.name = Groupname or ""
+  DownedPilot.name = Groupname or Playername or ""
   DownedPilot.originalUnit = OriginalUnit or ""
   DownedPilot.player = Playername or ""
   DownedPilot.side = Side or 0
@@ -650,6 +670,7 @@ function CSAR:_CreateDownedPilotTrack(Group,Groupname,Side,OriginalUnit,Descript
   DownedPilot.timestamp = 0
   DownedPilot.alive = true
   DownedPilot.wetfeet = Wetfeet or false
+  DownedPilot.BeaconName = BeaconName
   
   -- Add Pilot
   local PilotTable = self.downedPilots
@@ -736,7 +757,6 @@ function CSAR:_SpawnPilotInField(country,point,frequency,wetfeet)
     :NewWithAlias(template,alias)
     :InitCoalition(coalition)
     :InitCountry(country)
-    --:InitAIOnOff(pilotcacontrol)
     :InitDelayOff()
     :SpawnFromCoordinate(point)
 
@@ -818,8 +838,18 @@ function CSAR:_AddCsar(_coalition , _country, _point, _typeName, _unitName, _pla
   end
   end
   
+  local BeaconName
+  
+  if _playerName then
+    BeaconName = _unitName..math.random(1,10000)
+  elseif _unitName then
+    BeaconName = _playerName..math.random(1,10000)
+  else
+    BeaconName = "Ghost-1-1"..math.random(1,10000)
+  end
+  
   if (_freq and _freq ~= 0) then --shagrat only add beacon if _freq is NOT 0 
-    self:_AddBeaconToGroup(_spawnedGroup, _freq)
+    self:_AddBeaconToGroup(_spawnedGroup, _freq, BeaconName)
   end
   
   self:_AddSpecialOptions(_spawnedGroup)
@@ -844,7 +874,7 @@ function CSAR:_AddCsar(_coalition , _country, _point, _typeName, _unitName, _pla
   
   local _GroupName = _spawnedGroup:GetName() or _alias
 
-  self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet)
+  self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet,BeaconName)
 
   self:_InitSARForPilot(_spawnedGroup, _unitName, _freq, noMessage, _playerName) --shagrat use unitName to have the aircraft callsign / descriptive "name" etc.
   
@@ -962,7 +992,6 @@ end
 -- @param Core.Point#COORDINATE Point
 -- @param #number Coalition Coalition.
 -- @param #string Description (optional) Description.
--- @param #boolean addBeacon (optional) yes or no.
 -- @param #boolean Nomessage (optional) If true, don\'t send a message to SAR.
 -- @param #string Unitname (optional) Name of the lost unit.
 -- @param #string Typename (optional) Type of plane.
@@ -1792,9 +1821,6 @@ function CSAR:_DisplayMessageToSAR(_unit, _text, _time, _clear, _speak, _overrid
     end
     _text = string.gsub(_text,"km"," kilometer")
     _text = string.gsub(_text,"nm"," nautical miles")
-    --self.msrs:SetVoice(self.SRSVoice)
-    --self.SRSQueue:NewTransmission(_text,nil,self.msrs,nil,1)
-    --self:I("Voice = "..self.SRSVoice)
     self.SRSQueue:NewTransmission(_text,duration,self.msrs,tstart,2,subgroups,subtitle,subduration,self.SRSchannel,self.SRSModulation,gender,culture,self.SRSVoice,volume,label,coord)
   end
   return self
@@ -1855,11 +1881,11 @@ function CSAR:_DisplayActiveSAR(_unitName)
         else
           distancetext = string.format("%.1fkm", _distance/1000.0)
         end
-    if _value.frequency == 0 then--shagrat insert CASEVAC without Frequency
+        if _value.frequency == 0 or self.CreateRadioBeacons == false then--shagrat insert CASEVAC without Frequency
-      table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %s ", _value.desc, _coordinatesText, distancetext) })
+          table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %s ", _value.desc, _coordinatesText, distancetext) })
-    else
+        else
-      table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %.2f KHz ADF - %s ", _value.desc, _coordinatesText, _value.frequency / 1000, distancetext) })
+          table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %.2f KHz ADF - %s ", _value.desc, _coordinatesText, _value.frequency / 1000, distancetext) })
-    end
+        end
     end
   end
   
@@ -1940,7 +1966,7 @@ function CSAR:_SignalFlare(_unitName)
       else
         _distance = string.format("%.1fkm",_closest.distance/1000)
       end 
-      local _msg = string.format("%s - Popping signal flare at your %s o\'clock. Distance %s", self:_GetCustomCallSign(_unitName), _clockDir, _distance)
+      local _msg = string.format("%s - Firing signal flare at your %s o\'clock. Distance %s", self:_GetCustomCallSign(_unitName), _clockDir, _distance)
       self:_DisplayMessageToSAR(_heli, _msg, self.messageTime, false, true, true)
       
       local _coord = _closest.pilot:GetCoordinate()
@@ -1974,7 +2000,7 @@ function CSAR:_DisplayToAllSAR(_message, _side, _messagetime,ToSRS,ToScreen)
     if self.msrs:GetProvider() == MSRS.Provider.WINDOWS then
       voice = self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda
     end
-    self:F("Voice = "..voice)
+    --self:F("Voice = "..voice)
     self.SRSQueue:NewTransmission(_message,duration,self.msrs,tstart,2,subgroups,subtitle,subduration,self.SRSchannel,self.SRSModulation,gender,culture,voice,volume,label,self.coordinate)
   end
   if ToScreen == true or ToScreen == nil then
@@ -1988,6 +2014,41 @@ function CSAR:_DisplayToAllSAR(_message, _side, _messagetime,ToSRS,ToScreen)
   return self
 end
 
+---(Internal) Request IR Strobe at closest downed pilot.
+--@param #CSAR self
+--@param #string _unitName Name of the helicopter
+function CSAR:_ReqIRStrobe( _unitName )
+  self:T(self.lid .. " _ReqIRStrobe")
+  local _heli = self:_GetSARHeli(_unitName)
+  if _heli == nil then
+      return
+  end
+  local smokedist = 8000
+  if smokedist < self.approachdist_far then smokedist = self.approachdist_far end
+  local _closest = self:_GetClosestDownedPilot(_heli)
+  if _closest ~= nil and _closest.pilot ~= nil and _closest.distance > 0 and _closest.distance < smokedist then
+      local _clockDir = self:_GetClockDirection(_heli, _closest.pilot)
+      local _distance = string.format("%.1fkm",_closest.distance/1000)
+      if _SETTINGS:IsImperial() then
+        _distance = string.format("%.1fnm",UTILS.MetersToNM(_closest.distance))
+      else
+        _distance = string.format("%.1fkm",_closest.distance/1000)
+      end 
+      local _msg = string.format("%s - IR Strobe active at your %s o\'clock. Distance %s", self:_GetCustomCallSign(_unitName), _clockDir, _distance)
+      self:_DisplayMessageToSAR(_heli, _msg, self.messageTime, false, true, true)
+      _closest.pilot:NewIRMarker(true,self.IRStrobeRuntime or 300)
+  else
+      local _distance = string.format("%.1fkm",smokedist/1000)
+      if _SETTINGS:IsImperial() then
+        _distance = string.format("%.1fnm",UTILS.MetersToNM(smokedist))
+      else
+        _distance = string.format("%.1fkm",smokedist/1000)
+      end 
+      self:_DisplayMessageToSAR(_heli, string.format("No Pilots within %s",_distance), self.messageTime, false, false, true)
+  end
+  return self
+end
+
 ---(Internal) Request smoke at closest downed pilot.
 --@param #CSAR self
 --@param #string _unitName Name of the helicopter
@@ -2111,12 +2172,12 @@ function CSAR:_AddMedevacMenuItem()
   local coalition = self.coalition
   local allheligroupset = self.allheligroupset -- Core.Set#SET_GROUP
   local _allHeliGroups = allheligroupset:GetSetObjects()
-
   -- rebuild units table
   local _UnitList = {}
   for _key, _group in pairs (_allHeliGroups) do  
-    local _unit = _group:GetUnit(1) -- Asume that there is only one unit in the flight for players
+    local _unit = _group:GetFirstUnitAlive() -- Asume that there is only one unit in the flight for players
-    if _unit then 
+    if _unit then
+      --self:T("Unitname ".._unit:GetName().." IsAlive "..tostring(_unit:IsAlive()).." IsPlayer "..tostring(_unit:IsPlayer())) 
       if _unit:IsAlive() and _unit:IsPlayer() then         
         local unitName = _unit:GetName()
             _UnitList[unitName] = unitName
@@ -2139,7 +2200,12 @@ function CSAR:_AddMedevacMenuItem()
           local _rootMenu1 = MENU_GROUP_COMMAND:New(_group,"List Active CSAR",_rootPath, self._DisplayActiveSAR,self,_unitName)
           local _rootMenu2 = MENU_GROUP_COMMAND:New(_group,"Check Onboard",_rootPath, self._CheckOnboard,self,_unitName)
           local _rootMenu3 = MENU_GROUP_COMMAND:New(_group,"Request Signal Flare",_rootPath, self._SignalFlare,self,_unitName)
-          local _rootMenu4 = MENU_GROUP_COMMAND:New(_group,"Request Smoke",_rootPath, self._Reqsmoke,self,_unitName):Refresh()
+          local _rootMenu4 = MENU_GROUP_COMMAND:New(_group,"Request Smoke",_rootPath, self._Reqsmoke,self,_unitName)
+          if self.AllowIRStrobe then
+            local _rootMenu5 = MENU_GROUP_COMMAND:New(_group,"Request IR Strobe",_rootPath, self._ReqIRStrobe,self,_unitName):Refresh()
+          else
+            _rootMenu4:Refresh()
+          end
         end
       end
     end
@@ -2230,9 +2296,13 @@ end
 -- @param #CSAR self
 -- @param Wrapper.Group#GROUP _group Group #GROUP object.
 -- @param #number _freq Frequency to use
-function CSAR:_AddBeaconToGroup(_group, _freq)
+-- @param #string _name Beacon Name to use
+-- @return #CSAR self
+function CSAR:_AddBeaconToGroup(_group, _freq, _name)
     self:T(self.lid .. " _AddBeaconToGroup")
+    if self.CreateRadioBeacons == false then return end
     local _group = _group   
+    
     if _group == nil then
         --return frequency to pool of available
         for _i, _current in ipairs(self.UsedVHFFrequencies) do
@@ -2247,22 +2317,24 @@ function CSAR:_AddBeaconToGroup(_group, _freq)
     if _group:IsAlive() then
       local _radioUnit = _group:GetUnit(1)
       if _radioUnit then    
-     local name = _radioUnit:GetName()
+        local name = _radioUnit:GetName()
         local Frequency = _freq -- Freq in Hertz
         local name = _radioUnit:GetName()
         local Sound =  "l10n/DEFAULT/"..self.radioSound
         local vec3 = _radioUnit:GetVec3() or _radioUnit:GetPositionVec3() or {x=0,y=0,z=0}
-        trigger.action.radioTransmission(Sound, vec3, 0, false, Frequency, self.ADFRadioPwr or 1000,name..math.random(1,10000)) -- Beacon in MP only runs for exactly 30secs straight
+        trigger.action.radioTransmission(Sound, vec3, 0, false, Frequency, self.ADFRadioPwr or 1000,_name) -- Beacon in MP only runs for exactly 30secs straight
       end
     end
+    
     return self
 end
 
 --- (Internal) Helper function to (re-)add beacon to downed pilot.
 -- @param #CSAR self
--- @param #table _args Arguments
+-- @return #CSAR self
 function CSAR:_RefreshRadioBeacons()
     self:T(self.lid .. " _RefreshRadioBeacons")
+    if self.CreateRadioBeacons == false then return end
     if self:_CountActiveDownedPilots() > 0 then
       local PilotTable = self.downedPilots
       for _,_pilot in pairs (PilotTable) do
@@ -2270,8 +2342,10 @@ function CSAR:_RefreshRadioBeacons()
         local pilot = _pilot -- #CSAR.DownedPilot
         local group = pilot.group
         local frequency = pilot.frequency or 0 -- thanks to @Thrud
+        local bname = pilot.BeaconName or pilot.name..math.random(1,100000)
+        trigger.action.stopRadioTransmission(bname)
         if group and group:IsAlive() and frequency > 0 then
-          self:_AddBeaconToGroup(group,frequency)
+          self:_AddBeaconToGroup(group,frequency,bname)
         end
       end
     end
@@ -2308,6 +2382,16 @@ function CSAR:_ReachedPilotLimit()
    end
 end
 
+  --- User - Function to add onw SET_GROUP Set-up for pilot filtering and assignment.
+  -- Needs to be set before starting the CSAR instance.
+  -- @param #CSAR self
+  -- @param Core.Set#SET_GROUP Set The SET_GROUP object created by the mission designer/user to represent the CSAR pilot groups.
+  -- @return #CSAR self 
+  function CSAR:SetOwnSetPilotGroups(Set)
+    self.UserSetGroup = Set
+    return self
+  end
+
   ------------------------------
   --- FSM internal Functions ---
   ------------------------------
@@ -2329,7 +2413,9 @@ function CSAR:onafterStart(From, Event, To)
   self:HandleEvent(EVENTS.PlayerEnterUnit, self._EventHandler)
   self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
   
-  if self.allowbronco then
+  if self.UserSetGroup then
+    self.allheligroupset  = self.UserSetGroup
+  elseif self.allowbronco then
     local prefixes = self.csarPrefix or {}
     self.allheligroupset = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(prefixes):FilterStart()
   elseif self.useprefix then
@@ -2338,7 +2424,9 @@ function CSAR:onafterStart(From, Event, To)
   else
     self.allheligroupset = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterCategoryHelicopter():FilterStart()
   end
+  
   self.mash = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(self.mashprefix):FilterStart() -- currently only GROUP objects, maybe support STATICs also?
+  
   if not self.coordinate then
     local csarhq = self.mash:GetRandom()
     if csarhq then 

Moose Development/Moose/Ops/Chief.lua

@@ -34,6 +34,7 @@
 -- @field Ops.Commander#COMMANDER commander Commander of assigned legions.
 -- @field #number Nsuccess Number of successful missions.
 -- @field #number Nfailure Number of failed mission.
+-- @field #table assetNumbers Asset numbers. Each entry is a table of data type `#CHIEF.AssetNumber`.
 -- @extends Ops.Intel#INTEL
 
 --- *In preparing for battle I have always found that plans are useless, but planning is indispensable* -- Dwight D Eisenhower
@@ -163,7 +164,7 @@
 -- 
 -- Will at a strategic zone with importance 2.
 -- 
--- If the zone is currently owned by another coalition and enemy ground troops are present in the zone, a CAS and an ARTY mission are lauchned:
+-- If the zone is currently owned by another coalition and enemy ground troops are present in the zone, a CAS and an ARTY mission are launched:
 -- 
 -- * A mission of type `AUFTRAG.Type.CASENHANCED` is started if assets are available that can carry out this mission type.
 -- * A mission of type `AUFTRAG.Type.ARTY` is started provided assets are available.
@@ -331,7 +332,7 @@ CHIEF.Strategy = {
 
 --- CHIEF class version.
 -- @field #string version
-CHIEF.version="0.6.0"
+CHIEF.version="0.6.1"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1284,8 +1285,10 @@ end
 -- 
 -- Empty:
 -- 
--- * `AUFTRAG.Type.ONGURAD` with Nmin=1 and Nmax=1 assets, Attribute=`GROUP.Attribute.GROUND_TANK`.
+-- * `AUFTRAG.Type.ONGURAD` with Nmin=0 and Nmax=1 assets, Attribute=`GROUP.Attribute.GROUND_TANK`.
+-- * `AUFTRAG.Type.ONGURAD` with Nmin=0 and Nmax=1 assets, Attribute=`GROUP.Attribute.GROUND_IFV`.
 -- * `AUFTRAG.Type.ONGUARD` with Nmin=1 and Nmax=3 assets, Attribute=`GROUP.Attribute.GROUND_INFANTRY`.
+-- * `AUFTRAG.Type.OPSTRANSPORT` with Nmin=0 and Nmax=1 assets, Attribute=`GROUP.Attribute.AIR_TRANSPORTHELO` or `GROUP.Attribute.GROUND_APC`. This asset is used to transport the infantry groups.
 -- 
 -- Resources can be created with the @{#CHIEF.CreateResource} and @{#CHIEF.AddToResource} functions.
 -- 
@@ -3033,10 +3036,13 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
   end
 
   -- Recruite infantry assets.
+  self:T(self.lid..string.format("Recruiting assets for zone %s", StratZone.opszone:GetName()))
   self:T(self.lid.."Missiontype="..MissionType)
   self:T({categories=Categories})
   self:T({attributes=Attributes})
   self:T({properties=Properties})
+  
+  
   local recruited, assets, legions=LEGION.RecruitCohortAssets(Cohorts, MissionType, nil, NassetsMin, NassetsMax, TargetVec2, nil, RangeMax, nil, nil, nil, nil, Categories, Attributes, Properties)
   
   if recruited then
@@ -3052,9 +3058,12 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
     local TargetCoord = TargetZone:GetCoordinate()
 
     -- First check if we need a transportation.
-    local transport=nil    
+    local transport=nil --Ops.OpsTransport#OPSTRANSPORT
+    local Ntransports=0
     if Resource.carrierNmin and Resource.carrierNmax and Resource.carrierNmax>0 then
     
+      self:T(self.lid..string.format("Recruiting carrier assets: Nmin=%s, Nmax=%s", tostring(Resource.carrierNmin), tostring(Resource.carrierNmax)))
+    
       -- Filter only those assets that shall be transported.
       local cargoassets=CHIEF._FilterAssets(assets, Resource.Categories, Resource.Attributes, Resource.Properties)
       
@@ -3064,6 +3073,10 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
         recruited, transport=LEGION.AssignAssetsForTransport(self.commander, self.commander.legions, cargoassets, 
         Resource.carrierNmin, Resource.carrierNmax, TargetZone, nil, Resource.carrierCategories, Resource.carrierAttributes, Resource.carrierProperties)
         
+        Ntransports=transport~=nil and #transport.assets or 0
+        
+        self:T(self.lid..string.format("Recruited %d transport carrier assets success=%s", Ntransports, tostring(recruited)))
+        
       end
     
     end
@@ -3076,7 +3089,7 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
       return false
     end
 
-    -- Debug messgage.
+    -- Debug message
     self:T2(self.lid..string.format("Recruited %d assets for mission %s", #assets, MissionType))
     
   
@@ -3224,10 +3237,13 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
       -- Attach mission to ops zone.
       StratZone.opszone:_AddMission(self.coalition, MissionType, mission)
       
+      mission:SetName(string.format("Stratzone %s-%d", StratZone.opszone:GetName(), mission.auftragsnummer))
+      
       -- Attach mission to resource.
       Resource.mission=mission
       
-      if transport then
+      -- Check if transport assets could be allocated. If carrier Nmin=0 and 0 assets could be allocated, transport would still be created but not usefull obviously
+      if transport and Ntransports>0 then
         -- Attach OPS transport to mission.
         mission.opstransport=transport
         -- Set ops zone to transport.
@@ -3240,7 +3256,7 @@ function CHIEF:RecruitAssetsForZone(StratZone, Resource)
     else
       
       -- Mission not supported.
-      self:E(self.lid..string.format("ERROR: Mission type not supported for OPSZONE! Unrecruiting assets..."))
+      self:E(self.lid..string.format("ERROR: Mission type %s not supported for OPSZONE! Unrecruiting assets...", tostring(MissionType)))
       LEGION.UnRecruitAssets(assets)
       
       return false  

Moose Development/Moose/Ops/Cohort.lua

@@ -577,7 +577,7 @@ function COHORT:AddAsset(Asset)
   return self
 end
 
---- Remove asset from chort.
+--- Remove specific asset from chort.
 -- @param #COHORT self
 -- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The asset.
 -- @return #COHORT self
@@ -609,6 +609,40 @@ function COHORT:DelGroup(GroupName)
   return self
 end
 
+--- Remove assets from pool. Not that assets must not be spawned or already reserved or requested.
+-- @param #COHORT self
+-- @param #number N Number of assets to be removed. Default 1.
+-- @return #COHORT self
+function COHORT:RemoveAssets(N)
+  self:T2(self.lid..string.format("Remove %d assets of Cohort", N))
+
+  N=N or 1
+  
+  local n=0
+  for i=#self.assets,1,-1 do
+    local asset=self.assets[i] --Functional.Warehouse#WAREHOUSE.Assetitem
+  
+    self:T2(self.lid..string.format("Checking removing asset %s", asset.spawngroupname))
+    if not (asset.requested or asset.spawned or asset.isReserved) then
+      self:T2(self.lid..string.format("Removing asset %s", asset.spawngroupname))
+      table.remove(self.assets, i)
+      n=n+1
+    else
+      self:T2(self.lid..string.format("Could NOT Remove asset %s", asset.spawngroupname))
+    end
+    
+    if n>=N then
+      break
+    end
+  
+  end
+  
+  self:T(self.lid..string.format("Removed %d/%d assets. New asset count=%d", n, N, #self.assets))
+
+  return self
+end
+
+
 --- Get name of the cohort.
 -- @param #COHORT self
 -- @return #string Name of the cohort.
@@ -975,6 +1009,7 @@ function COHORT:CanMission(Mission)
   
     if Mission.refuelSystem and Mission.refuelSystem==self.tankerSystem then
       -- Correct refueling system.
+      self:T(self.lid..string.format("INFO: Correct refueling system requested=%s != %s=available", tostring(Mission.refuelSystem), tostring(self.tankerSystem)))
     else
       self:T(self.lid..string.format("INFO: Wrong refueling system requested=%s != %s=available", tostring(Mission.refuelSystem), tostring(self.tankerSystem)))
       return false

Moose Development/Moose/Ops/EasyGCICAP.lua

@@ -7,6 +7,7 @@
 -- 
 -------------------------------------------------------------------------
 -- Date: September 2023
+-- Last Update: July 2024
 -------------------------------------------------------------------------
 --
 --- **Ops** - Easy GCI & CAP Manager
@@ -65,6 +66,9 @@
 -- @field #boolean TankerInvisible
 -- @field #number CapFormation
 -- @field #table ReadyFlightGroups
+-- @field #boolean DespawnAfterLanding
+-- @field #boolean DespawnAfterHolding
+-- @field #list<Ops.Auftrag#AUFTRAG> ListOfAuftrag
 -- @extends Core.Fsm#FSM
 
 --- *“Airspeed, altitude, and brains. Two are always needed to successfully complete the flight.”* -- Unknown.
@@ -93,7 +97,8 @@
 -- 
 -- ### Prerequisites
 -- 
--- You have to put a STATIC object on the airbase with the UNIT name according to the name of the airbase. E.g. for Kuitaisi this has to have the name Kutaisi. This object symbolizes the AirWing HQ.
+-- You have to put a **STATIC WAREHOUSE** object on the airbase with the UNIT name according to the name of the airbase. **Do not put any other static type or it creates a conflict with the airbase name!** 
+-- E.g. for Kuitaisi this has to have the unit name Kutaisi. This object symbolizes the AirWing HQ.
 -- Next put a late activated template group for your CAP/GCI Squadron on the map. Last, put a zone on the map for the CAP operations, let's name it "Blue Zone 1". Size of the zone plays no role.
 -- Put an EW radar system on the map and name it aptly, like "Blue EWR".
 -- 
@@ -209,6 +214,9 @@ EASYGCICAP = {
   TankerInvisible = true,
   CapFormation = nil,
   ReadyFlightGroups = {},
+  DespawnAfterLanding = false,
+  DespawnAfterHolding = true,
+  ListOfAuftrag = {}
 }
 
 --- Internal Squadron data type
@@ -244,7 +252,7 @@ EASYGCICAP = {
 
 --- EASYGCICAP class version.
 -- @field #string version
-EASYGCICAP.version="0.1.10"
+EASYGCICAP.version="0.1.13"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -292,6 +300,9 @@ function EASYGCICAP:New(Alias, AirbaseName, Coalition, EWRName)
   self.Monitor = false
   self.TankerInvisible = true
   self.CapFormation = ENUMS.Formation.FixedWing.FingerFour.Group
+  self.DespawnAfterLanding = false
+  self.DespawnAfterHolding = true
+  self.ListOfAuftrag = {}
   
   -- Set some string id for output to DCS.log file.
   self.lid=string.format("EASYGCICAP %s | ", self.alias)
@@ -341,7 +352,7 @@ end
 -- @param #number Maxiumum Maxmimum number of parallel missions allowed. Count is Cap-Missions + Intercept-Missions + Alert5-Missionsm default is 6
 -- @return #EASYGCICAP self 
 function EASYGCICAP:SetMaxAliveMissions(Maxiumum)
-  self:T(self.lid.."SetDefaultResurrection")
+  self:T(self.lid.."SetMaxAliveMissions")
   self.MaxAliveMissions = Maxiumum or 8
   return self
 end
@@ -458,6 +469,26 @@ function EASYGCICAP:SetDefaultOverhead(Overhead)
   return self
 end
 
+--- Set default despawning after landing.
+-- @param #EASYGCICAP self
+-- @return #EASYGCICAP self
+function EASYGCICAP:SetDefaultDespawnAfterLanding()
+  self:T(self.lid.."SetDefaultDespawnAfterLanding")
+  self.DespawnAfterLanding = true
+  self.DespawnAfterHolding = false
+  return self
+end
+
+--- Set default despawning after holding (despawn in air close to AFB).
+-- @param #EASYGCICAP self
+-- @return #EASYGCICAP self
+function EASYGCICAP:SetDefaultDespawnAfterHolding()
+  self:T(self.lid.."SetDefaultDespawnAfterLanding")
+  self.DespawnAfterLanding = false
+  self.DespawnAfterHolding = true
+  return self
+end
+
 --- Set CAP mission start to vary randomly between Start end End seconds.
 -- @param #EASYGCICAP self
 -- @param #number Start
@@ -512,6 +543,8 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
   self:T(self.lid.."_AddAirwing "..Airbasename)
   
   local CapFormation = self.CapFormation
+  local DespawnAfterLanding = self.DespawnAfterLanding
+  local DespawnAfterHolding = self.DespawnAfterHolding
   
   -- Create Airwing
   local CAP_Wing = AIRWING:New(Airbasename,Alias)
@@ -553,8 +586,11 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
   
   function CAP_Wing:OnAfterFlightOnMission(From, Event, To, Flightgroup, Mission)
     local flightgroup = Flightgroup -- Ops.FlightGroup#FLIGHTGROUP
-    --flightgroup:SetDespawnAfterLanding()
+    if DespawnAfterLanding then
-    flightgroup:SetDespawnAfterHolding()
+      flightgroup:SetDespawnAfterLanding()
+    elseif DespawnAfterHolding then
+      flightgroup:SetDespawnAfterHolding()
+    end
     flightgroup:SetDestinationbase(AIRBASE:FindByName(Airbasename))
     flightgroup:GetGroup():CommandEPLRS(true,5)
     flightgroup:GetGroup():SetOptionRadarUsingForContinousSearch()
@@ -577,10 +613,11 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
     flightgroup:GetGroup():OptionROTEvadeFire()   
     flightgroup:SetFuelLowRTB(true)
     Intel:AddAgent(flightgroup)
-    function flightgroup:OnAfterHolding(From,Event,To)
+    if DespawnAfterHolding then
-      self:Despawn(1,true)
+      function flightgroup:OnAfterHolding(From,Event,To)
-    end 
+        self:Despawn(1,true)
-    
+      end 
+    end
   end
   
   if self.noaltert5 > 0 then  
@@ -588,6 +625,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
     alert:SetRequiredAssets(self.noaltert5)
     alert:SetRepeat(99) 
     CAP_Wing:AddMission(alert)
+    table.insert(self.ListOfAuftrag,alert)
   end
     
   self.wings[Airbasename] = { CAP_Wing, AIRBASE:FindByName(Airbasename):GetZone(), Airbasename }
@@ -1124,7 +1162,7 @@ function EASYGCICAP:_TryAssignIntercept(ReadyFlightGroups,InterceptAuftrag,Group
   return assigned, wingsize
 end
 
---- Add a zone to the rejected zones set.
+--- Here, we'll decide if we need to launch an intercepting flight, and from where
 -- @param #EASYGCICAP self
 -- @param Ops.Intel#INTEL.Cluster Cluster
 -- @return #EASYGCICAP self 
@@ -1168,9 +1206,11 @@ function EASYGCICAP:_AssignIntercept(Cluster)
       local zone = _data[2] -- Core.Zone#ZONE
       local zonecoord = zone:GetCoordinate()
       local name = _data[3] -- #string
+      local coa = AIRBASE:FindByName(name):GetCoalition()
       local distance = position:DistanceFromPointVec2(zonecoord)
       local airframes = airwing:CountAssets(true)
-      if distance < bestdistance and airframes >= wingsize then
+      local samecoalitionab = coa == self.coalition and true or false
+      if distance < bestdistance and airframes >= wingsize and samecoalitionab == true then
         bestdistance = distance
         targetairwing = airwing
         targetawname = name
@@ -1186,10 +1226,11 @@ function EASYGCICAP:_AssignIntercept(Cluster)
       local name = data.AirbaseName
       local zonecoord = data.Coordinate
       local airwing = wings[name][1]
-      
+      local coa = AIRBASE:FindByName(name):GetCoalition()
+      local samecoalitionab = coa == self.coalition and true or false
       local distance = position:DistanceFromPointVec2(zonecoord)
       local airframes = airwing:CountAssets(true)
-      if distance < bestdistance and airframes >= wingsize then
+      if distance < bestdistance and airframes >= wingsize and samecoalitionab == true then
         bestdistance = distance
         targetairwing = airwing -- Ops.Airwing#AIRWING
         targetawname = name
@@ -1228,6 +1269,8 @@ function EASYGCICAP:_AssignIntercept(Cluster)
               nogozoneset
             )
           end
+          
+        table.insert(self.ListOfAuftrag,InterceptAuftrag)
         local assigned, rest = self:_TryAssignIntercept(ReadyFlightGroups,InterceptAuftrag,contact.group,wingsize)
         if not assigned  then
           InterceptAuftrag:SetRequiredAssets(rest)
@@ -1319,6 +1362,20 @@ end
 -- @return #EASYGCICAP self
 function EASYGCICAP:onafterStatus(From,Event,To)
   self:T({From,Event,To})
+  -- cleanup
+  local cleaned = false
+  local cleanlist = {}
+  for _,_auftrag in pairs(self.ListOfAuftrag) do
+    local auftrag = _auftrag -- Ops.Auftrag#AUFTRAG
+    if auftrag and (not (auftrag:IsCancelled() or auftrag:IsDone() or auftrag:IsOver())) then
+      table.insert(cleanlist,auftrag)
+      cleaned = true
+    end
+  end
+  if cleaned == true then
+    self.ListOfAuftrag = nil
+    self.ListOfAuftrag = cleanlist
+  end
   -- Gather Some Stats
   local function counttable(tbl)
     local count = 0

Moose Development/Moose/Ops/Fleet.lua

@@ -334,6 +334,9 @@ function FLEET:onafterStatus(From, Event, To)
   -- Info ---
   -----------    
 
+  -- Display tactival overview.
+  self:_TacticalOverview()
+
   -- General info:
   if self.verbose>=1 then
 

Moose Development/Moose/Ops/FlightGroup.lua

@@ -3815,18 +3815,9 @@ function FLIGHTGROUP:_InitGroup(Template)
   -- Group object.
   local group=self.group --Wrapper.Group#GROUP
 
-  -- Get template of group.
-  local template=Template or self:_GetTemplate()
-
   -- Helo group.
   self.isHelo=group:IsHelicopter()
 
-  -- Is (template) group uncontrolled.
-  self.isUncontrolled=template.uncontrolled
-
-  -- Is (template) group late activated.
-  self.isLateActivated=template.lateActivation
-
   -- Max speed in km/h.
   self.speedMax=group:GetSpeedMax()
   
@@ -3846,25 +3837,38 @@ function FLIGHTGROUP:_InitGroup(Template)
 
   -- Group ammo.
   self.ammo=self:GetAmmoTot()
+  
+  -- Get template of group.
+  local template=Template or self:_GetTemplate()  
 
-  -- Radio parameters from template. Default is set on spawn if not modified by user.
+  -- Is (template) group uncontrolled.
-  self.radio.Freq=tonumber(template.frequency)
+  self.isUncontrolled=template~=nil and template.uncontrolled or false
-  self.radio.Modu=tonumber(template.modulation)
-  self.radio.On=template.communication
 
-  -- Set callsign. Default is set on spawn if not modified by user.
+  -- Is (template) group late activated.
-  local callsign=template.units[1].callsign
+  self.isLateActivated=template~=nil and template.lateActivation or false
-  --self:I({callsign=callsign})
+
-  if type(callsign)=="number" then  -- Sometimes callsign is just "101".
+  if template then
-    local cs=tostring(callsign)
+
-    callsign={}
+    -- Radio parameters from template. Default is set on spawn if not modified by user.
-    callsign[1]=cs:sub(1,1)
+    self.radio.Freq=tonumber(template.frequency)
-    callsign[2]=cs:sub(2,2)
+    self.radio.Modu=tonumber(template.modulation)
-    callsign[3]=cs:sub(3,3)
+    self.radio.On=template.communication
+  
+    -- Set callsign. Default is set on spawn if not modified by user.
+    local callsign=template.units[1].callsign
+    --self:I({callsign=callsign})
+    if type(callsign)=="number" then  -- Sometimes callsign is just "101".
+      local cs=tostring(callsign)
+      callsign={}
+      callsign[1]=cs:sub(1,1)
+      callsign[2]=cs:sub(2,2)
+      callsign[3]=cs:sub(3,3)
+    end
+    self.callsign.NumberSquad=tonumber(callsign[1])
+    self.callsign.NumberGroup=tonumber(callsign[2])
+    self.callsign.NameSquad=UTILS.GetCallsignName(self.callsign.NumberSquad)
+    
   end
-  self.callsign.NumberSquad=tonumber(callsign[1])
-  self.callsign.NumberGroup=tonumber(callsign[2])
-  self.callsign.NameSquad=UTILS.GetCallsignName(self.callsign.NumberSquad)
 
   -- Set default formation.
   if self.isHelo then

Moose Development/Moose/Ops/Legion.lua

@@ -21,6 +21,7 @@
 -- @field #table cohorts Cohorts of this legion.
 -- @field Ops.Commander#COMMANDER commander Commander of this legion.
 -- @field Ops.Chief#CHIEF chief Chief of this legion.
+-- @field #boolean tacview If `true`, show tactical overview on status update.
 -- @extends Functional.Warehouse#WAREHOUSE
 
 --- *Per aspera ad astra.*
@@ -322,6 +323,14 @@ function LEGION:SetVerbosity(VerbosityLevel)
   return self
 end
 
+--- Set tactical overview on.
+-- @param #LEGION self
+-- @return #LEGION self
+function LEGION:SetTacticalOverviewOn()  
+  self.tacview=true
+  return self
+end
+
 --- Add a mission for the legion. It will pick the best available assets for the mission and lauch it when ready. 
 -- @param #LEGION self
 -- @param Ops.Auftrag#AUFTRAG Mission Mission for this legion.
@@ -1772,7 +1781,7 @@ end
 -- Mission Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- Create a new flight group after an asset was spawned.
+--- Create a new OPS group after an asset was spawned.
 -- @param #LEGION self
 -- @param Functional.Warehouse#WAREHOUSE.Assetitem asset The asset.
 -- @return Ops.FlightGroup#FLIGHTGROUP The created flightgroup object.
@@ -1836,6 +1845,53 @@ function LEGION:_CreateFlightGroup(asset)
   return opsgroup
 end
 
+--- Display tactical overview.
+-- @param #LEGION self 
+function LEGION:_TacticalOverview()
+
+  if self.tacview then
+
+    local NassetsTotal=self:CountAssets(nil)
+    local NassetsStock=self:CountAssets(true)
+    local NassetsActiv=self:CountAssets(false)
+  
+    local NmissionsTotal=#self.missionqueue
+    local NmissionsRunni=self:CountMissionsInQueue()
+  
+    -- Info message
+    local text=string.format("Tactical Overview %s\n", self.alias)
+    text=text..string.format("===================================\n")
+  
+    -- Asset info.
+    text=text..string.format("Assets: %d [Active=%d, Stock=%d]\n", NassetsTotal, NassetsActiv, NassetsStock)
+  
+    -- Mission info.
+    text=text..string.format("Missions: %d [Running=%d]\n", NmissionsTotal, NmissionsRunni)
+    for _,mtype in pairs(AUFTRAG.Type) do
+      local n=self:CountMissionsInQueue(mtype)
+      if n>0 then
+        local N=self:CountMissionsInQueue(mtype)
+        text=text..string.format("  - %s: %d [Running=%d]\n", mtype, n, N)
+      end
+    end
+  
+    
+    local Ntransports=#self.transportqueue
+    if Ntransports>0 then
+      text=text..string.format("Transports: %d\n", Ntransports)
+      for _,_transport in pairs(self.transportqueue) do
+        local transport=_transport --Ops.OpsTransport#OPSTRANSPORT
+        text=text..string.format(" - %s", transport:GetState())
+      end
+    end
+  
+    -- Message to coalition.
+    MESSAGE:New(text, 60, nil, true):ToCoalition(self:GetCoalition())  
+  
+    
+  end
+  
+end
 
 --- Check if an asset is currently on a mission (STARTED or EXECUTING).
 -- @param #LEGION self
@@ -2563,6 +2619,8 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti
     local RangeMax = RangeMax or 0    
     local InRange=(RangeMax and math.max(RangeMax, Rmax) or Rmax) >= TargetDistance
     
+    --env.info(string.format("Range TargetDist=%.1f Rmax=%.1f RangeMax=%.1f InRange=%s", TargetDistance, Rmax, RangeMax, tostring(InRange)))
+    
     return InRange    
   end
 
@@ -2628,7 +2686,7 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti
   else
     Cohort:T(Cohort.lid..string.format("Cohort %s cannot because of category", Cohort.name))
     return false  
-  end  
+  end
   
   if can then
     can=CheckAttribute(Cohort)
@@ -2684,7 +2742,7 @@ function LEGION._CohortCan(Cohort, MissionType, Categories, Attributes, Properti
   else
     Cohort:T(Cohort.lid..string.format("Cohort %s cannot because of max weight", Cohort.name))
     return false
-  end  
+  end
   
   return nil
 end
@@ -2728,6 +2786,8 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
     
     -- Check if cohort can do the mission.
     local can=LEGION._CohortCan(cohort, MissionTypeRecruit, Categories, Attributes, Properties, WeaponTypes, TargetVec2, RangeMax, RefuelSystem, CargoWeight, MaxWeight)
+
+    --env.info(string.format("RecruitCohortAssets %s Cohort=%s can=%s", MissionTypeRecruit, cohort:GetName(), tostring(can)))
     
     -- Check OnDuty, capable, in range and refueling type (if TANKER).
     if can then
@@ -2744,6 +2804,12 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
     
   end
   
+  -- Break if no assets could be found
+  if #Assets==0 then
+    --env.info(string.format("LEGION.RecruitCohortAssets: No assets could be recruited for mission type %s [Nmin=%s, Nmax=%s]", MissionTypeRecruit, tostring(NreqMin), tostring(NreqMax)))
+    return false, {}, {}  
+  end
+  
   -- Now we have a long list with assets.
   LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, false, TotalWeight)
   

Moose Development/Moose/Ops/NavyGroup.lua

@@ -44,6 +44,7 @@
 -- @field #number pathCorridor Path corrdidor width in meters.
 -- @field #boolean ispathfinding If true, group is currently path finding.
 -- @field #NAVYGROUP.Target engage Engage target.
+-- @field #boolean intowindold Use old calculation to determine heading into wind.
 -- @extends Ops.OpsGroup#OPSGROUP
 
 --- *Something must be left to chance; nothing is sure in a sea fight above all.* -- Horatio Nelson
@@ -393,7 +394,8 @@ function NAVYGROUP:New(group)
   -- Handle events:
   self:HandleEvent(EVENTS.Birth,      self.OnEventBirth)
   self:HandleEvent(EVENTS.Dead,       self.OnEventDead)
-  self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit)  
+  self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit)
+  self:HandleEvent(EVENTS.UnitLost, self.OnEventRemoveUnit)  
   
   -- Start the status monitoring.
   self.timerStatus=TIMER:New(self.Status, self):Start(1, 30)
@@ -455,6 +457,18 @@ function NAVYGROUP:SetPathfindingOff()
   return self
 end
 
+--- Set if old into wind calculation is used when carrier turns into the wind for a recovery.
+-- @param #NAVYGROUP self
+-- @param #boolean SwitchOn If `true` or `nil`, use old into wind calculation.
+-- @return #NAVYGROUP self
+function NAVYGROUP:SetIntoWindLegacy( SwitchOn )
+  if SwitchOn==nil then
+    SwitchOn=true
+  end
+  self.intowindold=SwitchOn
+  return self
+end
+
 
 --- Add a *scheduled* task.
 -- @param #NAVYGROUP self
@@ -600,6 +614,58 @@ function NAVYGROUP:AddTurnIntoWind(starttime, stoptime, speed, uturn, offset)
   return recovery
 end
 
+--- Get "Turn Into Wind" data. You can specify a certain ID.
+-- @param #NAVYGROUP self
+-- @param #number TID (Optional) Turn Into wind ID. If not given, the currently open "Turn into Wind" data is return (if there is any).
+-- @return #NAVYGROUP.IntoWind Turn into window data table.
+function NAVYGROUP:GetTurnIntoWind(TID)
+
+  if TID then
+  
+    -- Look for a specific ID.
+    for _,_turn in pairs(self.Qintowind) do
+      local turn=_turn --#NAVYGROUP.IntoWind      
+      if turn.Id==TID then
+        return turn
+      end    
+    end
+  
+  else
+
+    -- Return currently open window.
+    return self.intowind
+  
+  end
+
+  return nil
+end
+
+--- Extend duration of turn into wind.
+-- @param #NAVYGROUP self
+-- @param #number Duration Duration in seconds. Default 300 sec.
+-- @param #NAVYGROUP.IntoWind TurnIntoWind (Optional) Turn into window data table. If not given, the currently open one is used (if there is any).
+-- @return #NAVYGROUP self
+function NAVYGROUP:ExtendTurnIntoWind(Duration, TurnIntoWind)
+
+  Duration=Duration or 300
+
+  -- ID of turn or nil
+  local TID=TurnIntoWind and TurnIntoWind.Id or nil
+  
+  -- Get turn data.
+  local turn=self:GetTurnIntoWind(TID)
+  
+  if turn then
+    turn.Tstop=turn.Tstop+Duration
+    self:T(self.lid..string.format("Extending turn into wind by %d seconds. New stop time is %s", Duration, UTILS.SecondsToClock(turn.Tstop)))
+  else
+    self:E(self.lid.."Could not get turn into wind to extend!")
+  end
+
+  return self
+end
+
+
 --- Remove steam into wind window from queue. If the window is currently active, it is stopped first.
 -- @param #NAVYGROUP self
 -- @param #NAVYGROUP.IntoWind IntoWindData Turn into window data table.
@@ -2068,8 +2134,43 @@ end
 --- Get heading of group into the wind.
 -- @param #NAVYGROUP self
 -- @param #number Offset Offset angle in degrees, e.g. to account for an angled runway.
+-- @param #number vdeck Desired wind speed on deck in Knots.
 -- @return #number Carrier heading in degrees.
-function NAVYGROUP:GetHeadingIntoWind_old(Offset)
+-- @return #number Carrier speed in knots.
+function NAVYGROUP:GetHeadingIntoWind_old(Offset, vdeck)
+
+  local function adjustDegreesForWindSpeed(windSpeed)
+    local degreesAdjustment = 0
+    -- the windspeeds are in m/s    
+    -- +0 degrees at 15m/s = 37kts
+    -- +0 degrees at 14m/s = 35kts
+    -- +0 degrees at 13m/s = 33kts
+    -- +4 degrees at 12m/s = 31kts
+    -- +4 degrees at 11m/s = 29kts
+    -- +4 degrees at 10m/s = 27kts
+    -- +4 degrees at 9m/s = 27kts
+    -- +4 degrees at 8m/s = 27kts
+    -- +8 degrees at 7m/s = 27kts
+    -- +8 degrees at 6m/s = 27kts
+    -- +8 degrees at 5m/s = 26kts
+    -- +20 degrees at 4m/s = 26kts
+    -- +20 degrees at 3m/s = 26kts
+    -- +30 degrees at 2m/s = 26kts 1s
+  
+    if windSpeed > 0 and windSpeed < 3 then
+      degreesAdjustment = 30
+    elseif windSpeed >= 3 and windSpeed < 5 then
+      degreesAdjustment = 20
+    elseif windSpeed >= 5 and windSpeed < 8 then
+      degreesAdjustment = 8
+    elseif windSpeed >= 8 and windSpeed < 13 then
+      degreesAdjustment = 4
+    elseif windSpeed >= 13 then
+      degreesAdjustment = 0
+    end
+  
+    return degreesAdjustment
+  end
 
   Offset=Offset or 0
 
@@ -2077,7 +2178,7 @@ function NAVYGROUP:GetHeadingIntoWind_old(Offset)
   local windfrom, vwind=self:GetWind()
 
   -- Actually, we want the runway in the wind.
-  local intowind=windfrom-Offset
+  local intowind = windfrom - Offset + adjustDegreesForWindSpeed(vwind)
 
   -- If no wind, take current heading.
   if vwind<0.1 then
@@ -2088,8 +2189,11 @@ function NAVYGROUP:GetHeadingIntoWind_old(Offset)
   if intowind<0 then
     intowind=intowind+360
   end
+
+  -- Speed of carrier in m/s but at least 4 knots.
+  local vtot = math.max(vdeck-UTILS.MpsToKnots(vwind), 4)
   
-  return intowind
+  return intowind, vtot
 end
 
 
@@ -2099,7 +2203,8 @@ end
 -- @param #number Offset Offset angle in degrees, e.g. to account for an angled runway.
 -- @param #number vdeck Desired wind speed on deck in Knots.
 -- @return #number Carrier heading in degrees.
-function NAVYGROUP:GetHeadingIntoWind(Offset, vdeck)
+-- @return #number Carrier speed in knots.
+function NAVYGROUP:GetHeadingIntoWind_new(Offset, vdeck)
 
   -- Default offset angle.
   Offset=Offset or 0
@@ -2180,6 +2285,25 @@ function NAVYGROUP:GetHeadingIntoWind(Offset, vdeck)
   return intowind, v
 end
 
+--- Get heading of group into the wind. This minimizes the cross wind for an angled runway.
+-- Implementation based on [Mags & Bami](https://magwo.github.io/carrier-cruise/) work.
+-- @param #NAVYGROUP self
+-- @param #number Offset Offset angle in degrees, e.g. to account for an angled runway.
+-- @param #number vdeck Desired wind speed on deck in Knots.
+-- @return #number Carrier heading in degrees.
+-- @return #number Carrier speed in knots.
+function NAVYGROUP:GetHeadingIntoWind(Offset, vdeck)
+
+  if self.intowindold then
+    --env.info("FF use OLD into wind")
+    return self:GetHeadingIntoWind_old(Offset, vdeck)
+  else
+    --env.info("FF use NEW into wind")
+    return self:GetHeadingIntoWind_new(Offset, vdeck)
+  end
+
+end
+
 
 --- Find free path to next waypoint.
 -- @param #NAVYGROUP self

Moose Development/Moose/Ops/OpsGroup.lua

@@ -11372,11 +11372,19 @@ end
 -- @return #OPSGROUP self
 function OPSGROUP:_InitWaypoints(WpIndexMin, WpIndexMax)
 
-  -- Template waypoints.
-  self.waypoints0=UTILS.DeepCopy(_DATABASE:GetGroupTemplate(self.groupname).route.points) --self.group:GetTemplateRoutePoints()
-
   -- Waypoints empty!
   self.waypoints={}
+  self.waypoints0={}
+
+  -- Get group template
+  local template=_DATABASE:GetGroupTemplate(self.groupname)
+
+  if template==nil then
+    return self
+  end
+
+  -- Template waypoints.
+  self.waypoints0=UTILS.DeepCopy(template.route.points) --self.group:GetTemplateRoutePoints()
 
   WpIndexMin=WpIndexMin or 1
   WpIndexMax=WpIndexMax or #self.waypoints0
@@ -13631,11 +13639,7 @@ function OPSGROUP:_AddElementByName(unitname)
   local unit=UNIT:FindByName(unitname)
 
   if unit then
-
+  
-    -- Get unit template.
-    local unittemplate=unit:GetTemplate()
-    --local unittemplate=_DATABASE:GetUnitTemplateFromUnitName(unitname)
-
     -- Element table.
     local element=self:GetElementByName(unitname)
 
@@ -13662,8 +13666,18 @@ function OPSGROUP:_AddElementByName(unitname)
     element.Nhit=0
     element.opsgroup=self
 
+    -- Get unit template.
+    local unittemplate=unit:GetTemplate()
+
+    if unittemplate==nil then
+      if element.DCSunit:getPlayerName() then
+        element.skill="Client"
+      end
+    else
+      element.skill=unittemplate~=nil and unittemplate.skill or "Unknown"
+    end
+
     -- Skill etc.
-    element.skill=unittemplate.skill or "Unknown"
     if element.skill=="Client" or element.skill=="Player" then
       element.ai=false
       element.client=CLIENT:FindByName(unitname)
@@ -13722,24 +13736,22 @@ function OPSGROUP:_AddElementByName(unitname)
       element.weightCargo=0
     end
     element.weight=element.weightEmpty+element.weightCargo
-
+    
     -- FLIGHTGROUP specific.
-    if self.isFlightgroup then
+    element.callsign=element.unit:GetCallsign()
-      element.callsign=element.unit:GetCallsign()
+    element.fuelmass=element.fuelmass0 or 99999
+    element.fuelrel=element.unit:GetFuel() or 1
+    
+    if self.isFlightgroup and unittemplate then
       element.modex=unittemplate.onboard_num
       element.payload=unittemplate.payload
       element.pylons=unittemplate.payload and unittemplate.payload.pylons or nil
       element.fuelmass0=unittemplate.payload and unittemplate.payload.fuel or 0
-      element.fuelmass=element.fuelmass0
-      element.fuelrel=element.unit:GetFuel()
     else
       element.callsign="Peter-1-1"
       element.modex="000"
       element.payload={}
       element.pylons={}
-      element.fuelmass0=99999
-      element.fuelmass =99999
-      element.fuelrel=1
     end
 
     -- Debug text.

Moose Development/Moose/Ops/OpsZone.lua

@@ -604,6 +604,14 @@ function OPSZONE:GetAttackDuration()
   return nil
 end
 
+--- Find an OPSZONE using the Zone Name.
+-- @param #OPSZONE self
+-- @param #string ZoneName The zone name.
+-- @return #OPSZONE The OPSZONE or nil if not found.
+function OPSZONE:FindByName( ZoneName )
+  local Found = _DATABASE:FindOpsZone( ZoneName )
+  return Found
+end
 
 --- Check if the red coalition is currently owning the zone.
 -- @param #OPSZONE self 

Moose Development/Moose/Ops/PlayerTask.lua

@@ -133,7 +133,7 @@ function PLAYERTASK:New(Type, Target, Repeat, Times, TTSType)
   self.TTSType = TTSType or "close air support"
   self.lastsmoketime = 0
   
-  if Repeat then
+  if type(Repeat) == "boolean" and Repeat == true and type(Times) == "number" and Times > 1 then
     self.Repeat = true
     self.RepeatNo = Times or 1
   end
@@ -1571,7 +1571,7 @@ PLAYERTASKCONTROLLER.Messages = {
   
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASKCONTROLLER.version="0.1.66"
+PLAYERTASKCONTROLLER.version="0.1.67"
 
 --- Create and run a new TASKCONTROLLER instance.
 -- @param #PLAYERTASKCONTROLLER self
@@ -1973,7 +1973,9 @@ function PLAYERTASKCONTROLLER:_SendMessageToClients(Text,Seconds)
   local seconds = Seconds or 10
   self.ClientSet:ForEachClient(
     function (Client)
-      local m = MESSAGE:New(Text,seconds,"Tasking"):ToClient(Client)
+      if Client ~= nil and Client:IsActive() then
+        local m = MESSAGE:New(Text,seconds,"Tasking"):ToClient(Client)
+      end
     end
   )
   return self
@@ -2206,7 +2208,7 @@ end
 function PLAYERTASKCONTROLLER:_EventHandler(EventData)
   self:T(self.lid.."_EventHandler: "..EventData.id)
   --self:T(self.lid.."_EventHandler: "..EventData.IniPlayerName)
-  if EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then
+  if EventData.id == EVENTS.UnitLost or EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then
     if EventData.IniPlayerName then
       self:T(self.lid.."Event for player: "..EventData.IniPlayerName)
       --if self.PlayerMenu[EventData.IniPlayerName] then
@@ -4138,6 +4140,7 @@ function PLAYERTASKCONTROLLER:onafterStart(From, Event, To)
   self:HandleEvent(EVENTS.Crash, self._EventHandler)
   self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
   self:HandleEvent(EVENTS.PlayerEnterAircraft, self._EventHandler)
+  self:HandleEvent(EVENTS.UnitLost, self._EventHandler)
   self:SetEventPriority(5)          
   return self
 end

Moose Development/Moose/Ops/RecoveryTanker.lua

@@ -660,9 +660,9 @@ function RECOVERYTANKER:SetRecoveryAirboss(switch)
   return self
 end
 
---- Set that the group takes the roll of an AWACS instead of a refueling tanker.
+--- Set that the group takes the role of an AWACS instead of a refueling tanker.
 -- @param #RECOVERYTANKER self
--- @param #boolean switch If true or nil, set roll AWACS.
+-- @param #boolean switch If true or nil, set role AWACS.
 -- @param #boolean eplrs If true or nil, enable EPLRS. If false, EPLRS will be off.
 -- @return #RECOVERYTANKER self
 function RECOVERYTANKER:SetAWACS(switch, eplrs)

Moose Development/Moose/Sound/Radio.lua

@@ -97,6 +97,7 @@ RADIO = {
   Power            = 100,
   Loop             = false,
   alias            = nil,
+  moduhasbeenset   = false,
 }
 
 --- Create a new RADIO Object. This doesn't broadcast a transmission, though, use @{#RADIO.Broadcast} to actually broadcast.
@@ -167,12 +168,13 @@ function RADIO:SetFrequency(Frequency)
   self:F2(Frequency)
 
   if type(Frequency) == "number" then
-
+    
     -- If frequency is in range
     --if (Frequency >= 30 and Frequency <= 87.995) or (Frequency >= 108 and Frequency <= 173.995) or (Frequency >= 225 and Frequency <= 399.975) then
 
       -- Convert frequency from MHz to Hz
-      self.Frequency = Frequency * 1000000
+      self.Frequency = Frequency
+      self.HertzFrequency = Frequency * 1000000
 
       -- If the RADIO is attached to a UNIT or a GROUP, we need to send the DCS Command "SetFrequency" to change the UNIT or GROUP frequency
       if self.Positionable.ClassName == "UNIT" or self.Positionable.ClassName == "GROUP" then
@@ -180,7 +182,7 @@ function RADIO:SetFrequency(Frequency)
         local commandSetFrequency={
           id = "SetFrequency",
           params = {
-            frequency  = self.Frequency,
+            frequency  = self.HertzFrequency,
             modulation = self.Modulation,
           }
         }
@@ -197,7 +199,7 @@ function RADIO:SetFrequency(Frequency)
   return self
 end
 
---- Set AM or FM modulation of the radio transmitter.
+--- Set AM or FM modulation of the radio transmitter. Set this before you set a frequency!
 -- @param #RADIO self
 -- @param #number Modulation Modulation is either radio.modulation.AM or radio.modulation.FM.
 -- @return #RADIO self
@@ -206,6 +208,10 @@ function RADIO:SetModulation(Modulation)
   if type(Modulation) == "number" then
     if Modulation == radio.modulation.AM or Modulation == radio.modulation.FM then --TODO Maybe make this future proof if ED decides to add an other modulation ?
       self.Modulation = Modulation
+      if self.moduhasbeenset == false and Modulation == radio.modulation.FM then -- override default
+        self:SetFrequency(self.Frequency)
+      end
+      self.moduhasbeenset = true
       return self
     end
   end

Moose Development/Moose/Sound/RadioQueue.lua

@@ -268,7 +268,7 @@ function RADIOQUEUE:NewTransmission(filename, duration, path, tstart, interval,
     return nil
   end
   if type(duration)~="number" then
-    self:E(self.lid.."ERROR: Duration specified is NOT a number.")
+    self:E(self.lid..string.format("ERROR: Duration specified is NOT a number but type=%s. Filename=%s, duration=%s", type(duration), tostring(filename), tostring(duration)))
     return nil    
   end
   
@@ -361,6 +361,7 @@ end
 -- @param #RADIOQUEUE self
 -- @param #RADIOQUEUE.Transmission transmission The transmission.
 function RADIOQUEUE:Broadcast(transmission)
+  self:T("Broadcast")
 
   if ((transmission.soundfile and transmission.soundfile.useSRS) or transmission.soundtext) and self.msrs then
     self:_BroadcastSRS(transmission)
@@ -425,7 +426,7 @@ function RADIOQUEUE:Broadcast(transmission)
   else
     
     -- Broadcasting from carrier. No subtitle possible. Need to send messages to players.
-    self:T(self.lid..string.format("Broadcasting via trigger.action.radioTransmission()."))
+    self:T(self.lid..string.format("Broadcasting via trigger.action.radioTransmission()"))
   
     -- Position from where to transmit.
     local vec3=nil
@@ -453,6 +454,8 @@ function RADIOQUEUE:Broadcast(transmission)
         local text=string.format("file=%s, freq=%.2f MHz, duration=%.2f sec, subtitle=%s", filename, self.frequency/1000000, transmission.duration, transmission.subtitle or "")
         MESSAGE:New(string.format(text, filename, transmission.duration, transmission.subtitle or ""), 5, "RADIOQUEUE "..self.alias):ToAll()
       end
+    else
+      self:E("ERROR: Could not get vec3 to determine transmission origin! Did you specify a sender and is it still alive?")
     end
 
   end
@@ -482,7 +485,6 @@ end
 --- Check radio queue for transmissions to be broadcasted.
 -- @param #RADIOQUEUE self
 function RADIOQUEUE:_CheckRadioQueue()
-  --env.info("FF check radio queue "..self.alias)
 
   -- Check if queue is empty.
   if #self.queue==0 then

Moose Development/Moose/Sound/SRS.lua

@@ -271,11 +271,11 @@ MSRS.Voices = {
     ["David"] = "Microsoft David Desktop", -- en-US
     ["Zira"] = "Microsoft Zira Desktop", -- en-US
     ["Hortense"] = "Microsoft Hortense Desktop", --fr-FR
-    ["de-DE-Hedda"] = "Microsoft Hedda Desktop", -- de-DE
+    ["de_DE_Hedda"] = "Microsoft Hedda Desktop", -- de-DE
-    ["en-GB-Hazel"] = "Microsoft Hazel Desktop", -- en-GB
+    ["en_GB_Hazel"] = "Microsoft Hazel Desktop", -- en-GB
-    ["en-US-David"] = "Microsoft David Desktop", -- en-US
+    ["en_US_David"] = "Microsoft David Desktop", -- en-US
-    ["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US
+    ["en_US_Zira"] = "Microsoft Zira Desktop", -- en-US
-    ["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR
+    ["fr_FR_Hortense"] = "Microsoft Hortense Desktop", --fr-FR
     },
   MicrosoftGRPC = { -- en-US/GB voices only as of Jan 2024, working ones if using gRPC and MS, if voice packs are installed
     --["Hedda"] = "Hedda", -- de-DE
@@ -304,8 +304,7 @@ MSRS.Voices = {
     ["en_CA_Linda"] = "Linda", --en-CA
     ["en_IN_Ravi"] = "Ravi", --en-IN
     ["en_IN_Heera"] = "Heera", --en-IN
-    ["en_IR_Sean"] = "Sean", --en-IR
+    ["en_IR_Sean"] = "Sean", --en-IR   
-    --]]     
     },  
   Google = {
     Standard = {
@@ -1238,7 +1237,7 @@ function MSRS:PlayTextExt(Text, Delay, Frequencies, Modulations, Gender, Culture
   self:T({Text, Delay, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate} )
 
   if Delay and Delay>0 then
-    self:ScheduleOnce(Delay, MSRS.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate)
+    self:ScheduleOnce(Delay, self.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate)
   else
 
     Frequencies = Frequencies or self:GetFrequencies()
@@ -1560,8 +1559,8 @@ end
 function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate)
 
   -- Debug info.
-  self:F("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
+  self:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
-  self:F({Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate})
+  self:T({Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate})
 
   local options = {} -- #MSRS.GRPCOptions
 
@@ -1587,7 +1586,6 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
 
   -- Provider (win, gcloud, ...)
   local provider = self.provider or MSRS.Provider.WINDOWS
-  self:F({provider=provider})
 
   -- Provider options: voice, credentials
   options.provider = {}
@@ -1595,7 +1593,7 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
 
   -- Voice
   Voice=Voice or self:GetVoice(self.provider) or self.voice
-
+  
   if Voice then
     -- We use a specific voice
     options.provider[provider].voice = Voice

Moose Development/Moose/Sound/SoundOutput.lua

@@ -24,7 +24,7 @@
 
 do -- Sound Base
 
-  --- @type SOUNDBASE
+  -- @type SOUNDBASE
   -- @field #string ClassName Name of the class.
   -- @extends Core.Base#BASE
 
@@ -100,7 +100,7 @@ end
 
 do -- Sound File
 
-  --- @type SOUNDFILE
+  -- @type SOUNDFILE
   -- @field #string ClassName Name of the class
   -- @field #string filename Name of the flag.
   -- @field #string path Directory path, where the sound file is located. This includes the final slash "/".
@@ -160,7 +160,7 @@ do -- Sound File
   -- @param #string FileName The name of the sound file, e.g. "Hello World.ogg".
   -- @param #string Path The path of the directory, where the sound file is located. Default is "l10n/DEFAULT/" within the miz file.
   -- @param #number Duration Duration in seconds, how long it takes to play the sound file. Default is 3 seconds.
-  -- @param #bolean UseSrs Set if SRS should be used to play this file. Default is false.
+  -- @param #boolean UseSrs Set if SRS should be used to play this file. Default is false.
   -- @return #SOUNDFILE self
   function SOUNDFILE:New(FileName, Path, Duration, UseSrs)
 
@@ -249,6 +249,9 @@ do -- Sound File
   -- @param #string Duration Duration in seconds. Default 3 seconds.
   -- @return #SOUNDFILE self
   function SOUNDFILE:SetDuration(Duration)
+    if Duration and type(Duration)=="string" then
+      Duration=tonumber(Duration)
+    end
     self.duration=Duration or 3
     return self
   end  
@@ -289,7 +292,7 @@ end
 
 do -- Text-To-Speech
 
-  --- @type SOUNDTEXT
+  -- @type SOUNDTEXT
   -- @field #string ClassName Name of the class
   -- @field #string text Text to speak.
   -- @field #number duration Duration in seconds.
@@ -356,7 +359,7 @@ do -- Text-To-Speech
     local self=BASE:Inherit(self, BASE:New()) -- #SOUNDTEXT
 
     self:SetText(Text)
-    self:SetDuration(Duration or STTS.getSpeechTime(Text))
+    self:SetDuration(Duration or MSRS.getSpeechTime(Text))
     --self:SetGender()
     --self:SetCulture()
     

Moose Development/Moose/Sound/UserSound.lua

@@ -21,7 +21,7 @@
 
 do -- UserSound
 
-  --- @type USERSOUND
+  -- @type USERSOUND
   -- @extends Core.Base#BASE
 
 

Moose Development/Moose/Tasking/CommandCenter.lua

@@ -181,7 +181,8 @@ COMMANDCENTER = {
 }
 
 
---- @type COMMANDCENTER.AutoAssignMethods
+---
+-- @type COMMANDCENTER.AutoAssignMethods
 COMMANDCENTER.AutoAssignMethods = {
   ["Random"] = 1,
   ["Distance"] = 2,
@@ -210,7 +211,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
   self:SetMessageDuration(10)
   
   self:HandleEvent( EVENTS.Birth,
-    --- @param #COMMANDCENTER self
+    -- @param #COMMANDCENTER self
     -- @param Core.Event#EVENTDATA EventData
     function( self, EventData )
       if EventData.IniObjectCategory == 1 then
@@ -241,7 +242,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
 --  -- - Assign the PlayerUnit to the Task if required.
 --  -- - Send a message to the other players in the group that this player has joined.
 --  self:HandleEvent( EVENTS.PlayerEnterUnit,
---    --- @param #COMMANDCENTER self
+--    -- @param #COMMANDCENTER self
 --    -- @param Core.Event#EVENTDATA EventData
 --    function( self, EventData )
 --      local PlayerUnit = EventData.IniUnit
@@ -258,7 +259,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
   -- The PlayerUnit will be UnAssigned from the Task.
   -- When there is no Unit left running the Task, the Task goes into Abort...
   self:HandleEvent( EVENTS.MissionEnd,
-    --- @param #TASK self
+    -- @param #TASK self
     -- @param Core.Event#EVENTDATA EventData
     function( self, EventData )
       local PlayerUnit = EventData.IniUnit
@@ -273,7 +274,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
   -- The PlayerUnit will be UnAssigned from the Task.
   -- When there is no Unit left running the Task, the Task goes into Abort...
   self:HandleEvent( EVENTS.PlayerLeaveUnit,
-    --- @param #TASK self
+    -- @param #TASK self
     -- @param Core.Event#EVENTDATA EventData
     function( self, EventData )
       local PlayerUnit = EventData.IniUnit
@@ -290,7 +291,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
   -- The PlayerUnit will be UnAssigned from the Task.
   -- When there is no Unit left running the Task, the Task goes into Abort...
   self:HandleEvent( EVENTS.Crash,
-    --- @param #TASK self
+    -- @param #TASK self
     -- @param Core.Event#EVENTDATA EventData
     function( self, EventData )
       local PlayerUnit = EventData.IniUnit

Moose Development/Moose/Tasking/DetectionManager.lua

@@ -48,7 +48,7 @@
 
 do -- DETECTION MANAGER
   
-  --- @type DETECTION_MANAGER
+  -- @type DETECTION_MANAGER
   -- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to.
   -- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects.
   -- @field Tasking.CommandCenter#COMMANDCENTER CC The command center that is used to communicate with the players.
@@ -62,7 +62,7 @@ do -- DETECTION MANAGER
     Detection = nil,
   }
   
-  --- @field Tasking.CommandCenter#COMMANDCENTER
+  -- @field Tasking.CommandCenter#COMMANDCENTER
   DETECTION_MANAGER.CC = nil
   
   --- FAC constructor.

Moose Development/Moose/Tasking/Mission.lua

@@ -19,7 +19,8 @@
 -- @module Tasking.Mission
 -- @image Task_Mission.JPG
 
---- @type MISSION
+---
+-- @type MISSION
 -- @field #MISSION.Clients _Clients
 -- @field Core.Menu#MENU_COALITION MissionMenu
 -- @field #string MissionBriefing
@@ -790,7 +791,7 @@ function MISSION:HasGroup( TaskGroup )
   return Has
 end
 
---- @param #MISSION self
+-- @param #MISSION self
 -- @return #number
 function MISSION:GetTasksRemaining()
   -- Determine how many tasks are remaining.
@@ -805,7 +806,7 @@ function MISSION:GetTasksRemaining()
   return TasksRemaining
 end
 
---- @param #MISSION self
+-- @param #MISSION self
 -- @return #number
 function MISSION:GetTaskTypes()
   -- Determine how many tasks are remaining.
@@ -865,7 +866,7 @@ end
 ----      - <xx> Aborted Tasks (xp)
 ----      - <xx> Failed Tasks (xp)
 ---- 
----- @param #MISSION self
+-- @param #MISSION self
 ---- @return #string
 --function MISSION:ReportSummary()
 --
@@ -1175,7 +1176,7 @@ end
 
 
 
---- @param #MISSION self
+-- @param #MISSION self
 -- @param #string TaskStatus The status
 -- @param Wrapper.Group#GROUP ReportGroup
 function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
@@ -1186,7 +1187,7 @@ function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
 end
 
 
---- @param #MISSION self
+-- @param #MISSION self
 -- @param Wrapper.Group#GROUP ReportGroup
 function MISSION:MenuReportPlayersPerTask( ReportGroup )
 
@@ -1195,7 +1196,7 @@ function MISSION:MenuReportPlayersPerTask( ReportGroup )
   self:GetCommandCenter():MessageTypeToGroup( Report, ReportGroup, MESSAGE.Type.Overview )
 end
 
---- @param #MISSION self
+-- @param #MISSION self
 -- @param Wrapper.Group#GROUP ReportGroup
 function MISSION:MenuReportPlayersProgress( ReportGroup )
 

Moose Development/Moose/Tasking/Task.lua

@@ -220,7 +220,8 @@
 -- @module Tasking.Task
 -- @image MOOSE.JPG
 
---- @type TASK
+---
+-- @type TASK
 -- @field Core.Scheduler#SCHEDULER TaskScheduler
 -- @field Tasking.Mission#MISSION Mission
 -- @field Core.Set#SET_GROUP SetGroup The Set of Groups assigned to the Task
@@ -726,7 +727,7 @@ function TASK:AddGroups( GroupSet )
   GroupSet = GroupSet or SET_GROUP:New()
  
   self.SetGroup:ForEachGroup(
-    --- @param Wrapper.Group#GROUP GroupSet
+    -- @param Wrapper.Group#GROUP GroupSet
     function( GroupItem )
       GroupSet:Add( GroupItem:GetName(), GroupItem)
     end
@@ -819,7 +820,7 @@ end
 
 do -- Group Assignment
 
-  --- @param #TASK self
+  -- @param #TASK self
   -- @param Actions.Act_Assign#ACT_ASSIGN AcceptClass
   function TASK:SetAssignMethod( AcceptClass )
   
@@ -1199,7 +1200,7 @@ function TASK:RemoveAssignedMenuForGroup( TaskGroup )
   
 end
 
---- @param #TASK self
+-- @param #TASK self
 -- @param Wrapper.Group#GROUP TaskGroup
 function TASK:MenuAssignToGroup( TaskGroup )
 
@@ -1208,7 +1209,7 @@ function TASK:MenuAssignToGroup( TaskGroup )
   self:AssignToGroup( TaskGroup )
 end
 
---- @param #TASK self
+-- @param #TASK self
 -- @param Wrapper.Group#GROUP TaskGroup
 function TASK:MenuMarkToGroup( TaskGroup )
   self:F()

Moose Development/Moose/Tasking/TaskInfo.lua

@@ -11,7 +11,8 @@
 -- @module Tasking.TaskInfo
 -- @image MOOSE.JPG
 
---- @type TASKINFO
+---
+-- @type TASKINFO
 -- @extends Core.Base#BASE
 
 --- 
@@ -29,7 +30,8 @@ TASKINFO = {
   ClassName = "TASKINFO",
 }
 
---- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report.
+---
+-- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report.
 -- 
 --   - "M" for Markings on the Map (F10).
 --   - "S" for Summary Reports.
@@ -279,7 +281,7 @@ function TASKINFO:AddCargoSet( SetCargo, Order, Detail, Keep )
   local CargoReport = REPORT:New()
   CargoReport:Add( "" )
   SetCargo:ForEachCargo(
-    --- @param Cargo.Cargo#CARGO Cargo
+    -- @param Cargo.Cargo#CARGO Cargo
     function( Cargo )
       CargoReport:Add( string.format( ' - %s (%s) %s - status %s ', Cargo:GetName(), Cargo:GetType(), Cargo:GetTransportationMethod(), Cargo:GetCurrentState() ) )
     end

Moose Development/Moose/Tasking/Task_A2A.lua

@@ -173,19 +173,19 @@ do -- TASK_A2A
 
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Core.Set#SET_UNIT TargetSetUnit The set of targets.
   function TASK_A2A:SetTargetSetUnit( TargetSetUnit )
 
     self.TargetSetUnit = TargetSetUnit
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   function TASK_A2A:GetPlannedMenuText()
     return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Core.Point#COORDINATE RendezVousCoordinate The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
   -- @param #number RendezVousRange The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
   -- @param Wrapper.Unit#UNIT TaskUnit
@@ -198,7 +198,7 @@ do -- TASK_A2A
     ActRouteRendezVous:SetRange( RendezVousRange )
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Wrapper.Unit#UNIT TaskUnit
   -- @return Core.Point#COORDINATE The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
   -- @return #number The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
@@ -210,7 +210,7 @@ do -- TASK_A2A
     return ActRouteRendezVous:GetCoordinate(), ActRouteRendezVous:GetRange()
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Core.Zone#ZONE_BASE RendezVousZone The Zone object where the RendezVous is located on the map.
   -- @param Wrapper.Unit#UNIT TaskUnit
   function TASK_A2A:SetRendezVousZone( RendezVousZone, TaskUnit )
@@ -221,7 +221,7 @@ do -- TASK_A2A
     ActRouteRendezVous:SetZone( RendezVousZone )
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Wrapper.Unit#UNIT TaskUnit
   -- @return Core.Zone#ZONE_BASE The Zone object where the RendezVous is located on the map.
   function TASK_A2A:GetRendezVousZone( TaskUnit )
@@ -232,7 +232,7 @@ do -- TASK_A2A
     return ActRouteRendezVous:GetZone()
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Core.Point#COORDINATE TargetCoordinate The Coordinate object where the Target is located on the map.
   -- @param Wrapper.Unit#UNIT TaskUnit
   function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit )
@@ -243,7 +243,7 @@ do -- TASK_A2A
     ActRouteTarget:SetCoordinate( TargetCoordinate )
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Wrapper.Unit#UNIT TaskUnit
   -- @return Core.Point#COORDINATE The Coordinate object where the Target is located on the map.
   function TASK_A2A:GetTargetCoordinate( TaskUnit )
@@ -254,7 +254,7 @@ do -- TASK_A2A
     return ActRouteTarget:GetCoordinate()
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map.
   -- @param Wrapper.Unit#UNIT TaskUnit
   function TASK_A2A:SetTargetZone( TargetZone, Altitude, Heading, TaskUnit )
@@ -265,7 +265,7 @@ do -- TASK_A2A
     ActRouteTarget:SetZone( TargetZone, Altitude, Heading )
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   -- @param Wrapper.Unit#UNIT TaskUnit
   -- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
   function TASK_A2A:GetTargetZone( TaskUnit )
@@ -309,7 +309,7 @@ do -- TASK_A2A
     self:__Goal( -10 )
   end
 
-  --- @param #TASK_A2A self
+  -- @param #TASK_A2A self
   function TASK_A2A:UpdateTaskInfo( DetectedItem )
 
     if self:IsStatePlanned() or self:IsStateAssigned() then
@@ -501,7 +501,7 @@ do -- TASK_A2A_SWEEP
     return self
   end
 
-  --- @param #TASK_A2A_SWEEP self
+  -- @param #TASK_A2A_SWEEP self
   function TASK_A2A_SWEEP:onafterGoal( TaskUnit, From, Event, To )
     local TargetSetUnit = self.TargetSetUnit -- Core.Set#SET_UNIT
 

Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua

@@ -148,7 +148,7 @@ do -- TASK_A2A_DISPATCHER
   --
   --      TaskDispatcher = TASK_A2A_DISPATCHER:New( ... )
   --
-  --      --- @param #TaskDispatcher self
+  --      -- @param #TaskDispatcher self
   --      -- @param #string From Contains the name of the state from where the Event was triggered.
   --      -- @param #string Event Contains the name of the event that was triggered. In this case Assign.
   --      -- @param #string To Contains the name of the state that will be transitioned to.