Update Airbase.lua

- Fixed #1524

Moose Development/Moose/AI/AI_Cargo_Helicopter.lua

@@ -277,7 +277,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
     self:F( { Helicopter:GetName(), Height = Helicopter:GetHeight( true ), Velocity = Helicopter:GetVelocityKMH() } )
 
     if self.RoutePickup == true then
-      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
+      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
         --self:Load( Helicopter:GetPointVec2() )
         self:Load( self.PickupZone )
         self.RoutePickup = false
@@ -285,7 +285,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
     end
     
     if self.RouteDeploy == true then
-      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 10 then
+      if Helicopter:GetHeight( true ) <= 5.5 and Helicopter:GetVelocityKMH() < 15 then
         self:Unload( self.DeployZone )
         self.RouteDeploy = false
       end

Moose Development/Moose/Core/Event.lua

@@ -1049,6 +1049,14 @@ function EVENT:onEvent( Event )
             Event.IniCoalition = 0
             Event.IniCategory  = 0
             Event.IniTypeName = "Ejected Pilot"
+         elseif Event.id == 33 then -- ejection seat discarded
+            Event.IniDCSUnit = Event.initiator
+            local ID=Event.initiator.id_
+            Event.IniDCSUnitName = string.format("Ejection Seat ID %s", tostring(ID))
+            Event.IniUnitName = Event.IniDCSUnitName
+            Event.IniCoalition = 0
+            Event.IniCategory  = 0
+            Event.IniTypeName = "Ejection Seat"
           else
             Event.IniDCSUnit = Event.initiator
             Event.IniDCSUnitName = Event.IniDCSUnit:getName()
@@ -1115,25 +1123,34 @@ function EVENT:onEvent( Event )
         end
         
         if Event.TgtObjectCategory == Object.Category.STATIC then
-          BASE:T({Event = Event})
-          --[[
-              Event.TgtDCSUnit = Event.target
+          BASE:T({StaticTgtEvent = Event.id})
+          -- get base data
+            Event.TgtDCSUnit = Event.target
+            if Event.target:isExist() and Event.id ~= 33 then -- leave out ejected seat object
               Event.TgtDCSUnitName = Event.TgtDCSUnit:getName()
               Event.TgtUnitName = Event.TgtDCSUnitName
               Event.TgtUnit = STATIC:FindByName( Event.TgtDCSUnitName, false )
               Event.TgtCoalition = Event.TgtDCSUnit:getCoalition()
               Event.TgtCategory = Event.TgtDCSUnit:getDesc().category
               Event.TgtTypeName = Event.TgtDCSUnit:getTypeName()
-          --]]
-          -- Same as for Event Initiator above 2.7 issue
-          Event.TgtDCSUnit = Event.target
-          local ID=Event.initiator.id_
-          Event.TgtDCSUnitName = string.format("Ejected Pilot ID %s", tostring(ID))
-          Event.TgtUnitName = Event.TgtDCSUnitName
-          --Event.TgtUnit = STATIC:FindByName( Event.TgtDCSUnitName, false )
-          Event.TgtCoalition = Event.IniCoalition
-          Event.TgtCategory = Event.IniCategory
-          Event.TgtTypeName = "Ejected Pilot"
+            else
+              Event.TgtDCSUnitName = string.format("No target object for Event ID %s", tostring(Event.id))
+              Event.TgtUnitName = Event.TgtDCSUnitName
+              Event.TgtUnit = nil
+              Event.TgtCoalition = 0
+              Event.TgtCategory = 0
+              if Event.id == 6 then
+                Event.TgtTypeName = "Ejected Pilot"
+                Event.TgtDCSUnitName = string.format("Ejected Pilot ID %s", tostring(Event.IniDCSUnitName))
+                Event.TgtUnitName = Event.TgtDCSUnitName
+              elseif Event.id == 33 then
+                Event.TgtTypeName = "Ejection Seat"
+                Event.TgtDCSUnitName = string.format("Ejection Seat ID %s", tostring(Event.IniDCSUnitName))
+                Event.TgtUnitName = Event.TgtDCSUnitName
+              else
+                Event.TgtTypeName = "Static"
+              end
+           end
         end
   
         if Event.TgtObjectCategory == Object.Category.SCENERY then

Moose Development/Moose/Core/Point.lua

@@ -1184,7 +1184,7 @@ do -- COORDINATE
     
     -- ETA.
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
     
     -- Waypoint description.
     RoutePoint.name=description
@@ -1333,7 +1333,7 @@ do -- COORDINATE
     RoutePoint.formation_template=""
     
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
 
     RoutePoint.speed = ( Speed or 20 ) / 3.6
     RoutePoint.speed_locked = true
@@ -1368,7 +1368,7 @@ do -- COORDINATE
     RoutePoint.formation_template = ""
 
     RoutePoint.ETA=0
-    RoutePoint.ETA_locked=true
+    RoutePoint.ETA_locked=false
 
     RoutePoint.speed = ( Speed or 20 ) / 3.6
     RoutePoint.speed_locked = true

Moose Development/Moose/Core/Set.lua

@@ -3267,7 +3267,7 @@ do -- SET_STATIC
     -- @param #SET_STATIC self
     -- @param Core.Zone#ZONE Zone The Zone to be tested for.
     -- @return #boolean
-    function SET_STATIC:IsPatriallyInZone( Zone )
+    function SET_STATIC:IsPartiallyInZone( Zone )
 
       local IsPartiallyInZone = false
 

Moose Development/Moose/Functional/Mantis.lua

@@ -51,7 +51,7 @@
 -- @field #number adv_state Advanced mode state tracker
 -- @field #boolean advAwacs Boolean switch to use Awacs as a separate detection stream
 -- @field #number awacsrange Detection range of an optional Awacs unit
--- @field #boolean UseAIOnOff Decide if we are using AI on/off (true) or AlarmState red/green (default)
+-- @field #boolean UseEmOnOff Decide if we are using Emissions on/off (true) or AlarmState red/green (default)
 -- @field Functional.Shorad#SHORAD Shorad SHORAD Object, if available
 -- @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
@@ -191,7 +191,7 @@ MANTIS = {
   ShoradLink            = false,
   ShoradTime            = 600,
   ShoradActDistance     = 15000,
-  UseAIOnOff            = false, 
+  UseEmOnOff            = true, 
 }
 
 -----------------------------------------------------------------------
@@ -208,7 +208,7 @@ 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 AIOnOff Make MANTIS switch AI on and off instead of changing the alarm state between RED and GREEN (optional)
+  --@param #boolean EmOnOff Make MANTIS switch Emissions on and off instead of changing the alarm state between RED and GREEN (optional, deault true)
   --@return #MANTIS self
   --@usage Start up your MANTIS with a basic setting
   --
@@ -230,7 +230,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, AIOnOff)
+  function MANTIS:New(name,samprefix,ewrprefix,hq,coaltion,dynamic,awacs, EmOnOff)
     
     -- DONE: Create some user functions for these
     -- DONE: Make HQ useful
@@ -264,7 +264,11 @@ do
     self.ShoradTime = 600
     self.ShoradActDistance = 15000
     -- TODO: add emissions on/off when available .... in 2 weeks
-    self.UseAIOnOff = AIOnOff or false     
+    if EmOnOff then
+      if EmOnOff == false then
+        self.UseEmOnOff = false
+      end
+    end    
      
     if type(awacs) == "string" then
       self.advAwacs = true
@@ -304,7 +308,7 @@ do
     end
     
     -- @field #string version
-    self.version="0.4.0"
+    self.version="0.4.1"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
     
     return self    
@@ -463,11 +467,11 @@ do
     end
   end
   
-  --- Set using AI on/off instead of changing alarm state
+  --- Set using Emissions on/off instead of changing alarm state
   -- @param #MANTIS self
-  -- @param #boolean switch Decide if we are changing alarm state or AI state
-  function MANTIS:SetUsingAIOnOff(switch)
-    self.UseAIOnOff = switch or false
+  -- @param #boolean switch Decide if we are changing alarm state or Emission state
+  function MANTIS:SetUsingEmOnOff(switch)
+    self.UseEmOnOff = switch or false
   end
   
   --- [Internal] Function to check if HQ is alive
@@ -714,8 +718,9 @@ do
      for _i,_group in pairs (SAM_Grps) do
         local group = _group
         -- TODO: add emissions on/off
-        if self.UseAIOnOff then
-          group:SetAIOff()
+        if self.UseEmOnOff then
+          group:EnableEmission(false)
+          --group:SetAIOff()
         else
           group:OptionAlarmStateGreen() -- AI off
         end
@@ -822,9 +827,10 @@ do
         if IsInZone then --check any target in zone
           if samgroup:IsAlive() then
             -- switch on SAM
-            if self.UseAIOnOff then
+            if self.UseEmOnOff then
               -- TODO: add emissions on/off
-              samgroup:SetAIOn()
+              --samgroup:SetAIOn()
+              samgroup:EnableEmission(true)
             end
             samgroup:OptionAlarmStateRed()
             -- link in to SHORAD if available
@@ -843,9 +849,10 @@ do
         else 
           if samgroup:IsAlive() then
             -- switch off SAM
-            if self.UseAIOnOff then
+            if self.UseEmOnOff then
               -- TODO: add emissions on/off
-              samgroup:SetAIOff()
+              samgroup:EnableEmission(false)
+              --samgroup:SetAIOff()
             else
               samgroup:OptionAlarmStateGreen()
             end
@@ -883,9 +890,10 @@ do
               local name = _data[1]
               local samgroup = GROUP:FindByName(name)
               if samgroup:IsAlive() then
-                if self.UseAIOnOff then
+                if self.UseEmOnOff then
                   -- TODO: add emissions on/off
-                  samgroup:SetAIOn()
+                  --samgroup:SetAIOn()
+                  samgroup:EnableEmission(true)
                 end
                 samgroup:OptionAlarmStateRed()
               end -- end alive

Moose Development/Moose/Functional/Sead.lua

@@ -17,8 +17,8 @@
 -- 
 -- ### Authors: **FlightControl**, **applevangelist**
 -- 
--- Last Update: Feb 2021
--- 
+-- Last Update: April 2021
+--
 -- ===
 -- 
 -- @module Functional.Sead
@@ -109,7 +109,7 @@ function SEAD:New( SEADGroupPrefixes )
 	end
 	
 	self:HandleEvent( EVENTS.Shot )
-	self:I("*** SEAD - Started Version 0.2.5")
+	self:I("*** SEAD - Started Version 0.2.7")
 	return self
 end
 
@@ -205,15 +205,18 @@ function SEAD:OnEventShot( EventData )
     SEADWeaponName == "weapons.missiles.AGM_84H" --AGM84 anti-radiation missiles fired
     --]]
   if self:_CheckHarms(SEADWeaponName) then
-  
+    local _targetskill = "Random"
+    local _targetMimgroupName = "none"
 		local _evade = math.random (1,100) -- random number for chance of evading action
 		local _targetMim = EventData.Weapon:getTarget() -- Identify target
-		local _targetMimname = Unit.getName(_targetMim) -- Unit name
-		local _targetMimgroup = Unit.getGroup(Weapon.getTarget(SEADWeapon)) --targeted group
-		local _targetMimgroupName = _targetMimgroup:getName() -- group name
-		local _targetskill =  _DATABASE.Templates.Units[_targetMimname].Template.skill
-		self:T( self.SEADGroupPrefixes )
-		self:T( _targetMimgroupName )
+		local _targetUnit = UNIT:Find(_targetMim) -- Unit name by DCS Object
+		if _targetUnit and _targetUnit:IsAlive() then
+  		local _targetMimgroup = _targetUnit:GetGroup()
+  		local _targetMimgroupName = _targetMimgroup:GetName() -- group name
+  		--local _targetskill =  _DATABASE.Templates.Units[_targetUnit].Template.skill
+  		self:T( self.SEADGroupPrefixes )
+  		self:T( _targetMimgroupName )
+		end
 		-- see if we are shot at
 		local SEADGroupFound = false
 		for SEADGroupPrefixID, SEADGroupPrefix in pairs( self.SEADGroupPrefixes ) do
@@ -249,6 +252,7 @@ function SEAD:OnEventShot( EventData )
 					 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
@@ -261,6 +265,7 @@ function SEAD:OnEventShot( EventData )
 							SuppressionEndTime = delay
 						  }
 						Controller.setOption(_targetMimcont, AI.Option.Ground.id.ALARM_STATE,AI.Option.Ground.val.ALARM_STATE.GREEN)
+						--_targetMimgroup:enableEmission(false)
 						timer.scheduleFunction(SuppressionEnd, id, SuppressionEndTime)	--Schedule the SuppressionEnd() function
 					end
 				end

Moose Development/Moose/Functional/Shorad.lua

@@ -18,7 +18,7 @@
 -- @module Functional.Shorad
 -- @image Functional.Shorad.jpg
 --
--- Date: Feb 2021
+-- Date: May 2021
 
 -------------------------------------------------------------------------
 --- **SHORAD** class, extends Core.Base#BASE
@@ -38,7 +38,7 @@
 -- @field #boolean DefendMavs Default true, intercept incoming AG-Missiles
 -- @field #number DefenseLowProb Default 70, minimum detection limit
 -- @field #number DefenseHighProb Default 90, maximim detection limit
--- @field #boolean UseAIOnOff Decide if we are using AI on/off (true) or AlarmState red/green (default).
+-- @field #boolean UseEmOnOff Decide if we are using Emission on/off (default) or AlarmState red/green.
 -- @extends Core.Base#BASE
 
 --- *Good friends are worth defending.* Mr Tushman, Wonder (the Movie) 
@@ -96,7 +96,7 @@ SHORAD = {
   DefendMavs = true,
   DefenseLowProb = 70,
   DefenseHighProb = 90,
-  UseAIOnOff = false,  
+  UseEmOnOff = false,  
 }
 
 -----------------------------------------------------------------------
@@ -159,7 +159,7 @@ do
   -- @param #string Coalition Coalition, i.e. "blue", "red", or "neutral"
   function SHORAD:New(Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition) 
     local self = BASE:Inherit( self, BASE:New() )
-    self:F({Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition})
+    self:T({Name, ShoradPrefix, Samset, Radius, ActiveTimer, Coalition})
     
     local GroupSet = SET_GROUP:New():FilterPrefixes(ShoradPrefix):FilterCoalitions(Coalition):FilterCategoryGround():FilterStart()
 
@@ -176,8 +176,8 @@ do
     self.DefendMavs = true
     self.DefenseLowProb = 70 -- probability to detect a missile shot, low margin
     self.DefenseHighProb = 90  -- probability to detect a missile shot, high margin
-    self.UseAIOnOff = false -- Decide if we are using AI on/off (true) or AlarmState red/green (default)
-    self:I("*** SHORAD - Started Version 0.1.0")
+    self.UseEmOnOff = true -- Decide if we are using Emission on/off (default) or AlarmState red/green
+    self:I("*** SHORAD - Started Version 0.2.5")
     -- Set the string id for output to DCS.log file.
     self.lid=string.format("SHORAD %s | ", self.name)
     self:_InitState()
@@ -192,8 +192,9 @@ do
     self:T({set = set})
     local aliveset = set:GetAliveSet() --#table
     for _,_group in pairs (aliveset) do
-     if self.UseAIOnOff then
-      _group:SetAIOff()
+     if self.UseEmOnOff then
+      --_group:SetAIOff()
+      _group:EnableEmission(false)
      else
       _group:OptionAlarmStateGreen() --Wrapper.Group#GROUP
      end
@@ -208,7 +209,7 @@ do
   -- @param #SHORAD self
   -- @param #boolean debug Switch debug on (true) or off (false)
   function SHORAD:SwitchDebug(debug)
-    self:F( { debug } )
+    self:T( { debug } )
     local onoff = debug or false
     if debug then
        self.debug = true
@@ -225,7 +226,7 @@ do
   -- @param #SHORAD self
   -- @param #boolean onoff
   function SHORAD:SwitchHARMDefense(onoff)
-    self:F( { onoff } )
+    self:T( { onoff } )
     local onoff = onoff or true
     self.DefendHarms = onoff
   end
@@ -234,7 +235,7 @@ do
   -- @param #SHORAD self
   -- @param #boolean onoff
   function SHORAD:SwitchAGMDefense(onoff)
-    self:F( { onoff } )
+    self:T( { onoff } )
     local onoff = onoff or true
     self.DefendMavs = onoff
   end
@@ -244,7 +245,7 @@ do
   -- @param #number low Minimum detection limit, integer 1-100
   -- @param #number high Maximum detection limit integer 1-100
   function SHORAD:SetDefenseLimits(low,high)
-    self:F( { low, high } )
+    self:T( { low, high } )
     local low = low or 70
     local high = high or 90
     if (low < 0) or (low > 100) or (low > high) then
@@ -279,11 +280,11 @@ do
     self.Radius = radius
   end
   
-  --- Set using AI on/off instead of changing alarm state
+  --- Set using Emission on/off instead of changing alarm state
   -- @param #SHORAD self
   -- @param #boolean switch Decide if we are changing alarm state or AI state
-  function SHORAD:SetUsingAIOnOff(switch)
-    self.UseAIOnOff = switch or false
+  function SHORAD:SetUsingEmOnOff(switch)
+    self.UseEmOnOff = switch or false
   end
   
   --- Check if a HARM was fired
@@ -291,7 +292,7 @@ do
   -- @param #string WeaponName
   -- @return #boolean Returns true for a match
   function SHORAD:_CheckHarms(WeaponName)
-    self:F( { WeaponName } )
+    self:T( { WeaponName } )
     local hit = false
     if self.DefendHarms then
       for _,_name in pairs (SHORAD.Harms) do
@@ -306,7 +307,7 @@ do
   -- @param #string WeaponName
   -- @return #boolean Returns true for a match
   function SHORAD:_CheckMavs(WeaponName)
-    self:F( { WeaponName } )
+    self:T( { WeaponName } )
     local hit = false
     if self.DefendMavs then
       for _,_name in pairs (SHORAD.Mavs) do
@@ -351,6 +352,7 @@ do
       local groupname = _groups:GetName()
       if string.find(groupname, tgtgrp, 1) then
         returnname = true
+        _groups:RelocateGroundRandomInRadius(7,100,false,false) -- be a bit evasive
       end
     end
     return returnname  
@@ -363,7 +365,8 @@ do
   function SHORAD:_CheckShotAtSams(TargetGroupName)
     local tgtgrp = TargetGroupName
     local shorad = self.Samset
-    local shoradset = shorad:GetAliveSet() --#table
+    --local shoradset = shorad:GetAliveSet() --#table
+    local shoradset = shorad:GetSet() --#table
     local returnname = false
     for _,_groups in pairs (shoradset) do
       local groupname = _groups:GetName()
@@ -392,6 +395,7 @@ do
   -- @param #string TargetGroup Name of the target group used to build the #ZONE
   -- @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
   -- @usage Use this function to integrate with other systems, example   
   -- 
   -- local SamSet = SET_GROUP:New():FilterPrefixes("Blue SAM"):FilterCoalitions("blue"):FilterStart()
@@ -400,18 +404,30 @@ do
   -- mymantis = MANTIS:New("BlueMantis","Blue SAM","Blue EWR",nil,"blue",false,"Blue Awacs")
   -- mymantis:AddShorad(myshorad,720)
   -- mymantis:Start()
-  function SHORAD:WakeUpShorad(TargetGroup, Radius, ActiveTimer)
-    self:F({TargetGroup, Radius, ActiveTimer})
-    local targetgroup = GROUP:FindByName(TargetGroup)
-    local targetzone = ZONE_GROUP:New("Shorad",targetgroup,Radius) -- create a defense zone to check
+  function SHORAD:WakeUpShorad(TargetGroup, Radius, ActiveTimer, TargetCat)
+    self:T({TargetGroup, Radius, ActiveTimer, TargetCat})
+    local targetcat = TargetCat or Object.Category.UNIT
+    local targetgroup = TargetGroup
+    local targetvec2 = nil
+    if targetcat == Object.Category.UNIT then
+      targetvec2 = GROUP:FindByName(targetgroup):GetVec2()
+    elseif targetcat == Object.Category.STATIC then
+      targetvec2 = STATIC:FindByName(targetgroup,false):GetVec2()
+    else
+      local samset = self.Samset
+      local sam = samset:GetRandom()
+      targetvec2 = sam:GetVec2()
+    end
+    local targetzone = ZONE_RADIUS:New("Shorad",targetvec2,Radius)  -- create a defense zone to check
     local groupset = self.Groupset --Core.Set#SET_GROUP
     local shoradset = groupset:GetAliveSet() --#table
     -- local function to switch off shorad again
     local function SleepShorad(group)
       local groupname = group:GetName()
       self.ActiveGroups[groupname] = nil
-      if self.UseAIOnOff then
-        group:SetAIOff()
+      if self.UseEmOnOff then
+        group:EnableEmission(false)
+        --group:SetAIOff()
       else
         group:OptionAlarmStateGreen()
       end
@@ -425,8 +441,9 @@ do
         local text = string.format("Waking up SHORAD %s", _group:GetName())
         self:T(text)
         local m = MESSAGE:New(text,10,"SHORAD"):ToAllIf(self.debug)
-        if self.UseAIOnOff then
+        if self.UseEmOnOff then
           _group:SetAIOn()
+          _group:EnableEmission(true)
         end
         _group:OptionAlarmStateRed()
         local groupname = _group:GetName()
@@ -443,7 +460,7 @@ do
   -- @param #SHORAD self
   -- @param Core.Event#EVENTDATA EventData The event details table data set
   function SHORAD:OnEventShot( EventData )
-    self:F( { EventData } )
+    self:T( { EventData } )
   
     --local ShootingUnit = EventData.IniDCSUnit
     --local ShootingUnitName = EventData.IniDCSUnitName
@@ -461,23 +478,45 @@ do
       end
       local text = string.format("%s Missile Launched = %s | Detected probability state is %s", self.lid, ShootingWeaponName, DetectedText)
       self:T( text )
-      local m = MESSAGE:New(text,15,"Info"):ToAllIf(self.debug)
+      local m = MESSAGE:New(text,10,"Info"):ToAllIf(self.debug)
       --
       if (self:_CheckHarms(ShootingWeaponName) or self:_CheckMavs(ShootingWeaponName)) and IsDetected then
         -- get target data
         local targetdata = EventData.Weapon:getTarget() -- Identify target
-        local targetunitname = Unit.getName(targetdata) -- Unit name
-        local targetgroup = Unit.getGroup(Weapon.getTarget(ShootingWeapon)) --targeted group
-        local targetgroupname = targetgroup:getName() -- group name
-        -- check if we or a SAM site are the target 
-        --local TargetGroup = EventData.TgtGroup -- Wrapper.Group#GROUP
-        local shotatus = self:_CheckShotAtShorad(targetgroupname) --#boolean
-        local shotatsams = self:_CheckShotAtSams(targetgroupname) --#boolean
-        -- 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)
-        end
+        local targetcat = targetdata:getCategory() -- Identify category
+        self:T(string.format("Target Category (3=STATIC, 1=UNIT)= %s",tostring(targetcat)))
+        local targetunit = nil
+        if targetcat == Object.Category.UNIT then -- UNIT
+          targetunit = UNIT:Find(targetdata)
+        elseif targetcat == Object.Category.STATIC then  -- STATIC
+          targetunit = STATIC:Find(targetdata)
+        end   
+        --local targetunitname = Unit.getName(targetdata) -- Unit name
+        if targetunit and targetunit:IsAlive() then
+          local targetunitname = targetunit:GetName()
+          --local targetgroup = Unit.getGroup(Weapon.getTarget(ShootingWeapon)) --targeted group
+          local targetgroup = nil
+          local targetgroupname = "none"
+          if targetcat == Object.Category.UNIT then
+            targetgroup = targetunit:GetGroup()
+            targetgroupname = targetgroup:GetName() -- group name
+          elseif targetcat == Object.Category.STATIC then
+            targetgroup = targetunit
+            targetgroupname = targetunitname
+          end
+          local text = string.format("%s Missile Target = %s", self.lid, tostring(targetgroupname))
+          self:T( text )
+          local m = MESSAGE:New(text,10,"Info"):ToAllIf(self.debug)
+          -- check if we or a SAM site are the target 
+          --local TargetGroup = EventData.TgtGroup -- Wrapper.Group#GROUP
+          local shotatus = self:_CheckShotAtShorad(targetgroupname) --#boolean
+          local shotatsams = self:_CheckShotAtSams(targetgroupname) --#boolean
+          -- 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)
+          end
+        end  
       end
     end
   end 

Moose Development/Moose/Wrapper/Airbase.lua

@@ -608,7 +608,7 @@ end
 
 --- Get all airbase names of the current map. This includes ships and FARPS.
 -- @param DCS#Coalition coalition (Optional) Return only airbases belonging to the specified coalition. By default, all airbases of the map are returned.
--- @param #number category (Optional) Return only airbases of a certain category, e.g. Airbase.Category.FARP
+-- @param #number category (Optional) Return only airbases of a certain category, e.g. `Airbase.Category.HELIPAD`.
 -- @return #table Table containing all airbase names of the current map.
 function AIRBASE.GetAllAirbaseNames(coalition, category)
 

Moose Development/Moose/Wrapper/Controllable.lua

@@ -1463,7 +1463,7 @@ function CONTROLLABLE:TaskFireAtPoint( Vec2, Radius, AmmoCount, WeaponType, Alti
     DCSTask.params.weaponType=WeaponType
   end
   
-  self:I(DCSTask)
+  --self:I(DCSTask)
 
   return DCSTask
 end