Merge branch 'develop' into FF/OpsStuff

.github/workflows/build-docs.yml

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

.github/workflows/build-includes.yml

@@ -5,8 +5,6 @@ on:
     branches:
       - master
       - develop
-      - Apple/Develop
-      
     paths:
       - 'Moose Setup/**/*.lua'
       - 'Moose Development/**/*.lua'
@@ -49,7 +47,6 @@ jobs:
 
       - name: Update apt-get (needed for act docker image)
         run: |
-          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get -qq update
 
       - name: Install tree
@@ -98,6 +95,10 @@ jobs:
           export COMMIT_TIME=$(git show -s --format=%cd ${{ github.sha }} --date=iso-strict)
           lua5.3 "./Moose Setup/Moose_Create.lua" D "$COMMIT_TIME-${{ github.sha }}" "./Moose Development/Moose" "./Moose Setup" "./build/result/Moose_Include_Dynamic"
 
+      - name: Run LuaSrcDiet
+        run: |
+          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
+
       #########################################################################
       # Run LuaCheck
       #########################################################################
@@ -107,10 +108,6 @@ jobs:
         run: |
           luacheck --std=lua51c --config=.luacheckrc -gurasqq "Moose Development/Moose"
 
-      - name: Run LuaSrcDiet
-        run: |
-          luasrcdiet --basic --opt-emptylines ./build/result/Moose_Include_Static/Moose.lua -o ./build/result/Moose_Include_Static/Moose_.lua
-
       #########################################################################
       # Push to MOOSE_INCLUDE
       #########################################################################

.github/workflows/gh-pages.yml

@@ -33,7 +33,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v3
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -43,7 +43,7 @@ jobs:
           working-directory: docs/
       - name: Setup Pages
         id: pages
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v3
       - name: Build with Jekyll
         # Outputs to the './_site' directory by default
         run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}"
@@ -52,7 +52,7 @@ jobs:
         working-directory: docs/
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v1
         with:
           path: docs/_site/
 
@@ -66,13 +66,13 @@ jobs:
     steps:
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v4
+        uses: actions/deploy-pages@v1
 
   check:
     runs-on: ubuntu-latest
     needs: deploy
     steps:
       - name: Setup Node
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v3
       - run: npm install linkinator
       - run: npx linkinator https://flightcontrol-master.github.io/MOOSE/ --verbosity error --timeout 5000 --recurse --skip "(java.com)" --retry-errors --retry-errors-count 3 --retry-errors-jitter

.gitignore

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

Moose Development/Moose/.vscode/settings.json

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

Moose Development/Moose/AI/AI_A2A_Cap.lua

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

Moose Development/Moose/AI/AI_A2A_Dispatcher.lua

@@ -23,7 +23,7 @@
 --
 -- ## Missions:
 --
--- [AID-A2A - AI A2A Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+-- [AID-A2A - AI A2A Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching)
 --
 -- ===
 --
@@ -310,7 +310,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to set a specific Engage Radius.
   -- **The Engage Radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-019%20-%20Engage%20Range%20Test)
+  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test)
   --
   -- In this example an Engage Radius is set to various values.
   --
@@ -333,7 +333,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius.
   -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-013%20-%20Intercept%20Test)
+  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test)
   --
   -- In these examples, the Gci Radius is set to various values:
   --
@@ -366,7 +366,7 @@ do -- AI_A2A_DISPATCHER
   -- it makes it easier sometimes for the mission maker to envisage where the red and blue territories roughly are.
   -- In a hot war the borders are effectively defined by the ground based radar coverage of a coalition.
   --
-  -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-009%20-%20Border%20Test)
+  -- Demonstration Mission: [AID-009 - AI_A2A - Border Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-009%20-%20Border%20Test)
   --
   -- In this example a border is set for the CCCP A2A dispatcher:
   --
@@ -1151,14 +1151,14 @@ do -- AI_A2A_DISPATCHER
 
     local AirbaseName = EventData.PlaceName -- The name of the airbase that was captured.
 
-    self:T( "Captured " .. AirbaseName )
+    self:I( "Captured " .. AirbaseName )
 
     -- Now search for all squadrons located at the airbase, and sanitize them.
     for SquadronName, Squadron in pairs( self.DefenderSquadrons ) do
       if Squadron.AirbaseName == AirbaseName then
         Squadron.ResourceCount = -999 -- The base has been captured, and the resources are eliminated. No more spawning.
         Squadron.Captured = true
-        self:T( "Squadron " .. SquadronName .. " captured." )
+        self:I( "Squadron " .. SquadronName .. " captured." )
       end
     end
   end
@@ -1233,7 +1233,7 @@ do -- AI_A2A_DISPATCHER
   --
   -- **Use the method @{#AI_A2A_DISPATCHER.SetEngageRadius}() to modify the default Engage Radius for ALL squadrons.**
   --
-  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-019%20-%20Engage%20Range%20Test)
+  -- Demonstration Mission: [AID-019 - AI_A2A - Engage Range Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-019%20-%20Engage%20Range%20Test)
   --
   -- @param #AI_A2A_DISPATCHER self
   -- @param #number EngageRadius (Optional, Default = 100000) The radius to report friendlies near the target.
@@ -1283,7 +1283,7 @@ do -- AI_A2A_DISPATCHER
   -- Use the method @{#AI_A2A_DISPATCHER.SetGciRadius}() to set a specific controlled ground intercept radius.
   -- **The Ground Controlled Intercept radius is defined for ALL squadrons which are operational.**
   --
-  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher/AID-A2A-013%20-%20Intercept%20Test)
+  -- Demonstration Mission: [AID-013 - AI_A2A - Intercept Test](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching/AID-A2A-013%20-%20Intercept%20Test)
   --
   -- @param #AI_A2A_DISPATCHER self
   -- @param #number GciRadius (Optional, Default = 200000) The radius to ground control intercept detected targets from the nearest airbase.
@@ -1828,7 +1828,7 @@ do -- AI_A2A_DISPATCHER
 
     self:SetSquadronCapInterval( SquadronName, self.DefenderDefault.CapLimit, self.DefenderDefault.CapMinSeconds, self.DefenderDefault.CapMaxSeconds, 1 )
 
-    self:T( { CAP = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, Zone, PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageAltType } } )
+    self:I( { CAP = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, Zone, PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageAltType } } )
 
     -- Add the CAP to the EWR network.
 
@@ -2085,7 +2085,7 @@ do -- AI_A2A_DISPATCHER
     Intercept.EngageCeilingAltitude = EngageCeilingAltitude
     Intercept.EngageAltType = EngageAltType
 
-    self:T( { GCI = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { GCI = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
   end
 
   --- Set squadron GCI.
@@ -3000,17 +3000,17 @@ do -- AI_A2A_DISPATCHER
     for FriendlyDistance, AIFriendly in UTILS.spairs( DefenderFriendlies or {} ) do
       -- We only allow to ENGAGE targets as long as the Units on both sides are balanced.
       if AttackerCount > DefenderCount then
-    --self:T("***** AI_A2A_DISPATCHER:CountDefendersToBeEngaged() *****\nThis is supposed to be a UNIT:")
+    --self:I("***** AI_A2A_DISPATCHER:CountDefendersToBeEngaged() *****\nThis is supposed to be a UNIT:")
     if AIFriendly then
       local classname = AIFriendly.ClassName or "No Class Name"
       local unitname = AIFriendly.IdentifiableName or "No Unit Name"
-      --self:T("Class Name: " .. classname)
-      --self:T("Unit Name: " .. unitname)
-      --self:T({AIFriendly})
+      --self:I("Class Name: " .. classname)
+      --self:I("Unit Name: " .. unitname)
+      --self:I({AIFriendly})
     end
     local Friendly = nil
     if AIFriendly and AIFriendly:IsAlive() then
-      --self:T("AIFriendly alive, getting GROUP")
+      --self:I("AIFriendly alive, getting GROUP")
       Friendly = AIFriendly:GetGroup() -- Wrapper.Group#GROUP
     end
     
@@ -3257,8 +3257,7 @@ do -- AI_A2A_DISPATCHER
             end
           end
 
-          --- AI_A2A_Fsm:onafterHome
-          -- @param #AI_A2A_DISPATCHER self
+          --- @param #AI_A2A_DISPATCHER self
           function AI_A2A_Fsm:onafterHome( Defender, From, Event, To, Action )
             if Defender and Defender:IsAlive() then
               self:F( { "CAP Home", Defender:GetName() } )
@@ -3506,8 +3505,7 @@ do -- AI_A2A_DISPATCHER
                     Dispatcher:ClearDefenderTaskTarget( DefenderGroup )
                   end
 
-                  --- function Fsm:onafterLostControl
-                  -- @param #AI_A2A_DISPATCHER self
+                  --- @param #AI_A2A_DISPATCHER self
                   function Fsm:onafterLostControl( Defender, From, Event, To )
                     self:F( { "GCI LostControl", Defender:GetName() } )
                     self:GetParent( self ).onafterHome( self, Defender, From, Event, To )
@@ -3520,8 +3518,7 @@ do -- AI_A2A_DISPATCHER
                     end
                   end
 
-                  --- function Fsm:onafterHome
-                  -- @param #AI_A2A_DISPATCHER self
+                  --- @param #AI_A2A_DISPATCHER self
                   function Fsm:onafterHome( DefenderGroup, From, Event, To, Action )
                     self:F( { "GCI Home", DefenderGroup:GetName() } )
                     self:GetParent( self ).onafterHome( self, DefenderGroup, From, Event, To )
@@ -3952,7 +3949,7 @@ end
 
 do
 
-  -- @type AI_A2A_GCICAP
+  --- @type AI_A2A_GCICAP
   -- @extends #AI_A2A_DISPATCHER
 
   --- Create an automatic air defence system for a coalition setting up GCI and CAP air defenses.
@@ -3962,7 +3959,7 @@ do
   --
   -- # Demo Missions
   --
-  -- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+  -- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2A%20-%20AI%20A2A%20Dispatching)
   --
   -- ===
   --
@@ -4322,23 +4319,23 @@ do
 
     -- Setup squadrons
 
-    self:T( { Airbases = AirbaseNames } )
+    self:I( { Airbases = AirbaseNames } )
 
-    self:T( "Defining Templates for Airbases ..." )
+    self:I( "Defining Templates for Airbases ..." )
     for AirbaseID, AirbaseName in pairs( AirbaseNames ) do
       local Airbase = _DATABASE:FindAirbase( AirbaseName ) -- Wrapper.Airbase#AIRBASE
       local AirbaseName = Airbase:GetName()
       local AirbaseCoord = Airbase:GetCoordinate()
       local AirbaseZone = ZONE_RADIUS:New( "Airbase", AirbaseCoord:GetVec2(), 3000 )
       local Templates = nil
-      self:T( { Airbase = AirbaseName } )
+      self:I( { Airbase = AirbaseName } )
       for TemplateID, Template in pairs( self.Templates:GetSet() ) do
         local Template = Template -- Wrapper.Group#GROUP
         local TemplateCoord = Template:GetCoordinate()
         if AirbaseZone:IsVec2InZone( TemplateCoord:GetVec2() ) then
           Templates = Templates or {}
           table.insert( Templates, Template:GetName() )
-          self:T( { Template = Template:GetName() } )
+          self:I( { Template = Template:GetName() } )
         end
       end
       if Templates then
@@ -4354,13 +4351,13 @@ do
     self.CAPTemplates:FilterPrefixes( CapPrefixes )
     self.CAPTemplates:FilterOnce()
 
-    self:T( "Setting up CAP ..." )
+    self:I( "Setting up CAP ..." )
     for CAPID, CAPTemplate in pairs( self.CAPTemplates:GetSet() ) do
       local CAPZone = ZONE_POLYGON:New( CAPTemplate:GetName(), CAPTemplate )
       -- Now find the closest airbase from the ZONE (start or center)
       local AirbaseDistance = 99999999
       local AirbaseClosest = nil -- Wrapper.Airbase#AIRBASE
-      self:T( { CAPZoneGroup = CAPID } )
+      self:I( { CAPZoneGroup = CAPID } )
       for AirbaseID, AirbaseName in pairs( AirbaseNames ) do
         local Airbase = _DATABASE:FindAirbase( AirbaseName ) -- Wrapper.Airbase#AIRBASE
         local AirbaseName = Airbase:GetName()
@@ -4368,7 +4365,7 @@ do
         local Squadron = self.DefenderSquadrons[AirbaseName]
         if Squadron then
           local Distance = AirbaseCoord:Get2DDistance( CAPZone:GetCoordinate() )
-          self:T( { AirbaseDistance = Distance } )
+          self:I( { AirbaseDistance = Distance } )
           if Distance < AirbaseDistance then
             AirbaseDistance = Distance
             AirbaseClosest = Airbase
@@ -4376,7 +4373,7 @@ do
         end
       end
       if AirbaseClosest then
-        self:T( { CAPAirbase = AirbaseClosest:GetName() } )
+        self:I( { CAPAirbase = AirbaseClosest:GetName() } )
         self:SetSquadronCap( AirbaseClosest:GetName(), CAPZone, 6000, 10000, 500, 800, 800, 1200, "RADIO" )
         self:SetSquadronCapInterval( AirbaseClosest:GetName(), CapLimit, 300, 600, 1 )
       end
@@ -4384,14 +4381,14 @@ do
 
     -- Setup GCI.
     -- GCI is setup for all Squadrons.
-    self:T( "Setting up GCI ..." )
+    self:I( "Setting up GCI ..." )
     for AirbaseID, AirbaseName in pairs( AirbaseNames ) do
       local Airbase = _DATABASE:FindAirbase( AirbaseName ) -- Wrapper.Airbase#AIRBASE
       local AirbaseName = Airbase:GetName()
       local Squadron = self.DefenderSquadrons[AirbaseName]
       self:F( { Airbase = AirbaseName } )
       if Squadron then
-        self:T( { GCIAirbase = AirbaseName } )
+        self:I( { GCIAirbase = AirbaseName } )
         self:SetSquadronGci( AirbaseName, 800, 1200 )
       end
     end

Moose Development/Moose/AI/AI_A2A_Gci.lua

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

Moose Development/Moose/AI/AI_A2A_Patrol.lua

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

Moose Development/Moose/AI/AI_A2G_BAI.lua

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

Moose Development/Moose/AI/AI_A2G_CAS.lua

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

Moose Development/Moose/AI/AI_A2G_Dispatcher.lua

@@ -24,7 +24,7 @@
 -- 
 -- ## Missions:
 -- 
--- [AID-A2G - AI A2G Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2G_Dispatcher)
+-- [AID-A2G - AI A2G Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching/AID-A2G%20-%20AI%20A2G%20Dispatching)
 -- 
 -- ===
 -- 
@@ -904,14 +904,14 @@ do -- AI_A2G_DISPATCHER
   -- @type AI_A2G_DISPATCHER.DefenseCoordinates
   -- @map <#string,Core.Point#COORDINATE> A list of all defense coordinates mapped per defense coordinate name.
 
-  -- @field #AI_A2G_DISPATCHER.DefenseCoordinates DefenseCoordinates
+  --- @field #AI_A2G_DISPATCHER.DefenseCoordinates DefenseCoordinates
   AI_A2G_DISPATCHER.DefenseCoordinates = {}
 
   --- Enumerator for spawns at airbases.
   -- @type AI_A2G_DISPATCHER.Takeoff
   -- @extends Wrapper.Group#GROUP.Takeoff
   
-  -- @field #AI_A2G_DISPATCHER.Takeoff Takeoff
+  --- @field #AI_A2G_DISPATCHER.Takeoff Takeoff
   AI_A2G_DISPATCHER.Takeoff = GROUP.Takeoff
   
   --- Defines Landing location.
@@ -942,7 +942,7 @@ do -- AI_A2G_DISPATCHER
   -- @type AI_A2G_DISPATCHER.DefenseQueue
   -- @list<#AI_A2G_DISPATCHER.DefenseQueueItem> DefenseQueueItem A list of all defenses being queued ...
   
-  -- @field #AI_A2G_DISPATCHER.DefenseQueue DefenseQueue
+  --- @field #AI_A2G_DISPATCHER.DefenseQueue DefenseQueue
   AI_A2G_DISPATCHER.DefenseQueue = {}
   
   --- Defense approach types.
@@ -1136,7 +1136,7 @@ do -- AI_A2G_DISPATCHER
   end
 
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   function AI_A2G_DISPATCHER:onafterStart( From, Event, To )
 
     self:GetParent( self ).onafterStart( self, From, Event, To )
@@ -1147,7 +1147,7 @@ do -- AI_A2G_DISPATCHER
       for Resource = 1, DefenderSquadron.ResourceCount or 0 do
         self:ResourcePark( DefenderSquadron )
       end
-      self:T( "Parked resources for squadron " .. DefenderSquadron.Name )
+      self:I( "Parked resources for squadron " .. DefenderSquadron.Name )
     end
     
   end
@@ -1201,7 +1201,7 @@ do -- AI_A2G_DISPATCHER
   end
   
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   function AI_A2G_DISPATCHER:ResourcePark( DefenderSquadron )
     local TemplateID = math.random( 1, #DefenderSquadron.Spawn )
     local Spawn = DefenderSquadron.Spawn[ TemplateID ] -- Core.Spawn#SPAWN
@@ -1218,33 +1218,33 @@ do -- AI_A2G_DISPATCHER
   end
 
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_A2G_DISPATCHER:OnEventBaseCaptured( EventData )
 
     local AirbaseName = EventData.PlaceName -- The name of the airbase that was captured.
     
-    self:T( "Captured " .. AirbaseName )
+    self:I( "Captured " .. AirbaseName )
     
     -- Now search for all squadrons located at the airbase, and sanitize them.
     for SquadronName, Squadron in pairs( self.DefenderSquadrons ) do
       if Squadron.AirbaseName == AirbaseName then
         Squadron.ResourceCount = -999 -- The base has been captured, and the resources are eliminated. No more spawning.
         Squadron.Captured = true
-        self:T( "Squadron " .. SquadronName .. " captured." )
+        self:I( "Squadron " .. SquadronName .. " captured." )
       end
     end
   end
 
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_A2G_DISPATCHER:OnEventCrashOrDead( EventData )
     self.Detection:ForgetDetectedUnit( EventData.IniUnitName ) 
   end
 
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_A2G_DISPATCHER:OnEventLand( EventData )
     self:F( "Landed" )
@@ -1261,7 +1261,7 @@ do -- AI_A2G_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
-        self:ResourcePark( Squadron )
+        self:ResourcePark( Squadron, Defender )
         return
       end
       if DefenderUnit:GetLife() ~= DefenderUnit:GetLife0() then
@@ -1273,7 +1273,7 @@ do -- AI_A2G_DISPATCHER
   end
   
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_A2G_DISPATCHER:OnEventEngineShutdown( EventData )
     local DefenderUnit = EventData.IniUnit
@@ -1289,7 +1289,7 @@ do -- AI_A2G_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
-        self:ResourcePark( Squadron )
+        self:ResourcePark( Squadron, Defender )
       end
     end 
   end
@@ -1297,7 +1297,7 @@ do -- AI_A2G_DISPATCHER
 
   do -- Manage the defensive behaviour
   
-    -- @param #AI_A2G_DISPATCHER self
+    --- @param #AI_A2G_DISPATCHER self
     -- @param #string DefenseCoordinateName The name of the coordinate to be defended by A2G defenses.
     -- @param Core.Point#COORDINATE DefenseCoordinate The coordinate to be defended by A2G defenses.
     function AI_A2G_DISPATCHER:AddDefenseCoordinate( DefenseCoordinateName, DefenseCoordinate )
@@ -1305,19 +1305,19 @@ do -- AI_A2G_DISPATCHER
     end
     
 
-    -- @param #AI_A2G_DISPATCHER self
+    --- @param #AI_A2G_DISPATCHER self
     function AI_A2G_DISPATCHER:SetDefenseReactivityLow()
       self.DefenseReactivity = 0.05
     end
     
 
-    -- @param #AI_A2G_DISPATCHER self
+    --- @param #AI_A2G_DISPATCHER self
     function AI_A2G_DISPATCHER:SetDefenseReactivityMedium()
       self.DefenseReactivity = 0.15
     end
     
 
-    -- @param #AI_A2G_DISPATCHER self
+    --- @param #AI_A2G_DISPATCHER self
     function AI_A2G_DISPATCHER:SetDefenseReactivityHigh()
       self.DefenseReactivity = 0.5
     end
@@ -1351,14 +1351,14 @@ do -- AI_A2G_DISPATCHER
   --   1. the **distance of the closest airbase to target**, being smaller than the **Defend Radius**.
   --   2. the **distance to any defense reference point**.
   -- 
-  -- The **default** defense radius is defined as **40000** or **40km**. Override the default defense radius when the era of the warfare is early, or, 
+  -- The **default** defense radius is defined as **400000** or **40km**. Override the default defense radius when the era of the warfare is early, or, 
   -- when you don't want to let the AI_A2G_DISPATCHER react immediately when a certain border or area is not being crossed.
   -- 
   -- Use the method @{#AI_A2G_DISPATCHER.SetDefendRadius}() to set a specific defend radius for all squadrons,
   -- **the Defense Radius is defined for ALL squadrons which are operational.**
   -- 
   -- @param #AI_A2G_DISPATCHER self
-  -- @param #number DefenseRadius (Optional, Default = 20000) The defense radius to engage detected targets from the nearest capable and available squadron airbase.
+  -- @param #number DefenseRadius (Optional, Default = 200000) The defense radius to engage detected targets from the nearest capable and available squadron airbase.
   -- @return #AI_A2G_DISPATCHER
   -- @usage
   -- 
@@ -1373,7 +1373,7 @@ do -- AI_A2G_DISPATCHER
   --   
   function AI_A2G_DISPATCHER:SetDefenseRadius( DefenseRadius )
 
-    self.DefenseRadius = DefenseRadius or 40000
+    self.DefenseRadius = DefenseRadius or 100000
     
     self.Detection:SetAcceptRange( self.DefenseRadius ) 
   
@@ -1868,7 +1868,7 @@ do -- AI_A2G_DISPATCHER
   end
 
   
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   -- @param #string SquadronName The squadron name.
   -- @param #number TakeoffInterval  Only Takeoff new units each specified interval in seconds in 10 seconds steps.
   -- @usage
@@ -2144,7 +2144,7 @@ do -- AI_A2G_DISPATCHER
     Sead.EngageAltType = EngageAltType
     Sead.Defend = true
     
-    self:T( { SEAD = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { SEAD = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
     
     return self
   end
@@ -2234,7 +2234,7 @@ do -- AI_A2G_DISPATCHER
 
     self:SetSquadronPatrolInterval( SquadronName, self.DefenderDefault.PatrolLimit, self.DefenderDefault.PatrolMinSeconds, self.DefenderDefault.PatrolMaxSeconds, 1, "SEAD" )
     
-    self:T( { SEAD = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { SEAD = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
   end
   
   
@@ -2295,7 +2295,7 @@ do -- AI_A2G_DISPATCHER
     Cas.EngageAltType = EngageAltType
     Cas.Defend = true
     
-    self:T( { CAS = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { CAS = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
     
     return self
   end
@@ -2385,7 +2385,7 @@ do -- AI_A2G_DISPATCHER
 
     self:SetSquadronPatrolInterval( SquadronName, self.DefenderDefault.PatrolLimit, self.DefenderDefault.PatrolMinSeconds, self.DefenderDefault.PatrolMaxSeconds, 1, "CAS" )
     
-    self:T( { CAS = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { CAS = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
   end
   
   
@@ -2446,7 +2446,7 @@ do -- AI_A2G_DISPATCHER
     Bai.EngageAltType = EngageAltType
     Bai.Defend = true
     
-    self:T( { BAI = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { BAI = { SquadronName, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
     
     return self
   end
@@ -2536,7 +2536,7 @@ do -- AI_A2G_DISPATCHER
 
     self:SetSquadronPatrolInterval( SquadronName, self.DefenderDefault.PatrolLimit, self.DefenderDefault.PatrolMinSeconds, self.DefenderDefault.PatrolMaxSeconds, 1, "BAI" )
     
-    self:T( { BAI = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
+    self:I( { BAI = { Zone:GetName(), PatrolMinSpeed, PatrolMaxSpeed, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolAltType, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType } } )
   end
   
 
@@ -3369,7 +3369,7 @@ do -- AI_A2G_DISPATCHER
   end 
 
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   function AI_A2G_DISPATCHER:AddDefenderToSquadron( Squadron, Defender, Size )
     self.Defenders = self.Defenders or {}
     local DefenderName = Defender:GetName()
@@ -3380,7 +3380,7 @@ do -- AI_A2G_DISPATCHER
     self:F( { DefenderName = DefenderName, SquadronResourceCount = Squadron.ResourceCount } )
   end
 
-  -- @param #AI_A2G_DISPATCHER self
+  --- @param #AI_A2G_DISPATCHER self
   function AI_A2G_DISPATCHER:RemoveDefenderFromSquadron( Squadron, Defender )
     self.Defenders = self.Defenders or {}
     local DefenderName = Defender:GetName()
@@ -3796,7 +3796,7 @@ do -- AI_A2G_DISPATCHER
         Dispatcher:ClearDefenderTaskTarget( DefenderGroup )
       end
 
-      -- @param #AI_A2G_DISPATCHER self
+      --- @param #AI_A2G_DISPATCHER self
       function AI_A2G_Fsm:onafterLostControl( DefenderGroup, From, Event, To )
         self:F({"LostControl", DefenderGroup:GetName()})
         self:GetParent(self).onafterHome( self, DefenderGroup, From, Event, To )
@@ -3813,7 +3813,7 @@ do -- AI_A2G_DISPATCHER
         end
       end
       
-      -- @param #AI_A2G_DISPATCHER self
+      --- @param #AI_A2G_DISPATCHER self
       function AI_A2G_Fsm:onafterHome( DefenderGroup, From, Event, To, Action )
         self:F({"Home", DefenderGroup:GetName()})
         self:GetParent(self).onafterHome( self, DefenderGroup, From, Event, To )
@@ -3894,15 +3894,11 @@ do -- AI_A2G_DISPATCHER
         local Squadron = Dispatcher:GetSquadronFromDefender( DefenderGroup )
         
         if Squadron then
-          local FirstUnit = AttackSetUnit:GetRandomSurely()
-          if FirstUnit then
+          local FirstUnit = AttackSetUnit:GetFirst()
           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
@@ -3937,7 +3933,7 @@ do -- AI_A2G_DISPATCHER
         Dispatcher:ClearDefenderTaskTarget( DefenderGroup )
       end
 
-      -- @param #AI_A2G_DISPATCHER self
+      --- @param #AI_A2G_DISPATCHER self
       function AI_A2G_Fsm:onafterLostControl( DefenderGroup, From, Event, To )
         self:F({"Defender LostControl", DefenderGroup:GetName()})
         self:GetParent(self).onafterHome( self, DefenderGroup, From, Event, To )
@@ -3954,7 +3950,7 @@ do -- AI_A2G_DISPATCHER
         end
       end
       
-      -- @param #AI_A2G_DISPATCHER self
+      --- @param #AI_A2G_DISPATCHER self
       function AI_A2G_Fsm:onafterHome( DefenderGroup, From, Event, To, Action )
         self:F({"Defender Home", DefenderGroup:GetName()})
         self:GetParent(self).onafterHome( self, DefenderGroup, From, Event, To )
@@ -4788,5 +4784,4 @@ 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,8 +13,9 @@
 
 
 
--- @type AI_A2G_SEAD
--- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL
+--- @type AI_A2G_SEAD
+-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
+-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
 
 
 --- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders.

Moose Development/Moose/AI/AI_Air.lua

@@ -9,8 +9,7 @@
 -- @module AI.AI_Air
 -- @image MOOSE.JPG
 
----
--- @type AI_AIR
+--- @type AI_AIR
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 
 --- The AI_AIR class implements the core functions to operate an AI @{Wrapper.Group}.
@@ -265,7 +264,7 @@ function AI_AIR:New( AIGroup )
   return self
 end
 
--- @param Wrapper.Group#GROUP self
+--- @param Wrapper.Group#GROUP self
 -- @param Core.Event#EVENTDATA EventData
 function GROUP:OnEventTakeoff( EventData, Fsm )
   Fsm:Takeoff()
@@ -447,13 +446,13 @@ function AI_AIR:onafterReturn( Controllable, From, Event, To )
   
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 function AI_AIR:onbeforeStatus()
 
   return self.CheckStatus
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 function AI_AIR:onafterStatus()
 
   if self.Controllable and self.Controllable:IsAlive() then
@@ -466,7 +465,7 @@ function AI_AIR:onafterStatus()
       local DistanceFromHomeBase = self.HomeAirbase:GetCoordinate():Get2DDistance( self.Controllable:GetCoordinate() )
       
       if DistanceFromHomeBase > self.DisengageRadius then
-        self:T( self.Controllable:GetName() .. " is too far from home base, RTB!" )
+        self:I( self.Controllable:GetName() .. " is too far from home base, RTB!" )
         self:Hold( 300 )
         RTB = false
       end
@@ -490,10 +489,10 @@ function AI_AIR:onafterStatus()
       if Fuel < self.FuelThresholdPercentage then
 
         if self.TankerName then
-          self:T( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... Refuelling at Tanker!" )
+          self:I( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... Refuelling at Tanker!" )
           self:Refuel()
         else
-          self:T( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... RTB!" )
+          self:I( self.Controllable:GetName() .. " is out of fuel: " .. Fuel .. " ... RTB!" )
           local OldAIControllable = self.Controllable
 
           local OrbitTask = OldAIControllable:TaskOrbitCircle( math.random( self.PatrolFloorAltitude, self.PatrolCeilingAltitude ), self.PatrolMinSpeed )
@@ -519,7 +518,7 @@ function AI_AIR:onafterStatus()
     -- Note that a group can consist of more units, so if one unit is damaged of a group, the mission may continue.
     -- The damaged unit will RTB due to DCS logic, and the others will continue to engage.
     if ( Damage / InitialLife ) < self.PatrolDamageThreshold then
-      self:T( self.Controllable:GetName() .. " is damaged: " .. Damage .. " ... RTB!" )
+      self:I( self.Controllable:GetName() .. " is damaged: " .. Damage .. " ... RTB!" )
       self:Damaged()
       RTB = true
       self:SetStatusOff()
@@ -537,7 +536,7 @@ function AI_AIR:onafterStatus()
           if Damage ~= InitialLife then
             self:Damaged()
           else  
-            self:T( self.Controllable:GetName() .. " control lost! " )
+            self:I( self.Controllable:GetName() .. " control lost! " )
 
             self:LostControl()
           end
@@ -561,7 +560,7 @@ function AI_AIR:onafterStatus()
 end
 
 
--- @param Wrapper.Group#GROUP AIGroup
+--- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR.RTBRoute( AIGroup, Fsm )
 
   AIGroup:F( { "AI_AIR.RTBRoute:", AIGroup:GetName() } )
@@ -572,7 +571,7 @@ function AI_AIR.RTBRoute( AIGroup, Fsm )
 
 end
 
--- @param Wrapper.Group#GROUP AIGroup
+--- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR.RTBHold( AIGroup, Fsm )
 
   AIGroup:F( { "AI_AIR.RTBHold:", AIGroup:GetName() } )
@@ -599,7 +598,7 @@ function AI_AIR:SetRTBSpeedFactors(MinFactor,MaxFactor)
 end
 
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR:onafterRTB( AIGroup, From, Event, To )
   self:F( { AIGroup, From, Event, To } )
@@ -618,10 +617,7 @@ function AI_AIR:onafterRTB( AIGroup, From, Event, To )
     --- Calculate the target route point.
 
     local FromCoord = AIGroup:GetCoordinate()
-    if not FromCoord then return end
-        
     local ToTargetCoord = self.HomeAirbase:GetCoordinate() -- coordinate is on land height(!)
-
     local ToTargetVec3 = ToTargetCoord:GetVec3()
     ToTargetVec3.y = ToTargetCoord:GetLandHeight()+3000 -- let's set this 1000m/3000 feet above ground
     local ToTargetCoord2 = COORDINATE:NewFromVec3( ToTargetVec3 )
@@ -642,13 +638,13 @@ function AI_AIR:onafterRTB( AIGroup, From, Event, To )
     local ToAirbaseCoord = ToTargetCoord2
 
     if Distance < 5000 then
-      self:T( "RTB and near the airbase!" )
+      self:I( "RTB and near the airbase!" )
       self:Home()
       return
     end
 
     if not AIGroup:InAir() == true then
-      self:T( "Not anymore in the air, considered Home." )
+      self:I( "Not anymore in the air, considered Home." )
       self:Home()
       return
     end
@@ -657,8 +653,8 @@ function AI_AIR:onafterRTB( AIGroup, From, Event, To )
     --- Create a route point of type air.
     local FromRTBRoutePoint = FromCoord:WaypointAir( 
       self.PatrolAltType, 
-      COORDINATE.WaypointType.TurningPoint, 
-      COORDINATE.WaypointAction.TurningPoint, 
+      POINT_VEC3.RoutePointType.TurningPoint, 
+      POINT_VEC3.RoutePointAction.TurningPoint, 
       RTBSpeed, 
       true 
     )
@@ -666,8 +662,8 @@ function AI_AIR:onafterRTB( AIGroup, From, Event, To )
     --- Create a route point of type air.
     local ToRTBRoutePoint = ToAirbaseCoord:WaypointAir( 
       self.PatrolAltType, 
-      COORDINATE.WaypointType.TurningPoint, 
-      COORDINATE.WaypointAction.TurningPoint, 
+      POINT_VEC3.RoutePointType.TurningPoint, 
+      POINT_VEC3.RoutePointAction.TurningPoint, 
       RTBSpeed, 
       true 
     )
@@ -690,12 +686,12 @@ function AI_AIR:onafterRTB( AIGroup, From, Event, To )
 
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR:onafterHome( AIGroup, From, Event, To )
   self:F( { AIGroup, From, Event, To } )
 
-  self:T( "Group " .. self.Controllable:GetName() .. " ... Home! ( " .. self:GetState() .. " )" )
+  self:I( "Group " .. self.Controllable:GetName() .. " ... Home! ( " .. self:GetState() .. " )" )
   
   if AIGroup and AIGroup:IsAlive() then
   end
@@ -704,17 +700,15 @@ end
 
 
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR:onafterHold( AIGroup, From, Event, To, HoldTime )
   self:F( { AIGroup, From, Event, To } )
 
-  self:T( "Group " .. self.Controllable:GetName() .. " ... Holding! ( " .. self:GetState() .. " )" )
+  self:I( "Group " .. self.Controllable:GetName() .. " ... Holding! ( " .. self:GetState() .. " )" )
   
   if AIGroup and AIGroup:IsAlive() then
-    local Coordinate = AIGroup:GetCoordinate()
-    if Coordinate == nil then return end
-    local OrbitTask = AIGroup:TaskOrbitCircle( math.random( self.PatrolFloorAltitude, self.PatrolCeilingAltitude ), self.PatrolMinSpeed, Coordinate )
+    local OrbitTask = AIGroup:TaskOrbitCircle( math.random( self.PatrolFloorAltitude, self.PatrolCeilingAltitude ), self.PatrolMinSpeed )
     local TimedOrbitTask = AIGroup:TaskControlled( OrbitTask, AIGroup:TaskCondition( nil, nil, nil, nil, HoldTime , nil ) )
     
     local RTBTask = AIGroup:TaskFunction( "AI_AIR.RTBHold", self )
@@ -728,17 +722,17 @@ function AI_AIR:onafterHold( AIGroup, From, Event, To, HoldTime )
 
 end
 
--- @param Wrapper.Group#GROUP AIGroup
+--- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR.Resume( AIGroup, Fsm )
 
-  AIGroup:T( { "AI_AIR.Resume:", AIGroup:GetName() } )
+  AIGroup:I( { "AI_AIR.Resume:", AIGroup:GetName() } )
   if AIGroup:IsAlive() then
     Fsm:__RTB( Fsm.TaskDelay )
   end
   
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_AIR:onafterRefuel( AIGroup, From, Event, To )
   self:F( { AIGroup, From, Event, To } )
@@ -750,7 +744,7 @@ function AI_AIR:onafterRefuel( AIGroup, From, Event, To )
 
     if Tanker and Tanker:IsAlive() and Tanker:IsAirPlane() then
 
-      self:T( "Group " .. self.Controllable:GetName() .. " ... Refuelling! State=" .. self:GetState() .. ", Refuelling tanker " .. self.TankerName )
+      self:I( "Group " .. self.Controllable:GetName() .. " ... Refuelling! State=" .. self:GetState() .. ", Refuelling tanker " .. self.TankerName )
 
       local RefuelRoute = {}
   
@@ -761,10 +755,10 @@ function AI_AIR:onafterRefuel( AIGroup, From, Event, To )
       local ToRefuelSpeed = math.random( self.PatrolMinSpeed, self.PatrolMaxSpeed )
       
       --- Create a route point of type air.
-      local FromRefuelRoutePoint = FromRefuelCoord:WaypointAir(self.PatrolAltType, COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, ToRefuelSpeed, true)
+      local FromRefuelRoutePoint = FromRefuelCoord:WaypointAir(self.PatrolAltType, POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, ToRefuelSpeed, true)
 
       --- Create a route point of type air. NOT used!
-      local ToRefuelRoutePoint = Tanker:GetCoordinate():WaypointAir(self.PatrolAltType, COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, ToRefuelSpeed, true)
+      local ToRefuelRoutePoint = Tanker:GetCoordinate():WaypointAir(self.PatrolAltType, POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, ToRefuelSpeed, true)
   
       self:F( { ToRefuelSpeed = ToRefuelSpeed } )
       
@@ -804,13 +798,13 @@ end
     
 
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 function AI_AIR:onafterDead()
   self:SetStatusOff()
 end
 
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Core.Event#EVENTDATA EventData
 function AI_AIR:OnCrash( EventData )
 
@@ -821,7 +815,7 @@ function AI_AIR:OnCrash( EventData )
   end
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Core.Event#EVENTDATA EventData
 function AI_AIR:OnEjection( EventData )
 
@@ -830,7 +824,7 @@ function AI_AIR:OnEjection( EventData )
   end
 end
 
--- @param #AI_AIR self
+--- @param #AI_AIR self
 -- @param Core.Event#EVENTDATA EventData
 function AI_AIR:OnPilotDead( EventData )
 

Moose Development/Moose/AI/AI_Air_Dispatcher.lua

@@ -24,7 +24,7 @@
 -- 
 -- ## Missions:
 -- 
--- [AI_A2A_Dispatcher](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_A2A_Dispatcher)
+-- [AID-AIR - AI AIR Dispatching](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AID%20-%20AI%20Dispatching)
 -- 
 -- ===
 -- 
@@ -900,14 +900,14 @@ do -- AI_AIR_DISPATCHER
   -- @type AI_AIR_DISPATCHER.DefenseCoordinates
   -- @map <#string,Core.Point#COORDINATE> A list of all defense coordinates mapped per defense coordinate name.
 
-  -- @field #AI_AIR_DISPATCHER.DefenseCoordinates DefenseCoordinates
+  --- @field #AI_AIR_DISPATCHER.DefenseCoordinates DefenseCoordinates
   AI_AIR_DISPATCHER.DefenseCoordinates = {}
 
   --- Enumerator for spawns at airbases
   -- @type AI_AIR_DISPATCHER.Takeoff
   -- @extends Wrapper.Group#GROUP.Takeoff
 
-  -- @field #AI_AIR_DISPATCHER.Takeoff Takeoff
+  --- @field #AI_AIR_DISPATCHER.Takeoff Takeoff
   AI_AIR_DISPATCHER.Takeoff = GROUP.Takeoff
 
   --- Defnes Landing location.
@@ -938,7 +938,7 @@ do -- AI_AIR_DISPATCHER
   -- @type AI_AIR_DISPATCHER.DefenseQueue
   -- @list<#AI_AIR_DISPATCHER.DefenseQueueItem> DefenseQueueItem A list of all defenses being queued ...
 
-  -- @field #AI_AIR_DISPATCHER.DefenseQueue DefenseQueue
+  --- @field #AI_AIR_DISPATCHER.DefenseQueue DefenseQueue
   AI_AIR_DISPATCHER.DefenseQueue = {}
 
   --- Defense approach types
@@ -1130,7 +1130,7 @@ do -- AI_AIR_DISPATCHER
   end
 
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   function AI_AIR_DISPATCHER:onafterStart( From, Event, To )
 
     self:GetParent( self ).onafterStart( self, From, Event, To )
@@ -1141,7 +1141,7 @@ do -- AI_AIR_DISPATCHER
       for Resource = 1, DefenderSquadron.ResourceCount or 0 do
         self:ResourcePark( DefenderSquadron )
       end
-      self:T( "Parked resources for squadron " .. DefenderSquadron.Name )
+      self:I( "Parked resources for squadron " .. DefenderSquadron.Name )
     end
     
   end
@@ -1194,7 +1194,7 @@ do -- AI_AIR_DISPATCHER
   end
   
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   function AI_AIR_DISPATCHER:ResourcePark( DefenderSquadron )
     local TemplateID = math.random( 1, #DefenderSquadron.Spawn )
     local Spawn = DefenderSquadron.Spawn[ TemplateID ] -- Core.Spawn#SPAWN
@@ -1211,31 +1211,31 @@ do -- AI_AIR_DISPATCHER
   end
 
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_AIR_DISPATCHER:OnEventBaseCaptured( EventData )
 
     local AirbaseName = EventData.PlaceName -- The name of the airbase that was captured.
     
-    self:T( "Captured " .. AirbaseName )
+    self:I( "Captured " .. AirbaseName )
     
     -- Now search for all squadrons located at the airbase, and sanitize them.
     for SquadronName, Squadron in pairs( self.DefenderSquadrons ) do
       if Squadron.AirbaseName == AirbaseName then
         Squadron.ResourceCount = -999 -- The base has been captured, and the resources are eliminated. No more spawning.
         Squadron.Captured = true
-        self:T( "Squadron " .. SquadronName .. " captured." )
+        self:I( "Squadron " .. SquadronName .. " captured." )
       end
     end
   end
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_AIR_DISPATCHER:OnEventCrashOrDead( EventData )
     self.Detection:ForgetDetectedUnit( EventData.IniUnitName ) 
   end
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_AIR_DISPATCHER:OnEventLand( EventData )
     self:F( "Landed" )
@@ -1252,7 +1252,7 @@ do -- AI_AIR_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
-        self:ResourcePark( Squadron )
+        self:ResourcePark( Squadron, Defender )
         return
       end
       if DefenderUnit:GetLife() ~= DefenderUnit:GetLife0() then
@@ -1263,7 +1263,7 @@ do -- AI_AIR_DISPATCHER
     end 
   end
   
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param Core.Event#EVENTDATA EventData
   function AI_AIR_DISPATCHER:OnEventEngineShutdown( EventData )
     local DefenderUnit = EventData.IniUnit
@@ -1279,31 +1279,31 @@ do -- AI_AIR_DISPATCHER
           self:RemoveDefenderFromSquadron( Squadron, Defender )
         end
         DefenderUnit:Destroy()
-        self:ResourcePark( Squadron )
+        self:ResourcePark( Squadron, Defender )
       end
     end 
   end
 
   do -- Manage the defensive behaviour
   
-    -- @param #AI_AIR_DISPATCHER self
+    --- @param #AI_AIR_DISPATCHER self
     -- @param #string DefenseCoordinateName The name of the coordinate to be defended by AIR defenses.
     -- @param Core.Point#COORDINATE DefenseCoordinate The coordinate to be defended by AIR defenses.
     function AI_AIR_DISPATCHER:AddDefenseCoordinate( DefenseCoordinateName, DefenseCoordinate )
       self.DefenseCoordinates[DefenseCoordinateName] = DefenseCoordinate
     end
     
-    -- @param #AI_AIR_DISPATCHER self
+    --- @param #AI_AIR_DISPATCHER self
     function AI_AIR_DISPATCHER:SetDefenseReactivityLow()
       self.DefenseReactivity = 0.05
     end
     
-    -- @param #AI_AIR_DISPATCHER self
+    --- @param #AI_AIR_DISPATCHER self
     function AI_AIR_DISPATCHER:SetDefenseReactivityMedium()
       self.DefenseReactivity = 0.15
     end
     
-    -- @param #AI_AIR_DISPATCHER self
+    --- @param #AI_AIR_DISPATCHER self
     function AI_AIR_DISPATCHER:SetDefenseReactivityHigh()
       self.DefenseReactivity = 0.5
     end
@@ -1867,7 +1867,7 @@ do -- AI_AIR_DISPATCHER
     
   end
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param #string SquadronName The squadron name.
   -- @param #number TakeoffInterval  Only Takeoff new units each specified interval in seconds in 10 seconds steps.
   -- @usage
@@ -2769,7 +2769,7 @@ do -- AI_AIR_DISPATCHER
 
   -- TODO: Need to model the resources in a squadron.
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param AI.AI_Air_Squadron#AI_AIR_SQUADRON Squadron
   function AI_AIR_DISPATCHER:AddDefenderToSquadron( Squadron, Defender, Size )
     self.Defenders = self.Defenders or {}
@@ -2782,7 +2782,7 @@ do -- AI_AIR_DISPATCHER
     self:F( { DefenderName = DefenderName, SquadronResourceCount = Squadron.ResourceCount } )
   end
 
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param AI.AI_Air_Squadron#AI_AIR_SQUADRON Squadron
   function AI_AIR_DISPATCHER:RemoveDefenderFromSquadron( Squadron, Defender )
     self.Defenders = self.Defenders or {}
@@ -2795,7 +2795,7 @@ do -- AI_AIR_DISPATCHER
     self:F( { DefenderName = DefenderName, SquadronResourceCount = SquadronResourceCount } )
   end
   
-  -- @param #AI_AIR_DISPATCHER self
+  --- @param #AI_AIR_DISPATCHER self
   -- @param Wrapper.Group#GROUP Defender
   -- @return AI.AI_Air_Squadron#AI_AIR_SQUADRON The Squadron.
   function AI_AIR_DISPATCHER:GetSquadronFromDefender( Defender )

Moose Development/Moose/AI/AI_Air_Engage.lua

@@ -13,8 +13,8 @@
 
 
 
--- @type AI_AIR_ENGAGE
--- @extends AI.AI_AIR#AI_AIR
+--- @type AI_AIR_ENGAGE
+-- @extends AI.AI_Air#AI_AIR
 
 
 --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
@@ -351,7 +351,7 @@ function AI_AIR_ENGAGE:onafterAbort( AIGroup, From, Event, To )
 end
 
 
--- @param #AI_AIR_ENGAGE self
+--- @param #AI_AIR_ENGAGE self
 -- @param Wrapper.Group#GROUP AIGroup The Group Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -361,7 +361,7 @@ function AI_AIR_ENGAGE:onafterAccomplish( AIGroup, From, Event, To )
   --self:SetDetectionOff()
 end
 
--- @param #AI_AIR_ENGAGE self
+--- @param #AI_AIR_ENGAGE self
 -- @param Wrapper.Group#GROUP AIGroup The Group Object managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -374,7 +374,7 @@ function AI_AIR_ENGAGE:onafterDestroy( AIGroup, From, Event, To, EventData )
   end
 end
 
--- @param #AI_AIR_ENGAGE self
+--- @param #AI_AIR_ENGAGE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_AIR_ENGAGE:OnEventDead( EventData )
   self:F( { "EventDead", EventData } )
@@ -387,9 +387,9 @@ function AI_AIR_ENGAGE:OnEventDead( EventData )
 end
 
 
--- @param Wrapper.Group#GROUP AIControllable
+--- @param Wrapper.Group#GROUP AIControllable
 function AI_AIR_ENGAGE.___EngageRoute( AIGroup, Fsm, AttackSetUnit )
-  Fsm:T(string.format("AI_AIR_ENGAGE.___EngageRoute: %s", tostring(AIGroup:GetName())))
+  Fsm:I(string.format("AI_AIR_ENGAGE.___EngageRoute: %s", tostring(AIGroup:GetName())))
   
   if AIGroup and AIGroup:IsAlive() then
     Fsm:__EngageRoute( Fsm.TaskDelay or 0.1, AttackSetUnit )
@@ -397,14 +397,14 @@ function AI_AIR_ENGAGE.___EngageRoute( AIGroup, Fsm, AttackSetUnit )
 end
 
 
--- @param #AI_AIR_ENGAGE self
+--- @param #AI_AIR_ENGAGE self
 -- @param Wrapper.Group#GROUP DefenderGroup The GroupGroup managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
 -- @param #string To The To State string.
 -- @param Core.Set#SET_UNIT AttackSetUnit Unit set to be attacked.
 function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, AttackSetUnit )
-  self:T( { DefenderGroup, From, Event, To, AttackSetUnit } )
+  self:I( { DefenderGroup, From, Event, To, AttackSetUnit } )
   
   local DefenderGroupName = DefenderGroup:GetName()
 
@@ -426,13 +426,7 @@ function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, Attac
       local DefenderCoord = DefenderGroup:GetPointVec3()
       DefenderCoord:SetY( EngageAltitude ) -- Ground targets don't have an altitude.
 
-      local TargetCoord = AttackSetUnit:GetRandomSurely():GetPointVec3()
-      
-      if TargetCoord == nil then
-        self:Return()
-        return
-      end
-      
+      local TargetCoord = AttackSetUnit:GetFirst():GetPointVec3()
       TargetCoord:SetY( EngageAltitude ) -- Ground targets don't have an altitude.
       
       local TargetDistance = DefenderCoord:Get2DDistance( TargetCoord )
@@ -441,19 +435,19 @@ function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, Attac
       -- TODO: A factor of * 3 is way too close. This causes the AI not to engange until merged sometimes!
       if TargetDistance <= EngageDistance * 9 then
 
-        --self:T(string.format("AI_AIR_ENGAGE onafterEngageRoute ==> __Engage - target distance = %.1f km", TargetDistance/1000))
+        --self:I(string.format("AI_AIR_ENGAGE onafterEngageRoute ==> __Engage - target distance = %.1f km", TargetDistance/1000))
         self:__Engage( 0.1, AttackSetUnit )
 
       else
       
-        --self:T(string.format("FF AI_AIR_ENGAGE onafterEngageRoute ==> Routing - target distance = %.1f km", TargetDistance/1000))
+        --self:I(string.format("FF AI_AIR_ENGAGE onafterEngageRoute ==> Routing - target distance = %.1f km", TargetDistance/1000))
 
         local EngageRoute = {}
         local AttackTasks = {}
         
         --- Calculate the target route point.
         
-        local FromWP = DefenderCoord:WaypointAir(self.PatrolAltType or "RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, EngageSpeed, true)
+        local FromWP = DefenderCoord:WaypointAir(self.PatrolAltType or "RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, EngageSpeed, true)
         
         EngageRoute[#EngageRoute+1] = FromWP
   
@@ -462,7 +456,7 @@ function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, Attac
         local FromEngageAngle = DefenderCoord:GetAngleDegrees( DefenderCoord:GetDirectionVec3( TargetCoord ) )
         local ToCoord=DefenderCoord:Translate( EngageDistance, FromEngageAngle, true )
         
-        local ToWP = ToCoord:WaypointAir(self.PatrolAltType or "RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, EngageSpeed, true)
+        local ToWP = ToCoord:WaypointAir(self.PatrolAltType or "RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, EngageSpeed, true)
   
         EngageRoute[#EngageRoute+1] = ToWP
 
@@ -478,16 +472,16 @@ function AI_AIR_ENGAGE:onafterEngageRoute( DefenderGroup, From, Event, To, Attac
     end
   else
     -- TODO: This will make an A2A Dispatcher CAP flight to return rather than going back to patrolling!
-    self:T( DefenderGroupName .. ": No targets found -> Going RTB")
+    self:I( DefenderGroupName .. ": No targets found -> Going RTB")
     self:Return()
   end
 end
 
 
--- @param Wrapper.Group#GROUP AIControllable
+--- @param Wrapper.Group#GROUP AIControllable
 function AI_AIR_ENGAGE.___Engage( AIGroup, Fsm, AttackSetUnit )
 
-  Fsm:T(string.format("AI_AIR_ENGAGE.___Engage: %s", tostring(AIGroup:GetName())))
+  Fsm:I(string.format("AI_AIR_ENGAGE.___Engage: %s", tostring(AIGroup:GetName())))
   
   if AIGroup and AIGroup:IsAlive() then
     local delay=Fsm.TaskDelay or 0.1
@@ -496,7 +490,7 @@ function AI_AIR_ENGAGE.___Engage( AIGroup, Fsm, AttackSetUnit )
 end
 
 
--- @param #AI_AIR_ENGAGE self
+--- @param #AI_AIR_ENGAGE self
 -- @param Wrapper.Group#GROUP DefenderGroup The GroupGroup managed by the FSM.
 -- @param #string From The From State string.
 -- @param #string Event The Event string.
@@ -522,7 +516,7 @@ function AI_AIR_ENGAGE:onafterEngage( DefenderGroup, From, Event, To, AttackSetU
       local DefenderCoord = DefenderGroup:GetPointVec3()
       DefenderCoord:SetY( EngageAltitude ) -- Ground targets don't have an altitude.
 
-      local TargetCoord = AttackSetUnit:GetRandomSurely():GetPointVec3()
+      local TargetCoord = AttackSetUnit:GetFirst():GetPointVec3()
       if not TargetCoord then
           self:Return()
           return
@@ -536,7 +530,7 @@ function AI_AIR_ENGAGE:onafterEngage( DefenderGroup, From, Event, To, AttackSetU
       local EngageRoute = {}
       local AttackTasks = {}
       
-      local FromWP = DefenderCoord:WaypointAir(self.EngageAltType or "RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, EngageSpeed, true)
+      local FromWP = DefenderCoord:WaypointAir(self.EngageAltType or "RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, EngageSpeed, true)
       EngageRoute[#EngageRoute+1] = FromWP
 
       self:SetTargetDistance( TargetCoord ) -- For RTB status check
@@ -544,7 +538,7 @@ function AI_AIR_ENGAGE:onafterEngage( DefenderGroup, From, Event, To, AttackSetU
       local FromEngageAngle = DefenderCoord:GetAngleDegrees( DefenderCoord:GetDirectionVec3( TargetCoord ) )
       local ToCoord=DefenderCoord:Translate( EngageDistance, FromEngageAngle, true )
       
-      local ToWP = ToCoord:WaypointAir(self.EngageAltType or "RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, EngageSpeed, true)
+      local ToWP = ToCoord:WaypointAir(self.EngageAltType or "RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, EngageSpeed, true)
       EngageRoute[#EngageRoute+1] = ToWP
       
       -- TODO: A factor of * 3 this way too low. This causes the AI NOT to engage until very close or even merged sometimes. Some A2A missiles have a much longer range! Needs more frequent updates of the task!
@@ -553,12 +547,12 @@ function AI_AIR_ENGAGE:onafterEngage( DefenderGroup, From, Event, To, AttackSetU
         local AttackUnitTasks = self:CreateAttackUnitTasks( AttackSetUnit, DefenderGroup, EngageAltitude ) -- Polymorphic
         
         if #AttackUnitTasks == 0 then
-          self:T( DefenderGroupName .. ": No valid targets found -> Going RTB")
+          self:I( DefenderGroupName .. ": No valid targets found -> Going RTB")
           self:Return()
           return
         else
           local text=string.format("%s: Engaging targets at distance %.2f NM", DefenderGroupName, UTILS.MetersToNM(TargetDistance))
-          self:T(text)
+          self:I(text)
           DefenderGroup:OptionROEOpenFire()
           DefenderGroup:OptionROTEvadeFire()
           DefenderGroup:OptionKeepWeaponsOnThreat()
@@ -575,13 +569,13 @@ function AI_AIR_ENGAGE:onafterEngage( DefenderGroup, From, Event, To, AttackSetU
     end
   else
     -- TODO: This will make an A2A Dispatcher CAP flight to return rather than going back to patrolling!
-    self:T( DefenderGroupName .. ": No targets found -> returning.")
+    self:I( DefenderGroupName .. ": No targets found -> returning.")
     self:Return()
     return
   end
 end
 
--- @param Wrapper.Group#GROUP AIEngage
+--- @param Wrapper.Group#GROUP AIEngage
 function AI_AIR_ENGAGE.Resume( AIEngage, Fsm )
 
   AIEngage:F( { "Resume:", AIEngage:GetName() } )

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}
@@ -309,7 +309,7 @@ function AI_AIR_PATROL:onafterPatrolRoute( AIPatrol, From, Event, To )
     local ToTargetSpeed = math.random( self.PatrolMinSpeed, self.PatrolMaxSpeed )
     local speedkmh=ToTargetSpeed
 
-    local FromWP = CurrentCoord:WaypointAir(self.PatrolAltType or "RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, ToTargetSpeed, true)
+    local FromWP = CurrentCoord:WaypointAir(self.PatrolAltType or "RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, ToTargetSpeed, true)
     PatrolRoute[#PatrolRoute+1] = FromWP
 
     if self.racetrack then
@@ -359,9 +359,9 @@ function AI_AIR_PATROL:onafterPatrolRoute( AIPatrol, From, Event, To )
     else
 
       --- Create a route point of type air.
-      local ToWP = ToTargetCoord:WaypointAir(self.PatrolAltType, COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, ToTargetSpeed, true)  
+      local ToWP = ToTargetCoord:WaypointAir(self.PatrolAltType, POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, ToTargetSpeed, true)  
       PatrolRoute[#PatrolRoute+1] = ToWP
-      
+
       local Tasks = {}
       Tasks[#Tasks+1] = AIPatrol:TaskFunction("AI_AIR_PATROL.___PatrolRoute", self)
       PatrolRoute[#PatrolRoute].task = AIPatrol:TaskCombo( Tasks )

Moose Development/Moose/AI/AI_Air_Squadron.lua

@@ -13,7 +13,7 @@
 
 
 
--- @type AI_AIR_SQUADRON
+--- @type AI_AIR_SQUADRON
 -- @extends Core.Base#BASE
 
 
@@ -38,7 +38,7 @@ AI_AIR_SQUADRON = {
 -- @return #AI_AIR_SQUADRON
 function AI_AIR_SQUADRON:New( SquadronName, AirbaseName, TemplatePrefixes, ResourceCount )
 
-  self:T( { Air_Squadron = { SquadronName, AirbaseName, TemplatePrefixes, ResourceCount } } )
+  self:I( { Air_Squadron = { SquadronName, AirbaseName, TemplatePrefixes, ResourceCount } } )
 
   local AI_Air_Squadron = BASE:New() -- #AI_AIR_SQUADRON
   

Moose Development/Moose/AI/AI_BAI.lua

@@ -11,7 +11,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_BAI)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/BAI%20-%20Battlefield%20Air%20Interdiction)
 -- 
 -- ===
 -- 
@@ -174,7 +174,8 @@ function AI_BAI_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude
   -- @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.
-  -- @param #string To The To State string. 
+  -- @param #string To The To State string.
+  
   -- @return #boolean Return false to cancel Transition.
   
   --- OnAfter Transition Handler for Event Engage.
@@ -407,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" )
@@ -416,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.
@@ -428,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.
@@ -477,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.
@@ -487,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.
@@ -521,12 +522,12 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To,
     
     --DONE: Create GetAltitude function for GROUP, and delete GetUnit(1).
     local CurrentAltitude = self.Controllable:GetAltitude()
-    local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+    local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
     local ToEngageZoneSpeed = self.PatrolMaxSpeed
     local CurrentRoutePoint = CurrentPointVec3:WaypointAir( 
         self.PatrolAltType, 
-        COORDINATE.WaypointType.TurningPoint, 
-        COORDINATE.WaypointAction.TurningPoint, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
         self.EngageSpeed, 
         true 
       )
@@ -577,13 +578,13 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To,
     self:T2( ToTargetVec2 )
 
     --- Obtain a 3D @{Point} from the 2D point + altitude.
-    local ToTargetPointVec3 = COORDINATE:New( ToTargetVec2.x, self.EngageAltitude, ToTargetVec2.y )
+    local ToTargetPointVec3 = POINT_VEC3:New( ToTargetVec2.x, self.EngageAltitude, ToTargetVec2.y )
     
     --- Create a route point of type air.
     local ToTargetRoutePoint = ToTargetPointVec3:WaypointAir( 
       self.PatrolAltType, 
-      COORDINATE.WaypointType.TurningPoint, 
-      COORDINATE.WaypointAction.TurningPoint, 
+      POINT_VEC3.RoutePointType.TurningPoint, 
+      POINT_VEC3.RoutePointAction.TurningPoint, 
       self.EngageSpeed, 
       true 
     )
@@ -611,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.
@@ -622,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.
@@ -636,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

@@ -9,7 +9,7 @@
 -- 
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Balancer)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AIB%20-%20AI%20Balancing)
 -- 
 -- ===
 -- 
@@ -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
@@ -168,8 +168,7 @@ function AI_BALANCER:ReturnToHomeAirbase( ReturnThresholdRange )
   self.ReturnThresholdRange = ReturnThresholdRange
 end
 
---- AI_BALANCER:onenterSpawning
--- @param #AI_BALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param #string ClientName
 -- @param Wrapper.Group#GROUP AIGroup
@@ -191,8 +190,7 @@ function AI_BALANCER:onenterSpawning( SetGroup, From, Event, To, ClientName )
   end
 end
 
---- AI_BALANCER:onenterDestroying
--- @param #AI_BALANCER self
+--- @param #AI_BALANCER self
 -- @param Core.Set#SET_GROUP SetGroup
 -- @param Wrapper.Group#GROUP AIGroup
 function AI_BALANCER:onenterDestroying( SetGroup, From, Event, To, ClientName, AIGroup )
@@ -220,24 +218,30 @@ function AI_BALANCER:onenterReturning( SetGroup, From, Event, To, AIGroup )
       AIGroup:MessageToRed( "Returning to home base ...", 30 )
     else
       -- Okay, we need to send this Group back to the nearest base of the Coalition of the AI.
-      local PointVec2 = COORDINATE:New(AIGroup:GetVec2().x, 0, AIGroup:GetVec2().y)
+      --TODO: i need to rework the POINT_VEC2 thing.
+      local PointVec2 = POINT_VEC2:New( AIGroup:GetVec2().x, AIGroup:GetVec2().y  )
       local ClosestAirbase = self.ReturnAirbaseSet:FindNearestAirbaseFromPointVec2( PointVec2 )
       self:T( ClosestAirbase.AirbaseName )
+      --[[
+      AIGroup:MessageToRed( "Returning to " .. ClosestAirbase:GetName().. " ...", 30 )
+      local RTBRoute = AIGroup:RouteReturnToAirbase( ClosestAirbase )
+      AIGroupTemplate.route = RTBRoute
+      AIGroup:Respawn( AIGroupTemplate )
+      ]]
       AIGroup:RouteRTB(ClosestAirbase)
     end
 
 end
 
---- AI_BALANCER:onenterMonitoring
--- @param #AI_BALANCER self
+
+--- @param #AI_BALANCER self
 function AI_BALANCER:onenterMonitoring( SetGroup )
 
   self:T2( { self.SetClient:Count() } )
   --self.SetClient:Flush()
 
   self.SetClient:ForEachClient(
-    --- SetClient:ForEachClient
-    -- @param Wrapper.Client#CLIENT Client
+    --- @param Wrapper.Client#CLIENT Client
     function( Client )
       self:T3(Client.ClientName)
 
@@ -260,8 +264,7 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
             self:T2( RangeZone )
             
             _DATABASE:ForEachPlayerUnit(
-              --- Nameless function
-              -- @param Wrapper.Unit#UNIT RangeTestUnit
+              --- @param Wrapper.Unit#UNIT RangeTestUnit
               function( RangeTestUnit, RangeZone, AIGroup, PlayerInRange )
                 self:T2( { PlayerInRange, RangeTestUnit.UnitName, RangeZone.ZoneName } )
                 if RangeTestUnit:IsInZone( RangeZone ) == true then
@@ -273,8 +276,7 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
                 end
               end,
               
-              --- Nameless function
-              -- @param Core.Zone#ZONE_RADIUS RangeZone
+              --- @param Core.Zone#ZONE_RADIUS RangeZone
               -- @param Wrapper.Group#GROUP AIGroup
               function( RangeZone, AIGroup, PlayerInRange )
                 if PlayerInRange.Value == false then
@@ -305,3 +307,6 @@ function AI_BALANCER:onenterMonitoring( SetGroup )
   
   self:__Monitor( 10 )
 end
+
+
+

Moose Development/Moose/AI/AI_CAP.lua

@@ -9,7 +9,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_CAP)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAP%20-%20Combat%20Air%20Patrol)
 -- 
 -- ===
 -- 
@@ -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.
@@ -423,12 +423,12 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
 
     --DONE: Create GetAltitude function for GROUP, and delete GetUnit(1).
     local CurrentAltitude = self.Controllable:GetAltitude()
-    local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+    local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
     local ToEngageZoneSpeed = self.PatrolMaxSpeed
     local CurrentRoutePoint = CurrentPointVec3:WaypointAir(
         self.PatrolAltType,
-        COORDINATE.WaypointType.TurningPoint,
-        COORDINATE.WaypointAction.TurningPoint,
+        POINT_VEC3.RoutePointType.TurningPoint,
+        POINT_VEC3.RoutePointAction.TurningPoint,
         ToEngageZoneSpeed,
         true
       )
@@ -445,13 +445,13 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
     self:T2( { self.PatrolMinSpeed, self.PatrolMaxSpeed, ToTargetSpeed } )
 
     --- Obtain a 3D @{Point} from the 2D point + altitude.
-    local ToTargetPointVec3 = COORDINATE:New( ToTargetVec2.x, ToTargetAltitude, ToTargetVec2.y )
+    local ToTargetPointVec3 = POINT_VEC3:New( ToTargetVec2.x, ToTargetAltitude, ToTargetVec2.y )
 
     --- Create a route point of type air.
     local ToPatrolRoutePoint = ToTargetPointVec3:WaypointAir(
       self.PatrolAltType,
-      COORDINATE.WaypointType.TurningPoint,
-      COORDINATE.WaypointAction.TurningPoint,
+      POINT_VEC3.RoutePointType.TurningPoint,
+      POINT_VEC3.RoutePointAction.TurningPoint,
       ToTargetSpeed,
       true
     )
@@ -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

@@ -11,7 +11,7 @@
 --
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_CAS)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAS%20-%20Close%20Air%20Support)
 -- 
 -- ===
 -- 
@@ -162,6 +162,7 @@ function AI_CAS_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude
   -- @param #string From The From State string.
   -- @param #string Event The Event string.
   -- @param #string To The To State string.
+  
   -- @return #boolean Return false to cancel Transition.
   
   --- OnAfter Transition Handler for Event Engage.
@@ -362,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 )
 
@@ -374,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.
@@ -386,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.
@@ -419,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.
@@ -429,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.
@@ -465,12 +466,12 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To,
     
     --DONE: Create GetAltitude function for GROUP, and delete GetUnit(1).
     local CurrentAltitude = self.Controllable:GetAltitude()
-    local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+    local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
     local ToEngageZoneSpeed = self.PatrolMaxSpeed
     local CurrentRoutePoint = CurrentPointVec3:WaypointAir( 
         self.PatrolAltType, 
-        COORDINATE.WaypointType.TurningPoint, 
-        COORDINATE.WaypointAction.TurningPoint, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
         self.EngageSpeed, 
         true 
       )
@@ -507,13 +508,13 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To,
     self:T2( ToTargetVec2 )
 
     --- Obtain a 3D @{Point} from the 2D point + altitude.
-    local ToTargetPointVec3 = COORDINATE:New( ToTargetVec2.x, self.EngageAltitude, ToTargetVec2.y )
+    local ToTargetPointVec3 = POINT_VEC3:New( ToTargetVec2.x, self.EngageAltitude, ToTargetVec2.y )
     
     --- Create a route point of type air.
     local ToTargetRoutePoint = ToTargetPointVec3:WaypointAir( 
       self.PatrolAltType, 
-      COORDINATE.WaypointType.TurningPoint, 
-      COORDINATE.WaypointAction.TurningPoint, 
+      POINT_VEC3.RoutePointType.TurningPoint, 
+      POINT_VEC3.RoutePointAction.TurningPoint, 
       self.EngageSpeed, 
       true 
     )
@@ -529,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.
@@ -540,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.
@@ -554,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.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo
 -- @image Cargo.JPG
 
--- @type AI_CARGO
+--- @type AI_CARGO
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 
 
@@ -547,7 +547,7 @@ function AI_CARGO:onafterUnloaded( Carrier, From, Event, To, Cargo, CarrierUnit,
     for _, CarrierUnit in pairs( Carrier:GetUnits() ) do
       local CarrierUnit = CarrierUnit -- Wrapper.Unit#UNIT
       local IsEmpty = CarrierUnit:IsCargoEmpty()
-      self:T({ IsEmpty = IsEmpty })
+      self:I({ IsEmpty = IsEmpty })
       if not IsEmpty then
         AllUnloaded = false
         break

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
 
 
@@ -440,7 +440,7 @@ function AI_CARGO_AIRPLANE:Route( Airplane, Airbase, Speed, Height, Uncontrolled
     
     -- To point.
     local AirbasePointVec2 = Airbase:GetPointVec2()
-    local ToWaypoint = AirbasePointVec2:WaypointAir(COORDINATE.WaypointAltType.BARO, "Land", "Landing", Speed or Airplane:GetSpeedMax()*0.8, true, Airbase)
+    local ToWaypoint = AirbasePointVec2:WaypointAir(POINT_VEC3.RoutePointAltType.BARO, "Land", "Landing", Speed or Airplane:GetSpeedMax()*0.8, true, Airbase)
         
     --ToWaypoint["airdromeId"]   = Airbase:GetID()
     --ToWaypoint["speed_locked"] = true

Moose Development/Moose/AI/AI_Cargo_Dispatcher.lua

@@ -18,7 +18,7 @@
 -- 
 -- Test missions can be located on the main GITHUB site.
 -- 
--- [FlightControl-Master/MOOSE_MISSIONS/AID - AI Dispatching/AID-CGO - AI Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Cargo_Dispatcher)
+-- [FlightControl-Master/MOOSE_MISSIONS/AID - AI Dispatching/AID-CGO - AI Cargo Dispatching/](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/AID%20-%20AI%20Dispatching/AID-CGO%20-%20AI%20Cargo%20Dispatching)
 -- 
 -- ===
 -- 
@@ -116,7 +116,7 @@
 -- @image AI_Cargo_Dispatcher.JPG
 
 
--- @type AI_CARGO_DISPATCHER
+--- @type AI_CARGO_DISPATCHER
 -- @field Core.Set#SET_GROUP CarrierSet The set of @{Wrapper.Group#GROUP} objects of carriers that will transport the cargo. 
 -- @field Core.Set#SET_CARGO CargoSet The set of @{Cargo.Cargo#CARGO} objects, which can be CARGO_GROUP, CARGO_CRATE, CARGO_SLINGLOAD objects.
 -- @field Core.Zone#SET_ZONE PickupZoneSet The set of pickup zones, which are used to where the cargo can be picked up by the carriers. If nil, then cargo can be picked up everywhere. 
@@ -572,7 +572,7 @@
 -- A home zone can be specified to where the Carriers will move when there isn't any cargo left for pickup.
 -- Use @{#AI_CARGO_DISPATCHER.SetHomeZone}() to specify the home zone.
 -- 
--- If no home zone is specified, the carriers will wait near the deploy zone for a new pickup command.
+-- If no home zone is specified, the carriers will wait near the deploy zone for a new pickup command.   
 -- 
 -- ===
 --   
@@ -583,12 +583,10 @@ AI_CARGO_DISPATCHER = {
   PickupCargo = {}
 }
 
---- List of AI_Cargo
--- @field #list
+--- @field #list 
 AI_CARGO_DISPATCHER.AI_Cargo = {}
 
---- List of PickupCargo
--- @field #list
+--- @field #list
 AI_CARGO_DISPATCHER.PickupCargo = {}
 
 
@@ -1161,7 +1159,7 @@ function AI_CARGO_DISPATCHER:onafterMonitor()
                 else
                   local text=string.format("WARNING: Cargo %s is too heavy to be loaded into transport. Cargo weight %.1f > %.1f load capacity of carrier %s.", 
                   tostring(Cargo:GetName()), Cargo:GetWeight(), LargestLoadCapacity, tostring(Carrier:GetName()))
-                  self:T(text)
+                  self:I(text)
                 end
               end
             end

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 = SET_GROUP:New():FilterPrefixes( "ShippingLane" ):FilterOnce():GetSetObjects()
+--      local ShippingLane = GROUP:New():FilterPrefixes( "ShippingLane" ):FilterStart()
 -- 
 --      AICargoDispatcherShip = AI_CARGO_DISPATCHER_SHIP:New( SetShip, SetCargoInfantry, SetPickupZones, SetDeployZones, ShippingLane )
 --      AICargoDispatcherShip:Start()

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -9,7 +9,7 @@
 -- @module AI.AI_Cargo_Helicopter
 -- @image AI_Cargo_Dispatching_For_Helicopters.JPG
 
--- @type AI_CARGO_HELICOPTER
+--- @type AI_CARGO_HELICOPTER
 -- @extends Core.Fsm#FSM_CONTROLLABLE
 
 
@@ -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
@@ -367,8 +367,8 @@ function AI_CARGO_HELICOPTER:onafterQueue( Helicopter, From, Event, To, Coordina
 --          local CoordinateFrom = Helicopter:GetCoordinate()
 --          local WaypointFrom = CoordinateFrom:WaypointAir( 
 --            "RADIO", 
---            COORDINATE.WaypointType.TurningPoint, 
---            COORDINATE.WaypointAction.TurningPoint, 
+--            POINT_VEC3.RoutePointType.TurningPoint, 
+--            POINT_VEC3.RoutePointAction.TurningPoint, 
 --            Speed, 
 --            true 
 --          )
@@ -380,8 +380,8 @@ function AI_CARGO_HELICOPTER:onafterQueue( Helicopter, From, Event, To, Coordina
     
         local WaypointTo = CoordinateTo:WaypointAir( 
           "RADIO", 
-          COORDINATE.WaypointType.TurningPoint, 
-          COORDINATE.WaypointAction.TurningPoint, 
+          POINT_VEC3.RoutePointType.TurningPoint, 
+          POINT_VEC3.RoutePointAction.TurningPoint, 
           50, 
           true 
         )
@@ -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
@@ -427,7 +427,7 @@ function AI_CARGO_HELICOPTER:onafterOrbit( Helicopter, From, Event, To, Coordina
     local landheight = CoordinateTo:GetLandHeight() -- get target height
     CoordinateTo.y = landheight + 50 -- flight height should be 50m above ground
     
-    local WaypointTo = CoordinateTo:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, 50, true)
+    local WaypointTo = CoordinateTo:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, 50, true)
     Route[#Route+1] = WaypointTo
     
     local Tasks = {}
@@ -496,14 +496,14 @@ function AI_CARGO_HELICOPTER:onafterPickup( Helicopter, From, Event, To, Coordin
     local CoordinateFrom = Helicopter:GetCoordinate()
 
     --- Create a route point of type air.
-    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, _speed, true)
+    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, _speed, true)
 
     --- Create a route point of type air.
     local CoordinateTo = Coordinate
     local landheight = CoordinateTo:GetLandHeight() -- get target height
     CoordinateTo.y = landheight + 50 -- flight height should be 50m above ground
     
-    local WaypointTo = CoordinateTo:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint,_speed, true)
+    local WaypointTo = CoordinateTo:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint,_speed, true)
 
     Route[#Route+1] = WaypointFrom
     Route[#Route+1] = WaypointTo
@@ -563,7 +563,7 @@ function AI_CARGO_HELICOPTER:onafterDeploy( Helicopter, From, Event, To, Coordin
 
     --- Create a route point of type air.
     local CoordinateFrom = Helicopter:GetCoordinate()
-    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, _speed, true)
+    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, _speed, true)
     Route[#Route+1] = WaypointFrom
     Route[#Route+1] = WaypointFrom
 
@@ -573,7 +573,7 @@ function AI_CARGO_HELICOPTER:onafterDeploy( Helicopter, From, Event, To, Coordin
     local landheight = CoordinateTo:GetLandHeight() -- get target height
     CoordinateTo.y = landheight + 50 -- flight height should be 50m above ground
     
-    local WaypointTo = CoordinateTo:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, _speed, true)
+    local WaypointTo = CoordinateTo:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, _speed, true)
 
     Route[#Route+1] = WaypointTo
     Route[#Route+1] = WaypointTo
@@ -631,7 +631,7 @@ function AI_CARGO_HELICOPTER:onafterHome( Helicopter, From, Event, To, Coordinat
     --- Create a route point of type air.
     local CoordinateFrom = Helicopter:GetCoordinate()
     
-    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, Speed, true)
+    local WaypointFrom = CoordinateFrom:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, Speed, true)
     Route[#Route+1] = WaypointFrom
 
     --- Create a route point of type air.
@@ -639,7 +639,7 @@ function AI_CARGO_HELICOPTER:onafterHome( Helicopter, From, Event, To, Coordinat
     local landheight = CoordinateTo:GetLandHeight() -- get target height
     CoordinateTo.y = landheight + Height -- flight height should be 50m above ground
     
-    local WaypointTo = CoordinateTo:WaypointAir("RADIO", COORDINATE.WaypointType.TurningPoint, COORDINATE.WaypointAction.TurningPoint, Speed, true)
+    local WaypointTo = CoordinateTo:WaypointAir("RADIO", POINT_VEC3.RoutePointType.TurningPoint, POINT_VEC3.RoutePointAction.TurningPoint, Speed, true)
 
     Route[#Route+1] = WaypointTo
     

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.lua

@@ -19,7 +19,7 @@
 -- 
 -- ## Missions:
 -- 
--- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Escort)
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
 -- 
 -- ===
 -- 
@@ -556,7 +556,7 @@ function AI_ESCORT:SetFlightMenuFormation( Formation )
 
   if MenuFormation then
     local Arguments = MenuFormation.Arguments
-    --self:T({Arguments=unpack(Arguments)})
+    --self:I({Arguments=unpack(Arguments)})
     local FlightMenuFormation = MENU_GROUP:New( self.PlayerGroup, "Formation", self.MainMenu )
     local MenuFlightFormationID = MENU_GROUP_COMMAND:New( self.PlayerGroup, Formation, FlightMenuFormation, 
       function ( self, Formation, ... )

Moose Development/Moose/AI/AI_Escort_Dispatcher.lua

@@ -15,7 +15,7 @@
 -- @image MOOSE.JPG
 
 
--- @type AI_ESCORT_DISPATCHER
+--- @type AI_ESCORT_DISPATCHER
 -- @extends Core.Fsm#FSM
 
 
@@ -33,7 +33,7 @@ AI_ESCORT_DISPATCHER = {
   ClassName = "AI_ESCORT_DISPATCHER",
 }
 
--- @field #list 
+--- @field #list 
 AI_ESCORT_DISPATCHER.AI_Escorts = {}
 
 
@@ -102,7 +102,7 @@ function AI_ESCORT_DISPATCHER:onafterStart( From, Event, To )
 
 end
 
--- @param #AI_ESCORT_DISPATCHER self
+--- @param #AI_ESCORT_DISPATCHER self
 -- @param Core.Event#EVENTDATA EventData
 function AI_ESCORT_DISPATCHER:OnEventExit( EventData )
 
@@ -110,11 +110,11 @@ function AI_ESCORT_DISPATCHER:OnEventExit( EventData )
   local PlayerGroup = EventData.IniGroup
   local PlayerUnit = EventData.IniUnit
   
-  self:T({EscortAirbase= self.EscortAirbase } )
-  self:T({PlayerGroupName = PlayerGroupName } )
-  self:T({PlayerGroup = PlayerGroup})
-  self:T({FirstGroup = self.CarrierSet:GetFirst()})
-  self:T({FindGroup = self.CarrierSet:FindGroup( PlayerGroupName )})
+  self:I({EscortAirbase= self.EscortAirbase } )
+  self:I({PlayerGroupName = PlayerGroupName } )
+  self:I({PlayerGroup = PlayerGroup})
+  self:I({FirstGroup = self.CarrierSet:GetFirst()})
+  self:I({FindGroup = self.CarrierSet:FindGroup( PlayerGroupName )})
   
   if self.CarrierSet:FindGroup( PlayerGroupName ) then
     if self.AI_Escorts[PlayerGroupName] then
@@ -125,7 +125,7 @@ function AI_ESCORT_DISPATCHER:OnEventExit( EventData )
       
 end
 
--- @param #AI_ESCORT_DISPATCHER self
+--- @param #AI_ESCORT_DISPATCHER self
 -- @param Core.Event#EVENTDATA EventData
 function AI_ESCORT_DISPATCHER:OnEventBirth( EventData )
 
@@ -133,17 +133,17 @@ function AI_ESCORT_DISPATCHER:OnEventBirth( EventData )
   local PlayerGroup = EventData.IniGroup
   local PlayerUnit = EventData.IniUnit
   
-  self:T({EscortAirbase= self.EscortAirbase } )
-  self:T({PlayerGroupName = PlayerGroupName } )
-  self:T({PlayerGroup = PlayerGroup})
-  self:T({FirstGroup = self.CarrierSet:GetFirst()})
-  self:T({FindGroup = self.CarrierSet:FindGroup( PlayerGroupName )})
+  self:I({EscortAirbase= self.EscortAirbase } )
+  self:I({PlayerGroupName = PlayerGroupName } )
+  self:I({PlayerGroup = PlayerGroup})
+  self:I({FirstGroup = self.CarrierSet:GetFirst()})
+  self:I({FindGroup = self.CarrierSet:FindGroup( PlayerGroupName )})
   
   if self.CarrierSet:FindGroup( PlayerGroupName ) then
     if not self.AI_Escorts[PlayerGroupName] then
       local LeaderUnit = PlayerUnit
       local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot )
-      self:T({EscortGroup = EscortGroup})
+      self:I({EscortGroup = EscortGroup})
       
       self:ScheduleOnce( 1,
         function( EscortGroup )

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

@@ -19,7 +19,7 @@
 -- 
 -- ## Missions:
 -- 
--- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Escort)
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
 -- 
 -- ===
 -- 
@@ -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
-  -- 
-  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-  -- Therefore, this class is considered to be deprecated
-  --
+--
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+-- Therefore, this class is considered to be deprecated
+--
 -- ===
 -- 
 -- ### Authors: **FlightControl** 
@@ -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 Core.Group#GROUP EscortGroup
+    --- @param Wrapper.Group#GROUP EscortGroup
     function( EscortGroup )
       EscortGroup:WayPointInitialize()
     

Moose Development/Moose/AI/AI_Formation.lua

@@ -7,13 +7,13 @@
 --   * Assign a group leader that will guide the large formation path.
 -- 
 -- ===
---
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Formation)
--- * **YouTube videos:** [Playlist](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0bFIJ9jIdYM22uaWmIN4oz)
--- * **Guides:** None
---
+-- 
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/FOR%20-%20AI%20Group%20Formation)
+-- 
+-- ===
+-- 
+-- ### [YouTube Playlist](https://www.youtube.com/playlist?list=PL7ZUrU4zZUl0bFIJ9jIdYM22uaWmIN4oz)
+-- 
 -- ===
 -- 
 -- ### Author: **FlightControl**
@@ -34,8 +34,8 @@
 -- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
 -- @field #number FollowDistance The current follow distance.
 -- @field #boolean ReportTargets If true, nearby targets are reported.
--- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
--- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
+-- @field DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
+-- @field DCS#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
 -- @field #number dtFollow Time step between position updates.
 
 
@@ -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
-  -- 
-  -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-  -- Therefore, this class is considered to be deprecated
-  --
+--
+-- # Developer Note
+-- 
+-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
+-- Therefore, this class is considered to be deprecated
+--
 -- @field #AI_FORMATION 
 AI_FORMATION = {
   ClassName = "AI_FORMATION",
@@ -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 = {
-  All = "*",
+  Airborne = "*",
   Airborne = "A",
   GroundRadar = "R",
   Ground = "G",
@@ -725,7 +725,7 @@ function AI_FORMATION:onafterFormationLine( FollowGroupSet, From , Event , To, X
   
   for FollowID, FollowGroup in pairs( FollowSet ) do
   
-    local PointVec3 = COORDINATE:New()
+    local PointVec3 = POINT_VEC3:New()
     PointVec3:SetX( XStart + i * XSpace )
     PointVec3:SetY( YStart + i * YSpace )
     PointVec3:SetZ( ZStart + i * ZSpace )
@@ -877,7 +877,7 @@ function AI_FORMATION:onafterFormationCenterWing( FollowGroupSet, From , Event ,
   
   for FollowID, FollowGroup in pairs( FollowSet ) do
   
-    local PointVec3 = COORDINATE:New()
+    local PointVec3 = POINT_VEC3:New()
     
     local Side = ( i % 2 == 0 ) and 1 or -1
     local Row = i / 2 + 1
@@ -936,7 +936,7 @@ function AI_FORMATION:onafterFormationBox( FollowGroupSet, From , Event , To, XS
   
   for FollowID, FollowGroup in pairs( FollowSet ) do
   
-    local PointVec3 = COORDINATE:New()
+    local PointVec3 = POINT_VEC3:New()
     
     local ZIndex = i % ZLevels
     local XIndex = math.floor( i / ZLevels )
@@ -996,7 +996,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
@@ -1020,7 +1020,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
@@ -1044,7 +1044,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup )
     FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
   else
     self.FollowGroupSet:ForSomeGroupAlive(
-      -- @param Core.Group#GROUP EscortGroup
+      --- @param Wrapper.Group#GROUP EscortGroup
       function( FollowGroup )
         FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
         FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
@@ -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/AI/AI_Patrol.lua

@@ -16,7 +16,7 @@
 --   
 -- ===
 -- 
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/AI/AI_Patrol)
+-- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/PAT%20-%20Patrolling)
 -- 
 -- ===
 -- 
@@ -652,15 +652,15 @@ function AI_PATROL_ZONE:onafterStart( Controllable, From, Event, To )
 end
 
 
--- @param #AI_PATROL_ZONE self
--- @param Wrapper.Controllable#CONTROLLABLE Controllable+
+--- @param #AI_PATROL_ZONE self
+--- @param Wrapper.Controllable#CONTROLLABLE Controllable
 function AI_PATROL_ZONE:onbeforeDetect( Controllable, From, Event, To )
 
   return self.DetectOn and self.DetectActivated
 end
 
--- @param #AI_PATROL_ZONE self
--- @param Wrapper.Controllable#CONTROLLABLE Controllable
+--- @param #AI_PATROL_ZONE self
+--- @param Wrapper.Controllable#CONTROLLABLE Controllable
 function AI_PATROL_ZONE:onafterDetect( Controllable, From, Event, To )
 
   local Detected = false
@@ -705,7 +705,7 @@ function AI_PATROL_ZONE:onafterDetect( Controllable, From, Event, To )
   
 end
 
--- @param Wrapper.Controllable#CONTROLLABLE AIControllable
+--- @param Wrapper.Controllable#CONTROLLABLE AIControllable
 -- This static method is called from the route path within the last task at the last waypoint of the Controllable.
 -- Note that this method is required, as triggers the next route when patrolling for the Controllable.
 function AI_PATROL_ZONE:_NewPatrolRoute( AIControllable )
@@ -751,12 +751,12 @@ function AI_PATROL_ZONE:onafterRoute( Controllable, From, Event, To )
       if not CurrentVec2 then return end
       --Done: Create GetAltitude function for GROUP, and delete GetUnit(1).
       local CurrentAltitude = self.Controllable:GetAltitude()
-      local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+      local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
       local ToPatrolZoneSpeed = self.PatrolMaxSpeed
       local CurrentRoutePoint = CurrentPointVec3:WaypointAir( 
           self.PatrolAltType, 
-          COORDINATE.WaypointType.TakeOffParking, 
-          COORDINATE.WaypointAction.FromParkingArea, 
+          POINT_VEC3.RoutePointType.TakeOffParking, 
+          POINT_VEC3.RoutePointAction.FromParkingArea, 
           ToPatrolZoneSpeed, 
           true 
         )
@@ -767,12 +767,12 @@ function AI_PATROL_ZONE:onafterRoute( Controllable, From, Event, To )
       if not CurrentVec2 then return end
       --DONE: Create GetAltitude function for GROUP, and delete GetUnit(1).
       local CurrentAltitude = self.Controllable:GetAltitude()
-      local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+      local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
       local ToPatrolZoneSpeed = self.PatrolMaxSpeed
       local CurrentRoutePoint = CurrentPointVec3:WaypointAir( 
           self.PatrolAltType, 
-          COORDINATE.WaypointType.TurningPoint, 
-          COORDINATE.WaypointAction.TurningPoint, 
+          POINT_VEC3.RoutePointType.TurningPoint, 
+          POINT_VEC3.RoutePointAction.TurningPoint, 
           ToPatrolZoneSpeed, 
           true 
         )
@@ -792,13 +792,13 @@ function AI_PATROL_ZONE:onafterRoute( Controllable, From, Event, To )
     self:T2( { self.PatrolMinSpeed, self.PatrolMaxSpeed, ToTargetSpeed } )
     
     --- Obtain a 3D @{Point} from the 2D point + altitude.
-    local ToTargetPointVec3 = COORDINATE:New( ToTargetVec2.x, ToTargetAltitude, ToTargetVec2.y )
+    local ToTargetPointVec3 = POINT_VEC3:New( ToTargetVec2.x, ToTargetAltitude, ToTargetVec2.y )
     
     --- Create a route point of type air.
     local ToTargetRoutePoint = ToTargetPointVec3:WaypointAir( 
       self.PatrolAltType, 
-      COORDINATE.WaypointType.TurningPoint, 
-      COORDINATE.WaypointAction.TurningPoint, 
+      POINT_VEC3.RoutePointType.TurningPoint, 
+      POINT_VEC3.RoutePointAction.TurningPoint, 
       ToTargetSpeed, 
       true 
     )
@@ -822,13 +822,13 @@ function AI_PATROL_ZONE:onafterRoute( Controllable, From, Event, To )
 
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 function AI_PATROL_ZONE:onbeforeStatus()
 
   return self.CheckStatus
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 function AI_PATROL_ZONE:onafterStatus()
   self:F2()
 
@@ -838,7 +838,7 @@ function AI_PATROL_ZONE:onafterStatus()
     
     local Fuel = self.Controllable:GetFuelMin()
     if Fuel < self.PatrolFuelThresholdPercentage then
-      self:T( self.Controllable:GetName() .. " is out of fuel:" .. Fuel .. ", RTB!" )
+      self:I( self.Controllable:GetName() .. " is out of fuel:" .. Fuel .. ", RTB!" )
       local OldAIControllable = self.Controllable
       
       local OrbitTask = OldAIControllable:TaskOrbitCircle( math.random( self.PatrolFloorAltitude, self.PatrolCeilingAltitude ), self.PatrolMinSpeed )
@@ -846,25 +846,16 @@ function AI_PATROL_ZONE:onafterStatus()
       OldAIControllable:SetTask( TimedOrbitTask, 10 )
 
       RTB = true
+    else
     end
     
     -- TODO: Check GROUP damage function.
     local Damage = self.Controllable:GetLife()
     if Damage <= self.PatrolDamageThreshold then
-      self:T( self.Controllable:GetName() .. " is damaged:" .. Damage .. ", RTB!" )
+      self:I( self.Controllable:GetName() .. " is damaged:" .. Damage .. ", RTB!" )
       RTB = true
     end
     
-    if self:IsInstanceOf("AI_CAS") or self:IsInstanceOf("AI_BAI") then
-      local atotal,shells,rockets,bombs,missiles = self.Controllable:GetAmmunition()
-      local arelevant = rockets+bombs   
-      if arelevant == 0 or missiles == 0 then 
-        RTB = true
-        self:T({total=atotal,shells=shells,rockets=rockets,bombs=bombs,missiles=missiles})
-        self:T( self.Controllable:GetName() .. " is out of ammo, RTB!" ) 
-      end
-    end
-    
     if RTB == true then
       self:RTB()
     else
@@ -873,7 +864,7 @@ function AI_PATROL_ZONE:onafterStatus()
   end
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 function AI_PATROL_ZONE:onafterRTB()
   self:F2()
 
@@ -890,12 +881,12 @@ function AI_PATROL_ZONE:onafterRTB()
     --DONE: Create GetAltitude function for GROUP, and delete GetUnit(1).
     --local CurrentAltitude = self.Controllable:GetUnit(1):GetAltitude()
     local CurrentAltitude = self.Controllable:GetAltitude()
-    local CurrentPointVec3 = COORDINATE:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
+    local CurrentPointVec3 = POINT_VEC3:New( CurrentVec2.x, CurrentAltitude, CurrentVec2.y )
     local ToPatrolZoneSpeed = self.PatrolMaxSpeed
     local CurrentRoutePoint = CurrentPointVec3:WaypointAir( 
         self.PatrolAltType, 
-        COORDINATE.WaypointType.TurningPoint, 
-        COORDINATE.WaypointAction.TurningPoint, 
+        POINT_VEC3.RoutePointType.TurningPoint, 
+        POINT_VEC3.RoutePointAction.TurningPoint, 
         ToPatrolZoneSpeed, 
         true 
       )
@@ -912,13 +903,13 @@ function AI_PATROL_ZONE:onafterRTB()
     
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 function AI_PATROL_ZONE:onafterDead()
   self:SetDetectionOff()
   self:SetStatusOff()
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_PATROL_ZONE:OnCrash( EventData )
 
@@ -929,7 +920,7 @@ function AI_PATROL_ZONE:OnCrash( EventData )
   end
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_PATROL_ZONE:OnEjection( EventData )
 
@@ -938,7 +929,7 @@ function AI_PATROL_ZONE:OnEjection( EventData )
   end
 end
 
--- @param #AI_PATROL_ZONE self
+--- @param #AI_PATROL_ZONE self
 -- @param Core.Event#EVENTDATA EventData
 function AI_PATROL_ZONE:OnPilotDead( EventData )
 

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/Cargo.lua

@@ -275,14 +275,14 @@
 -- The cargo must be in the **Loaded** state.
 -- @function [parent=#CARGO] UnBoard
 -- @param #CARGO self
--- @param Core.Point#COORDINATE ToPointVec2 (optional) @{Core.Point#COORDINATE) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
+-- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
 --- UnBoards the cargo to a Carrier. The event will create a movement (= running or driving) of the cargo from the Carrier.
 -- The cargo must be in the **Loaded** state.
 -- @function [parent=#CARGO] __UnBoard
 -- @param #CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
--- @param Core.Point#COORDINATE ToPointVec2 (optional) @{Core.Point#COORDINATE) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
+-- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo should run after onboarding. If not provided, the cargo will run to 60 meters behind the Carrier location.
 
 
 -- Load
@@ -307,14 +307,14 @@
 -- The cargo must be in the **Loaded** state.
 -- @function [parent=#CARGO] UnLoad
 -- @param #CARGO self
--- @param Core.Point#COORDINATE ToPointVec2 (optional) @{Core.Point#COORDINATE) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
+-- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
 --- UnLoads the cargo to a Carrier. The event will unload the cargo from the Carrier. There will be no movement simulated of the cargo loading.
 -- The cargo must be in the **Loaded** state.
 -- @function [parent=#CARGO] __UnLoad
 -- @param #CARGO self
 -- @param #number DelaySeconds The amount of seconds to delay the action.
--- @param Core.Point#COORDINATE ToPointVec2 (optional) @{Core.Point#COORDINATE) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
+-- @param Core.Point#POINT_VEC2 ToPointVec2 (optional) @{Core.Point#POINT_VEC2) to where the cargo will be placed after unloading. If not provided, the cargo will be placed 60 meters behind the Carrier location.
 
 -- State Transition Functions
 
@@ -370,7 +370,7 @@ CARGOS = {}
 
 do -- CARGO
 
-  -- @type CARGO
+  --- @type CARGO
   -- @extends Core.Fsm#FSM_PROCESS
   -- @field #string Type A string defining the type of the cargo. eg. Engineers, Equipment, Screwdrivers.
   -- @field #string Name A string defining the name of the cargo. The name is the unique identifier of the cargo.
@@ -433,7 +433,7 @@ do -- CARGO
     Reported = {},
   }
 
-  -- @type CARGO.CargoObjects
+  --- @type CARGO.CargoObjects
   -- @map < #string, Wrapper.Positionable#POSITIONABLE > The alive POSITIONABLE objects representing the the cargo.
 
   --- CARGO Constructor. This class is an abstract class and should not be instantiated.
@@ -447,7 +447,7 @@ do -- CARGO
   function CARGO:New( Type, Name, Weight, LoadRadius, NearRadius ) --R2.1
 
     local self = BASE:Inherit( self, FSM:New() ) -- #CARGO
-    self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+    self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
     self:SetStartState( "UnLoaded" )
     self:AddTransition( { "UnLoaded", "Boarding" }, "Board", "Boarding" )
@@ -467,7 +467,7 @@ do -- CARGO
     self.Type = Type
     self.Name = Name
     self.Weight = Weight or 0
-    self.CargoObject = nil -- Wrapper.Group#GROUP
+    self.CargoObject = nil
     self.CargoCarrier = nil -- Wrapper.Client#CLIENT
     self.Representable = false
     self.Slingloadable = false
@@ -711,7 +711,7 @@ do -- CARGO
   -- @param #CARGO self
   -- @return #CARGO
   function CARGO:Spawn( PointVec2 )
-    self:T()
+    self:F()
 
   end
 
@@ -812,7 +812,7 @@ do -- CARGO
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the CargoGroup is within the loading radius.
   function CARGO:IsInLoadRadius( Coordinate )
-    self:T( { Coordinate, LoadRadius = self.LoadRadius } )
+    self:F( { Coordinate, LoadRadius = self.LoadRadius } )
 
     local Distance = 0
     if self:IsUnLoaded() then
@@ -832,7 +832,7 @@ do -- CARGO
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo can report itself.
   function CARGO:IsInReportRadius( Coordinate )
-    self:T( { Coordinate } )
+    self:F( { Coordinate } )
 
     local Distance = 0
     if self:IsUnLoaded() then
@@ -853,23 +853,23 @@ do -- CARGO
   -- @param #number NearRadius The radius when the cargo will board the Carrier (to avoid collision).
   -- @return #boolean
   function CARGO:IsNear( Coordinate, NearRadius )
-    --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius } )
+    --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius } )
 
     if self.CargoObject:IsAlive() then
       --local Distance = PointVec2:Get2DDistance( self.CargoObject:GetPointVec2() )
-      --self:T( { CargoObjectName = self.CargoObject:GetName() } )
-      --self:T( { CargoObjectVec2 = self.CargoObject:GetVec2() } )
-      --self:T( { PointVec2 = PointVec2:GetVec2() } )
+      --self:F( { CargoObjectName = self.CargoObject:GetName() } )
+      --self:F( { CargoObjectVec2 = self.CargoObject:GetVec2() } )
+      --self:F( { PointVec2 = PointVec2:GetVec2() } )
       local Distance = Coordinate:Get2DDistance( self.CargoObject:GetCoordinate() )
-      --self:T( { Distance = Distance, NearRadius = NearRadius or "nil" }  )
+      --self:F( { Distance = Distance, NearRadius = NearRadius or "nil" }  )
 
       if Distance <= NearRadius then
-        --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = true } )
+        --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = true } )
         return true
       end
     end
 
-    --self:T( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = false } )
+    --self:F( { PointVec2 = PointVec2, NearRadius = NearRadius, IsNear = false } )
     return false
   end
 
@@ -878,12 +878,12 @@ do -- CARGO
   -- @param Core.Zone#ZONE_BASE Zone
   -- @return #boolean **true** if cargo is in the Zone, **false** if cargo is not in the Zone.
   function CARGO:IsInZone( Zone )
-    --self:T( { Zone } )
+    --self:F( { Zone } )
 
     if self:IsLoaded() then
       return Zone:IsPointVec2InZone( self.CargoCarrier:GetPointVec2() )
     else
-      --self:T( { Size = self.CargoObject:GetSize(), Units = self.CargoObject:GetUnits() } )
+      --self:F( { Size = self.CargoObject:GetSize(), Units = self.CargoObject:GetUnits() } )
       if self.CargoObject:GetSize() ~= 0 then
         return Zone:IsPointVec2InZone( self.CargoObject:GetPointVec2() )
       else
@@ -897,7 +897,7 @@ do -- CARGO
 
   --- Get the current PointVec2 of the cargo.
   -- @param #CARGO self
-  -- @return Core.Point#COORDINATE
+  -- @return Core.Point#POINT_VEC2
   function CARGO:GetPointVec2()
     return self.CargoObject:GetPointVec2()
   end
@@ -1034,7 +1034,7 @@ end -- CARGO
 
 do -- CARGO_REPRESENTABLE
 
-  -- @type CARGO_REPRESENTABLE
+  --- @type CARGO_REPRESENTABLE
   -- @extends #CARGO
   -- @field test
 
@@ -1056,7 +1056,7 @@ do -- CARGO_REPRESENTABLE
 
     -- Inherit CARGO.
     local self = BASE:Inherit( self, CARGO:New( Type, Name, 0, LoadRadius, NearRadius ) ) -- #CARGO_REPRESENTABLE
-    self:T( { Type, Name, LoadRadius, NearRadius } )
+    self:F( { Type, Name, LoadRadius, NearRadius } )
 
     -- Descriptors.
     local Desc=CargoObject:GetDesc()
@@ -1086,7 +1086,7 @@ do -- CARGO_REPRESENTABLE
   function CARGO_REPRESENTABLE:Destroy()
 
     -- Cargo objects are deleted from the _DATABASE and SET_CARGO objects.
-    self:T( { CargoName = self:GetName() } )
+    self:F( { CargoName = self:GetName() } )
     --_EVENTDISPATCHER:CreateEventDeleteCargo( self )
 
     return self
@@ -1094,7 +1094,7 @@ do -- CARGO_REPRESENTABLE
 
   --- Route a cargo unit to a PointVec2.
   -- @param #CARGO_REPRESENTABLE self
-  -- @param Core.Point#COORDINATE ToPointVec2
+  -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number Speed
   -- @return #CARGO_REPRESENTABLE
   function CARGO_REPRESENTABLE:RouteTo( ToPointVec2, Speed )
@@ -1123,12 +1123,12 @@ do -- CARGO_REPRESENTABLE
     CoordinateZone:Scan( { Object.Category.UNIT } )
     for _, DCSUnit in pairs( CoordinateZone:GetScannedUnits() ) do
       local NearUnit = UNIT:Find( DCSUnit )
-      self:T({NearUnit=NearUnit})
+      self:F({NearUnit=NearUnit})
       local NearUnitCoalition = NearUnit:GetCoalition()
       local CargoCoalition = self:GetCoalition()
       if NearUnitCoalition == CargoCoalition then
         local Attributes = NearUnit:GetDesc()
-        self:T({Desc=Attributes})
+        self:F({Desc=Attributes})
         if NearUnit:HasAttribute( "Trucks" ) then
           MESSAGE:New( Message, 20, NearUnit:GetCallsign() .. " reporting - Cargo " .. self:GetName() ):ToGroup( TaskGroup )
           break
@@ -1142,7 +1142,7 @@ end -- CARGO_REPRESENTABLE
 
 do -- CARGO_REPORTABLE
 
-    -- @type CARGO_REPORTABLE
+    --- @type CARGO_REPORTABLE
     -- @extends #CARGO
     CARGO_REPORTABLE = {
       ClassName = "CARGO_REPORTABLE"
@@ -1158,7 +1158,7 @@ do -- CARGO_REPORTABLE
   -- @return #CARGO_REPORTABLE
   function CARGO_REPORTABLE:New( Type, Name, Weight, LoadRadius, NearRadius )
     local self = BASE:Inherit( self, CARGO:New( Type, Name, Weight, LoadRadius, NearRadius ) ) -- #CARGO_REPORTABLE
-    self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+    self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
     return self
   end
@@ -1178,7 +1178,7 @@ end
 
 do -- CARGO_PACKAGE
 
-  -- @type CARGO_PACKAGE
+  --- @type CARGO_PACKAGE
   -- @extends #CARGO_REPRESENTABLE
   CARGO_PACKAGE = {
     ClassName = "CARGO_PACKAGE"
@@ -1195,7 +1195,7 @@ do -- CARGO_PACKAGE
 -- @return #CARGO_PACKAGE
 function CARGO_PACKAGE:New( CargoCarrier, Type, Name, Weight, LoadRadius, NearRadius )
   local self = BASE:Inherit( self, CARGO_REPRESENTABLE:New( CargoCarrier, Type, Name, Weight, LoadRadius, NearRadius ) ) -- #CARGO_PACKAGE
-  self:T( { Type, Name, Weight, LoadRadius, NearRadius } )
+  self:F( { Type, Name, Weight, LoadRadius, NearRadius } )
 
   self:T( CargoCarrier )
   self.CargoCarrier = CargoCarrier
@@ -1213,7 +1213,7 @@ end
 -- @param #number BoardDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterOnBoard( From, Event, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
 
@@ -1246,7 +1246,7 @@ end
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @return #boolean
 function CARGO_PACKAGE:IsNear( CargoCarrier )
-  self:T()
+  self:F()
 
   local CargoCarrierPoint = CargoCarrier:GetCoordinate()
 
@@ -1271,7 +1271,7 @@ end
 -- @param #number LoadDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterOnBoarded( From, Event, To, CargoCarrier, Speed, BoardDistance, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   if self:IsNear( CargoCarrier ) then
     self:__Load( 1, CargoCarrier, Speed, LoadDistance, Angle )
@@ -1292,7 +1292,7 @@ end
 -- @param #number Radius
 -- @param #number Angle
 function CARGO_PACKAGE:onafterUnBoard( From, Event, To, CargoCarrier, Speed, UnLoadDistance, UnBoardDistance, Radius, Angle )
-  self:T()
+  self:F()
 
   self.CargoInAir = self.CargoCarrier:InAir()
 
@@ -1331,7 +1331,7 @@ end
 -- @param Wrapper.Unit#UNIT CargoCarrier
 -- @param #number Speed
 function CARGO_PACKAGE:onafterUnBoarded( From, Event, To, CargoCarrier, Speed )
-  self:T()
+  self:F()
 
   if self:IsNear( CargoCarrier ) then
     self:__UnLoad( 1, CargoCarrier, Speed )
@@ -1350,7 +1350,7 @@ end
 -- @param #number LoadDistance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterLoad( From, Event, To, CargoCarrier, Speed, LoadDistance, Angle )
-  self:T()
+  self:F()
 
   self.CargoCarrier = CargoCarrier
 
@@ -1378,7 +1378,7 @@ end
 -- @param #number Distance
 -- @param #number Angle
 function CARGO_PACKAGE:onafterUnLoad( From, Event, To, CargoCarrier, Speed, Distance, Angle )
-  self:T()
+  self:F()
 
   local StartPointVec2 = self.CargoCarrier:GetPointVec2()
   local CargoCarrierHeading = self.CargoCarrier:GetHeading() -- Get Heading of object in degrees.

Moose Development/Moose/Cargo/CargoCrate.lua

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

Moose Development/Moose/Cargo/CargoGroup.lua

@@ -22,7 +22,6 @@ do -- CARGO_GROUP
   --- @type CARGO_GROUP
   -- @field Core.Set#SET_CARGO CargoSet The collection of derived CARGO objects.
   -- @field #string GroupName The name of the CargoGroup.
-  -- @field Wrapper.Group#GROUÜ CargoCarrier The carrier group.
   -- @extends Cargo.Cargo#CARGO_REPORTABLE
   
   --- Defines a cargo that is represented by a @{Wrapper.Group} object within the simulator.
@@ -65,7 +64,7 @@ do -- CARGO_GROUP
   
     -- Inherit CAROG_REPORTABLE
     local self = BASE:Inherit( self, CARGO_REPORTABLE:New( Type, Name, 0, LoadRadius, NearRadius ) ) -- #CARGO_GROUP
-    self:T( { Type, Name, LoadRadius } )
+    self:F( { Type, Name, LoadRadius } )
   
     self.CargoSet = SET_CARGO:New()
     self.CargoGroup = CargoGroup
@@ -147,7 +146,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   function CARGO_GROUP:Respawn()
 
-    self:T( { "Respawning" } )
+    self:F( { "Respawning" } )
 
     for CargoID, CargoData in pairs( self.CargoSet:GetSet() ) do
       local Cargo = CargoData -- Cargo.Cargo#CARGO
@@ -228,7 +227,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   function CARGO_GROUP:Regroup()
   
-    self:T("Regroup")
+    self:F("Regroup")
 
     if self.Grouped == false then
     
@@ -242,7 +241,7 @@ do -- CARGO_GROUP
       for CargoUnitName, CargoUnit in pairs( self.CargoSet:GetSet() ) do
         local CargoUnit = CargoUnit -- Cargo.CargoUnit#CARGO_UNIT
 
-        self:T( { CargoUnit:GetName(), UnLoaded = CargoUnit:IsUnLoaded() } )
+        self:F( { CargoUnit:GetName(), UnLoaded = CargoUnit:IsUnLoaded() } )
 
         if CargoUnit:IsUnLoaded() then
     
@@ -259,7 +258,7 @@ do -- CARGO_GROUP
       -- Then we register the new group in the database
       self.CargoGroup = GROUP:NewTemplate( GroupTemplate, GroupTemplate.CoalitionID, GroupTemplate.CategoryID, GroupTemplate.CountryID )
 
-      self:T( { "Regroup", GroupTemplate } )
+      self:F( { "Regroup", GroupTemplate } )
         
       -- Now we spawn the new group based on the template created.
       self.CargoObject = _DATABASE:Spawn( GroupTemplate )
@@ -272,7 +271,7 @@ do -- CARGO_GROUP
   -- @param Core.Event#EVENTDATA EventData 
   function CARGO_GROUP:OnEventCargoDead( EventData )
   
-    self:T(EventData)
+    self:E(EventData)
 
     local Destroyed = false
   
@@ -297,7 +296,7 @@ do -- CARGO_GROUP
     
     if Destroyed then
       self:Destroyed()
-      self:T( { "Cargo group destroyed" } )
+      self:E( { "Cargo group destroyed" } )
     end
   
   end
@@ -310,14 +309,14 @@ do -- CARGO_GROUP
   -- @param Wrapper.Unit#UNIT CargoCarrier
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterBoard( From, Event, To, CargoCarrier, NearRadius, ... )
-    self:T( { CargoCarrier.UnitName, From, Event, To, NearRadius = NearRadius } )
+    self:F( { CargoCarrier.UnitName, From, Event, To, NearRadius = NearRadius } )
     
     NearRadius = NearRadius or self.NearRadius
     
     -- For each Cargo object within the CARGO_GROUPED, route each object to the CargoLoadPointVec2
     self.CargoSet:ForEach(
       function( Cargo, ... )
-        self:T( { "Board Unit", Cargo:GetName( ), Cargo:IsDestroyed(), Cargo.CargoObject:IsAlive() } )
+        self:F( { "Board Unit", Cargo:GetName( ), Cargo:IsDestroyed(), Cargo.CargoObject:IsAlive() } )
         local CargoGroup = Cargo.CargoObject --Wrapper.Group#GROUP
         CargoGroup:OptionAlarmStateGreen()
         Cargo:__Board( 1, CargoCarrier, NearRadius, ... )
@@ -335,7 +334,7 @@ do -- CARGO_GROUP
   -- @param #string To
   -- @param Wrapper.Unit#UNIT CargoCarrier
   function CARGO_GROUP:onafterLoad( From, Event, To, CargoCarrier, ... )
-    --self:T( { From, Event, To, CargoCarrier, ...} )
+    --self:F( { From, Event, To, CargoCarrier, ...} )
     
     if From == "UnLoaded" then
       -- For each Cargo object within the CARGO_GROUP, load each cargo to the CargoCarrier.
@@ -360,7 +359,7 @@ do -- CARGO_GROUP
   -- @param Wrapper.Unit#UNIT CargoCarrier
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterBoarding( From, Event, To, CargoCarrier, NearRadius, ... )
-    --self:T( { CargoCarrier.UnitName, From, Event, To } )
+    --self:F( { CargoCarrier.UnitName, From, Event, To } )
   
     local Boarded = true
     local Cancelled = false
@@ -394,7 +393,7 @@ do -- CARGO_GROUP
         if not Boarded then
           self:__Boarding( -5, CargoCarrier, NearRadius, ... )
         else
-          self:T("Group Cargo is loaded")
+          self:F("Group Cargo is loaded")
           self:__Load( 1, CargoCarrier, ... )
         end
       else
@@ -411,10 +410,10 @@ do -- CARGO_GROUP
   -- @param #string Event
   -- @param #string From
   -- @param #string To
-  -- @param Core.Point#COORDINATE ToPointVec2
+  -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterUnBoard( From, Event, To, ToPointVec2, NearRadius, ... )
-    self:T( {From, Event, To, ToPointVec2, NearRadius } )
+    self:F( {From, Event, To, ToPointVec2, NearRadius } )
   
     NearRadius = NearRadius or 25
   
@@ -454,10 +453,10 @@ do -- CARGO_GROUP
   -- @param #string Event
   -- @param #string From
   -- @param #string To
-  -- @param Core.Point#COORDINATE ToPointVec2
+  -- @param Core.Point#POINT_VEC2 ToPointVec2
   -- @param #number NearRadius If distance is smaller than this number, cargo is loaded into the carrier.
   function CARGO_GROUP:onafterUnBoarding( From, Event, To, ToPointVec2, NearRadius, ... )
-    --self:T( { From, Event, To, ToPointVec2, NearRadius } )
+    --self:F( { From, Event, To, ToPointVec2, NearRadius } )
   
     --local NearRadius = NearRadius or 25
   
@@ -492,9 +491,9 @@ do -- CARGO_GROUP
   -- @param #string Event
   -- @param #string From
   -- @param #string To
-  -- @param Core.Point#COORDINATE ToPointVec2
+  -- @param Core.Point#POINT_VEC2 ToPointVec2
   function CARGO_GROUP:onafterUnLoad( From, Event, To, ToPointVec2, ... )
-    --self:T( { From, Event, To, ToPointVec2 } )
+    --self:F( { From, Event, To, ToPointVec2 } )
   
     if From == "Loaded" then
       
@@ -599,7 +598,7 @@ do -- CARGO_GROUP
   end
 
 
-  --- Get the underlying GROUP object from the CARGO_GROUP.
+  --- Get the amount of cargo units in the group.
   -- @param #CARGO_GROUP self
   -- @return #CARGO_GROUP
   function CARGO_GROUP:GetGroup( Cargo )
@@ -612,7 +611,7 @@ do -- CARGO_GROUP
   -- @param #CARGO_GROUP self
   -- @param Core.Point#COORDINATE Coordinate
   function CARGO_GROUP:RouteTo( Coordinate )
-    --self:T( {Coordinate = Coordinate } )
+    --self:F( {Coordinate = Coordinate } )
     
     -- For each Cargo within the CargoSet, route each object to the Coordinate
     self.CargoSet:ForEach(
@@ -630,13 +629,13 @@ do -- CARGO_GROUP
   -- @param #number NearRadius
   -- @return #boolean The Cargo is near to the Carrier or #nil if the Cargo is not near to the Carrier.
   function CARGO_GROUP:IsNear( CargoCarrier, NearRadius )
-    self:T( {NearRadius = NearRadius } )
+    self:F( {NearRadius = NearRadius } )
     
     for _, Cargo in pairs( self.CargoSet:GetSet() ) do
       local Cargo = Cargo -- Cargo.Cargo#CARGO
       if Cargo:IsAlive() then
         if Cargo:IsNear( CargoCarrier:GetCoordinate(), NearRadius ) then
-          self:T( "Near" )
+          self:F( "Near" )
           return true
         end
       end
@@ -650,7 +649,7 @@ do -- CARGO_GROUP
   -- @param Core.Point#COORDINATE Coordinate
   -- @return #boolean true if the Cargo Group is within the load radius.
   function CARGO_GROUP:IsInLoadRadius( Coordinate )
-    --self:T( { Coordinate } )
+    --self:F( { Coordinate } )
   
     local Cargo = self:GetFirstAlive() -- Cargo.Cargo#CARGO
 
@@ -670,7 +669,7 @@ do -- CARGO_GROUP
         return false
       end
       
-      self:T( { Distance = Distance, LoadRadius = self.LoadRadius } )
+      self:F( { Distance = Distance, LoadRadius = self.LoadRadius } )
       if Distance <= self.LoadRadius then
         return true
       else
@@ -688,12 +687,12 @@ do -- CARGO_GROUP
   -- @param Core.Point#Coordinate Coordinate
   -- @return #boolean true if the Cargo Group is within the report radius.
   function CARGO_GROUP:IsInReportRadius( Coordinate )
-    --self:T( { Coordinate } )
+    --self:F( { Coordinate } )
   
     local Cargo = self:GetFirstAlive() -- Cargo.Cargo#CARGO
 
     if Cargo then
-      self:T( { Cargo } )
+      self:F( { Cargo } )
       local Distance = 0
       if Cargo:IsUnLoaded() then
         Distance = Coordinate:Get2DDistance( Cargo.CargoObject:GetCoordinate() )
@@ -739,7 +738,7 @@ do -- CARGO_GROUP
   -- @return #boolean **true** if the first element of the CargoGroup is in the Zone
   -- @return #boolean **false** if there is no element of the CargoGroup in the Zone.
   function CARGO_GROUP:IsInZone( Zone )
-    --self:T( { Zone } )
+    --self:F( { Zone } )
   
     local Cargo = self.CargoSet:GetFirst() -- Cargo.Cargo#CARGO
 
@@ -772,4 +771,3 @@ do -- CARGO_GROUP
     
 
 end -- CARGO_GROUP
-

Moose Development/Moose/Cargo/CargoSlingload.lua

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

Moose Development/Moose/Cargo/CargoUnit.lua

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

Moose Development/Moose/Core/Astar.lua

@@ -157,8 +157,6 @@ ASTAR = {
 -- @field #number surfacetype Surface type.
 -- @field #table valid Cached valid/invalid nodes.
 -- @field #table cost Cached cost.
--- @field Core.Pathline#PATHLINE pathline Pathline that node is part of.
--- @field Core.Pathline#PATHLINE.Point pathpoint Pathline point.
 
 --- ASTAR infinity.
 -- @field #number INF
@@ -166,7 +164,7 @@ ASTAR.INF=1/0
 
 --- ASTAR class version.
 -- @field #string version
-ASTAR.version="0.5.0"
+ASTAR.version="0.4.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -174,7 +172,6 @@ ASTAR.version="0.5.0"
 
 -- TODO: Add more valid neighbour functions.
 -- TODO: Write docs.
--- DONE: Add pathlines for seach/valid neighbours.
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Constructor
@@ -247,10 +244,7 @@ end
 function ASTAR:AddNode(Node)
 
   self.nodes[Node.id]=Node
-  self.Nnodes=self.Nnodes+1
-  
-  self:T3(self.lid..string.format("Adding node UID=%d", Node.id))
-  --Node.coordinate:MarkToAll(string.format("Node ID=%d", Node.id))
+  self.Nnodes=self.Nnodes+1 
     
   return self
 end
@@ -268,47 +262,6 @@ function ASTAR:AddNodeFromCoordinate(Coordinate)
   return node
 end
 
---- Adds nodes to the table of grid nodes from a PATHLINE.
--- @param #ASTAR self
--- @param Core.Pathline#PATHLINE Pathline Pathline or name of pathline. Has to exist.
--- @return #ASTAR self
-function ASTAR:AddNodeFromPathlineName(Pathline)
-
-  if type(Pathline)=="string" then
-    Pathline=PATHLINE:FindByName(Pathline)
-  end
-  
-  if Pathline then
-  
-    for i,_point in pairs(Pathline.points) do
-      local point=_point --Core.Pathline#PATHLINE.Point
-
-      -- Create node from point coordinate.
-      local node=self:AddNodeFromCoordinate(COORDINATE:NewFromVec3(point.vec3))
-      
-      -- Add pathline parameters.
-      node.pathline=Pathline
-      node.pathpoint=point
-      
-      -- Debug.
-      local name=node.pathline and node.pathline.name or "N/A"
-      local idx=node.pathline and node.pathline:_GetPointIndex(node.pathpoint) or "N/A"
-      
-      -- Debug message.
-      self:T(self.lid..string.format("Adding node UID=%d pathline=%s [%s]", node.id, name, tostring(idx)))
-            
-      -- Debug mark
-      --node.coordinate:MarkToAll(string.format("Node ID=%d\npathline=%s [%s]", node.id, name, tostring(idx)))
-      
-    end    
-    
-  else
-    env.error("FF error pathline")
-  end
-
-  return self
-end
-
 --- Check if the coordinate of a node has is at a valid surface type.
 -- @param #ASTAR self
 -- @param #ASTAR.Node Node The node to be added.
@@ -387,18 +340,6 @@ function ASTAR:SetValidNeighbourRoad(MaxDistance)
   return self
 end
 
---- Set valid neighbours to be on the same pathline or not further apart than 10 meters to jump from one pathline to another.
--- @param #ASTAR self
--- @param #number MaxDistance Max allowed distance between nodes of different pathlines in meters. Default is 10 m.
--- @return #ASTAR self
-function ASTAR:SetValidNeighbourPathline(MaxDistance)
-
-  self:SetValidNeighbourFunction(ASTAR.Pathline, MaxDistance)
-
-  return self
-end
-
-
 --- Set the function which calculates the "cost" to go from one to another node.
 -- The first to arguments of this function are always the two nodes under consideration. But you can add optional arguments.
 -- Very often the distance between nodes is a good measure for the cost.
@@ -443,7 +384,7 @@ end
 -- @return #ASTAR self
 function ASTAR:SetCostRoad()
 
-  self:SetCostFunction(ASTAR.Road)
+  self:SetCostFunction(ASTAR)
 
   return self
 end
@@ -603,55 +544,6 @@ function ASTAR.Road(nodeA, nodeB)
 
 end
 
---- Function to check if two nodes are on the same pathline or if nodes are less than 10 meters apart.
--- @param #ASTAR.Node nodeA First node.
--- @param #ASTAR.Node nodeB Other node.
--- @param #number distmax Max distance in meters. Default is 10 m.
--- @return #boolean If true, two nodes are connected.
-function ASTAR.Pathline(nodeA, nodeB, distmax)
-
-  distmax=distmax or 10
-
-  if nodeA.pathline.name==nodeB.pathline.name then
-  
-    -- Nodes are on the same pathline. We use the index to check if they are neighbours.
-  
-    local pathline=nodeA.pathline
-    
-    local idxA=pathline:_GetPointIndex(nodeA.pathpoint)
-    local idxB=pathline:_GetPointIndex(nodeB.pathpoint)
-    
-    if math.abs(idxA-idxB)<=1 then
-      return true
-    end
-    
-  else
-    
-    -- Check if nodeB is close to pathline of nodeA.
-    local c, dist, segA=nodeA.pathline:GetClosestPoint3D(nodeB.coordinate)
-    local seg=segA --Core.Pathline#PATHLINE.Segment
-    
-    if dist<distmax and (nodeA.pathpoint.uid==seg.p1.uid or nodeA.pathpoint.uid==seg.p2.uid) then
-      --env.info(string.format("FF NodeB=%d [pathline=%s] is close to NodeA=%d [pathline=%s] ==> valid neighbour", nodeB.id, nodeB.pathline.name, nodeA.id, nodeA.pathline.name))
-      return true
-    end
-
-
-    -- Check if nodeA is close to pathline of nodeB.
-    local c, dist, segB=nodeB.pathline:GetClosestPoint3D(nodeA.coordinate)
-    local seg=segB --Core.Pathline#PATHLINE.Segment
-
-    if dist<distmax and (nodeB.pathpoint.uid==seg.p1.uid or nodeB.pathpoint.uid==seg.p2.uid) then
-      --env.info(string.format("FF NodeA=%d [pathline=%s] is close to NodeB=%d [pathline=%s] ==> valid neighbour", nodeA.id, nodeA.pathline.name, nodeB.id, nodeB.pathline.name))
-      return true
-    end    
-    
-  end
-
-  return false
-end
-
-
 --- Function to check if distance between two nodes is less than a threshold distance.
 -- @param #ASTAR.Node nodeA First node.
 -- @param #ASTAR.Node nodeB Other node.
@@ -675,9 +567,7 @@ end
 -- @param #ASTAR.Node nodeB Other node.
 -- @return #number Distance between the two nodes.
 function ASTAR.Dist2D(nodeA, nodeB)
-  local dist=nodeA.coordinate:Get2DDistance(nodeB.coordinate)
-  --local text=string.format("FF Cost Dist2D NodeA=%d-->NodeB=%d = %.1f", nodeA.id, nodeB.id, dist)
-  --env.info(text)
+  local dist=nodeA.coordinate:Get2DDistance(nodeB)
   return dist
 end
 
@@ -704,7 +594,7 @@ function ASTAR.DistRoad(nodeA, nodeB)
     local dist=0
     
     for i=2,#path do
-      local b=path[i]   --DCS#Vec2
+      local b=path[i] --DCS#Vec2
       local a=path[i-1] --DCS#Vec2
       
       dist=dist+UTILS.VecDist2D(a,b)
@@ -714,6 +604,7 @@ function ASTAR.DistRoad(nodeA, nodeB)
     return dist
   end
   
+
   return math.huge
 end
 
@@ -723,11 +614,10 @@ end
 
 --- Find the closest node from a given coordinate.
 -- @param #ASTAR self
--- @param Core.Point#COORDINATE Coordinate Reference coordinate.
--- @param #table ExcludeNodes Table of nodes that are excluded.
--- @return #ASTAR.Node Closest node to the coordinate.
+-- @param Core.Point#COORDINATE Coordinate.
+-- @return #ASTAR.Node Cloest node to the coordinate.
 -- @return #number Distance to closest node in meters.
-function ASTAR:FindClosestNode(Coordinate, ExcludeNodes)
+function ASTAR:FindClosestNode(Coordinate)
 
   local distMin=math.huge
   local closeNode=nil
@@ -735,15 +625,11 @@ function ASTAR:FindClosestNode(Coordinate, ExcludeNodes)
   for _,_node in pairs(self.nodes) do
     local node=_node --#ASTAR.Node
     
-    if ExcludeNodes==nil or self:_IsNodeNotInTable(ExcludeNodes, node) then
+    local dist=node.coordinate:Get2DDistance(Coordinate)
     
-      local dist=node.coordinate:Get2DDistance(Coordinate)
-      
-      if dist<distMin then
-        distMin=dist
-        closeNode=node
-      end
-      
+    if dist<distMin then
+      distMin=dist
+      closeNode=node
     end
     
   end
@@ -751,162 +637,38 @@ function ASTAR:FindClosestNode(Coordinate, ExcludeNodes)
   return closeNode, distMin
 end
 
---- Find the closest pathline to a given reference coordinate.
--- @param #ASTAR self
--- @param Core.Point#COORDINATE Coordinate Reference coordinate.
--- @return Core.Pathline#PATHLINE Closest pathline
--- @return #number Distance in meters.
--- @return DCS#Vec3 Closest point on pathline to the ref coordinate.
--- @return Core.Pathline#PATHLINE.Segment Segment.
-function ASTAR:FindClosestPathline(Coordinate)
-
-  local pathline=nil --Core.Pathline#PATHLINE
-  local dist=math.huge
-  local vec3=nil
-  local S=nil
-  
-  for _,_node in pairs(self.nodes) do
-    local node=_node --#ASTAR.Node
-    
-    if node.pathline then
-    
-      local vec, d, s=node.pathline:GetClosestPoint3D(Coordinate)
-      
-      if d<dist then
-        pathline=node.pathline
-        dist=d
-        vec3=vec
-        S=s        
-      end
-    
-    end    
-  end
-  
-  if pathline then
-    -- Debug info.
-    self:T(self.lid..string.format("Closest pathline %s: dist=%.1f", pathline.name, dist))
-  end
-
-  return pathline, dist, vec3, S
-end
-
---- Find the closest node to the given coordinate.
--- @param #ASTAR self
--- @param Core.Point#COORDINATE Coord Reference coordinate.
--- @param #table ExcludeNodes Nodes that are excluded.
--- @return #ASTAR.Node The node that was fround
-function ASTAR:_FindClosestTerminalNode(Coord, ExcludeNodes)
-  
-  -- Find the closest pathline to the ref coordinate.
-  local pathline, dist, vec3, s=self:FindClosestPathline(Coord)
-
-  -- Find the closest node to the given start coordinate.
-  local node, dist2=self:FindClosestNode(Coord)
-  
-  if pathline and vec3 and dist and dist2>dist then
-
-    -- Create a node on the closest pathline so we first go straight there and then along the pathline.
-    local node=self:AddNodeFromCoordinate(COORDINATE:NewFromVec3(vec3))
-    
-    -- We also need the pathline point.    
-    local point=pathline:AddPointFromVec3(vec3, nil, s.p1)
-
-    node.pathline=pathline    
-    node.pathpoint=point
-    
-    self:T2(self.lid..string.format("Added new node=%d, which is closest to start coord. dist=%.1f m", node.id, dist))
-  end
-
-  -- Find the closest node to the given start coordinate.
-  local Node, dist3=self:FindClosestNode(Coord, ExcludeNodes)
-
-  -- Debug info.
-  self:T(self.lid..string.format("CLOSEST node ID=%d, distance=%.1f", Node.id, dist3))
-
-  return Node, dist3
-end
-
-
 --- Find the start node.
 -- @param #ASTAR self
+-- @param #ASTAR.Node Node The node to be added to the nodes table.
 -- @return #ASTAR self
 function ASTAR:FindStartNode()
+
+  local node, dist=self:FindClosestNode(self.startCoord)
   
-  -- Find the closest pathline to the 
-  local pathline, dist, vec3, s=self:FindClosestPathline(self.startCoord)
-
-  -- Find the closest node to the given start coordinate.
-  local node, dist2=self:FindClosestNode(self.startCoord)
+  self.startNode=node
   
-  if pathline and vec3 and dist and dist2>dist then
-
-    -- Create a node on the closest pathline so we first go straight there and then along the pathline.
-    local node=self:AddNodeFromCoordinate(COORDINATE:NewFromVec3(vec3))
-    
-    -- We also need the pathline point.    
-    local point=pathline:AddPointFromVec3(vec3, nil, s.p1)
-
-    node.pathline=pathline    
-    node.pathpoint=point
-    
-    self:T2(self.lid..string.format("Added new node=%d, which is closest to start coord. dist=%.1f m", node.id, dist))
+  if dist>1000 then
+    self:T(self.lid.."Adding start node to node grid!")
+    self:AddNode(node)
   end
-
-  -- Find the closest node to the given start coordinate.
-  self.startNode, dist2=self:FindClosestNode(self.startCoord)
-  
-  --self.startNode.coordinate:MarkToAll("Start Node")
-  
-  -- Debug info.
-  self:T(self.lid..string.format("START node ID=%d", self.startNode.id))
-  
-  -- Not sure why I did this. The node does not need to be added again as it is already contained in self.nodes!
-  --  if dist>1000 then
-  --    self:T(self.lid.."Adding start node to node grid!")
-  --    self:AddNode(node)
-  --  end
     
   return self
 end
 
---- Find the end node.
+--- Add a node.
 -- @param #ASTAR self
+-- @param #ASTAR.Node Node The node to be added to the nodes table.
 -- @return #ASTAR self
 function ASTAR:FindEndNode()
-  
-  local pathline, dist, vec3, s=self:FindClosestPathline(self.endCoord)
-  
-  -- Find the closest node to the given start coordinate.
-  local node, dist2=self:FindClosestNode(self.endCoord)  
-  
-  if pathline and vec3 and dist and dist2>dist then
 
-    -- Create a node on the closest pathline so we first go straight there and then along the pathline.
-    local node=self:AddNodeFromCoordinate(COORDINATE:NewFromVec3(vec3))
-        
-    -- We also need the point.
-    local point=pathline:AddPointFromVec3(vec3, nil, s.p1)
-    
-    -- Add pathline parameters to node.
-    node.pathline=pathline
-    node.pathpoint=point
-    
-    self:T2(self.lid..string.format("Added new node=%d, which is closest to END coord: dist=%.1f m", node.id, dist))
+  local node, dist=self:FindClosestNode(self.endCoord)
+
+  self.endNode=node
+  
+  if dist>1000 then
+    self:T(self.lid.."Adding end node to node grid!")
+    self:AddNode(node)
   end
-  
-  -- Find closest node to the end coordinate (exclude the start coordinate.
-  self.endNode, dist=self:FindClosestNode(self.endCoord, {self.startNode})
-  
-  --self.endNode.coordinate:MarkToAll("End Node")
-  
-  -- Debug info.
-  self:T(self.lid..string.format("END node ID=%d", self.endNode.id))
-  
-  -- Not sure why I did this. The node does not need to be added again as it is already contained in self.nodes!
-  --  if dist>1000 then
-  --    self:T(self.lid.."Adding end node to node grid!")
-  --    self:AddNode(node)
-  --  end
     
   return self
 end
@@ -922,21 +684,12 @@ end
 -- @return #table Table of nodes from start to finish.
 function ASTAR:GetPath(ExcludeStartNode, ExcludeEndNode)
 
---  self:FindStartNode()
---  self:FindEndNode()
-  
-  -- Find start Node (closest node to start coordinate).
-  self.startNode=self:_FindClosestTerminalNode(self.startCoord)
-  
-  -- Find end node, which is not the start node (excluded).
-  self.endNode=self:_FindClosestTerminalNode(self.endCoord, {self.startNode})
+  self:FindStartNode()
+  self:FindEndNode()
 
   local nodes=self.nodes
   local start=self.startNode
   local goal=self.endNode
-  
-  -- Debug info.
-  self:T(self.lid..string.format("GetPath Start Node=%d, End Node=%d", start.id, goal.id))
 
   -- Sets.
   local openset   = {}
@@ -993,12 +746,7 @@ function ASTAR:GetPath(ExcludeStartNode, ExcludeEndNode)
         text=text..string.format(", OS Time %.6f sec", dT)
       end
       text=text..string.format(", Nvalid=%d [%d cached]", self.nvalid, self.nvalidcache)
-      text=text..string.format(", Ncost=%d [%d cached]", self.ncost, self.ncostcache)      
-      text=text..string.format("\nNodes:")
-      for i,_node in ipairs(path) do
-        local node=_node --#ASTAR.Node
-        text=text..string.format("\n[%d] Node ID=%d", i, node.id)
-      end
+      text=text..string.format(", Ncost=%d [%d cached]", self.ncost, self.ncostcache)
       self:T(self.lid..text)
       
       return path
@@ -1011,16 +759,13 @@ function ASTAR:GetPath(ExcludeStartNode, ExcludeEndNode)
     
     -- Get neighbour nodes.
     local neighbors=self:_NeighbourNodes(current, nodes)
-
+    
     -- Loop over neighbours.
     for _,neighbor in pairs(neighbors) do
     
-      -- Node is not in closed set.
       if self:_NotIn(closedset, neighbor.id) then
       
-        -- Calculate tentative_g_score.
-        --local tentative_g_score=g_score[current.id] + self:_DistNodes(current, neighbor)
-        local tentative_g_score=g_score[current.id] + self:_HeuristicCost(current, neighbor)
+        local tentative_g_score=g_score[current.id]+self:_DistNodes(current, neighbor)
          
         if self:_NotIn(openset, neighbor.id) or tentative_g_score < g_score[neighbor.id] then
         
@@ -1048,73 +793,6 @@ function ASTAR:GetPath(ExcludeStartNode, ExcludeEndNode)
   return nil -- no valid path
 end
 
---- A* pathfinding function. This seaches the path along nodes between start and end nodes/coordinates. 
--- It automatically creates a PATHLINE object that is returned in combination with the nodes of the optimal path. 
--- @param #ASTAR self
--- @param #boolean ExcludeStartNode If *true*, do not include start node in found path. Default is to include it.
--- @param #boolean ExcludeEndNode If *true*, do not include end node in found path. Default is to include it.
--- @return Core.Pathline#PATHLINE Pathline.
--- @return #table Nodes of path.
-function ASTAR:GetPathline(ExcludeStartNode, ExcludeEndNode)
-
-  local nodes=self:GetPath(ExcludeStartNode, ExcludeEndNode)
-  
-  local pathline=nil --Core.Pathline#PATHLINE
-  if nodes then
-  
-    pathline=PATHLINE:New("Astar")
-  
-    for _,_node in pairs(nodes) do
-      local node=_node --#ASTAR.Node 
-      
-      local point=pathline:AddPointFromVec3(node.coordinate)
-      point.name=node.pathline.name
-          
-    end
-      
-  end
-
-  return pathline, nodes
-end
-
---- Get pathlines from nodes.
--- @param #ASTAR self
--- @param #table Nodes Given nodes.
--- @return #table Table of PATHLINES used in the path.
-function ASTAR:GetPathlinesFromNodes(Nodes)
-
-  local pathlines={}
-  
-  --for _,_node in pairs(Nodes or {}) do
-  for i=1,#Nodes do
-    local node=Nodes[i] --#ASTAR.Node
-    
-    -- Pathline.
-    local pathline=node.pathline
-    
-    if pathline and i>1 and i<#Nodes then
-      
-      -- Previous and next nodes.
-      local n=Nodes[i-1] --#ASTAR.Node
-      local N=Nodes[i+1] --#ASTAR.Node
-      
-      -- Check if previous and next nodes are on the same pathline.
-      -- If only one point in beteen is of another pathline, this is a junction and we dont actually switch to the other pathline.
-      if n.pathline and N.pathline and n.pathline.name==N.pathline.name and n.pathline.name~=pathline.name then
-        pathline=n.pathline
-      end
-      
-    end
-
-    -- We do not want to add the same pathline two times in a row.
-    if #pathlines==0 or (#pathlines>0 and pathlines[#pathlines].name~=pathline.name) then      
-      table.insert(pathlines, pathline)
-    end
-  end
-
-  return pathlines
-end
-
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- A* pathfinding helper functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1133,18 +811,16 @@ function ASTAR:_HeuristicCost(nodeA, nodeB)
   local cost=nodeA.cost[nodeB.id]
   if cost~=nil then
     self.ncostcache=self.ncostcache+1
-    self:T(self.lid..string.format("Cost nodeA=%d --> nodeB=%d = %.1f (Cashed!)", nodeA.id, nodeB.id, cost))
     return cost
   end
 
+  local cost=nil
   if self.CostFunc then
     cost=self.CostFunc(nodeA, nodeB, unpack(self.CostArg))
   else
     cost=self:_DistNodes(nodeA, nodeB)
   end
   
-  self:T(self.lid..string.format("Cost nodeA=%d --> nodeB=%d = %.1f", nodeA.id, nodeB.id, cost))
-  
   nodeA.cost[nodeB.id]=cost
   nodeB.cost[nodeA.id]=cost  -- Symmetric problem. 
   
@@ -1158,10 +834,9 @@ end
 -- @return #boolean If true, transition between nodes is possible.
 function ASTAR:_IsValidNeighbour(node, neighbor)
 
-  -- Counter of function calls.
+  -- Counter.
   self.nvalid=self.nvalid+1
   
-  -- Check if neighbour is in cached set.
   local valid=node.valid[neighbor.id]
   if valid~=nil then
     --env.info(string.format("Node %d has valid=%s neighbour %d", node.id, tostring(valid), neighbor.id))
@@ -1169,16 +844,13 @@ function ASTAR:_IsValidNeighbour(node, neighbor)
     return valid
   end
 
-  -- Check if this is a valid neighbour.
   local valid=nil
   if self.ValidNeighbourFunc then
     valid=self.ValidNeighbourFunc(node, neighbor, unpack(self.ValidNeighbourArg))  
   else
-    -- If no valid neighbour function is defined, we assume all nodes are valid neighbours.
     valid=true
   end
 
-  -- Cache valid neighbour.
   node.valid[neighbor.id]=valid
   neighbor.valid[node.id]=valid  -- Symmetric problem. 
 
@@ -1212,9 +884,6 @@ function ASTAR:_LowestFscore(set, f_score)
     end
   end
   
-  -- Debug info.
-  self:T(self.lid..string.format("Lowest Fscore=%.1f, Node=%s", lowest, tostring(bestNode)))
-  
   return self.nodes[bestNode]
 end
 
@@ -1259,46 +928,16 @@ end
 -- @param #table map Map.
 -- @param #ASTAR.Node current_node The current node.
 -- @return #table Unwinded path.
-function ASTAR:_UnwindPath(flat_path, map, current_node)
+function ASTAR:_UnwindPath( flat_path, map, current_node )
 
-  local previous_node=map[current_node]
-
-  if previous_node then
-    table.insert(flat_path, 1, previous_node) 
-    return self:_UnwindPath(flat_path, map, previous_node)
+  if map [current_node] then
+    table.insert (flat_path, 1, map[current_node]) 
+    return self:_UnwindPath(flat_path, map, map[current_node])
   else
-    -- No previous node ==> return path.
     return flat_path
   end
 end
 
---- Function to check if a certain node is in a given table.
--- @param #ASTAR self
--- @param #table Nodes Nodes table.
--- @param #ASTAR.Node Node The node to check.
--- @return #boolean If true, the node is not in the set.
-function ASTAR:_IsNodeInTable(Nodes, Node)
-
-  for _,_node in pairs(Nodes) do
-    local node=_node --#ASTAR.Node
-    if node.id==Node.id then
-      return true
-    end
-  end
-
-  return false
-end
-
---- Function to check if a certain node is **not** in a given table.
--- @param #ASTAR self
--- @param #table Nodes Nodes table.
--- @param #ASTAR.Node Node The node to check.
--- @return #boolean If true, the node is not in the set.
-function ASTAR:_IsNodeNotInTable(Nodes, Node)
-  local is=self:_IsNodeInTable(Nodes, Node)
-  return not is
-end
-
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Core/Base.lua

@@ -26,7 +26,7 @@
 -- @module Core.Base
 -- @image Core_Base.JPG
 
-local _TraceOnOff = false -- default to no tracing
+local _TraceOnOff = true
 local _TraceLevel = 1
 local _TraceAll = false
 local _TraceClass = {}
@@ -34,12 +34,11 @@ local _TraceClassMethod = {}
 
 local _ClassID = 0
 
---- Base class of everything
+---
 -- @type BASE
--- @field #string ClassName The name of the class.
--- @field #number ClassID The ID number of the class.
--- @field #string ClassNameAndID The name of the class concatenated with the ID number of the class.
--- @field Core.Scheduler#SCHEDULER Scheduler The scheduler object.
+-- @field ClassName The name of the class.
+-- @field ClassID The ID number of the class.
+-- @field ClassNameAndID The name of the class concatenated with the ID number of the class.
 
 --- BASE class
 --
@@ -201,7 +200,6 @@ BASE = {
   States = {},
   Debug = debug,
   Scheduler = nil,
-  Properties = {},
 }
 
 -- @field #BASE.__
@@ -212,6 +210,14 @@ BASE._ = {
   Schedules = {}, --- Contains the Schedulers Active
 }
 
+--- The Formation Class
+-- @type FORMATION
+-- @field Cone A cone formation.
+FORMATION = {
+  Cone = "Cone",
+  Vee = "Vee",
+}
+
 --- BASE constructor.
 --
 -- This is an example how to use the BASE:New() constructor in a new class definition when inheriting from BASE.
@@ -735,31 +741,7 @@ 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.
@@ -880,62 +862,6 @@ 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
@@ -1110,31 +1036,6 @@ function BASE:ClearState( Object, StateName )
   end
 end
 
---- Set one property of an object.
--- @param #BASE self
--- @param Key The key that is used as a reference of the value. Note that the key can be a #string, but it can also be any other type!
--- @param Value The value that is stored. Note that the value can be a #string, but it can also be any other type!
-function BASE:SetProperty(Key,Value)
-  self.Properties = self.Properties or {}
-  self.Properties[Key] = Value
-end
-            
---- Get one property of an object by the key.
--- @param #BASE self
--- @param Key The key that is used as a reference of the value. Note that the key can be a #string, but it can also be any other type!
--- @return Value The value that is stored. Note that the value can be a #string, but it can also be any other type! Nil if not found.         
-function BASE:GetProperty(Key)
-  self.Properties = self.Properties or {}
-  return self.Properties[Key]
-end
-
---- Get all of the properties of an object in a table.
--- @param #BASE self
--- @return #table of values, indexed by keys.
-function BASE:GetProperties()
-  return self.Properties
-end
-            
 -- Trace section
 
 -- Log a trace (only shown when trace is on)
@@ -1243,28 +1144,6 @@ function BASE:TraceClassMethod( Class, Method )
   self:I( "Tracing method " .. Method .. " of class " .. Class )
 end
 
---- (Internal) Serialize arguments
--- @param #BASE self
--- @param #table Arguments
--- @return #string Text
-function BASE:_Serialize(Arguments)
-  local text = UTILS.PrintTableToLog({Arguments}, 0, true)
-  text = string.gsub(text,"(\n+)","")
-  text = string.gsub(text,"%(%(","%(")
-  text = string.gsub(text,"%)%)","%)")
-  text = string.gsub(text,"(%s+)"," ")
-  return text
-end
-
------ (Internal) Serialize arguments
----- @param #BASE self
----- @param #table Arguments
----- @return #string Text
---function BASE:_Serialize(Arguments)
---  local text=UTILS.BasicSerialize(Arguments)
---  return text
---end
-
 --- Trace a function call. This function is private.
 -- @param #BASE self
 -- @param Arguments A #table or any field.
@@ -1289,7 +1168,7 @@ function BASE:_F( Arguments, DebugInfoCurrentParam, DebugInfoFromParam )
       if DebugInfoFrom then
         LineFrom = DebugInfoFrom.currentline
       end
-      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "F", self.ClassName, self.ClassID, Function, BASE:_Serialize(Arguments) ) )
+      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "F", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
     end
   end
 end
@@ -1299,7 +1178,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1314,7 +1193,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F2( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1329,7 +1208,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:F3( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1363,7 +1242,7 @@ function BASE:_T( Arguments, DebugInfoCurrentParam, DebugInfoFromParam )
       if DebugInfoFrom then
         LineFrom = DebugInfoFrom.currentline
       end
-      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s", LineCurrent, LineFrom, "T", self.ClassName, self.ClassID, BASE:_Serialize(Arguments) ) )
+      env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s", LineCurrent, LineFrom, "T", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
     end
   end
 end
@@ -1373,7 +1252,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1388,7 +1267,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T2( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 2 then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1403,7 +1282,7 @@ end
 -- @param Arguments A #table or any field.
 function BASE:T3( Arguments )
 
-  if BASE.Debug and _TraceOnOff == true and _TraceLevel >= 3 then
+  if BASE.Debug and _TraceOnOff then
     local DebugInfoCurrent = BASE.Debug.getinfo( 2, "nl" )
     local DebugInfoFrom = BASE.Debug.getinfo( 3, "l" )
 
@@ -1435,7 +1314,7 @@ function BASE:E( Arguments )
 
     env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "E", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
   else
-    env.info( string.format( "%1s:%30s%05d(%s)", "E", self.ClassName, self.ClassID, UTILS.BasicSerialize(Arguments) ) )
+    env.info( string.format( "%1s:%30s%05d(%s)", "E", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
   end
 
 end
@@ -1462,7 +1341,39 @@ function BASE:I( Arguments )
 
     env.info( string.format( "%6d(%6d)/%1s:%30s%05d.%s(%s)", LineCurrent, LineFrom, "I", self.ClassName, self.ClassID, Function, UTILS.BasicSerialize( Arguments ) ) )
   else
-    env.info( string.format( "%1s:%30s%05d(%s)", "I", self.ClassName, self.ClassID, UTILS.BasicSerialize(Arguments)) )
+    env.info( string.format( "%1s:%30s%05d(%s)", "I", self.ClassName, self.ClassID, UTILS.BasicSerialize( Arguments ) ) )
   end
 
 end
+
+--- old stuff
+
+-- function BASE:_Destructor()
+--  --self:E("_Destructor")
+--
+--  --self:EventRemoveAll()
+-- end
+
+-- THIS IS WHY WE NEED LUA 5.2 ...
+-- function BASE:_SetDestructor()
+--
+--  -- TODO: Okay, this is really technical...
+--  -- When you set a proxy to a table to catch __gc, weak tables don't behave like weak...
+--  -- Therefore, I am parking this logic until I've properly discussed all this with the community.
+--
+--  local proxy = newproxy(true)
+--  local proxyMeta = getmetatable(proxy)
+--
+--  proxyMeta.__gc = function ()
+--    env.info("In __gc for " .. self:GetClassNameAndID() )
+--    if self._Destructor then
+--        self:_Destructor()
+--    end
+--  end
+--
+--  -- keep the userdata from newproxy reachable until the object
+--  -- table is about to be garbage-collected - then the __gc hook
+--  -- will be invoked and the destructor called
+--  rawset( self, '__proxy', proxy )
+--
+-- end

Moose Development/Moose/Core/Beacon.lua

@@ -8,10 +8,6 @@
 --
 -- ===
 --
--- ### [Demo Missions](https://github.com/FlightControl-Master/MOOSE_Demos/tree/master/Core/Beacon)
---
--- ===
---
 -- ### Authors: Hugues "Grey_Echo" Bousquet, funkyfranky
 --
 -- @module Core.Beacon
@@ -38,13 +34,11 @@
 -- @type BEACON
 -- @field #string ClassName Name of the class "BEACON".
 -- @field Wrapper.Controllable#CONTROLLABLE Positionable The @{Wrapper.Controllable#CONTROLLABLE} that will receive radio capabilities.
--- @field #number UniqueName Counter to make the unique naming work.
 -- @extends Core.Base#BASE
 BEACON = {
   ClassName    = "BEACON",
   Positionable = nil,
   name         = nil,
-  UniqueName = 0, 
 }
 
 --- Beacon types supported by DCS. 
@@ -292,7 +286,6 @@ end
 -- myBeacon:AATACAN(20, "TEXACO", true) -- Activate the beacon
 function BEACON:AATACAN(TACANChannel, Message, Bearing, BeaconDuration)
   self:F({TACANChannel, Message, Bearing, BeaconDuration})
-  self:E("This method is DEPRECATED! Please use ActivateTACAN() instead.")
 
   local IsValid = true
 
@@ -386,9 +379,7 @@ end
 function BEACON:RadioBeacon(FileName, Frequency, Modulation, Power, BeaconDuration)
   self:F({FileName, Frequency, Modulation, Power, BeaconDuration})
   local IsValid = false
-  
-  Modulation = Modulation or radio.modulation.AM
-  
+
   -- Check the filename
   if type(FileName) == "string" then
     if FileName:find(".ogg") or FileName:find(".wav") then
@@ -399,7 +390,7 @@ function BEACON:RadioBeacon(FileName, Frequency, Modulation, Power, BeaconDurati
     end
   end
   if not IsValid then
-    self:E({"File name invalid. Maybe something wrong with the extension? ", FileName})
+    self:E({"File name invalid. Maybe something wrong with the extension ? ", FileName})
   end
 
   -- Check the Frequency
@@ -425,9 +416,7 @@ function BEACON:RadioBeacon(FileName, Frequency, Modulation, Power, BeaconDurati
   if IsValid then
     self:T2({"Activating Beacon on ", Frequency, Modulation})
     -- Note that this is looped. I have to give this transmission a unique name, I use the class ID
-    BEACON.UniqueName = BEACON.UniqueName + 1
-    self.BeaconName = "MooseBeacon"..tostring(BEACON.UniqueName)
-    trigger.action.radioTransmission(FileName, self.Positionable:GetPositionVec3(), Modulation, true, Frequency, Power, self.BeaconName)
+    trigger.action.radioTransmission(FileName, self.Positionable:GetPositionVec3(), Modulation, true, Frequency, Power, tostring(self.ID))
 
      if BeaconDuration then -- Schedule the stop of the BEACON if asked by the MD
        SCHEDULER:New( nil, 
@@ -435,8 +424,7 @@ function BEACON:RadioBeacon(FileName, Frequency, Modulation, Power, BeaconDurati
            self:StopRadioBeacon()
          end, {}, BeaconDuration)
      end
-  end
-  return self 
+  end 
 end
 
 --- Stops the Radio Beacon
@@ -445,7 +433,7 @@ end
 function BEACON:StopRadioBeacon()
   self:F()
   -- The unique name of the transmission is the class ID
-  trigger.action.stopRadioTransmission(self.BeaconName)
+  trigger.action.stopRadioTransmission(tostring(self.ID))
   return self
 end
 

Moose Development/Moose/Core/ClientMenu.lua

@@ -20,7 +20,7 @@
 -- 
 -- @module Core.ClientMenu
 -- @image Core_Menu.JPG
--- last change: Jan 2025
+-- last change: Oct 2023
 
 -- TODO
 ----------------------------------------------------------------------------------------------------------------
@@ -51,15 +51,14 @@
 -- @field #boolean Generic
 -- @field #boolean debug
 -- @field #CLIENTMENUMANAGER Controller
--- @field #active boolean
 -- @extends Core.Base#BASE
 
 ---
 -- @field #CLIENTMENU
 CLIENTMENU = {
-  ClassName = "CLIENTMENU",
+  ClassName = "CLIENTMENUE",
   lid = "",
-  version = "0.1.3",
+  version = "0.1.1",
   name = nil,
   path = nil,
   group = nil,
@@ -71,7 +70,6 @@ CLIENTMENU = {
   debug = false,
   Controller = nil,
   groupname = nil,
-  active = false,
 }
 
 ---
@@ -80,7 +78,7 @@ CLIENTMENU_ID = 0
 
 --- Create an new CLIENTMENU object.
 -- @param #CLIENTMENU self
--- @param Wrapper.Client#CLIENT Client The client for whom this entry is. Leave as nil for a generic entry.
+-- @param Wrapper.Client#CLIENT Client The client for whom this entry is.
 -- @param #string Text Text of the F10 menu entry.
 -- @param #CLIENTMENU Parent The parent menu entry.
 -- @param #string Function (optional) Function to call when the entry is used.
@@ -116,7 +114,7 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
   if self.Functionargs and self.debug then
     self:T({"Functionargs",self.Functionargs})
   end
-  if not self.Generic and self.active == false then
+  if not self.Generic then
     if Function ~= nil then
       local ErrorHandler = function( errmsg )
         env.info( "MOOSE Error in CLIENTMENU COMMAND function: " .. errmsg )
@@ -135,10 +133,8 @@ function CLIENTMENU:NewEntry(Client,Text,Parent,Function,...)
         end
       end
       self.path = missionCommands.addCommandForGroup(self.GroupID,Text,self.parentpath, self.CallHandler)
-      self.active = true
     else
       self.path = missionCommands.addSubMenuForGroup(self.GroupID,Text,self.parentpath)
-      self.active = true
     end
   else
     if self.parentpath then
@@ -204,7 +200,6 @@ function CLIENTMENU:RemoveF10()
     if not status then
       self:I(string.format("**** Error Removing Menu Entry %s for %s!",tostring(self.name),self.groupname))
     end
-    self.active = false
   end
   return self
 end
@@ -329,22 +324,6 @@ end
 -- 
 -- Many functions can either change the tree for one client or for all clients.
 -- 
--- ## Conceptual remarks
--- 
--- There's a couple of things to fully understand: 
--- 
--- 1) **CLIENTMENUMANAGER** manages a set of entries from **CLIENTMENU**, it's main purpose is to administer the *shadow menu tree*, ie. a menu structure which is not 
--- (yet) visible to any client   
--- 2) The entries are **CLIENTMENU** objects, which are linked in a tree form. There's two ways to create them:   
---          A) in the manager with ":NewEntry()" which initially 
---              adds it to the shadow menu **only**   
---          B) stand-alone directly as `CLIENTMENU:NewEntry()` - here it depends on whether or not you gave a CLIENT object if the entry is created as generic entry or pushed 
---              a **specific** client. **Be aware** though that the entries are not managed by the CLIENTMANAGER before the next step!   
--- A generic entry can be added to the manager (and the shadow tree) with `:AddEntry()` - this will also push it to all clients(!) if no client is given, or a specific client only.  
--- 3) Pushing only works for alive clients.   
--- 4) Live and shadow tree entries are managed via the CLIENTMENUMANAGER object.   
--- 5) `Propagate()`refreshes the menu tree for all, or a single client.   
--- 
 -- ## Create a base reference tree and send to all clients
 -- 
 --            local clientset = SET_CLIENT:New():FilterStart()
@@ -417,7 +396,7 @@ end
 CLIENTMENUMANAGER = {
   ClassName = "CLIENTMENUMANAGER",
   lid = "",
-  version = "0.1.6",
+  version = "0.1.4",
   name = nil,
   clientset = nil,
   menutree = {},
@@ -455,7 +434,7 @@ end
 -- @param #CLIENTMENUMANAGER self
 -- @param Core.Event#EVENTDATA EventData
 -- @return #CLIENTMENUMANAGER self
-function CLIENTMENUMANAGER:_EventHandler(EventData,Retry)
+function CLIENTMENUMANAGER:_EventHandler(EventData)
   self:T(self.lid.."_EventHandler: "..EventData.id)
   --self:I(self.lid.."_EventHandler: "..tostring(EventData.IniPlayerName))
   if EventData.id == EVENTS.PlayerLeaveUnit or EventData.id == EVENTS.Ejection or EventData.id == EVENTS.Crash or EventData.id == EVENTS.PilotDead then
@@ -468,10 +447,6 @@ function CLIENTMENUMANAGER:_EventHandler(EventData,Retry)
     if EventData.IniPlayerName and EventData.IniGroup then
       if (not self.clientset:IsIncludeObject(_DATABASE:FindClient( EventData.IniUnitName ))) then
         self:T(self.lid.."Client not in SET: "..EventData.IniPlayerName)
-        if not Retry then
-          -- try again in 2 secs
-          self:ScheduleOnce(2,CLIENTMENUMANAGER._EventHandler,self,EventData,true)
-        end
         return self
       end
       --self:I(self.lid.."Join event for player: "..EventData.IniPlayerName)
@@ -517,7 +492,7 @@ function CLIENTMENUMANAGER:_EventHandler(EventData,Retry)
   return self
 end
 
---- Set this Client Manager to auto-propagate menus **once** to newly joined players. Useful if you have **one** menu structure only. Does not automatically push follow-up changes to the client(s).
+--- Set this Client Manager to auto-propagate menus to newly joined players. Useful if you have **one** menu structure only.
 -- @param #CLIENTMENUMANAGER self
 -- @return #CLIENTMENUMANAGER self
 function CLIENTMENUMANAGER:InitAutoPropagation()
@@ -528,11 +503,11 @@ function CLIENTMENUMANAGER:InitAutoPropagation()
   self:HandleEvent(EVENTS.PilotDead, self._EventHandler)
   self:HandleEvent(EVENTS.PlayerEnterAircraft, self._EventHandler)
   self:HandleEvent(EVENTS.PlayerEnterUnit, self._EventHandler)
-  self:SetEventPriority(6) 
+  self:SetEventPriority(5) 
   return self 
 end
 
---- Create a new entry in the **generic** structure.
+--- Create a new entry in the generic structure.
 -- @param #CLIENTMENUMANAGER self
 -- @param #string Text Text of the F10 menu entry.
 -- @param #CLIENTMENU Parent The parent menu entry.
@@ -685,7 +660,6 @@ end
 function CLIENTMENUMANAGER:Propagate(Client)
   self:T(self.lid.."Propagate")
   --self:I(UTILS.PrintTableToLog(Client,1))
-  local knownunits = {} -- track so we can ID multi seated
   local Set = self.clientset.Set
   if Client then
     Set = {Client}
@@ -694,42 +668,34 @@ function CLIENTMENUMANAGER:Propagate(Client)
   for _,_client in pairs(Set) do
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
-      local playerunit = client:GetName()
-      --local playergroup = client:GetGroup()
       local playername = client:GetPlayerName() or "none"
-      if not knownunits[playerunit] then
-        knownunits[playerunit] = true
-      else
-        self:I("Player in multi seat unit: "..playername)
-        break -- multi seat already build
-      end
-      if not self.playertree[playername] then
-        self.playertree[playername] = {}
-      end
-      for level,branch in pairs (self.menutree) do
-        self:T("Building branch:" .. level)
-        for _,leaf in pairs(branch) do
-          self:T("Building leaf:" .. leaf)
-          local entry = self:FindEntryByUUID(leaf)
-          if entry then
-            self:T("Found generic entry:" .. entry.UUID)
-            local parent = nil
-            if entry.Parent and entry.Parent.UUID then
-              parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
-            end
-            self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
-            self.playertree[playername][entry.UUID].Once = entry.Once
-          else
-            self:T("NO generic entry for:" .. leaf)
-          end  
+        if not self.playertree[playername] then
+          self.playertree[playername] = {}
+        end
+        for level,branch in pairs (self.menutree) do
+          self:T("Building branch:" .. level)
+          for _,leaf in pairs(branch) do
+            self:T("Building leaf:" .. leaf)
+            local entry = self:FindEntryByUUID(leaf)
+            if entry then
+              self:T("Found generic entry:" .. entry.UUID)
+              local parent = nil
+              if entry.Parent and entry.Parent.UUID then
+                parent = self.playertree[playername][entry.Parent.UUID] or self:FindEntryByUUID(entry.Parent.UUID)
+              end
+              self.playertree[playername][entry.UUID] = CLIENTMENU:NewEntry(client,entry.name,parent,entry.Function,unpack(entry.Functionargs))
+              self.playertree[playername][entry.UUID].Once = entry.Once
+            else
+              self:T("NO generic entry for:" .. leaf)
+            end  
+          end
         end
-      end
     end
   end
   return self
 end
 
---- Push a single previously created entry into the F10 menu structure of all clients.
+--- Push a single previously created entry into the menu structure of all clients.
 -- @param #CLIENTMENUMANAGER self
 -- @param #CLIENTMENU Entry The entry to add.
 -- @param Wrapper.Client#CLIENT Client (optional) If given, make this change only for this client. 
@@ -737,21 +703,13 @@ end
 function CLIENTMENUMANAGER:AddEntry(Entry,Client)
   self:T(self.lid.."AddEntry")
   local Set = self.clientset.Set
-  local knownunits = {}
   if Client then
     Set = {Client}
   end
   for _,_client in pairs(Set) do
     local client = _client -- Wrapper.Client#CLIENT
     if client and client:IsAlive() then
-      local playername = client:GetPlayerName() or "None"
-      local unitname = client:GetName()
-      if not knownunits[unitname] then
-        knownunits[unitname] = true
-      else
-        self:I("Player in multi seat unit: "..playername)  
-        break
-      end
+      local playername = client:GetPlayerName()
       if Entry then
         self:T("Adding generic entry:" .. Entry.UUID)
         local parent = nil

Moose Development/Moose/Core/Database.lua

@@ -20,7 +20,6 @@
 --   * 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.
 --
 -- ===
 --
@@ -38,9 +37,6 @@
 -- @field #table Templates Templates: Units, Groups, Statics, ClientsByName, ClientsByID.
 -- @field #table CLIENTS Clients.
 -- @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.
@@ -56,7 +52,6 @@
 --  * 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.
 --
@@ -98,9 +93,6 @@ DATABASE = {
   OPSZONES = {},
   PATHLINES = {},
   STORAGES = {},
-  STNS={},
-  SADL={},
-  DYNAMICCARGO={},
 }
 
 local _DATABASECoalition =
@@ -139,7 +131,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 )
@@ -147,8 +139,6 @@ 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()
@@ -176,30 +166,24 @@ 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, force )
-  
-  local DCSunitName = DCSUnitName
-  
-  if type(DCSunitName) == "number" then DCSunitName = string.format("%d",DCSUnitName) end
-  
-  if not self.UNITS[DCSunitName] or force == true then
+function DATABASE:AddUnit( DCSUnitName )
+
+  if not self.UNITS[DCSUnitName] 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
 
@@ -211,9 +195,10 @@ function DATABASE:AddStatic( DCSStaticName )
 
   if not self.STATICS[DCSStaticName] then
     self.STATICS[DCSStaticName] = STATIC:Register( DCSStaticName )
+    return self.STATICS[DCSStaticName]
   end
 
-  return self.STATICS[DCSStaticName]
+  return nil
 end
 
 
@@ -223,42 +208,16 @@ function DATABASE:DeleteStatic( DCSStaticName )
   self.STATICS[DCSStaticName] = nil
 end
 
---- Finds a STATIC based on the Static Name.
+--- Finds a STATIC based on the StaticName.
 -- @param #DATABASE self
--- @param #string StaticName Name of the static object.
+-- @param #string StaticName
 -- @return Wrapper.Static#STATIC The found STATIC.
 function DATABASE:FindStatic( StaticName )
+
   local StaticFound = self.STATICS[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)
-  end
-  return self.DYNAMICCARGO[Name]
-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.
@@ -490,10 +449,10 @@ do -- Zones and Pathlines
 
       -- Loop over layers.
       for layerID, layerData in pairs(env.mission.drawings.layers or {}) do
-        
+
         -- Loop over objects in layers.
         for objectID, objectData in pairs(layerData.objects or {}) do
-          
+
           -- Check for polygon which has at least 4 points (we would need 3 but the origin seems to be there twice)
           if objectData.polygonMode and (objectData.polygonMode=="free") and objectData.points and #objectData.points>=4 then
 
@@ -529,32 +488,10 @@ do -- Zones and Pathlines
 
             -- Create new polygon zone.
             local Zone=ZONE_POLYGON:NewFromPointsArray(ZoneName, points)
-            
-            --Zone.DrawID = objectID
-            
+
             -- Set color.
             Zone:SetColor({1, 0, 0}, 0.15)
-            Zone:SetFillColor({1, 0, 0}, 0.15)
-            
-            if objectData.colorString then 
-              -- eg colorString = 0xff0000ff
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetColor({r, g, b}, a)
-            end
-            if objectData.fillColorString then 
-              -- eg fillColorString = 0xff00004b
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetFillColor({r, g, b}, a)
-            end
-            
+
             -- Store in DB.
             self.ZONENAMES[ZoneName] = ZoneName
 
@@ -595,26 +532,7 @@ do -- Zones and Pathlines
 
             -- Set color.
             Zone:SetColor({1, 0, 0}, 0.15)
-            
-           if objectData.colorString then 
-              -- eg colorString = 0xff0000ff
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetColor({r, g, b}, a)
-            end
-            if objectData.fillColorString then 
-              -- eg fillColorString = 0xff00004b
-              local color = string.gsub(objectData.colorString,"^0x","")
-              local r = tonumber(string.sub(color,1,2),16)/255
-              local g = tonumber(string.sub(color,3,4),16)/255
-              local b = tonumber(string.sub(color,5,6),16)/255
-              local a = tonumber(string.sub(color,7,8),16)/255
-              Zone:SetFillColor({r, g, b}, a)
-            end
-            
+
             -- Store in DB.
             self.ZONENAMES[ZoneName] = ZoneName
 
@@ -838,7 +756,7 @@ end -- cargo
 
 --- Finds a CLIENT based on the ClientName.
 -- @param #DATABASE self
--- @param #string ClientName - Note this is the UNIT name of the client!
+-- @param #string ClientName
 -- @return Wrapper.Client#CLIENT The found CLIENT.
 function DATABASE:FindClient( ClientName )
 
@@ -850,19 +768,14 @@ 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, Force )
-  
-  local DCSUnitName = 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 )
+function DATABASE:AddClient( ClientName )
+
+  if not self.CLIENTS[ClientName] then
+    self.CLIENTS[ClientName] = CLIENT:Register( ClientName )
   end
 
-  return self.CLIENTS[DCSUnitName]
+  return self.CLIENTS[ClientName]
 end
 
 
@@ -873,25 +786,15 @@ 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
--- @param #string GroupName
--- @param #boolean force
--- @return Wrapper.Group#GROUP The Group
-function DATABASE:AddGroup( GroupName, force )
+function DATABASE:AddGroup( GroupName )
 
-  if not self.GROUPS[GroupName] or force == true then
+  if not self.GROUPS[GroupName] then
     self:T( { "Add GROUP:", GroupName } )
     self.GROUPS[GroupName] = GROUP:Register( GroupName )
   end
@@ -902,11 +805,9 @@ 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:I( { "Add player for unit:", UnitName, PlayerName } )
+    self:T( { "Add player for unit:", UnitName, PlayerName } )
     self.PLAYERS[PlayerName] = UnitName
     self.PLAYERUNITS[PlayerName] = self:FindUnit( UnitName )
     self.PLAYERSJOINED[PlayerName] = PlayerName
@@ -914,21 +815,6 @@ 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 )
@@ -1001,7 +887,7 @@ function DATABASE:Spawn( SpawnTemplate )
   SpawnTemplate.CountryID = nil
   SpawnTemplate.CategoryID = nil
 
-  self:_RegisterGroupTemplate( SpawnTemplate, SpawnCoalitionID, SpawnCategoryID, SpawnCountryID, SpawnTemplate.name  )
+  self:_RegisterGroupTemplate( SpawnTemplate, SpawnCoalitionID, SpawnCategoryID, SpawnCountryID  )
 
   self:T3( SpawnTemplate )
   coalition.addGroup( SpawnCountryID, SpawnCategoryID, SpawnTemplate )
@@ -1078,7 +964,7 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
   self.Templates.Groups[GroupTemplateName].CategoryID = CategoryID
   self.Templates.Groups[GroupTemplateName].CoalitionID = CoalitionSide
   self.Templates.Groups[GroupTemplateName].CountryID = CountryID
-  
+
   local UnitNames = {}
 
   for unit_num, UnitTemplate in pairs( GroupTemplate.units ) do
@@ -1102,31 +988,10 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
       self.Templates.ClientsByName[UnitTemplate.name].CountryID = CountryID
       self.Templates.ClientsByID[UnitTemplate.unitId] = UnitTemplate
     end
-    
-    if UnitTemplate.AddPropAircraft then
-      if UnitTemplate.AddPropAircraft.STN_L16 then
-        local stn = UTILS.OctalToDecimal(UnitTemplate.AddPropAircraft.STN_L16)
-        if stn == nil or stn < 1 then
-          self:E("WARNING: Invalid STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
-        else
-          self.STNS[stn] = UnitTemplate.name
-          self:I("Register STN "..tostring(UnitTemplate.AddPropAircraft.STN_L16).." for ".. UnitTemplate.name)
-        end
-      end
-      if UnitTemplate.AddPropAircraft.SADL_TN then
-        local sadl = UTILS.OctalToDecimal(UnitTemplate.AddPropAircraft.SADL_TN)
-        if sadl == nil or sadl < 1 then
-          self:E("WARNING: Invalid SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
-        else
-          self.SADL[sadl] = UnitTemplate.name
-          self:I("Register SADL "..tostring(UnitTemplate.AddPropAircraft.SADL_TN).." for ".. UnitTemplate.name)
-        end
-      end  
-    end
 
     UnitNames[#UnitNames+1] = self.Templates.Units[UnitTemplate.name].UnitName
   end
-    
+
   -- Debug info.
   self:T( { Group     = self.Templates.Groups[GroupTemplateName].GroupName,
             Coalition = self.Templates.Groups[GroupTemplateName].CoalitionID,
@@ -1137,92 +1002,15 @@ function DATABASE:_RegisterGroupTemplate( GroupTemplate, CoalitionSide, Category
         )
 end
 
---- Get next (consecutive) free STN as octal number.
--- @param #DATABASE self
--- @param #number octal Starting octal.
--- @param #string unitname Name of the associated unit.
--- @return #number Octal
-function DATABASE:GetNextSTN(octal,unitname)
-  local first = UTILS.OctalToDecimal(octal) or 0
-  if self.STNS[first] == unitname then return octal end
-  local nextoctal = 77777
-  local found = false
-  if 32767-first < 10 then
-    first = 0
-  end
-  for i=first+1,32767 do
-    if self.STNS[i] == nil then
-      found = true
-      nextoctal = UTILS.DecimalToOctal(i)
-      self.STNS[i] = unitname
-      self:T("Register STN "..tostring(nextoctal).." for ".. unitname)
-      break
-    end
-  end
-  if not found then
-    self:E(string.format("WARNING: No next free STN past %05d found!",octal))
-    -- cleanup
-    local NewSTNS = {}
-    for _id,_name in pairs(self.STNS) do
-      if self.UNITS[_name] ~= nil then
-        NewSTNS[_id] = _name
-      end
-    end
-    self.STNS = nil
-    self.STNS = NewSTNS
-  end
-  return nextoctal 
-end
-
---- Get next (consecutive) free SADL as octal number.
--- @param #DATABASE self
--- @param #number octal Starting octal.
--- @param #string unitname Name of the associated unit.
--- @return #number Octal
-function DATABASE:GetNextSADL(octal,unitname)
-  local first = UTILS.OctalToDecimal(octal) or 0
-  if self.SADL[first] == unitname then return octal end
-  local nextoctal = 7777
-  local found = false
-  if 4095-first < 10 then
-    first = 0
-  end
-  for i=first+1,4095 do
-    if self.STNS[i] == nil then
-      found = true
-      nextoctal = UTILS.DecimalToOctal(i)
-      self.SADL[i] = unitname
-      self:T("Register SADL "..tostring(nextoctal).." for ".. unitname)
-      break
-    end
-  end
-  if not found then
-    self:E(string.format("WARNING: No next free SADL past %04d found!",octal))
-    -- cleanup
-    local NewSTNS = {}
-    for _id,_name in pairs(self.SADL) do
-      if self.UNITS[_name] ~= nil then
-        NewSTNS[_id] = _name
-      end
-    end
-    self.SADL = nil
-    self.SADL = NewSTNS
-  end
-  return nextoctal 
-end
-
 --- Get group template.
 -- @param #DATABASE self
 -- @param #string GroupName Group name.
 -- @return #table Group template table.
 function DATABASE:GetGroupTemplate( GroupName )
-  local GroupTemplate=nil
-  if self.Templates.Groups[GroupName] then
-    GroupTemplate = self.Templates.Groups[GroupName].Template
-    GroupTemplate.SpawnCoalitionID = self.Templates.Groups[GroupName].CoalitionID
-    GroupTemplate.SpawnCategoryID = self.Templates.Groups[GroupName].CategoryID
-    GroupTemplate.SpawnCountryID = self.Templates.Groups[GroupName].CountryID
-  end
+  local GroupTemplate = self.Templates.Groups[GroupName].Template
+  GroupTemplate.SpawnCoalitionID = self.Templates.Groups[GroupName].CoalitionID
+  GroupTemplate.SpawnCategoryID = self.Templates.Groups[GroupName].CategoryID
+  GroupTemplate.SpawnCountryID = self.Templates.Groups[GroupName].CountryID
   return GroupTemplate
 end
 
@@ -1267,43 +1055,6 @@ 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.
@@ -1377,11 +1128,7 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Coalition ID.
 function DATABASE:GetCoalitionFromClientTemplate( ClientName )
-  if self.Templates.ClientsByName[ClientName] then  
-    return self.Templates.ClientsByName[ClientName].CoalitionID
-  end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
-  return nil
+  return self.Templates.ClientsByName[ClientName].CoalitionID
 end
 
 --- Get category ID from client name.
@@ -1389,11 +1136,7 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Category ID.
 function DATABASE:GetCategoryFromClientTemplate( ClientName )
-  if self.Templates.ClientsByName[ClientName] then  
-    return self.Templates.ClientsByName[ClientName].CategoryID
-  end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
-  return nil
+  return self.Templates.ClientsByName[ClientName].CategoryID
 end
 
 --- Get country ID from client name.
@@ -1401,11 +1144,7 @@ end
 -- @param #string ClientName Name of the Client.
 -- @return #number Country ID.
 function DATABASE:GetCountryFromClientTemplate( ClientName )
-  if self.Templates.ClientsByName[ClientName] then  
-    return self.Templates.ClientsByName[ClientName].CountryID
-  end
-  self:E("WARNING: Template does not exist for client "..tostring(ClientName))
-  return nil  
+  return self.Templates.ClientsByName[ClientName].CountryID
 end
 
 --- Airbase
@@ -1451,36 +1190,6 @@ 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
@@ -1579,29 +1288,12 @@ end
 -- @param DCS#Airbase airbase Airbase.
 -- @return #DATABASE self
 function DATABASE:_RegisterAirbase(airbase)
-  
-  local IsSyria = UTILS.GetDCSMap() == "Syria" and true or false
-  local countHSyria = 0
-  
+
   if airbase then
 
     -- Get the airbase name.
     local DCSAirbaseName = airbase:getName()
-    
-    -- DCS 2.9.8.1107 added 143 helipads all named H with the same object ID ..
-    if IsSyria and DCSAirbaseName == "H" and countHSyria > 0 then
-      --[[
-      local p = airbase:getPosition().p
-      local mgrs = COORDINATE:New(p.x,p.z,p.y):ToStringMGRS()
-      self:I("Airbase on Syria map named H @ "..mgrs)
-      countHSyria = countHSyria + 1
-      if countHSyria > 1 then return self end
-      --]]
-      return self
-    elseif IsSyria and DCSAirbaseName == "H" and countHSyria == 0 then
-      countHSyria = countHSyria + 1
-    end
-    
+
     -- This gave the incorrect value to be inserted into the airdromeID for DCS 2.5.6. Is fixed now.
     local airbaseID=airbase:getID()
 
@@ -1610,17 +1302,9 @@ function DATABASE:_RegisterAirbase(airbase)
 
     -- Unique ID.
     local airbaseUID=airbase:GetID(true)
-    
-    local typename = airbase:GetTypeName()
-    
-    local category = airbase.category
-    
-    if category == Airbase.Category.SHIP and typename == "FARP_SINGLE_01" then
-      category = Airbase.Category.HELIPAD
-    end
-    
+
     -- Debug output.
-    local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [", AIRBASE.CategoryName[category], tostring(DCSAirbaseName), airbaseUID, #airbase.runways, airbase.NparkingTotal)
+    local text=string.format("Register %s: %s (UID=%d), Runways=%d, Parking=%d [", AIRBASE.CategoryName[airbase.category], tostring(DCSAirbaseName), airbaseUID, #airbase.runways, airbase.NparkingTotal)
     for _,terminalType in pairs(AIRBASE.TerminalType) do
       if airbase.NparkingTerminal and airbase.NparkingTerminal[terminalType] then
         text=text..string.format("%d=%d ", terminalType, airbase.NparkingTerminal[terminalType])
@@ -1641,7 +1325,7 @@ end
 -- @param #DATABASE self
 -- @param Core.Event#EVENTDATA Event
 function DATABASE:_EventOnBirth( Event )
-  self:T( { Event } )
+  self:F( { Event } )
 
   if Event.IniDCSUnit then
 
@@ -1649,17 +1333,7 @@ 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
@@ -1680,9 +1354,9 @@ function DATABASE:_EventOnBirth( Event )
     end
 
     if Event.IniObjectCategory == Object.Category.UNIT then
-      
-      Event.IniGroup = self:FindGroup( Event.IniDCSGroupName )
+
       Event.IniUnit = self:FindUnit( Event.IniDCSUnitName )
+      Event.IniGroup = self:FindGroup( Event.IniDCSGroupName )
 
       -- Client
       local client=self.CLIENTS[Event.IniDCSUnitName] --Wrapper.Client#CLIENT
@@ -1698,10 +1372,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 client == nil or (client and client:CountPlayers() == 0) then
-          client=self:AddClient(Event.IniDCSUnitName, true)
+        if not client then
+          client=self:AddClient(Event.IniDCSUnitName)
         end
 
         -- Add player.
@@ -1711,19 +1385,14 @@ function DATABASE:_EventOnBirth( Event )
         if not self.PLAYERS[PlayerName] then
           self:AddPlayer( Event.IniUnitName, PlayerName )
         end
-        
-        local function SetPlayerSettings(self,PlayerName,IniUnit)
-          -- Player settings.
-          local Settings = SETTINGS:Set( PlayerName )
-          --Settings:SetPlayerMenu(Event.IniUnit)
-          Settings:SetPlayerMenu(IniUnit)
-          -- Create an event.
-          self:CreateEventPlayerEnterAircraft(IniUnit)
-          --self:CreateEventPlayerEnterAircraft(Event.IniUnit)
-        end
-        
-        self:ScheduleOnce(1,SetPlayerSettings,self,PlayerName,Event.IniUnit)
-        
+
+        -- Player settings.
+        local Settings = SETTINGS:Set( PlayerName )
+        Settings:SetPlayerMenu(Event.IniUnit)
+
+        -- Create an event.
+        self:CreateEventPlayerEnterAircraft(Event.IniUnit)
+
       end
 
     end
@@ -1737,6 +1406,7 @@ end
 -- @param #DATABASE self
 -- @param Core.Event#EVENTDATA Event
 function DATABASE:_EventOnDeadOrCrash( Event )
+
   if Event.IniDCSUnit then
 
     local name=Event.IniDCSUnitName
@@ -1744,7 +1414,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
     if Event.IniObjectCategory == 3 then
 
       ---
-      -- STATICS 
+      -- STATICS
       ---
 
       if self.STATICS[Event.IniDCSUnitName] then
@@ -1754,7 +1424,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))
@@ -1777,8 +1447,7 @@ function DATABASE:_EventOnDeadOrCrash( Event )
 
         -- Delete unit.
         if self.UNITS[Event.IniDCSUnitName] then
-          self:ScheduleOnce(1,self.DeleteUnit,self,Event.IniDCSUnitName)
-          --self:DeleteUnit(Event.IniDCSUnitName)
+          self:DeleteUnit(Event.IniDCSUnitName)
         end
 
         -- Remove client players.
@@ -1845,15 +1514,6 @@ 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
@@ -1877,7 +1537,7 @@ function DATABASE:_EventOnPlayerLeaveUnit( Event )
     if Event.IniObjectCategory == 1 then
 
       -- Try to get the player name. This can be buggy for multicrew aircraft!
-      local PlayerName = Event.IniPlayerName or Event.IniUnit:GetPlayerName() or FindPlayerName(Event.IniUnitName)
+      local PlayerName = Event.IniUnit:GetPlayerName() or FindPlayerName(Event.IniUnitName)
           
       if PlayerName then
 
@@ -1895,7 +1555,6 @@ 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
@@ -2193,7 +1852,7 @@ end
 
 --- Add a flight control to the data base.
 -- @param #DATABASE self
--- @param OPS.FlightControl#FLIGHTCONTROL flightcontrol
+-- @param Ops.FlightControl#FLIGHTCONTROL flightcontrol
 function DATABASE:AddFlightControl(flightcontrol)
   self:F2( { flightcontrol } )
   self.FLIGHTCONTROLS[flightcontrol.airbasename]=flightcontrol
@@ -2202,7 +1861,7 @@ end
 --- Get a flight control object from the data base.
 -- @param #DATABASE self
 -- @param #string airbasename Name of the associated airbase.
--- @return OPS.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.s
+-- @return Ops.FlightControl#FLIGHTCONTROL The FLIGHTCONTROL object.s
 function DATABASE:GetFlightControl(airbasename)
   return self.FLIGHTCONTROLS[airbasename]
 end
@@ -2274,7 +1933,7 @@ function DATABASE:_RegisterTemplates()
                   for group_num, Template in pairs(obj_type_data.group) do
 
                     if obj_type_name ~= "static" and Template and Template.units and type(Template.units) == 'table' then  --making sure again- this is a valid group
-                      
+
                       self:_RegisterGroupTemplate(Template, CoalitionSide, _DATABASECategory[string.lower(CategoryName)], CountryID)
 
                     else

Moose Development/Moose/Core/Event.lua

@@ -194,11 +194,6 @@ 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.
@@ -266,29 +261,17 @@ 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.x
-  --UnitTaskTimeout           = world.event.S_EVENT_UNIT_TASK_TIMEOUT or -1,
-  UnitTaskComplete          = world.event.S_EVENT_UNIT_TASK_COMPLETE or -1,
+  -- Added with DCS 2.9.0
+  UnitTaskTimeout           = world.event.S_EVENT_UNIT_TASK_TIMEOUT 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, 
-  RunwayTakeoff             = world.event.S_EVENT_RUNWAY_TAKEOFF 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,
+  PostponedTakeoff          = world.event.S_EVENT_POSTPONED_TAKEOFF or -1, 
+  PostponedLand             = world.event.S_EVENT_POSTPONED_LAND 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:
 --
@@ -344,9 +327,6 @@ 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.
 
 
 
@@ -666,24 +646,24 @@ local _EVENTMETA = {
      Text = "S_EVENT_WEAPON_DROP"
    },
    -- DCS 2.9
-  --[EVENTS.UnitTaskTimeout] = {
-    -- Order = 1,
-    -- Side = "I",
-    -- Event = "OnEventUnitTaskTimeout",
-    -- Text = "S_EVENT_UNIT_TASK_TIMEOUT "
-   --},
+  [EVENTS.UnitTaskTimeout] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventUnitTaskTimeout",
+     Text = "S_EVENT_UNIT_TASK_TIMEOUT "
+   },
   [EVENTS.UnitTaskStage] = {
      Order = 1,
      Side = "I",
      Event = "OnEventUnitTaskStage",
      Text = "S_EVENT_UNIT_TASK_STAGE "
    },
-  --[EVENTS.MacSubtaskScore] = {
-    -- Order = 1,
-     --Side = "I",
-     --Event = "OnEventMacSubtaskScore",
-     --Text = "S_EVENT_MAC_SUBTASK_SCORE"
-   --},
+  [EVENTS.MacSubtaskScore] = {
+     Order = 1,
+     Side = "I",
+     Event = "OnEventMacSubtaskScore",
+     Text = "S_EVENT_MAC_SUBTASK_SCORE"
+   },
   [EVENTS.MacExtraScore] = {
      Order = 1,
      Side = "I",
@@ -702,76 +682,20 @@ local _EVENTMETA = {
      Event = "OnEventMissionWinner",
      Text = "S_EVENT_MISSION_WINNER"
    },
-  [EVENTS.RunwayTakeoff] = {
+  [EVENTS.PostponedTakeoff] = {
      Order = 1,
      Side = "I",
-     Event = "OnEventRunwayTakeoff",
-     Text = "S_EVENT_RUNWAY_TAKEOFF"
+     Event = "OnEventPostponedTakeoff",
+     Text = "S_EVENT_POSTPONED_TAKEOFF"
    },
-  [EVENTS.RunwayTouch] = {
+  [EVENTS.PostponedLand] = {
      Order = 1,
      Side = "I",
-     Event = "OnEventRunwayTouch",
-     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"
+     Event = "OnEventPostponedLand",
+     Text = "S_EVENT_POSTPONED_LAND"
    }, 
 }
 
-
 --- The Events structure
 -- @type EVENT.Events
 -- @field #number IniUnit
@@ -1184,63 +1108,7 @@ 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.
@@ -1329,7 +1197,6 @@ function EVENT:onEvent( Event )
           end
           
           Event.IniDCSGroupName = Event.IniUnit and Event.IniUnit.GroupName or ""
-          Event.IniGroupName=Event.IniDCSGroupName --At least set the group name because group might not exist any more
           if Event.IniDCSGroup and Event.IniDCSGroup:isExist() then
             Event.IniDCSGroupName = Event.IniDCSGroup:getName()
             Event.IniGroup = GROUP:FindByName( Event.IniDCSGroupName )
@@ -1356,13 +1223,7 @@ function EVENT:onEvent( Event )
           Event.IniDCSUnit = Event.initiator
           Event.IniDCSUnitName = Event.IniDCSUnit:getName()
           Event.IniUnitName = 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.IniUnit = CARGO:FindByName( Event.IniDCSUnitName )
           Event.IniCoalition = Event.IniDCSUnit:getCoalition()
           Event.IniCategory = Event.IniDCSUnit:getDesc().category
           Event.IniTypeName = Event.IniDCSUnit:getTypeName()
@@ -1372,12 +1233,11 @@ function EVENT:onEvent( Event )
           -- Scenery
           ---          
           Event.IniDCSUnit = Event.initiator
-          Event.IniDCSUnitName = ( Event.IniDCSUnit and Event.IniDCSUnit.getName ) and Event.IniDCSUnit:getName() or "Scenery no name "..math.random(1,20000)
+          Event.IniDCSUnitName = Event.IniDCSUnit:getName()
           Event.IniUnitName = Event.IniDCSUnitName
           Event.IniUnit = SCENERY:Register( Event.IniDCSUnitName, Event.initiator )
-          Event.IniCategory =  (Event.IniDCSUnit and Event.IniDCSUnit.getDesc ) and Event.IniDCSUnit:getDesc().category
-          Event.IniTypeName = (Event.initiator and Event.initiator.isExist          
-          and Event.initiator:isExist() and Event.IniDCSUnit and Event.IniDCSUnit.getTypeName) and Event.IniDCSUnit:getTypeName() or "SCENERY"
+          Event.IniCategory = Event.IniDCSUnit:getDesc().category
+          Event.IniTypeName = Event.initiator:isExist() and Event.IniDCSUnit:getTypeName() or "SCENERY"
 
         elseif Event.IniObjectCategory == Object.Category.BASE then
           ---
@@ -1441,7 +1301,7 @@ function EVENT:onEvent( Event )
           -- STATIC
           ---
           Event.TgtDCSUnit = Event.target
-          if Event.target.isExist and Event.target:isExist() and Event.id ~= 33 then -- leave out ejected seat object, check that isExist exists (Kiowa Hellfire issue, Special K)
+          if Event.target:isExist() and Event.id ~= 33 then -- leave out ejected seat object
             Event.TgtDCSUnitName = Event.TgtDCSUnit:getName()
             -- Workaround for borked target info on cruise missiles
             if Event.TgtDCSUnitName and Event.TgtDCSUnitName ~= "" then
@@ -1475,26 +1335,24 @@ function EVENT:onEvent( Event )
           -- SCENERY
           ---
           Event.TgtDCSUnit = Event.target
-          Event.TgtDCSUnitName = Event.TgtDCSUnit.getName and Event.TgtDCSUnit.getName() or nil
-          if Event.TgtDCSUnitName~=nil then
-            Event.TgtUnitName = Event.TgtDCSUnitName
-            Event.TgtUnit = SCENERY:Register( Event.TgtDCSUnitName, Event.target )
-            Event.TgtCategory = Event.TgtDCSUnit:getDesc().category
-            Event.TgtTypeName = Event.TgtDCSUnit:getTypeName()
-          end
+          Event.TgtDCSUnitName = Event.TgtDCSUnit:getName()
+          Event.TgtUnitName = Event.TgtDCSUnitName
+          Event.TgtUnit = SCENERY:Register( Event.TgtDCSUnitName, Event.target )
+          Event.TgtCategory = Event.TgtDCSUnit:getDesc().category
+          Event.TgtTypeName = Event.TgtDCSUnit:getTypeName()
         end
       end
 
       -- Weapon.
-      if Event.weapon and type(Event.weapon) == "table" and Event.weapon.isExist and Event.weapon:isExist() then
+      if Event.weapon then
         Event.Weapon = Event.weapon
-        Event.WeaponName = Event.weapon:isExist() and Event.weapon:getTypeName() or "Unknown Weapon"
+        Event.WeaponName = Event.Weapon:getTypeName()
         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 and Event.Weapon:getCoalition()
-        Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon.getDesc and Event.Weapon:getDesc().category
-        Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon.getTypeName  and Event.Weapon:getTypeName()
+        Event.WeaponCoalition = Event.WeaponUNIT and Event.Weapon:getCoalition()
+        Event.WeaponCategory = Event.WeaponUNIT and Event.Weapon:getDesc().category
+        Event.WeaponTypeName = Event.WeaponUNIT and Event.Weapon:getTypeName()
         --Event.WeaponTgtDCSUnit = Event.Weapon:getTarget()
       end
 
@@ -1520,7 +1378,6 @@ function EVENT:onEvent( Event )
         Event.MarkCoordinate=COORDINATE:NewFromVec3(Event.pos)
         Event.MarkText=Event.text
         Event.MarkCoalition=Event.coalition
-        Event.IniCoalition=Event.coalition
         Event.MarkGroupID = Event.groupID
       end
 
@@ -1529,15 +1386,6 @@ 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.
@@ -249,7 +249,7 @@ do -- FSM
   --
   -- ### Linear Transition Example
   --
-  -- This example is fully implemented in the MOOSE test mission on GitHub: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Core/FSM/FSM-100%20-%20Transition%20Explanation)
+  -- This example is fully implemented in the MOOSE test mission on GITHUB: [FSM-100 - Transition Explanation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/blob/master/FSM%20-%20Finite%20State%20Machine/FSM-100%20-%20Transition%20Explanation/FSM-100%20-%20Transition%20Explanation.lua)
   --
   -- It models a unit standing still near Batumi, and flaring every 5 seconds while switching between a Green flare and a Red flare.
   -- The purpose of this example is not to show how exciting flaring is, but it demonstrates how a Linear Transition FSM can be build.
@@ -948,9 +948,8 @@ do -- FSM
 end
 
 do -- FSM_CONTROLLABLE
-  
-  ---
-  -- @type FSM_CONTROLLABLE
+
+  --- @type FSM_CONTROLLABLE
   -- @field Wrapper.Controllable#CONTROLLABLE Controllable
   -- @extends Core.Fsm#FSM
 
@@ -1082,9 +1081,8 @@ do -- FSM_CONTROLLABLE
 end
 
 do -- FSM_PROCESS
-  
-  ---
-  -- @type FSM_PROCESS
+
+  --- @type FSM_PROCESS
   -- @field Tasking.Task#TASK Task
   -- @extends Core.Fsm#FSM_CONTROLLABLE
 

Moose Development/Moose/Core/Goal.lua

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

Moose Development/Moose/Core/MarkerOps_Base.lua

@@ -17,7 +17,7 @@
 -- ### Author: **Applevangelist**
 -- 
 -- Date: 5 May 2021
--- Last Update: Mar 2023
+-- Last Update: Feb 2023
 -- 
 -- ===
 ---
@@ -50,7 +50,7 @@ MARKEROPS_BASE = {
   ClassName = "MARKEROPS",
   Tag = "mytag",
   Keywords = {},
-  version = "0.1.3",
+  version = "0.1.1",
   debug = false,
   Casesensitive = true,
 }
@@ -108,30 +108,23 @@ function MARKEROPS_BASE:New(Tagname,Keywords,Casesensitive)
    --- On after "MarkAdded" event. Triggered when a Marker is added to the F10 map.
    -- @function [parent=#MARKEROPS_BASE] OnAfterMarkAdded
    -- @param #MARKEROPS_BASE self
-   -- @param #string From The From state.
-   -- @param #string Event The Event called.
-   -- @param #string To The To state.
-   -- @param #string Text The text on the marker.
-   -- @param #table Keywords Table of matching keywords found in the Event text.
+   -- @param #string From The From state
+   -- @param #string Event The Event called
+   -- @param #string To The To state
+   -- @param #string Text The text on the marker
+   -- @param #table Keywords Table of matching keywords found in the Event text
    -- @param Core.Point#COORDINATE Coord Coordinate of the marker.
-   -- @param #number MarkerID Id of this marker.
-   -- @param #number CoalitionNumber Coalition of the marker creator.
-   -- @param #string PlayerName Name of the player creating/changing the mark. nil if it cannot be obtained. 
-   -- @param Core.Event#EVENTDATA EventData the event data table. 
    
    --- On after "MarkChanged" event. Triggered when a Marker is changed on the F10 map.
    -- @function [parent=#MARKEROPS_BASE] OnAfterMarkChanged
    -- @param #MARKEROPS_BASE self
-   -- @param #string From The From state.
-   -- @param #string Event The Event called.
-   -- @param #string To The To state.
-   -- @param #string Text The text on the marker.
-   -- @param #table Keywords Table of matching keywords found in the Event text.
+   -- @param #string From The From state
+   -- @param #string Event The Event called
+   -- @param #string To The To state
+   -- @param #string Text The text on the marker
+   -- @param #table Keywords Table of matching keywords found in the Event text
    -- @param Core.Point#COORDINATE Coord Coordinate of the marker.
-   -- @param #number MarkerID Id of this marker.
-   -- @param #number CoalitionNumber Coalition of the marker creator.
-   -- @param #string PlayerName Name of the player creating/changing the mark. nil if it cannot be obtained. 
-   -- @param Core.Event#EVENTDATA EventData the event data table
+   -- @param #number idx DCS Marker ID
 
    --- On after "MarkDeleted" event. Triggered when a Marker is deleted from the F10 map.
    -- @function [parent=#MARKEROPS_BASE] OnAfterMarkDeleted
@@ -140,7 +133,7 @@ function MARKEROPS_BASE:New(Tagname,Keywords,Casesensitive)
    -- @param #string Event The Event called
    -- @param #string To The To state
    
-   --- "Stop" trigger. Used to stop the function an unhandle events
+      --- "Stop" trigger. Used to stop the function an unhandle events
    -- @function [parent=#MARKEROPS_BASE] Stop
 
 end
@@ -162,30 +155,29 @@ function MARKEROPS_BASE:OnEventMark(Event)
       local text = tostring(Event.text)
       local m = MESSAGE:New(string.format("Mark added at %s with text: %s",coordtext,text),10,"Info",false):ToAll()
     end
-    local coalition = Event.MarkCoalition
     -- decision
     if Event.id==world.event.S_EVENT_MARK_ADDED then
-      self:T({event="S_EVENT_MARK_ADDED", carrier=Event.IniGroupName, vec3=Event.pos})
+      self:T({event="S_EVENT_MARK_ADDED", carrier=self.groupname, vec3=Event.pos})
       -- Handle event
       local Eventtext = tostring(Event.text)
       if Eventtext~=nil then
         if self:_MatchTag(Eventtext) then
          local matchtable = self:_MatchKeywords(Eventtext)
-         self:MarkAdded(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
+         self:MarkAdded(Eventtext,matchtable,coord)
         end
       end
     elseif Event.id==world.event.S_EVENT_MARK_CHANGE then
-      self:T({event="S_EVENT_MARK_CHANGE", carrier=Event.IniGroupName, vec3=Event.pos})
+      self:T({event="S_EVENT_MARK_CHANGE", carrier=self.groupname, vec3=Event.pos})
       -- Handle event.
       local Eventtext = tostring(Event.text)
       if Eventtext~=nil then
         if self:_MatchTag(Eventtext) then
          local matchtable = self:_MatchKeywords(Eventtext)
-         self:MarkChanged(Eventtext,matchtable,coord,Event.idx,coalition,Event.PlayerName,Event)
+         self:MarkChanged(Eventtext,matchtable,coord,Event.idx)
         end
       end
     elseif Event.id==world.event.S_EVENT_MARK_REMOVED then
-      self:T({event="S_EVENT_MARK_REMOVED", carrier=Event.IniGroupName, vec3=Event.pos})
+      self:T({event="S_EVENT_MARK_REMOVED", carrier=self.groupname, vec3=Event.pos})
       -- Hande event.
       local Eventtext = tostring(Event.text)
       if Eventtext~=nil then
@@ -238,10 +230,8 @@ end
  -- @param #string To The To state
  -- @param #string Text The text on the marker
  -- @param #table Keywords Table of matching keywords found in the Event text
- -- @param #number MarkerID Id of this marker
- -- @param #number CoalitionNumber Coalition of the marker creator
  -- @param Core.Point#COORDINATE Coord Coordinate of the marker.
-function MARKEROPS_BASE:onbeforeMarkAdded(From,Event,To,Text,Keywords,Coord,MarkerID,CoalitionNumber)
+function MARKEROPS_BASE:onbeforeMarkAdded(From,Event,To,Text,Keywords,Coord)
   self:T({self.lid,From,Event,To,Text,Keywords,Coord:ToStringLLDDM()})
 end
 
@@ -252,10 +242,8 @@ end
  -- @param #string To The To state
  -- @param #string Text The text on the marker
  -- @param #table Keywords Table of matching keywords found in the Event text
- -- @param #number MarkerID Id of this marker
- -- @param #number CoalitionNumber Coalition of the marker creator
  -- @param Core.Point#COORDINATE Coord Coordinate of the marker.
-function MARKEROPS_BASE:onbeforeMarkChanged(From,Event,To,Text,Keywords,Coord,MarkerID,CoalitionNumber)
+function MARKEROPS_BASE:onbeforeMarkChanged(From,Event,To,Text,Keywords,Coord)
   self:T({self.lid,From,Event,To,Text,Keywords,Coord:ToStringLLDDM()})
 end
 

Moose Development/Moose/Core/Message.lua

@@ -75,37 +75,35 @@ MESSAGE.Type = {
 
 --- Creates a new MESSAGE object. Note that these MESSAGE objects are not yet displayed on the display panel. You must use the functions @{#MESSAGE.ToClient} or @{#MESSAGE.ToCoalition} or @{#MESSAGE.ToAll} to send these Messages to the respective recipients.
 -- @param self
--- @param #string Text is the text of the Message.
--- @param #number Duration Duration in seconds how long the message text is shown.
--- @param #string Category (Optional) String expressing the "category" of the Message. The category will be shown as the first text in the message followed by a ": ".
+-- @param #string MessageText is the text of the Message.
+-- @param #number MessageDuration is a number in seconds of how long the MESSAGE should be shown on the display panel.
+-- @param #string MessageCategory (optional) is a string expressing the "category" of the Message. The category will be shown as the first text in the message followed by a ": ".
 -- @param #boolean ClearScreen (optional) Clear all previous messages if true.
--- @return #MESSAGE self
+-- @return #MESSAGE
 -- @usage
 --
---   -- Create a series of new Messages.
---   -- MessageAll is meant to be sent to all players, for 25 seconds, and is classified as "Score".
---   -- MessageRED is meant to be sent to the RED players only, for 10 seconds, and is classified as "End of Mission", with ID "Win".
---   -- MessageClient1 is meant to be sent to a Client, for 25 seconds, and is classified as "Score", with ID "Score".
---   -- MessageClient1 is meant to be sent to a Client, for 25 seconds, and is classified as "Score", with ID "Score".
+--    -- Create a series of new Messages.
+--    -- MessageAll is meant to be sent to all players, for 25 seconds, and is classified as "Score".
+--    -- MessageRED is meant to be sent to the RED players only, for 10 seconds, and is classified as "End of Mission", with ID "Win".
+--    -- MessageClient1 is meant to be sent to a Client, for 25 seconds, and is classified as "Score", with ID "Score".
+--    -- MessageClient1 is meant to be sent to a Client, for 25 seconds, and is classified as "Score", with ID "Score".
 --   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!",  25, "End of Mission" )
 --   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty" )
 --   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target",  25, "Score" )
 --   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score")
 --
-function MESSAGE:New( Text, Duration, Category, ClearScreen )
-
+function MESSAGE:New( MessageText, MessageDuration, MessageCategory, ClearScreen )
   local self = BASE:Inherit( self, BASE:New() )
-  
-  self:F( { Text, Duration, Category } )
+  self:F( { MessageText, MessageDuration, MessageCategory } )
 
   self.MessageType = nil
 
   -- When no MessageCategory is given, we don't show it as a title... 
-  if Category and Category ~= "" then
-    if Category:sub( -1 ) ~= "\n" then
-      self.MessageCategory = Category .. ": "
+  if MessageCategory and MessageCategory ~= "" then
+    if MessageCategory:sub( -1 ) ~= "\n" then
+      self.MessageCategory = MessageCategory .. ": "
     else
-      self.MessageCategory = Category:sub( 1, -2 ) .. ":\n"
+      self.MessageCategory = MessageCategory:sub( 1, -2 ) .. ":\n"
     end
   else
     self.MessageCategory = ""
@@ -116,9 +114,9 @@ function MESSAGE:New( Text, Duration, Category, ClearScreen )
     self.ClearScreen = ClearScreen
   end
 
-  self.MessageDuration = Duration or 5
+  self.MessageDuration = MessageDuration or 5
   self.MessageTime = timer.getTime()
-  self.MessageText = Text:gsub( "^\n", "", 1 ):gsub( "\n$", "", 1 )
+  self.MessageText = MessageText:gsub( "^\n", "", 1 ):gsub( "\n$", "", 1 )
 
   self.MessageSent = false
   self.MessageGroup = false
@@ -179,22 +177,40 @@ 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.
---   Client = CLIENT:FindByName("NameOfClientUnit")
+--   ClientGroup = Group.getByName( "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", 25, "Score" ):ToClient( Client )
+--   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25, "Score" ):ToClient( ClientGroup )
+--   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25, "Score" ):ToClient( ClientGroup )
 --   or
---   MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score"):ToClient( Client )
---   MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score"):ToClient( Client )
+--   MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25 ):ToClient( ClientGroup )
+--   MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25 ):ToClient( ClientGroup )
 --   or
---   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score")
---   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score")
---   MessageClient1:ToClient( Client )
---   MessageClient2:ToClient( Client )
+--   MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", "Score", 25 )
+--   MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", "Score", 25 )
+--   MessageClient1:ToClient( ClientGroup )
+--   MessageClient2:ToClient( ClientGroup )
 --
 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
 
@@ -241,7 +257,6 @@ 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
@@ -290,11 +305,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", 25, "Penalty"):ToBlue()
+--   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25):ToBlue()
 --   or
---   MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToBlue()
+--   MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToBlue()
 --   or
---   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
+--   MessageBLUE = MESSAGE:New( "To the BLUE Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
 --   MessageBLUE:ToBlue()
 --
 function MESSAGE:ToBlue()
@@ -311,11 +326,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", 25, "Penalty"):ToRed()
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToRed()
 --   or
---   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty"):ToRed()
+--   MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 ):ToRed()
 --   or
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
 --   MessageRED:ToRed()
 --
 function MESSAGE:ToRed()
@@ -334,11 +349,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", 25, "Penalty"):ToCoalition( coalition.side.RED )
+--   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 )
 --   or
---   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 )
+--   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 )
 --   or
---   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", 25, "Penalty")
+--   MessageRED = MESSAGE:New( "To the RED Players: You receive a penalty because you've killed one of your own units", "Penalty", 25 )
 --   MessageRED:ToCoalition( coalition.side.RED )
 --
 function MESSAGE:ToCoalition( CoalitionSide, Settings )
@@ -353,7 +368,7 @@ function MESSAGE:ToCoalition( CoalitionSide, Settings )
   if CoalitionSide then
     if self.MessageDuration ~= 0 then
       self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
-      trigger.action.outTextForCoalition( CoalitionSide, self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
+      trigger.action.outTextForCoalition( CoalitionSide, self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
     end
   end
   
@@ -380,36 +395,29 @@ end
 --- Sends a MESSAGE to all players. 
 -- @param #MESSAGE self
 -- @param Core.Settings#Settings Settings (Optional) Settings for message display.
--- @param #number Delay (Optional) Delay in seconds before the message is send. Default instantly (`nil`).
--- @return #MESSAGE self
+-- @return #MESSAGE
 -- @usage
 --
 --   -- Send a message created to all players.
---   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission"):ToAll()
+--   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
 --   or
---   MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission"):ToAll()
+--   MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 ):ToAll()
 --   or
---   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", 25, "End of Mission")
+--   MessageAll = MESSAGE:New( "To all Players: BLUE has won! Each player of BLUE wins 50 points!", "End of Mission", 25 )
 --   MessageAll:ToAll()
 --
-function MESSAGE:ToAll( Settings, Delay )
+function MESSAGE:ToAll( Settings )
   self:F()
 
-  if Delay and Delay>0 then
-    self:ScheduleOnce(Delay, MESSAGE.ToAll, self, Settings, 0)
-  else
+  if self.MessageType then
+    local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
+    self.MessageDuration = Settings:GetMessageTime( self.MessageType )
+    self.MessageCategory = "" -- self.MessageType .. ": "
+  end
 
-    if self.MessageType then
-      local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
-      self.MessageDuration = Settings:GetMessageTime( self.MessageType )
-      self.MessageCategory = "" -- self.MessageType .. ": "
-    end
-  
-    if self.MessageDuration ~= 0 then
-      self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
-      trigger.action.outText( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
-    end
-    
+  if self.MessageDuration ~= 0 then
+    self:T( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ) .. " / " .. self.MessageDuration )
+    trigger.action.outText( self.MessageCategory .. self.MessageText:gsub( "\n$", "" ):gsub( "\n$", "" ), self.MessageDuration, self.ClearScreen )
   end
 
   return self
@@ -451,20 +459,19 @@ end
 
 _MESSAGESRS = {}
 
---- Set up MESSAGE generally to allow Text-To-Speech via SRS and TTS functions. `SetMSRS()` will try to use as many attributes configured with @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
--- @param #string PathToSRS (optional) Path to SRS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone" or your configuration file setting.
--- @param #number Port Port (optional) number of SRS, defaults to 5002 or your configuration file setting.
--- @param #string PathToCredentials (optional) Path to credentials file for Google.
+--- Set up MESSAGE generally to allow Text-To-Speech via SRS and TTS functions.
+-- @param #string PathToSRS Path to SRS Folder, defaults to "C:\\\\Program Files\\\\DCS-SimpleRadio-Standalone".
+-- @param #number Port Port number of SRS, defaults to 5002.
+-- @param #string PathToCredentials (optional) Path to credentials file for e.g. Google.
 -- @param #number Frequency Frequency in MHz. Can also be given as a #table of frequencies.
 -- @param #number Modulation Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations.
--- @param #string Gender (optional) Gender, i.e. "male" or "female", defaults to "female" or your configuration file setting.
--- @param #string Culture (optional) Culture, e.g. "en-US", defaults to "en-GB" or your configuration file setting.
+-- @param #string Gender (optional) Gender, i.e. "male" or "female", defaults to "female".
+-- @param #string Culture (optional) Culture, e.g. "en-US", defaults to "en-GB"
 -- @param #string Voice (optional) Voice. Will override gender and culture settings, e.g. MSRS.Voices.Microsoft.Hazel or MSRS.Voices.Google.Standard.de_DE_Standard_D. Hint on Microsoft voices - working voices are limited to Hedda, Hazel, David, Zira and Hortense. **Must** be installed on your Desktop or Server!
 -- @param #number Coalition (optional) Coalition, can be coalition.side.RED, coalition.side.BLUE or coalition.side.NEUTRAL. Defaults to coalition.side.NEUTRAL.
 -- @param #number Volume (optional) Volume, can be between 0.0 and 1.0 (loudest).
 -- @param #string Label (optional) Label, defaults to "MESSAGE" or the Message Category set.
 -- @param Core.Point#COORDINATE Coordinate (optional) Coordinate this messages originates from.
--- @param #string Backend (optional) Backend to be used, can be MSRS.Backend.SRSEXE or MSRS.Backend.GRPC
 -- @usage
 --          -- Mind the dot here, not using the colon this time around!
 --          -- Needed once only
@@ -472,56 +479,46 @@ _MESSAGESRS = {}
 --          -- later on in your code
 --          MESSAGE:New("Test message!",15,"SPAWN"):ToSRS()
 --          
-function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate,Backend)
+function MESSAGE.SetMSRS(PathToSRS,Port,PathToCredentials,Frequency,Modulation,Gender,Culture,Voice,Coalition,Volume,Label,Coordinate)
+  _MESSAGESRS.MSRS = MSRS:New(PathToSRS,Frequency or 243,Modulation or radio.modulation.AM,Volume)
   
-  _MESSAGESRS.PathToSRS = PathToSRS or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+  _MESSAGESRS.frequency = Frequency
+  _MESSAGESRS.modulation = Modulation or radio.modulation.AM
   
-  _MESSAGESRS.frequency = Frequency or MSRS.frequencies or 243
-  _MESSAGESRS.modulation = Modulation or MSRS.modulations or radio.modulation.AM
+  _MESSAGESRS.MSRS:SetCoalition(Coalition or coalition.side.NEUTRAL)
+  _MESSAGESRS.coalition = Coalition or coalition.side.NEUTRAL
   
-  _MESSAGESRS.MSRS = MSRS:New(_MESSAGESRS.PathToSRS,_MESSAGESRS.frequency, _MESSAGESRS.modulation)
-
-  _MESSAGESRS.coalition = Coalition or MSRS.coalition or coalition.side.NEUTRAL    
-  _MESSAGESRS.MSRS:SetCoalition(_MESSAGESRS.coalition)
-
   _MESSAGESRS.coordinate = Coordinate
+  _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
   
-  if Coordinate then
-    _MESSAGESRS.MSRS:SetCoordinate(Coordinate)
-  end
-  
-  if Backend then
-   _MESSAGESRS.MSRS:SetBackend(Backend)
-  end
-  
-  _MESSAGESRS.Culture = Culture or MSRS.culture or "en-GB"
   _MESSAGESRS.MSRS:SetCulture(Culture)
+  _MESSAGESRS.Culture = Culture or "en-GB"
 
-  _MESSAGESRS.Gender = Gender or MSRS.gender or "female"
   _MESSAGESRS.MSRS:SetGender(Gender)
+  _MESSAGESRS.Gender = Gender or "female"
 
-  if PathToCredentials then
-    _MESSAGESRS.MSRS:SetProviderOptionsGoogle(PathToCredentials)
-    _MESSAGESRS.MSRS:SetProvider(MSRS.Provider.GOOGLE)
-  end
+  _MESSAGESRS.MSRS:SetGoogle(PathToCredentials)
+  _MESSAGESRS.google = PathToCredentials
+
+  _MESSAGESRS.MSRS:SetLabel(Label or "MESSAGE")
+  _MESSAGESRS.label = Label or "MESSAGE"
+
+  _MESSAGESRS.MSRS:SetPort(Port or 5002)
+  _MESSAGESRS.port = Port or 5002
   
-  _MESSAGESRS.label = Label or MSRS.Label or "MESSAGE"
-  _MESSAGESRS.MSRS:SetLabel(_MESSAGESRS.label)
-
-  _MESSAGESRS.port = Port or MSRS.port or 5002
-  _MESSAGESRS.MSRS:SetPort(_MESSAGESRS.port)
-
-  _MESSAGESRS.volume = Volume or MSRS.volume or 1
+  _MESSAGESRS.volume = Volume or 1
   _MESSAGESRS.MSRS:SetVolume(_MESSAGESRS.volume)
   
   if Voice then _MESSAGESRS.MSRS:SetVoice(Voice) end
   
-  _MESSAGESRS.voice = Voice or MSRS.voice --or MSRS.Voices.Microsoft.Hedda
+  _MESSAGESRS.voice = Voice --or MSRS.Voices.Microsoft.Hedda
+  --if _MESSAGESRS.google and not Voice then _MESSAGESRS.Voice = MSRS.Voices.Google.Standard.en_GB_Standard_A end
+  --_MESSAGESRS.MSRS:SetVoice(Voice or _MESSAGESRS.voice)
   
-  _MESSAGESRS.SRSQ = MSRSQUEUE:New(_MESSAGESRS.label)
+  _MESSAGESRS.SRSQ = MSRSQUEUE:New(Label or "MESSAGE")
 end
 
---- Sends a message via SRS. `ToSRS()` will try to use as many attributes configured with @{Core.Message#MESSAGE.SetMSRS}() and @{Sound.SRS#MSRS.LoadConfigFile}() as possible.
+--- Sends a message via SRS.
 -- @param #MESSAGE self
 -- @param #number frequency (optional) Frequency in MHz. Can also be given as a #table of frequencies. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
 -- @param #number modulation (optional) Modulation, i.e. radio.modulation.AM  or radio.modulation.FM. Can also be given as a #table of modulations. Only needed if you want to override defaults set with `MESSAGE.SetMSRS()` for this one setting.
@@ -549,7 +546,7 @@ function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volum
         _MESSAGESRS.MSRS:SetCoordinate(coordinate)  
       end
       local category = string.gsub(self.MessageCategory,":","")
-      _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,0.5,1,nil,nil,nil,frequency or _MESSAGESRS.frequency,modulation or _MESSAGESRS.modulation, gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,nil,volume or _MESSAGESRS.volume,category,coordinate or _MESSAGESRS.coordinate)
+      _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency or _MESSAGESRS.frequency,modulation or _MESSAGESRS.modulation, gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,nil,volume or _MESSAGESRS.volume,category,coordinate or _MESSAGESRS.coordinate)
   end
   return self
 end

Moose Development/Moose/Core/Pathline.lua

@@ -5,13 +5,11 @@
 --    * Path from A to B
 --    * Arbitrary number of points
 --    * Automatically from lines drawtool
---    * Draw line or mark points on F10 map
---    * Find closest points to path
 --
 -- ===
 --
 -- ### Author: **funkyfranky**
---
+-- 
 -- ===
 -- @module Core.Pathline
 -- @image CORE_Pathline.png
@@ -23,7 +21,6 @@
 -- @field #string lid Class id string for output to DCS log file.
 -- @field #string name Name of the path line.
 -- @field #table points List of 3D points defining the path.
--- @field #number counter Running number counting the point IDs.
 -- @extends Core.Base#BASE
 
 --- *The shortest distance between two points is a straight line.* -- Archimedes
@@ -31,30 +28,30 @@
 -- ===
 --
 -- # The PATHLINE Concept
---
+-- 
 -- List of points defining a path from A to B. The pathline can consist of multiple points. Each point holds the information of its position, the surface type, the land height
 -- and the water depth (if over sea).
---
+-- 
 -- Line drawings created in the mission editor are automatically registered as pathlines and stored in the MOOSE database.
 -- They can be accessed with the @{#PATHLINE.FindByName) function.
---
+-- 
 -- # Constructor
---
+-- 
 -- The @{PATHLINE.New) function creates a new PATHLINE object. This does not hold any points. Points can be added with the @{#PATHLINE.AddPointFromVec2} and @{#PATHLINE.AddPointFromVec3}
---
+-- 
 -- For a given table of 2D or 3D positions, a new PATHLINE object can be created with the @{#PATHLINE.NewFromVec2Array} or @{#PATHLINE.NewFromVec3Array}, respectively.
---
+-- 
 -- # Line Drawings
---
+-- 
 -- The most convenient way to create a pathline is the draw panel feature in the DCS mission editor. You can select "Line" and then "Segments", "Segment" or "Free" to draw your lines.
 -- These line drawings are then automatically added to the MOOSE database as PATHLINE objects and can be retrieved with the @{#PATHLINE.FindByName) function, where the name is the one
 -- you specify in the draw panel.
---
+-- 
 -- # Mark on F10 map
---
--- The ponints of the PATHLINE can be marked on the F10 map with the @{#PATHLINE.MarkPoints}(`true`) function. The mark points contain information of the surface type, land height and
+-- 
+-- The ponints of the PATHLINE can be marked on the F10 map with the @{#PATHLINE.MarkPoints}(`true`) function. The mark points contain information of the surface type, land height and 
 -- water depth.
---
+-- 
 -- To remove the marks, use @{#PATHLINE.MarkPoints}(`false`).
 --
 -- @field #PATHLINE
@@ -62,39 +59,27 @@ PATHLINE = {
   ClassName      = "PATHLINE",
   lid            =   nil,
   points         =    {},
-  counter        =     0,
 }
 
 --- Point of line.
 -- @type PATHLINE.Point
--- @field #number uid Unique ID of this point.
--- @field #string mother Name of the pathline this point belongs to.
--- @field #string name Name of this point.
 -- @field DCS#Vec3 vec3 3D position.
 -- @field DCS#Vec2 vec2 2D position.
 -- @field #number surfaceType Surface type.
 -- @field #number landHeight Land height in meters.
 -- @field #number depth Water depth in meters.
 -- @field #number markerID Marker ID.
--- @field #number lineID Marker of pathline ID.
-
---- Segment of line.
--- @type PATHLINE.Segment
--- @field #PATHLINE.Point p1 First point.
--- @field #PATHLINE.Point p2 Second point.
 
 
 --- PATHLINE class version.
 -- @field #string version
-PATHLINE.version="0.3.0"
+PATHLINE.version="0.1.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
--- TODO: Read/write to JSON file
--- TODO: Translate/rotate pathline
--- TODO: Add color.
+-- TODO: A lot...
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Constructor
@@ -108,10 +93,10 @@ function PATHLINE:New(Name)
 
   -- Inherit everything from INTEL class.
   local self=BASE:Inherit(self, BASE:New()) --#PATHLINE
-
+  
   self.name=Name or "Unknown Path"
 
-  self.lid=string.format("PATHLINE %s | ", self.name)
+  self.lid=string.format("PATHLINE %s | ", Name)
 
   return self
 end
@@ -166,70 +151,41 @@ end
 --- Add a point to the path from a given 2D position. The third dimension is determined from the land height.
 -- @param #PATHLINE self
 -- @param DCS#Vec2 Vec2 The 2D vector (x,y) to add.
--- @param #number Index Index to add this point, *e.g.* 1 for first point or 2 for second point. Default is at the end.
--- @param #PATHLINE.Point Point Add point after given point. Default is at the end or at given index.
 -- @return #PATHLINE self
-function PATHLINE:AddPointFromVec2(Vec2, Index, Point)
+function PATHLINE:AddPointFromVec2(Vec2)
 
   if Vec2 then
-
-    -- Create a new point.
+  
     local point=self:_CreatePoint(Vec2)
 
-    if Index then
-      -- Add at given index.
-      table.insert(self.points, Index, point)
-    else
-      if Point then
-        -- Get index of given point.
-        local i=self:_GetPointIndex(Point)
-        -- Add new point after given point.
-        table.insert(self.points, i+1, point)
-      else
-        -- Add add the end.
-        table.insert(self.points, point)
-      end
-    end
+    table.insert(self.points, point)
+    
   end
-
+  
   return self
 end
 
 --- Add a point to the path from a given 3D position.
 -- @param #PATHLINE self
 -- @param DCS#Vec3 Vec3 The 3D vector (x,y) to add.
--- @param #number Index Index to add this point, *e.g.* 1 for first point or 2 for second point. Default is at the end.
--- @param #PATHLINE.Point Point Add point after given point. Default is at the end or at given index.
--- @return #PATHLINE.Point Point that was added.
-function PATHLINE:AddPointFromVec3(Vec3, Index, Point)
+-- @return #PATHLINE self
+function PATHLINE:AddPointFromVec3(Vec3)
 
   if Vec3 then
-
+  
     local point=self:_CreatePoint(Vec3)
 
-    if Index then
-      -- Add add given index.
-      table.insert(self.points, Index, point)
-    else
-      if Point then
-        local i=self:_GetPointIndex(Point)
-        table.insert(self.points, i+1, point)
-      else
-        -- Add add the end.
-        table.insert(self.points, point)
-      end
-    end
-
-    return point
+    table.insert(self.points, point)
+    
   end
-
-  return nil
+  
+  return self
 end
 
 --- Get name of pathline.
 -- @param #PATHLINE self
 -- @return #string Name of the pathline.
-function PATHLINE:GetName()
+function PATHLINE:GetName()  
   return self.name
 end
 
@@ -243,35 +199,18 @@ end
 
 --- Get points of pathline. Not that points are tables, that contain more information as just the 2D or 3D position but also the surface type etc.
 -- @param #PATHLINE self
--- @return #list <Core.Pathline#PATHLINE.Point> List of points.
-function PATHLINE:GetPoints()
+-- @return #list <#PATHLINE.Point> List of points.
+function PATHLINE:GetPoints()  
   return self.points
 end
 
---- Get segments of pathline.
--- @param #PATHLINE self
--- @return #list <Core.Pathline#PATHLINE.Segment> List of points.
-function PATHLINE:GetSetments()
-
-  local segments={}
-
-  for i=1,#self.points-1 do
-    local segment={} --#PATHLINE.Segment
-    segment.p1=self.points[i]
-    segment.p2=self.points[i+1]
-    table.insert(segments, segment)
-  end
-
-  return segments
-end
-
 --- Get 3D points of pathline.
 -- @param #PATHLINE self
--- @return #list <DCS#Vec3> List of DCS#Vec3 points.
+-- @return <DCS#Vec3> List of DCS#Vec3 points.
 function PATHLINE:GetPoints3D()
 
   local vecs={}
-
+  
   for _,_point in pairs(self.points) do
     local point=_point --#PATHLINE.Point
     table.insert(vecs, point.vec3)
@@ -282,11 +221,11 @@ end
 
 --- Get 2D points of pathline.
 -- @param #PATHLINE self
--- @return #list <DCS#Vec2> List of DCS#Vec2 points.
+-- @return <DCS#Vec2> List of DCS#Vec2 points.
 function PATHLINE:GetPoints2D()
 
   local vecs={}
-
+  
   for _,_point in pairs(self.points) do
     local point=_point --#PATHLINE.Point
     table.insert(vecs, point.vec2)
@@ -298,14 +237,13 @@ end
 --- Get COORDINATES of pathline. Note that COORDINATE objects are created when calling this function. That does involve deep copy calls and can have an impact on performance if done too often.
 -- @param #PATHLINE self
 -- @return <Core.Point#COORDINATE> List of COORDINATES points.
-function PATHLINE:GetCoordinates()
+function PATHLINE:GetCoordinats()
 
   local vecs={}
-
+  
   for _,_point in pairs(self.points) do
     local point=_point --#PATHLINE.Point
     local coord=COORDINATE:NewFromVec3(point.vec3)
-    table.insert(vecs, coord)
   end
 
   return vecs
@@ -318,13 +256,13 @@ end
 function PATHLINE:GetPointFromIndex(n)
 
   local N=self:GetNumberOfPoints()
-
+  
   n=n or 1
 
   local point=nil --#PATHLINE.Point
-
+  
   if n>=1 and n<=N then
-    point=self.points[n]
+    point=self.point[n]
   else
     self:E(self.lid..string.format("ERROR: No point in pathline for N=%s", tostring(n)))
   end
@@ -339,11 +277,11 @@ end
 function PATHLINE:GetPoint3DFromIndex(n)
 
   local point=self:GetPointFromIndex(n)
-
+  
   if point then
     return point.vec3
   end
-
+  
   return nil
 end
 
@@ -354,11 +292,11 @@ end
 function PATHLINE:GetPoint2DFromIndex(n)
 
   local point=self:GetPointFromIndex(n)
-
+  
   if point then
     return point.vec2
   end
-
+  
   return nil
 end
 
@@ -366,314 +304,33 @@ end
 --- Mark points on F10 map.
 -- @param #PATHLINE self
 -- @param #boolean Switch If `true` or nil, set marks. If `false`, remove marks.
--- @return #PATHLINE self
+-- @return <DCS#Vec3> List of DCS#Vec3 points.
 function PATHLINE:MarkPoints(Switch)
-
   for i,_point in pairs(self.points) do
     local point=_point --#PATHLINE.Point
-
     if Switch==false then
-
+      
       if point.markerID then
-        UTILS.RemoveMark(point.markerID)
+        UTILS.RemoveMark(point.markerID, Delay)
       end
-
+      
     else
-
+    
       if point.markerID then
         UTILS.RemoveMark(point.markerID)
       end
-
+    
       point.markerID=UTILS.GetMarkID()
-
-      local text=string.format("Pathline %s: Point #%d [UID=%d]\nSurface Type=%d\nHeight=%.1f m\nDepth=%.1f m", self.name, i, point.uid, point.surfaceType, point.landHeight, point.depth)
-
+      
+      local text=string.format("Pathline %s: Point #%d\nSurface Type=%d\nHeight=%.1f m\nDepth=%.1f m", self.name, i, point.surfaceType, point.landHeight, point.depth)
+      
       trigger.action.markToAll(point.markerID, text, point.vec3, "")
-
+    
     end
   end
-
-  return self
 end
 
 
---- Draw line on F10 map.
--- @param #PATHLINE self
--- @param #boolean Switch If `true` or nil, draw pathline. If `false`, remove drawing.
--- @param #number Coalition Coalition side. Default -1 for all.
--- @param #table Color RGB color and alpha `{r, g, b, a}`. Default {0, 1, 0, 0.5}.
--- @param #number LineType Line type. Default 1=solid.
--- @return #PATHLINE self
-function PATHLINE:Draw(Switch, Coalition, Color, LineType)
-
-  Coalition=Coalition or -1
-  Color=Color or {0, 1, 0, 0.5}
-  LineType=LineType or 1
-
-  if Switch==false then
-
-    for i,_point in pairs(self.points) do
-      local point=_point --#PATHLINE.Point
-
-      if point.lineID then
-        UTILS.RemoveMark(point.lineID)
-      end
-
-    end
-
-  else
-
-    for i=2,#self.points do
-
-      local p1=self.points[i-1] --#PATHLINE.Point
-      local p2=self.points[i]   --#PATHLINE.Point
-
-      if p2.lineID then
-        UTILS.RemoveMark(p2.lineID)
-      end
-
-      p2.lineID=UTILS.GetMarkID()
-
-      trigger.action.lineToAll(Coalition, p2.lineID, p1.vec3, p2.vec3, Color, LineType)
-
-    end
-
-  end
-
-  return self
-end
-
---- Get the closest point on the pathline for a given reference point.
--- @param #PATHLINE self
--- @param DCS#Vec2 Vec2 Reference Point in 2D.
--- @return DCS#Vec2 Cloest point on pathline.
--- @return #number Distance from closest point to ref point in meters.
--- @return #PATHLINE.Segment Closest segment of ref point.
-function PATHLINE:GetClosestPoint2D(Vec2)
-
-  local P=nil --DCS#Vec2
-  local D=math.huge
-  local S={} --#PATHLINE.Segment
-
-  for i=2,#self.points do
-
-    local A=self.points[i-1] --#PATHLINE.Point
-    local B=self.points[i]   --#PATHLINE.Point
-
-    local a=A.vec2
-    local b=B.vec2
-
-    local ab=UTILS.Vec2Substract(b, a)
-    local ap=UTILS.Vec2Substract(Vec2, a)
-
-    local proj=UTILS.Vec2Dot(ap, ab)
-
-    local lab=UTILS.Vec2Norm(ab)
-
-    local f=proj/lab/lab
-
-    -- Debug info.
-    local text=string.format("FF Proj=%.1f, |ab|=%.1f, f=%.1f", proj, lab, f)
-    self:T(self.lid..text)
-
-    -- Cases for finite segment.
-    local p=nil --DCS#Vec2
-    if f<0 then
-      p=a
-    elseif f>1 then
-      p=b
-    else
-      local r=UTILS.Vec2Mult(ab, f)
-      p=UTILS.Vec2Add(a, r)
-    end
-
-    -- Distance.
-    local d=UTILS.VecDist2D(p, Vec2)
-
-    if d<=D then
-      D=d
-      P=p
-      S.p1=A
-      S.p2=B
-    end
-
-  end
-
-  return P, D, S
-end
-
---- Get the closest point on the pathline for a given reference point.
--- This point does not necessarily is a node of the pathline. In general it will be somewhere in between the nodes defining the pathline.
--- @param #PATHLINE self
--- @param DCS#Vec3 Vec3 Reference Point in 3D. Can also be a `COORDINATE`.
--- @return DCS#Vec3 Closest point on pathline.
--- @return #number Distance from closest point to ref point in meters.
--- @return #PATHLINE.Segment Closest segment of ref point.
-function PATHLINE:GetClosestPoint3D(Vec3)
-
-  local P=nil --DCS#Vec3
-  local D=math.huge
-  local S={} --#PATHLINE.Segment
-
-  if not Vec3 then
-    self:E(self.lid.."ERROR: input Vec3 is nil!")
-    return nil, nil, nil
-  end
-
-  for i=2,#self.points do
-
-    local A=self.points[i-1] --#PATHLINE.Point
-    local B=self.points[i]   --#PATHLINE.Point
-
-    local a=A.vec3
-    local b=B.vec3
-
-    local ab=UTILS.VecSubstract(b, a)
-    local ap=UTILS.VecSubstract(Vec3, a)
-
-    local proj=UTILS.VecDot(ap, ab)
-
-    local lab=UTILS.VecNorm(ab)
-
-    local f=proj/lab/lab
-
-    -- Debug info.
-    self:T(self.lid..string.format("Proj=%.1f, |ab|=%.1f, f=%.1f", proj, lab, f))
-
-    -- Cases for finite segment.
-    local p=nil --DCS#Vec2
-    if f<0 then
-      p=a
-    elseif f>1 then
-      p=b
-    else
-      local r=UTILS.VecMult(ab, f)
-      p=UTILS.VecAdd(a, r)
-    end
-
-    -- Distance.
-    local d=UTILS.VecDist3D(p, Vec3)
-
-    if d<=D then
-      D=d
-      P=p
-      S.p1=A
-      S.p2=B
-    end
-
-  end
-
-  return P, D, S
-end
-
-
---- Write PATHLINE to JSON file.
--- **NOTE**: Requires `io` and `lfs` to be de-sanitized!
--- @param #PATHLINE self
--- @param #string FileName Name of the file. Default is the name of the pathline.
--- @return #PATHLINE self
-function PATHLINE:WriteJSON(FileName)
-
-  if io and lfs then
-
-    -- JSON script.
-    local json=loadfile("Scripts\\JSON.lua")()
-
-    local data={}
-
-    -- We store the name and the points.
-    data.name=self.name
-    data.points=self.points
-    for i,_point in pairs(self.points) do
-      local point=_point --#PATHLINE.Point
-      --point.markerID=nil
-    end
-
-    -- Encode data to raw JSON. Encode converts a lua table into JSON string that can be written to file.
-    local raw_json=json:encode(data)
-
-    -- Debug data.
-    self:T(data)
-
-    -- Write in "User/Saved Games/" Folder.
-    local filepath=lfs.writedir() .. FileName
-
-    -- Open file for writing.
-    local f = io.open(filepath, "wb")
-    if f then
-      f:write(raw_json)
-      f:close()
-      self:T(self.lid .. string.format("Saving PATHLINE %s file %s", self.name, tostring(filepath)))
-    else
-      self:E(self.lid .. string.format( "ERROR: Could not save PATHLINE to file %s", tostring(filepath)))
-    end
-
-  else
-    self:E(self.lid .. string.format( "ERROR: Could not save results because IO and/or LFS are not de-sanitized!"))
-  end
-
-end
-
---- Read PATHLINE from JSON file.
--- **NOTE**: Requires `io` and `lfs` to be de-sanitized!
--- @param #PATHLINE self
--- @param #string FileName Name of the file.
--- @return #PATHLINE self
-function PATHLINE:NewFromJSON(FileName)
-
-  if io and lfs then
-
-    -- JSON script.
-    local json=loadfile("Scripts\\JSON.lua")()
-
-    local data={}
-
-    -- Write in "User/Saved Games/" Folder.
-    local filepath=lfs.writedir() .. FileName
-
-    --env.info(filepath)
-
-    -- Open file in binary mode for reading.
-    local f = io.open(filepath, "rb")
-    if f then
-      data = f:read("*all")
-      f:close()
-    else
-      env.info(string.format("WARNING: Could not load PATHLINE from file %s!", tostring(filepath)))
-      return nil
-    end
-
-    -- Decode JSON data to get a lua table.
-    local data=json:decode(data)
-
-    if data and data.name then
-
-      -- Create a new pathline instance.
-      local self=PATHLINE:New(data.name)
-
-      for i=1,#data.points do
-        local point=data.points[i] --#PATHLINE.Point
-
-        -- Create new point from data.
-        local p=self:AddPointFromVec3(point.vec3)
-
-        -- Set name.
-        p.name=point.name
-
-        -- Remove marker ID.
-        p.markerID=nil
-      end
-
-      return self
-    else
-      BASE:E("ERROR: Cannot find pathline name in data from JSON file. File may be corrupted!")
-    end
-  else
-    BASE:E("ERROR: IO and/or LFS not de-sanitized! Cannot read file.")
-  end
-
-end
-
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Private functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -681,57 +338,33 @@ end
 --- Get 3D points of pathline.
 -- @param #PATHLINE self
 -- @param DCS#Vec3 Vec Position vector. Can also be a DCS#Vec2 in which case the altitude at landheight is taken.
--- @return #PATHLINE.Point Pathline Point.
+-- @return #PATHLINE.Point
 function PATHLINE:_CreatePoint(Vec)
 
   local point={} --#PATHLINE.Point
 
-  self.counter=self.counter+1
-
-  point.uid=self.counter
-  point.mother=self.name
-
-  point.name=string.format("%s #%d", self.name, point.uid)
-
   if Vec.z then
     -- Given vec is 3D
     point.vec3=UTILS.DeepCopy(Vec)
     point.vec2={x=Vec.x, y=Vec.z}
   else
-    -- Given vec is 2D
+    -- Given vec is 2D  
     point.vec2=UTILS.DeepCopy(Vec)
     point.vec3={x=Vec.x, y=land.getHeight(Vec), z=Vec.y}
   end
 
   -- Get surface type.
   point.surfaceType=land.getSurfaceType(point.vec2)
-
+  
   -- Get land height and depth.
   point.landHeight, point.depth=land.getSurfaceHeightWithSeabed(point.vec2)
-
+  
   point.markerID=nil
 
   return point
 end
 
---- Get index of point in the lua table.
--- @param #PATHLINE self
--- @param #PATHLINE.Point Point Given point.
--- @return #number index
-function PATHLINE:_GetPointIndex(Point)
-
-  for i,_point in pairs(self.points) do
-    local point=_point --#PATHLINE.Point
-
-    if point.uid==Point.uid then
-      return i
-    end
-
-  end
-
-  return nil
-end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------

Moose Development/Moose/Core/Point.lua

@@ -24,9 +24,8 @@
 
 
 do -- COORDINATE
-  
-  ---
-  -- @type COORDINATE
+
+  --- @type COORDINATE
   -- @field #string ClassName Name of the class
   -- @field #number x Component of the 3D vector.
   -- @field #number y Component of the 3D vector.
@@ -110,7 +109,7 @@ do -- COORDINATE
   --
   -- ## 4.4) Get the North correction of the current location.
   --
-  --   * @{#COORDINATE.GetNorthCorrectionRadians}(): Obtains the north correction at the current 3D point.
+  --   * @{#COORDINATE.GetNorthCorrection}(): Obtains the north correction at the current 3D point.
   --
   -- ## 4.5) Point Randomization
   --
@@ -181,7 +180,7 @@ do -- COORDINATE
   --   * @{#COORDINATE.ToStringBR}(): Generates a Bearing & Range text in the format of DDD for DI where DDD is degrees and DI is distance.
   --   * @{#COORDINATE.ToStringBRA}(): Generates a Bearing, Range & Altitude text.
   --   * @{#COORDINATE.ToStringBRAANATO}(): Generates a Generates a Bearing, Range, Aspect & Altitude text in NATOPS.
-  --   * @{#COORDINATE.ToStringLL}(): Generates a Latitude & Longitude text.
+  --   * @{#COORDINATE.ToStringLL}(): Generates a Latutide & Longitude text.
   --   * @{#COORDINATE.ToStringLLDMS}(): Generates a Lat, Lon, Degree, Minute, Second text.
   --   * @{#COORDINATE.ToStringLLDDM}(): Generates a Lat, Lon, Degree, decimal Minute text.
   --   * @{#COORDINATE.ToStringMGRS}(): Generates a MGRS grid coordinate text.
@@ -453,23 +452,6 @@ do -- COORDINATE
   end
 
 
-  --- Returns the coordinate from the latitude and longitude given in degrees, minutes and seconds (DMS).
-  -- @param #COORDINATE self
-  -- @param #string Latitude Latitude in DMS as string, e.g. "`42° 24' 14.3"`". Not that the characters `°`, `'` and `"` are important.
-  -- @param #string Longitude Longitude in DMS as string, e.g. "`42° 24' 14.3"`". Not that the characters `°`, `'` and `"` are important.
-  -- @param #number Altitude (Optional) Altitude in meters. Default is the land height at the coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:NewFromLLDMS(Latitude, Longitude, Altitude)
-  
-    local lat=UTILS.LLDMSstringToDD(Latitude)
-    local lon=UTILS.LLDMSstringToDD(Longitude)
-    
-    self=COORDINATE:NewFromLLDD(lat, lon, Altitude)
-  
-    return self
-  end  
-
-
   --- Returns if the 2 coordinates are at the same 2D position.
   -- @param #COORDINATE self
   -- @param #COORDINATE Coordinate
@@ -678,7 +660,7 @@ do -- COORDINATE
     local _,_,_,_,_,scenerys=self:ScanObjects(radius, false, false, true)
 
     local set={}
-    
+
     for _,_scenery in pairs(scenerys) do
       local scenery=_scenery --DCS#Object
 
@@ -719,9 +701,8 @@ do -- COORDINATE
   -- @param #COORDINATE PointVec2Reference The reference @{#COORDINATE}.
   -- @return DCS#Distance The distance from the reference @{#COORDINATE} in meters.
   function COORDINATE:DistanceFromPointVec2( PointVec2Reference )
-    self:F2( PointVec2Reference )  
-    if not PointVec2Reference then return math.huge end
-    
+    self:F2( PointVec2Reference )
+
     local Distance = ( ( PointVec2Reference.x - self.x ) ^ 2 + ( PointVec2Reference.z - self.z ) ^2 ) ^ 0.5
 
     self:T2( Distance )
@@ -985,13 +966,8 @@ do -- COORDINATE
   -- @return DCS#Distance Distance The distance in meters.
   function COORDINATE:Get2DDistance(TargetCoordinate)
     if not TargetCoordinate then return 1000000 end
-    --local a={x=TargetCoordinate.x-self.x, y=0, z=TargetCoordinate.z-self.z}
-    local a = self:GetVec2()
-    if not TargetCoordinate.ClassName then
-      TargetCoordinate=COORDINATE:NewFromVec3(TargetCoordinate)
-    end
-    local b = TargetCoordinate:GetVec2()
-    local norm=UTILS.VecDist2D(a,b)
+    local a={x=TargetCoordinate.x-self.x, y=0, z=TargetCoordinate.z-self.z}
+    local norm=UTILS.VecNorm(a)
     return norm
   end
 
@@ -1174,162 +1150,6 @@ do -- COORDINATE
     return vec3
   end
 
-  --- Return the x coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @return #number The x coordinate.
-  function COORDINATE:GetX()
-    return self.x
-  end
-
-  --- Return the y coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @return #number The y coordinate.
-  function COORDINATE:GetY()
-    if self:IsInstanceOf("POINT_VEC2") then
-      return self.z
-    end
-    return self.y
-  end
-
-  --- Return the z coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @return #number The z coordinate.
-  function COORDINATE:GetZ()
-    return self.z
-  end
-
-  --- Set the x coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number x The x coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:SetX( x )
-    self.x = x
-    return self
-  end
-
-  --- Set the y coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number y The y coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:SetY( y )
-    if self:IsInstanceOf("POINT_VEC2") then
-      self.z = y
-    else
-      self.y = y
-    end
-    return self
-  end
-
-  --- Set the z coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number z The z coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:SetZ( z )
-    self.z = z
-    return self
-  end
-
-  --- Add to the x coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number x The x coordinate value to add to the current x coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:AddX( x )
-    self.x = self.x + x
-    return self
-  end
-  
-  
-  --- Return Return the Lat(itude) coordinate of the COORDINATE (ie: (parent)COORDINATE.x).
-  -- @param #COORDINATE self
-  -- @return #number The x coordinate.
-  function COORDINATE:GetLat()
-    return self.x
-  end
-
-  --- Set the Lat(itude) coordinate of the COORDINATE (ie: COORDINATE.x).
-  -- @param #COORDINATE self
-  -- @param #number x The x coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:SetLat( x )
-    self.x = x
-    return self
-  end
-
-  --- Return the Lon(gitude) coordinate of the COORDINATE (ie: (parent)COORDINATE.z).
-  -- @param #COORDINATE self
-  -- @return #number The y coordinate.
-  function COORDINATE:GetLon()
-    return self.z
-  end
-
-  --- Set the Lon(gitude) coordinate of the COORDINATE (ie: COORDINATE.z).
-  -- @param #COORDINATE self
-  -- @param #number y The y coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:SetLon( z )
-    self.z = z
-    return self
-  end
-
-  --- Return the altitude (height) of the land at the COORDINATE.
-  -- @param #COORDINATE self
-  -- @return #number The land altitude.
-  function COORDINATE:GetAlt()
-    return self.y ~= 0 or land.getHeight( { x = self.x, y = self.z } )
-  end
-
-  --- Set the altitude of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number Altitude The land altitude. If nothing (nil) is given, then the current land altitude is set.
-  -- @return #COORDINATE
-  function COORDINATE:SetAlt( Altitude )
-    self.y = Altitude or land.getHeight( { x = self.x, y = self.z } )
-    return self
-  end
-
-  --- Add to the current land height an altitude.
-  -- @param #COORDINATE self
-  -- @param #number Altitude The Altitude to add. If nothing (nil) is given, then the current land altitude is set.
-  -- @return #COORDINATE
-  function COORDINATE:AddAlt( Altitude )
-    self.y = land.getHeight( { x = self.x, y = self.z } ) + Altitude or 0
-    return self
-  end
-
-
-  --- Return a random COORDINATE within an Outer Radius and optionally NOT within an Inner Radius of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param DCS#Distance OuterRadius
-  -- @param DCS#Distance InnerRadius
-  -- @return #COORDINATE
-  function COORDINATE:GetRandomPointVec2InRadius( OuterRadius, InnerRadius )
-    self:F2( { OuterRadius, InnerRadius } )
-
-    return COORDINATE:NewFromVec2( self:GetRandomVec2InRadius( OuterRadius, InnerRadius ) )
-  end
-
-  --- Add to the y coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number y The y coordinate value to add to the current y coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:AddY( y )
-    if self:IsInstanceOf("POINT_VEC2") then
-      return self:AddZ(y)
-    else
-      self.y = self.y + y
-    end
-    return self
-  end
-
-  --- Add to the z coordinate of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param #number z The z coordinate value to add to the current z coordinate.
-  -- @return #COORDINATE
-  function COORDINATE:AddZ( z )
-    self.z = self.z +z
-    return self
-  end
-
 
   --- Returns a text documenting the wind direction (from) and strength according the measurement system @{Core.Settings}.
   -- The text will reflect the wind like this:
@@ -1394,7 +1214,7 @@ do -- COORDINATE
     local s = string.format( '%03d°', AngleDegrees )
     
     if MagVar then
-      local variation = self:GetMagneticDeclination() or 0
+      local variation = UTILS.GetMagneticDeclination() or 0
       local AngleMagnetic = AngleDegrees - variation
       
       if AngleMagnetic < 0 then AngleMagnetic = 360-AngleMagnetic end
@@ -1507,16 +1327,13 @@ do -- COORDINATE
   -- @param Core.Settings#SETTINGS Settings
   -- @param #string Language (Optional) Language "en" or "ru"
   -- @param #boolean MagVar If true, also state angle in magnetic
-  -- @param #number Precision Rounding precision, defaults to 0
   -- @return #string The BR Text
-  function COORDINATE:GetBRText( AngleRadians, Distance, Settings, Language, MagVar, Precision )
+  function COORDINATE:GetBRText( AngleRadians, Distance, Settings, Language, MagVar )
 
     local Settings = Settings or _SETTINGS -- Core.Settings#SETTINGS
-      
-    Precision = Precision or 0
-      
+
     local BearingText = self:GetBearingText( AngleRadians, 0, Settings, MagVar )
-    local DistanceText = self:GetDistanceText( Distance, Settings, Language, Precision )
+    local DistanceText = self:GetDistanceText( Distance, Settings, Language, 0 )
 
     local BRText = BearingText .. DistanceText
 
@@ -2138,18 +1955,9 @@ do -- COORDINATE
   --- Smokes the point in a color.
   -- @param #COORDINATE self
   -- @param Utilities.Utils#SMOKECOLOR SmokeColor
-  -- @param #string name (Optional) Name if you want to stop the smoke early (normal duration: 5mins)
-  function COORDINATE:Smoke( SmokeColor, name )
+  function COORDINATE:Smoke( SmokeColor )
     self:F2( { SmokeColor } )
-    self.firename = name or "Smoke-"..math.random(1,100000)
-    trigger.action.smoke( self:GetVec3(), SmokeColor, self.firename )
-  end
-
-  --- Stops smoking the point in a color.
-  -- @param #COORDINATE self
-  -- @param #string name (Optional) Name if you want to stop the smoke early (normal duration: 5mins)
-  function COORDINATE:StopSmoke( name )
-    self:StopBigSmokeAndFire( name )
+    trigger.action.smoke( self:GetVec3(), SmokeColor )
   end
 
   --- Smoke the COORDINATE Green.
@@ -2423,7 +2231,7 @@ do -- COORDINATE
     --   local MarkGroup = GROUP:FindByName( "AttackGroup" )
     --   local MarkID = TargetCoord:MarkToGroup( "This is a target for the attack group", AttackGroup )
     --   <<< logic >>>
-    --   TargetCoord:RemoveMark( MarkID ) -- The mark is now removed
+    --   RemoveMark( MarkID ) -- The mark is now removed
     function COORDINATE:RemoveMark( MarkID )
       trigger.action.removeMark( MarkID )
     end
@@ -2600,7 +2408,7 @@ do -- COORDINATE
       for i,coord in ipairs(Coordinates) do
         vecs[i+1]=coord:GetVec3()
       end
-      
+
       if #vecs<3 then
         self:E("ERROR: A free form polygon needs at least three points!")
       elseif #vecs==3 then
@@ -2647,18 +2455,15 @@ do -- COORDINATE
         -- Write command as string and execute that. Idea by Grimes https://forum.dcs.world/topic/324201-mark-to-all-function/#comment-5273793
         local s=string.format("trigger.action.markupToAll(7, %d, %d,", Coalition, MarkID)
         for _,vec in pairs(vecs) do
-          --s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
-          s=s..string.format("{x=%.1f, y=%.1f, z=%.1f},", vec.x, vec.y, vec.z)
+          s=s..string.format("%s,", UTILS._OneLineSerialize(vec))
         end
-        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", Color[1], Color[2], Color[3], Color[4])
-        s=s..string.format("{%.3f, %.3f, %.3f, %.3f},", FillColor[1], FillColor[2], FillColor[3], FillColor[4])
-        s=s..string.format("%d,", LineType or 1)
-        s=s..string.format("%s", tostring(ReadOnly))
-        if Text and type(Text)=="string" and string.len(Text)>0 then
-          s=s..string.format(", \"%s\"", tostring(Text))
+        s=s..string.format("%s, %s, %s, %s", UTILS._OneLineSerialize(Color), UTILS._OneLineSerialize(FillColor), tostring(LineType), tostring(ReadOnly))
+        if Text and Text~="" then
+          s=s..string.format(", \"%s\"", Text)
         end
         s=s..")"
         
+        
         -- Execute string command
         local success=UTILS.DoString(s)
                 
@@ -2746,7 +2551,7 @@ do -- COORDINATE
 
     Offset=Offset or 2
 
-    -- Measurement of visibility should not be from the ground, so Adding a hypothetical 2 meters to each Coordinate.
+    -- Measurement of visibility should not be from the ground, so Adding a hypotethical 2 meters to each Coordinate.
     local FromVec3 = self:GetVec3()
     FromVec3.y = FromVec3.y + Offset
 
@@ -2859,9 +2664,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 (%s sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), tonumber(sunrise) or "0", Tdiff))
+    --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))
 
-    if InSeconds or type(sunrise) == "string" then
+    if InSeconds then
       return sunrise
     else
       return UTILS.SecondsToClock(sunrise, true)
@@ -2937,10 +2742,7 @@ 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.
@@ -3027,9 +2829,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 (%s sec of the day) (GMT %d)", Latitude, Longitude, date, DayOfYear, tostring(UTILS.SecondsToClock(sunrise)), tostring(sunrise) or "0", Tdiff))
+    --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))
 
-    if InSeconds or type(sunrise) == "string" then
+    if InSeconds then
       return sunrise
     else
       return UTILS.SecondsToClock(sunrise, true)
@@ -3090,13 +2892,12 @@ do -- COORDINATE
   -- @param #COORDINATE FromCoordinate The coordinate to measure the distance and the bearing from.
   -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
   -- @param #boolean MagVar If true, also get angle in MagVar for BR/BRA
-  -- @param #number Precision Rounding precision, currently full km as default (=0)
   -- @return #string The BR text.
-  function COORDINATE:ToStringBR( FromCoordinate, Settings, MagVar, Precision )
+  function COORDINATE:ToStringBR( FromCoordinate, Settings, MagVar )
     local DirectionVec3 = FromCoordinate:GetDirectionVec3( self )
     local AngleRadians =  self:GetAngleRadians( DirectionVec3 )
     local Distance = self:Get2DDistance( FromCoordinate )
-    return "BR, " .. self:GetBRText( AngleRadians, Distance, Settings, nil, MagVar, Precision )
+    return "BR, " .. self:GetBRText( AngleRadians, Distance, Settings, nil, MagVar )
   end
 
   --- Return a BRA string from a COORDINATE to the COORDINATE.
@@ -3132,8 +2933,6 @@ do -- COORDINATE
     local AngleRadians =  self:GetAngleRadians( DirectionVec3 )
     
     local bearing = UTILS.Round( UTILS.ToDegree( AngleRadians ),0 )
-    local magnetic = self:GetMagneticDeclination() or 0
-    bearing = bearing - magnetic
     
     local rangeMetres = self:Get2DDistance(currentCoord)
     local rangeNM = UTILS.Round( UTILS.MetersToNM(rangeMetres), 0)
@@ -3153,10 +2952,10 @@ do -- COORDINATE
     end
 
     -- corrected Track to be direction of travel of bogey (self in this case)
-    local track = "Maneuver"
-  
-  if self.Heading then
-    track = UTILS.BearingToCardinal(self.Heading) or "North"
+   	local track = "Maneuver"
+	
+	if self.Heading then
+		track = UTILS.BearingToCardinal(self.Heading) or "North"
     end
     
     if rangeNM > 3 then
@@ -3268,18 +3067,6 @@ do -- COORDINATE
     return coord.LOtoLL( self:GetVec3() )
   end
 
-  --- Get Latitude & Longitude text.
-  -- @param #COORDINATE self
-  -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
-  -- @return #string LLText
-  function COORDINATE:ToStringLL( Settings )
-  
-    local LL_Accuracy = Settings and Settings.LL_Accuracy or _SETTINGS.LL_Accuracy
-    local lat, lon = coord.LOtoLL( self:GetVec3() )
-    return string.format('%f', lat) .. ' ' .. string.format('%f', lon)
-  end
-
-  
   --- Provides a Lat Lon string in Degree Minute Second format.
   -- @param #COORDINATE self
   -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
@@ -3313,50 +3100,6 @@ do -- COORDINATE
     local MGRS = coord.LLtoMGRS( lat, lon )
     return "MGRS " .. UTILS.tostringMGRS( MGRS, MGRS_Accuracy )
   end
-  
-  --- Provides a COORDINATE from an MGRS String
-  -- @param #COORDINATE self
-  -- @param #string MGRSString MGRS String, e.g. "MGRS 37T DK 12345 12345"
-  -- @return #COORDINATE self
-  function COORDINATE:NewFromMGRSString( MGRSString )
-    local myparts = UTILS.Split(MGRSString," ")
-    local northing = tostring(myparts[5]) or ""
-    local easting = tostring(myparts[4]) or ""
-    if string.len(easting) < 5 then easting = easting..string.rep("0",5-string.len(easting)) end  
-    if string.len(northing) < 5 then northing = northing..string.rep("0",5-string.len(northing)) end
-    local MGRS = {
-            UTMZone = myparts[2],
-            MGRSDigraph = myparts[3],
-            Easting = easting,
-            Northing = northing,
-          } 
-    local lat, lon = coord.MGRStoLL(MGRS)
-    local point = coord.LLtoLO(lat, lon, 0)
-    local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z})
-    return coord
-  end
-  
-  --- Provides a COORDINATE from an MGRS Coordinate
-  -- @param #COORDINATE self
-  -- @param #string UTMZone UTM Zone, e.g. "37T"
-  -- @param #string MGRSDigraph Digraph, e.g. "DK"
-  -- @param #string Easting Meters easting - string in order to allow for leading zeros, e.g. "01234". Should be 5 digits.
-  -- @param #string Northing Meters northing - string in order to allow for leading zeros, e.g. "12340". Should be 5 digits.
-  -- @return #COORDINATE self
-  function COORDINATE:NewFromMGRS( UTMZone, MGRSDigraph, Easting, Northing )
-    if string.len(Easting) < 5 then Easting = tostring(Easting..string.rep("0",5-string.len(Easting) )) end  
-    if string.len(Northing) < 5 then Northing = tostring(Northing..string.rep("0",5-string.len(Northing) )) end
-    local MGRS = {
-            UTMZone = UTMZone,
-            MGRSDigraph = MGRSDigraph,
-            Easting = tostring(Easting),
-            Northing = tostring(Northing),
-          }
-    local lat, lon = coord.MGRStoLL(MGRS)
-    local point = coord.LLtoLO(lat, lon, 0)
-    local coord = COORDINATE:NewFromVec2({x=point.x,y=point.z})
-    return coord
-  end
 
   --- Provides a coordinate string of the point, based on a coordinate format system:
   --   * Uses default settings in COORDINATE.
@@ -3506,16 +3249,16 @@ do -- COORDINATE
   -- @param #COORDINATE self
   -- @param Wrapper.Controllable#CONTROLLABLE Controllable The controllable to retrieve the settings from, otherwise the default settings will be chosen.
   -- @param Core.Settings#SETTINGS Settings (optional) The settings. Can be nil, and in this case the default settings are used. If you want to specify your own settings, use the _SETTINGS object.
+  -- @param Tasking.Task#TASK Task The task for which coordinates need to be calculated.
   -- @return #string The coordinate Text in the configured coordinate system.
-  function COORDINATE:ToString( Controllable, Settings )
+  function COORDINATE:ToString( Controllable, Settings, Task )
 
 --    self:E( { Controllable = Controllable and Controllable:GetName() } )
 
     local Settings = Settings or ( Controllable and _DATABASE:GetPlayerSettings( Controllable:GetPlayerName() ) ) or _SETTINGS
 
     local ModeA2A = nil
-    
-    --[[
+
     if Task then
       if Task:IsInstanceOf( TASK_A2A ) then
         ModeA2A = true
@@ -3532,7 +3275,7 @@ do -- COORDINATE
         end
       end
     end
-    --]]
+
 
     if ModeA2A == nil then
       local IsAir = Controllable and ( Controllable:IsAirPlane() or Controllable:IsHelicopter() ) or false
@@ -3607,7 +3350,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 #boolean IsSteep If true, area is steep
+  -- @return #boolen IsSteep If true, area is steep
   -- @return #number MaxElevation Elevation in meters measured over 100m
   function COORDINATE:IsInSteepArea(Radius,Minelevation)
     local steep = false
@@ -3639,7 +3382,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 #boolean IsFlat If true, area is flat
+  -- @return #boolen 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)
@@ -3647,18 +3390,9 @@ do -- COORDINATE
     return flat, elev
   end
   
-  --- Return a random COORDINATE within an Outer Radius and optionally NOT within an Inner Radius of the COORDINATE.
-  -- @param #COORDINATE self
-  -- @param DCS#Distance OuterRadius
-  -- @param DCS#Distance InnerRadius
-  -- @return #COORDINATE
-  function COORDINATE:GetRandomPointVec3InRadius( OuterRadius, InnerRadius )
-    return COORDINATE:NewFromVec3( self:GetRandomVec3InRadius( OuterRadius, InnerRadius ) )
-  end
-  
 end
 
-do 
+do -- POINT_VEC3
 
   --- The POINT_VEC3 class
   -- @type POINT_VEC3
@@ -3675,8 +3409,6 @@ do
 
   --- Defines a 3D point in the simulator and with its methods, you can use or manipulate the point in 3D space.
   --
-  -- **DEPRECATED - PLEASE USE COORDINATE!**
-  --
   -- **Important Note:** Most of the functions in this section were taken from MIST, and reworked to OO concepts.
   -- In order to keep the credibility of the the author,
   -- I want to emphasize that the formulas embedded in the MIST framework were created by Grimes or previous authors,
@@ -3764,9 +3496,122 @@ do
     return self
   end
 
+  --- Create a new POINT_VEC3 object from Vec2 coordinates.
+  -- @param #POINT_VEC3 self
+  -- @param DCS#Vec2 Vec2 The Vec2 point.
+  -- @param DCS#Distance LandHeightAdd (optional) Add a landheight.
+  -- @return Core.Point#POINT_VEC3 self
+  function POINT_VEC3:NewFromVec2( Vec2, LandHeightAdd )
+
+    local self = BASE:Inherit( self, COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) ) -- Core.Point#POINT_VEC3
+    self:F2( self )
+
+    return self
+  end
+
+
+  --- Create a new POINT_VEC3 object from  Vec3 coordinates.
+  -- @param #POINT_VEC3 self
+  -- @param DCS#Vec3 Vec3 The Vec3 point.
+  -- @return Core.Point#POINT_VEC3 self
+  function POINT_VEC3:NewFromVec3( Vec3 )
+
+    local self = BASE:Inherit( self, COORDINATE:NewFromVec3( Vec3 ) ) -- Core.Point#POINT_VEC3
+    self:F2( self )
+
+    return self
+  end
+
+
+
+  --- Return the x coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @return #number The x coordinate.
+  function POINT_VEC3:GetX()
+    return self.x
+  end
+
+  --- Return the y coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @return #number The y coordinate.
+  function POINT_VEC3:GetY()
+    return self.y
+  end
+
+  --- Return the z coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @return #number The z coordinate.
+  function POINT_VEC3:GetZ()
+    return self.z
+  end
+
+  --- Set the x coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number x The x coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:SetX( x )
+    self.x = x
+    return self
+  end
+
+  --- Set the y coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number y The y coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:SetY( y )
+    self.y = y
+    return self
+  end
+
+  --- Set the z coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number z The z coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:SetZ( z )
+    self.z = z
+    return self
+  end
+
+  --- Add to the x coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number x The x coordinate value to add to the current x coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:AddX( x )
+    self.x = self.x + x
+    return self
+  end
+
+  --- Add to the y coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number y The y coordinate value to add to the current y coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:AddY( y )
+    self.y = self.y + y
+    return self
+  end
+
+  --- Add to the z coordinate of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param #number z The z coordinate value to add to the current z coordinate.
+  -- @return #POINT_VEC3
+  function POINT_VEC3:AddZ( z )
+    self.z = self.z +z
+    return self
+  end
+
+  --- Return a random POINT_VEC3 within an Outer Radius and optionally NOT within an Inner Radius of the POINT_VEC3.
+  -- @param #POINT_VEC3 self
+  -- @param DCS#Distance OuterRadius
+  -- @param DCS#Distance InnerRadius
+  -- @return #POINT_VEC3
+  function POINT_VEC3:GetRandomPointVec3InRadius( OuterRadius, InnerRadius )
+
+    return POINT_VEC3:NewFromVec3( self:GetRandomVec3InRadius( OuterRadius, InnerRadius ) )
+  end
+
 end
 
-do
+do -- POINT_VEC2
 
   --- @type POINT_VEC2
   -- @field DCS#Distance x The x coordinate in meters.
@@ -3775,8 +3620,6 @@ do
 
   --- Defines a 2D point in the simulator. The height coordinate (if needed) will be the land height + an optional added height specified.
   --
-  --  **DEPRECATED - PLEASE USE COORDINATE!**
-  --
   -- ## POINT_VEC2 constructor
   --
   -- A new POINT_VEC2 instance can be created with:
@@ -3824,4 +3667,166 @@ do
     return self
   end
 
+  --- Create a new POINT_VEC2 object from  Vec2 coordinates.
+  -- @param #POINT_VEC2 self
+  -- @param DCS#Vec2 Vec2 The Vec2 point.
+  -- @return Core.Point#POINT_VEC2 self
+  function POINT_VEC2:NewFromVec2( Vec2, LandHeightAdd )
+
+    local LandHeight = land.getHeight( Vec2 )
+
+    LandHeightAdd = LandHeightAdd or 0
+    LandHeight = LandHeight + LandHeightAdd
+
+    local self = BASE:Inherit( self, COORDINATE:NewFromVec2( Vec2, LandHeightAdd ) ) -- #POINT_VEC2
+    self:F2( self )
+
+    return self
+  end
+
+  --- Create a new POINT_VEC2 object from  Vec3 coordinates.
+  -- @param #POINT_VEC2 self
+  -- @param DCS#Vec3 Vec3 The Vec3 point.
+  -- @return Core.Point#POINT_VEC2 self
+  function POINT_VEC2:NewFromVec3( Vec3 )
+
+    local self = BASE:Inherit( self, COORDINATE:NewFromVec3( Vec3 ) ) -- #POINT_VEC2
+    self:F2( self )
+
+    return self
+  end
+
+  --- Return the x coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @return #number The x coordinate.
+  function POINT_VEC2:GetX()
+    return self.x
+  end
+
+  --- Return the y coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @return #number The y coordinate.
+  function POINT_VEC2:GetY()
+    return self.z
+  end
+
+  --- Set the x coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param #number x The x coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:SetX( x )
+    self.x = x
+    return self
+  end
+
+  --- Set the y coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param #number y The y coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:SetY( y )
+    self.z = y
+    return self
+  end
+
+  --- Return Return the Lat(itude) coordinate of the POINT_VEC2 (ie: (parent)POINT_VEC3.x).
+  -- @param #POINT_VEC2 self
+  -- @return #number The x coordinate.
+  function POINT_VEC2:GetLat()
+    return self.x
+  end
+
+  --- Set the Lat(itude) coordinate of the POINT_VEC2 (ie: POINT_VEC3.x).
+  -- @param #POINT_VEC2 self
+  -- @param #number x The x coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:SetLat( x )
+    self.x = x
+    return self
+  end
+
+  --- Return the Lon(gitude) coordinate of the POINT_VEC2 (ie: (parent)POINT_VEC3.z).
+  -- @param #POINT_VEC2 self
+  -- @return #number The y coordinate.
+  function POINT_VEC2:GetLon()
+    return self.z
+  end
+
+  --- Set the Lon(gitude) coordinate of the POINT_VEC2 (ie: POINT_VEC3.z).
+  -- @param #POINT_VEC2 self
+  -- @param #number y The y coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:SetLon( z )
+    self.z = z
+    return self
+  end
+
+  --- Return the altitude (height) of the land at the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @return #number The land altitude.
+  function POINT_VEC2:GetAlt()
+    return self.y ~= 0 or land.getHeight( { x = self.x, y = self.z } )
+  end
+
+  --- Set the altitude of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param #number Altitude The land altitude. If nothing (nil) is given, then the current land altitude is set.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:SetAlt( Altitude )
+    self.y = Altitude or land.getHeight( { x = self.x, y = self.z } )
+    return self
+  end
+
+  --- Add to the x coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param #number x The x coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:AddX( x )
+    self.x = self.x + x
+    return self
+  end
+
+  --- Add to the y coordinate of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param #number y The y coordinate.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:AddY( y )
+    self.z = self.z + y
+    return self
+  end
+
+  --- Add to the current land height an altitude.
+  -- @param #POINT_VEC2 self
+  -- @param #number Altitude The Altitude to add. If nothing (nil) is given, then the current land altitude is set.
+  -- @return #POINT_VEC2
+  function POINT_VEC2:AddAlt( Altitude )
+    self.y = land.getHeight( { x = self.x, y = self.z } ) + Altitude or 0
+    return self
+  end
+
+
+  --- Return a random POINT_VEC2 within an Outer Radius and optionally NOT within an Inner Radius of the POINT_VEC2.
+  -- @param #POINT_VEC2 self
+  -- @param DCS#Distance OuterRadius
+  -- @param DCS#Distance InnerRadius
+  -- @return #POINT_VEC2
+  function POINT_VEC2:GetRandomPointVec2InRadius( OuterRadius, InnerRadius )
+    self:F2( { OuterRadius, InnerRadius } )
+
+    return POINT_VEC2:NewFromVec2( self:GetRandomVec2InRadius( OuterRadius, InnerRadius ) )
+  end
+
+  -- TODO: Check this to replace
+  --- Calculate the distance from a reference @{#POINT_VEC2}.
+  -- @param #POINT_VEC2 self
+  -- @param #POINT_VEC2 PointVec2Reference The reference @{#POINT_VEC2}.
+  -- @return DCS#Distance The distance from the reference @{#POINT_VEC2} in meters.
+  function POINT_VEC2:DistanceFromPointVec2( PointVec2Reference )
+    self:F2( PointVec2Reference )
+
+    local Distance = ( ( PointVec2Reference.x - self.x ) ^ 2 + ( PointVec2Reference.z - self.z ) ^2 ) ^ 0.5
+
+    self:T2( Distance )
+    return Distance
+  end
+
 end

Moose Development/Moose/Core/Report.lua

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

Moose Development/Moose/Core/ScheduleDispatcher.lua

@@ -1,4 +1,4 @@
----- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
+--- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
 --
 -- ===
 --

Moose Development/Moose/Core/Scheduler.lua

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

Moose Development/Moose/Core/Settings.lua

@@ -29,9 +29,7 @@
 -- @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.
@@ -220,8 +218,7 @@ SETTINGS = {
 
 SETTINGS.__Enum = {}
 
----
--- @type SETTINGS.__Enum.Era
+--- @type SETTINGS.__Enum.Era
 -- @field #number WWII
 -- @field #number Korea
 -- @field #number Cold
@@ -740,8 +737,8 @@ do -- SETTINGS
     if _SETTINGS.ShowPlayerMenu == true then
 
       local PlayerGroup = PlayerUnit:GetGroup()
-      local PlayerName = PlayerUnit:GetPlayerName() or "None"
-      --local PlayerNames = PlayerGroup:GetPlayerNames()
+      local PlayerName = PlayerUnit:GetPlayerName()
+      local PlayerNames = PlayerGroup:GetPlayerNames()
 
       local PlayerMenu = MENU_GROUP:New( PlayerGroup, 'Settings "' .. PlayerName .. '"' )
 

Moose Development/Moose/Core/SpawnStatic.lua

@@ -1,36 +1,36 @@
 --- **Core** - Spawn statics.
---
+--  
 -- ===
---
+-- 
 -- ## Features:
---
+-- 
 --   * Spawn new statics from a static already defined in the mission editor.
 --   * Spawn new statics from a given template.
 --   * Spawn new statics from a given type.
 --   * Spawn with a custom heading and location.
 --   * Spawn within a zone.
 --   * Spawn statics linked to units, .e.g on aircraft carriers.
---
+-- 
 -- ===
---
+-- 
 -- # Demo Missions
+-- 
+-- ## [SPAWNSTATIC Demo Missions](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SPS%20-%20Spawning%20Statics)
 --
--- ## [SPAWNSTATIC Demo Missions](https://github.com/FlightControl-Master/MOOSE_Demos/tree/master/Core/SpawnStatic)
---
---
+-- 
 -- ===
---
+-- 
 -- # YouTube Channel
---
--- ## No videos yet!
---
+-- 
+-- ## [SPAWNSTATIC YouTube Channel]() [No videos yet!]
+-- 
 -- ===
---
+-- 
 -- ### Author: **FlightControl**
 -- ### Contributions: **funkyfranky**
---
+-- 
 -- ===
---
+-- 
 -- @module Core.SpawnStatic
 -- @image Core_Spawnstatic.JPG
 
@@ -58,37 +58,37 @@
 
 
 --- Allows to spawn dynamically new @{Wrapper.Static}s into your mission.
---
--- Through creating a copy of an existing static object template as defined in the Mission Editor (ME), SPAWNSTATIC can retireve the properties of the defined static object template (like type, category etc),
+-- 
+-- Through creating a copy of an existing static object template as defined in the Mission Editor (ME), SPAWNSTATIC can retireve the properties of the defined static object template (like type, category etc), 
 -- and "copy" these properties to create a new static object and place it at the desired coordinate.
---
--- New spawned @{Wrapper.Static}s get **the same name** as the name of the template Static, or gets the given name when a new name is provided at the Spawn method.
+-- 
+-- New spawned @{Wrapper.Static}s get **the same name** as the name of the template Static, or gets the given name when a new name is provided at the Spawn method.  
 -- By default, spawned @{Wrapper.Static}s will follow a naming convention at run-time:
---
+-- 
 --   * Spawned @{Wrapper.Static}s will have the name _StaticName_#_nnn_, where _StaticName_ is the name of the **Template Static**, and _nnn_ is a **counter from 0 to 99999**.
---
+-- 
 -- # SPAWNSTATIC Constructors
---
+-- 
 -- Firstly, we need to create a SPAWNSTATIC object that will be used to spawn new statics into the mission. There are three ways to do this.
---
+-- 
 -- ## Use another Static
---
+-- 
 -- A new SPAWNSTATIC object can be created using another static by the @{#SPAWNSTATIC.NewFromStatic}() function. All parameters such as position, heading, country will be initialized
 -- from the static.
---
+-- 
 -- ## From a Template
---
+-- 
 -- A SPAWNSTATIC object can also be created from a template table using the @{#SPAWNSTATIC.NewFromTemplate}(SpawnTemplate, CountryID) function. All parameters are taken from the template.
---
+-- 
 -- ## From a Type
---
+-- 
 -- A very basic method is to create a SPAWNSTATIC object by just giving the type of the static. All parameters must be initialized from the InitXYZ functions described below. Otherwise default values
 -- are used. For example, if no spawn coordinate is given, the static will be created at the origin of the map.
---
+-- 
 -- # Setting Parameters
---
+-- 
 -- Parameters such as the spawn position, heading, country etc. can be set via :Init*XYZ* functions. Note that these functions must be given before the actual spawn command!
---
+-- 
 --   * @{#SPAWNSTATIC.InitCoordinate}(Coordinate) Sets the coordinate where the static is spawned. Statics are always spawnd on the ground.
 --   * @{#SPAWNSTATIC.InitHeading}(Heading) sets the orientation of the static.
 --   * @{#SPAWNSTATIC.InitLivery}(LiveryName) sets the livery of the static. Not all statics support this.
@@ -99,17 +99,17 @@
 --   * @{#SPAWNSTATIC.InitLinkToUnit}(Unit, OffsetX, OffsetY, OffsetAngle) links the static to a unit, e.g. to an aircraft carrier.
 --
 -- # Spawning the Statics
---
+-- 
 -- Once the SPAWNSTATIC object is created and parameters are initialized, the spawn command can be given. There are different methods where some can be used to directly set parameters
 -- such as position and heading.
---
+-- 
 --   * @{#SPAWNSTATIC.Spawn}(Heading, NewName) spawns the static with the set parameters. Optionally, heading and name can be given. The name **must be unique**!
 --   * @{#SPAWNSTATIC.SpawnFromCoordinate}(Coordinate, Heading, NewName) spawn the static at the given coordinate. Optionally, heading and name can be given. The name **must be unique**!
---   * @{#SPAWNSTATIC.SpawnFromPointVec2}(PointVec2, Heading, NewName) spawns the static at a COORDINATE coordinate. Optionally, heading and name can be given. The name **must be unique**!
+--   * @{#SPAWNSTATIC.SpawnFromPointVec2}(PointVec2, Heading, NewName) spawns the static at a POINT_VEC2 coordinate. Optionally, heading and name can be given. The name **must be unique**!
 --   * @{#SPAWNSTATIC.SpawnFromZone}(Zone, Heading, NewName) spawns the static at the center of a @{Core.Zone}. Optionally, heading and name can be given. The name **must be unique**!
---
+--  
 -- @field #SPAWNSTATIC SPAWNSTATIC
---
+-- 
 SPAWNSTATIC = {
   ClassName  = "SPAWNSTATIC",
   SpawnIndex = 0,
@@ -139,9 +139,9 @@ SPAWNSTATIC = {
 function SPAWNSTATIC:NewFromStatic(SpawnTemplateName, SpawnCountryID)
 
   local self = BASE:Inherit( self, BASE:New() ) -- #SPAWNSTATIC
-
+  
   local TemplateStatic, CoalitionID, CategoryID, CountryID = _DATABASE:GetStaticGroupTemplate(SpawnTemplateName)
-
+  
   if TemplateStatic then
     self.SpawnTemplatePrefix = SpawnTemplateName
     self.TemplateStaticUnit  = UTILS.DeepCopy(TemplateStatic.units[1])
@@ -166,11 +166,11 @@ end
 function SPAWNSTATIC:NewFromTemplate(SpawnTemplate, CountryID)
 
   local self = BASE:Inherit( self, BASE:New() ) -- #SPAWNSTATIC
-
+  
   self.TemplateStaticUnit  = UTILS.DeepCopy(SpawnTemplate)
   self.SpawnTemplatePrefix = SpawnTemplate.name
   self.CountryID           = CountryID or country.id.USA
-
+  
   return self
 end
 
@@ -189,69 +189,13 @@ 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
 
   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.
@@ -347,7 +291,7 @@ function SPAWNSTATIC:InitCountry(CountryID)
   return self
 end
 
---- Initialize name prefix statics get. This will be appended by "#0001", "#0002" etc.
+--- Initialize name prefix statics get. This will be appended by "#0001", "#0002" etc. 
 -- @param #SPAWNSTATIC self
 -- @param #string NamePrefix Name prefix of statics spawned. Will append #0001, etc to the name.
 -- @return #SPAWNSTATIC self
@@ -373,25 +317,6 @@ 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.
@@ -402,18 +327,18 @@ function SPAWNSTATIC:Spawn(Heading, NewName)
   if Heading then
     self.InitStaticHeading=Heading
   end
-
+  
   if NewName then
     self.InitStaticName=NewName
   end
 
   return self:_SpawnStatic(self.TemplateStaticUnit, self.CountryID)
-
+  
 end
 
---- Creates a new @{Wrapper.Static} from a COORDINATE.
+--- Creates a new @{Wrapper.Static} from a POINT_VEC2.
 -- @param #SPAWNSTATIC self
--- @param Core.Point#COORDINATE PointVec2 The 2D coordinate where to spawn the static.
+-- @param Core.Point#POINT_VEC2 PointVec2 The 2D coordinate where to spawn the static.
 -- @param #number Heading The heading of the static, which is a number in degrees from 0 to 360.
 -- @param #string NewName (Optional) The name of the new static.
 -- @return Wrapper.Static#STATIC The static spawned.
@@ -422,7 +347,7 @@ function SPAWNSTATIC:SpawnFromPointVec2(PointVec2, Heading, NewName)
   local vec2={x=PointVec2:GetX(), y=PointVec2:GetY()}
 
   local Coordinate=COORDINATE:NewFromVec2(vec2)
-
+  
   return self:SpawnFromCoordinate(Coordinate, Heading, NewName)
 end
 
@@ -437,11 +362,11 @@ function SPAWNSTATIC:SpawnFromCoordinate(Coordinate, Heading, NewName)
 
   -- Set up coordinate.
   self.InitStaticCoordinate=Coordinate
-
+  
   if Heading then
     self.InitStaticHeading=Heading
   end
-
+  
   if NewName then
     self.InitStaticName=NewName
   end
@@ -460,7 +385,7 @@ function SPAWNSTATIC:SpawnFromZone(Zone, Heading, NewName)
 
   -- Spawn the new static at the center of the zone.
   local Static = self:SpawnFromPointVec2( Zone:GetPointVec2(), Heading, NewName )
-
+  
   return Static
 end
 
@@ -474,45 +399,45 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
   Template=Template or {}
 
   local CountryID=CountryID or self.CountryID
-
+  
   if self.InitStaticType then
     Template.type=self.InitStaticType
   end
-
+  
   if self.InitStaticCategory then
     Template.category=self.InitStaticCategory
   end
-
-  if self.InitStaticCoordinate then
-    Template.x   = self.InitStaticCoordinate.x
+  
+  if self.InitStaticCoordinate then  
+    Template.x   = self.InitStaticCoordinate.x    
     Template.y   = self.InitStaticCoordinate.z
-    Template.alt = self.InitStaticCoordinate.y
+    Template.alt = self.InitStaticCoordinate.y  
   end
-
+  
   if self.InitStaticHeading then
-    Template.heading = math.rad(self.InitStaticHeading)
+    Template.heading = math.rad(self.InitStaticHeading)  
   end
 
   if self.InitStaticShape then
     Template.shape_name=self.InitStaticShape
   end
-
+  
   if self.InitStaticLivery then
     Template.livery_id=self.InitStaticLivery
   end
-
+  
   if self.InitStaticDead~=nil then
     Template.dead=self.InitStaticDead
   end
-
+  
   if self.InitStaticCargo~=nil then
     Template.canCargo=self.InitStaticCargo
   end
-
+  
   if self.InitStaticCargoMass~=nil then
     Template.mass=self.InitStaticCargoMass
   end
-
+  
   if self.InitLinkUnit then
     Template.linkUnit=self.InitLinkUnit:GetID()
     Template.linkOffset=true
@@ -521,43 +446,49 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     Template.offsets.x=self.InitOffsetX
     Template.offsets.angle=self.InitOffsetAngle and math.rad(self.InitOffsetAngle) or 0
   end
-
+  
   if self.InitFarp then
     Template.heliport_callsign_id = self.InitFarpCallsignID
     Template.heliport_frequency   = self.InitFarpFreq
     Template.heliport_modulation  = self.InitFarpModu
     Template.unitId=nil
   end
-
+  
   -- Increase spawn index counter.
   self.SpawnIndex = self.SpawnIndex + 1
-
+  
   -- Name of the spawned static.
   Template.name = self.InitStaticName or string.format("%s#%05d", self.SpawnTemplatePrefix, self.SpawnIndex)
 
+  -- Add and register the new static.
+  local mystatic=_DATABASE:AddStatic(Template.name)
+  
+  -- Debug output.
+  self:T(Template)
+  
   -- Add static to the game.
   local Static=nil  --DCS#StaticObject
-
+  
   if self.InitFarp then
-
-    local TemplateGroup={}
+    
+    local TemplateGroup={}    
     TemplateGroup.units={}
     TemplateGroup.units[1]=Template
-
+    
     TemplateGroup.visible=true
     TemplateGroup.hidden=false
     TemplateGroup.x=Template.x
     TemplateGroup.y=Template.y
     TemplateGroup.name=Template.name
 
-    self:T("Spawning FARP")
+    self:T("Spawning FARP")        
     self:T({Template=Template})
     self:T({TemplateGroup=TemplateGroup})
-
+    
     -- ED's dirty way to spawn FARPS.
     Static=coalition.addGroup(CountryID, -1, TemplateGroup)
 
-    -- Currently DCS 2.8 does not trigger birth events if FARPS are spawned!
+    -- Currently DCS 2.8 does not trigger birth events if FAPRS are spawned!
     -- We create such an event. The airbase is registered in Core.Event
     local Event = {
       id = EVENTS.Birth,
@@ -568,32 +499,10 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
     world.onEvent(Event)
 
   else
-    self:T("Spawning Static")
-    self:T2({Template=Template})
+    self:T("Spawning Static")        
+    self:T2({Template=Template})  
     Static=coalition.addStaticObject(CountryID, Template)
+  end
     
-    if Static then
-      self:T(string.format("Succesfully spawned static object \"%s\" ID=%d", Static:getName(), Static:getID()))
-      --[[
-      local static=StaticObject.getByName(Static:getName())
-      if static then
-        env.info(string.format("FF got static from StaticObject.getByName"))
-      else
-        env.error(string.format("FF error did NOT get static from StaticObject.getByName"))
-      end ]]      
-    else
-      self:E(string.format("ERROR: DCS static object \"%s\" is nil!", tostring(Template.name)))
-    end
-  end
-  
-  -- Add and register the new static.
-  local mystatic=_DATABASE:AddStatic(Template.name)
-  
-  -- 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 set the flag to.
+  -- @param #number Number The number value to be checked if it is the same as the userflag.
   -- @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_Detection.lua

@@ -2,8 +2,7 @@
 -- @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
@@ -107,7 +106,7 @@ function ZONE_DETECTION:SmokeZone( SmokeColor, Points, AddHeight, AngleOffset )
     local Radial = ( Angle + AngleOffset ) * RadialBase / 360
     Point.x = Vec2.x + math.cos( Radial ) * self:GetRadius()
     Point.y = Vec2.y + math.sin( Radial ) * self:GetRadius()
-    COORDINATE:New( Point.x, AddHeight, Point.y):Smoke( SmokeColor )
+    POINT_VEC2:New( Point.x, Point.y, AddHeight ):Smoke( SmokeColor )
   end
 
   return self
@@ -138,7 +137,7 @@ function ZONE_DETECTION:FlareZone( FlareColor, Points, Azimuth, AddHeight )
     local Radial = Angle * RadialBase / 360
     Point.x = Vec2.x + math.cos( Radial ) * self:GetRadius()
     Point.y = Vec2.y + math.sin( Radial ) * self:GetRadius()
-    COORDINATE:New( Point.x, AddHeight, Point.y ):Flare( FlareColor, Azimuth )
+    POINT_VEC2:New( Point.x, Point.y, AddHeight ):Flare( FlareColor, Azimuth )
   end
 
   return self
@@ -202,3 +201,4 @@ function ZONE_DETECTION:IsVec3InZone( Vec3 )
 
   return InZone
 end
+

Moose Development/Moose/DCS.lua

@@ -14,7 +14,6 @@ do -- world
   -- @field #world.event event [https://wiki.hoggitworld.com/view/DCS_enum_world](https://wiki.hoggitworld.com/view/DCS_enum_world)
   -- @field #world.BirthPlace BirthPlace The birthplace enumerator is used to define where an aircraft or helicopter has spawned in association with birth events.
   -- @field #world.VolumeType VolumeType The volumeType enumerator defines the types of 3d geometery used within the [world.searchObjects](https://wiki.hoggitworld.com/view/DCS_func_searchObjects) function.
-  -- @field #world.weather weather Weather functions for fog etc.
 
   --- The world singleton contains functions centered around two different but extremely useful functions.
   -- * Events and event handlers are all governed within world.
@@ -26,68 +25,38 @@ 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 = 0
-  -- @field S_EVENT_SHOT = 1
-  -- @field S_EVENT_HIT = 2
-  -- @field S_EVENT_TAKEOFF = 3
-  -- @field S_EVENT_LAND = 4
-  -- @field S_EVENT_CRASH = 5
-  -- @field S_EVENT_EJECTION = 6
-  -- @field S_EVENT_REFUELING = 7
-  -- @field S_EVENT_DEAD = 8
-  -- @field S_EVENT_PILOT_DEAD = 9
-  -- @field S_EVENT_BASE_CAPTURED = 10
-  -- @field S_EVENT_MISSION_START = 11
-  -- @field S_EVENT_MISSION_END = 12
-  -- @field S_EVENT_TOOK_CONTROL = 13
-  -- @field S_EVENT_REFUELING_STOP = 14
-  -- @field S_EVENT_BIRTH = 15
-  -- @field S_EVENT_HUMAN_FAILURE = 16
-  -- @field S_EVENT_DETAILED_FAILURE = 17
-  -- @field S_EVENT_ENGINE_STARTUP = 18
-  -- @field S_EVENT_ENGINE_SHUTDOWN = 19
-  -- @field S_EVENT_PLAYER_ENTER_UNIT = 20
-  -- @field S_EVENT_PLAYER_LEAVE_UNIT = 21
-  -- @field S_EVENT_PLAYER_COMMENT = 22
-  -- @field S_EVENT_SHOOTING_START = 23
-  -- @field S_EVENT_SHOOTING_END = 24
-  -- @field S_EVENT_MARK_ADDED  = 25 
-  -- @field S_EVENT_MARK_CHANGE = 26
-  -- @field S_EVENT_MARK_REMOVED = 27
-  -- @field S_EVENT_KILL = 28
-  -- @field S_EVENT_SCORE = 29
-  -- @field S_EVENT_UNIT_LOST = 30
-  -- @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
+  -- @field S_EVENT_INVALID 
+  -- @field S_EVENT_SHOT [https://wiki.hoggitworld.com/view/DCS_event_shot](https://wiki.hoggitworld.com/view/DCS_event_shot)
+  -- @field S_EVENT_HIT [https://wiki.hoggitworld.com/view/DCS_event_hit](https://wiki.hoggitworld.com/view/DCS_event_hit)
+  -- @field S_EVENT_TAKEOFF [https://wiki.hoggitworld.com/view/DCS_event_takeoff](https://wiki.hoggitworld.com/view/DCS_event_takeoff)
+  -- @field S_EVENT_LAND [https://wiki.hoggitworld.com/view/DCS_event_land](https://wiki.hoggitworld.com/view/DCS_event_land)
+  -- @field S_EVENT_CRASH [https://wiki.hoggitworld.com/view/DCS_event_crash](https://wiki.hoggitworld.com/view/DCS_event_crash)
+  -- @field S_EVENT_EJECTION [https://wiki.hoggitworld.com/view/DCS_event_ejection](https://wiki.hoggitworld.com/view/DCS_event_ejection)
+  -- @field S_EVENT_REFUELING [https://wiki.hoggitworld.com/view/DCS_event_refueling](https://wiki.hoggitworld.com/view/DCS_event_refueling)
+  -- @field S_EVENT_DEAD [https://wiki.hoggitworld.com/view/DCS_event_dead](https://wiki.hoggitworld.com/view/DCS_event_dead)
+  -- @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_BASE_CAPTURED [https://wiki.hoggitworld.com/view/DCS_event_base_captured](https://wiki.hoggitworld.com/view/DCS_event_base_captured)
+  -- @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_END [https://wiki.hoggitworld.com/view/DCS_event_mission_end](https://wiki.hoggitworld.com/view/DCS_event_mission_end)
+  -- @field S_EVENT_TOOK_CONTROL 
+  -- @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_BIRTH [https://wiki.hoggitworld.com/view/DCS_event_birth](https://wiki.hoggitworld.com/view/DCS_event_birth)
+  -- @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_ENGINE_STARTUP [https://wiki.hoggitworld.com/view/DCS_event_engine_startup](https://wiki.hoggitworld.com/view/DCS_event_engine_startup)
+  -- @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_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_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_COMMENT 
+  -- @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_SHOOTING_END [https://wiki.hoggitworld.com/view/DCS_event_shooting_end](https://wiki.hoggitworld.com/view/DCS_event_shooting_end)
+  -- @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_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 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_KILL [https://wiki.hoggitworld.com/view/DCS_event_kill](https://wiki.hoggitworld.com/view/DCS_event_kill) DCS>=2.5.6
+  -- @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_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_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_MAX
   
   --- The birthplace enumerator is used to define where an aircraft or helicopter has spawned in association with birth events.
   -- @type world.BirthPlace
@@ -133,36 +102,6 @@ do -- world
   -- @function [parent=#world] getAirbases
   -- @param #number coalitionId The coalition side number ID. Default is all airbases are returned.
   -- @return #table Table of DCS airbase objects.
-
-
-  --- Weather functions.
-  -- @type world.weather
-
-  --- Fog animation data structure.
-  -- @type world.FogAnimation
-  -- @field #number time
-  -- @field #number visibility
-  -- @field #number thickness
-
-  --- Returns the current fog thickness.
-  -- @function [parent=#world.weather] getFogThickness Returns the fog thickness.
-  -- @return #number Fog thickness in meters. If there is no fog, zero is returned.
-
-  --- Sets the fog thickness instantly. Any current fog animation is discarded.
-  -- @function [parent=#world.weather] setFogThickness
-  -- @param #number thickness Fog thickness in meters. Set to zero to disable fog.
-
-  --- Returns the current fog visibility distance.
-  -- @function [parent=#world.weather] getFogVisibilityDistance Returns the current maximum visibility distance in meters. Returns zero if fog is not present.
-
-  --- Instantly sets the maximum visibility distance of fog at sea level when looking at the horizon. Any current fog animation is discarded. Set zero to disable the fog.
-  -- @function [parent=#world.weather] setFogVisibilityDistance
-  -- @param #number visibility Max fog visibility in meters. Set to zero to disable fog.
-
-  --- Sets fog animation keys. Time is set in seconds and relative to the current simulation time, where time=0 is the current moment. 
-  -- Time must be increasing. Previous animation is always discarded despite the data being correct.
-  -- @function [parent=#world.weather] setFogAnimation
-  -- @param #world.FogAnimation animation List of fog animations
  
 end -- world
 
@@ -438,7 +377,7 @@ do -- coalition
   -- @param #table groupData Group data table.
   -- @return DCS#Group The spawned Group object.
 
-  --- Dynamically spawns a static object. See [hoggit](https://wiki.hoggitworld.com/view/DCS_func_addStaticObject)
+  --- Dynamically spawns a static object. See [hoggit](https://wiki.hoggitworld.com/view/DCS_func_addGroup)
   -- @function [parent=#coalition] addStaticObject
   -- @param #number countryId Id of the country.
   -- @param #table groupData Group data table.
@@ -451,7 +390,6 @@ end -- coalition
 
 do -- Types
 
-  --- Descriptors.
   -- @type Desc
   -- @field #number speedMax0 Max speed in meters/second at zero altitude.
   -- @field #number massEmpty Empty mass in kg.
@@ -630,13 +568,9 @@ do -- Object
   --- @function [parent=#Object] destroy
   -- @param #Object self
   
-  --- Returns an enumerator of the category for the specific object. 
-  -- The enumerator returned is dependent on the category of the object and how the function is called. 
-  -- As of DCS 2.9.2 when this function is called on an Object, Unit, Weapon, or Airbase a 2nd value will be returned which details the object sub-category value.
-  -- @function [parent=#Object] getCategory
+  --- @function [parent=#Object] getCategory
   -- @param #Object self
-  -- @return #Object.Category The object category (1=UNIT, 2=WEAPON, 3=STATIC, 4=BASE, 5=SCENERY, 6=Cargo)
-  -- @return #number The subcategory of the passed object, e.g. Unit.Category if a unit object was passed.
+  -- @return #Object.Category
   
   --- Returns type name of the Object.
   -- @function [parent=#Object] getTypeName
@@ -1049,16 +983,14 @@ do -- Spot
 end -- Spot
 
 do -- Controller
-
   --- Controller is an object that performs A.I.-tasks. Other words controller is an instance of A.I.. Controller stores current main task, active enroute tasks and behavior options. Controller performs commands. Please, read DCS A-10C GUI Manual EN.pdf chapter "Task Planning for Unit Groups", page 91 to understand A.I. system of DCS:A-10C. 
   -- 
   -- This class has 2 types of functions:
   -- 
   -- * Tasks
-  -- * Commands: Commands are instant actions those required zero time to perform. Commands may be used both for control unit/group behavior and control game mechanics.
-  -- 
+  -- * Commands: Commands are instant actions those required zero time to perform. Commands may be used both for control unit/group behavior and control game mechanics. 
   -- @type Controller
-  -- @field #Controller.Detection Detection Enum contains identifiers of surface types.
+  -- @field #Controller.Detection Detection Enum contains identifiers of surface types. 
   
   --- Enables and disables the controller.
   -- Note: Now it works only for ground / naval groups!
@@ -1117,18 +1049,18 @@ do -- Controller
   
   -- Detection
   
-  --- Enum containing detection types.
+  --- Enum contains identifiers of surface types. 
   -- @type Controller.Detection
-  -- @field #number VISUAL Visual detection. Numeric value 1.
-  -- @field #number OPTIC Optical detection. Numeric value 2.
-  -- @field #number RADAR Radar detection. Numeric value 4.
-  -- @field #number IRST Infra-red search and track detection. Numeric value 8.
-  -- @field #number RWR Radar Warning Receiver detection. Numeric value 16.
-  -- @field #number DLINK Data link detection. Numeric value 32.
+  -- @field VISUAL
+  -- @field OPTIC
+  -- @field RADAR
+  -- @field IRST
+  -- @field RWR
+  -- @field DLINK
   
   --- Detected target. 
-  -- @type Controller.DetectedTarget
-  -- @field DCS#Object object The target
+  -- @type DetectedTarget
+  -- @field Wrapper.Object#Object object The target
   -- @field #boolean visible The target is visible
   -- @field #boolean type The target type is known
   -- @field #boolean distance Distance to the target is known
@@ -1141,9 +1073,9 @@ do -- Controller
   -- @param #Controller.Detection detection Controller.Detection detection1, Controller.Detection detection2, ... Controller.Detection detectionN 
   -- @return #boolean detected True if the target is detected. 
   -- @return #boolean visible Has effect only if detected is true. True if the target is visible now. 
-  -- @return #boolean type Has effect only if detected is true. True if the target type is known.
-  -- @return #boolean distance Has effect only if detected is true. True if the distance to the target is known.
   -- @return #ModelTime lastTime Has effect only if visible is false. Last time when target was seen. 
+  -- @return #boolean type Has effect only if detected is true. True if the target type is known. 
+  -- @return #boolean distance Has effect only if detected is true. True if the distance to the target is known. 
   -- @return #Vec3 lastPos Has effect only if visible is false. Last position of the target when it was seen. 
   -- @return #Vec3 lastVel Has effect only if visible is false. Last velocity of the target when it was seen. 
   
@@ -1169,7 +1101,6 @@ end -- Controller
 
 do -- Unit
 
-  --- Unit.
   -- @type Unit
   -- @extends #CoalitionObject
   -- @field ID Identifier of an unit. It assigned to an unit by the Mission Editor automatically. 
@@ -1734,7 +1665,6 @@ 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/AICSAR.lua

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

Moose Development/Moose/Functional/ATC_Ground.lua

@@ -10,7 +10,9 @@
 -- 
 -- ===
 -- 
--- ## Missions: None
+-- ## Missions:
+-- 
+-- [ABP - Airbase Police](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ABP%20-%20Airbase%20Police)
 --
 -- ===
 --
@@ -18,7 +20,7 @@
 -- ### Author: FlightControl - Framework Design &  Programming
 -- ### Refactoring to use the Runway auto-detection: Applevangelist
 -- @date August 2022
--- Last Update Feb 2025
+-- Last Update Nov 2023
 --
 -- ===
 -- 
@@ -416,7 +418,7 @@ end
 -- @field #ATC_GROUND_UNIVERSAL
 ATC_GROUND_UNIVERSAL = {
   ClassName = "ATC_GROUND_UNIVERSAL",
-  Version = "0.0.2",
+  Version = "0.0.1",
   SetClient = nil,
   Airbases = nil,
   AirbaseList = nil,
@@ -441,25 +443,17 @@ function ATC_GROUND_UNIVERSAL:New(AirbaseList)
   self:T( { self.ClassName } )
 
   self.Airbases = {}
+
+  for _name,_ in pairs(_DATABASE.AIRBASES) do
+    self.Airbases[_name]={}  
+  end
   
   self.AirbaseList = AirbaseList
   
   if not self.AirbaseList then
     self.AirbaseList = {}
-    for _name,_base in pairs(_DATABASE.AIRBASES) do
-      -- DONE exclude FARPS and Ships
-      if _base and _base.isAirdrome == true then
-        self.AirbaseList[_name]=_name
-        self.Airbases[_name]={}
-      end
-    end
-  else
-    for _,_name in pairs(AirbaseList) do
-      -- DONE exclude FARPS and Ships
-      local airbase = _DATABASE:FindAirbase(_name)
-      if airbase and (airbase.isAirdrome == true) then
-        self.Airbases[_name]={} 
-      end 
+    for _name,_ in pairs(_DATABASE.AIRBASES) do
+      self.AirbaseList[_name]=_name 
     end
   end
   
@@ -705,8 +699,7 @@ end
 function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
   self:I("_AirbaseMonitor")
   self.SetClient:ForEachClient(
-    --- Nameless function
-    -- @param Wrapper.Client#CLIENT Client
+    --- @param Wrapper.Client#CLIENT Client
     function( Client )
 
       if Client:IsAlive() then
@@ -729,18 +722,14 @@ function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
 
             if NotInRunwayZone then
               
-              local Taxi = Client:GetState( self, "Taxi" )
-              
               if IsOnGround then
-                
+                local Taxi = Client:GetState( self, "Taxi" )
                 self:T( Taxi )
                 if Taxi == false then
                   local Velocity = VELOCITY:New( AirbaseMeta.KickSpeed or self.KickSpeed )
                   Client:Message( "Welcome to " .. AirbaseID .. ". The maximum taxiing speed is " .. 
                                   Velocity:ToString() , 20, "ATC" )
                   Client:SetState( self, "Taxi", true )
-                  Client:SetState( self, "Speeding", false )
-                  Client:SetState( self, "Warnings", 0 )
                 end
   
                 -- TODO: GetVelocityKMH function usage
@@ -749,7 +738,7 @@ function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
                 local IsAboveRunway = Client:IsAboveRunway()
                 self:T( {IsAboveRunway, IsOnGround, Velocity:Get() })
   
-                if IsOnGround and not Taxi then
+                if IsOnGround then
                   local Speeding = false
                   if AirbaseMeta.MaximumKickSpeed then 
                     if Velocity:Get() > AirbaseMeta.MaximumKickSpeed then
@@ -761,17 +750,15 @@ function ATC_GROUND_UNIVERSAL:_AirbaseMonitor()
                     end
                   end
                   if Speeding == true then
-                    --MESSAGE:New( "Penalty! Player " .. Client:GetPlayerName() .. 
-                    --             " has been kicked, due to a severe airbase traffic rule violation ...", 10, "ATC" ):ToAll()
-                    --Client:Destroy()
-                    Client:SetState( self, "Speeding", true )
-                    local SpeedingWarnings = Client:GetState( self, "Warnings" )
-                    Client:SetState( self, "Warnings", SpeedingWarnings + 1 )
-                    Client:Message( "Warning " .. SpeedingWarnings .. "/3! Airbase traffic rule violation! Slow down now! Your speed is " .. 
-                                        Velocity:ToString(), 5, "ATC" )
+                    MESSAGE:New( "Penalty! Player " .. Client:GetPlayerName() .. 
+                                 " has been kicked, due to a severe airbase traffic rule violation ...", 10, "ATC" ):ToAll()
+                    Client:Destroy()
+                    Client:SetState( self, "Speeding", false )
+                    Client:SetState( self, "Warnings", 0 )
                   end
                 end                  
-           
+                  
+  
                 if IsOnGround then
   
                   local Speeding = false
@@ -1049,23 +1036,23 @@ end
 -- The following airbases are monitored at the Nevada region.
 -- Use the @{Wrapper.Airbase#AIRBASE.Nevada} enumeration to select the airbases to be monitored.
 -- 
---    * `AIRBASE.Nevada.Beatty`
---    * `AIRBASE.Nevada.Boulder_City`
---    * `AIRBASE.Nevada.Creech`
+--    * `AIRBASE.Nevada.Beatty_Airport`
+--    * `AIRBASE.Nevada.Boulder_City_Airport`
+--    * `AIRBASE.Nevada.Creech_AFB`
 --    * `AIRBASE.Nevada.Echo_Bay`
---    * `AIRBASE.Nevada.Groom_Lake`
---    * `AIRBASE.Nevada.Henderson_Executive`
---    * `AIRBASE.Nevada.Jean`
---    * `AIRBASE.Nevada.Laughlin`
+--    * `AIRBASE.Nevada.Groom_Lake_AFB`
+--    * `AIRBASE.Nevada.Henderson_Executive_Airport`
+--    * `AIRBASE.Nevada.Jean_Airport`
+--    * `AIRBASE.Nevada.Laughlin_Airport`
 --    * `AIRBASE.Nevada.Lincoln_County`
---    * `AIRBASE.Nevada.McCarran_International`
+--    * `AIRBASE.Nevada.McCarran_International_Airport`
 --    * `AIRBASE.Nevada.Mesquite`
---    * `AIRBASE.Nevada.Mina`
---    * `AIRBASE.Nevada.Nellis`
+--    * `AIRBASE.Nevada.Mina_Airport`
+--    * `AIRBASE.Nevada.Nellis_AFB`
 --    * `AIRBASE.Nevada.North_Las_Vegas`
---    * `AIRBASE.Nevada.Pahute_Mesa`
---    * `AIRBASE.Nevada.Tonopah`
---    * `AIRBASE.Nevada.Tonopah_Test_Range`
+--    * `AIRBASE.Nevada.Pahute_Mesa_Airstrip`
+--    * `AIRBASE.Nevada.Tonopah_Airport`
+--    * `AIRBASE.Nevada.Tonopah_Test_Range_Airfield`
 --
 -- # Installation
 -- 
@@ -1102,10 +1089,10 @@ end
 --    
 --     -- Monitor specific airbases.
 --     ATC_Ground = ATC_GROUND_NEVADA:New(              
---       { AIRBASE.Nevada.Laughlin,                        
+--       { AIRBASE.Nevada.Laughlin_Airport,                        
 --         AIRBASE.Nevada.Lincoln_County,               
 --         AIRBASE.Nevada.North_Las_Vegas,              
---         AIRBASE.Nevada.McCarran_International
+--         AIRBASE.Nevada.McCarran_International_Airport
 --       }                                              
 --     )                                                
 -- 
@@ -1344,33 +1331,33 @@ end
 -- The following airbases are monitored at the PersianGulf region.
 -- Use the @{Wrapper.Airbase#AIRBASE.PersianGulf} enumeration to select the airbases to be monitored.
 -- 
---   * `AIRBASE.PersianGulf.Abu_Musa_Island`
---   * `AIRBASE.PersianGulf.Al_Dhafra_AFB`
+--   * `AIRBASE.PersianGulf.Abu_Musa_Island_Airport`
+--   * `AIRBASE.PersianGulf.Al_Dhafra_AB`
 --   * `AIRBASE.PersianGulf.Al_Maktoum_Intl`
---   * `AIRBASE.PersianGulf.Al_Minhad_AFB`
+--   * `AIRBASE.PersianGulf.Al_Minhad_AB`
 --   * `AIRBASE.PersianGulf.Bandar_Abbas_Intl`
 --   * `AIRBASE.PersianGulf.Bandar_Lengeh`
 --   * `AIRBASE.PersianGulf.Dubai_Intl`
 --   * `AIRBASE.PersianGulf.Fujairah_Intl`
 --   * `AIRBASE.PersianGulf.Havadarya`
---   * `AIRBASE.PersianGulf.Kerman`
+--   * `AIRBASE.PersianGulf.Kerman_Airport`
 --   * `AIRBASE.PersianGulf.Khasab`
---   * `AIRBASE.PersianGulf.Lar`
+--   * `AIRBASE.PersianGulf.Lar_Airbase`
 --   * `AIRBASE.PersianGulf.Qeshm_Island`
 --   * `AIRBASE.PersianGulf.Sharjah_Intl`
---   * `AIRBASE.PersianGulf.Shiraz_Intl`
+--   * `AIRBASE.PersianGulf.Shiraz_International_Airport`
 --   * `AIRBASE.PersianGulf.Sir_Abu_Nuayr`
 --   * `AIRBASE.PersianGulf.Sirri_Island`
 --   * `AIRBASE.PersianGulf.Tunb_Island_AFB`
 --   * `AIRBASE.PersianGulf.Tunb_Kochak`
---   * `AIRBASE.PersianGulf.Sas_Al_Nakheel`
---   * `AIRBASE.PersianGulf.Bandar_e_Jask`
---   * `AIRBASE.PersianGulf.Abu_Dhabi_Intl`
---   * `AIRBASE.PersianGulf.Al_Bateen`
---   * `AIRBASE.PersianGulf.Kish_Intl`
---   * `AIRBASE.PersianGulf.Al_Ain_Intl`
---   * `AIRBASE.PersianGulf.Lavan_Island`
---   * `AIRBASE.PersianGulf.Jiroft`
+--   * `AIRBASE.PersianGulf.Sas_Al_Nakheel_Airport`
+--   * `AIRBASE.PersianGulf.Bandar_e_Jask_airfield`
+--   * `AIRBASE.PersianGulf.Abu_Dhabi_International_Airport`
+--   * `AIRBASE.PersianGulf.Al_Bateen_Airport`
+--   * `AIRBASE.PersianGulf.Kish_International_Airport`
+--   * `AIRBASE.PersianGulf.Al_Ain_International_Airport`
+--   * `AIRBASE.PersianGulf.Lavan_Island_Airport`
+--   * `AIRBASE.PersianGulf.Jiroft_Airport`
 --
 -- # Installation
 -- 
@@ -1405,8 +1392,8 @@ end
 --     AirbasePoliceCaucasus = ATC_GROUND_PERSIANGULF:New()
 --     
 --     ATC_Ground = ATC_GROUND_PERSIANGULF:New( 
---       { AIRBASE.PersianGulf.Kerman,
---         AIRBASE.PersianGulf.Al_Minhad_AFB 
+--       { AIRBASE.PersianGulf.Kerman_Airport,
+--         AIRBASE.PersianGulf.Al_Minhad_AB 
 --       } 
 --     )
 -- 
@@ -1455,10 +1442,11 @@ function ATC_GROUND_PERSIANGULF:Start( RepeatScanSeconds )
   self.AirbaseMonitor = SCHEDULER:New( self, self._AirbaseMonitor, { self }, 0, RepeatScanSeconds )
 end
           
----
--- @type ATC_GROUND_MARIANAISLANDS
+
+ -- @type ATC_GROUND_MARIANAISLANDS
 -- @extends #ATC_GROUND
 
+     
 
 --- # ATC\_GROUND\_MARIANA, extends @{#ATC_GROUND}
 -- 

Moose Development/Moose/Functional/AmmoTruck.lua

@@ -8,7 +8,7 @@
 --
 -- ## Missions:
 --
--- Demo missions can be found on [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/Functional/AmmoTruck)
+-- ### [AmmoTruck](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/AMT%20-%20AmmoTruck/AmmoTruck%20100%20-%20NTTR%20-%20Basic)
 --
 -- ===
 --
@@ -20,7 +20,7 @@
 -- Last update: July 2023
 
 -------------------------------------------------------------------------
---- **AMMOTRUCK** class, extends Core.Fsm#FSM
+--- **AMMOTRUCK** class, extends Core.FSM#FSM
 -- @type AMMOTRUCK
 -- @field #string ClassName Class Name
 -- @field #string lid Lid for log entries
@@ -41,7 +41,7 @@
 -- @field #number waitingtime Max waiting time in seconds
 -- @field #boolean routeonroad Route truck on road if true (default)
 -- @field #number reloads Number of reloads a single truck can do before he must return home
--- @extends Core.Fsm#FSM
+-- @extends Core.FSM#FSM
 
 --- *Amateurs talk about tactics, but professionals study logistics.* - General Robert H Barrow, USMC
 --
@@ -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,7 +45,6 @@
 -- @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.
@@ -416,7 +415,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 M939"
+--      arty set, battery "Mortar Bravo", rearming group "Ammo Truck M818"
 -- 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
@@ -454,7 +453,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 M939 truck.
+--     -- Define a rearming group. This is a Transport M818 truck.
 --     paladin:SetRearmingGroup(GROUP:FindByName("Blue Ammo Truck"))
 --
 --     -- Set the max firing range. A Paladin unit has a range of 20 km.
@@ -619,148 +618,63 @@ ARTY.WeaponType={
 }
 
 --- Database of common artillery unit properties.
--- @type ARTY.dbitem
--- @field #string displayname Name displayed in ME.
--- @field #number minrange Minimum firing range in meters.
--- @field #number maxrange Maximum firing range in meters.
--- @field #number reloadtime Reload time in seconds.
-
---- Database of common artillery unit properties.
--- Table key is the "type name" and table value is and `ARTY.dbitem`.
 -- @type ARTY.db
 ARTY.db={
-  ["LeFH_18-40-105"] = {
-    displayname = "FH LeFH-18 105mm", -- name displayed in the ME
-    minrange    = 500,                -- min range (green circle) in meters
-    maxrange    = 10500,              -- max range (red circle) in meters
-    reloadtime  = nil,                -- reload time in seconds
+  ["2B11 mortar"] = {  -- type "2B11 mortar"
+    minrange   = 500,  -- correct?
+    maxrange   = 7000, -- 7 km
+    reloadtime = 30,   -- 30 sec
   },
-  ["M2A1-105"] = {
-    displayname = "FH M2A1 105mm",
-    minrange    = 500,
-    maxrange    = 11500,
-    reloadtime  = nil,
+  ["SPH 2S1 Gvozdika"] = { -- type "SAU Gvozdika"
+    minrange   = 300,      -- correct?
+    maxrange   = 15000,    -- 15 km
+    reloadtime = nil,      -- unknown
   },
-  ["Pak40"] = {
-    displayname = "FH Pak 40 75mm",
-    minrange    = 500,
-    maxrange    = 3000,
-    reloadtime  = nil,
-  },      
-  ["L118_Unit"] = {
-    displayname = "L118 Light Artillery Gun",
-    minrange    = 500,
-    maxrange    = 17500,
-    reloadtime  = nil,
+  ["SPH 2S19 Msta"] = { --type "SAU Msta", alias "2S19 Msta"
+    minrange   = 300,     -- correct?
+    maxrange   = 23500,   -- 23.5 km
+    reloadtime = nil,     -- unknown
   },
-  ["Smerch"] = {
-    displayname = "MLRS 9A52 Smerch CM 300mm",
-    minrange    = 20000,
-    maxrange    = 70000,
-    reloadtime  = 2160,
+  ["SPH 2S3 Akatsia"] = { -- type "SAU Akatsia", alias "2S3 Akatsia"
+    minrange   = 300,   -- correct?
+    maxrange   = 17000, -- 17 km
+    reloadtime = nil,   -- unknown
   },
-  ["Smerch_HE"] = {
-    displayname = "MLRS 9A52 Smerch HE 300mm",
-    minrange    = 20000,
-    maxrange    = 70000,
-    reloadtime  = 2160,
+  ["SPH 2S9 Nona"] = { --type "SAU 2-C9"
+    minrange   = 500,   -- correct?
+    maxrange   = 7000,  -- 7 km
+    reloadtime = nil,   -- unknown
   },
-  ["Uragan_BM-27"] = {
-    displayname = "MLRS 9K57 Uragan BM-27 220mm",
-    minrange   = 11500,
-    maxrange   = 35800,
-    reloadtime = 840,
+  ["SPH M109 Paladin"] = { -- type "M-109", alias "M109"
+    minrange   = 300,     -- correct?
+    maxrange   = 22000,   -- 22 km
+    reloadtime = nil,   -- unknown
   },
-  ["Grad-URAL"] = {
-    displayname = "MLRS BM-21 Grad 122mm",
-    minrange   = 5000,
-    maxrange   = 19000,
-    reloadtime = 420,
+  ["SpGH Dana"] = {       -- type "SpGH_Dana"
+    minrange   = 300,     -- correct?
+    maxrange   = 18700,   -- 18.7 km
+    reloadtime = nil,     -- unknown
   },
-  ["HL_B8M1"] = {
-    displayname = "MLRS HL with B8M1 80mm",
-    minrange   = 500,
-    maxrange   = 5000,
-    reloadtime = nil,
+  ["MLRS BM-21 Grad"] = { --type "Grad-URAL", alias "MLRS BM-21 Grad"
+    minrange = 5000,  --  5 km
+    maxrange = 19000, -- 19 km
+    reloadtime = 420, -- 7 min
   },
-  ["tt_B8M1"] = {
-    displayname = "MLRS LC with B8M1 80mm",
-    minrange   = 500,
-    maxrange   = 5000,
-    reloadtime = nil,
+  ["MLRS 9K57 Uragan BM-27"] = { -- type "Uragan_BM-27"
+    minrange   = 11500, -- 11.5 km
+    maxrange   = 35800, -- 35.8 km
+    reloadtime = 840,   -- 14 min
   },
-  ["MLRS"] = {
-    displayname = "MLRS M270 227mm",
-    minrange   = 10000,
-    maxrange   = 32000,
-    reloadtime = 540,
+  ["MLRS 9A52 Smerch"] = { -- type "Smerch"
+    minrange   = 20000, -- 20 km
+    maxrange   = 70000, -- 70 km
+    reloadtime = 2160,  -- 36 min
   },
-  ["2B11 mortar"] = {
-    displayname = "Mortar 2B11 120mm", 
-    minrange    = 500,
-    maxrange    = 7000,
-    reloadtime  = 30,
+  ["MLRS M270"] = { --type "MRLS", alias "M270 MRLS"
+    minrange   = 10000, -- 10 km
+    maxrange   = 32000, -- 32 km
+    reloadtime = 540,   -- 9 min
   },
-  ["PLZ05"] = {
-    displayname = "PLZ-05", 
-    minrange    = 500,
-    maxrange    = 23500,
-    reloadtime  = nil,
-  },
-  ["SAU Gvozdika"] = {
-    displayname = "SPH 2S1 Gvozdika 122mm",
-    minrange    = 300,
-    maxrange    = 15000,
-    reloadtime  = nil,
-  },
-  ["SAU Msta"] = {
-    displayname = "SPH 2S19 Msta 152mm",
-    minrange    = 300,
-    maxrange    = 23500,
-    reloadtime  = nil,
-  },
-  ["SAU Akatsia"] = {
-    displayname = "SPH 2S3 Akatsia 152mm",
-    minrange    = 300,
-    maxrange    = 17000,
-    reloadtime  = nil,
-  },
-  ["SpGH_Dana"] = {
-    displayname = "SPH Dana vz77 152mm",
-    minrange    = 300,
-    maxrange    = 18700,
-    reloadtime  = nil,
-  },
-  ["M-109"] = {
-    displayname = "SPH M109 Paladin 155mm",
-    minrange    = 300,
-    maxrange    = 22000,
-    reloadtime  = nil,
-  }, 
-  ["M12_GMC"] = {
-    displayname = "SPH M12 GMC 155mm",
-    minrange    = 300,
-    maxrange    = 18200,
-    reloadtime  = nil,
-  },
-  ["Wespe124"] = {
-    displayname = "SPH Sd.Kfz.124 Wespe 105mm",
-    minrange    = 300,
-    maxrange    = 7000,
-    reloadtime  = nil,
-  },
-  ["T155_Firtina"] = {
-    displayname = "SPH T155 Firtina 155mm",
-    minrange    = 300,
-    maxrange    = 41000,
-    reloadtime  = nil,
-  },
-  ["SAU 2-C9"] = {
-    displayname = "SPM 2S9 Nona 120mm M",
-    minrange    = 500,
-    maxrange    = 7000,
-    reloadtime  = nil,
-  },  
 }
 
 --- Target.
@@ -780,7 +694,7 @@ ARTY.db={
 
 --- Arty script version.
 -- @field #string version
-ARTY.version="1.3.3"
+ARTY.version="1.3.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
@@ -793,7 +707,7 @@ ARTY.version="1.3.3"
 -- 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 M939, Red Ural-375. Are there more? <user needs to know!>
+-- DONE: Check that right rearming vehicle is specified. Blue M818, 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.
@@ -882,8 +796,8 @@ function ARTY:New(group, alias)
   -- Maximum speed in km/h.
   self.SpeedMax=group:GetSpeedMax()
 
-  -- Group is mobile or not (e.g. mortars). Some immobile units have a speed of 1 m/s = 3.6 km/h. So we check this number.
-  if self.SpeedMax>3.6 then
+  -- Group is mobile or not (e.g. mortars).
+  if self.SpeedMax>1 then
     self.ismobile=true
   else
     self.ismobile=false
@@ -1618,7 +1532,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 M939 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 M818 transport whilst for red an unarmed Ural-375 transport can be used.
 -- @return self
 function ARTY:SetRearmingGroup(group)
   self:F({group=group})
@@ -1973,7 +1887,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.Narty0=self:GetAmmo(self.Debug)
+  self.Nammo0, self.Nshells0, self.Nrockets0, self.Nmissiles0=self:GetAmmo(self.Debug)
 
   -- Init nuclear explosion parameters if they were not set by user.
   if self.nukerange==nil then
@@ -2008,7 +1922,7 @@ function ARTY:onafterStart(Controllable, From, Event, To)
   end
 
   -- Check if we have and arty type that is in the DB.
-  local _dbproperties=self:_CheckDB(self.Type)
+  local _dbproperties=self:_CheckDB(self.DisplayName)
   self:T({dbproperties=_dbproperties})
   if _dbproperties~=nil then
     for property,value in pairs(_dbproperties) do
@@ -2054,8 +1968,8 @@ function ARTY:onafterStart(Controllable, From, Event, To)
   text=text..string.format("Type                = %s\n", self.Type)
   text=text..string.format("Display Name        = %s\n", self.DisplayName)
   text=text..string.format("Number of units     = %d\n", self.IniGroupStrength)
-  text=text..string.format("Speed max           = %.1f km/h\n", self.SpeedMax)
-  text=text..string.format("Speed default       = %.1f km/h\n", self.Speed)
+  text=text..string.format("Speed max           = %d km/h\n", self.SpeedMax)
+  text=text..string.format("Speed default       = %d km/h\n", self.Speed)
   text=text..string.format("Is mobile           = %s\n", tostring(self.ismobile))
   text=text..string.format("Is cargo            = %s\n", tostring(self.iscargo))
   text=text..string.format("Min range           = %.1f km\n", self.minrange/1000)
@@ -2179,7 +2093,7 @@ function ARTY:_StatusReport(display)
   end
 
   -- Get Ammo.
-  local Nammo, Nshells, Nrockets, Nmissiles, Narty=self:GetAmmo()
+  local Nammo, Nshells, Nrockets, Nmissiles=self:GetAmmo()
   local Nnukes=self.Nukes
   local Nillu=self.Nillu
   local Nsmoke=self.Nsmoke
@@ -2192,7 +2106,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", Narty)
+  text=text..string.format("Number of shells    = %d\n", Nshells)
   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)
@@ -2379,19 +2293,19 @@ function ARTY:OnEventShot(EventData)
         end
 
         -- Get current ammo.
-        local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
+        local _nammo,_nshells,_nrockets,_nmissiles=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 illumination shells because we just fired one.
+        -- Decrease available illuminatin shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then
           self.Nillu=self.Nillu-1
         end
 
-        -- Decrease available smoke shells because we just fired one.
+        -- Decrease available illuminatin shells because we just fired one.
         if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then
           self.Nsmoke=self.Nsmoke-1
         end
@@ -2409,7 +2323,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, _narty, _nrockets, _nmissiles))
+        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 uses weapontype %s for current target.", self.groupname, _weapontype))
 
         -- Default switches for cease fire and relocation.
@@ -2857,7 +2771,7 @@ function ARTY:onafterStatus(Controllable, From, Event, To)
   self:_EventFromTo("onafterStatus", Event, From, To)
   
   -- Get ammo.
-  local nammo, nshells, nrockets, nmissiles, narty=self:GetAmmo()
+  local nammo, nshells, nrockets, nmissiles=self:GetAmmo()
   
   -- We have a cargo group ==> check if group was loaded into a carrier.
   if self.iscargo and self.cargogroup then
@@ -2874,7 +2788,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, narty, 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, nshells, self.Nsmoke, self.Nillu, self.Nukes, self.nukewarhead/1000000, nrockets, nmissiles))
 
   if self.Controllable and self.Controllable:IsAlive() then
 
@@ -2957,19 +2871,20 @@ function ARTY:onafterStatus(Controllable, From, Event, To)
       if self.currentTarget then
         self:CeaseFire(self.currentTarget)
       end
-      
-      if self:is("CombatReady") then
-        -- Open fire on timed target.
-        self:OpenFire(_timedTarget)
-      end
+
+      -- Open fire on timed target.
+      self:OpenFire(_timedTarget)
+
     elseif _normalTarget then
-      
-      if self:is("CombatReady") then  
-        -- Open fire on normal target.
-        self:OpenFire(_normalTarget)
-      end
+
+      -- Open fire on normal target.
+      self:OpenFire(_normalTarget)
+
     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
@@ -3130,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, Narty=self:GetAmmo()
-  local nfire=Narty
+  local Nammo, Nshells, Nrockets, Nmissiles=self:GetAmmo()
+  local nfire=Nammo
   local _type="shots"
   if target.weapontype==ARTY.WeaponType.Auto then
-    nfire=Nammo  -- We take everything that is available
+    nfire=Nammo
     _type="shots"
   elseif target.weapontype==ARTY.WeaponType.Cannon then
-    nfire=Narty
+    nfire=Nshells
     _type="shells"
   elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
     nfire=self.Nukes
@@ -3155,8 +3070,6 @@ function ARTY:onafterOpenFire(Controllable, From, Event, To, target)
     nfire=Nmissiles
     _type="cruise missiles"
   end
-  
-  --env.info(string.format("FF type=%s, Nrockets=%d, Nfire=%d target.nshells=%d", _type, Nrockets, nfire, target.nshells))
 
   -- Adjust if less than requested ammo is left.
   target.nshells=math.min(target.nshells, nfire)
@@ -3424,7 +3337,7 @@ function ARTY:_CheckRearmed()
   self:F2()
 
   -- Get current ammo.
-  local nammo,nshells,nrockets,nmissiles,narty=self:GetAmmo()
+  local nammo,nshells,nrockets,nmissiles=self:GetAmmo()
 
   -- Number of units still alive.
   local units=self.Controllable:GetUnits()
@@ -3633,7 +3546,7 @@ end
 -- @param #string To To state.
 function ARTY:onafterRespawn(Controllable, From, Event, To)
   self:_EventFromTo("onafterRespawn", Event, From, To)
-  self:I("Respawning arty group")
+
   local group=self.Controllable --Wrapper.Group#GROUP
 
   -- Respawn group.
@@ -3690,11 +3603,7 @@ 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()
 
@@ -3705,7 +3614,7 @@ function ARTY:_FireAtCoord(coord, radius, nshells, weapontype)
   local fire=group:TaskFireAtPoint(vec2, radius, nshells, weapontype)
 
   -- Execute task.
-  group:SetTask(fire,1)
+  group:SetTask(fire)
 end
 
 --- Set task for attacking a group.
@@ -3722,11 +3631,7 @@ 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()
 
@@ -3737,7 +3642,7 @@ function ARTY:_AttackGroup(target)
   local fire=group:TaskAttackGroup(targetgroup, weapontype, AI.Task.WeaponExpend.ONE, 1)
 
   -- Execute task.
-  group:SetTask(fire,1)
+  group:SetTask(fire)
 end
 
 
@@ -3804,6 +3709,51 @@ function ARTY:_NuclearBlast(_coord)
     ignite(_fires)
   end
 
+--[[
+  local ZoneNuke=ZONE_RADIUS:New("Nukezone", _coord:GetVec2(), 2000)
+
+  -- Scan for Scenery objects.
+  ZoneNuke:Scan(Object.Category.SCENERY)
+
+  -- Array with all possible hideouts, i.e. scenery objects in the vicinity of the group.
+  local scenery={}
+
+  for SceneryTypeName, SceneryData in pairs(ZoneNuke:GetScannedScenery()) do
+    for SceneryName, SceneryObject in pairs(SceneryData) do
+
+      local SceneryObject = SceneryObject -- Wrapper.Scenery#SCENERY
+
+      -- Position of the scenery object.
+      local spos=SceneryObject:GetCoordinate()
+
+      -- Distance from group to impact point.
+      local distance= spos:Get2DDistance(_coord)
+
+      -- Place markers on every possible scenery object.
+      if self.Debug then
+        local MarkerID=spos:MarkToAll(string.format("%s scenery object %s", self.Controllable:GetName(), SceneryObject:GetTypeName()))
+        local text=string.format("%s scenery: %s, Coord %s", self.Controllable:GetName(), SceneryObject:GetTypeName(), SceneryObject:GetCoordinate():ToStringLLDMS())
+        self:T2(SUPPRESSION.id..text)
+      end
+
+      -- Add to table.
+      table.insert(scenery, {object=SceneryObject, distance=distance})
+
+      --SceneryObject:Destroy()
+    end
+  end
+
+  -- Sort scenery wrt to distance from impact point.
+--  local _sort = function(a,b) return a.distance < b.distance end
+--  table.sort(scenery,_sort)
+
+--  for _,object in pairs(scenery) do
+--    local sobject=object -- Wrapper.Scenery#SCENERY
+--    sobject:Destroy()
+--  end
+
+]]
+
 end
 
 --- Route group to a certain point.
@@ -3965,7 +3915,6 @@ 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})
 
@@ -3979,7 +3928,6 @@ function ARTY:GetAmmo(display)
   local nshells=0
   local nrockets=0
   local nmissiles=0
-  local nartyshells=0
 
   -- Get all units.
   local units=self.Controllable:GetUnits()
@@ -4082,8 +4030,7 @@ 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)
 
@@ -4129,7 +4076,7 @@ function ARTY:GetAmmo(display)
   -- Total amount of ammunition.
   nammo=nshells+nrockets+nmissiles
 
-  return nammo, nshells, nrockets, nmissiles, nartyshells
+  return nammo, nshells, nrockets, nmissiles
 end
 
 --- Returns a name of a missile category.
@@ -4880,10 +4827,7 @@ function ARTY:_CheckShootingStarted()
 
     -- Check if we waited long enough and no shot was fired.
     --if dt > self.WaitForShotTime and self.Nshots==0 then
-    
-    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
+    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))
@@ -4945,7 +4889,7 @@ end
 function ARTY:_CheckOutOfAmmo(targets)
 
   -- Get current ammo.
-  local _nammo,_nshells,_nrockets,_nmissiles,_narty=self:GetAmmo()
+  local _nammo,_nshells,_nrockets,_nmissiles=self:GetAmmo()
 
    -- Special weapon type requested ==> Check if corresponding ammo is empty.
   local _partlyoutofammo=false
@@ -4957,7 +4901,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 _narty==0 then
+    elseif Target.weapontype==ARTY.WeaponType.Cannon and _nshells==0 then
 
       self:T(self.lid..string.format("Group %s, cannons requested for target %s but shells empty.", self.groupname, Target.name))
       _partlyoutofammo=true
@@ -5001,14 +4945,14 @@ end
 function ARTY:_CheckWeaponTypeAvailable(target)
 
   -- Get current ammo of group.
-  local Nammo, Nshells, Nrockets, Nmissiles, Narty=self:GetAmmo()
+  local Nammo, Nshells, Nrockets, Nmissiles=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=Narty
+    nfire=Nshells
   elseif target.weapontype==ARTY.WeaponType.TacticalNukes then
     nfire=self.Nukes
   elseif target.weapontype==ARTY.WeaponType.IlluminationShells then

Moose Development/Moose/Functional/Autolase.lua

@@ -5,11 +5,11 @@
 -- **AUOTLASE** - Autolase targets in the field.
 -- 
 -- ===
---
+-- 
 -- ## Missions:
 --
--- None yet.
---
+-- ### [Autolase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/develop/)
+-- 
 -- ===
 -- 
 -- **Main Features:**
@@ -74,7 +74,7 @@
 -- @image Designation.JPG
 --
 -- Date: 24 Oct 2021
--- Last Update: Mar 2025
+-- Last Update: Oct 2023
 --
 --- Class AUTOLASE
 -- @type AUTOLASE
@@ -87,12 +87,6 @@
 -- @field Core.Set#SET_GROUP RecceSet
 -- @field #table LaserCodes
 -- @field #table playermenus
--- @field #boolean smokemenu
--- @field #boolean threatmenu
--- @field #number RoundingPrecision
--- @field #table smokeoffset
--- @field #boolean increasegroundawareness
--- @field #number MonitorFrequency
 -- @extends Ops.Intel#INTEL
 
 ---
@@ -103,10 +97,6 @@ AUTOLASE = {
   verbose = 0,
   alias = "",
   debug = false,
-  smokemenu = true,
-  RoundingPrecision = 0,
-  increasegroundawareness = true,
-  MonitorFrequency = 30,
 }
 
 --- Laser spot info
@@ -125,7 +115,7 @@ AUTOLASE = {
 
 --- AUTOLASE class version.
 -- @field #string version
-AUTOLASE.version = "0.1.31"
+AUTOLASE.version = "0.1.22"
 
 -------------------------------------------------------------------
 -- Begin Functional.Autolase.lua
@@ -198,7 +188,6 @@ function AUTOLASE:New(RecceSet, Coalition, Alias, PilotSet)
   self.reporttimelong = 30
   self.smoketargets = false
   self.smokecolor = SMOKECOLOR.Red
-  self.smokeoffset = nil
   self.notifypilots = true
   self.targetsperrecce = {}
   self.RecceUnits = {}
@@ -213,13 +202,6 @@ function AUTOLASE:New(RecceSet, Coalition, Alias, PilotSet)
   self.blacklistattributes = {}
   self:SetLaserCodes( { 1688, 1130, 4785, 6547, 1465, 4578 } ) -- set self.LaserCodes
   self.playermenus = {}
-  self.smokemenu = true
-  self.threatmenu = true
-  self.RoundingPrecision = 0
-  self.increasegroundawareness = true
-  self.MonitorFrequency = 30
-  
-  self:EnableSmokeMenu({Angle=math.random(0,359),Distance=math.random(10,20)})
   
   -- Set some string id for output to DCS.log file.
   self.lid=string.format("AUTOLASE %s (%s) | ", self.alias, self.coalition and UTILS.GetCoalitionName(self.coalition) or "unknown")
@@ -322,92 +304,53 @@ end
 -- Helper Functions
 -------------------------------------------------------------------
 
---- [User] When using Monitor, set the frequency here in which the report will appear
--- @param #AUTOLASE self
--- @param #number Seconds Run the report loop every number of seconds defined here.
--- @return #AUTOLASE self
-function AUTOLASE:SetMonitorFrequency(Seconds)
-  self.MonitorFrequency = Seconds or 30
-  return self
-end
-
 --- [User] Set a table of possible laser codes.
--- Each new RECCE can select a code from this table, default is { 1688, 1130, 4785, 6547, 1465, 4578 }.
+-- Each new RECCE can select a code from this table, default is { 1688, 1130, 4785, 6547, 1465, 4578 } .
 -- @param #AUTOLASE self
 -- @param #list<#number> LaserCodes
--- @return #AUTOLASE self
+-- @return #AUTOLASE
 function AUTOLASE:SetLaserCodes( LaserCodes )
   self.LaserCodes = ( type( LaserCodes ) == "table" ) and LaserCodes or { LaserCodes }
   return self
 end
 
---- [User] Improve ground unit detection by using a zone scan and LOS check.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:EnableImproveGroundUnitsDetection()
-  self.increasegroundawareness = true
-  return self
-end
-
---- [User] Do not improve ground unit detection by using a zone scan and LOS check.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:DisableImproveGroundUnitsDetection()
-  self.increasegroundawareness = false
-  return self
-end
-
 --- (Internal) Function to set pilot menu.
 -- @param #AUTOLASE self
 -- @return #AUTOLASE self 
 function AUTOLASE:SetPilotMenu()
   if self.usepilotset then
     local pilottable = self.pilotset:GetSetObjects() or {}
-    local grouptable = {}
     for _,_unit in pairs (pilottable) do
       local Unit = _unit -- Wrapper.Unit#UNIT
       if Unit and Unit:IsAlive() then
         local Group = Unit:GetGroup()
-        local GroupName = Group:GetName() or "none"
         local unitname = Unit:GetName()
-        if not grouptable[GroupName] == true then
-          if self.playermenus[unitname] then self.playermenus[unitname]:Remove() end -- menus
-          local lasetopm = MENU_GROUP:New(Group,"Autolase",nil)
-          self.playermenus[unitname] = lasetopm
-          local lasemenu = MENU_GROUP_COMMAND:New(Group,"Status",lasetopm,self.ShowStatus,self,Group,Unit)
-          if self.smokemenu then
-            local smoke = (self.smoketargets == true) and "off" or "on"
-            local smoketext = string.format("Switch smoke targets to %s",smoke)
-            local smokemenu = MENU_GROUP_COMMAND:New(Group,smoketext,lasetopm,self.SetSmokeTargets,self,(not self.smoketargets))
-          end -- smokement
-         if self.threatmenu then
-             local threatmenutop = MENU_GROUP:New(Group,"Set min lasing threat",lasetopm)
-             for i=0,10,2 do
-              local text = "Threatlevel "..tostring(i)
-              local threatmenu = MENU_GROUP_COMMAND:New(Group,text,threatmenutop,self.SetMinThreatLevel,self,i)
-             end -- threatlevel
-         end -- threatmenu
-          for _,_grp in pairs(self.RecceSet.Set) do
-            local grp = _grp -- Wrapper.Group#GROUP
-            local unit = grp:GetUnit(1)
-            --local name = grp:GetName()
-            if unit and unit:IsAlive() then
-              local name = unit:GetName()
-              local mname = string.gsub(name,".%d+.%d+$","")
-              local code = self:GetLaserCode(name)
-              local unittop = MENU_GROUP:New(Group,"Change laser code for "..mname,lasetopm)
-              for _,_code in pairs(self.LaserCodes) do
-                local text = tostring(_code)
-                if _code == code then text = text.."(*)" end
-                local changemenu = MENU_GROUP_COMMAND:New(Group,text,unittop,self.SetRecceLaserCode,self,name,_code,true)
-              end -- Codes
-            end -- unit alive
-          end -- Recceset
-          grouptable[GroupName] = true
-        end -- grouptable[GroupName] 
+        if self.playermenus[unitname] then self.playermenus[unitname]:Remove() end
+        local lasetopm = MENU_GROUP:New(Group,"Autolase",nil)
+        self.playermenus[unitname] = lasetopm
+        local lasemenu = MENU_GROUP_COMMAND:New(Group,"Status",lasetopm,self.ShowStatus,self,Group,Unit)
+        local smoke = (self.smoketargets == true) and "off" or "on"
+        local smoketext = string.format("Switch smoke targets to %s",smoke)
+        local smokemenu = MENU_GROUP_COMMAND:New(Group,smoketext,lasetopm,self.SetSmokeTargets,self,(not self.smoketargets))
+        for _,_grp in pairs(self.RecceSet.Set) do
+          local grp = _grp -- Wrapper.Group#GROUP
+          local unit = grp:GetUnit(1)
+          --local name = grp:GetName()
+          if unit and unit:IsAlive() then
+            local name = unit:GetName()
+            local mname = string.gsub(name,".%d+.%d+$","")
+            local code = self:GetLaserCode(name)
+            local unittop = MENU_GROUP:New(Group,"Change laser code for "..mname,lasetopm)
+            for _,_code in pairs(self.LaserCodes) do
+              local text = tostring(_code)
+              if _code == code then text = text.."(*)" end
+              local changemenu = MENU_GROUP_COMMAND:New(Group,text,unittop,self.SetRecceLaserCode,self,name,_code,true)
+            end
+          end
+        end
         --lasemenu:Refresh()
-      end -- unit alive
-    end -- pilot loop
+      end
+    end
   else
     if not self.NoMenus then
       self.Menu = MENU_COALITION_COMMAND:New(self.coalition,"Autolase",nil,self.ShowStatus,self)
@@ -500,7 +443,7 @@ end
 -- @param #string Gender (Optional) Defaults to "male"
 -- @param #string Culture (Optional) Defaults to "en-US"
 -- @param #number Port (Optional) Defaults to 5002
--- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS#SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
+-- @param #string Voice (Optional) Use a specifc voice with the @{Sound.SRS.SetVoice} function, e.g, `:SetVoice("Microsoft Hedda Desktop")`.
 -- Note that this must be installed on your windows system. Can also be Google voice types, if you are using Google TTS.
 -- @param #number Volume (Optional) Volume - between 0.0 (silent) and 1.0 (loudest)
 -- @param #string PathToGoogleKey (Optional) Path to your google key if you want to use google TTS
@@ -508,18 +451,18 @@ end
 function AUTOLASE:SetUsingSRS(OnOff,Path,Frequency,Modulation,Label,Gender,Culture,Port,Voice,Volume,PathToGoogleKey)
   if OnOff then
     self.useSRS = true
-    self.SRSPath = Path or MSRS.path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
+    self.SRSPath = Path or "C:\\Program Files\\DCS-SimpleRadio-Standalone"
     self.SRSFreq = Frequency or 271
     self.SRSMod = Modulation or radio.modulation.AM
-    self.Gender = Gender or MSRS.gender or "male"
-    self.Culture = Culture or MSRS.culture or "en-US"
-    self.Port = Port or MSRS.port or 5002
+    self.Gender = Gender or "male"
+    self.Culture = Culture or "en-US"
+    self.Port = Port or 5002
     self.Voice = Voice 
     self.PathToGoogleKey = PathToGoogleKey
     self.Volume = Volume or 1.0
     self.Label = Label
     -- set up SRS
-    self.SRS = MSRS:New(self.SRSPath,self.SRSFreq,self.SRSMod)
+    self.SRS = MSRS:New(self.SRSPath,self.SRSFreq,self.SRSMod,self.Volume)
     self.SRS:SetCoalition(self.coalition)
     self.SRS:SetLabel(self.MenuName or self.Name)
     self.SRS:SetGender(self.Gender)
@@ -527,10 +470,8 @@ function AUTOLASE:SetUsingSRS(OnOff,Path,Frequency,Modulation,Label,Gender,Cultu
     self.SRS:SetPort(self.Port)
     self.SRS:SetVoice(self.Voice)
     self.SRS:SetCoalition(self.coalition)
-    self.SRS:SetVolume(self.Volume)
     if self.PathToGoogleKey then
-      self.SRS:SetProviderOptionsGoogle(PathToGoogleKey,PathToGoogleKey)
-      self.SRS:SetProvider(MSRS.Provider.GOOGLE)
+      self.SRS:SetGoogle(self.PathToGoogleKey)
     end
     self.SRSQueue = MSRSQUEUE:New(self.alias)
   else
@@ -638,54 +579,6 @@ function AUTOLASE:SetSmokeTargets(OnOff,Color)
   return self
 end
 
---- (User) Function to set rounding precision for BR distance output.
--- @param #AUTOLASE self
--- @param #number IDP Rounding precision before/after the decimal sign. Defaults to zero. Positive values round right of the decimal sign, negative ones left of the decimal sign. 
--- @return #AUTOLASE self 
-function AUTOLASE:SetRoundingPrecsion(IDP)
-  self.RoundingPrecision = IDP or 0
-  return self
-end
-
---- (User) Show the "Switch smoke target..." menu entry for pilots. On by default.
--- @param #AUTOLASE self
--- @param #table Offset (Optional) Define an offset for the smoke, i.e. not directly on the unit itself, angle is degrees and distance is meters. E.g. `autolase:EnableSmokeMenu({Angle=30,Distance=20})`
--- @return #AUTOLASE self 
-function AUTOLASE:EnableSmokeMenu(Offset)
-  self.smokemenu = true
-  if Offset then
-    self.smokeoffset = {}
-    self.smokeoffset.Distance = Offset.Distance or math.random(10,20)
-    self.smokeoffset.Angle = Offset.Angle or math.random(0,359)
-  end
-  return self
-end
-
---- (User) Do not show the "Switch smoke target..." menu entry for pilots.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:DisableSmokeMenu()
-  self.smokemenu = false
-  self.smokeoffset = nil
-  return self
-end
-
---- (User) Show the "Switch min threat lasing..." menu entry for pilots. On by default.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:EnableThreatLevelMenu()
-  self.threatmenu = true
-  return self
-end
-
---- (User) Do not show the "Switch min threat lasing..." menu entry for pilots.
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:DisableThreatLevelMenu()
-  self.threatmenu = false
-  return self
-end
-
 --- (Internal) Function to calculate line of sight.
 -- @param #AUTOLASE self
 -- @param Wrapper.Unit#UNIT Unit 
@@ -725,8 +618,7 @@ function AUTOLASE:CleanCurrentLasing()
       local unit = recce:GetUnit(1)
       local name = unit:GetName()
       if not self.RecceUnits[name] then
-        local isground = (unit and unit.IsGround) and unit:IsGround() or false
-        self.RecceUnits[name] = { name=name, unit=unit, cooldown = false, timestamp = timer.getAbsTime(), isground=isground }
+        self.RecceUnits[name] = { name=name, unit=unit, cooldown = false, timestamp = timer.getAbsTime() }
       end
     end
   end
@@ -812,11 +704,8 @@ function AUTOLASE:ShowStatus(Group,Unit)
       end
       local code = self:GetLaserCode(unit:GetName())
       report:Add(string.format("Recce %s has code %d",name,code))
-      report:Add("---------------")
     end
   end
-  report:Add(string.format("Lasing min threat level %d",self.minthreatlevel))
-  report:Add("---------------")
   local lines = 0
   for _ind,_entry in pairs(self.CurrentLasing) do
     local entry = _entry -- #AUTOLASE.LaserSpot
@@ -836,28 +725,22 @@ function AUTOLASE:ShowStatus(Group,Unit)
     if playername then
       local settings = _DATABASE:GetPlayerSettings(playername)
       if settings then
-        self:T("Get Settings ok!")
+        self:I("Get Settings ok!")
         if settings:IsA2G_MGRS() then
           locationstring = entry.coordinate:ToStringMGRS(settings)
         elseif settings:IsA2G_LL_DMS() then
           locationstring = entry.coordinate:ToStringLLDMS(settings)
-        elseif settings:IsA2G_LL_DDM() then
-         locationstring = entry.coordinate:ToStringLLDDM(settings)
         elseif settings:IsA2G_BR() then
-          -- attention this is the distance from the ASKING unit to target, not from RECCE to target!
-          local startcoordinate = Unit:GetCoordinate() or Group:GetCoordinate()
-          locationstring = entry.coordinate:ToStringBR(startcoordinate,settings,false,self.RoundingPrecision)
+          locationstring = entry.coordinate:ToStringBR(Group:GetCoordinate() or Unit:GetCoordinate(),settings)
         end
       end
     end
-    local text = string.format("+ %s lasing %s code %d\nat %s",reccename,typename,code,locationstring)
+    local text = string.format("%s lasing %s code %d\nat %s",reccename,typename,code,locationstring)
     report:Add(text)
-    report:Add("---------------")
     lines = lines + 1
   end
   if lines == 0 then
     report:Add("No targets!")
-    report:Add("---------------")
   end
   local reporttime = self.reporttimelong
   if lines == 0 then reporttime = self.reporttimeshort end
@@ -976,65 +859,6 @@ function AUTOLASE:CanLase(Recce,Unit)
   return canlase
 end
 
---- (Internal) Function to do a zone check per ground Recce and make found units and statics "known".
--- @param #AUTOLASE self
--- @return #AUTOLASE self 
-function AUTOLASE:_Prescient()
-  -- self.RecceUnits[name] = { name=name, unit=unit, cooldown = false, timestamp = timer.getAbsTime(), isground=isground }
-  for _,_data in pairs(self.RecceUnits) do
-    -- ground units only
-    if _data.isground and _data.unit and _data.unit:IsAlive() then
-      local unit = _data.unit -- Wrapper.Unit#UNIT
-      local position = unit:GetCoordinate() -- Core.Point#COORDINATE
-      local needsinit = false
-      if position then
-        local lastposition = unit:GetProperty("lastposition")
-        -- property initiated?
-        if not lastposition then
-          unit:SetProperty("lastposition",position)
-          lastposition = position
-          needsinit = true
-        end
-        -- has moved?
-        local dist = position:Get2DDistance(lastposition)
-        -- refresh?
-        local TNow = timer.getAbsTime()
-        -- check
-        if dist > 10 or needsinit==true or TNow - _data.timestamp > 29 then
-          -- init scan objects
-          local hasunits,hasstatics,_,Units,Statics = position:ScanObjects(self.LaseDistance,true,true,false)
-          -- loop found units
-          if hasunits then
-            self:T(self.lid.."Checking possibly visible UNITs for Recce "..unit:GetName())
-            for _,_target in pairs(Units) do -- Wrapper.Unit#UNIT object here
-              local target = _target -- Wrapper.Unit#UNIT
-              if target and target:GetCoalition() ~= self.coalition then
-                if unit:IsLOS(target) and (not target:IsUnitDetected(unit))then
-                  unit:KnowUnit(target,true,true)
-                end
-              end
-            end
-          end
-          -- loop found statics
-          if hasstatics then
-           self:T(self.lid.."Checking possibly visible STATICs for Recce "..unit:GetName())
-            for _,_static in pairs(Statics) do -- DCS static object here
-              local static = STATIC:Find(_static)
-              if static and static:GetCoalition() ~= self.coalition then
-                local IsLOS = position:IsLOS(static:GetCoordinate())
-                if IsLOS then
-                  unit:KnowUnit(static,true,true)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-  return self
-end
-
 -------------------------------------------------------------------
 -- FSM Functions
 -------------------------------------------------------------------
@@ -1047,9 +871,6 @@ end
 -- @return #AUTOLASE self
 function AUTOLASE:onbeforeMonitor(From, Event, To)
   self:T({From, Event, To})
-  if self.increasegroundawareness then
-    self:_Prescient()
-  end
   -- Check if group has detected any units.
   self:UpdateIntel()
   return self
@@ -1069,16 +890,16 @@ function AUTOLASE:onafterMonitor(From, Event, To)
   
   self:SetPilotMenu()
   
-  local detecteditems = self.Contacts or {} -- #table of Ops.Intel#INTEL.Contact
+  local detecteditems = self.Contacts or {} -- #table of Ops.Intelligence#INTEL.Contact
   local groupsbythreat = {}
   local report = REPORT:New("Detections")
   local lines = 0
   for _,_contact in pairs(detecteditems) do
-    local contact = _contact -- Ops.Intel#INTEL.Contact
+    local contact = _contact -- Ops.Intelligence#INTEL.Contact
     local grp = contact.group
     local coord = contact.position
     local reccename = contact.recce or "none"
-    local threat = contact.threatlevel or 0
+  local threat = contact.threatlevel or 0
     local reccegrp = UNIT:FindByName(reccename)
     if reccegrp then
       local reccecoord = reccegrp:GetCoordinate()
@@ -1202,9 +1023,6 @@ function AUTOLASE:onafterMonitor(From, Event, To)
           }
        if self.smoketargets then
           local coord = unit:GetCoordinate()
-          if self.smokeoffset then
-            coord:Translate(self.smokeoffset.Distance,self.smokeoffset.Angle,true,true)
-          end
           local color = self:GetSmokeColor(reccename)
           coord:Smoke(color)
        end
@@ -1215,8 +1033,7 @@ function AUTOLASE:onafterMonitor(From, Event, To)
     end
   end
   
-  local nextloop = -self.MonitorFrequency or -30
-  self:__Monitor(nextloop)
+  self:__Monitor(-30)
   return self
 end
 

Moose Development/Moose/Functional/CleanUp.lua

@@ -14,7 +14,7 @@
 --
 -- ## Missions:
 --
--- [CLA - CleanUp Airbase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/CleanUp)
+-- [CLA - CleanUp Airbase](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CLA%20-%20CleanUp%20Airbase)
 --
 -- ===
 --
@@ -52,13 +52,11 @@
 -- @module Functional.CleanUp
 -- @image CleanUp_Airbases.JPG
 
----
--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
+--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
 -- @field #map<#string,Wrapper.Airbase#AIRBASE> Airbases Map of Airbases.
 -- @extends Core.Base#BASE
 
----
--- @type CLEANUP_AIRBASE
+--- @type CLEANUP_AIRBASE
 -- @extends #CLEANUP_AIRBASE.__
 
 --- Keeps airbases clean, and tries to guarantee continuous airbase operations, even under combat.
@@ -95,7 +93,7 @@ CLEANUP_AIRBASE = {
 -- @field #CLEANUP_AIRBASE.__
 CLEANUP_AIRBASE.__ = {}
 
--- @field #CLEANUP_AIRBASE.__.Airbases
+--- @field #CLEANUP_AIRBASE.__.Airbases
 CLEANUP_AIRBASE.__.Airbases = {}
 
 --- Creates the main object which is handling the cleaning of the debris within the given Zone Names.
@@ -242,8 +240,7 @@ function CLEANUP_AIRBASE.__:DestroyMissile( MissileObject )
 	end
 end
 
----
--- @param #CLEANUP_AIRBASE self
+--- @param #CLEANUP_AIRBASE self
 -- @param Core.Event#EVENTDATA EventData
 function CLEANUP_AIRBASE.__:OnEventBirth( EventData )
   self:F( { EventData } )
@@ -357,7 +354,7 @@ function CLEANUP_AIRBASE.__:EventAddForCleanUp( Event )
   self:F({Event})
 
 
-	if Event.IniDCSUnit and Event.IniUnit and Event.IniCategory == Object.Category.UNIT then
+	if Event.IniDCSUnit and Event.IniCategory == Object.Category.UNIT then
 		if self.CleanUpList[Event.IniDCSUnitName] == nil then
 			if self:IsInAirbase( Event.IniUnit:GetVec2() ) then
 				self:AddForCleanUp( Event.IniUnit, Event.IniDCSUnitName )
@@ -365,7 +362,7 @@ function CLEANUP_AIRBASE.__:EventAddForCleanUp( Event )
 		end
 	end
 
-	if Event.TgtDCSUnit and Event.TgtUnit and Event.TgtCategory == Object.Category.UNIT then
+	if Event.TgtDCSUnit and Event.TgtCategory == Object.Category.UNIT then
 		if self.CleanUpList[Event.TgtDCSUnitName] == nil then
 			if self:IsInAirbase( Event.TgtUnit:GetVec2() ) then
 				self:AddForCleanUp( Event.TgtUnit, Event.TgtDCSUnitName )
@@ -387,7 +384,7 @@ function CLEANUP_AIRBASE.__:CleanUpSchedule()
 		local CleanUpUnit = CleanUpListData.CleanUpUnit -- Wrapper.Unit#UNIT
 		local CleanUpGroupName = CleanUpListData.CleanUpGroupName
 
-		if CleanUpUnit and CleanUpUnit:IsAlive() ~= nil then
+		if CleanUpUnit:IsAlive() ~= nil then
 
 		  if self:IsInAirbase( CleanUpUnit:GetVec2() ) then
 
@@ -414,7 +411,7 @@ function CLEANUP_AIRBASE.__:CleanUpSchedule()
   					end
   				end
   				-- Clean Units which are waiting for a very long time in the CleanUpZone.
-  				if CleanUpUnit and (CleanUpUnit.GetPlayerName == nil or not CleanUpUnit:GetPlayerName()) then
+  				if CleanUpUnit and not CleanUpUnit:GetPlayerName() then
   					local CleanUpUnitVelocity = CleanUpUnit:GetVelocityKMH()
   					if CleanUpUnitVelocity < 1 then
   						if CleanUpListData.CleanUpMoved then

Moose Development/Moose/Functional/ClientWatch.lua

@@ -1,687 +0,0 @@
---- **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/Designate.lua

@@ -15,12 +15,10 @@
 --  
 -- ===
 -- 
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Designate)
--- * **YouTube videos:** None
--- * **Guides:** None
---
+-- ## Missions:
+-- 
+-- [DES - Designation](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/DES%20-%20Designation)
+-- 
 -- ===
 --
 -- Targets detected by recce will be communicated to a group of attacking players.  
@@ -184,7 +182,7 @@
 
 do -- DESIGNATE
 
-  -- @type DESIGNATE
+  --- @type DESIGNATE
   -- @extends Core.Fsm#FSM_PROCESS
 
   --- Manage the designation of detected targets.
@@ -525,7 +523,7 @@ do -- DESIGNATE
 
     self.AttackSet:ForEachGroupAlive(
     
-      -- @param Wrapper.Group#GROUP AttackGroup
+      --- @param Wrapper.Group#GROUP AttackGroup
       function( AttackGroup )
         self.FlashStatusMenu[AttackGroup] = FlashMenu
       end
@@ -554,7 +552,7 @@ do -- DESIGNATE
 
     self.AttackSet:ForEachGroupAlive(
     
-      -- @param Wrapper.Group#GROUP AttackGroup
+      --- @param Wrapper.Group#GROUP AttackGroup
       function( AttackGroup )
         self.FlashDetectionMessage[AttackGroup] = FlashDetectionMessage
       end
@@ -826,7 +824,7 @@ do -- DESIGNATE
           -- This Detection is obsolete, remove from the designate scope
           self.Designating[DesignateIndex] = nil
           self.AttackSet:ForEachGroupAlive(
-            -- @param Wrapper.Group#GROUP AttackGroup
+            --- @param Wrapper.Group#GROUP AttackGroup
             function( AttackGroup )
               if AttackGroup:IsAlive() == true then
                 local DetectionText = self.Detection:DetectedItemReportSummary( DetectedItem, AttackGroup ):Text( ", " )
@@ -903,7 +901,7 @@ do -- DESIGNATE
 
     self.AttackSet:ForEachGroupAlive(
     
-      -- @param Wrapper.Group#GROUP GroupReport
+      --- @param Wrapper.Group#GROUP GroupReport
       function( AttackGroup )
       
         if self.FlashStatusMenu[AttackGroup] or ( MenuAttackGroup and ( AttackGroup:GetName() == MenuAttackGroup:GetName() ) ) then
@@ -1060,7 +1058,7 @@ do -- DESIGNATE
 
     self.AttackSet:ForEachGroupAlive(
     
-      -- @param Wrapper.Group#GROUP GroupReport
+      --- @param Wrapper.Group#GROUP GroupReport
       function( AttackGroup )
       
         self:ScheduleOnce( Delay, self.SetMenu, self, AttackGroup )
@@ -1198,7 +1196,7 @@ do -- DESIGNATE
     --local ReportTypes = REPORT:New()
     --local ReportLaserCodes = REPORT:New()
     
-    --TargetSetUnit:Flush( self )
+    TargetSetUnit:Flush( self )
 
     --self:F( { Recces = self.Recces } ) 
     for TargetUnit, RecceData in pairs( self.Recces ) do
@@ -1229,12 +1227,10 @@ do -- DESIGNATE
       end
     end    
     
-    if TargetSetUnit == nil then return end
-    
     if self.AutoLase or ( not self.AutoLase and ( self.LaseStart + Duration >= timer.getTime() ) ) then
 
       TargetSetUnit:ForEachUnitPerThreatLevel( 10, 0,
-        -- @param Wrapper.Unit#UNIT SmokeUnit
+        --- @param Wrapper.Unit#UNIT SmokeUnit
         function( TargetUnit )
         
           self:F( { TargetUnit = TargetUnit:GetName() } )
@@ -1255,7 +1251,7 @@ do -- DESIGNATE
     
                     local RecceUnit = UnitData -- Wrapper.Unit#UNIT
                     local RecceUnitDesc = RecceUnit:GetDesc()
-                    --self:F( { RecceUnit = RecceUnit:GetName(), RecceDescription = RecceUnitDesc } )x
+                    --self:F( { RecceUnit = RecceUnit:GetName(), RecceDescription = RecceUnitDesc } )
     
                     if RecceUnit:IsLasing() == false then
                       --self:F( { IsDetected = RecceUnit:IsDetected( TargetUnit ), IsLOS = RecceUnit:IsLOS( TargetUnit ) } )
@@ -1277,10 +1273,9 @@ do -- DESIGNATE
                           local Spot = RecceUnit:LaseUnit( TargetUnit, LaserCode, Duration )
                           local AttackSet = self.AttackSet
                           local DesignateName = self.DesignateName
-                          local typename = TargetUnit:GetTypeName()
     
                           function Spot:OnAfterDestroyed( From, Event, To )
-                            self.Recce:MessageToSetGroup( "Target " ..typename .. " destroyed. " .. TargetSetUnit:CountAlive() .. " targets left.", 
+                            self.Recce:MessageToSetGroup( "Target " .. TargetUnit:GetTypeName() .. " destroyed. " .. TargetSetUnit:Count() .. " targets left.", 
                                                           5, AttackSet, self.DesignateName )
                           end
     
@@ -1288,7 +1283,7 @@ do -- DESIGNATE
                           -- OK. We have assigned for the Recce a TargetUnit. We can exit the function.
                           MarkingCount = MarkingCount + 1
                           local TargetUnitType = TargetUnit:GetTypeName()
-                          RecceUnit:MessageToSetGroup( "Marking " .. TargetUnitType .. " with laser " .. RecceUnit:GetSpot().LaserCode .. " for " .. Duration .. "s.", 
+                          RecceUnit:MessageToSetGroup( "Marking " .. TargetUnit:GetTypeName() .. " with laser " .. RecceUnit:GetSpot().LaserCode .. " for " .. Duration .. "s.", 
                                                      10, self.AttackSet, DesignateName )
                           if not MarkedTypes[TargetUnitType] then
                             MarkedTypes[TargetUnitType] = true
@@ -1395,7 +1390,7 @@ do -- DESIGNATE
     local MarkedCount = 0
   
     TargetSetUnit:ForEachUnitPerThreatLevel( 10, 0,
-      -- @param Wrapper.Unit#UNIT SmokeUnit
+      --- @param Wrapper.Unit#UNIT SmokeUnit
       function( SmokeUnit )
 
         if MarkedCount < self.MaximumMarkings then
@@ -1460,10 +1455,9 @@ do -- DESIGNATE
   -- @param #DESIGNATE self
   -- @return #DESIGNATE
   function DESIGNATE:onafterDoneSmoking( From, Event, To, Index )
-    if self.Designating[Index] ~= nil then
-      self.Designating[Index] = string.gsub( self.Designating[Index], "S", "" )
-      self:SetDesignateMenu()
-    end
+
+    self.Designating[Index] = string.gsub( self.Designating[Index], "S", "" )
+    self:SetDesignateMenu()
   end
 
   --- DoneIlluminating
@@ -1476,3 +1470,5 @@ do -- DESIGNATE
   end
 
 end
+
+

Moose Development/Moose/Functional/Detection.lua

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

Moose Development/Moose/Functional/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/Escort.lua

@@ -16,13 +16,11 @@
 --   * Escort tactical situation reporting.
 -- 
 -- ===
---
--- ## Additional Material:
---
--- * **Demo Missions:** [GitHub](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Escort)
--- * **YouTube videos:** None
--- * **Guides:** None
---
+-- 
+-- ## Missions:
+-- 
+-- [ESC - Escorting](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/ESC%20-%20Escorting)
+-- 
 -- ===
 -- 
 -- Allows you to interact with escorting AI on your flight and take the lead.
@@ -1154,6 +1152,8 @@ function ESCORT:_ReportTargetsScheduler()
 
   if self.EscortGroup:IsAlive() and self.EscortClient:IsAlive() then
 
+    if true then
+
       local EscortGroupName = self.EscortGroup:GetName() 
     
       self.EscortMenuAttackNearbyTargets:RemoveSubMenus()
@@ -1224,6 +1224,177 @@ function ESCORT:_ReportTargetsScheduler()
       end
       
       return true
+    else
+--      local EscortGroupName = self.EscortGroup:GetName()
+--      local EscortTargets = self.EscortGroup:GetDetectedTargets()
+--  
+--      local ClientEscortTargets = self.EscortClient._EscortGroups[EscortGroupName].Targets
+--  
+--      local EscortTargetMessages = ""
+--      for EscortTargetID, EscortTarget in pairs( EscortTargets ) do
+--        local EscortObject = EscortTarget.object
+--        self:T( EscortObject )
+--        if EscortObject and EscortObject:isExist() and EscortObject.id_ < 50000000 then
+--  
+--          local EscortTargetUnit = UNIT:Find( EscortObject )
+--          local EscortTargetUnitName = EscortTargetUnit:GetName()
+--  
+--  
+--  
+--          --          local EscortTargetIsDetected,
+--          --                EscortTargetIsVisible,
+--          --                EscortTargetLastTime,
+--          --                EscortTargetKnowType,
+--          --                EscortTargetKnowDistance,
+--          --                EscortTargetLastPos,
+--          --                EscortTargetLastVelocity
+--          --                = self.EscortGroup:IsTargetDetected( EscortObject )
+--          --
+--          --          self:T( { EscortTargetIsDetected,
+--          --                EscortTargetIsVisible,
+--          --                EscortTargetLastTime,
+--          --                EscortTargetKnowType,
+--          --                EscortTargetKnowDistance,
+--          --                EscortTargetLastPos,
+--          --                EscortTargetLastVelocity } )
+--  
+--  
+--          local EscortTargetUnitVec3 = EscortTargetUnit:GetVec3()
+--          local EscortVec3 = self.EscortGroup:GetVec3()
+--          local Distance = ( ( EscortTargetUnitVec3.x - EscortVec3.x )^2 +
+--            ( EscortTargetUnitVec3.y - EscortVec3.y )^2 +
+--            ( EscortTargetUnitVec3.z - EscortVec3.z )^2
+--            ) ^ 0.5 / 1000
+--  
+--          self:T( { self.EscortGroup:GetName(), EscortTargetUnit:GetName(), Distance, EscortTarget } )
+--  
+--          if Distance <= 15 then
+--  
+--            if not ClientEscortTargets[EscortTargetUnitName] then
+--              ClientEscortTargets[EscortTargetUnitName] = {}
+--            end
+--            ClientEscortTargets[EscortTargetUnitName].AttackUnit = EscortTargetUnit
+--            ClientEscortTargets[EscortTargetUnitName].visible = EscortTarget.visible
+--            ClientEscortTargets[EscortTargetUnitName].type = EscortTarget.type
+--            ClientEscortTargets[EscortTargetUnitName].distance = EscortTarget.distance
+--          else
+--            if ClientEscortTargets[EscortTargetUnitName] then
+--              ClientEscortTargets[EscortTargetUnitName] = nil
+--            end
+--          end
+--        end
+--      end
+--  
+--      self:T( { "Sorting Targets Table:", ClientEscortTargets } )
+--      table.sort( ClientEscortTargets, function( a, b ) return a.Distance < b.Distance end )
+--      self:T( { "Sorted Targets Table:", ClientEscortTargets } )
+--  
+--      -- Remove the sub menus of the Attack menu of the Escort for the EscortGroup.
+--      self.EscortMenuAttackNearbyTargets:RemoveSubMenus()
+--  
+--      if self.EscortMenuTargetAssistance then
+--        self.EscortMenuTargetAssistance:RemoveSubMenus()
+--      end
+--  
+--      --for MenuIndex = 1, #self.EscortMenuAttackTargets do
+--      --  self:T( { "Remove Menu:", self.EscortMenuAttackTargets[MenuIndex] } )
+--      --  self.EscortMenuAttackTargets[MenuIndex] = self.EscortMenuAttackTargets[MenuIndex]:Remove()
+--      --end
+--  
+--  
+--      if ClientEscortTargets then
+--        for ClientEscortTargetUnitName, ClientEscortTargetData in pairs( ClientEscortTargets ) do
+--  
+--          for ClientEscortGroupName, EscortGroupData in pairs( self.EscortClient._EscortGroups ) do
+--  
+--            if ClientEscortTargetData and ClientEscortTargetData.AttackUnit:IsAlive() then
+--  
+--              local EscortTargetMessage = ""
+--              local EscortTargetCategoryName = ClientEscortTargetData.AttackUnit:GetCategoryName()
+--              local EscortTargetCategoryType = ClientEscortTargetData.AttackUnit:GetTypeName()
+--              if ClientEscortTargetData.type then
+--                EscortTargetMessage = EscortTargetMessage .. EscortTargetCategoryName .. " (" .. EscortTargetCategoryType .. ") at "
+--              else
+--                EscortTargetMessage = EscortTargetMessage .. "Unknown target at "
+--              end
+--  
+--              local EscortTargetUnitVec3 = ClientEscortTargetData.AttackUnit:GetVec3()
+--              local EscortVec3 = self.EscortGroup:GetVec3()
+--              local Distance = ( ( EscortTargetUnitVec3.x - EscortVec3.x )^2 +
+--                ( EscortTargetUnitVec3.y - EscortVec3.y )^2 +
+--                ( EscortTargetUnitVec3.z - EscortVec3.z )^2
+--                ) ^ 0.5 / 1000
+--  
+--              self:T( { self.EscortGroup:GetName(), ClientEscortTargetData.AttackUnit:GetName(), Distance, ClientEscortTargetData.AttackUnit } )
+--              if ClientEscortTargetData.visible == false then
+--                EscortTargetMessage = EscortTargetMessage .. string.format( "%.2f", Distance ) .. " estimated km"
+--              else
+--                EscortTargetMessage = EscortTargetMessage .. string.format( "%.2f", Distance ) .. " km"
+--              end
+--  
+--              if ClientEscortTargetData.visible then
+--                EscortTargetMessage = EscortTargetMessage .. ", visual"
+--              end
+--  
+--              if ClientEscortGroupName == EscortGroupName then
+--  
+--                MENU_GROUP_COMMAND:New( self.EscortClient,
+--                  EscortTargetMessage,
+--                  self.EscortMenuAttackNearbyTargets,
+--                  ESCORT._AttackTarget,
+--                  { ParamSelf = self,
+--                    ParamUnit = ClientEscortTargetData.AttackUnit
+--                  }
+--                )
+--                EscortTargetMessages = EscortTargetMessages .. "\n - " .. EscortTargetMessage
+--              else
+--                if self.EscortMenuTargetAssistance then
+--                  local MenuTargetAssistance = MENU_GROUP:New( self.EscortClient, EscortGroupData.EscortName, self.EscortMenuTargetAssistance )
+--                  MENU_GROUP_COMMAND:New( self.EscortClient,
+--                    EscortTargetMessage,
+--                    MenuTargetAssistance,
+--                    ESCORT._AssistTarget,
+--                    self,
+--                    EscortGroupData.EscortGroup,
+--                    ClientEscortTargetData.AttackUnit
+--                  )
+--                end
+--              end
+--            else
+--              ClientEscortTargetData = nil
+--            end
+--          end
+--        end
+--  
+--        if EscortTargetMessages ~= "" and self.ReportTargets == true then
+--          self.EscortGroup:MessageToClient( "Detected targets within 15 km range:" .. EscortTargetMessages:gsub("\n$",""), 20, self.EscortClient )
+--        else
+--          self.EscortGroup:MessageToClient( "No targets detected!", 20, self.EscortClient )
+--        end
+--      end
+--  
+--      if self.EscortMenuResumeMission then
+--        self.EscortMenuResumeMission:RemoveSubMenus()
+--  
+--        --    if self.EscortMenuResumeWayPoints then
+--        --      for MenuIndex = 1, #self.EscortMenuResumeWayPoints do
+--        --        self:T( { "Remove Menu:", self.EscortMenuResumeWayPoints[MenuIndex] } )
+--        --        self.EscortMenuResumeWayPoints[MenuIndex] = self.EscortMenuResumeWayPoints[MenuIndex]:Remove()
+--        --      end
+--        --    end
+--  
+--        local TaskPoints = self:RegisterRoute()
+--        for WayPointID, WayPoint in pairs( TaskPoints ) do
+--          local EscortVec3 = self.EscortGroup:GetVec3()
+--          local Distance = ( ( WayPoint.x - EscortVec3.x )^2 +
+--            ( WayPoint.y - EscortVec3.z )^2
+--            ) ^ 0.5 / 1000
+--          MENU_GROUP_COMMAND:New( self.EscortClient, "Waypoint " .. WayPointID .. " at " .. string.format( "%.2f", Distance ).. "km", self.EscortMenuResumeMission, ESCORT._ResumeMission, { ParamSelf = self, ParamWayPoint = WayPointID } )
+--        end
+--      end
+--  
+--      return true
+    end
   end
   
   return false

Moose Development/Moose/Functional/Mantis.lua

@@ -13,7 +13,7 @@
 --
 -- ## Missions:
 --
--- ### [MANTIS - Modular, Automatic and Network capable Targeting and Interception System](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Mantis)
+-- ### [MANTIS - Modular, Automatic and Network capable Targeting and Interception System](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/MTS%20-%20Mantis/MTS-010%20-%20Basic%20Mantis%20Demo)
 --
 -- ===
 --
@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
--- Last Update: Mar 2025
+-- Last Update: Nov 2023
 
 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -58,11 +58,6 @@
 -- @field #boolean ShoradLink If true, #MANTIS has #SHORAD enabled
 -- @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.
--- @field #boolean SmokeDecoy If true, smoke short range SAM units as decoy if a plane is in firing range.
--- @field #number SmokeDecoyColor Color to use, defaults to SMOKECOLOR.White
--- @field #number checkcounter Counter for SAM Table refreshes
 -- @extends Core.Base#BASE
 
 
@@ -74,7 +69,7 @@
 -- 
 -- * Moose derived  Modular, Automatic and Network capable Targeting and Interception System.
 -- * Controls a network of SAM sites. Uses detection to switch on the SAM site closest to the enemy.
--- * **Automatic mode** (default since 0.8) will set-up your SAM site network automatically for you
+-- * **Automatic mode** (default since 0.8) can set-up your SAM site network automatically for you
 -- * **Classic mode** behaves like before
 -- * Leverage evasiveness from SEAD, leverage attack range setting
 -- * Automatic setup of SHORAD based on groups of the class "short-range"
@@ -89,7 +84,6 @@
 -- * SAM sites, e.g. each **group name** begins with "Red SAM"
 -- * EWR network and AWACS, e.g. each **group name** begins with "Red EWR" and *not* e.g. "Red SAM EWR" (overlap with  "Red SAM"), "Red EWR Awacs" will be found by "Red EWR"
 -- * SHORAD, e.g. each **group name** begins with "Red SHORAD" and *not" e.g. just "SHORAD" because you might also have "Blue SHORAD"
--- * Point Defense, e.g. each **group name** begins with "Red AAA" and *not" e.g. just "AAA" because you might also have "Blue AAA"
 -- 
 -- It's important to get this right because of the nature of the filter-system in @{Core.Set#SET_GROUP}. Filters are "greedy", that is they
 -- will match *any* string that contains the search string - hence we need to avoid that SAMs, EWR and SHORAD step on each other\'s toes.
@@ -100,7 +94,7 @@
 -- Known SAM types at the time of writing are:
 -- 
 -- * Avenger
--- * Chaparral
+-- * Chaparrel
 -- * Hawk
 -- * Linebacker
 -- * NASAMS
@@ -148,7 +142,6 @@
 --  **Location** is of highest importance here. Whilst AWACS in DCS has almost the "all seeing eye", EWR don't have that. Choose your location wisely, against a mountain backdrop or inside a valley even the best EWR system
 --  doesn't work well. Prefer higher-up locations with a good view; use F7 in-game to check where you actually placed your EWR and have a look around. Apart from the obvious choice, do also consider other radar units
 --  for this role, most have "SR" (search radar) or "STR" (search and track radar) in their names, use the encyclopedia to see what they actually do.
---  **HINT** Set at least one EWR on invisible and immortal so MANTIS doesn't stop working.
 --
 -- ## 1.2 SAM sites
 --
@@ -194,32 +187,29 @@
 --        -- This is effectively a 3-stage filter allowing for zone overlap. A coordinate is accepted first when   
 --        -- it is inside any AcceptZone. Then RejectZones are checked, which enforces both borders, but also overlaps of   
 --        -- Accept- and RejectZones. Last, if it is inside a conflict zone, it is accepted.   
---        mybluemantis:AddZones(AcceptZones,RejectZones,ConflictZones)   
+--        `mybluemantis:AddZones(AcceptZones,RejectZones,ConflictZones)`   
 --        
 --        
--- ### 2.1.2 Change the number of long-, mid- and short-range, point defense systems going live on a detected target:   
+-- ### 2.1.2 Change the number of long-, mid- and short-range systems going live on a detected target:   
 -- 
---        -- parameters are numbers. Defaults are 1,2,2,6,6 respectively
---        mybluemantis:SetMaxActiveSAMs(Short,Mid,Long,Classic,Point)
+--        -- parameters are numbers. Defaults are 1,2,2,6 respectively
+--        `mybluemantis:SetMaxActiveSAMs(Short,Mid,Long,Classic)`
 -- 
--- ### 2.1.3 SHORAD/Point defense will automatically be added from SAM sites of type "point" or if the range is less than 5km or if the type is AAA. 
+-- ### 2.1.3 SHORAD will automatically be added from SAM sites of type "short-range"   
 --        
 -- ### 2.1.4 Advanced features   
 -- 
---        -- Option to switch off auto mode **before** you start MANTIS (not recommended)   
---        mybluemantis.automode = false
+--        -- switch off auto mode **before** you start MANTIS.   
+--        `mybluemantis.automode = false`
 --        
---        -- Option to set the scale of the activation range, i.e. don't activate at the fringes of max range, defaults below.   
+--        -- switch off auto shorad **before** you start MANTIS.   
+--        `mybluemantis.autoshorad = false`
+--        
+--        -- scale of the activation range, i.e. don't activate at the fringes of max range, defaults below.   
 --        -- also see engagerange below.   
---            self.radiusscale[MANTIS.SamType.LONG] = 1.1   
---            self.radiusscale[MANTIS.SamType.MEDIUM] = 1.2   
---            self.radiusscale[MANTIS.SamType.SHORT] = 1.3 
---            self.radiusscale[MANTIS.SamType.POINT] = 1.4 
---        
--- ### 2.1.5 Friendlies check in firing range
--- 
---        -- For some scenarios, like Cold War, it might be useful not to activate SAMs if friendly aircraft are around to avoid death by friendly fire.
---        mybluemantis.checkforfriendlies = true  
+--        `    self.radiusscale[MANTIS.SamType.LONG] = 1.1`   
+--        `    self.radiusscale[MANTIS.SamType.MEDIUM] = 1.2`   
+--        `    self.radiusscale[MANTIS.SamType.SHORT] = 1.3`   
 -- 
 -- # 3. Default settings [both modes unless stated otherwise]
 --
@@ -243,9 +233,9 @@
 --
 --  Use this option if you want to make use of or allow advanced SEAD tactics.
 --
--- # 5. Integrate SHORAD [classic mode, not necessary in automode, not recommended for manual setup]
+-- # 5. Integrate SHORAD [classic mode]
 --
---  You can also choose to integrate Mantis with @{Functional.Shorad#SHORAD} for protection against HARMs and AGMs manually. When SHORAD detects a missile fired at one of MANTIS' SAM sites, it will activate SHORAD systems in
+--  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:
 --
 --          local SamSet = SET_GROUP:New():FilterPrefixes("Blue SAM"):FilterCoalitions("blue"):FilterStart()
@@ -299,7 +289,6 @@ MANTIS = {
   SAM_Table_Long        = {},
   SAM_Table_Medium      = {},
   SAM_Table_Short       = {},
-  SAM_Table_PointDef    = {},
   lid                   = "",
   Detection             = nil,
   AWACS_Detection       = nil,
@@ -332,10 +321,6 @@ MANTIS = {
   automode              = true,
   autoshorad            = true,
   ShoradGroupSet        = nil,
-  checkforfriendlies    = false,
-  SmokeDecoy            = false,
-  SmokeDecoyColor       = SMOKECOLOR.White,
-  checkcounter          = 1,
 }
 
 --- Advanced state enumerator
@@ -352,17 +337,8 @@ MANTIS.SamType = {
   SHORT = "Short",
   MEDIUM = "Medium",
   LONG = "Long",
-  POINT = "Point",
 }
 
---- SAM Radiusscale
--- @type MANTIS.radiusscale
-MANTIS.radiusscale = {}
-MANTIS.radiusscale[MANTIS.SamType.LONG] = 1.1
-MANTIS.radiusscale[MANTIS.SamType.MEDIUM] = 1.2
-MANTIS.radiusscale[MANTIS.SamType.SHORT] = 1.75
-MANTIS.radiusscale[MANTIS.SamType.POINT] = 3
-
 --- SAM data
 -- @type MANTIS.SamData
 -- @field #number Range Max firing range in km
@@ -370,28 +346,27 @@ MANTIS.radiusscale[MANTIS.SamType.POINT] = 3
 -- @field #number Height Max firing height in km
 -- @field #string Type #MANTIS.SamType of SAM, i.e. SHORT, MEDIUM or LONG (range)
 -- @field #string Radar Radar typename on unit level (used as key)
--- @field #string Point Point defense capable
 MANTIS.SamData = {
-  ["Hawk"] = { Range=35, Blindspot=0, Height=12, Type="Medium", Radar="Hawk" }, -- measures in km
-  ["NASAMS"] = { Range=14, Blindspot=0, Height=7, Type="Short", Radar="NSAMS" }, -- AIM 120B
-  ["Patriot"] = { Range=99, Blindspot=0, Height=25, Type="Long", Radar="Patriot" },
-  ["Rapier"] = { Range=10, Blindspot=0, Height=3, Type="Short", Radar="rapier" },
+  ["Hawk"] = { Range=44, Blindspot=0, Height=9, Type="Medium", Radar="Hawk" }, -- measures in km
+  ["NASAMS"] = { Range=14, Blindspot=0, Height=3, Type="Short", Radar="NSAMS" },
+  ["Patriot"] = { Range=99, Blindspot=0, Height=9, Type="Long", Radar="Patriot" },
+  ["Rapier"] = { Range=6, Blindspot=0, Height=3, Type="Short", Radar="rapier" },
   ["SA-2"] = { Range=40, Blindspot=7, Height=25, Type="Medium", Radar="S_75M_Volhov" },
   ["SA-3"] = { Range=18, Blindspot=6, Height=18, Type="Short", Radar="5p73 s-125 ln" },
   ["SA-5"] = { Range=250, Blindspot=7, Height=40, Type="Long", Radar="5N62V" },
   ["SA-6"] = { Range=25, Blindspot=0, Height=8, Type="Medium", Radar="1S91" },
   ["SA-10"] = { Range=119, Blindspot=0, Height=18, Type="Long" , Radar="S-300PS 4"},
   ["SA-11"] = { Range=35, Blindspot=0, Height=20, Type="Medium", Radar="SA-11" },
-  ["Roland"] = { Range=5, Blindspot=0, Height=5, Type="Point", Radar="Roland" },
+  ["Roland"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Roland" },
   ["HQ-7"] = { Range=12, Blindspot=0, Height=3, Type="Short", Radar="HQ-7" },
-  ["SA-9"] = { Range=4, Blindspot=0, Height=3, Type="Point", Radar="Strela", Point="true" },
+  ["SA-9"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="Strela" },
   ["SA-8"] = { Range=10, Blindspot=0, Height=5, Type="Short", Radar="Osa 9A33" },
   ["SA-19"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Tunguska" },
-  ["SA-15"] = { Range=11, Blindspot=0, Height=6, Type="Point", Radar="Tor 9A331", Point="true" },
-  ["SA-13"] = { Range=5, Blindspot=0, Height=3, Type="Point", Radar="Strela", Point="true" },
+  ["SA-15"] = { Range=11, Blindspot=0, Height=6, Type="Short", Radar="Tor 9A331" },
+  ["SA-13"] = { Range=5, Blindspot=0, Height=3, Type="Short", Radar="Strela" },
   ["Avenger"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="Avenger" },
-  ["Chaparral"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Chaparral" },
-  ["Linebacker"] = { Range=4, Blindspot=0, Height=3, Type="Point", Radar="Linebacker", Point="true" },
+  ["Chaparrel"] = { Range=8, Blindspot=0, Height=3, Type="Short", Radar="Chaparral" },
+  ["Linebacker"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="Linebacker" },
   ["Silkworm"] = { Range=90, Blindspot=1, Height=0.2, Type="Long", Radar="Silkworm" },
   -- units from HDS Mod, multi launcher options is tricky
   ["SA-10B"] = { Range=75, Blindspot=0, Height=18, Type="Medium" , Radar="SA-10B"},
@@ -399,8 +374,9 @@ MANTIS.SamData = {
   ["SA-20A"] = { Range=150, Blindspot=5, Height=27, Type="Long" , Radar="S-300PMU1"},
   ["SA-20B"] = { Range=200, Blindspot=4, Height=27, Type="Long" , Radar="S-300PMU2"},
   ["HQ-2"] = { Range=50, Blindspot=6, Height=35, Type="Medium", Radar="HQ_2_Guideline_LN" },
+  ["SHORAD"] = { Range=3, Blindspot=0, Height=3, Type="Short", Radar="Igla" },
   ["TAMIR IDFA"] = { Range=20, Blindspot=0.6, Height=12.3, Type="Short", Radar="IRON_DOME_LN" },
-  ["STUNNER IDFA"] = { Range=250, Blindspot=1, Height=45, Type="Long", Radar="DAVID_SLING_LN" },   
+  ["STUNNER IDFA"] = { Range=250, Blindspot=1, Height=45, Type="Long", Radar="DAVID_SLING_LN" },  
 }
 
 --- SAM data HDS
@@ -410,7 +386,6 @@ MANTIS.SamData = {
 -- @field #number Height Max firing height in km
 -- @field #string Type #MANTIS.SamType of SAM, i.e. SHORT, MEDIUM or LONG (range)
 -- @field #string Radar Radar typename on unit level (used as key)
--- @field #string Point Point defense capable
 MANTIS.SamDataHDS = {
   -- units from HDS Mod, multi launcher options is tricky
   -- group name MUST contain HDS to ID launcher type correctly!
@@ -432,21 +407,20 @@ MANTIS.SamDataHDS = {
 -- @field #number Height Max firing height in km
 -- @field #string Type #MANTIS.SamType of SAM, i.e. SHORT, MEDIUM or LONG (range)
 -- @field #string Radar Radar typename on unit level (used as key)
--- @field #string Point Point defense capable
 MANTIS.SamDataSMA = {
   -- units from SMA Mod (Sweedish Military Assets)
   -- https://forum.dcs.world/topic/295202-swedish-military-assets-for-dcs-by-currenthill/
   -- group name MUST contain SMA to ID launcher type correctly!
-   ["RBS98M SMA"] = { Range=20, Blindspot=0.2, Height=8, Type="Short", Radar="RBS-98" },
-   ["RBS70 SMA"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="RBS-70" },  
-   ["RBS70M SMA"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="BV410_RBS70" }, 
-   ["RBS90 SMA"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="RBS-90" }, 
-   ["RBS90M SMA"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="BV410_RBS90" },  
-   ["RBS103A SMA"] = { Range=160, Blindspot=1, Height=36, Type="Long", Radar="LvS-103_Lavett103_Rb103A" },
-   ["RBS103B SMA"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_Rb103B" }, 
-   ["RBS103AM SMA"] = { Range=160, Blindspot=1, Height=36, Type="Long", Radar="LvS-103_Lavett103_HX_Rb103A" },
-   ["RBS103BM SMA"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_HX_Rb103B" },
-   ["Lvkv9040M SMA"] = { Range=2, Blindspot=0.1, Height=1.2, Type="Point", Radar="LvKv9040",Point="true" },   
+  ["RBS98M SMA"] = { Range=20, Blindspot=0, Height=8, Type="Short", Radar="RBS-98" },
+  ["RBS70 SMA"] = { Range=8, Blindspot=0, Height=5.5, Type="Short", Radar="RBS-70" },  
+  ["RBS70M SMA"] = { Range=8, Blindspot=0, Height=5.5, Type="Short", Radar="BV410_RBS70" }, 
+  ["RBS90 SMA"] = { Range=8, Blindspot=0, Height=5.5, Type="Short", Radar="RBS-90" }, 
+  ["RBS90M SMA"] = { Range=8, Blindspot=0, Height=5.5, Type="Short", Radar="BV410_RBS90" },  
+  ["RBS103A SMA"] = { Range=150, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_Rb103A" },
+  ["RBS103B SMA"] = { Range=35, Blindspot=0, Height=36, Type="Medium", Radar="LvS-103_Lavett103_Rb103B" }, 
+  ["RBS103AM SMA"] = { Range=150, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_HX_Rb103A" },
+  ["RBS103BM SMA"] = { Range=35, Blindspot=0, Height=36, Type="Medium", Radar="LvS-103_Lavett103_HX_Rb103B" },
+  ["Lvkv9040M SMA"] = { Range=4, Blindspot=0, Height=2.5, Type="Short", Radar="LvKv9040" },      
 }
 
 --- SAM data CH
@@ -456,54 +430,28 @@ MANTIS.SamDataSMA = {
 -- @field #number Height Max firing height in km
 -- @field #string Type #MANTIS.SamType of SAM, i.e. SHORT, MEDIUM or LONG (range)
 -- @field #string Radar Radar typename on unit level (used as key)
--- @field #string Point Point defense capable
 MANTIS.SamDataCH = {
-    -- units from CH (Military Assets by Currenthill)
-    -- https://www.currenthill.com/
-    -- group name MUST contain CHM to ID launcher type correctly!
-   ["2S38 CHM"] = { Range=6, Blindspot=0.1, Height=4.5, Type="Short", Radar="2S38" },
-   ["PantsirS1 CHM"] = { Range=20, Blindspot=1.2, Height=15, Type="Short", Radar="PantsirS1" }, 
-   ["PantsirS2 CHM"] = { Range=30, Blindspot=1.2, Height=18, Type="Medium", Radar="PantsirS2" }, 
-   ["PGL-625 CHM"] = { Range=10, Blindspot=1, Height=5, Type="Short", Radar="PGL_625" }, 
-   ["HQ-17A CHM"] = { Range=15, Blindspot=1.5, Height=10, Type="Short", Radar="HQ17A" }, 
-   ["M903PAC2 CHM"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="MIM104_M903_PAC2" },
-   ["M903PAC3 CHM"] = { Range=160, Blindspot=1, Height=40, Type="Long", Radar="MIM104_M903_PAC3" }, 
-   ["TorM2 CHM"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2" },
-   ["TorM2K CHM"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2K" },
-   ["TorM2M CHM"] = { Range=16, Blindspot=1, Height=10, Type="Short", Radar="TorM2M" }, 
-   ["NASAMS3-AMRAAMER CHM"] = { Range=50, Blindspot=2, Height=35.7, Type="Medium", Radar="CH_NASAMS3_LN_AMRAAM_ER" }, 
-   ["NASAMS3-AIM9X2 CHM"] = { Range=20, Blindspot=0.2, Height=18, Type="Short", Radar="CH_NASAMS3_LN_AIM9X2" },
-   ["C-RAM CHM"] = { Range=2, Blindspot=0, Height=2, Type="Point", Radar="CH_Centurion_C_RAM", Point="true" }, 
-   ["PGZ-09 CHM"] = { Range=4, Blindspot=0.5, Height=3, Type="Point", Radar="CH_PGZ09", Point="true" },
-   ["S350-9M100 CHM"] = { Range=15, Blindspot=1, Height=8, Type="Short", Radar="CH_S350_50P6_9M100" },
-   ["S350-9M96D CHM"] = { Range=150, Blindspot=2.5, Height=30, Type="Long", Radar="CH_S350_50P6_9M96D" },
-   ["LAV-AD CHM"] = { Range=8, Blindspot=0.16, Height=4.8, Type="Short", Radar="CH_LAVAD" }, 
-   ["HQ-22 CHM"] = { Range=170, Blindspot=5, Height=27, Type="Long", Radar="CH_HQ22_LN" }, 
-   ["PGZ-95 CHM"] = { Range=2.5, Blindspot=0.5, Height=2, Type="Point", Radar="CH_PGZ95",Point="true" },
-   ["LD-3000 CHM"] = { Range=2.5, Blindspot=0.1, Height=3, Type="Point", Radar="CH_LD3000_stationary", Point="true" }, 
-   ["LD-3000M CHM"] = { Range=2.5, Blindspot=0.1, Height=3, Type="Point", Radar="CH_LD3000", Point="true" },  
-   ["FlaRakRad CHM"] = { Range=8, Blindspot=1.5, Height=6, Type="Short", Radar="CH_FlaRakRad" },  
-   ["IRIS-T SLM CHM"] = { Range=40, Blindspot=0.5, Height=20, Type="Medium", Radar="CH_IRIST_SLM" }, 
-   ["M903PAC2KAT1 CHM"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="CH_MIM104_M903_PAC2_KAT1" }, 
-   ["Skynex CHM"] = { Range=3.5, Blindspot=0.1, Height=3.5, Type="Point", Radar="CH_SkynexHX", Point="true" },
-   ["Skyshield CHM"] = { Range=3.5, Blindspot=0.1, Height=3.5, Type="Point", Radar="CH_Skyshield_Gun", Point="true" },
-   ["WieselOzelot CHM"] = { Range=8, Blindspot=0.16, Height=4.8, Type="Short", Radar="CH_Wiesel2Ozelot" }, 
-   ["BukM3-9M317M CHM"] = { Range=70, Blindspot=0.25, Height=35, Type="Medium", Radar="CH_BukM3_9A317M" },  
-   ["BukM3-9M317MA CHM"] = { Range=70, Blindspot=0.25, Height=35, Type="Medium", Radar="CH_BukM3_9A317MA" },  
-   ["SkySabre CHM"] = { Range=30, Blindspot=0.5, Height=10, Type="Medium", Radar="CH_SkySabreLN" },  
-   ["Stormer CHM"] = { Range=7.5, Blindspot=0.3, Height=7, Type="Short", Radar="CH_StormerHVM" },  
-   ["THAAD CHM"] = { Range=200, Blindspot=40, Height=150, Type="Long", Radar="CH_THAAD_M1120" },  
-   ["USInfantryFIM92K CHM"] = { Range=8, Blindspot=0.16, Height=4.8, Type="Short", Radar="CH_USInfantry_FIM92" },
-   ["RBS98M CHM"] = { Range=20, Blindspot=0.2, Height=8, Type="Short", Radar="RBS-98" },
-   ["RBS70 CHM"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="RBS-70" },  
-   ["RBS70M CHM"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="BV410_RBS70" }, 
-   ["RBS90 CHM"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="RBS-90" }, 
-   ["RBS90M CHM"] = { Range=8, Blindspot=0.25, Height=6, Type="Short", Radar="BV410_RBS90" },  
-   ["RBS103A CHM"] = { Range=160, Blindspot=1, Height=36, Type="Long", Radar="LvS-103_Lavett103_Rb103A" },
-   ["RBS103B CHM"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_Rb103B" }, 
-   ["RBS103AM CHM"] = { Range=160, Blindspot=1, Height=36, Type="Long", Radar="LvS-103_Lavett103_HX_Rb103A" },
-   ["RBS103BM CHM"] = { Range=120, Blindspot=3, Height=24.5, Type="Long", Radar="LvS-103_Lavett103_HX_Rb103B" },
-   ["Lvkv9040M CHM"] = { Range=2, Blindspot=0.1, Height=1.2, Type="Point", Radar="LvKv9040",Point="true" },   
+  -- units from CH (Military Assets by Currenthill)
+  -- https://www.currenthill.com/
+  -- group name MUST contain CHM to ID launcher type correctly!
+ ["2S38 CH"] = { Range=8, Blindspot=0.5, Height=6, Type="Short", Radar="2S38" },
+ ["PantsirS1 CH"] = { Range=20, Blindspot=1.2, Height=15, Type="Short", Radar="PantsirS1" }, 
+ ["PantsirS2 CH"] = { Range=30, Blindspot=1.2, Height=18, Type="Medium", Radar="PantsirS2" }, 
+ ["PGL-625 CH"] = { Range=10, Blindspot=0.5, Height=5, Type="Short", Radar="PGL_625" }, 
+ ["HQ-17A CH"] = { Range=20, Blindspot=1.5, Height=10, Type="Short", Radar="HQ17A" }, 
+ ["M903PAC2 CH"] = { Range=160, Blindspot=3, Height=24.5, Type="Long", Radar="MIM104_M903_PAC2" },
+ ["M903PAC3 CH"] = { Range=120, Blindspot=1, Height=40, Type="Long", Radar="MIM104_M903_PAC3" }, 
+ ["TorM2 CH"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2" },
+ ["TorM2K CH"] = { Range=12, Blindspot=1, Height=10, Type="Short", Radar="TorM2K" },
+ ["TorM2M CH"] = { Range=16, Blindspot=1, Height=10, Type="Short", Radar="TorM2M" }, 
+ ["NASAMS3-AMRAAMER CH"] = { Range=50, Blindspot=2, Height=35.7, Type="Medium", Radar="CH_NASAMS3_LN_AMRAAM_ER" }, 
+ ["NASAMS3-AIM9X2 CH"] = { Range=20, Blindspot=0.2, Height=18, Type="Short", Radar="CH_NASAMS3_LN_AIM9X2" },
+ ["C-RAM CH"] = { Range=2, Blindspot=0, Height=2, Type="Short", Radar="CH_Centurion_C_RAM" }, 
+ ["PGZ-09 CH"] = { Range=4, Blindspot=0, Height=3, Type="Short", Radar="CH_PGZ09" },
+ ["S350-9M100 CH"] = { Range=15, Blindspot=1.5, Height=8, Type="Short", Radar="CH_S350_50P6_9M100" },
+ ["S350-9M96D CH"] = { Range=150, Blindspot=2.5, Height=30, Type="Long", Radar="CH_S350_50P6_9M96D" },
+ ["LAV-AD CH"] = { Range=8, Blindspot=0.2, Height=4.8, Type="Short", Radar="CH_LAVAD" }, 
+ ["HQ-22 CH"] = { Range=170, Blindspot=5, Height=27, Type="Long", Radar="CH_HQ22_LN" }, 
 }
 
 -----------------------------------------------------------------------
@@ -554,8 +502,7 @@ do
     -- DONE: Treat Awacs separately, since they might be >80km off site
     -- DONE: Allow tables of prefixes for the setup
     -- DONE: Auto-Mode with range setups for various known SAM types.
-    
-    self.name = name or "mymantis"
+
     self.SAM_Templates_Prefix = samprefix or "Red SAM"
     self.EWR_Templates_Prefix = ewrprefix or "Red EWR"
     self.HQ_Template_CC = hq or nil
@@ -564,7 +511,6 @@ do
     self.SAM_Table_Long = {}
     self.SAM_Table_Medium = {}
     self.SAM_Table_Short = {}
-    self.SAM_Table_PointDef = {}
     self.dynamic = dynamic or false
     self.checkradius = 25000
     self.grouping = 5000
@@ -593,6 +539,10 @@ do
     self.SuppressedGroups = {}
     -- 0.8 additions
     self.automode = true
+    self.radiusscale = {}
+    self.radiusscale[MANTIS.SamType.LONG] = 1.1
+    self.radiusscale[MANTIS.SamType.MEDIUM] = 1.2
+    self.radiusscale[MANTIS.SamType.SHORT] = 1.3
     --self.SAMCheckRanges = {}
     self.usezones = false
     self.AcceptZones = {}
@@ -601,7 +551,6 @@ do
     self.maxlongrange = 1
     self.maxmidrange = 2
     self.maxshortrange = 2
-    self.maxpointdefrange = 6 
     self.maxclassic = 6
     self.autoshorad = true
     self.ShoradGroupSet = SET_GROUP:New() -- Core.Set#SET_GROUP
@@ -609,10 +558,7 @@ do
     
     self.SkateZones = nil
     self.SkateNumber =  3
-    self.shootandscoot = false
-    
-    self.SmokeDecoy = false
-    self.SmokeDecoyColor = SMOKECOLOR.White
+    self.shootandscoot = false   
     
     self.UseEmOnOff = true
     if EmOnOff == false then
@@ -624,7 +570,6 @@ do
     else
       self.advAwacs = false
     end
-    
 
     -- Set the string id for output to DCS.log file.
     self.lid=string.format("MANTIS %s | ", self.name)
@@ -684,12 +629,9 @@ do
       self.HQ_CC = GROUP:FindByName(self.HQ_Template_CC)
     end
     
-    -- counter for SAM table updates
-    self.checkcounter = 1
-    
     -- TODO Version
     -- @field #string version
-    self.version="0.9.27"
+    self.version="0.8.15"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
 
     --- FSM Functions ---
@@ -886,7 +828,7 @@ do
     self.AcceptZones = AcceptZones or {}
     self.RejectZones = RejectZones or {}
     self.ConflictZones = ConflictZones or {}
-    if #self.AcceptZones > 0 or #self.RejectZones > 0 or #self.ConflictZones > 0 then
+    if #AcceptZones > 0 or #RejectZones > 0 or #ConflictZones > 0 then
       self.usezones = true
     end
     return self
@@ -925,31 +867,19 @@ do
     return self
   end
   
-  --- Function to set Short Range SAMs to spit out smoke as decoy, if an enemy plane is in range.
-  -- @param #MANTIS self
-  -- @param #boolean Onoff Set to true for on and nil/false for off.
-  -- @param #number Color (Optional) Color to use, defaults to `SMOKECOLOR.White`
-  function MANTIS:SetSmokeDecoy(Onoff,Color)
-    self.SmokeDecoy = Onoff
-    self.SmokeDecoyColor = Color or SMOKECOLOR.White
-    return self
-  end
-  
     --- Function to set number of SAMs going active on a valid, detected thread
     -- @param #MANTIS self
     -- @param #number Short Number of short-range systems activated, defaults to 1.
     -- @param #number Mid Number of mid-range systems activated, defaults to 2.
     -- @param #number Long Number of long-range systems activated, defaults to 2.
     -- @param #number Classic (non-automode) Number of overall systems activated, defaults to 6.
-    -- @param #number Point Number of point defense and AAA systems activated, defaults to 6.
     -- @return #MANTIS self
-  function MANTIS:SetMaxActiveSAMs(Short,Mid,Long,Classic,Point)
+  function MANTIS:SetMaxActiveSAMs(Short,Mid,Long,Classic)
     self:T(self.lid .. "SetMaxActiveSAMs")
     self.maxclassic = Classic or 6
     self.maxlongrange = Long or 1
     self.maxmidrange = Mid or 2
     self.maxshortrange = Short or 2
-    self.maxpointdefrange= Point or 6
     return self
   end
 
@@ -1151,24 +1081,6 @@ do
     end
     return self
   end
-  
-  --- [Internal] Check if any EWR or AWACS is still alive
-  -- @param #MANTIS self
-  -- @return #boolean outcome
-  function MANTIS:_CheckAnyEWRAlive()
-    self:T(self.lid .. "_CheckAnyEWRAlive")
-    local alive = false
-    if self.EWR_Group:CountAlive() > 0 then
-      alive = true
-    end
-    if not alive and self.AWACS_Prefix then
-      local awacs = GROUP:FindByName(self.AWACS_Prefix)
-      if awacs and awacs:IsAlive() then
-        alive = true
-      end
-    end
-    return alive
-  end
 
   --- [Internal] Function to determine state of the advanced mode
   -- @param #MANTIS self
@@ -1237,7 +1149,7 @@ do
         --self:T(self.lid.." Relocating HQ")
         local text = self.lid.." Relocating HQ"
         --local m= MESSAGE:New(text,10,"MANTIS"):ToAll()
-          _hqgrp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
+          _hqgrp:RelocateGroundRandomInRadius(20,500,true,true)
       end
       --relocate EWR
       -- TODO: maybe dependent on AlarmState? Observed: SA11 SR only relocates if no objects in reach
@@ -1251,7 +1163,7 @@ do
               local text = self.lid.." Relocating EWR ".._grp:GetName()
               local m= MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
               if self.verbose then self:I(text) end
-              _grp:RelocateGroundRandomInRadius(20,500,true,true,nil,true)
+              _grp:RelocateGroundRandomInRadius(20,500,true,true)
              end
          end
       end
@@ -1310,10 +1222,10 @@ do
   function MANTIS:_PreFilterHeight(height)
     self:T(self.lid.."_PreFilterHeight")   
     local set = {}
-    local dlink = self.Detection -- Ops.Intel#INTEL_DLINK
+    local dlink = self.Detection -- Ops.Intelligence#INTEL_DLINK
     local detectedgroups = dlink:GetContactTable()
     for _,_contact in pairs(detectedgroups) do
-      local contact = _contact -- Ops.Intel#INTEL.Contact
+      local contact = _contact -- Ops.Intelligence#INTEL.Contact
       local grp = contact.group -- Wrapper.Group#GROUP
       if grp:IsAlive() then
         if grp:GetHeight(true) < height then
@@ -1343,10 +1255,6 @@ do
       -- DEBUG
       set = self:_PreFilterHeight(height)
     end
-    --self.friendlyset -- Core.Set#SET_GROUP
-    if self.checkforfriendlies == true and self.friendlyset == nil then
-      self.friendlyset = SET_GROUP:New():FilterCoalitions(self.Coalition):FilterCategories({"plane","helicopter"}):FilterFunction(function(grp) if grp and grp:InAir() then return true else return false end end):FilterStart()
-    end
     for _,_coord in pairs (set) do
       local coord = _coord  -- get current coord to check
       -- output for cross-check
@@ -1361,27 +1269,18 @@ do
         zonecheck = self:_CheckCoordinateInZones(coord)
       end
       if self.verbose and self.debug then
-        --local dectstring = coord:ToStringLLDMS()
-        local samstring = samcoordinate:ToStringMGRS({MGRS_Accuracy=0})
-        samstring = string.gsub(samstring,"%s","")
+        local dectstring = coord:ToStringLLDMS()
+        local samstring = samcoordinate:ToStringLLDMS()
         local inrange = "false"
         if targetdistance <= rad then
           inrange = "true"
         end
-        local text = string.format("Checking SAM at %s | Tgtdist %.1fkm | Rad %.1fkm | Inrange %s", samstring, targetdistance/1000, rad/1000, inrange)
+        local text = string.format("Checking SAM at %s | Targetdist %d | Rad %d | Inrange %s", samstring, targetdistance, rad, inrange)
         local m = MESSAGE:New(text,10,"Check"):ToAllIf(self.debug)
         self:T(self.lid..text)
       end
-      -- friendlies around?
-      local nofriendlies = true
-      if self.checkforfriendlies == true then
-        local closestfriend, distance = self.friendlyset:GetClosestGroup(samcoordinate)
-        if closestfriend and distance and distance < rad then
-          nofriendlies = false
-        end
-      end
       -- end output to cross-check
-      if targetdistance <= rad and zonecheck == true and nofriendlies == true then
+      if targetdistance <= rad and zonecheck then
         return true, targetdistance
       end
     end
@@ -1476,7 +1375,7 @@ do
   -- @return #string type Long, medium or short range
   -- @return #number blind "blind" spot
   function MANTIS:_GetSAMDataFromUnits(grpname,mod,sma,chm)
-    self:T(self.lid.."_GetSAMDataFromUnits")
+    self:T(self.lid.."_GetSAMRangeFromUnits")
     local found = false
     local range = self.checkradius
     local height = 3000
@@ -1515,17 +1414,6 @@ do
       end
       if found then break end
     end
-    --- AAA or Point Defense
-    if not found then
-      local grp = GROUP:FindByName(grpname)
-      if (grp and grp:IsAlive() and grp:IsAAA()) or string.find(grpname,"AAA",1,true) then
-        range = 2000
-        height = 2000
-        blind = 50
-        type = MANTIS.SamType.POINT
-        found = true
-      end
-    end
     if not found then
       self:E(self.lid .. string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname))
     end
@@ -1540,7 +1428,7 @@ do
   -- @return #string type Long, medium or short range
   -- @return #number blind "blind" spot
   function MANTIS:_GetSAMRange(grpname)
-    self:T(self.lid.."_GetSAMRange for "..tostring(grpname))
+    self:T(self.lid.."_GetSAMRange")
     local range = self.checkradius
     local height = 3000
     local type = MANTIS.SamType.MEDIUM
@@ -1557,9 +1445,9 @@ do
     elseif string.find(grpname,"CHM",1,true) then
       CHMod = true
     end
-    --if self.automode then
+    if self.automode then
       for idx,entry in pairs(self.SamData) do
-        self:T2("ID = " .. idx)
+        --self:I("ID = " .. idx)
         if string.find(grpname,idx,1,true) then
           local _entry = entry -- #MANTIS.SamData
           type = _entry.Type
@@ -1567,32 +1455,18 @@ do
           range = _entry.Range * 1000 * radiusscale -- max firing range
           height = _entry.Height * 1000 -- max firing height        
           blind = _entry.Blindspot 
-          self:T("Matching Groupname = " .. grpname .. " Range= " .. range)
+          --self:I("Matching Groupname = " .. grpname .. " Range= " .. range)
           found = true
           break
         end
       end
-    --end
-    --- Secondary - AAA or Point Defense
-    if not found then
-      local grp = GROUP:FindByName(grpname)
-      if (grp and grp:IsAlive() and grp:IsAAA()) or string.find(grpname,"AAA",1,true) then
-        range = 2000
-        height = 2000
-        blind = 50
-        type = MANTIS.SamType.POINT
-        found = true
-      end
     end
-    --- Tertiary filter if not found
-    if (not found) or HDSmod or SMAMod or CHMod then
+    -- secondary filter if not found
+    if (not found and self.automode) or HDSmod or SMAMod or CHMod then
       range, height, type = self:_GetSAMDataFromUnits(grpname,HDSmod,SMAMod,CHMod)
     elseif not found then
       self:E(self.lid .. string.format("*****Could not match radar data for %s! Will default to midrange values!",grpname))
     end
-    if found and string.find(grpname,"SHORAD",1,true) then
-      type = MANTIS.SamType.POINT -- force short on match
-    end
     return range, height, type, blind
   end
   
@@ -1610,7 +1484,6 @@ do
      local SAM_Tbl_lg = {} -- table of long range SAM defense zones
      local SAM_Tbl_md = {} -- table of mid range SAM defense zones
      local SAM_Tbl_sh = {} -- table of short range SAM defense zones
-     local SAM_Tbl_pt = {} -- table of point defense/AAA
      local SEAD_Grps = {} -- table of SAM names to make evasive
      local engagerange = self.engagerange -- firing range in % of max
      --cycle through groups and set alarm state etc
@@ -1629,27 +1502,23 @@ do
         local grpname = group:GetName()
         local grpcoord = group:GetCoordinate()
         local grprange,grpheight,type,blind  = self:_GetSAMRange(grpname)
-        table.insert( SAM_Tbl, {grpname, grpcoord, grprange, grpheight, blind, type})
+        table.insert( SAM_Tbl, {grpname, grpcoord, grprange, grpheight, blind})
         --table.insert( SEAD_Grps, grpname )
         if type == MANTIS.SamType.LONG then
-          table.insert( SAM_Tbl_lg, {grpname, grpcoord, grprange, grpheight, blind, type})
+          table.insert( SAM_Tbl_lg, {grpname, grpcoord, grprange, grpheight, blind})
           table.insert( SEAD_Grps, grpname )
-          self:T("SAM "..grpname.." is type LONG")
+          --self:T("SAM "..grpname.." is type LONG")
         elseif type == MANTIS.SamType.MEDIUM then
-         table.insert( SAM_Tbl_md, {grpname, grpcoord, grprange, grpheight, blind, type})
+         table.insert( SAM_Tbl_md, {grpname, grpcoord, grprange, grpheight, blind})
          table.insert( SEAD_Grps, grpname )
-         self:T("SAM "..grpname.." is type MEDIUM")
+         --self:T("SAM "..grpname.." is type MEDIUM")
         elseif type == MANTIS.SamType.SHORT then
-          table.insert( SAM_Tbl_sh, {grpname, grpcoord, grprange, grpheight, blind, type})
-          table.insert( SEAD_Grps, grpname )
-          self:T("SAM "..grpname.." is type SHORT")
-        elseif type == MANTIS.SamType.POINT then
-          table.insert( SAM_Tbl_pt, {grpname, grpcoord, grprange, grpheight, blind, type})
-          self:T("SAM "..grpname.." is type POINT")
+          table.insert( SAM_Tbl_sh, {grpname, grpcoord, grprange, grpheight, blind})
+          --self:T("SAM "..grpname.." is type SHORT")
           self.ShoradGroupSet:Add(grpname,group)
           if not self.autoshorad then
             table.insert( SEAD_Grps, grpname )
-          end  
+          end
         end
         self.SamStateTracker[grpname] = "GREEN"
         end
@@ -1658,7 +1527,6 @@ do
      self.SAM_Table_Long = SAM_Tbl_lg
      self.SAM_Table_Medium = SAM_Tbl_md
      self.SAM_Table_Short = SAM_Tbl_sh
-     self.SAM_Table_PointDef = SAM_Tbl_pt
      -- make SAMs evasive
      local mysead = SEAD:New( SEAD_Grps, self.Padding ) -- Functional.Sead#SEAD
      mysead:SetEngagementRange(engagerange)
@@ -1682,8 +1550,7 @@ do
      local SAM_Tbl = {} -- table of SAM defense zones
      local SAM_Tbl_lg = {} -- table of long range SAM defense zones
      local SAM_Tbl_md = {} -- table of mid range SAM defense zones
-     local SAM_Tbl_sh = {} -- table of short range SAM defense zones
-     local SAM_Tbl_pt = {} -- table of point defense/AAA
+     local SAM_Tbl_sh = {} -- table of short range SAM defense zon
      local SEAD_Grps = {} -- table of SAM names to make evasive
      local engagerange = self.engagerange -- firing range in % of max
      --cycle through groups and set alarm state etc
@@ -1694,21 +1561,17 @@ do
           local grpname = group:GetName()
           local grpcoord = group:GetCoordinate()
           local grprange, grpheight,type,blind  = self:_GetSAMRange(grpname)
-          local radaralive = group:IsSAM()
-          table.insert( SAM_Tbl, {grpname, grpcoord, grprange, grpheight, blind, type}) -- make the table lighter, as I don't really use the zone here
+          table.insert( SAM_Tbl, {grpname, grpcoord, grprange, grpheight, blind}) -- make the table lighter, as I don't really use the zone here
           table.insert( SEAD_Grps, grpname )
-          if type == MANTIS.SamType.LONG and radaralive then
-            table.insert( SAM_Tbl_lg, {grpname, grpcoord, grprange, grpheight, blind, type})
-            self:T({grpname,grprange, grpheight})
-          elseif type == MANTIS.SamType.MEDIUM and radaralive then
-           table.insert( SAM_Tbl_md, {grpname, grpcoord, grprange, grpheight, blind, type})
-           self:T({grpname,grprange, grpheight})
-          elseif type == MANTIS.SamType.SHORT and radaralive then
-           table.insert( SAM_Tbl_sh, {grpname, grpcoord, grprange, grpheight, blind, type})
-           self:T({grpname,grprange, grpheight})
-          elseif type == MANTIS.SamType.POINT or (not radaralive) then
-            table.insert( SAM_Tbl_pt, {grpname, grpcoord, grprange, grpheight, blind, type})
-            self:T({grpname,grprange, grpheight})
+          if type == MANTIS.SamType.LONG then
+            table.insert( SAM_Tbl_lg, {grpname, grpcoord, grprange, grpheight, blind})
+            --self:I({grpname,grprange, grpheight})
+          elseif type == MANTIS.SamType.MEDIUM then
+           table.insert( SAM_Tbl_md, {grpname, grpcoord, grprange, grpheight, blind})
+           --self:I({grpname,grprange, grpheight})
+          elseif type == MANTIS.SamType.SHORT then
+            table.insert( SAM_Tbl_sh, {grpname, grpcoord, grprange, grpheight, blind})
+            -- self:I({grpname,grprange, grpheight})
             self.ShoradGroupSet:Add(grpname,group)
             if self.autoshorad then
               self.Shorad.Groupset = self.ShoradGroupSet
@@ -1720,7 +1583,6 @@ do
      self.SAM_Table_Long = SAM_Tbl_lg
      self.SAM_Table_Medium = SAM_Tbl_md
      self.SAM_Table_Short = SAM_Tbl_sh
-     self.SAM_Table_PointDef = SAM_Tbl_pt
      -- make SAMs evasive
      if self.mysead ~= nil then
       local mysead = self.mysead
@@ -1764,33 +1626,20 @@ do
   -- @param #table detset Table of COORDINATES
   -- @param #boolean dlink Using DLINK
   -- @param #number limit of SAM sites to go active on a contact
-  -- @return #number instatusred
-  -- @return #number instatusgreen
-  -- @return #number activeshorads
+  -- @return #MANTIS self
   function MANTIS:_CheckLoop(samset,detset,dlink,limit)
     self:T(self.lid .. "CheckLoop " .. #detset .. " Coordinates")
     local switchedon = 0
-    local instatusred = 0
-    local instatusgreen = 0
-    local activeshorads = 0
-    local SEADactive = 0
     for _,_data in pairs (samset) do
       local samcoordinate = _data[2]
       local name = _data[1]
       local radius = _data[3]
       local height = _data[4]
       local blind = _data[5] * 1.25 + 1
-      local shortsam = (_data[6] == MANTIS.SamType.SHORT) and true or false
-      if not shortsam then
-        shortsam = (_data[6] == MANTIS.SamType.POINT) and true or false
-      end
       local samgroup = GROUP:FindByName(name)
       local IsInZone, Distance = self:_CheckObjectInZone(detset, samcoordinate, radius, height, dlink)
       local suppressed = self.SuppressedGroups[name] or false
-      local activeshorad = false
-      if self.Shorad and self.Shorad.ActiveGroups and self.Shorad.ActiveGroups[name] then
-       activeshorad = true
-      end
+      local activeshorad = self.Shorad.ActiveGroups[name] or false
       if IsInZone and not suppressed and not activeshorad then --check any target in zone and not currently managed by SEAD
         if samgroup:IsAlive() then
           -- switch on SAM
@@ -1803,23 +1652,12 @@ do
           elseif (not self.UseEmOnOff) and switchedon < limit then
             samgroup:OptionAlarmStateRed()
             switchedon = switchedon + 1
-            switch = true           
+            switch = true
           end
           if self.SamStateTracker[name] ~= "RED" and switch then
             self:__RedState(1,samgroup)
             self.SamStateTracker[name] = "RED"
           end
-          -- TODO doesn't work
-          if shortsam == true and self.SmokeDecoy == true then
-            self:T("Smoking")
-            local units = samgroup:GetUnits() or {}
-            local smoke = self.SmokeDecoyColor or SMOKECOLOR.White
-            for _,unit in pairs(units) do
-              if unit and unit:IsAlive() then
-                unit:GetCoordinate():Smoke(smoke)
-              end
-            end
-          end
           -- link in to SHORAD if available
           -- DONE: Test integration fully
           if self.ShoradLink and (Distance < self.ShoradActDistance or Distance < blind ) then -- don't give SHORAD position away too early
@@ -1832,7 +1670,7 @@ do
           -- debug output
           if (self.debug or self.verbose) and switch then
             local text = string.format("SAM %s in alarm state RED!", name)
-            --local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug
+            local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
             if self.verbose then self:I(self.lid..text) end
           end
         end --end alive
@@ -1850,27 +1688,13 @@ do
           end
           if self.debug or self.verbose then
             local text = string.format("SAM %s in alarm state GREEN!", name)
-            --local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
+            local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
             if self.verbose then self:I(self.lid..text) end
           end
         end --end alive
-      end --end check     
-    end --for loop
-    if self.debug or self.verbose then
-      for _,_status in pairs(self.SamStateTracker) do
-        if _status == "GREEN" then
-          instatusgreen=instatusgreen+1
-        elseif _status == "RED" then
-          instatusred=instatusred+1
-        end
-      end
-      if self.Shorad then
-        for _,_name in pairs(self.Shorad.ActiveGroups or {}) do
-          activeshorads=activeshorads+1
-        end
-      end
-    end
-    return instatusred, instatusgreen, activeshorads
+      end --end check
+    end --for for loop
+    return self
   end
   
   --- [Internal] Check detection function
@@ -1883,38 +1707,22 @@ do
     --get detected set
     local detset = detection:GetDetectedItemCoordinates()
     --self:T("Check:", {detset})
-    -- update SAM Table evey 3 runs
-    if self.checkcounter%3 == 0 then
+    -- randomly update SAM Table
+    local rand = math.random(1,100)
+    if rand > 65 then -- 1/3 of cases
       self:_RefreshSAMTable()
     end
-    self.checkcounter = self.checkcounter + 1
-    local instatusred = 0
-    local instatusgreen = 0
-    local activeshorads = 0
     -- switch SAMs on/off if (n)one of the detected groups is inside their reach
     if self.automode then
       local samset = self.SAM_Table_Long -- table of i.1=names, i.2=coordinates, i.3=firing range, i.4=firing height
-      local instatusredl, instatusgreenl, activeshoradsl = self:_CheckLoop(samset,detset,dlink,self.maxlongrange)
+      self:_CheckLoop(samset,detset,dlink,self.maxlongrange)
       local samset = self.SAM_Table_Medium -- table of i.1=names, i.2=coordinates, i.3=firing range, i.4=firing height
-      local instatusredm, instatusgreenm, activeshoradsm = self:_CheckLoop(samset,detset,dlink,self.maxmidrange)
+      self:_CheckLoop(samset,detset,dlink,self.maxmidrange)
       local samset = self.SAM_Table_Short -- table of i.1=names, i.2=coordinates, i.3=firing range, i.4=firing height
-      local instatusreds, instatusgreens, activeshoradss = self:_CheckLoop(samset,detset,dlink,self.maxshortrange)
-      local samset = self.SAM_Table_PointDef -- table of i.1=names, i.2=coordinates, i.3=firing range, i.4=firing height
-      instatusred, instatusgreen, activeshorads = self:_CheckLoop(samset,detset,dlink,self.maxpointdefrange)
+      self:_CheckLoop(samset,detset,dlink,self.maxshortrange)
     else
       local samset = self:_GetSAMTable() -- table of i.1=names, i.2=coordinates, i.3=firing range, i.4=firing height
-      instatusred, instatusgreen, activeshorads = self:_CheckLoop(samset,detset,dlink,self.maxclassic)
-    end
-    if self.debug or self.verbose then
-      local statusreport = REPORT:New("\nMANTIS Status "..self.name)
-      statusreport:Add("+-----------------------------+")
-      statusreport:Add(string.format("+ SAM in RED State: %2d",instatusred))
-      statusreport:Add(string.format("+ SAM in GREEN State: %2d",instatusgreen))
-      if self.Shorad then
-       statusreport:Add(string.format("+ SHORAD active: %2d",activeshorads))  
-      end
-      statusreport:Add("+-----------------------------+")
-      MESSAGE:New(statusreport:Text(),10):ToAll():ToLog()
+      self:_CheckLoop(samset,detset,dlink,self.maxclassic)
     end
     return self
   end
@@ -1969,7 +1777,7 @@ do
   -- @return #MANTIS self
   function MANTIS:_CheckDLinkState()
     self:T(self.lid .. "_CheckDLinkState")
-    local dlink = self.Detection -- Ops.Intel#INTEL_DLINK
+    local dlink = self.Detection -- Ops.Intelligence#INTEL_DLINK
     local TS = timer.getAbsTime()
     if not dlink:Is("Running") and (TS - self.DLTimeStamp > 29) then
       self.DLink = false
@@ -1999,7 +1807,7 @@ do
     end
     --]]
     if self.autoshorad then
-      self.Shorad = SHORAD:New(self.name.."-SHORAD","SHORAD",self.SAM_Group,self.ShoradActDistance,self.ShoradTime,self.coalition,self.UseEmOnOff)
+      self.Shorad = SHORAD:New(self.name.."-SHORAD",self.name.."-SHORAD",self.SAM_Group,self.ShoradActDistance,self.ShoradTime,self.coalition,self.UseEmOnOff)
       self.Shorad:SetDefenseLimits(80,95)
       self.ShoradLink = true
       self.Shorad.Groupset=self.ShoradGroupSet
@@ -2024,34 +1832,12 @@ do
     if not self.state2flag then
       self:_Check(self.Detection,self.DLink)
     end
-  
-    local EWRAlive = self:_CheckAnyEWRAlive()
-    
-    local function FindSAMSRTR()
-      for i=1,1000 do
-        local randomsam = self.SAM_Group:GetRandom()
-        if randomsam and randomsam:IsAlive() then
-          if randomsam:IsSAM() then return randomsam end
-        end
-      end
-    end
-    
-    -- Switch on a random SR/TR if no EWR left over
-    if not EWRAlive then
-      local randomsam = FindSAMSRTR() -- Wrapper.Group#GROUP
-      if randomsam and randomsam:IsAlive() then
-        if self.UseEmOnOff then
-          randomsam:EnableEmission(true)
-        else
-          randomsam:OptionAlarmStateRed()
-        end
-        local name = randomsam:GetName()
-        if self.SamStateTracker[name] ~= "RED" then
-          self:__RedState(1,randomsam)
-          self.SamStateTracker[name] = "RED"
-        end
-      end
+
+    --[[ check Awacs
+    if self.advAwacs and not self.state2flag then
+      self:_Check(self.AWACS_Detection,false)
     end
+    --]]
     
     -- relocate HQ and EWR
     if self.autorelocate then
@@ -2061,6 +1847,8 @@ do
 
       local halfintv = math.floor(timepassed / relointerval)
 
+      --self:T({timepassed=timepassed, halfintv=halfintv})
+
       if halfintv >= 1 then
         self.TimeStamp = timer.getAbsTime()
         self:_Relocate()
@@ -2189,7 +1977,7 @@ do
       local Shorad = self.Shorad
       local radius = self.checkradius
       local ontime = self.ShoradTime
-      Shorad:WakeUpShorad(Name, radius, ontime, nil, true)
+      Shorad:WakeUpShorad(Name, radius, ontime)
       self:__ShoradActivated(1,Name, radius, ontime)
     end
     return self

Moose Development/Moose/Functional/MissileTrainer.lua

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

Moose Development/Moose/Functional/Scoring.lua

@@ -19,7 +19,7 @@
 --
 -- ## Missions:
 --
--- [SCO - Scoring](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Scoring)
+-- [SCO - Scoring](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SCO%20-%20Scoring)
 --
 -- ===
 --
@@ -78,8 +78,7 @@
 -- ### Authors: **FlightControl**
 --
 -- ### Contributions:
---  
---   * **Applevangelist**: Additional functionality, fixes.
+--
 --   * **Wingthor (TAW)**: Testing & Advice.
 --   * **Dutch-Baron (TAW)**: Testing & Advice.
 --   * **Whisper**: Testing and Advice.
@@ -117,13 +116,11 @@
 -- Special targets can be set that will give extra scores to the players when these are destroyed.
 -- Use the methods @{#SCORING.AddUnitScore}() and @{#SCORING.RemoveUnitScore}() to specify a special additional score for a specific @{Wrapper.Unit}s.
 -- Use the methods @{#SCORING.AddStaticScore}() and @{#SCORING.RemoveStaticScore}() to specify a special additional score for a specific @{Wrapper.Static}s.
--- Use the method @{#SCORING.AddScoreSetGroup}() to specify a special additional score for a specific @{Wrapper.Group}s gathered in a @{Core.Set#SET_GROUP}.
+-- Use the method @{#SCORING.SetGroupGroup}() to specify a special additional score for a specific @{Wrapper.Group}s.
 --
 --      local Scoring = SCORING:New( "Scoring File" )
 --      Scoring:AddUnitScore( UNIT:FindByName( "Unit #001" ), 200 )
 --      Scoring:AddStaticScore( STATIC:FindByName( "Static #1" ), 100 )
---      local GroupSet = SET_GROUP:New():FilterPrefixes("RAT"):FilterStart()
---      Scoring:AddScoreSetGroup( GroupSet, 100)
 --
 -- The above grants an additional score of 200 points for Unit #001 and an additional 100 points of Static #1 if these are destroyed.
 -- Note that later in the mission, one can remove these scores set, for example, when the a goal achievement time limit is over.
@@ -229,7 +226,7 @@ SCORING = {
   ClassID = 0,
   Players = {},
   AutoSave = true,
-  version = "1.18.4"
+  version = "1.17.1"
 }
 
 local _SCORINGCoalition = {
@@ -248,15 +245,13 @@ local _SCORINGCategory = {
 --- Creates a new SCORING object to administer the scoring achieved by players.
 -- @param #SCORING self
 -- @param #string GameName The name of the game. This name is also logged in the CSV score file.
--- @param #string SavePath (Optional) Path where to save the CSV file, defaults to your **<User>\\Saved Games\\DCS\\Logs** folder.
--- @param #boolean AutoSave (Optional) If passed as `false`, then swith autosave off.
 -- @return #SCORING self
 -- @usage
 --
 --   -- Define a new scoring object for the mission Gori Valley.
 --   ScoringObject = SCORING:New( "Gori Valley" )
 --
-function SCORING:New( GameName, SavePath, AutoSave )
+function SCORING:New( GameName )
 
   -- Inherits from BASE
   local self = BASE:Inherit( self, BASE:New() ) -- #SCORING
@@ -281,15 +276,9 @@ function SCORING:New( GameName, SavePath, AutoSave )
   self:SetMessagesZone( true )
 
   -- Scales
-  
   self:SetScaleDestroyScore( 10 )
   self:SetScaleDestroyPenalty( 30 )
 
-  -- Hitting a target multiple times before destoying it should not result in a higger score
-  -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
-  -- Making this configurable to anyone can enable this anyway if they want
-  self:SetScoreIncrementOnHit(0)
-
   -- Default fratricide penalty level (maximum penalty that can be assigned to a player before he gets kicked).
   self:SetFratricide( self.ScaleDestroyPenalty * 3 )
   self.penaltyonfratricide = true
@@ -319,8 +308,7 @@ function SCORING:New( GameName, SavePath, AutoSave )
   end )
 
   -- Create the CSV file.
-  self.AutoSavePath = SavePath
-  self.AutoSave = AutoSave or true
+  self.AutoSave = true
   self:OpenCSV( GameName )
 
   return self
@@ -434,31 +422,6 @@ function SCORING:AddScoreGroup( ScoreGroup, Score )
   return self
 end
 
---- Specify a special additional score for a @{Core.Set#SET_GROUP}.
--- @param #SCORING self
--- @param Core.Set#SET_GROUP Set The @{Core.Set#SET_GROUP} for which each @{Wrapper.Unit} in each Group a Score is given.
--- @param #number Score The Score value.
--- @return #SCORING
-function SCORING:AddScoreSetGroup(Set, Score)
-  local set = Set:GetSetObjects()
-  
-  for _,_group in pairs (set) do
-    if _group and _group:IsAlive() then
-      self:AddScoreGroup(_group,Score)
-    end
-  end
-  
-  local function AddScore(group)
-    self:AddScoreGroup(group,Score)
-  end
-  
-  function Set:OnAfterAdded(From,Event,To,ObjectName,Object)
-    AddScore(Object)
-  end
-  
-  return self
-end
-
 --- Add a @{Core.Zone} to define additional scoring when any object is destroyed in that zone.
 -- Note that if a @{Core.Zone} with the same name is already within the scoring added, the @{Core.Zone} (type) and Score will be replaced!
 -- This allows for a dynamic destruction zone evolution within your mission.
@@ -504,16 +467,6 @@ function SCORING:SetMessagesHit( OnOff )
   return self
 end
 
---- Configure to increment score after a target has been hit.
--- @param #SCORING self
--- @param #number score  amount of point to inclement score on each hit
--- @return #SCORING
-function SCORING:SetScoreIncrementOnHit( score )
-
-  self.ScoreIncrementOnHit = score
-  return self
-end
-
 --- If to send messages after a target has been hit.
 -- @param #SCORING self
 -- @return #boolean
@@ -932,7 +885,6 @@ function SCORING:OnEventBirth( Event )
       Event.IniUnit.BirthTime = timer.getTime()
       if PlayerName then
         self:_AddPlayerFromUnit( Event.IniUnit )
-        self.Players[PlayerName].PlayerKills = 0
         self:SetScoringMenu( Event.IniGroup )
       end
     end
@@ -1061,11 +1013,11 @@ function SCORING:_EventOnHit( Event )
         PlayerHit.PenaltyHit = PlayerHit.PenaltyHit or 0
         PlayerHit.TimeStamp = PlayerHit.TimeStamp or 0
         PlayerHit.UNIT = PlayerHit.UNIT or TargetUNIT
-        -- After an instant kill we can't compute the threat level anymore. To fix this we compute at OnEventBirth
+        -- After an instant kill we can't compute the thread level anymore. To fix this we compute at OnEventBirth
         if PlayerHit.UNIT.ThreatType == nil then
-          PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
+        PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
           -- if this fails for some reason, set a good default value
-          if PlayerHit.ThreatType == nil or PlayerHit.ThreatType == "" then
+          if PlayerHit.ThreatType == nil then
             PlayerHit.ThreatLevel = 1
             PlayerHit.ThreatType = "Unknown"
           end
@@ -1073,7 +1025,7 @@ function SCORING:_EventOnHit( Event )
           PlayerHit.ThreatLevel = PlayerHit.UNIT.ThreatLevel
           PlayerHit.ThreatType = PlayerHit.UNIT.ThreatType
         end
-        
+
         -- Only grant hit scores if there was more than one second between the last hit.        
         if timer.getTime() - PlayerHit.TimeStamp > 1 then
           PlayerHit.TimeStamp = timer.getTime()
@@ -1108,8 +1060,10 @@ function SCORING:_EventOnHit( Event )
               end
               self:ScoreCSV( InitPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, InitUnitName, InitUnitCoalition, InitUnitCategory, InitUnitType, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType )
             else
-              Player.Score = Player.Score + self.ScoreIncrementOnHit
-              PlayerHit.Score = PlayerHit.Score + self.ScoreIncrementOnHit
+              -- Hitting a target multiple times before destoying it should not result in a higger score
+              -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
+              -- Player.Score = Player.Score + 1
+              -- PlayerHit.Score = PlayerHit.Score + 1
               PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1
               if TargetPlayerName ~= nil then -- It is a player hitting another player ...
                 MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. InitPlayerName .. "' hit enemy player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " .. PlayerHit.ScoreHit .. " times. " ..
@@ -1172,9 +1126,9 @@ function SCORING:_EventOnHit( Event )
         PlayerHit.PenaltyHit = PlayerHit.PenaltyHit or 0
         PlayerHit.TimeStamp = PlayerHit.TimeStamp or 0
         PlayerHit.UNIT = PlayerHit.UNIT or TargetUNIT
-        -- After an instant kill we can't compute the threat level anymore. To fix this we compute at OnEventBirth
+        -- After an instant kill we can't compute the thread level anymore. To fix this we compute at OnEventBirth
         if PlayerHit.UNIT.ThreatType == nil then
-          PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
+        PlayerHit.ThreatLevel, PlayerHit.ThreatType = PlayerHit.UNIT:GetThreatLevel()
           -- if this fails for some reason, set a good default value
           if PlayerHit.ThreatType == nil then
             PlayerHit.ThreatLevel = 1
@@ -1209,8 +1163,10 @@ function SCORING:_EventOnHit( Event )
                 :ToCoalitionIf( Event.WeaponCoalition, self:IfMessagesHit() and self:IfMessagesToCoalition() )
               self:ScoreCSV( Event.WeaponPlayerName, TargetPlayerName, "HIT_PENALTY", 1, -10, Event.WeaponName, Event.WeaponCoalition, Event.WeaponCategory, Event.WeaponTypeName, TargetUnitName, TargetUnitCoalition, TargetUnitCategory, TargetUnitType )
             else
-              Player.Score = Player.Score + self.ScoreIncrementOnHit
-              PlayerHit.Score = PlayerHit.Score + self.ScoreIncrementOnHit
+              -- Hitting a target multiple times before destoying it should not result in a higger score
+              -- Multiple hits is typically a results of bombs/missles missing their target but still inflict some spash damage
+              -- Player.Score = Player.Score + 1
+              -- PlayerHit.Score = PlayerHit.Score + 1
               PlayerHit.ScoreHit = PlayerHit.ScoreHit + 1
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. Event.WeaponPlayerName .. "' hit enemy target " .. TargetUnitCategory .. " ( " .. TargetType .. " ) " ..
                                "Score: " .. PlayerHit.Score .. ".  Score Total:" .. Player.Score - Player.Penalty,
@@ -1318,18 +1274,13 @@ function SCORING:_EventOnDeadOrCrash( Event )
             TargetDestroy.Penalty = TargetDestroy.Penalty + ThreatPenalty
             TargetDestroy.PenaltyDestroy = TargetDestroy.PenaltyDestroy + 1
 
-
-           --self:OnKillPvP(PlayerName, TargetPlayerName, true, TargetThreatLevel, Player.ThreatLevel, ThreatPenalty)
-
             if Player.HitPlayers[TargetPlayerName] then -- A player destroyed another player
-              self:OnKillPvP(PlayerName, TargetPlayerName, true)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed friendly player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Penalty: -" .. ThreatPenalty .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
                      :ToAllIf( self:IfMessagesDestroy() and self:IfMessagesToAll() )
                      :ToCoalitionIf( InitCoalition, self:IfMessagesDestroy() and self:IfMessagesToCoalition() )
             else
-              self:OnKillPvE(PlayerName, TargetUnitName, true, TargetThreatLevel, Player.ThreatLevel, ThreatPenalty)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed friendly target " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Penalty: -" .. ThreatPenalty .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
@@ -1352,19 +1303,12 @@ function SCORING:_EventOnDeadOrCrash( Event )
             TargetDestroy.Score = TargetDestroy.Score + ThreatScore
             TargetDestroy.ScoreDestroy = TargetDestroy.ScoreDestroy + 1
             if Player.HitPlayers[TargetPlayerName] then -- A player destroyed another player
-              if Player.PlayerKills ~= nil then
-                Player.PlayerKills = Player.PlayerKills + 1
-              else
-                Player.PlayerKills = 1
-              end
-              self:OnKillPvP(PlayerName, TargetPlayerName, false, TargetThreatLevel, Player.ThreatLevel, ThreatScore)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed enemy player '" .. TargetPlayerName .. "' " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Score: +" .. ThreatScore .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
                      :ToAllIf( self:IfMessagesDestroy() and self:IfMessagesToAll() )
                      :ToCoalitionIf( InitCoalition, self:IfMessagesDestroy() and self:IfMessagesToCoalition() )
             else
-              self:OnKillPvE(PlayerName, TargetUnitName, false, TargetThreatLevel, Player.ThreatLevel, ThreatScore)
               MESSAGE:NewType( self.DisplayMessagePrefix .. "Player '" .. PlayerName .. "' destroyed enemy " .. TargetUnitCategory .. " ( " .. ThreatTypeTarget .. " ) " ..
                                "Score: +" .. ThreatScore .. " = " .. Player.Score - Player.Penalty,
                                MESSAGE.Type.Information )
@@ -1842,11 +1786,10 @@ end
 function SCORING:OpenCSV( ScoringCSV )
   self:F( ScoringCSV )
 
-  if lfs and io and os and self.AutoSave == true then
+  if lfs and io and os and self.AutoSave then
     if ScoringCSV then
       self.ScoringCSV = ScoringCSV
-      local path = self.AutoSavePath or lfs.writedir() .. [[Logs\]]
-      local fdir = path .. self.ScoringCSV .. " " .. os.date( "%Y-%m-%d %H-%M-%S" ) .. ".csv"
+      local fdir = lfs.writedir() .. [[Logs\]] .. self.ScoringCSV .. " " .. os.date( "%Y-%m-%d %H-%M-%S" ) .. ".csv"
 
       self.CSVFile, self.err = io.open( fdir, "w+" )
       if not self.CSVFile then
@@ -1964,26 +1907,3 @@ function SCORING:SwitchAutoSave(OnOff)
   self.AutoSave = OnOff
   return self
 end
-
---- Handles the event when one player kill another player
--- @param #SCORING self
--- @param #string PlayerName The attacking player
--- @param #string TargetPlayerName The name of the killed player
--- @param #boolean IsTeamKill true if this kill was a team kill
--- @param #number TargetThreatLevel Threat level of the target
--- @param #number PlayerThreatLevel Threat level of the player
--- @param #number Score The score based on both threat levels
-function SCORING:OnKillPvP(PlayerName, TargetPlayerName, IsTeamKill, TargetThreatLevel, PlayerThreatLevel, Score)
-  
-end
---- Handles the event when one player kill another player
--- @param #SCORING self
--- @param #string PlayerName The attacking player
--- @param #string TargetUnitName the name of the killed unit
--- @param #boolean IsTeamKill true if this kill was a team kill
--- @param #number TargetThreatLevel Threat level of the target
--- @param #number PlayerThreatLevel Threat level of the player
--- @param #number Score The score based on both threat levels
-function SCORING:OnKillPvE(PlayerName, TargetUnitName, IsTeamKill, TargetThreatLevel, PlayerThreatLevel, Score)
-  
-end

Moose Development/Moose/Functional/Sead.lua

@@ -13,13 +13,13 @@
 --
 -- ## Missions:
 --
--- [SEV - SEAD Evasion](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Sead)
+-- [SEV - SEAD Evasion](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SEV%20-%20SEAD%20Evasion)
 --
 -- ===
 --
--- ### Authors: **applevangelist**, **FlightControl**
+-- ### Authors: **FlightControl**, **applevangelist**
 --
--- Last Update: Dec 2024
+-- Last Update: Oct 2023
 --
 -- ===
 --
@@ -28,16 +28,6 @@
 
 ---
 -- @type SEAD
--- @field #string ClassName The Class Name.
--- @field #table TargetSkill Table of target skills.
--- @field #table SEADGroupPrefixes Table of SEAD prefixes.
--- @field #table SuppressedGroups Table of currently suppressed groups.
--- @field #number EngagementRange Engagement Range.
--- @field #number Padding Padding in seconds.
--- @field #function CallBack Callback function for suppression plans.
--- @field #boolean UseCallBack Switch for callback function to be used.
--- @field #boolean debug Debug switch.
--- @field #boolen WeaponTrack Track switch, if true track weapon speed for 30 secs.
 -- @extends Core.Base#BASE
 
 --- Make SAM sites execute evasive and defensive behaviour when being fired upon.
@@ -66,11 +56,10 @@ SEAD = {
   SEADGroupPrefixes = {},
   SuppressedGroups = {},
   EngagementRange = 75, --  default 75% engagement range Feature Request #1355
-  Padding = 15,
+  Padding = 10,
   CallBack = nil,
   UseCallBack = false,
   debug = false,
-  WeaponTrack = false,
 }
 
   --- Missile enumerators
@@ -80,7 +69,6 @@ SEAD = {
   ["AGM_122"] = "AGM_122",
   ["AGM_84"] = "AGM_84",
   ["AGM_45"] = "AGM_45",
-  ["AGM_65"] = "AGM_65",
   ["ALARM"] = "ALARM",
   ["LD-10"] = "LD-10",
   ["X_58"] = "X_58",
@@ -100,7 +88,6 @@ SEAD = {
   -- km and mach
   ["AGM_88"] = { 150, 3},
   ["AGM_45"] = { 12, 2},
-  ["AGM_65"] = { 16, 0.9},
   ["AGM_122"] = { 16.5, 2.3},
   ["AGM_84"] = { 280, 0.8},
   ["ALARM"] = { 45, 2},
@@ -157,7 +144,7 @@ function SEAD:New( SEADGroupPrefixes, Padding )
   self:AddTransition("*",             "ManageEvasion",                "*")
   self:AddTransition("*",             "CalculateHitZone",             "*")
   
-  self:I("*** SEAD - Started Version 0.4.9")
+  self:I("*** SEAD - Started Version 0.4.5")
   return self
 end
 
@@ -333,6 +320,9 @@ function SEAD:onafterCalculateHitZone(From,Event,To,SEADWeapon,pos0,height,SEADG
         end  
         
         local seadset = SET_GROUP:New():FilterPrefixes(self.SEADGroupPrefixes):FilterZones({targetzone}):FilterOnce()
+        local tgtcoord = targetzone:GetRandomPointVec2()
+        --if tgtcoord and tgtcoord.ClassName == "COORDINATE" then
+          --local tgtgrp = seadset:FindNearestGroupFromPointVec2(tgtcoord)
           local tgtgrp = seadset:GetRandom()
           local _targetgroup = nil
           local _targetgroupname = "none"
@@ -384,7 +374,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
         reach = wpndata[1] * 1.1
         local mach = wpndata[2]
         wpnspeed = math.floor(mach * 340.29)
-        if Weapon and Weapon:GetSpeed() > 0 then
+        if Weapon then
           wpnspeed = Weapon:GetSpeed()
           self:T(string.format("*** SEAD - Weapon Speed from WEAPON: %f m/s",wpnspeed))
         end
@@ -411,7 +401,7 @@ function SEAD:onafterManageEvasion(From,Event,To,_targetskill,_targetgroup,SEADP
             grp:EnableEmission(false)
           end
           grp:OptionAlarmStateGreen() -- needed else we cannot move around
-          grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond",true)
+          grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond")
           if self.UseCallBack then
             local object = self.CallBack
             object:SeadSuppressionStart(grp,name,attacker)
@@ -465,38 +455,29 @@ end
 -- @return #SEAD self
 function SEAD:HandleEventShot( EventData )
   self:T( { EventData.id } )
-  
+  local SEADPlane = EventData.IniUnit -- Wrapper.Unit#UNIT
+  local SEADGroup = EventData.IniGroup -- Wrapper.Group#GROUP
+  local SEADPlanePos = SEADPlane:GetCoordinate() -- Core.Point#COORDINATE
+  local SEADUnit = EventData.IniDCSUnit
+  local SEADUnitName = EventData.IniDCSUnitName
   local SEADWeapon = EventData.Weapon -- Identify the weapon fired
-  local SEADWeaponName = EventData.WeaponName or "None" -- return weapon type
-  
-  if self:_CheckHarms(SEADWeaponName) then
-    --UTILS.PrintTableToLog(EventData)
-    local SEADPlane = EventData.IniUnit -- Wrapper.Unit#UNIT
-    
-    if not SEADPlane then return self end -- case IniUnit is empty
-    
-    local SEADGroup = EventData.IniGroup -- Wrapper.Group#GROUP
-    local SEADPlanePos = SEADPlane:GetCoordinate() -- Core.Point#COORDINATE
-    local SEADUnit = EventData.IniDCSUnit
-    local SEADUnitName = EventData.IniDCSUnitName
-  
-    local WeaponWrapper = WEAPON:New(EventData.Weapon) -- Wrapper.Weapon#WEAPON
-    
-    self:T( "*** SEAD - Missile Launched = " .. SEADWeaponName)
+  local SEADWeaponName = EventData.WeaponName -- return weapon type
 
+  local WeaponWrapper = WEAPON:New(EventData.Weapon)
+  --local SEADWeaponSpeed = WeaponWrapper:GetSpeed() -- mps
+  
+  self:T( "*** SEAD - Missile Launched = " .. SEADWeaponName)
+  --self:T({ SEADWeapon })
+
+  if self:_CheckHarms(SEADWeaponName) then
     self:T( '*** SEAD - Weapon Match' )
-    if self.WeaponTrack == true then
-      WeaponWrapper:SetFuncTrack(function(weapon) env.info(string.format("*** Weapon Speed: %d m/s",weapon:GetSpeed() or -1)) end)
-      WeaponWrapper:StartTrack(0.1)
-      WeaponWrapper:StopTrack(30)
-    end
     local _targetskill = "Random"
     local _targetgroupname = "none"
     local _target = EventData.Weapon:getTarget() -- Identify target
     if not _target or self.debug  then -- AGM-88 or 154 w/o target data
       self:E("***** SEAD - No target data for " .. (SEADWeaponName or "None"))
       if string.find(SEADWeaponName,"AGM_88",1,true) or string.find(SEADWeaponName,"AGM_154",1,true) then
-        self:T("**** Tracking AGM-88/154 with no target data.")
+        self:I("**** Tracking AGM-88/154 with no target data.")
         local pos0 = SEADPlane:GetCoordinate()
         local fheight = SEADPlane:GetHeight()
         self:__CalculateHitZone(20,SEADWeapon,pos0,fheight,SEADGroup,SEADWeaponName)
@@ -542,7 +523,7 @@ function SEAD:HandleEventShot( EventData )
     end
     if SEADGroupFound == true then -- yes we are being attacked
       if string.find(SEADWeaponName,"ADM_141",1,true) then
-        self:__ManageEvasion(2,_targetskill,_targetgroup,SEADPlanePos,SEADWeaponName,SEADGroup,2,WeaponWrapper)
+        self:__ManageEvasion(2,_targetskill,_targetgroup,SEADPlanePos,SEADWeaponName,SEADGroup,0,WeaponWrapper)
       else
         self:ManageEvasion(_targetskill,_targetgroup,SEADPlanePos,SEADWeaponName,SEADGroup,0,WeaponWrapper)
       end

Moose Development/Moose/Functional/Shorad.lua

@@ -11,7 +11,7 @@
 -- 
 -- ## Missions:
 --
--- ### [SHORAD - Short Range Air Defense](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/Shorad)
+-- ### [SHORAD - Short Range Air Defense](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/SRD%20-%20SHORAD%20Defense)
 -- 
 -- ===
 -- 
@@ -21,7 +21,7 @@
 -- @image Functional.Shorad.jpg
 --
 -- Date: Nov 2021
--- Last Update: Jan 2025
+-- Last Update: Nov 2023
 
 -------------------------------------------------------------------------
 --- **SHORAD** class, extends Core.Base#BASE
@@ -113,7 +113,7 @@ SHORAD = {
   SkateNumber = 3,
   SkateZones = nil,
   minscootdist = 100,
-  maxscootdist = 3000,
+  minscootdist = 3000,
   scootrandomcoord = false,  
 }
 
@@ -443,9 +443,7 @@ do
     for _,_groups in pairs (shoradset) do
       local groupname = _groups:GetName()
       if string.find(groupname, tgtgrp, 1, true) then
-        if _groups:IsSAM() then
-          returnname = true
-        end
+        returnname = true
       end
     end
     return returnname
@@ -472,7 +470,6 @@ do
   -- @param #number Radius Radius of the #ZONE
   -- @param #number ActiveTimer Number of seconds to stay active
   -- @param #number TargetCat (optional) Category, i.e. Object.Category.UNIT or Object.Category.STATIC
-  -- @param #boolean ShotAt If true, function is called after a shot
   -- @return #SHORAD self 
   -- @usage Use this function to integrate with other systems, example   
   -- 
@@ -482,7 +479,7 @@ do
   -- mymantis = MANTIS:New("BlueMantis","Blue SAM","Blue EWR",nil,"blue",false,"Blue Awacs")
   -- mymantis:AddShorad(myshorad,720)
   -- mymantis:Start()
-  function SHORAD:onafterWakeUpShorad(From, Event, To, TargetGroup, Radius, ActiveTimer, TargetCat, ShotAt)
+  function SHORAD:onafterWakeUpShorad(From, Event, To, TargetGroup, Radius, ActiveTimer, TargetCat)
     self:T(self.lid .. " WakeUpShorad")
     self:T({TargetGroup, Radius, ActiveTimer, TargetCat})
     local targetcat = TargetCat or Object.Category.UNIT
@@ -524,27 +521,7 @@ do
     -- go through set and find the one(s) to activate
     local TDiff = 4
     for _,_group in pairs (shoradset) do
-      
-      local groupname = _group:GetName()
-      
-      if groupname == TargetGroup and ShotAt==true then
-        -- Shot at a SHORAD group
-        if self.UseEmOnOff then
-          _group:EnableEmission(false)
-        end
-        _group:OptionAlarmStateGreen()
-        self.ActiveGroups[groupname] = nil
-        local text = string.format("Shot at SHORAD %s! Evading!", _group:GetName())
-        self:T(text)
-        local m = MESSAGE:New(text,10,"SHORAD"):ToAllIf(self.debug)
-        
-        --Shoot and Scoot
-        if self.shootandscoot then
-          self:__ShootAndScoot(1,_group)
-        end
-        
-      elseif _group:IsAnyInZone(targetzone) or groupname == TargetGroup then
-        -- shot at a group we protect
+      if _group:IsAnyInZone(targetzone) then
         local text = string.format("Waking up SHORAD %s", _group:GetName())
         self:T(text)
         local m = MESSAGE:New(text,10,"SHORAD"):ToAllIf(self.debug)
@@ -552,6 +529,7 @@ do
           _group:EnableEmission(true)
         end
         _group:OptionAlarmStateRed()
+        local groupname = _group:GetName()
         if self.ActiveGroups[groupname] == nil then -- no timer yet for this group
           self.ActiveGroups[groupname] = { Timing = ActiveTimer }
           local endtime = timer.getTime() + (ActiveTimer * math.random(75,100) / 100 ) -- randomize wakeup a bit
@@ -629,7 +607,7 @@ do
             _targetgroupname = tgtgrp:GetName() -- group name
             _targetskill = tgtgrp:GetUnit(1):GetSkill()
             self:T("*** Found Target = ".. _targetgroupname)
-            self:WakeUpShorad(_targetgroupname, self.Radius, self.ActiveTimer, Object.Category.UNIT,true)
+            self:WakeUpShorad(_targetgroupname, self.Radius, self.ActiveTimer, Object.Category.UNIT)
           end
         end
       end     
@@ -758,7 +736,7 @@ do
           -- if being shot at, find closest SHORADs to activate
           if shotatsams or shotatus then
             self:T({shotatsams=shotatsams,shotatus=shotatus})
-            self:WakeUpShorad(targetgroupname, self.Radius, self.ActiveTimer, targetcat, true)
+            self:WakeUpShorad(targetgroupname, self.Radius, self.ActiveTimer, targetcat)
           end
         end  
       end

Moose Development/Moose/Functional/Tiresias.lua

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

Moose Development/Moose/Functional/Warehouse.lua

@@ -87,7 +87,7 @@
 -- @field #number respawndelay Delay before respawn in seconds.
 -- @field #number runwaydestroyed Time stamp timer.getAbsTime() when the runway was destroyed.
 -- @field #number runwayrepairtime Time in seconds until runway will be repaired after it was destroyed. Default is 3600 sec (one hour).
--- @field OPS.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
+-- @field Ops.FlightControl#FLIGHTCONTROL flightcontrol Flight control of this warehouse.
 -- @extends Core.Fsm#FSM
 
 --- Have your assets at the right place at the right time - or not!
@@ -1629,7 +1629,7 @@ WAREHOUSE = {
 -- @field #boolean arrived If true, asset arrived at its destination.
 -- 
 -- @field #number damage Damage of asset group in percent.
--- @field Ops.Airwing#AIRWING.Payload payload The payload of the asset.
+-- @field Ops.AirWing#AIRWING.Payload payload The payload of the asset.
 -- @field Ops.OpsGroup#OPSGROUP flightgroup The flightgroup object.
 -- @field Ops.Cohort#COHORT cohort The cohort this asset belongs to.
 -- @field Ops.Legion#LEGION legion The legion this asset belonts to.
@@ -3414,7 +3414,7 @@ end
 -- FSM states
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- On after Start event. Starts the warehouse. Adds event handlers and schedules status updates of reqests and queue.
+--- On after Start event. Starts the warehouse. Addes event handlers and schedules status updates of reqests and queue.
 -- @param #WAREHOUSE self
 -- @param #string From From state.
 -- @param #string Event Event.
@@ -3595,7 +3595,6 @@ function WAREHOUSE:onafterStatus(From, Event, To)
     local Trepair=self:GetRunwayRepairtime()
     self:I(self.lid..string.format("Runway destroyed! Will be repaired in %d sec", Trepair))
     if Trepair==0 then
-      self.runwaydestroyed = nil
       self:RunwayRepaired()
     end
   end
@@ -5393,8 +5392,7 @@ function WAREHOUSE:onafterRunwayDestroyed(From, Event, To)
   self:_InfoMessage(text)
 
   self.runwaydestroyed=timer.getAbsTime()
-  
-  return self
+
 end
 
 --- On after "RunwayRepaired" event.
@@ -5409,8 +5407,7 @@ function WAREHOUSE:onafterRunwayRepaired(From, Event, To)
   self:_InfoMessage(text)
 
   self.runwaydestroyed=nil
-  
-  return self
+
 end
 
 
@@ -6047,7 +6044,7 @@ function WAREHOUSE:_SpawnAssetAircraft(alias, asset, request, parking, uncontrol
 
     else
 
-      if parking and #parking<#template.units and not airstart then
+      if #parking<#template.units and not airstart then
         local text=string.format("ERROR: Not enough parking! Free parking = %d < %d aircraft to be spawned.", #parking, #template.units)
         self:_DebugMessage(text)
         return nil
@@ -6089,7 +6086,7 @@ function WAREHOUSE:_SpawnAssetAircraft(alias, asset, request, parking, uncontrol
           terminal=parking[i].TerminalID
         end
 
-        if self.Debug and terminal then
+        if self.Debug then
           local text=string.format("Spawnplace unit %s terminal %d.", unit.name, terminal)
           coord:MarkToAll(text)
           env.info(text)
@@ -6732,7 +6729,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,12 +7943,10 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
       local clients=_DATABASE.CLIENTS
       for clientname, client in pairs(clients) do
         local template=_DATABASE:GetGroupTemplateFromUnitName(clientname)
-        if template then
-          local units=template.units
-          for i,unit in pairs(units) do
-            local coord=COORDINATE:New(unit.x, unit.alt, unit.y)
-            coords[unit.name]=coord
-          end
+        local units=template.units
+        for i,unit in pairs(units) do
+          local coord=COORDINATE:New(unit.x, unit.alt, unit.y)
+          coords[unit.name]=coord
         end
       end
     end
@@ -8122,11 +8117,9 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
               -- Debug output for occupied spots.            
               if self.Debug then
                 local coord=problem.coord --Core.Point#COORDINATE
-                if coord then
-                    local text=string.format("Obstacle %s [type=%s] blocking spot=%d! Size=%.1f m and distance=%.1f m.", problem.name, problem.type, _termid, problem.size, problem.dist)
-                    self:I(self.lid..text)
-                    coord:MarkToAll(text)
-                end
+                local text=string.format("Obstacle %s [type=%s] blocking spot=%d! Size=%.1f m and distance=%.1f m.", problem.name, problem.type, _termid, problem.size, problem.dist)
+                self:I(self.lid..text)
+                coord:MarkToAll(string.format(text))
               else
                 self:T(self.lid..string.format("Parking spot %d is occupied or not big enough!", _termid))
               end
@@ -8435,14 +8428,12 @@ function WAREHOUSE:_GetAttribute(group)
   local attribute=WAREHOUSE.Attribute.OTHER_UNKNOWN --#WAREHOUSE.Attribute
 
   if group then
-  
-    local groupCat=group:GetCategory()
 
     -----------
     --- Air ---
     -----------
     -- Planes
-    local transportplane=group:HasAttribute("Transports") and group:HasAttribute("Planes") and groupCat==Group.Category.AIRPLANE
+    local transportplane=group:HasAttribute("Transports") and group:HasAttribute("Planes")
     local awacs=group:HasAttribute("AWACS")
     local fighter=group:HasAttribute("Fighters") or group:HasAttribute("Interceptors") or group:HasAttribute("Multirole fighters") or (group:HasAttribute("Bombers") and not group:HasAttribute("Strategic bombers"))
     local bomber=group:HasAttribute("Strategic bombers")
@@ -8597,6 +8588,7 @@ end
 -- @param #WAREHOUSE.Queueitem qitem Item of queue to be removed.
 -- @param #table queue The queue from which the item should be deleted.
 function WAREHOUSE:_DeleteQueueItem(qitem, queue)
+  self:F({qitem=qitem, queue=queue})
 
   for i=1,#queue do
     local _item=queue[i] --#WAREHOUSE.Queueitem

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -12,7 +12,7 @@
 -- 
 -- ## Missions:
 -- 
--- [CAZ - Capture Zones](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/Functional/ZoneCaptureCoalition)
+-- [CAZ - Capture Zones](https://github.com/FlightControl-Master/MOOSE_MISSIONS/tree/master/CAZ%20-%20Capture%20Zones)
 -- 
 -- ===
 -- 
@@ -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/Globals.lua

@@ -10,7 +10,7 @@ _SCHEDULEDISPATCHER = SCHEDULEDISPATCHER:New() -- Core.ScheduleDispatcher#SCHEDU
 _DATABASE = DATABASE:New() -- Core.Database#DATABASE
 
 --- Settings
-_SETTINGS = SETTINGS:Set() -- Core.Settings#SETTINGS
+_SETTINGS = SETTINGS:Set()
 _SETTINGS:SetPlayerMenuOn()
 
 --- Register cargos.

Moose Development/Moose/Modules.lua

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

Moose Development/Moose/Modules_local.lua

@@ -1,7 +1,9 @@
 __Moose.Include( 'Utilities\\Enums.lua' )
+__Moose.Include( 'Utilities\\Routines.lua' )
 __Moose.Include( 'Utilities\\Utils.lua' )
 __Moose.Include( 'Utilities\\Profiler.lua' )
---__Moose.Include( 'Utilities\\STTS.lua' )
+__Moose.Include( 'Utilities\\Templates.lua' )
+__Moose.Include( 'Utilities\\STTS.lua' )
 __Moose.Include( 'Utilities\\FiFo.lua' )
 __Moose.Include( 'Utilities\\Socket.lua' )
 
@@ -15,11 +17,11 @@ __Moose.Include( 'Core\\Event.lua' )
 __Moose.Include( 'Core\\Settings.lua' )
 __Moose.Include( 'Core\\Menu.lua' )
 __Moose.Include( 'Core\\Zone.lua' )
-__Moose.Include( 'Core\\Velocity.lua' )
+__Moose.Include( 'Core\\Zone_Detection.lua' )
 __Moose.Include( 'Core\\Database.lua' )
 __Moose.Include( 'Core\\Set.lua' )
 __Moose.Include( 'Core\\Point.lua' )
-__Moose.Include( 'Core\\Pathline.lua' )
+__Moose.Include( 'Core\\Velocity.lua' )
 __Moose.Include( 'Core\\Message.lua' )
 __Moose.Include( 'Core\\Fsm.lua' )
 __Moose.Include( 'Core\\Spawn.lua' )
@@ -32,7 +34,6 @@ __Moose.Include( 'Core\\MarkerOps_Base.lua' )
 __Moose.Include( 'Core\\TextAndSound.lua' )
 __Moose.Include( 'Core\\Condition.lua' )
 __Moose.Include( 'Core\\ClientMenu.lua' )
-__Moose.Include( 'Core\\Vector.lua' )
 
 __Moose.Include( 'Wrapper\\Object.lua' )
 __Moose.Include( 'Wrapper\\Identifiable.lua' )
@@ -45,10 +46,6 @@ __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' )
@@ -80,10 +77,6 @@ __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' )
@@ -114,9 +107,6 @@ __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' )
@@ -179,7 +169,4 @@ __Moose.Include( 'Tasking\\Task_Cargo_Dispatcher.lua' )
 __Moose.Include( 'Tasking\\Task_Capture_Zone.lua' )
 __Moose.Include( 'Tasking\\Task_Capture_Dispatcher.lua' )
 
-__Moose.Include( 'Navigation\\Point.lua' )
-__Moose.Include( 'Navigation\\Beacons.lua' )
-
 __Moose.Include( 'Globals.lua' )