Adjustments for Forrestal by Pene

AIRBOSS v1.2.0

Moose Development/Moose/Core/Database.lua

@@ -136,7 +136,7 @@ function DATABASE:New()
   self:_RegisterGroupsAndUnits()
   self:_RegisterClients()
   self:_RegisterStatics()
-  self:_RegisterAirbases()
+  --self:_RegisterAirbases()
   --self:_RegisterPlayers()
 
   self.UNITS_Position = 0

Moose Development/Moose/Core/Set.lua

@@ -3999,6 +3999,24 @@ do -- SET_CLIENT
     return self
   end
   
+  --- Iterate the SET_CLIENT and count alive units.
+  -- @param #SET_CLIENT self
+  -- @return #number count
+  function SET_CLIENT:CountAlive()
+
+    local Set = self:GetSet()
+
+    local CountU = 0
+    for UnitID, UnitData in pairs(Set) do -- For each GROUP in SET_GROUP
+      if UnitData and UnitData:IsAlive() then
+        CountU = CountU + 1
+      end
+
+    end
+
+    return CountU
+  end
+  
   ---
   -- @param #SET_CLIENT self
   -- @param Wrapper.Client#CLIENT MClient
@@ -4746,7 +4764,7 @@ do -- SET_AIRBASE
 
     local airbaseName, airbase=self:FindInDatabase(EventData)
 
-    if airbase and airbase:IsShip() or airbase:IsHelipad() then
+    if airbase and (airbase:IsShip() or airbase:IsHelipad()) then
       self:RemoveAirbasesByName(airbaseName)
     end
 

Moose Development/Moose/Core/SpawnStatic.lua

@@ -422,7 +422,11 @@ function SPAWNSTATIC:_SpawnStatic(Template, CountryID)
   end
   
   if self.InitCargo~=nil then
-    Template.isCargo=self.InitCargo
+    Template.canCargo=self.InitCargo
+  end
+  
+  if self.InitCargoMass~=nil then
+    Template.mass=self.InitCargoMass
   end
   
   if self.InitLinkUnit then

Moose Development/Moose/Core/Zone.lua

@@ -183,12 +183,12 @@ function ZONE_BASE:IsCoordinateInZone( Coordinate )
   return InZone
 end
 
---- Returns if a PointVec2 is within the zone.
+--- Returns if a PointVec2 is within the zone. (Name is misleading, actually takes a #COORDINATE)
 -- @param #ZONE_BASE self
--- @param Core.Point#POINT_VEC2 PointVec2 The PointVec2 to test.
+-- @param Core.Point#COORDINATE PointVec2 The coordinate to test.
 -- @return #boolean true if the PointVec2 is within the zone.
-function ZONE_BASE:IsPointVec2InZone( PointVec2 )
+function ZONE_BASE:IsPointVec2InZone( Coordinate )
-  local InZone = self:IsVec2InZone( PointVec2:GetVec2() )
+  local InZone = self:IsVec2InZone( Coordinate:GetVec2() )
   return InZone
 end
 

Moose Development/Moose/Functional/Mantis.lua

@@ -23,9 +23,9 @@
 -- Date: July 2021
 
 -------------------------------------------------------------------------
---- **MANTIS** class, extends #Core.Base#BASE
+--- **MANTIS** class, extends Core.Base#BASE
 -- @type MANTIS
--- @field #string Classname
+-- @field #string ClassName
 -- @field #string name Name of this Mantis
 -- @field #string SAM_Templates_Prefix Prefix to build the #SET_GROUP for SAM sites
 -- @field Core.Set#SET_GROUP SAM_Group The SAM #SET_GROUP
@@ -195,6 +195,9 @@ MANTIS = {
   TimeStamp             = 0,
   state2flag            = false,
   SamStateTracker       = {},
+  DLink                 = false,
+  DLTimeStamp           = 0,
+  Padding               = 10,
 }
 
 --- Advanced state enumerator
@@ -219,7 +222,8 @@ do
   --@param #string coaltion Coalition side of your setup, e.g. "blue", "red" or "neutral"
   --@param #boolean dynamic Use constant (true) filtering or just filter once (false, default) (optional)
   --@param #string awacs Group name of your Awacs (optional)
-  --@param #boolean EmOnOff Make MANTIS switch Emissions on and off instead of changing the alarm state between RED and GREEN
+  --@param #boolean EmOnOff Make MANTIS switch Emissions on and off instead of changing the alarm state between RED and GREEN (optional) 
+  --@param #number Padding For #SEAD - Extra number of seconds to add to radar switch-back-on time (optional) 
   --@return #MANTIS self
   --@usage Start up your MANTIS with a basic setting
   --
@@ -241,7 +245,7 @@ do
   --    `mybluemantis = MANTIS:New("bluemantis","Blue SAM","Blue EWR",nil,"blue",false,"Blue Awacs")`  
   --    `mybluemantis:Start()`
   --    
-  function MANTIS:New(name,samprefix,ewrprefix,hq,coaltion,dynamic,awacs, EmOnOff)
+  function MANTIS:New(name,samprefix,ewrprefix,hq,coaltion,dynamic,awacs, EmOnOff, Padding)
     
     -- DONE: Create some user functions for these
     -- DONE: Make HQ useful
@@ -278,6 +282,8 @@ do
     self.relointerval = math.random(1800,3600) -- random between 30 and 60 mins
     self.state2flag = false
     self.SamStateTracker = {} -- table to hold alert states, so we don't trigger state changes twice in adv mode
+    self.DLink = false
+    self.Padding = Padding or 10
     
     if EmOnOff then
       if EmOnOff == false then
@@ -325,7 +331,7 @@ do
     end
     
     -- @field #string version
-    self.version="0.5.2"
+    self.version="0.6.2"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
     
     --- FSM Functions ---
@@ -593,7 +599,7 @@ do
   -- E.g. `mymantis:SetAdvancedMode(true, 90)`
   function MANTIS:SetAdvancedMode(onoff, ratio)
     self:T(self.lid .. "SetAdvancedMode")
-    self:T({onoff, ratio})
+    --self:T({onoff, ratio})
     local onoff = onoff or false
     local ratio = ratio or 100
     if (type(self.HQ_Template_CC) == "string") and onoff and self.dynamic then
@@ -619,6 +625,17 @@ do
     return self
   end
   
+  --- Set using an #INTEL_DLINK object instead of #DETECTION. Requires Develop branch of Moose.lua.
+  -- @param #MANTIS self
+  -- @param Ops.Intelligence#INTEL_DLINK DLink The data link object to be used.
+  function MANTIS:SetUsingDLink(DLink)
+    self:T(self.lid .. "SetUsingDLink")
+    self.DLink = true
+    self.Detection = DLink
+    self.DLTimeStamp = timer.getAbsTime()
+    return self
+  end
+  
   --- [Internal] Function to check if HQ is alive
   -- @param #MANTIS self
   -- @return #boolean True if HQ is alive, else false
@@ -633,10 +650,10 @@ do
       local hqgrp = GROUP:FindByName(hq)
       if hqgrp then
         if hqgrp:IsAlive() then -- ok we're on, hq exists and as alive
-          self:T(self.lid.." HQ is alive!")
+          --self:T(self.lid.." HQ is alive!")
           return true
         else
-          self:T(self.lid.." HQ is dead!")
+          --self:T(self.lid.." HQ is dead!")
           return false  
         end
       end
@@ -650,7 +667,7 @@ do
   function MANTIS:_CheckEWRState()
     self:T(self.lid .. "CheckEWRState")
     local text = self.lid.." Checking EWR State"
-    self:T(text)
+    --self:T(text)
     local m= MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
     if self.verbose then self:I(text) end
     -- start check
@@ -666,7 +683,7 @@ do
           end
         end
       end
-      self:T(self.lid..string.format(" No of EWR alive is %d", nalive))
+      --self:T(self.lid..string.format(" No of EWR alive is %d", nalive))
       if nalive > 0 then
         return true
       else
@@ -682,10 +699,8 @@ do
   -- @return #number Previous state for tracking 0, 1, or 2
   function MANTIS:_CalcAdvState()
     self:T(self.lid .. "CalcAdvState")
-    local text = self.lid.." Calculating Advanced State"
+    local m=MESSAGE:New(self.lid.." Calculating Advanced State",10,"MANTIS"):ToAllIf(self.debug)
-    self:T(text)
+    if self.verbose then self:I(self.lid.." Calculating Advanced State") end
-    local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
-    if self.verbose then self:I(text) end
     -- start check
     local currstate = self.adv_state -- save curr state for comparison later
     local EWR_State = self:_CheckEWRState()
@@ -703,10 +718,12 @@ do
     local ratio = self.adv_ratio / 100 -- e.g. 80/100 = 0.8
     ratio = ratio * self.adv_state -- e.g 0.8*2 = 1.6
     local newinterval = interval + (interval * ratio) -- e.g. 30+(30*1.6) = 78
+    if self.debug or self.verbose then
       local text = self.lid..string.format(" Calculated OldState/NewState/Interval: %d / %d / %d", currstate, self.adv_state, newinterval)
-    self:T(text)
+      --self:T(text)
       local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
       if self.verbose then self:I(text) end
+    end
     return newinterval, currstate
   end
   
@@ -716,13 +733,13 @@ do
   -- @param #boolean ewr If true, will relocate  EWR objects
   function MANTIS:SetAutoRelocate(hq, ewr)
     self:T(self.lid .. "SetAutoRelocate")
-    self:T({hq, ewr})
+    --self:T({hq, ewr})
     local hqrel = hq or false
     local ewrel = ewr or false
     if hqrel or ewrel then
       self.autorelocate = true
       self.autorelocateunits = { HQ = hqrel, EWR = ewrel }
-      self:T({self.autorelocate, self.autorelocateunits})
+      --self:T({self.autorelocate, self.autorelocateunits})
     end
     return self
   end    
@@ -739,7 +756,7 @@ do
       local HQGroup = self.HQ_CC
       if self.autorelocateunits.HQ and self.HQ_CC and HQGroup:IsAlive() then --only relocate if HQ exists
         local _hqgrp = self.HQ_CC
-        self:T(self.lid.." Relocating HQ")
+        --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)
@@ -752,7 +769,7 @@ do
          local EWR_Grps = EWR_GRP.Set --table of objects in SET_GROUP
          for _,_grp in pairs (EWR_Grps) do
              if _grp:IsAlive() and _grp:IsGround() then
-              self:T(self.lid.." Relocating EWR ".._grp:GetName())
+              --self:T(self.lid.." Relocating EWR ".._grp:GetName())
               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
@@ -778,12 +795,14 @@ do
     for _,_coord in pairs (set) do
       local coord = _coord  -- get current coord to check
       -- output for cross-check
+      local targetdistance = samcoordinate:DistanceFromPointVec2(coord)
+      if self.verbose or self.debug then 
         local dectstring = coord:ToStringLLDMS()
         local samstring = samcoordinate:ToStringLLDMS()
-      local targetdistance = samcoordinate:DistanceFromPointVec2(coord)
         local text = string.format("Checking SAM at % s - Distance %d m - Target %s", samstring, targetdistance, dectstring)
         local m = MESSAGE:New(text,10,"Check"):ToAllIf(self.debug)
-      if self.verbose then self:I(self.lid..text) end
+        self:I(self.lid..text) 
+      end
       -- end output to cross-check
       if targetdistance <= radius then
         return true, targetdistance
@@ -888,7 +907,7 @@ do
      end
      self.SAM_Table = SAM_Tbl
      -- make SAMs evasive
-     local mysead = SEAD:New( SEAD_Grps )
+     local mysead = SEAD:New( SEAD_Grps, self.Padding ) -- Functional.Sead#SEAD
      mysead:SetEngagementRange(engagerange)
      self.mysead = mysead
      return self
@@ -999,9 +1018,11 @@ do
             self:__ShoradActivated(1,name, radius, ontime)
           end
           -- debug output
+          if self.debug or self.verbose then
             local text = string.format("SAM %s switched to alarm state RED!", name)
             local m=MESSAGE:New(text,10,"MANTIS"):ToAllIf(self.debug)
             if self.verbose then self:I(self.lid..text) end
+          end
         end --end alive
       else 
         if samgroup:IsAlive() then
@@ -1014,9 +1035,11 @@ do
               self:__GreenState(1,samgroup)
               self.SamStateTracker[name] = "GREEN"
             end
+          if self.debug or self.verbose then  
             local text = string.format("SAM %s switched to alarm state GREEN!", name)
             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 for loop
@@ -1067,6 +1090,20 @@ do
     return self
   end
   
+  --- [Internal] Check DLink state
+  -- @param #MANTIS self
+  -- @return #MANTIS self
+  function MANTIS:_CheckDLinkState()
+    self:T(self.lid .. "_CheckDLinkState")
+    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
+      self.Detection = self:StartDetection() -- fall back
+      self:I(self.lid .. "Intel DLink not running - switching back to single detection!")
+    end
+  end
+    
   --- [Internal] Function to set start state
   -- @param #MANTIS self
   -- @param #string From The From State
@@ -1077,11 +1114,13 @@ do
     self:T({From, Event, To})
     self:T(self.lid.."Starting MANTIS")
     self:SetSAMStartState()
+    if not self.DLink then
       self.Detection = self:StartDetection()
+    end
     if self.advAwacs then
       self.AWACS_Detection = self:StartAwacsDetection()
     end
-    self:__Status(self.detectinterval)   
+    self:__Status(-math.random(1,10))   
     return self
   end
   
@@ -1120,11 +1159,16 @@ do
       end
     end
     
-    -- timer for advanced state check
+    -- advanced state check
     if self.advanced then
       self:_CheckAdvState()
     end
     
+    -- check DLink state
+    if self.DLink then
+      self:_CheckDLinkState()
+    end
+    
     return self
   end
 
@@ -1136,6 +1180,13 @@ do
   -- @return #MANTIS self
   function MANTIS:onafterStatus(From,Event,To)
     self:T({From, Event, To})
+    -- Display some states
+    if self.debug then
+      self:I(self.lid .. "Status Report")
+      for _name,_state in pairs(self.SamStateTracker) do
+        self:I(string.format("Site %s\tStatus %s",_name,_state))
+      end
+    end
     local interval = self.detectinterval * -1
     self:__Status(interval)
     return self

Moose Development/Moose/Functional/Range.lua

@@ -2831,6 +2831,7 @@ function RANGE:_CheckInZone(_unitName)
           local accur=0
           if shots>0 then
             accur=_result.hits/shots*100
+            if accur > 100 then accur = 100 end
           end
 
           -- Message text.

Moose Development/Moose/Functional/Sead.lua

@@ -17,14 +17,15 @@
 -- 
 -- ### Authors: **FlightControl**, **applevangelist**
 -- 
--- Last Update: July 2021
+-- Last Update: Aug 2021
 -- 
 -- ===
 -- 
 -- @module Functional.Sead
 -- @image SEAD.JPG
 
---- @type SEAD
+--- 
+-- @type SEAD
 -- @extends Core.Base#BASE
 
 --- Make SAM sites execute evasive and defensive behaviour when being fired upon.
@@ -48,7 +49,8 @@ SEAD = {
   }, 
   SEADGroupPrefixes = {},
   SuppressedGroups = {},
-  EngagementRange = 75 --  default 75% engagement range Feature Request #1355
+  EngagementRange = 75, --  default 75% engagement range Feature Request #1355
+  Padding = 10,
 }
 
   --- Missile enumerators
@@ -59,7 +61,7 @@ SEAD = {
   ["AGM_122"] = "AGM_122",
   ["AGM_84"] = "AGM_84",
   ["AGM_45"] = "AGM_45",
-  ["ALARN"] = "ALARM",
+  ["ALARM"] = "ALARM",
   ["LD-10"] = "LD-10",
   ["X_58"] = "X_58",
   ["X_28"] = "X_28",
@@ -68,17 +70,35 @@ SEAD = {
   ["Kh25"] = "Kh25",
   }
   
+  --- Missile enumerators - from DCS ME and Wikipedia
+  -- @field HarmData
+  SEAD.HarmData = {
+  -- km and mach
+  ["AGM_88"] = { 150, 3},
+  ["AGM_45"] = { 12, 2},
+  ["AGM_122"] = { 16.5, 2.3},
+  ["AGM_84"] = { 280, 0.85},
+  ["ALARM"] = { 45, 2},
+  ["LD-10"] = { 60, 4},
+  ["X_58"] = { 70, 4},
+  ["X_28"] = { 80, 2.5},
+  ["X_25"] = { 25, 0.76},
+  ["X_31"] = {150, 3},
+  ["Kh25"] = {25, 0.8},
+  }
+  
 --- Creates the main object which is handling defensive actions for SA sites or moving SA vehicles.
 -- When an anti radiation missile is fired (KH-58, KH-31P, KH-31A, KH-25MPU, HARM missiles), the SA will shut down their radars and will take evasive actions...
 -- Chances are big that the missile will miss.
 -- @param #SEAD self
--- @param table{string,...}|string SEADGroupPrefixes which is a table of Prefixes of the SA Groups in the DCS mission editor on which evasive actions need to be taken.
+-- @param #table SEADGroupPrefixes Table of #string entries or single #string, which is a table of Prefixes of the SA Groups in the DCS mission editor on which evasive actions need to be taken.
+-- @param #number Padding (Optional) Extra number of seconds to add to radar switch-back-on time
 -- @return SEAD
 -- @usage
 -- -- CCCP SEAD Defenses
 -- -- Defends the Russian SA installations from SEAD attacks.
 -- SEAD_RU_SAM_Defenses = SEAD:New( { 'RU SA-6 Kub', 'RU SA-6 Defenses', 'RU MI-26 Troops', 'RU Attack Gori' } )
-function SEAD:New( SEADGroupPrefixes )
+function SEAD:New( SEADGroupPrefixes, Padding )
 
   local self = BASE:Inherit( self, BASE:New() )
   self:F( SEADGroupPrefixes )
@@ -91,8 +111,13 @@ function SEAD:New( SEADGroupPrefixes )
     self.SEADGroupPrefixes[SEADGroupPrefixes] = SEADGroupPrefixes
   end
   
+  local padding = Padding or 10
+  if padding < 10 then padding = 10 end
+  self.Padding = padding
+  
   self:HandleEvent( EVENTS.Shot, self.HandleEventShot )
-  self:I("*** SEAD - Started Version 0.2.9")
+  
+  self:I("*** SEAD - Started Version 0.3.1")
   return self
 end
 
@@ -130,17 +155,61 @@ function SEAD:SetEngagementRange(range)
   return self
 end
 
+--- Set the padding in seconds, which extends the radar off time calculated by SEAD
+-- @param #SEAD self
+-- @param #number Padding Extra number of seconds to add for the switch-on
+function SEAD:SetPadding(Padding)
+  self:T( { Padding } )
+  local padding = Padding or 10
+  if padding < 10 then padding = 10 end
+  self.Padding = padding
+  return self
+end
+
   --- Check if a known HARM was fired
   -- @param #SEAD self
   -- @param #string WeaponName
   -- @return #boolean Returns true for a match
+  -- @return #string name Name of hit in table
   function SEAD:_CheckHarms(WeaponName)
     self:T( { WeaponName } )
     local hit = false
+    local name = ""
       for _,_name in pairs (SEAD.Harms) do
-        if string.find(WeaponName,_name,1) then hit = true end
+        if string.find(WeaponName,_name,1) then 
+          hit = true
+          name = _name 
+          break
+        end
+      end
+    return hit, name
+  end
+
+  --- (Internal) Return distance in meters between two coordinates or -1 on error.
+  -- @param #SEAD self
+  -- @param Core.Point#COORDINATE _point1 Coordinate one
+  -- @param Core.Point#COORDINATE _point2 Coordinate two
+  -- @return #number Distance in meters
+  function SEAD:_GetDistance(_point1, _point2)
+    self:T("_GetDistance")
+    if _point1 and _point2 then
+      local distance1 = _point1:Get2DDistance(_point2)
+      local distance2 = _point1:DistanceFromPointVec2(_point2)
+      --self:T({dist1=distance1, dist2=distance2})
+      if distance1 and type(distance1) == "number" then
+        return distance1
+      elseif distance2 and type(distance2) == "number" then
+        return distance2
+      else
+        self:E("*****Cannot calculate distance!")
+        self:E({_point1,_point2})
+        return -1
+      end
+    else
+      self:E("******Cannot calculate distance!")
+      self:E({_point1,_point2})
+      return -1
     end
-    return hit
   end
   
 --- Detects if an SAM site was shot with an anti radiation missile. In this case, take evasive actions based on the skill level set within the ME.
@@ -148,36 +217,38 @@ end
 -- @param #SEAD
 -- @param Core.Event#EVENTDATA EventData
 function SEAD:HandleEventShot( EventData )
-  self:T( { EventData } )
+  self:T( { EventData.id } )
-
+  local SEADPlane = EventData.IniUnit -- Wrapper.Unit#UNIT
+  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 -- return weapon type
 
   self:T( "*** SEAD - Missile Launched = " .. SEADWeaponName)
-  self:T({ SEADWeapon })
+  --self:T({ SEADWeapon })
   
   if self:_CheckHarms(SEADWeaponName) then
+    self:T( '*** SEAD - Weapon Match' )
     local _targetskill = "Random"
-    local _targetMimgroupName = "none"
+    local _targetgroupname = "none"
-    local _evade = math.random (1,100) -- random number for chance of evading action
+    local _target = EventData.Weapon:getTarget() -- Identify target
-    local _targetMim = EventData.Weapon:getTarget() -- Identify target
+    local _targetUnit = UNIT:Find(_target) -- Wrapper.Unit#UNIT
-    local _targetUnit = UNIT:Find(_targetMim) -- Unit name by DCS Object
+    local _targetgroup = nil -- Wrapper.Group#GROUP
     if _targetUnit and _targetUnit:IsAlive() then
-      local _targetMimgroup = _targetUnit:GetGroup()
+      _targetgroup = _targetUnit:GetGroup()
-      _targetMimgroupName = _targetMimgroup:GetName() -- group name
+      _targetgroupname = _targetgroup:GetName() -- group name
-      --local _targetskill =  _DATABASE.Templates.Units[_targetUnit].Template.skill
+      local _targetUnitName = _targetUnit:GetName()
-      self:T( self.SEADGroupPrefixes )
+      _targetUnit:GetSkill()
-      self:T( _targetMimgroupName )
+      _targetskill = _targetUnit:GetSkill()
     end
     -- see if we are shot at
     local SEADGroupFound = false
     for SEADGroupPrefixID, SEADGroupPrefix in pairs( self.SEADGroupPrefixes ) do
       self:T( SEADGroupPrefix )
-      if string.find( _targetMimgroupName, SEADGroupPrefix, 1, true ) then
+      if string.find( _targetgroupname, SEADGroupPrefix, 1, true ) then
         SEADGroupFound = true
-        self:T( '*** SEAD - Group Found' )
+        self:T( '*** SEAD - Group Match Found' )
         break
       end
     end   
@@ -186,42 +257,67 @@ function SEAD:HandleEventShot( EventData )
         local Skills = { "Average", "Good", "High", "Excellent" }
         _targetskill = Skills[ math.random(1,4) ]
       end
-      self:T( _targetskill )
+      --self:T( _targetskill )
       if self.TargetSkill[_targetskill] then
+        local _evade = math.random (1,100) -- random number for chance of evading action
         if (_evade > self.TargetSkill[_targetskill].Evade) then
-        
+          self:T("*** SEAD - Evading")
-          self:T( string.format("*** SEAD - Evading, target skill  " ..string.format(_targetskill)) )
+          -- calculate distance of attacker
-        
+          local _targetpos = _targetgroup:GetCoordinate()
-          local _targetMimgroup = Unit.getGroup(Weapon.getTarget(SEADWeapon))
+          local _distance = self:_GetDistance(SEADPlanePos, _targetpos)
-          local _targetMimcont= _targetMimgroup:getController()
+          -- weapon speed
-          
+          local hit, data = self:_CheckHarms(SEADWeaponName)
-          routines.groupRandomDistSelf(_targetMimgroup,300,'Diamond',250,20) -- move randomly
+          local wpnspeed = 666 -- ;)
-          
+          local reach = 10
-          --tracker ID table to switch groups off and on again
+          if hit then
-          local id = { 
+            local wpndata = SEAD.HarmData[data]
-          groupName = _targetMimgroup,
+            reach = wpndata[1] * 1,1
-          ctrl = _targetMimcont
+            local mach = wpndata[2]
-          }
+            wpnspeed = math.floor(mach * 340.29)
-
-          local function SuppressionEnd(id) --switch group back on
-           local range = self.EngagementRange -- Feature Request #1355
-            self:T(string.format("*** SEAD - Engagement Range is %d", range))
-            id.ctrl:setOption(AI.Option.Ground.id.ALARM_STATE,AI.Option.Ground.val.ALARM_STATE.RED)
-            --id.groupName:enableEmission(true)
-            id.ctrl:setOption(AI.Option.Ground.id.AC_ENGAGEMENT_RANGE_RESTRICTION,range) --Feature Request #1355
-            self.SuppressedGroups[id.groupName] = nil  --delete group id from table when done
           end
+          -- time to impact
+          local _tti = math.floor(_distance / wpnspeed) -- estimated impact time
+          if _distance > 0 then
+            _distance = math.floor(_distance / 1000) -- km
+          else
+            _distance = 0
+          end
+          
+          self:T( string.format("*** SEAD - target skill %s, distance %dkm, reach %dkm, tti %dsec", _targetskill, _distance,reach,_tti ))
+          
+          if reach >= _distance then
+            self:T("*** SEAD - Shot in Reach")
+            
+            local function SuppressionStart(args)
+              self:T(string.format("*** SEAD - %s Radar Off & Relocating",args[2]))
+              local grp = args[1] -- Wrapper.Group#GROUP
+              grp:OptionAlarmStateGreen()
+              grp:RelocateGroundRandomInRadius(20,300,false,false,"Diamond")
+            end
+            
+            local function SuppressionStop(args)
+              self:T(string.format("*** SEAD - %s Radar On",args[2]))
+              local grp = args[1]  -- Wrapper.Group#GROUP
+              grp:OptionAlarmStateRed()
+              grp:OptionEngageRange(self.EngagementRange)
+              self.SuppressedGroups[args[2]] = false
+            end
+            
             -- randomize switch-on time
             local delay = math.random(self.TargetSkill[_targetskill].DelayOn[1], self.TargetSkill[_targetskill].DelayOn[2])
-          local SuppressionEndTime = timer.getTime() + delay
+            if delay > _tti then delay = delay / 2 end -- speed up
-          --create entry
+            if _tti > (3*delay) then delay = (_tti / 2) * 0.9 end -- shot from afar
-          if self.SuppressedGroups[id.groupName] == nil then  --no timer entry for this group yet
+            
-            self.SuppressedGroups[id.groupName] = {
+            local SuppressionStartTime = timer.getTime() + delay     
-              SuppressionEndTime = delay
+            local SuppressionEndTime = timer.getTime() + _tti + self.Padding
-              }
+            
-            Controller.setOption(_targetMimcont, AI.Option.Ground.id.ALARM_STATE,AI.Option.Ground.val.ALARM_STATE.GREEN)
+            if not self.SuppressedGroups[_targetgroupname] then
-            --_targetMimgroup:enableEmission(false)
+              self:T(string.format("*** SEAD - %s | Parameters TTI %ds | Switch-Off in %ds",_targetgroupname,_tti,delay))
-            timer.scheduleFunction(SuppressionEnd, id, SuppressionEndTime)  --Schedule the SuppressionEnd() function
+              timer.scheduleFunction(SuppressionStart,{_targetgroup,_targetgroupname},SuppressionStartTime)
+              timer.scheduleFunction(SuppressionStop,{_targetgroup,_targetgroupname},SuppressionEndTime)
+              self.SuppressedGroups[_targetgroupname] = true
+            end
+            
           end
         end
       end

Moose Development/Moose/Functional/Shorad.lua

@@ -113,7 +113,7 @@ do
   ["AGM_122"] = "AGM_122",
   ["AGM_84"] = "AGM_84",
   ["AGM_45"] = "AGM_45",
-  ["ALARN"] = "ALARM",
+  ["ALARM"] = "ALARM",
   ["LD-10"] = "LD-10",
   ["X_58"] = "X_58",
   ["X_28"] = "X_28",

Moose Development/Moose/Functional/ZoneCaptureCoalition.lua

@@ -715,6 +715,7 @@ do -- ZONE_CAPTURE_COALITION
   
       local UnitHit = EventData.TgtUnit
       
+      if UnitHit.ClassName ~= "SCENERY" then
       -- Check if unit is inside the capture zone and that it is of the defending coalition.
           if UnitHit and UnitHit:IsInZone(self) and UnitHit:GetCoalition()==self.Coalition then
           
@@ -728,7 +729,7 @@ do -- ZONE_CAPTURE_COALITION
             end
             
           end
-
+      end
     end
   
   end
@@ -890,12 +891,14 @@ do -- ZONE_CAPTURE_COALITION
     end
     
     -- Status text.
+    if false then
       local text=string.format("CAPTURE ZONE %s: Owner=%s (Previous=%s): #blue=%d, #red=%d, Status %s", self:GetZoneName(), self:GetCoalitionName(), UTILS.GetCoalitionName(self:GetPreviousCoalition()), nBlue, nRed, State)
       local NewState = self:GetState()
       if NewState~=State then
         text=text..string.format(" --> %s", NewState)
       end
       self:I(text)
+    end
     
   end
 

Moose Development/Moose/Globals.lua

@@ -18,6 +18,7 @@ _DATABASE:_RegisterCargos()
 
 --- Register zones.
 _DATABASE:_RegisterZones()
+_DATABASE:_RegisterAirbases()
 
 --- Check if os etc is available.
 BASE:I("Checking de-sanitization of os, io and lfs:")

Moose Development/Moose/Ops/Airboss.lua

@@ -31,7 +31,10 @@
 --    * [USS Abraham Lincoln](https://en.wikipedia.org/wiki/USS_Abraham_Lincoln_(CVN-72)) (CVN-72) [Super Carrier Module]
 --    * [USS George Washington](https://en.wikipedia.org/wiki/USS_George_Washington_(CVN-73)) (CVN-73) [Super Carrier Module]
 --    * [USS Harry S. Truman](https://en.wikipedia.org/wiki/USS_Harry_S._Truman) (CVN-75) [Super Carrier Module]
+--    * [USS Forrestal](https://en.wikipedia.org/wiki/USS_Forrestal_(CV-59)) (CV-59) [Heatblur Carrier Module]
 --    * [USS Tarawa](https://en.wikipedia.org/wiki/USS_Tarawa_(LHA-1)) (LHA-1) [**WIP**]
+--    * [USS America](https://en.wikipedia.org/wiki/USS_America_(LHA-6)) (LHA-6) [**WIP**]
+--    * [Juan Carlos I](https://en.wikipedia.org/wiki/Spanish_amphibious_assault_ship_Juan_Carlos_I) (L61) [**WIP**]
 --
 -- **Supported Aircraft:**
 --
@@ -48,8 +51,8 @@
 --
 -- At the moment, optimized parameters are available for the F/A-18C Hornet (Lot 20) and A-4E community mod as aircraft and the USS John C. Stennis as carrier.
 --
--- The AV-8B Harrier and the USS Tarawa are WIP. Those two can only be used together, i.e. the Tarawa is the only carrier the harrier is supposed to land on and
+-- The AV-8B Harrier, the USS Tarawa, USS America and Juan Carlos I are WIP. The AV-8B harrier and the LHA's and LHD can only be used together, i.e. these ships are the only carriers the harrier is supposed to land on and
--- the no other fixed wing aircraft (human or AI controlled) are supposed to land on the Tarawa. Currently only Case I is supported. Case II/III take slightly steps from the CVN carrier.
+-- no other fixed wing aircraft (human or AI controlled) are supposed to land on these ships. Currently only Case I is supported. Case II/III take slightly different steps from the CVN carrier.
 -- However, the two Case II/III pattern are very similar so this is not a big drawback.
 --
 -- Heatblur's mighty F-14B Tomcat has been added (March 13th 2019) as well. Same goes for the A version.
@@ -108,6 +111,7 @@
 -- ### AV-8B Harrier at USS Tarawa
 --
 --    * [Harrier Ship Landing Mission with Auto LSO!](https://www.youtube.com/watch?v=lqmVvpunk2c)
+--    * [Harrier Practice pattern USS America](https://youtu.be/99NigITYmcI)
 --
 -- ===
 --
@@ -295,6 +299,8 @@
 -- ![Banner Image](..\Presentations\AIRBOSS\Airboss_Case1_Landing.png)
 --
 -- Once the aircraft reaches the Initial, the landing pattern begins. The important steps of the pattern are shown in the image above.
+-- The AV-8B Harrier pattern is very similar, the only differences are as there is no angled deck there is no wake check. from the ninety you wil fly a straight approach offset 26 ft to port (left) of the tram line.
+-- The aim is to arrive abeam the landing spot in a stable hover at 120 ft with forward speed matched to the boat. From there the LSO will call "cleared to land". You then level cross to the tram line at the designated landing spot at land vertcally.
 --
 --
 -- ## CASE III
@@ -919,9 +925,9 @@
 --
 -- ## Sound Packs
 --
--- The AIRBOSS currently has two different "sound packs" for both LSO and Marshal radios. These contain voice overs by different actors.
+-- The AIRBOSS currently has two different "sound packs" for LSO and three different "sound Packs" for Marshal radios. These contain voice overs by different actors.
 -- These can be set by @{#AIRBOSS.SetVoiceOversLSOByRaynor}() and @{#AIRBOSS.SetVoiceOversMarshalByRaynor}(). These are the default settings.
--- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}().
+-- The other sound files can be set by @{#AIRBOSS.SetVoiceOversLSOByFF}(), @{#AIRBOSS.SetVoiceOversMarshalByGabriella}() and @{#AIRBOSS.SetVoiceOversMarshalByFF}().
 -- Also combinations can be used, e.g.
 --
 --     airbossStennis:SetVoiceOversLSOByFF()
@@ -1256,7 +1262,7 @@ AIRBOSS = {
 
 --- Aircraft types capable of landing on carrier (human+AI).
 -- @type AIRBOSS.AircraftCarrier
--- @field #string AV8B AV-8B Night Harrier. Works only with the USS Tarawa.
+-- @field #string AV8B AV-8B Night Harrier. Works only with the USS Tarawa, USS America and Juan Carlos I.
 -- @field #string A4EC A-4E Community mod.
 -- @field #string HORNET F/A-18C Lot 20 Hornet by Eagle Dynamics.
 -- @field #string F14A F-14A by Heatblur.
@@ -1290,8 +1296,11 @@ AIRBOSS.AircraftCarrier={
 -- @field #string WASHINGTON USS George Washington (CVN-73) [Super Carrier Module]
 -- @field #string STENNIS USS John C. Stennis (CVN-74)
 -- @field #string TRUMAN USS Harry S. Truman (CVN-75) [Super Carrier Module]
+-- @field #string FORRESTAL USS Forrestal (CV-59) [Heatblur Carrier Module]
 -- @field #string VINSON USS Carl Vinson (CVN-70) [Obsolete]
 -- @field #string TARAWA USS Tarawa (LHA-1)
+-- @field #string AMERICA USS America (LHA-6)
+-- @field #string JCARLOS Juan Carlos I (L61)
 -- @field #string KUZNETSOV Admiral Kuznetsov (CV 1143.5)
 AIRBOSS.CarrierType={
   ROOSEVELT="CVN_71",
@@ -1299,8 +1308,11 @@ AIRBOSS.CarrierType={
   WASHINGTON="CVN_73",
   TRUMAN="CVN_75",
   STENNIS="Stennis",
+  FORRESTAL="Forrestal",
   VINSON="VINSON",
   TARAWA="LHA_Tarawa",
+  AMERICA="USS America LHA-6",
+  JCARLOS="L61",
   KUZNETSOV="KUZNECOW",
 }
 
@@ -1420,8 +1432,8 @@ AIRBOSS.PatternStep={
 -- @field #string IM "IM": In the middle.
 -- @field #string IC "IC": In close.
 -- @field #string AR "AR": At the ramp.
--- @field #string AL "AL": Abeam landing position (Tarawa).
+-- @field #string AL "AL": Abeam landing position (V/STOL).
--- @field #string LC "LC": Level crossing (Tarawa).
+-- @field #string LC "LC": Level crossing (V/STOL).
 -- @field #string IW "IW": In the wires.
 AIRBOSS.GroovePos={
   X0="X0",
@@ -1486,6 +1498,7 @@ AIRBOSS.GroovePos={
 -- @field #AIRBOSS.RadioCall DEPARTANDREENTER "Depart and re-enter" call.
 -- @field #AIRBOSS.RadioCall EXPECTHEAVYWAVEOFF "Expect heavy wavoff" call.
 -- @field #AIRBOSS.RadioCall EXPECTSPOT75 "Expect spot 7.5" call.
+-- @field #AIRBOSS.RadioCall EXPECTSPOT5 "Expect spot 5" call.
 -- @field #AIRBOSS.RadioCall FAST "You're fast" call.
 -- @field #AIRBOSS.RadioCall FOULDECK "Foul Deck" call.
 -- @field #AIRBOSS.RadioCall HIGH "You're high" call.
@@ -1713,7 +1726,7 @@ AIRBOSS.MenuF10Root=nil
 
 --- Airboss class version.
 -- @field #string version
-AIRBOSS.version="1.1.6"
+AIRBOSS.version="1.2.0"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -1964,12 +1977,20 @@ function AIRBOSS:New(carriername, alias)
     self:_InitNimitz()
   elseif self.carriertype==AIRBOSS.CarrierType.TRUMAN then
     self:_InitNimitz()
+  elseif self.carriertype==AIRBOSS.CarrierType.FORRESTAL then
+    self:_InitForrestal()
   elseif self.carriertype==AIRBOSS.CarrierType.VINSON then
     -- TODO: Carl Vinson parameters.
     self:_InitStennis()
   elseif self.carriertype==AIRBOSS.CarrierType.TARAWA then
     -- Tarawa parameters.
     self:_InitTarawa()
+  elseif self.carriertype==AIRBOSS.CarrierType.AMERICA then
+    -- Use America parameters.
+    self:_InitAmerica()
+  elseif self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+    -- Use Juan Carlos parameters.
+    self:_InitJcarlos()
   elseif self.carriertype==AIRBOSS.CarrierType.KUZNETSOV then
     -- Kusnetsov parameters - maybe...
     self:_InitStennis()
@@ -2025,7 +2046,7 @@ function AIRBOSS:New(carriername, alias)
     local stern=self:_GetSternCoord()
 
     -- Bow pos.
-    local bow=stern:Translate(self.carrierparam.totlength, hdg)
+    local bow=stern:Translate(self.carrierparam.totlength, hdg, true)
 
     -- End of rwy.
     local rwy=stern:Translate(self.carrierparam.rwylength, FB, true)
@@ -2043,31 +2064,31 @@ function AIRBOSS:New(carriername, alias)
       bow:FlareYellow()
 
       -- Runway half width = 10 m.
-      local r1=stern:Translate(self.carrierparam.rwywidth*0.5, FB+90)
+      local r1=stern:Translate(self.carrierparam.rwywidth*0.5, FB+90, true)
-      local r2=stern:Translate(self.carrierparam.rwywidth*0.5, FB-90)
+      local r2=stern:Translate(self.carrierparam.rwywidth*0.5, FB-90, true)
-      r1:FlareWhite()
+      --r1:FlareWhite()
-      r2:FlareWhite()
+      --r2:FlareWhite()
 
       -- End of runway.
       rwy:FlareRed()
 
       -- Right 30 meters from stern.
-      local cR=stern:Translate(self.carrierparam.totwidthstarboard, hdg+90)
+      local cR=stern:Translate(self.carrierparam.totwidthstarboard, hdg+90, true)
-      cR:FlareYellow()
+      --cR:FlareYellow()
 
       -- Left 40 meters from stern.
-      local cL=stern:Translate(self.carrierparam.totwidthport, hdg-90)
+      local cL=stern:Translate(self.carrierparam.totwidthport, hdg-90, true)
-      cL:FlareYellow()
+      --cL:FlareYellow()
 
 
       -- Carrier specific.
-      if self.carrier:GetTypeName()~=AIRBOSS.CarrierType.TARAWA then
+      if self.carrier:GetTypeName()~=AIRBOSS.CarrierType.TARAWA or self.carrier:GetTypeName()~=AIRBOSS.CarrierType.AMERICA or self.carrier:GetTypeName()~=AIRBOSS.CarrierType.JCARLOS then
 
         -- Flare wires.
-        local w1=stern:Translate(self.carrierparam.wire1, FB)
+        local w1=stern:Translate(self.carrierparam.wire1, FB, true)
-        local w2=stern:Translate(self.carrierparam.wire2, FB)
+        local w2=stern:Translate(self.carrierparam.wire2, FB, true)
-        local w3=stern:Translate(self.carrierparam.wire3, FB)
+        local w3=stern:Translate(self.carrierparam.wire3, FB, true)
-        local w4=stern:Translate(self.carrierparam.wire4, FB)
+        local w4=stern:Translate(self.carrierparam.wire4, FB, true)
         w1:FlareWhite()
         w2:FlareYellow()
         w3:FlareWhite()
@@ -4361,6 +4382,35 @@ function AIRBOSS:_InitNimitz()
 
 end
 
+--- Init parameters for Forrestal class super carriers.
+-- @param #AIRBOSS self
+function AIRBOSS:_InitForrestal()
+
+  -- Init Nimitz as default.
+  self:_InitNimitz()
+
+  -- Carrier Parameters.
+  self.carrierparam.sterndist  =-135.5
+  self.carrierparam.deckheight =  20 --20.1494  --DCS World OpenBeta\CoreMods\tech\USS_Nimitz\Database\USS_CVN_7X.lua
+
+  -- Total size of the carrier (approx as rectangle).
+  self.carrierparam.totlength=315         -- Wiki says 325 meters overall length.
+  self.carrierparam.totwidthport=45         -- Wiki says  73 meters overall beam.
+  self.carrierparam.totwidthstarboard=35
+
+  -- Landing runway.
+  self.carrierparam.rwyangle   =  -9.1359  --DCS World OpenBeta\CoreMods\tech\USS_Nimitz\scripts\USS_Nimitz_RunwaysAndRoutes.lua
+  self.carrierparam.rwylength  = 212
+  self.carrierparam.rwywidth   =  25
+
+  -- Wires.
+  self.carrierparam.wire1      =  44        -- Distance from stern to first wire. Original from Frank - 42
+  self.carrierparam.wire2      =  54        --51.5
+  self.carrierparam.wire3      =  64        --62
+  self.carrierparam.wire4      =  74        --72.5
+
+end
+
 --- Init parameters for LHA-1 Tarawa carrier.
 -- @param #AIRBOSS self
 function AIRBOSS:_InitTarawa()
@@ -4401,6 +4451,85 @@ function AIRBOSS:_InitTarawa()
 
 end
 
+--- Init parameters for LHA-6 America carrier.
+-- @param #AIRBOSS self
+function AIRBOSS:_InitAmerica()
+
+  -- Init Stennis as default.
+  self:_InitStennis()
+
+  -- Carrier Parameters.
+  self.carrierparam.sterndist  =-125
+  self.carrierparam.deckheight =  20  --67 ft
+
+  -- Total size of the carrier (approx as rectangle).
+  self.carrierparam.totlength=257
+  self.carrierparam.totwidthport=11
+  self.carrierparam.totwidthstarboard=25
+
+  -- Landing runway.
+  self.carrierparam.rwyangle  =   0
+  self.carrierparam.rwylength = 240
+  self.carrierparam.rwywidth  =  15
+
+  -- Wires.
+  self.carrierparam.wire1=nil
+  self.carrierparam.wire2=nil
+  self.carrierparam.wire3=nil
+  self.carrierparam.wire4=nil
+
+  -- Late break.
+  self.BreakLate.name="Late Break"
+  self.BreakLate.Xmin=-UTILS.NMToMeters(1)         -- Not more than 1 NM behind the boat. Last check was at 0.
+  self.BreakLate.Xmax= UTILS.NMToMeters(5)         -- Not more than 5 NM in front of the boat. Enough for late breaks?
+  self.BreakLate.Zmin=-UTILS.NMToMeters(1.6)       -- Not more than 1.6 NM port.
+  self.BreakLate.Zmax= UTILS.NMToMeters(1)         -- Not more than 1 NM starboard.
+  self.BreakLate.LimitXmin= 0                      -- Check and next step 0.8 NM port and in front of boat.
+  self.BreakLate.LimitXmax= nil
+  self.BreakLate.LimitZmin=-UTILS.NMToMeters(0.5)  -- 926 m port, closer than the stennis as abeam is 0.8-1.0 rather than 1.2
+  self.BreakLate.LimitZmax= nil
+
+end
+
+--- Init parameters for L61 Juan Carlos carrier.
+-- @param #AIRBOSS self
+function AIRBOSS:_InitJcarlos()
+
+  -- Init Stennis as default.
+  self:_InitStennis()
+
+  -- Carrier Parameters.
+  self.carrierparam.sterndist  =-125
+  self.carrierparam.deckheight = 20  --67 ft
+
+  -- Total size of the carrier (approx as rectangle).
+  self.carrierparam.totlength=231
+  self.carrierparam.totwidthport=10
+  self.carrierparam.totwidthstarboard=22
+
+  -- Landing runway.
+  self.carrierparam.rwyangle  =   0
+  self.carrierparam.rwylength = 202
+  self.carrierparam.rwywidth  =  14
+
+  -- Wires.
+  self.carrierparam.wire1=nil
+  self.carrierparam.wire2=nil
+  self.carrierparam.wire3=nil
+  self.carrierparam.wire4=nil
+
+  -- Late break.
+  self.BreakLate.name="Late Break"
+  self.BreakLate.Xmin=-UTILS.NMToMeters(1)         -- Not more than 1 NM behind the boat. Last check was at 0.
+  self.BreakLate.Xmax= UTILS.NMToMeters(5)         -- Not more than 5 NM in front of the boat. Enough for late breaks?
+  self.BreakLate.Zmin=-UTILS.NMToMeters(1.6)       -- Not more than 1.6 NM port.
+  self.BreakLate.Zmax= UTILS.NMToMeters(1)         -- Not more than 1 NM starboard.
+  self.BreakLate.LimitXmin= 0                      -- Check and next step 0.8 NM port and in front of boat.
+  self.BreakLate.LimitXmax= nil
+  self.BreakLate.LimitZmin=-UTILS.NMToMeters(0.5)  -- 926 m port, closer than the stennis as abeam is 0.8-1.0 rather than 1.2
+  self.BreakLate.LimitZmax= nil
+
+end
 --- Init parameters for Marshal Voice overs *Gabriella* by HighwaymanEd.
 -- @param #AIRBOSS self
 -- @param #string mizfolder (Optional) Folder within miz file where the sound files are located.
@@ -4555,6 +4684,7 @@ function AIRBOSS:SetVoiceOversLSOByRaynor(mizfolder)
   self.LSOCall.DEPARTANDREENTER.duration=1.10
   self.LSOCall.EXPECTHEAVYWAVEOFF.duration=1.30
   self.LSOCall.EXPECTSPOT75.duration=1.85
+  self.LSOCall.EXPECTSPOT5.duration=1.3
   self.LSOCall.FAST.duration=0.75
   self.LSOCall.FOULDECK.duration=0.75
   self.LSOCall.HIGH.duration=0.65
@@ -4613,6 +4743,7 @@ function AIRBOSS:SetVoiceOversLSOByFF(mizfolder)
   self.LSOCall.DEPARTANDREENTER.duration=1.10
   self.LSOCall.EXPECTHEAVYWAVEOFF.duration=1.20
   self.LSOCall.EXPECTSPOT75.duration=2.00
+  self.LSOCall.EXPECTSPOT5.duration=1.3
   self.LSOCall.FAST.duration=0.70
   self.LSOCall.FOULDECK.duration=0.62
   self.LSOCall.HIGH.duration=0.65
@@ -4881,6 +5012,14 @@ function AIRBOSS:_InitVoiceOvers()
       duration=2.0,
       subduration=5,
     },
+  EXPECTSPOT5={
+      file="LSO-ExpectSpot5",
+      suffix="ogg",
+      loud=false,
+      subtitle="Expect spot 5",
+      duration=1.3,
+      subduration=5,
+    },
     STABILIZED={
       file="LSO-Stabilized",
       suffix="ogg",
@@ -5540,14 +5679,14 @@ function AIRBOSS:_GetAircraftAoA(playerData)
     aoa.Fast       = 8.25       --=17.5/2
     aoa.FAST       = 8.00       --=16.5/2
   elseif harrier then
-    -- AV-8B Harrier parameters. This might need further tuning.
+    -- AV-8B Harrier parameters. Tuning done on the Fast AoA to allow for abeam and ninety at Nozzles 60 - 73.
     aoa.SLOW       = 14.0
     aoa.Slow       = 13.0
     aoa.OnSpeedMax = 12.0
     aoa.OnSpeed    = 11.0
     aoa.OnSpeedMin = 10.0
-    aoa.Fast       =  9.0
+    aoa.Fast       =  8.0
-    aoa.FAST       =  8.0
+    aoa.FAST       =  7.5
   end
 
   return aoa
@@ -5807,7 +5946,7 @@ function AIRBOSS:_GetAircraftParameters(playerData, step)
       alt=UTILS.FeetToMeters(300) --?
     elseif harrier then
       -- 300-325 ft
-      alt=UTILS.FeetToMeters(300)
+      alt=UTILS.FeetToMeters(300)-- Need to verify
     end
 
     aoa=aoaac.OnSpeed
@@ -6746,8 +6885,8 @@ function AIRBOSS:_GetMarshalAltitude(stack, case)
     -- Second point 1.5 NM ahead.
     p2=Carrier:Translate(UTILS.NMToMeters(1.5), hdg)
 
-    -- Tarawa Delta pattern.
+    -- Tarawa,LHA,LHD Delta patterns.
-    if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+    if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
 
       -- Pattern is directly overhead the carrier.
       p1=Carrier:Translate(UTILS.NMToMeters(1.0), hdg+90)
@@ -8592,7 +8731,7 @@ function AIRBOSS:OnEventLand(EventData)
           self:T(self.lid..text)
 
           -- Check carrier type.
-          if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+          if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
 
             -- Power "Idle".
             self:RadioTransmission(self.LSORadio, self.LSOCall.IDLE, false, 1, nil, true)
@@ -8627,7 +8766,7 @@ function AIRBOSS:OnEventLand(EventData)
       -- AI unit landed --
       --------------------
 
-      if self.carriertype~=AIRBOSS.CarrierType.TARAWA then
+      if self.carriertype~=AIRBOSS.CarrierType.TARAWA or self.carriertype~=AIRBOSS.CarrierType.AMERICA or self.carriertype~=AIRBOSS.CarrierType.JCARLOS then
 
         -- Coordinate at landing event
         local coord=EventData.IniUnit:GetCoordinate()
@@ -9534,8 +9673,10 @@ function AIRBOSS:_Bullseye(playerData)
     -- Hint for player about altitude, AoA etc.
     self:_PlayerHint(playerData)
 
-    -- LSO expect spot 7.5 call
+    -- LSO expect spot 5 or 7.5 call
-    if playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+  if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+      self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT5, nil, nil, nil, true)
+    elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
       self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT75, nil, nil, nil, true)
     end
 
@@ -9671,8 +9812,8 @@ function AIRBOSS:_CheckForLongDownwind(playerData)
   -- 1.6 NM from carrier is too far.
   local limit=UTILS.NMToMeters(-1.6)
 
-  -- For the tarawa we give a bit more space.
+  -- For the tarawa, other LHA and LHD we give a bit more space.
-  if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+  if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
     limit=UTILS.NMToMeters(-2.0)
   end
 
@@ -9717,8 +9858,10 @@ function AIRBOSS:_Abeam(playerData)
     -- Paddles contact.
     self:RadioTransmission(self.LSORadio, self.LSOCall.PADDLESCONTACT, nil, nil, nil, true)
 
-     -- LSO expect spot 7.5 call
+     -- LSO expect spot 5 or 7.5 call
-    if playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+  if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+      self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT5, false, 5, nil, true)
+    elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
       self:RadioTransmission(self.LSORadio, self.LSOCall.EXPECTSPOT75, false, 5, nil, true)
     end
 
@@ -9755,7 +9898,7 @@ function AIRBOSS:_Ninety(playerData)
     self:_PlayerHint(playerData)
 
     -- Next step: wake.
-    if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+    if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
       -- Harrier has no wake stop. It stays port of the boat.
       self:_SetPlayerStep(playerData, AIRBOSS.PatternStep.FINAL)
     else
@@ -10429,12 +10572,15 @@ function AIRBOSS:_GetSternCoord()
   --local stern=self:GetCoordinate()
 
   -- Stern coordinate (sterndist<0).
-  if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+  if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
     -- Tarawa: Translate 8 meters port.
     self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(8, FB-90, true, true)
   elseif self.carriertype==AIRBOSS.CarrierType.STENNIS then
     -- Stennis: translate 7 meters starboard wrt Final bearing.
     self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(7, FB+90, true, true)
+  elseif self.carriertype==AIRBOSS.CarrierType.FORRESTAL then
+    -- Forrestal
+    self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(7.5, FB+90, true, true)
   else
     -- Nimitz SC: translate 8 meters starboard wrt Final bearing.
     self.sterncoord:Translate(self.carrierparam.sterndist, hdg, true, true):Translate(9.5, FB+90, true, true)
@@ -11172,7 +11318,7 @@ function AIRBOSS:_GetZoneHolding(case, stack)
     self.zoneHolding=ZONE_RADIUS:New("CASE I Holding Zone", Post:GetVec2(), self.marshalradius)
 
     -- Delta pattern.
-    if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+    if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
       self.zoneHolding=ZONE_RADIUS:New("CASE I Holding Zone", self.carrier:GetVec2(), UTILS.NMToMeters(5))
     end
 
@@ -11225,7 +11371,7 @@ function AIRBOSS:_GetZoneCommence(case, stack)
     -- Three position
     local Three=self:GetCoordinate():Translate(D, hdg+275)
 
-    if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+    if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
 
       local Dx=UTILS.NMToMeters(2.25)
 
@@ -11516,7 +11662,7 @@ function AIRBOSS:_GetAltCarrier(unit)
   return h
 end
 
---- Get optimal landing position of the aircraft. Usually between second and third wire. In case of Tarawa we take the abeam landing spot 120 ft abeam the 7.5 position.
+--- Get optimal landing position of the aircraft. Usually between second and third wire. In case of Tarawa and America we take the abeam landing spot 120 ft abeam the 7.5 position, for the Juan Carlos I it is 120 ft and abeam the 5 position.
 -- @param #AIRBOSS self
 -- @return Core.Point#COORDINATE Optimal landing coordinate.
 function AIRBOSS:_GetOptLandingCoordinate()
@@ -11536,6 +11682,23 @@ function AIRBOSS:_GetOptLandingCoordinate()
   self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
     --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-90)
 
+    -- Alitude 120 ft.
+    self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
+  elseif self.carriertype==AIRBOSS.CarrierType.AMERICA then
+
+    -- Landing 100 ft abeam, 120 ft alt. To allow adjustments to match different deck configurations.
+  self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-90, true, true)
+    --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-90)
+
+    -- Alitude 120 ft.
+    self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
+
+  elseif self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+
+    -- Landing 100 ft abeam, 120 ft alt.
+  self.landingcoord:UpdateFromCoordinate(self:_GetLandingSpotCoordinate()):Translate(35, FB-100, true, true)
+    --stern=self:_GetLandingSpotCoordinate():Translate(35, FB-100)
+
     -- Alitude 120 ft.
     self.landingcoord:SetAltitude(UTILS.FeetToMeters(120))
 
@@ -11573,6 +11736,21 @@ function AIRBOSS:_GetLandingSpotCoordinate()
 
     -- Primary landing spot 7.5
     self.landingspotcoord:Translate(57, hdg, true, true):SetAltitude(self.carrierparam.deckheight)
+  elseif self.carriertype==AIRBOSS.CarrierType.AMERICA then
+
+    -- Landing 100 ft abeam, 120 alt.
+    local hdg=self:GetHeading()
+
+    -- Primary landing spot 7.5 a little further forwad on the America
+    self.landingspotcoord:Translate(59, hdg, true, true):SetAltitude(self.carrierparam.deckheight)
+
+  elseif self.carriertype==AIRBOSS.CarrierType.JCARLOS then
+
+    -- Landing 100 ft abeam, 120 alt.
+    local hdg=self:GetHeading()
+
+    -- Primary landing spot 5.0 -- TODO voice for different landing Spots.
+    self.landingspotcoord:Translate(89, hdg, true, true):SetAltitude(self.carrierparam.deckheight)
 
   end
 
@@ -12065,6 +12243,11 @@ end
 -- * > 24 seconds: No Grade "--"
 --
 -- If you manage to be between 16.4 and and 16.6 seconds, you will even get and okay underline "\_OK\_".
+-- No groove time for Harrier on LHA, LHD set to Tgroove Unicorn as starting point to allow possible _OK_ 5.0.
+-- If time in the AV-8B
+--
+-- * < 90 seconds: OK V/STOL
+-- * > 91 Seconds: SLOW V/STOL (Early hover stop selection)
 --
 -- @param #AIRBOSS self
 -- @param #AIRBOSS.PlayerData playerData Player data table.
@@ -12083,6 +12266,13 @@ function AIRBOSS:_EvalGrooveTime(playerData)
     grade="OK Groove"
   elseif t<=24 then
     grade="(LIG)"
+  -- Time in groove for AV-8B
+  elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B and t<55 then -- VSTOL Late Hover stop selection too fast to Abeam LDG Spot AV-8B.
+    grade="FAST V/STOL Groove"
+  elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B and t<90 then -- VSTOL Operations with AV-8B.
+    grade="OK V/STOL Groove"
+  elseif playerData.actype==AIRBOSS.AircraftCarrier.AV8B and t>=91 then -- VSTOL Early Hover stop selection slow to Abeam LDG Spot AV-8B.
+    grade="SLOW V/STOL Groove"
   else
     grade="LIG"
   end
@@ -12092,6 +12282,11 @@ function AIRBOSS:_EvalGrooveTime(playerData)
     grade="_OK_"
   end
 
+  -- V/STOL Unicorn!
+  if playerData.actype==AIRBOSS.AircraftCarrier.AV8B and (t>=65.0 and t<=75.0) then
+    grade="_OK_ V/STOL"
+  end
+
   return grade
 end
 
@@ -12108,7 +12303,7 @@ function AIRBOSS:_LSOgrade(playerData)
     return select(2, string.gsub(base, pattern, ""))
   end
 
-  -- Analyse flight data and conver to LSO text.
+  -- Analyse flight data and convert to LSO text.
   local GXX,nXX=self:_Flightdata2Text(playerData, AIRBOSS.GroovePos.XX)
   local GIM,nIM=self:_Flightdata2Text(playerData, AIRBOSS.GroovePos.IM)
   local GIC,nIC=self:_Flightdata2Text(playerData, AIRBOSS.GroovePos.IC)
@@ -12117,25 +12312,37 @@ function AIRBOSS:_LSOgrade(playerData)
   -- Put everything together.
   local G=GXX.." "..GIM.." ".." "..GIC.." "..GAR
 
-  -- Count number of minor, normal and major deviations.
+  -- Count number of minor, normal and major deviations. TODO - work on Harrier counts due slower approach speed.
   local N=nXX+nIM+nIC+nAR
   local nL=count(G, '_')/2
   local nS=count(G, '%(')
   local nN=N-nS-nL
 
-  -- Groove time 15-18.99 sec for a unicorn.
+  -- Groove time 15-18.99 sec for a unicorn. Or 65-70 for V/STOL unicorn.
   local Tgroove=playerData.Tgroove
   local TgrooveUnicorn=Tgroove and (Tgroove>=15.0 and Tgroove<=18.99) or false
+  local TgrooveVstolUnicorn=Tgroove and (Tgroove>=65.0 and Tgroove<=70.0)and playerData.actype==AIRBOSS.AircraftCarrier.AV8B or false
 
   local grade
   local points
-  if N==0 and TgrooveUnicorn then
+  if N==0 and (TgrooveUnicorn or TgrooveVstolUnicorn ) then
     -- No deviations, should be REALLY RARE!
     grade="_OK_"
     points=5.0
     G="Unicorn"
   else
-    if nL>0 then
+
+    -- Add AV-8B Harrier devation allowances due to lower groundspeed and 3x conventional groove time, this allows to maintain LSO tolerances while respecting the deviations are not unsafe. (WIP requires feedback)
+      -- Large devaitions still result in a No Grade, A Unicorn still requires a clean pass with no deviation.
+  if nL>3 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+      -- Larger deviations ==> "No grade" 2.0 points.
+      grade="--"
+      points=2.0
+  elseif nN>2 and playerData.actype==AIRBOSS.AircraftCarrier.AV8B then
+      -- Only average deviations ==>  "Fair Pass" Pass with average deviations and corrections.
+      grade="(OK)"
+      points=3.0
+  elseif nL>0 then
       -- Larger deviations ==> "No grade" 2.0 points.
       grade="--"
       points=2.0
@@ -12148,6 +12355,7 @@ function AIRBOSS:_LSOgrade(playerData)
       grade="OK"
       points=4.0
     end
+
 end
 
   -- Replace" )"( and "__"
@@ -12444,7 +12652,7 @@ function AIRBOSS:_GS(step, n)
     if n==-1 then
       gp=AIRBOSS.GroovePos.IC
     elseif n==1 then
-      if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+      if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
         gp=AIRBOSS.GroovePos.AL
       else
         gp=AIRBOSS.GroovePos.IW
@@ -14334,17 +14542,17 @@ function AIRBOSS:_IsCarrierAircraft(unit)
   -- Get aircraft type name
   local aircrafttype=unit:GetTypeName()
 
-  -- Special case for Harrier which can only land on Tarawa.
+  -- Special case for Harrier which can only land on Tarawa, LHA and LHD.
   if aircrafttype==AIRBOSS.AircraftCarrier.AV8B then
-    if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+    if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
       return true
     else
       return false
     end
   end
 
-  -- Also only Harriers can land on the Tarawa.
+  -- Also only Harriers can land on the Tarawa, LHA and LHD.
-  if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+  if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
     if aircrafttype~=AIRBOSS.AircraftCarrier.AV8B then
       return false
     end
@@ -17713,8 +17921,8 @@ function AIRBOSS:_MarkCaseZones(_unitName, flare)
           self:_GetZoneBullseye(case):FlareZone(FLARECOLOR.Green, 45)
         end
 
-        -- Tarawa landing spots.
+        -- Tarawa, LHA and LHD landing spots.
-        if self.carriertype==AIRBOSS.CarrierType.TARAWA then
+        if self.carriertype==AIRBOSS.CarrierType.TARAWA or self.carriertype==AIRBOSS.CarrierType.AMERICA or self.carriertype==AIRBOSS.CarrierType.JCARLOS then
           text=text.."\n* abeam landing stop with RED flares"
           -- Abeam landing spot zone.
           local ALSPT=self:_GetZoneAbeamLandingSpot()

Moose Development/Moose/Ops/CSAR.lua

@@ -22,7 +22,7 @@
 -- @module Ops.CSAR
 -- @image OPS_CSAR.jpg
 
--- Date: Aug 2021
+-- Date: Oct 2021
 
 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -97,6 +97,14 @@
 --         self.pilotmustopendoors = false -- switch to true to enable check of open doors
 --         -- (added 0.1.9)
 --         self.suppressmessages = false -- switch off all messaging if you want to do your own
+--         -- (added 0.1.11)
+--         self.rescuehoverheight = 20 -- max height for a hovering rescue in meters
+--         self.rescuehoverdistance = 10 -- max distance for a hovering rescue in meters
+--         -- (added 0.1.12)
+--         -- Country codes for spawned pilots
+--         self.countryblue= country.id.USA
+--         self.countryred = country.id.RUSSIA
+--         self.countryneutral = country.id.UN_PEACEKEEPERS
 -- 
 -- ## 2.1 Experimental Features
 -- 
@@ -230,10 +238,11 @@ CSAR.AircraftType["Mi-8MTV2"] = 12
 CSAR.AircraftType["Mi-8MT"] = 12  
 CSAR.AircraftType["Mi-24P"] = 8 
 CSAR.AircraftType["Mi-24V"] = 8
+CSAR.AircraftType["Bell-47"] = 2
 
 --- CSAR class version.
 -- @field #string version
-CSAR.version="0.1.10r3"
+CSAR.version="0.1.11r2"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -349,7 +358,7 @@ function CSAR:New(Coalition, Template, Alias)
   self.csarPrefix = { "helicargo", "MEDEVAC"} -- prefixes used for useprefix=true - DON\'T use # in names!
   self.template = Template or "generic" -- template for downed pilot
   self.mashprefix = {"MASH"} -- prefixes used to find MASHes
-  self.mash = SET_GROUP:New():FilterCoalitions(self.coalition):FilterPrefixes(self.mashprefix):FilterOnce() -- currently only GROUP objects, maybe support STATICs also?
+ 
   self.autosmoke = false -- automatically smoke location when heli is near
   self.autosmokedistance = 2000 -- distance for autosmoke
   -- added 0.1.4
@@ -363,6 +372,15 @@ function CSAR:New(Coalition, Template, Alias)
   self.pilotmustopendoors = false -- switch to true to enable check on open doors
   self.suppressmessages = false
   
+  -- added 0.1.11r1
+  self.rescuehoverheight = 20
+  self.rescuehoverdistance = 10
+ 
+  -- added 0.1.12
+  self.countryblue= country.id.USA
+  self.countryred = country.id.RUSSIA
+  self.countryneutral = country.id.UN_PEACEKEEPERS
+    
   -- WARNING - here\'ll be dragons
   -- for this to work you need to de-sanitize your mission environment in <DCS root>\Scripts\MissionScripting.lua
   -- needs SRS => 1.9.6 to work (works on the *server* side)
@@ -549,6 +567,7 @@ function CSAR:_SpawnPilotInField(country,point,frequency)
   for i=1,10 do
     math.random(i,10000)
   end
+  if point:IsSurfaceTypeWater() then point.y = 0 end
   local template = self.template
   local alias = string.format("Pilot %.2fkHz-%d", freq, math.random(1,99))
   local coalition = self.coalition
@@ -687,11 +706,11 @@ function CSAR:_SpawnCsarAtZone( _zone, _coalition, _description, _randomPoint, _
   
   local _country = 0
   if _coalition == coalition.side.BLUE then
-    _country = country.id.USA
+    _country = self.countryblue
   elseif _coalition == coalition.side.RED then
-    _country = country.id.RUSSIA
+    _country = self.countryred
   else
-    _country = country.id.UN_PEACEKEEPERS
+    _country = self.countryneutral
   end
   
   self:_AddCsar(_coalition, _country, pos, typename, unitname, _description, freq, _nomessage, _description, forcedesc)
@@ -718,7 +737,6 @@ function CSAR:SpawnCSARAtZone(Zone, Coalition, Description, RandomPoint, Nomessa
   return self
 end
 
--- TODO: Split in functions per Event type
 --- (Internal) Event handler.
 -- @param #CSAR self
 function CSAR:_EventHandler(EventData)
@@ -790,7 +808,7 @@ function CSAR:_EventHandler(EventData)
           if self:_DoubleEjection(_unitname) then
             return
           end
-          self:_DisplayToAllSAR("MAYDAY MAYDAY! " .. _unit:GetTypeName() .. " shot down. No Chute!", self.coalition, self.messageTime)         
+
       else
           self:T(self.lid .. " Pilot has not taken off, ignore")
       end
@@ -878,13 +896,6 @@ function CSAR:_EventHandler(EventData)
    
           if _place:GetCoalition() == self.coalition or _place:GetCoalition() == coalition.side.NEUTRAL then
             self:_ScheduledSARFlight(_event.IniUnitName,_event.IniGroupName,true)
-            --[[
-            if self.pilotmustopendoors and not self:_IsLoadingDoorOpen(_event.IniUnitName) then
-              self:_DisplayMessageToSAR(_unit, "Open the door to let me out!", self.messageTime, true)
-            else
-              self:_RescuePilots(_unit)
-            end  
-            --]]
           else
               self:T(string.format("Airfield %d, Unit %d", _place:GetCoalition(), _unit:GetCoalition()))
               end
@@ -904,7 +915,6 @@ end
 function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage)
   self:T(self.lid .. " _InitSARForPilot")
   local _leader = _downedGroup:GetUnit(1)
-  --local _groupName = _downedGroup:GetName()
   local _groupName = _GroupName
   local _freqk = _freq / 1000
   local _coordinatesText = self:_GetPositionOfWounded(_downedGroup)
@@ -920,7 +930,7 @@ function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage)
   end
 
    -- trigger FSM event
-  self:__PilotDown(2,_downedGroup, _freqk, _leadername, _coordinatesText)
+  self:__PilotDown(2,_downedGroup, _freqk, _groupName, _coordinatesText)
   
   return self
 end
@@ -1090,7 +1100,6 @@ function CSAR:_PickupUnit(_heliUnit, _pilotName, _woundedGroup, _woundedGroupNam
   local grouptable = downedgrouptable --#CSAR.DownedPilot
   self.inTransitGroups[_heliName][_woundedGroupName] =
   {
-      -- DONE: Fix with #CSAR.DownedPilot
       originalUnit = grouptable.originalUnit,
       woundedGroup = _woundedGroupName,
       side = self.coalition,
@@ -1129,42 +1138,7 @@ end
 -- @return #boolean outcome The outcome.
 function CSAR:_IsLoadingDoorOpen( unit_name )
   self:T(self.lid .. " _IsLoadingDoorOpen")
-  
-  --[[
-  local ret_val = false
-  local unit = Unit.getByName(unit_name)
-  if unit ~= nil then
-      local type_name = unit:getTypeName()
-      
-      if type_name == "Mi-8MT" and unit:getDrawArgumentValue(86) == 1 or unit:getDrawArgumentValue(250) == 1 then
-          self:T(unit_name .. " Cargo doors are open or cargo door not present")
-          ret_val =  true
-      end
-      
-      if type_name == "Mi-24P" and unit:getDrawArgumentValue(38) == 1 or unit:getDrawArgumentValue(86) == 1 then
-          self:T(unit_name .. " a side door is open")
-          ret_val =  true
-      end
-      
-      if type_name == "UH-1H" and unit:getDrawArgumentValue(43) == 1 or unit:getDrawArgumentValue(44) == 1 then
-          self:T(unit_name .. " a side door is open ")
-          ret_val =  true
-      end
-
-      if string.find(type_name, "SA342" ) and unit:getDrawArgumentValue(34) == 1 or unit:getDrawArgumentValue(38) == 1 then
-          self:T(unit_name .. " front door(s) are open")
-          ret_val =  true
-      end
-
-      if ret_val == false then
-          self:T(unit_name .. " all doors are closed")
-      end
-      return ret_val
-          
-  end -- nil
-  --]]
   return UTILS.IsLoadingDoorOpen(unit_name)
-  
 end
 
 --- (Internal) Function to check if heli is close to group.
@@ -1195,14 +1169,12 @@ function CSAR:_CheckCloseWoundedGroup(_distance, _heliUnit, _heliName, _woundedG
           else
             self:_DisplayMessageToSAR(_heliUnit, string.format("%s: %s. You\'re close now! Land in a safe place, I will go there ", _heliName, _pilotName), self.messageTime,false,true)
           end
-          --mark as shown for THIS heli and THIS group
           self.heliCloseMessage[_lookupKeyHeli] = true
       end
   
       -- have we landed close enough?
       if not _heliUnit:InAir() then
   
-          -- if you land on them, doesnt matter if they were heading to someone else as you\'re closer, you win! :)
         if self.pilotRuntoExtractPoint == true then
             if (_distance < self.extractDistance) then
               local _time = self.landedStatus[_lookupKeyHeli]
@@ -1246,15 +1218,16 @@ function CSAR:_CheckCloseWoundedGroup(_distance, _heliUnit, _heliName, _woundedG
           end
           
           if _heliUnit:InAir() and _unitsInHelicopter + 1 <= _maxUnits then
-  
+              -- TODO - make variable
-              if _distance < 8.0 then
+              if _distance < self.rescuehoverdistance then
   
                   --check height!
                   local leaderheight = _woundedLeader:GetHeight()
                   if leaderheight < 0 then leaderheight = 0 end
                   local _height = _heliUnit:GetHeight() - leaderheight
                   
-                  if _height <= 20.0 then
+                  -- TODO - make variable
+                  if _height <= self.rescuehoverheight then
   
                       local _time = self.hoverStatus[_lookupKeyHeli]
   
@@ -1354,7 +1327,6 @@ function CSAR:_RescuePilots(_heliUnit)
       return
   end
 
-  -- DONE: count saved units?
   local PilotsSaved = self:_PilotsOnboard(_heliName)
   
   self.inTransitGroups[_heliName] = nil
@@ -1450,7 +1422,6 @@ function CSAR:_DisplayActiveSAR(_unitName)
     local _groupName = _value.name
     self:T(string.format("Display Active Pilot: %s", tostring(_groupName)))
     self:T({Table=_value})
-    --local _woundedGroup = GROUP:FindByName(_groupName)
     local _woundedGroup = _value.group
     if _woundedGroup and _value.alive then  
         local _coordinatesText = self:_GetPositionOfWounded(_woundedGroup) 
@@ -1747,7 +1718,6 @@ function CSAR:_GetDistance(_point1, _point2)
   if _point1 and _point2 then
     local distance1 = _point1:Get2DDistance(_point2)
     local distance2 = _point1:DistanceFromPointVec2(_point2)
-    self:I({dist1=distance1, dist2=distance2})
     if distance1 and type(distance1) == "number" then
       return distance1
     elseif distance2 and type(distance2) == "number" then
@@ -1768,7 +1738,6 @@ end
 -- @param #CSAR self
 function CSAR:_GenerateVHFrequencies()
   self:T(self.lid .. " _GenerateVHFrequencies")
-  --local _skipFrequencies = self.SkipFrequencies
       
   local FreeVHFFrequencies = {}
   FreeVHFFrequencies = UTILS.GenerateVHFrequencies()
@@ -1808,7 +1777,6 @@ function CSAR:_GetClockDirection(_heli, _group)
   if _heading then
     local Aspect = Angle - _heading
     if Aspect == 0 then Aspect = 360 end
-    --clock = math.floor(Aspect / 30)
     clock = math.abs(UTILS.Round((Aspect / 30),0))
     if clock == 0 then clock = 12 end
   end    
@@ -1917,6 +1885,7 @@ function CSAR:onafterStart(From, Event, To)
   else
     self.allheligroupset = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterCategoryHelicopter():FilterStart()
   end
+  self.mash = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(self.mashprefix):FilterStart() -- currently only GROUP objects, maybe support STATICs also?
   self:__Status(-10)
   return self
 end

Moose Development/Moose/Sound/Radio.lua

@@ -157,7 +157,7 @@ end
 --- Set the frequency for the radio transmission.
 -- If the transmitting positionable is a unit or group, this also set the command "SetFrequency" with the defined frequency and modulation.
 -- @param #RADIO self
--- @param #number Frequency Frequency in MHz. Ranges allowed for radio transmissions in DCS : 30-87.995 / 108-173.995 / 225-399.975MHz.
+-- @param #number Frequency Frequency in MHz.
 -- @return #RADIO self
 function RADIO:SetFrequency(Frequency)
   self:F2(Frequency)
@@ -165,7 +165,7 @@ function RADIO:SetFrequency(Frequency)
   if type(Frequency) == "number" then
   
     -- If frequency is in range
-    if (Frequency >= 30 and Frequency <= 87.995) or (Frequency >= 108 and Frequency <= 173.995) or (Frequency >= 225 and Frequency <= 399.975) then
+   -- if (Frequency >= 30 and Frequency <= 87.995) or (Frequency >= 108 and Frequency <= 173.995) or (Frequency >= 225 and Frequency <= 399.975) then
     
       -- Convert frequency from MHz to Hz
       self.Frequency = Frequency * 1000000
@@ -186,10 +186,10 @@ function RADIO:SetFrequency(Frequency)
       end
       
       return self
-    end
+  --  end
   end
   
-  self:E({"Frequency is outside of DCS Frequency ranges (30-80, 108-152, 225-400). Frequency unchanged.", Frequency})
+  self:E({"Frequency is not a number. Frequency unchanged.", Frequency})
   return self
 end
 

Moose Development/Moose/Utilities/Utils.lua

@@ -6,7 +6,7 @@
 --
 -- ### Contributions:
 --
---   * FlightControl : Rework to OO framework 
+--   * FlightControl : Rework to OO framework.
 --
 -- @module Utils
 -- @image MOOSE.JPG
@@ -339,18 +339,34 @@ UTILS.MetersToNM = function(meters)
   return meters/1852
 end
 
+UTILS.KiloMetersToNM = function(kilometers)
+  return kilometers/1852*1000
+end
+
 UTILS.MetersToSM = function(meters)
   return meters/1609.34
 end
 
+UTILS.KiloMetersToSM = function(kilometers)
+  return kilometers/1609.34*1000
+end
+
 UTILS.MetersToFeet = function(meters)
   return meters/0.3048
 end
 
+UTILS.KiloMetersToFeet = function(kilometers)
+  return kilometers/0.3048*1000
+end
+
 UTILS.NMToMeters = function(NM)
   return NM*1852
 end
 
+UTILS.NMToKiloMeters = function(NM)
+  return NM*1852/1000
+end
+
 UTILS.FeetToMeters = function(feet)
   return feet*0.3048
 end
@@ -907,7 +923,7 @@ function UTILS.RandomGaussian(x0, sigma, xmin, xmax, imax)
     local x1=math.random()
     local x2=math.random()
 
-    -- Transform to Gaussian exp(-(x-x0)²/(2*sigma²).
+    -- Transform to Gaussian exp(-(x-x0)°/(2*sigma°).
     r = math.sqrt(-2*sigma*sigma * math.log(x1)) * math.cos(2*math.pi * x2) + x0
 
     i=i+1
@@ -961,6 +977,33 @@ function UTILS.VecNorm(a)
   return math.sqrt(UTILS.VecDot(a, a))
 end
 
+--- Calculate the distance between two 2D vectors.
+-- @param DCS#Vec2 a Vector in 3D with x, y components.
+-- @param DCS#Vec2 b Vector in 3D with x, y components.
+-- @return #number Distance between the vectors.
+function UTILS.VecDist2D(a, b)
+
+  local c={x=b.x-a.x, y=b.y-a.y}
+
+  local d=math.sqrt(c.x*c.x+c.y*c.y)
+
+  return d
+end
+
+
+--- Calculate the distance between two 3D vectors.
+-- @param DCS#Vec3 a Vector in 3D with x, y, z components.
+-- @param DCS#Vec3 b Vector in 3D with x, y, z components.
+-- @return #number Distance between the vectors.
+function UTILS.VecDist3D(a, b)
+
+  local c={x=b.x-a.x, y=b.y-a.y, z=b.z-a.z}
+
+  local d=math.sqrt(UTILS.VecDot(c, c))
+
+  return d
+end
+
 --- Calculate the [cross product](https://en.wikipedia.org/wiki/Cross_product) of two 3D vectors. The result is a 3D vector.
 -- @param DCS#Vec3 a Vector in 3D with x, y, z components.
 -- @param DCS#Vec3 b Vector in 3D with x, y, z components.
@@ -1535,7 +1578,7 @@ function UTILS.IsLoadingDoorOpen( unit_name )
   if unit ~= nil then
       local type_name = unit:getTypeName()
 
-     if type_name == "Mi-8MT" and unit:getDrawArgumentValue(38) == 1 or unit:getDrawArgumentValue(86) == 1 or unit:getDrawArgumentValue(250) == 1 then
+      if type_name == "Mi-8MT" and unit:getDrawArgumentValue(38) == 1 or unit:getDrawArgumentValue(86) == 1 or unit:getDrawArgumentValue(250) < 0 then
           BASE:T(unit_name .. " Cargo doors are open or cargo door not present")
           ret_val =  true
       end
@@ -1555,6 +1598,26 @@ function UTILS.IsLoadingDoorOpen( unit_name )
           ret_val =  true
       end
 
+      if string.find(type_name, "Hercules") and unit:getDrawArgumentValue(1215) == 1 and unit:getDrawArgumentValue(1216) == 1 then
+          BASE:T(unit_name .. " rear doors are open")
+          ret_val =  true
+      end
+
+      if string.find(type_name, "Hercules") and (unit:getDrawArgumentValue(1220) == 1 or unit:getDrawArgumentValue(1221) == 1) then
+          BASE:T(unit_name .. " para doors are open")
+          ret_val =  true
+      end
+
+      if string.find(type_name, "Hercules") and unit:getDrawArgumentValue(1217) == 1 then
+          BASE:T(unit_name .. " side door is open")
+          ret_val =  true
+      end
+      
+      if string.find(type_name, "Bell-47") then -- bell aint got no doors so always ready to load injured soldiers
+          BASE:T(unit_name .. " door is open")
+          ret_val =  true
+      end
+      
       if ret_val == false then
           BASE:T(unit_name .. " all doors are closed")
       end
@@ -1588,10 +1651,10 @@ function UTILS.GenerateVHFrequencies()
   local _skipFrequencies = {
   214,274,291.5,295,297.5,
   300.5,304,307,309.5,311,312,312.5,316,
-  320,324,328,329,330,336,337,
+  320,324,328,329,330,332,336,337,
   342,343,348,351,352,353,358,
   363,365,368,372.5,374,
-  380,381,384,389,395,396,
+  380,381,384,385,389,395,396,
   414,420,430,432,435,440,450,455,462,470,485,
   507,515,520,525,528,540,550,560,570,577,580,
   602,625,641,662,670,680,682,690,
@@ -1698,7 +1761,7 @@ function UTILS.GenerateLaserCodes()
     while _code < 1777 and _count < 30 do
         while true do
            _code = _code + 1
-            if not self:_ContainsDigit(_code, 8)
+            if not ContainsDigit(_code, 8)
                     and not ContainsDigit(_code, 9)
                     and not ContainsDigit(_code, 0) then
                 table.insert(jtacGeneratedLaserCodes, _code)

Moose Development/Moose/Wrapper/Airbase.lua

@@ -17,6 +17,7 @@
 -- @field #table CategoryName Names of airbase categories.
 -- @field #string AirbaseName Name of the airbase.
 -- @field #number AirbaseID Airbase ID.
+-- @field Core.Zone#ZONE AirbaseZone Circular zone around the airbase with a radius of 2500 meters. For ships this is a ZONE_UNIT object.
 -- @field #number category Airbase category.
 -- @field #table descriptors DCS descriptors.
 -- @field #boolean isAirdrome Airbase is an airdrome.
@@ -546,6 +547,13 @@ function AIRBASE:Register(AirbaseName)
     self.isHelipad=true
   elseif self.category==Airbase.Category.SHIP then
     self.isShip=true
+    -- DCS bug: Oil rigs and gas platforms have category=2 (ship). Also they cannot be retrieved by coalition.getStaticObjects()
+    if self.descriptors.typeName=="Oil rig" or self.descriptors.typeName=="Ga" then
+      self.isHelipad=true
+      self.isShip=false
+      self.category=Airbase.Category.HELIPAD
+      _DATABASE:AddStatic(AirbaseName)
+	end
   else
     self:E("ERROR: Unknown airbase category!")
   end
@@ -558,8 +566,14 @@ function AIRBASE:Register(AirbaseName)
   self:GetCoordinate()
 
   if vec2 then
-    -- TODO: For ships we need a moving zone.
+    if self.isShip then
+      local unit=UNIT:FindByName(AirbaseName)
+      if unit then
+        self.AirbaseZone=ZONE_UNIT:New(AirbaseName, unit, 2500)
+      end
+    else
       self.AirbaseZone=ZONE_RADIUS:New(AirbaseName, vec2, 2500)
+    end
   else
     self:E(string.format("ERROR: Cound not get position Vec2 of airbase %s", AirbaseName))
   end
@@ -1006,10 +1020,19 @@ function AIRBASE:GetParkingSpotsTable(termtype)
 
       local spot=self:_GetParkingSpotByID(_spot.Term_Index)
 
+      if spot then
+
         spot.Free=_isfree(_spot) -- updated
         spot.TOAC=_spot.TO_AC    -- updated
 
         table.insert(spots, spot)
+
+      else
+
+        self:E(string.format("ERROR: Parking spot %s is nil!", tostring(_spot.Term_Index)))
+
+      end
+
     end
 
   end
@@ -1084,7 +1107,7 @@ function AIRBASE:MarkParkingSpots(termtype, mark)
 
   -- Get airbase name.
   local airbasename=self:GetName()
-  self:E(string.format("Parking spots at %s for termial type %s:", airbasename, tostring(termtype)))
+  self:E(string.format("Parking spots at %s for terminal type %s:", airbasename, tostring(termtype)))
 
   for _,_spot in pairs(parkingdata) do
 
@@ -1161,14 +1184,25 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,
   parkingdata=parkingdata or self:GetParkingSpotsTable(terminaltype)
 
   -- Get the aircraft size, i.e. it's longest side of x,z.
-  local aircraft=group:GetUnit(1)
+  local aircraft = nil -- fix local problem below
-  local _aircraftsize, ax,ay,az=aircraft:GetObjectSize()
+  local _aircraftsize, ax,ay,az
+  if group and group.ClassName == "GROUP" then
+    aircraft=group:GetUnit(1)
+    _aircraftsize, ax,ay,az=aircraft:GetObjectSize()
+  else
+    -- SU27 dimensions
+    _aircraftsize = 23
+    ax = 23 -- length
+    ay = 7 -- height
+    az = 17 -- width
+  end
+
     
   -- Number of spots we are looking for. Note that, e.g. grouping can require a number different from the group size!
   local _nspots=nspots or group:GetSize()
 
   -- Debug info.
-  self:E(string.format("%s: Looking for %d parking spot(s) for aircraft of size %.1f m (x=%.1f,y=%.1f,z=%.1f) at termial type %s.", airport, _nspots, _aircraftsize, ax, ay, az, tostring(terminaltype)))
+  self:E(string.format("%s: Looking for %d parking spot(s) for aircraft of size %.1f m (x=%.1f,y=%.1f,z=%.1f) at terminal type %s.", airport, _nspots, _aircraftsize, ax, ay, az, tostring(terminaltype)))
 
   -- Table of valid spots.
   local validspots={}
@@ -1291,6 +1325,7 @@ function AIRBASE:FindFreeParkingSpotForAircraft(group, terminaltype, scanradius,
 
   -- Retrun spots we found, even if there were not enough.
   return validspots
+  
 end
 
 --- Check black and white lists.

Moose Development/Moose/Wrapper/Controllable.lua

@@ -3779,8 +3779,9 @@ end
 -- @param  #number radius Radius of the relocation zone, default 500
 -- @param  #boolean onroad If true, route on road (less problems with AI way finding), default true
 -- @param  #boolean shortcut If true and onroad is set, take a shorter route - if available - off road, default false
+-- @param #string formation Formation string as in the mission editor, e.g. "Vee", "Diamond", "Line abreast", etc. Defaults to "Off Road"
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortcut)
+function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortcut, formation)
   self:F2( { self.ControllableName } )
 
     local _coord = self:GetCoordinate()
@@ -3791,14 +3792,14 @@ function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortc
     local _grptsk = {}
     local _candoroad = false
     local _shortcut = shortcut or false
+    local _formation = formation or "Off Road"
 
     -- create a DCS Task an push it on the group
-    -- TaskGroundOnRoad(ToCoordinate,Speed,OffRoadFormation,Shortcut,FromCoordinate,WaypointFunction,WaypointFunctionArguments)
     if onroad then
-      _grptsk, _candoroad = self:TaskGroundOnRoad(_tocoord,_speed,"Off Road",_shortcut)
+      _grptsk, _candoroad = self:TaskGroundOnRoad(_tocoord,_speed,_formation,_shortcut)
       self:Route(_grptsk,5)
     else
-      self:TaskRouteToVec2(_tocoord:GetVec2(),_speed,"Off Road")
+      self:TaskRouteToVec2(_tocoord:GetVec2(),_speed,_formation)
     end
 
   return self

Moose Development/Moose/Wrapper/Group.lua

@@ -1147,6 +1147,7 @@ function GROUP:GetAmmunition()
   local Nshells=0
   local Nrockets=0
   local Nmissiles=0
+  local Nbombs=0
   
   if DCSControllable then
     
@@ -1155,18 +1156,19 @@ function GROUP:GetAmmunition()
       local Unit = UnitData -- Wrapper.Unit#UNIT
       
       -- Get ammo of the unit
-      local ntot, nshells, nrockets, nmissiles = Unit:GetAmmunition()
+      local ntot, nshells, nrockets, nbombs, nmissiles = Unit:GetAmmunition()
       
       Ntot=Ntot+ntot
       Nshells=Nshells+nshells
       Nrockets=Nrockets+nrockets
       Nmissiles=Nmissiles+nmissiles
+      Nbombs=Nbombs+nbombs
       
     end
     
   end
   
-  return Ntot, Nshells, Nrockets, Nmissiles
+  return Ntot, Nshells, Nrockets, Nbombs, Nmissiles
 end
 
 
@@ -2576,8 +2578,10 @@ end
 -- @return #GROUP self 
 function GROUP:SetCommandInvisible(switch)
   self:F2( self.GroupName )
-  local switch = switch or false
+  if switch==nil then
-  local SetInvisible = {id = 'SetInvisible', params = {value = true}}
+    switch=false
+  end
+  local SetInvisible = {id = 'SetInvisible', params = {value = switch}}
   self:SetCommand(SetInvisible)
   return self
 end
@@ -2588,12 +2592,25 @@ end
 -- @return #GROUP self 
 function GROUP:SetCommandImmortal(switch)
   self:F2( self.GroupName )
-  local switch = switch or false
+  if switch==nil then
-  local SetInvisible = {id = 'SetImmortal', params = {value = true}}
+    switch=false
-  self:SetCommand(SetInvisible)
+  end
+  local SetImmortal = {id = 'SetImmortal', params = {value = switch}}
+  self:SetCommand(SetImmortal)
   return self
 end
 
+--- Get skill from Group. Effectively gets the skill from Unit 1 as the group holds no skill value.
+-- @param #GROUP self
+-- @return #string Skill String of skill name.
+function GROUP:GetSkill()
+  self:F2( self.GroupName )
+  local unit = self:GetUnit(1)
+  local name = unit:GetName()
+  local skill = _DATABASE.Templates.Units[name].Template.skill or "Random"
+  return skill
+end
+
 --do -- Smoke
 --
 ----- Signal a flare at the position of the GROUP.

Moose Development/Moose/Wrapper/Positionable.lua

@@ -684,6 +684,27 @@ function POSITIONABLE:IsShip()
 end
 
 
+--- Returns if the unit is a submarine.
+-- @param #POSITIONABLE self
+-- @return #boolean Submarines attributes result.
+function POSITIONABLE:IsSubmarine()
+  self:F2()
+
+  local DCSUnit = self:GetDCSObject()
+
+  if DCSUnit then
+    local UnitDescriptor = DCSUnit:getDesc()
+    if UnitDescriptor.attributes["Submarines"] == true then
+      return true
+    else
+      return false
+    end
+  end
+
+  return nil
+end
+
+
 --- Returns true if the POSITIONABLE is in the air.
 -- Polymorphic, is overridden in GROUP and UNIT.
 -- @param Wrapper.Positionable#POSITIONABLE self
@@ -1513,6 +1534,7 @@ do -- Cargo
           ["Ural-4320 APA-5D"] = 10,
           ["Ural-4320T"] = 14,
           ["ZBD04A"] = 7, -- new by kappa
+          ["VAB_Mephisto"] = 8, -- new by Apple
         }
 
         local CargoBayWeightLimit = ( Weights[Desc.typeName] or 0 ) * 95

Moose Development/Moose/Wrapper/Unit.lua

@@ -1426,3 +1426,13 @@ function UNIT:EnableEmission(switch)
 
   return self
 end
+
+--- Get skill from Unit.
+-- @param #UNIT self
+-- @return #string Skill String of skill name.
+function UNIT:GetSkill()
+  self:F2( self.UnitName )
+  local name = self.UnitName
+  local skill = _DATABASE.Templates.Units[name].Template.skill or "Random"
+  return skill
+end

README.md

@@ -74,6 +74,6 @@ MOOSE has a living (chat and video) community of users, beta testers and contrib
    
 
 Kind regards,
-FlightControl (FC)
+The Moose Team