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

Moose Development/Moose/Functional/Mantis.lua

@@ -22,7 +22,7 @@
 -- @module Functional.Mantis
 -- @image Functional.Mantis.jpg
 --
--- Last Update: Apr 2025
+-- Last Update: May 2025
 
 -------------------------------------------------------------------------
 --- **MANTIS** class, extends Core.Base#BASE
@@ -62,7 +62,8 @@
 -- @field #table FilterZones Table of Core.Zone#ZONE Zones Consider SAM groups in this zone(s) only for this MANTIS instance, must be handed as #table of Zone objects.
 -- @field #boolean SmokeDecoy If true, smoke short range SAM units as decoy if a plane is in firing range.
 -- @field #number SmokeDecoyColor Color to use, defaults to SMOKECOLOR.White
--- @field #number checkcounter Counter for SAM Table refreshes
+-- @field #number checkcounter Counter for SAM Table refreshes.
+-- @field #number DLinkCacheTime Seconds after which cached contacts in DLink will decay.
 -- @extends Core.Base#BASE
 
 
@@ -321,6 +322,7 @@ MANTIS = {
   SmokeDecoy            = false,
   SmokeDecoyColor       = SMOKECOLOR.White,
   checkcounter          = 1,
+  DLinkCacheTime        = 120,
 }
 
 --- Advanced state enumerator
@@ -612,7 +614,8 @@ do
       self.advAwacs = false
     end
     
-
+    self:SetDLinkCacheTime()
+    
     -- Set the string id for output to DCS.log file.
     self.lid=string.format("MANTIS %s | ", self.name)
 
@@ -676,7 +679,7 @@ do
     
     -- TODO Version
     -- @field #string version
-    self.version="0.9.28"
+    self.version="0.9.29"
     self:I(string.format("***** Starting MANTIS Version %s *****", self.version))
 
     --- FSM Functions ---
@@ -1026,6 +1029,15 @@ do
     end
     return self
   end
+  
+  --- Function to set how long INTEL DLINK remembers contacts.
+  -- @param #MANTIS self
+  -- @param #number seconds Remember this many seconds
+  -- @return #MANTIS self
+  function MANTIS:SetDLinkCacheTime(seconds)
+    self.DLinkCacheTime = math.abs(seconds or 120)
+    return self
+  end
 
   --- Function to set the detection interval
   -- @param #MANTIS self
@@ -1418,7 +1430,9 @@ do
     --IntelTwo:SetClusterRadius(5000)
     IntelTwo:Start()
     
-    local IntelDlink = INTEL_DLINK:New({IntelOne,IntelTwo},self.name.." DLINK",22,300)
+    local CacheTime = self.DLinkCacheTime or 120
+    local IntelDlink = INTEL_DLINK:New({IntelOne,IntelTwo},self.name.." DLINK",22,CacheTime)
+    
     IntelDlink:__Start(1)
     
     self:SetUsingDLink(IntelDlink)

Moose Development/Moose/Wrapper/Airbase.lua

@@ -790,7 +790,7 @@ AIRBASE.Sinai = {
 -- * AIRBASE.Kola.Vidsel
 -- * AIRBASE.Kola.Vuojarvi
 -- * AIRBASE.Kola.Andoya
--- * AIRBASE.Kola.Alakourtti
+-- * AIRBASE.Kola.Alakurtti
 -- * AIRBASE.Kola.Kittila
 -- * AIRBASE.Kola.Bardufoss
 -- * AIRBASE.Kola.Alta
@@ -820,7 +820,7 @@ AIRBASE.Kola = {
   ["Vidsel"] = "Vidsel",
   ["Vuojarvi"] = "Vuojarvi",
   ["Andoya"] = "Andoya",
-  ["Alakourtti"] = "Alakourtti",
+  ["Alakurtti"] = "Alakurtti",
   ["Kittila"] = "Kittila",
   ["Bardufoss"] = "Bardufoss",
   ["Alta"] = "Alta",