Merge branch 'develop' into FF/Ops

2026-08-18 13:16:03 +00:00 · 2025-06-10 21:58:38 +02:00
parent baa3f3234e f6a8317c42
commit 1d04f7c945
84 changed files with 1563 additions and 800 deletions
@@ -2798,7 +2798,7 @@ function ATIS:onafterBroadcast( From, Event, To )

    end
    _RUNACT = subtitle
-    alltext = alltext .. ";\n" .. subtitle
+    --alltext = alltext .. ";\n" .. subtitle

    -- Runway length.
    if self.rwylength then
@@ -1731,10 +1731,10 @@ AIRBOSS.Difficulty = {
 -- @field #table trapsheet Groove data table recorded every 0.5 seconds.
 -- @field #boolean trapon If true, save trap sheets.
 -- @field #string debriefschedulerID Debrief scheduler ID.
-- 
+--
 -- @field Sound.SRS#MSRS SRS
 -- @field Sound.SRS#MSRSQUEUE SRSQ
-- 
+--
 -- @extends #AIRBOSS.FlightGroup

 --- Main group level radio menu: F10 Other/Airboss.
@@ -1912,6 +1912,9 @@ function AIRBOSS:New( carriername, alias )
  -- Set max section members. Default 2.
  self:SetMaxSectionSize()

+  -- Set max section distance. Default 100 meters.
+  self:SetMaxSectionDistance()
+
  -- Set max flights per stack. Default is 2.
  self:SetMaxFlightsPerStack()

@@ -2539,7 +2542,7 @@ function AIRBOSS:AddRecoveryWindow( starttime, stoptime, case, holdingoffset, tu
    return self
  end
  if Tstop <= Tnow then
-      string.format( "WARNING: Recovery stop time %s already over. Tnow=%s! Recovery window rejected.", UTILS.SecondsToClock( Tstop ), UTILS.SecondsToClock( Tnow ) ) 
+      string.format( "WARNING: Recovery stop time %s already over. Tnow=%s! Recovery window rejected.", UTILS.SecondsToClock( Tstop ), UTILS.SecondsToClock( Tnow ) )
    return self
  end

@@ -3066,7 +3069,7 @@ end
 -- @param #number Port Port of the SRS server, defaults to 5002.
 -- @param #string Culture (Optional, Airboss Culture)  Culture, defaults to "en-US".
 -- @param #string Gender (Optional, Airboss Gender)  Gender, e.g. "male" or "female". Defaults to "male".
-- @param #string Voice (Optional, Airboss Voice) Set to use a specific voice. Will **override gender and culture** settings.  
+-- @param #string Voice (Optional, Airboss Voice) Set to use a specific voice. Will **override gender and culture** settings.
 -- @param #string GoogleCreds (Optional) Path to Google credentials, e.g. "C:\\Program Files\\DCS-SimpleRadio-Standalone\\yourgooglekey.json".
 -- @param #number Volume (Optional) E.g. 0.75. Defaults to 1.0 (loudest).
 -- @param #table AltBackend (Optional) See MSRS for details.
@@ -3088,8 +3091,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
  self.SRS:SetVolume(Volume or 1)
  --self.SRS:SetModulations(Modulations)
  if GoogleCreds then
-    self.SRS:SetProviderOptionsGoogle(GoogleCreds,GoogleCreds)
-    self.SRS:SetProvider(MSRS.Provider.GOOGLE)
+    self.SRS:SetGoogle(GoogleCreds)
  end
  if Voice then
    self.SRS:SetVoice(Voice)
@@ -3098,10 +3100,10 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
  -- SRSQUEUE
  self.SRSQ = MSRSQUEUE:New("AIRBOSS")
  self.SRSQ:SetTransmitOnlyWithPlayers(true)
-  if not self.PilotRadio then 
+  if not self.PilotRadio then
    self:SetSRSPilotVoice()
  end
-  return self  
+  return self
 end

 --- Set LSO radio frequency and modulation. Default frequency is 264 MHz AM.
@@ -3344,6 +3346,22 @@ function AIRBOSS:SetMaxSectionSize( nmax )
  return self
 end

+--- Set maximum distance up to which section members are allowed (default: 100 meters).
+-- @param #AIRBOSS self
+-- @param #number dmax Max distance in meters (default 100 m). Minimum is 10 m, maximum is 5000 m.
+-- @return #AIRBOSS self
+function AIRBOSS:SetMaxSectionDistance( dmax )
+    if dmax then
+        if dmax < 10 then
+            dmax = 10
+        elseif dmax > 5000 then
+            dmax = 5000
+        end
+    end
+    self.maxsectiondistance = dmax or 100
+    return self
+end
+
 --- Set max number of flights per stack. All members of a section count as one "flight".
 -- @param #AIRBOSS self
 -- @param #number nmax Number of max allowed flights per stack. Default is two. Minimum is one, maximum is 4.
@@ -3623,7 +3641,6 @@ function AIRBOSS:onafterStart( From, Event, To )
  self:HandleEvent( EVENTS.PlayerLeaveUnit, self._PlayerLeft )
  self:HandleEvent( EVENTS.MissionEnd )
  self:HandleEvent( EVENTS.RemoveUnit )
-  self:HandleEvent( EVENTS.UnitLost, self.OnEventRemoveUnit )

  -- self.StatusScheduler=SCHEDULER:New(self)
  -- self.StatusScheduler:Schedule(self, self._Status, {}, 1, 0.5)
@@ -8724,13 +8741,13 @@ function AIRBOSS:OnEventRemoveUnit( EventData )

  -- Nil checks.
  if EventData == nil then
-    self:E( self.lid .. "ERROR: EventData=nil in event REMOVEUNIT!" )
-    self:E( EventData )
+    self:T( self.lid .. "ERROR: EventData=nil in event REMOVEUNIT!" )
+    self:T( EventData )
    return
  end
  if EventData.IniUnit == nil then
-    self:E( self.lid .. "ERROR: EventData.IniUnit=nil in event REMOVEUNIT!" )
-    self:E( EventData )
+    self:T( self.lid .. "ERROR: EventData.IniUnit=nil in event REMOVEUNIT!" )
+    self:T( EventData )
    return
  end

@@ -11598,7 +11615,7 @@ function AIRBOSS:GetHeadingIntoWind_old( vdeck, magnetic, coord )
  local function adjustDegreesForWindSpeed(windSpeed)
    local degreesAdjustment = 0
  -- the windspeeds are in m/s
-  
+
  -- +0 degrees at 15m/s = 37kts
  -- +0 degrees at 14m/s = 35kts
  -- +0 degrees at 13m/s = 33kts
@@ -11613,7 +11630,7 @@ function AIRBOSS:GetHeadingIntoWind_old( vdeck, magnetic, coord )
  -- +20 degrees at 4m/s = 26kts
  -- +20 degrees at 3m/s = 26kts
  -- +30 degrees at 2m/s = 26kts 1s
-  
+
    if windSpeed > 0 and windSpeed < 3 then
      degreesAdjustment = 30
    elseif windSpeed >= 3 and windSpeed < 5 then
@@ -11625,7 +11642,7 @@ function AIRBOSS:GetHeadingIntoWind_old( vdeck, magnetic, coord )
    elseif windSpeed >= 13 then
      degreesAdjustment = 0
    end
-  
+
    return degreesAdjustment
  end

@@ -11684,60 +11701,60 @@ function AIRBOSS:GetHeadingIntoWind_new( vdeck, magnetic, coord )
    local h=self:GetHeading(magnetic)
    return h, math.min(vdeck, Vmax)
  end
-  
+
  -- Convert wind speed to knots.
  vwind=UTILS.MpsToKnots(vwind)
-  
+
  -- Wind to in knots.
  local windto=(windfrom+180)%360
-  
+
  -- Offset angle in rad. We also define the rotation to be clock-wise, which requires a minus sign.
  local alpha=math.rad(-Offset)
-    
+
  -- Constant.
  local C = math.sqrt(math.cos(alpha)^2 / math.sin(alpha)^2 + 1)
-  
+

  -- Upper limit of desired speed due to max boat speed.
  local vdeckMax=vwind + math.cos(alpha) * Vmax
-  
+
  -- Lower limit of desired speed due to min boat speed.
  local vdeckMin=vwind + math.cos(alpha) * Vmin
-  
-  
+
+
  -- Speed of ship so it matches the desired speed.
  local v=0
-  
-  -- Angle wrt. to wind TO-direction 
+
+  -- Angle wrt. to wind TO-direction
  local theta=0

  if vdeck>vdeckMax then
    -- Boat cannot go fast enough
-    
+
    -- Set max speed.
    v=Vmax
-    
+
    -- Calculate theta.
    theta = math.asin(v/(vwind*C)) - math.asin(-1/C)
-  
+
  elseif vdeck<vdeckMin then
    -- Boat cannot go slow enought
-  
+
    -- Set min speed.
    v=Vmin
-    
+
    -- Calculatge theta.
    theta = math.asin(v/(vwind*C)) - math.asin(-1/C)
-  
+
  elseif vdeck*math.sin(alpha)>vwind then
    -- Too little wind
-    
+
    -- Set theta to 90°
    theta=math.pi/2
-    
+
    -- Set speed.
    v = math.sqrt(vdeck^2 - vwind^2)
-  
+
  else
    -- Normal case
    theta = math.asin(vdeck * math.sin(alpha) / vwind)
@@ -11746,9 +11763,9 @@ function AIRBOSS:GetHeadingIntoWind_new( vdeck, magnetic, coord )

  -- Magnetic heading.
  local magvar= magnetic and self.magvar or 0
-  
+
  -- Ship heading so cross wind is min for the given wind.
-  local intowind = (540 + (windto - magvar + math.deg(theta) )) % 360  
+  local intowind = (540 + (windto - magvar + math.deg(theta) )) % 360

  return intowind, v
 end
@@ -12206,7 +12223,7 @@ function AIRBOSS:_LSOgrade( playerData )
      -- Normal laning part at the beginning
      local Gb = GXX .. " " .. GIM

-      -- Number of deviations that occurred at the the beginning of the landing (XX or IM). These are graded like in non-VTOL landings, i.e. on deviations is 
+      -- Number of deviations that occurred at the the beginning of the landing (XX or IM). These are graded like in non-VTOL landings, i.e. on deviations is
      local N=nXX+nIM
      local nL=count(Gb, '_')/2
      local nS=count(Gb, '%(')
@@ -12224,7 +12241,7 @@ function AIRBOSS:_LSOgrade( playerData )

      if nL>0 or nLv>1 then
          -- Larger deviations at XX or IM or at least one larger deviation IC or AR==> "No grade" 2.0 points.
-          -- In other words, we allow one larger deviation at IC+AR 
+          -- In other words, we allow one larger deviation at IC+AR
          grade="--"
          points=2.0
      elseif nN>0 or nNv>1 or nLv==1 then
@@ -13720,7 +13737,7 @@ function AIRBOSS:CarrierTurnIntoWind( time, vdeck, uturn )
  local deltaH = self:_GetDeltaHeading( hdg, hiw )

  -- Debug output
-  self:I( self.lid .. string.format( "Carrier steaming into the wind (%.1f kts). Heading=%03d-->%03d (Delta=%.1f), Speed=%.1f knots, Distance=%.1f NM, Time=%d sec", 
+  self:I( self.lid .. string.format( "Carrier steaming into the wind (%.1f kts). Heading=%03d-->%03d (Delta=%.1f), Speed=%.1f knots, Distance=%.1f NM, Time=%d sec",
  UTILS.MpsToKnots( vwind ), hdg, hiw, deltaH, speedknots, distNM, speedknots, time ) )

  -- Current coordinate.
@@ -14932,12 +14949,12 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
  if radio == nil or call == nil then
    return
  end
-  
+
  if not self.SRS then
-  
+
    -- Create a new radio transmission item.
    local transmission = {} -- #AIRBOSS.Radioitem
-  
+
    transmission.radio = radio
    transmission.call = call
    transmission.Tplay = timer.getAbsTime() + (delay or 0)
@@ -14945,49 +14962,49 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
    transmission.isplaying = false
    transmission.Tstarted = nil
    transmission.loud = loud and call.loud
-  
+
    -- Player onboard number if sender has one.
    if self:_IsOnboard( call.modexsender ) then
      self:_Number2Radio( radio, call.modexsender, delay, 0.3, pilotcall )
    end
-  
+
    -- Play onboard number if receiver has one.
    if self:_IsOnboard( call.modexreceiver ) then
      self:_Number2Radio( radio, call.modexreceiver, delay, 0.3, pilotcall )
    end
-  
+
    -- Add transmission to the right queue.
    local caller = ""
    if radio.alias == "LSO" then
-  
+
      table.insert( self.RQLSO, transmission )
-  
+
      caller = "LSOCall"
-  
+
      -- Schedule radio queue checks.
      if not self.RQLid then
        self:T( self.lid .. string.format( "Starting LSO radio queue." ) )
        self.RQLid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQLSO, "LSO" }, 0.02, 0.05 )
      end
-  
+
    elseif radio.alias == "MARSHAL" then
-  
+
      table.insert( self.RQMarshal, transmission )
-  
+
      caller = "MarshalCall"
-  
+
      if not self.RQMid then
        self:T( self.lid .. string.format( "Starting Marhal radio queue." ) )
        self.RQMid = self.radiotimer:Schedule( nil, AIRBOSS._CheckRadioQueue, { self, self.RQMarshal, "MARSHAL" }, 0.02, 0.05 )
      end
-  
+
    end
-  
+
    -- Append radio click sound at the end of the transmission.
    if click then
      self:RadioTransmission( radio, self[caller].CLICK, false, delay )
    end
-  
+
  else

    -- SRS transmission
@@ -14998,7 +15015,7 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
      local voice = nil
      local gender = nil
      local culture = nil
-      
+
      if radio.alias == "AIRBOSS" then
        frequency = self.AirbossRadio.frequency
        modulation = self.AirbossRadio.modulation
@@ -15006,13 +15023,13 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
        gender = self.AirbossRadio.gender
        culture = self.AirbossRadio.culture
      end
-      
+
      if radio.alias == "MARSHAL" then
        voice = self.MarshalRadio.voice
        gender = self.MarshalRadio.gender
        culture = self.MarshalRadio.culture
      end
-      
+
      if radio.alias == "LSO" then
        frequency = self.LSORadio.frequency
        modulation = self.LSORadio.modulation
@@ -15020,7 +15037,7 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
        gender = self.LSORadio.gender
        culture = self.LSORadio.culture
      end
-      
+
      if pilotcall then
        voice = self.PilotRadio.voice
        gender = self.PilotRadio.gender
@@ -15034,16 +15051,16 @@ function AIRBOSS:RadioTransmission( radio, call, loud, delay, interval, click, p
        modulation = self.AirbossRadio.modulation
        radio.alias = "AIRBOSS"
      end
-      
+
      local volume = nil
-      
+
      if loud then
        volume = 1.0
      end
-      
+
      --local text = tostring(call.modexreceiver).."; "..radio.alias.."; "..call.subtitle
      local text = call.subtitle
-      self:T(self.lid..text) 
+      self:T(self.lid..text)
      local srstext = self:_GetNiceSRSText(text)
      self.SRSQ:NewTransmission(srstext, call.duration, self.SRS, nil, 0.1, nil, call.subtitle, call.subduration, frequency, modulation, gender, culture, voice, volume, radio.alias)
    end
@@ -15063,11 +15080,11 @@ function AIRBOSS:SetSRSPilotVoice( Voice, Gender, Culture )
  self.PilotRadio.voice = Voice or MSRS.Voices.Microsoft.David
  self.PilotRadio.gender = Gender or "male"
  self.PilotRadio.culture = Culture or "en-US"
-  
+
  if (not Voice) and self.SRS and self.SRS:GetProvider() == MSRS.Provider.GOOGLE then
    self.PilotRadio.voice = MSRS.Voices.Google.Standard.en_US_Standard_J
  end
-  
+
  return self
 end

@@ -15381,44 +15398,44 @@ function AIRBOSS:MessageToPlayer( playerData, message, sender, receiver, duratio
      -- SCHEDULER:New(nil, self.MessageToPlayer, {self, playerData, message, sender, receiver, duration, clear}, delay)
      self:ScheduleOnce( delay, self.MessageToPlayer, self, playerData, message, sender, receiver, duration, clear )
    else
-      
+
      if not self.SRS then
        -- Wait until previous sound finished.
        local wait = 0
-  
+
        -- Onboard number to get the attention.
        if receiver == playerData.onboard then
-  
+
          -- Which voice over number to use.
          if sender and (sender == "LSO" or sender == "MARSHAL" or sender == "AIRBOSS") then
-  
+
            -- User sound of board number.
            wait = wait + self:_Number2Sound( playerData, sender, receiver )
-  
+
          end
        end
-  
+
        -- Negative.
        if string.find( text:lower(), "negative" ) then
          local filename = self:_RadioFilename( self.MarshalCall.NEGATIVE, false, "MARSHAL" )
          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
          wait = wait + self.MarshalCall.NEGATIVE.duration
        end
-  
+
        -- Affirm.
        if string.find( text:lower(), "affirm" ) then
          local filename = self:_RadioFilename( self.MarshalCall.AFFIRMATIVE, false, "MARSHAL" )
          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
          wait = wait + self.MarshalCall.AFFIRMATIVE.duration
        end
-  
+
        -- Roger.
        if string.find( text:lower(), "roger" ) then
          local filename = self:_RadioFilename( self.MarshalCall.ROGER, false, "MARSHAL" )
          USERSOUND:New( filename ):ToGroup( playerData.group, wait )
          wait = wait + self.MarshalCall.ROGER.duration
        end
-  
+
        -- Play click sound to end message.
        if wait > 0 then
          local filename = self:_RadioFilename( self.MarshalCall.CLICK )
@@ -15431,7 +15448,7 @@ function AIRBOSS:MessageToPlayer( playerData, message, sender, receiver, duratio
        local voice = self.MarshalRadio.voice
        local gender = self.MarshalRadio.gender
        local culture = self.MarshalRadio.culture
-        
+
        if not sender then sender = "AIRBOSS" end

        if string.find(sender,"AIRBOSS" ) then
@@ -17049,7 +17066,7 @@ function AIRBOSS:_RemoveSectionMember( playerData, sectionmember )
  return false
 end

--- Set all flights within 100 meters to be part of my section.
+--- Set all flights within maxsectiondistance meters to be part of my section (default: 100 meters).
 -- @param #AIRBOSS self
 -- @param #string _unitName Name of the player unit.
 function AIRBOSS:_SetSection( _unitName )
@@ -17067,7 +17084,7 @@ function AIRBOSS:_SetSection( _unitName )
      local mycoord = _unit:GetCoordinate()

      -- Max distance up to which section members are allowed.
-      local dmax = 100
+      local dmax = self.maxsectiondistance

      -- Check if player is in Marshal or pattern queue already.
      local text
@@ -1403,6 +1403,8 @@ function AUFTRAG:NewINTERCEPT(Target)
 end

 --- **[AIR]** Create a CAP mission.
+-- Assinged groups are tasked to execute a CAP mission. This consists of a DCS orbit task combined with an enroute "search and engage in zone" task. 
+-- **Note** that currently DCS only supports *circular* zones for the task.
 -- @param #AUFTRAG self
 -- @param Core.Zone#ZONE_RADIUS ZoneCAP Circular CAP zone. Detected targets in this zone will be engaged.
 -- @param #number Altitude Altitude at which to orbit in feet. Default is 10,000 ft.
@@ -1717,7 +1719,7 @@ end

 --- **[AIR]** Create a STRIKE mission. Flight will attack the closest map object to the specified coordinate.
 -- @param #AUFTRAG self
-- @param Core.Point#COORDINATE Target The target coordinate. Can also be given as a GROUP, UNIT, STATIC or TARGET object.
+-- @param Core.Point#COORDINATE Target The target coordinate. Can also be given as a GROUP, UNIT, STATIC, SET_GROUP, SET_UNIT, SET_STATIC or TARGET object.
 -- @param #number Altitude Engage altitude in feet. Default 2000 ft.
 -- @param #number EngageWeaponType Which weapon to use. Defaults to auto, ie ENUMS.WeaponFlag.Auto. See ENUMS.WeaponFlag for options.
 -- @return #AUFTRAG self
@@ -1749,7 +1751,7 @@ end
 --- **[AIR]** Create a BOMBING mission. Flight will drop bombs a specified coordinate.
 -- See [DCS task bombing](https://wiki.hoggitworld.com/view/DCS_task_bombing).
 -- @param #AUFTRAG self
-- @param Core.Point#COORDINATE Target Target coordinate. Can also be specified as a GROUP, UNIT, STATIC or TARGET object.
+-- @param Core.Point#COORDINATE Target Target coordinate. Can also be specified as a GROUP, UNIT, STATIC, SET_GROUP, SET_UNIT, SET_STATIC or TARGET object.
 -- @param #number Altitude Engage altitude in feet. Default 25000 ft.
 -- @param #number EngageWeaponType Which weapon to use. Defaults to auto, ie ENUMS.WeaponFlag.Auto. See ENUMS.WeaponFlag for options.
 -- @return #AUFTRAG self
@@ -6108,10 +6110,13 @@ function AUFTRAG:GetDCSMissionTask()
    -- BOMBING Mission --
    ---------------------

-    local DCStask=CONTROLLABLE.TaskBombing(nil, self:GetTargetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType, Divebomb)
+    local coords = self.engageTarget:GetCoordinates()
+    for _, coord in pairs(coords) do
+        local DCStask = CONTROLLABLE.TaskBombing(nil, coord:GetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType)
+
+        table.insert(DCStasks, DCStask)
+    end

-    table.insert(DCStasks, DCStask)
-    
  elseif self.type==AUFTRAG.Type.STRAFING then

    ----------------------
@@ -6311,9 +6316,12 @@ function AUFTRAG:GetDCSMissionTask()
    -- STRIKE Mission --
    --------------------

-    local DCStask=CONTROLLABLE.TaskAttackMapObject(nil, self:GetTargetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType)
+    local coords = self.engageTarget:GetCoordinates()
+    for _, coord in pairs(coords) do
+        local DCStask=CONTROLLABLE.TaskAttackMapObject(nil, coord:GetVec2(), self.engageAsGroup, self.engageWeaponExpend, self.engageQuantity, self.engageDirection, self.engageAltitude, self.engageWeaponType)

-    table.insert(DCStasks, DCStask)
+        table.insert(DCStasks, DCStask)
+    end

  elseif self.type==AUFTRAG.Type.TANKER or self.type==AUFTRAG.Type.RECOVERYTANKER then

@@ -31,7 +31,7 @@
 -- @image OPS_CSAR.jpg

 ---
-- Last Update Jan 2025
+-- Last Update May 2025

 -------------------------------------------------------------------------
 --- **CSAR** class, extends Core.Base#BASE, Core.Fsm#FSM
@@ -263,6 +263,7 @@ CSAR = {
  rescuedpilots = 0,
  limitmaxdownedpilots = true,
  maxdownedpilots = 10,
+  useFIFOLimitReplacement = false, -- If true, it will remove the oldest downed pilot when a new one is added, if the limit is reached.
  allheligroupset = nil,
  topmenuname = "CSAR",
  ADFRadioPwr = 1000,
@@ -313,7 +314,7 @@ CSAR.AircraftType["CH-47Fbl1"] = 31

 --- CSAR class version.
 -- @field #string version
-CSAR.version="1.0.30"
+CSAR.version="1.0.33"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -468,7 +469,7 @@ function CSAR:New(Coalition, Template, Alias)
  -- added 1.0.15
  self.allowbronco = false  -- set to true to use the Bronco mod as a CSAR plane
  
-  self.ADFRadioPwr = 1000
+  self.ADFRadioPwr = 500
  
  -- added 1.0.16
  self.PilotWeight = 80
@@ -1144,19 +1145,8 @@ function CSAR:_EventHandler(EventData)
        self:T("Double Ejection!")
        return self
      end
-      
-      -- limit no of pilots in the field.
-      if self.limitmaxdownedpilots and self:_ReachedPilotLimit() then
-        self:T("Maxed Downed Pilot!")
-        return self
-      end
-    
-    
-    -- TODO: Over water check --- EVENTS.LandingAfterEjection NOT triggered by DCS, so handle csarUsePara = true case
-    -- might create dual pilots in edge cases
-    
-    local wetfeet = false
-    
+
+
    local initdcscoord = nil
    local initcoord = nil
    if _event.id == EVENTS.Ejection then
@@ -1168,6 +1158,36 @@ function CSAR:_EventHandler(EventData)
      initcoord = COORDINATE:NewFromVec3(initdcscoord)
      self:T({initdcscoord})
    end
+
+      -- Remove downed pilot if already exists to replace with new one.
+      if _event.IniPlayerName then
+          local PilotTable = self.downedPilots --#CSAR.DownedPilot
+          local _foundPilot = nil
+          for _,_pilot in pairs(PilotTable) do
+            if _pilot.player == _event.IniPlayerName and _pilot.alive == true then
+              _foundPilot = _pilot
+              break
+            end
+          end
+          if _foundPilot then
+              self:T("Downed pilot already exists!")
+              _foundPilot.group:Destroy(false)
+              self:_RemoveNameFromDownedPilots(_foundPilot.name)
+              self:_CheckDownedPilotTable()
+          end
+      end
+
+      -- limit no of pilots in the field.
+      if self.limitmaxdownedpilots and self:_ReachedPilotLimit() then
+        self:T("Maxed Downed Pilot!")
+        return self
+      end
+    
+    
+    -- TODO: Over water check --- EVENTS.LandingAfterEjection NOT triggered by DCS, so handle csarUsePara = true case
+    -- might create dual pilots in edge cases
+    
+    local wetfeet = false
    
    --local surface = _unit:GetCoordinate():GetSurfaceType()
    local surface = initcoord:GetSurfaceType()
@@ -2116,56 +2136,50 @@ end
 --- (Internal) Determine distance to closest MASH.
 -- @param #CSAR self
 -- @param Wrapper.Unit#UNIT _heli Helicopter #UNIT
-- @return #CSAR self
+-- @return #number Distance in meters
+-- @return #string MASH Name as string
 function CSAR:_GetClosestMASH(_heli)
  self:T(self.lid .. " _GetClosestMASH")
  local _mashset = self.mash -- Core.Set#SET_GROUP
-  local _mashes = _mashset:GetSetObjects() -- #table
+  local MashSets = {}
+  --local _mashes = _mashset.Set-- #table
+  table.insert(MashSets,_mashset.Set)
+  table.insert(MashSets,self.zonemashes.Set)
+  table.insert(MashSets,self.staticmashes.Set)
  local _shortestDistance = -1
  local _distance = 0
  local _helicoord = _heli:GetCoordinate()
-  
-  local function GetCloseAirbase(coordinate,Coalition,Category)
-      
-      local a=coordinate:GetVec3()
-      local distmin=math.huge
-      local airbase=nil
-      for DCSairbaseID, DCSairbase in pairs(world.getAirbases(Coalition)) do
-        local b=DCSairbase:getPoint()
-  
-        local c=UTILS.VecSubstract(a,b)
-        local dist=UTILS.VecNorm(c)
-  
-        if dist<distmin and (Category==nil or Category==DCSairbase:getDesc().category) then
-          distmin=dist
-          airbase=DCSairbase
-        end
-  
-      end  
-      return distmin
-  end
+  local MashName = nil
  
  if self.allowFARPRescue then
    local position = _heli:GetCoordinate()
    local afb,distance = position:GetClosestAirbase(nil,self.coalition)
    _shortestDistance = distance
+    MashName = (afb ~= nil) and afb:GetName() or "Unknown"
  end
  
-  for _, _mashUnit in pairs(_mashes) do
-      if _mashUnit and _mashUnit:IsAlive() then
-          local _mashcoord = _mashUnit:GetCoordinate()
-          _distance = self:_GetDistance(_helicoord, _mashcoord)
-          if _distance ~= nil and (_shortestDistance == -1 or _distance < _shortestDistance) then
-            _shortestDistance = _distance
-          end
-      end
+  for _,_mashes in pairs(MashSets)  do
+    for _, _mashUnit in pairs(_mashes or {}) do
+        local _mashcoord
+        if _mashUnit and (not _mashUnit:IsInstanceOf("ZONE_BASE")) and _mashUnit:IsAlive() then
+          _mashcoord = _mashUnit:GetCoordinate()
+        elseif _mashUnit and _mashUnit:IsInstanceOf("ZONE_BASE") then
+          _mashcoord = _mashUnit:GetCoordinate()
+        end
+        _distance = self:_GetDistance(_helicoord, _mashcoord)
+        if _distance ~= nil and (_shortestDistance == -1 or _distance < _shortestDistance) then
+          _shortestDistance = _distance
+          MashName = _mashUnit:GetName() or "Unknown"
+        end
+    end
  end
  
  if _shortestDistance ~= -1 then
-      return _shortestDistance
+      return _shortestDistance, MashName
  else
      return -1
  end
+  
 end

 --- (Internal) Display onboarded rescued pilots.
@@ -2323,9 +2337,9 @@ end
 -- @param #CSAR self
 -- @param Wrapper.Group#GROUP _group Group #GROUP object.
 -- @param #number _freq Frequency to use
-- @param #string _name Beacon Name to use
+-- @param #string BeaconName Beacon Name to use
 -- @return #CSAR self
-function CSAR:_AddBeaconToGroup(_group, _freq, _name)
+function CSAR:_AddBeaconToGroup(_group, _freq, BeaconName)
    self:T(self.lid .. " _AddBeaconToGroup")
    if self.CreateRadioBeacons == false then return end
    local _group = _group   
@@ -2346,10 +2360,11 @@ function CSAR:_AddBeaconToGroup(_group, _freq, _name)
      if _radioUnit then    
        local name = _radioUnit:GetName()
        local Frequency = _freq -- Freq in Hertz
-        local name = _radioUnit:GetName()
+        --local name = _radioUnit:GetName()
        local Sound =  "l10n/DEFAULT/"..self.radioSound
        local vec3 = _radioUnit:GetVec3() or _radioUnit:GetPositionVec3() or {x=0,y=0,z=0}
-        trigger.action.radioTransmission(Sound, vec3, 0, false, Frequency, self.ADFRadioPwr or 1000,_name) -- Beacon in MP only runs for exactly 30secs straight
+        self:I(self.lid..string.format("Added Radio Beacon %d Hertz | Name %s | Position {%d,%d,%d}",Frequency,BeaconName,vec3.x,vec3.y,vec3.z))
+        trigger.action.radioTransmission(Sound, vec3, 0, true, Frequency, self.ADFRadioPwr or 500,BeaconName) -- Beacon in MP only runs for exactly 30secs straight
      end
    end
    
@@ -2370,9 +2385,13 @@ function CSAR:_RefreshRadioBeacons()
        local group = pilot.group
        local frequency = pilot.frequency or 0 -- thanks to @Thrud
        local bname = pilot.BeaconName or pilot.name..math.random(1,100000)
-        trigger.action.stopRadioTransmission(bname)
+        --trigger.action.stopRadioTransmission(bname)
        if group and group:IsAlive() and frequency > 0 then
-          self:_AddBeaconToGroup(group,frequency,bname)
+          --self:_AddBeaconToGroup(group,frequency,bname)
+        else
+          if frequency > 0 then
+            trigger.action.stopRadioTransmission(bname)
+          end
        end
      end
    end
@@ -2402,11 +2421,26 @@ function CSAR:_ReachedPilotLimit()
   local limit = self.maxdownedpilots
   local islimited = self.limitmaxdownedpilots
   local count = self:_CountActiveDownedPilots()
-   if islimited and (count >= limit) then
-      return true
-   else
-      return false
-   end
+    if islimited and (count >= limit) then
+        if self.useFIFOLimitReplacement then
+            local oldIndex  = -1
+            local oldDownedPilot = nil
+            for _index, _downedpilot in pairs(self.downedPilots) do
+                oldIndex = _index
+                oldDownedPilot = _downedpilot
+                break
+            end
+            if oldDownedPilot then
+                oldDownedPilot.group:Destroy(false)
+                oldDownedPilot.alive = false
+                self:_CheckDownedPilotTable()
+                return false
+            end
+        end
+        return true
+    else
+        return false
+    end
 end

  --- User - Function to add onw SET_GROUP Set-up for pilot filtering and assignment.
@@ -2454,9 +2488,10 @@ function CSAR:onafterStart(From, Event, To)
  
  self.mash = SET_GROUP:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(self.mashprefix):FilterStart()
  
-  local staticmashes = SET_STATIC:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(self.mashprefix):FilterOnce()
-  local zonemashes = SET_ZONE:New():FilterPrefixes(self.mashprefix):FilterOnce()
+  self.staticmashes = SET_STATIC:New():FilterCoalitions(self.coalitiontxt):FilterPrefixes(self.mashprefix):FilterOnce()
+  self.zonemashes = SET_ZONE:New():FilterPrefixes(self.mashprefix):FilterOnce()
  
+  --[[
  if staticmashes:Count() > 0  then
    for _,_mash in pairs(staticmashes.Set) do
      self.mash:AddObject(_mash)
@@ -2464,10 +2499,13 @@ function CSAR:onafterStart(From, Event, To)
  end
  
  if zonemashes:Count() > 0  then
+    self:T("Adding zones to self.mash SET")
    for _,_mash in pairs(zonemashes.Set) do
      self.mash:AddObject(_mash)
    end
+    self:T("Objects in SET: "..self.mash:Count())
  end
+  --]]
  
  if not self.coordinate then
    local csarhq = self.mash:GetRandom()
@@ -70,6 +70,7 @@
 -- @field #boolean DespawnAfterLanding
 -- @field #boolean DespawnAfterHolding
 -- @field #list<Ops.Auftrag#AUFTRAG> ListOfAuftrag
+-- @field #string defaulttakeofftype Take off type
 -- @extends Core.Fsm#FSM

 --- *“Airspeed, altitude, and brains. Two are always needed to successfully complete the flight.”* -- Unknown.
@@ -223,7 +224,8 @@ EASYGCICAP = {
  ReadyFlightGroups = {},
  DespawnAfterLanding = false,
  DespawnAfterHolding = true,
-  ListOfAuftrag = {}
+  ListOfAuftrag = {},
+  defaulttakeofftype = "hot",
 }

 --- Internal Squadron data type
@@ -259,7 +261,7 @@ EASYGCICAP = {

 --- EASYGCICAP class version.
 -- @field #string version
-EASYGCICAP.version="0.1.18"
+EASYGCICAP.version="0.1.22"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -312,6 +314,7 @@ function EASYGCICAP:New(Alias, AirbaseName, Coalition, EWRName)
  self.DespawnAfterLanding = false
  self.DespawnAfterHolding = true
  self.ListOfAuftrag = {}
+  self.defaulttakeofftype = "hot"
  
  -- Set some string id for output to DCS.log file.
  self.lid=string.format("EASYGCICAP %s | ", self.alias)
@@ -400,6 +403,16 @@ function EASYGCICAP:SetDefaultRepeatOnFailure(Retries)
  return self
 end

+--- Add default take off type for the airwings.
+-- @param #EASYGCICAP self
+-- @param #string Takeoff Can be "hot", "cold", or "air" - default is "hot".
+-- @return #EASYGCICAP self 
+function EASYGCICAP:SetDefaultTakeOffType(Takeoff)
+  self:T(self.lid.."SetDefaultTakeOffType")
+  self.defaulttakeofftype = Takeoff or "hot"
+  return self
+end
+
 --- Set default CAP Speed in knots
 -- @param #EASYGCICAP self
 -- @param #number Speed Speed defaults to 300
@@ -569,6 +582,13 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
  local DespawnAfterLanding = self.DespawnAfterLanding
  local DespawnAfterHolding = self.DespawnAfterHolding
  
+  -- Check STATIC name
+  local check = STATIC:FindByName(Airbasename,false)
+  if check == nil then
+    MESSAGE:New(self.lid.."There's no warehouse static on the map (wrong naming?) for airbase "..tostring(Airbasename).."!",30,"CHECK"):ToAllIf(self.debug):ToLog()
+    return
+  end
+  
  -- Create Airwing
  local CAP_Wing = AIRWING:New(Airbasename,Alias)
  CAP_Wing:SetVerbosityLevel(0)
@@ -596,9 +616,8 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
  if #self.ManagedREC > 0 then
    CAP_Wing:SetNumberRecon(1)
  end
-  --local PatrolCoordinateKutaisi = ZONE:New(CapZoneName):GetCoordinate()
-  --CAP_Wing:AddPatrolPointCAP(PatrolCoordinateKutaisi,self.capalt,UTILS.KnotsToAltKIAS(self.capspeed,self.capalt),self.capdir,self.capleg)
-  CAP_Wing:SetTakeoffHot()
+
+  CAP_Wing:SetTakeoffType(self.defaulttakeofftype)
  CAP_Wing:SetLowFuelThreshold(0.3)
  CAP_Wing.RandomAssetScore = math.random(50,100)
  CAP_Wing:Start()
@@ -606,6 +625,9 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
  local Intel = self.Intel
  
  local TankerInvisible = self.TankerInvisible
+  local engagerange = self.engagerange
+  local GoZoneSet = self.GoZoneSet
+  local NoGoZoneSet = self.NoGoZoneSet
  
  function CAP_Wing:onbeforeFlightOnMission(From, Event, To, Flightgroup, Mission)
    local flightgroup = Flightgroup -- Ops.FlightGroup#FLIGHTGROUP
@@ -619,7 +641,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
    flightgroup:GetGroup():SetOptionRadarUsingForContinousSearch()
    if Mission.type ~= AUFTRAG.Type.TANKER and Mission.type ~= AUFTRAG.Type.AWACS and Mission.type ~= AUFTRAG.Type.RECON then
      flightgroup:SetDetection(true)
-      flightgroup:SetEngageDetectedOn(self.engagerange,{"Air"},self.GoZoneSet,self.NoGoZoneSet)
+      flightgroup:SetEngageDetectedOn(engagerange,{"Air"},GoZoneSet,NoGoZoneSet)
      flightgroup:SetOutOfAAMRTB()
      if CapFormation then
        flightgroup:GetGroup():SetOption(AI.Option.Air.id.FORMATION,CapFormation)
@@ -801,6 +823,11 @@ function EASYGCICAP:_SetCAPPatrolPoints()
  self:T(self.lid.."_SetCAPPatrolPoints")
  for _,_data in pairs(self.ManagedCP) do
    local data = _data --#EASYGCICAP.CapPoint
+    self:T("Airbasename = "..data.AirbaseName)
+    if not self.wings[data.AirbaseName] then
+      MESSAGE:New(self.lid.."You are trying to create a CAP point for which there is no wing! "..tostring(data.AirbaseName),30,"CHECK"):ToAllIf(self.debug):ToLog()
+      return
+    end
    local Wing = self.wings[data.AirbaseName][1] -- Ops.Airwing#AIRWING
    local Coordinate = data.Coordinate
    local Altitude = data.Altitude
@@ -259,7 +259,7 @@ function FLIGHTGROUP:New(group)
  local self=BASE:Inherit(self, OPSGROUP:New(group)) -- #FLIGHTGROUP

  -- Set some string id for output to DCS.log file.
-  self.lid=string.format("FLIGHTGROUP %s | ", self.groupname)
+  self.lid=string.format("FLIGHTGROUP %s | ", self.groupname or "N/A")

  -- Defaults
  self:SetDefaultROE()
@@ -2002,6 +2002,9 @@ function FLIGHTGROUP:onafterElementAirborne(From, Event, To, Element)

  -- Debug info.
  self:T2(self.lid..string.format("Element airborne %s", Element.name))
+  
+  -- Set parking spot to free. Also for FC. This is usually done after taxiing but doing it here in case the group is teleported.
+  self:_SetElementParkingFree(Element)  

  -- Set element status.
  self:_UpdateStatus(Element, OPSGROUP.ElementStatus.AIRBORNE)
@@ -2324,7 +2324,7 @@ INTEL_DLINK = {
  verbose         =     0,
  lid             =   nil,
  alias           =   nil,
-  cachetime       =   300,
+  cachetime       =   120,
  interval        =   20,
  contacts        =   {},
  clusters        =   {},
@@ -2333,7 +2333,7 @@ INTEL_DLINK = {

 --- Version string
 -- @field #string version
-INTEL_DLINK.version = "0.0.1"
+INTEL_DLINK.version = "0.0.2"

 --- Function to instantiate a new object
 -- @param #INTEL_DLINK self
@@ -2384,15 +2384,15 @@ function INTEL_DLINK:New(Intels, Alias, Interval, Cachetime)
    self.alias="SPECTRE"
  end

-  -- Cache time
-  self.cachetime = Cachetime or 300
-
  -- Interval
  self.interval = Interval or 20

  -- Set some string id for output to DCS.log file.
  self.lid=string.format("INTEL_DLINK %s | ", self.alias)

+  -- Cache time
+  self:SetDLinkCacheTime(Cachetime or 120)
+  
    -- Start State.
  self:SetStartState("Stopped")

@@ -2477,6 +2477,16 @@ function INTEL_DLINK:onafterStart(From, Event, To)
  return self
 end

+  --- Function to set how long INTEL DLINK remembers contacts.
+  -- @param #INTEL_DLINK self
+  -- @param #number seconds Remember this many seconds. Defaults to 180.
+  -- @return #INTEL_DLINK self
+  function INTEL_DLINK:SetDLinkCacheTime(seconds)
+    self.cachetime = math.abs(seconds or 120)
+    self:I(self.lid.."Caching for "..self.cachetime.." seconds.")
+    return self
+  end
+
 --- Function to collect data from the various #INTEL
 -- @param #INTEL_DLINK self
 -- @param #string From The From state
@@ -5589,10 +5589,13 @@ function OPSGROUP:onafterUnpauseMission(From, Event, To)
    -- Debug info.
    self:T(self.lid..string.format("Unpausing mission %s [%s]", mission:GetName(), mission:GetType()))
    
+    -- Set state of mission, e.g. for not teleporting again
+    mission.unpaused=true
+    
    -- Start mission.
    self:MissionStart(mission)
    
-    -- Remove mission from 
+    -- Remove mission from pausedmissions queue
    for i,mid in pairs(self.pausedmissions) do
      --self:T(self.lid..string.format("Checking paused mission", mid))
      if mid==mission.auftragsnummer then
@@ -6232,7 +6235,7 @@ function OPSGROUP:RouteToMission(mission, delay)
    end
    
    -- Check if group is mobile. Note that some immobile units report a speed of 1 m/s = 3.6 km/h.
-    if self.speedMax<=3.6 or mission.teleport then
+    if (self.speedMax<=3.6 or mission.teleport) and not mission.unpaused then

      -- Teleport to waypoint coordinate. Mission will not be paused.
      self:Teleport(waypointcoord, nil, true)
@@ -53,7 +53,8 @@
 -- @field #number threatlevelCapture Threat level necessary to capture a zone.
 -- @field Core.Set#SET_UNIT ScanUnitSet Set of scanned units.
 -- @field Core.Set#SET_GROUP ScanGroupSet Set of scanned groups.
-- @extends Core.Fsm#FSM
+-- @field #number UpdateSeconds Run status every this many seconds.
+-- @extends Core.Fsm#FSM 

 --- *Gentlemen, when the enemy is committed to a mistake we must not interrupt him too soon.* --- Horation Nelson
 --
@@ -77,6 +78,7 @@ OPSZONE = {
  Tnut           =     0,
  chiefs         =    {},
  Missions       =    {},
+  UpdateSeconds  =    120,
 }

 --- OPSZONE.MISSION
@@ -97,7 +99,7 @@ OPSZONE.ZoneType={

 --- OPSZONE class version.
 -- @field #string version
-OPSZONE.version="0.6.1"
+OPSZONE.version="0.6.2"

 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
@@ -733,7 +735,8 @@ function OPSZONE:onafterStart(From, Event, To)
  self.timerStatus=self.timerStatus or TIMER:New(OPSZONE.Status, self)
  
  -- Status update.
-  self.timerStatus:Start(1, 120)
+  local EveryUpdateIn = self.UpdateSeconds or 120
+  self.timerStatus:Start(1, EveryUpdateIn)
  
  -- Handle base captured event.
  if self.airbase then
@@ -21,7 +21,7 @@
 -- ===
 -- @module Ops.PlayerTask
 -- @image OPS_PlayerTask.jpg
-- @date Last Update Jan 2025
+-- @date Last Update May 2025


 do
@@ -98,7 +98,7 @@ PLAYERTASK = {

 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASK.version="0.1.25"
+PLAYERTASK.version="0.1.27"

 --- Generic task condition.
 -- @type PLAYERTASK.Condition
@@ -556,6 +556,7 @@ end
 -- @param #PLAYERTASK self
 -- @param #SET_BASE CaptureSquadGroupNamePrefix The prefix of the group name that needs to capture the zone.
 -- @param #number Coalition The coalition that needs to capture the zone.
+-- @param #boolean CheckClientInZone If true, a CLIENT assigned to this task also needs to be in the zone for the task to be successful.
 -- @return #PLAYERTASK self
 -- @usage
 -- -- We can use either STATIC, SET_STATIC, SCENERY or SET_SCENERY as target objects.
@@ -570,20 +571,20 @@ end
 --
 -- -- We set CaptureSquadGroupNamePrefix the group name prefix as set in the ME or the spawn of the group that need to be present at the OpsZone like a capture squad,
 -- -- and set the capturing Coalition in order to trigger a successful task.
-- mytask:AddOpsZoneCaptureSuccessCondition("capture-squad", coalition.side.BLUE)
+-- mytask:AddOpsZoneCaptureSuccessCondition("capture-squad", coalition.side.BLUE, false)
 --
 -- playerTaskManager:AddPlayerTaskToQueue(mytask)
-function PLAYERTASK:AddOpsZoneCaptureSuccessCondition(CaptureSquadGroupNamePrefix, Coalition)
+function PLAYERTASK:AddOpsZoneCaptureSuccessCondition(CaptureSquadGroupNamePrefix, Coalition, CheckClientInZone)
    local task = self
    task:AddConditionSuccess(
            function(target)
                if target:IsInstanceOf("OPSZONE") then
-                    return task:_CheckCaptureOpsZoneSuccess(target, CaptureSquadGroupNamePrefix, Coalition, true)
+                    return task:_CheckCaptureOpsZoneSuccess(target, CaptureSquadGroupNamePrefix, Coalition, CheckClientInZone or true)
                elseif target:IsInstanceOf("SET_OPSZONE") then
                    local successes = 0
                    local isClientInZone = false
                    target:ForEachZone(function(opszone)
-                        if task:_CheckCaptureOpsZoneSuccess(opszone, CaptureSquadGroupNamePrefix, Coalition) then
+                        if task:_CheckCaptureOpsZoneSuccess(opszone, CaptureSquadGroupNamePrefix, Coalition, CheckClientInZone or true) then
                            successes = successes + 1
                        end

@@ -979,6 +980,12 @@ function PLAYERTASK:onafterStatus(From, Event, To)
  
  if status == "Stopped" then return self end
  
+  -- update marker in case target is moving
+  if self.TargetMarker then
+    local coordinate = self.Target:GetCoordinate() 
+    self.TargetMarker:UpdateCoordinate(coordinate,0.5) 
+  end
+  
  -- Check Target status
  local targetdead = false
  
@@ -1902,7 +1909,7 @@ PLAYERTASKCONTROLLER.Messages = {
  
 --- PLAYERTASK class version.
 -- @field #string version
-PLAYERTASKCONTROLLER.version="0.1.69"
+PLAYERTASKCONTROLLER.version="0.1.70"

 --- Create and run a new TASKCONTROLLER instance.
 -- @param #PLAYERTASKCONTROLLER self
@@ -1944,7 +1951,7 @@ function PLAYERTASKCONTROLLER:New(Name, Coalition, Type, ClientFilter)
  self.taskinfomenu = false
  self.activehasinfomenu = false
  self.MenuName = nil
-  self.menuitemlimit = 5
+  self.menuitemlimit = 6
  self.holdmenutime = 30
  
  self.MarkerReadOnly = false
@@ -2415,7 +2422,7 @@ function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,Holdi
        end  
      )
    else
-      self:E(self.lid.."No FLIGHTGROUP object passed or FLIGHTGROUP is not alive!")
+      self:E(self.lid.."No OPSGROUP/SET_OPSGROUP object passed or object is not alive!")
    end
  else
    self.autolase = nil
@@ -2574,7 +2581,7 @@ function PLAYERTASKCONTROLLER:SetMenuOptions(InfoMenu,ItemLimit,HoldTime)
  if self.activehasinfomenu then
    self:EnableTaskInfoMenu()
  end
-  self.menuitemlimit = ItemLimit or 5
+  self.menuitemlimit = ItemLimit+1 or 6
  self.holdmenutime = HoldTime or 30
  return self
 end
@@ -3479,7 +3486,7 @@ end
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Ops.PlayerTask#PLAYERTASK PlayerTask
 -- @param #boolean Silent If true, make no "has new task" announcement
-- @param #boolen TaskFilter If true, apply the white/black-list task filters here, also
+-- @param #boolean TaskFilter If true, apply the white/black-list task filters here, also
 -- @return #PLAYERTASKCONTROLLER self
 -- @usage
 -- Example to create a PLAYERTASK of type CTLD and give Players 10 minutes to complete:
@@ -3703,6 +3710,7 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
    else
      CoordText = Coordinate:ToStringA2A(Client,nil,self.ShowMagnetic)
    end
+    --self:I("CoordText = "..CoordText)
    -- Threat Level
    local ThreatLevel = task.Target:GetThreatLevelMax()
    --local ThreatLevelText = "high"
@@ -3837,7 +3845,8 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
        Text = string.gsub(Text,"9","niner")
        CoordText = "MGRS;"..Text
        if self.PathToGoogleKey then
-          CoordText = string.format("<say-as interpret-as='characters'>%s</say-as>",CoordText)
+          --CoordText = string.format("<say-as interpret-as=\'characters\'>%s</say-as>",CoordText)
+          --doesn't seem to work any longer
        end
        --self:I(self.lid.." | ".. CoordText)
      end
@@ -3855,10 +3864,12 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
        CoordText = string.gsub(ttstext," BR, "," Bee, Arr, ")
       end
      elseif task:HasFreetext() then
+      
        -- add tts freetext
        local brieftxt = self.gettext:GetEntry("BRIEFING",self.locale)
        ttstext = ttstext .. string.format("; %s: ",brieftxt)..task:GetFreetextTTS()
      end
+      --self:I("**** TTS Text ****\n"..ttstext.."\n*****")
      self.SRSQueue:NewTransmission(ttstext,nil,self.SRS,nil,2)
    end  
  else
@@ -4357,7 +4368,7 @@ function PLAYERTASKCONTROLLER:SwitchDetectStatics(OnOff)
  return self
 end

--- [User] Add accept zone to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Add an accept zone to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Core.Zone#ZONE AcceptZone Add a zone to the accept zone set.
 -- @return #PLAYERTASKCONTROLLER self
@@ -4371,7 +4382,7 @@ function PLAYERTASKCONTROLLER:AddAcceptZone(AcceptZone)
  return self
 end

--- [User] Add accept SET_ZONE to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Add an accept SET_ZONE to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Core.Set#SET_ZONE AcceptZoneSet Add a SET_ZONE to the accept zone set.
 -- @return #PLAYERTASKCONTROLLER self
@@ -4385,7 +4396,7 @@ function PLAYERTASKCONTROLLER:AddAcceptZoneSet(AcceptZoneSet)
  return self
 end

--- [User] Add reject zone to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Add a reject zone to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Core.Zone#ZONE RejectZone Add a zone to the reject zone set.
 -- @return #PLAYERTASKCONTROLLER self
@@ -4399,7 +4410,7 @@ function PLAYERTASKCONTROLLER:AddRejectZone(RejectZone)
  return self
 end

--- [User] Add reject SET_ZONE to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Add a reject SET_ZONE to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param Core.Set#SET_ZONE  RejectZoneSet Add a zone to the reject zone set.
 -- @return #PLAYERTASKCONTROLLER self
@@ -4413,9 +4424,37 @@ function PLAYERTASKCONTROLLER:AddRejectZoneSet(RejectZoneSet)
  return self
 end

--- [User] Remove accept zone from INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Add a conflict zone to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
-- @param Core.Zone#ZONE AcceptZone Add a zone to the accept zone set.
+-- @param Core.Zone#ZONE ConflictZone Add a zone to the conflict zone set.
+-- @return #PLAYERTASKCONTROLLER self
+function PLAYERTASKCONTROLLER:AddConflictZone(ConflictZone)
+  self:T(self.lid.."AddConflictZone")
+  if self.Intel then
+    self.Intel:AddConflictZone(ConflictZone)
+  else
+    self:E(self.lid.."*****NO detection has been set up (yet)!")
+  end
+  return self
+end
+
+--- [User] Add a conflict SET_ZONE to INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+-- @param #PLAYERTASKCONTROLLER self
+-- @param Core.Set#SET_ZONE ConflictZoneSet Add a zone to the conflict zone set.
+-- @return #PLAYERTASKCONTROLLER self
+function PLAYERTASKCONTROLLER:AddConflictZoneSet(ConflictZoneSet)
+  self:T(self.lid.."AddConflictZoneSet")
+  if self.Intel then
+    self.Intel.conflictzoneset:AddSet(ConflictZoneSet)
+  else
+    self:E(self.lid.."*****NO detection has been set up (yet)!")
+  end
+  return self
+end
+
+--- [User] Remove an accept zone from INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+-- @param #PLAYERTASKCONTROLLER self
+-- @param Core.Zone#ZONE AcceptZone Remove this zone from the accept zone set.
 -- @return #PLAYERTASKCONTROLLER self
 function PLAYERTASKCONTROLLER:RemoveAcceptZone(AcceptZone)
  self:T(self.lid.."RemoveAcceptZone")
@@ -4427,11 +4466,11 @@ function PLAYERTASKCONTROLLER:RemoveAcceptZone(AcceptZone)
  return self
 end

--- [User] Remove reject zone from INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+--- [User] Remove a reject zone from INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
 -- @param #PLAYERTASKCONTROLLER self
-- @param Core.Zone#ZONE RejectZone Add a zone to the reject zone set.
+-- @param Core.Zone#ZONE RejectZone Remove this zone from the reject zone set.
 -- @return #PLAYERTASKCONTROLLER self
-function PLAYERTASKCONTROLLER:RemoveRejectZoneSet(RejectZone)
+function PLAYERTASKCONTROLLER:RemoveRejectZone(RejectZone)
  self:T(self.lid.."RemoveRejectZone")
  if self.Intel then
    self.Intel:RemoveRejectZone(RejectZone)
@@ -4441,6 +4480,20 @@ function PLAYERTASKCONTROLLER:RemoveRejectZoneSet(RejectZone)
  return self
 end

+--- [User] Remove a conflict zone from INTEL detection. You need to set up detection with @{#PLAYERTASKCONTROLLER.SetupIntel}() **before** using this.
+-- @param #PLAYERTASKCONTROLLER self
+-- @param Core.Zone#ZONE ConflictZone Remove this zone from the conflict zone set.
+-- @return #PLAYERTASKCONTROLLER self
+function PLAYERTASKCONTROLLER:RemoveConflictZone(ConflictZone)
+  self:T(self.lid.."RemoveConflictZone")
+  if self.Intel then
+    self.Intel:RemoveConflictZone(ConflictZone)
+  else
+    self:E(self.lid.."*****NO detection has been set up (yet)!")
+  end
+  return self
+end
+
 --- [User] Set the top menu name to a custom string.
 -- @param #PLAYERTASKCONTROLLER self
 -- @param #string Name The name to use as the top menu designation.
@@ -1715,6 +1715,26 @@ function TARGET:GetAverageCoordinate()
  return nil
 end

+
+--- Get coordinates of all targets. (e.g. for a SET_STATIC)
+-- @param #TARGET self
+-- @return #table Table with coordinates of all targets.
+function TARGET:GetCoordinates()
+    local coordinates={}
+
+    for _,_target in pairs(self.targets) do
+        local target=_target --#TARGET.Object
+
+        local coordinate=self:GetTargetCoordinate(target)
+        if coordinate then
+            table.insert(coordinates, coordinate)
+        end
+
+    end
+
+    return coordinates
+end
+
 --- Get heading of target.
 -- @param #TARGET self
 -- @return #number Heading of the target in degrees.
@@ -1968,6 +1988,21 @@ function TARGET:GetObject(RefCoordinate, Coalitions)
  return nil
 end

+--- Get all target objects.
+-- @param #TARGET self
+-- @return #table List of target objects.
+function TARGET:GetObjects()
+    local objects={}
+
+    for _,_target in pairs(self.targets) do
+        local target=_target --#TARGET.Object
+
+        table.insert(objects, target.Object)
+    end
+
+    return objects
+end
+
 --- Count alive objects.
 -- @param #TARGET self
 -- @param #TARGET.Object Target Target objective.