Merge branch 'develop' into FF/Ops

Moose Development/Moose/Ops/Auftrag.lua

@@ -3084,6 +3084,39 @@ function AUFTRAG:SetRequiredCarriers(NcarriersMin, NcarriersMax)
   return self
 end
 
+--- Set that (jet) aircraft are generally **not** allowed to use afterburner. Default is use of afterburner is allowed.
+-- @param #AUFTRAG self
+-- @return #AUFTRAG self
+function AUFTRAG:SetProhibitAfterburner()
+  self.prohibitAB = true
+  return self 
+end
+
+--- Set that (jet) aircraft are generally allowed to use afterburner. Default is use of afterburner is allowed.
+-- @param #AUFTRAG self
+-- @return #AUFTRAG self
+function AUFTRAG:SetAllowAfterburner()
+  self.prohibitAB = false
+  return self 
+end
+
+--- Set that (jet) aircraft are **not** allowed to use afterburner in mission execution phase. Default is use of afterburner is allowed.
+-- @param #AUFTRAG self
+-- @return #AUFTRAG self
+function AUFTRAG:SetProhibitAfterburnerExecutePhase()
+  self.prohibitABExecute = true
+  return self 
+end
+
+--- Set that (jet) aircraft are allowed to use afterburner in mission execution phase. Default is use of afterburner is allowed.
+-- @param #AUFTRAG self
+-- @return #AUFTRAG self
+function AUFTRAG:SetAllowAfterburnerExecutePhase()
+  self.prohibitABExecute = false
+  return self 
+end
+
+-- prohibitABExecute
 
 --- **[LEGION, COMMANDER, CHIEF]** Assign a legion cohort to the mission. Only these cohorts will be considered for the job.
 -- @param #AUFTRAG self

Moose Development/Moose/Ops/CTLD.lua

@@ -1219,7 +1219,7 @@ CTLD.UnitTypes = {
 
 --- CTLD class version.
 -- @field #string version
-CTLD.version="1.0.35"
+CTLD.version="1.0.36"
 
 --- Instantiate a new CTLD.
 -- @param #CTLD self
@@ -2335,7 +2335,7 @@ function CTLD:_GetCrates(Group, Unit, Cargo, number, drop)
       rheading = UTILS.RandomGaussian(0,30,-90,90,100)
       rheading = math.fmod((heading + rheading + addon), 360)
     else
-      local initialSpacing = IsHerc and 16 or 12 -- initial spacing of the first crates
+      local initialSpacing = IsHerc and 16 or (capabilities.length+2) -- initial spacing of the first crates
       local crateSpacing = 4 -- further spacing of remaining crates
       local lateralSpacing = 4 -- lateral spacing of crates
       local nrSideBySideCrates = 3 -- number of crates that are placed side-by-side

Moose Development/Moose/Ops/FlightGroup.lua

@@ -206,7 +206,7 @@ FLIGHTGROUP.PlayerSkill = {
 
 --- Player data.
 -- @type FLIGHTGROUP.PlayerData
--- @type #string name Player name.
+-- @field #string name Player name.
 -- @field #boolean subtitles Display subtitles.
 -- @field #string skill Skill level.
 

Moose Development/Moose/Ops/OpsGroup.lua

@@ -3339,8 +3339,10 @@ end
 function OPSGROUP:GetExpectedSpeed()
 
   if self:IsHolding() or self:Is("Rearming") or self:IsWaiting() or self:IsRetreated() then
+    --env.info("GetExpectedSpeed - returning ZERO")
     return 0
   else
+    --env.info("GetExpectedSpeed - returning self.speedWP = "..self.speedWp)
     return self.speedWp or 0
   end
 
@@ -5344,7 +5346,7 @@ function OPSGROUP:onafterMissionStart(From, Event, To, Mission)
   --if self.isFlightgroup and Mission.type~=AUFTRAG.Type.ALERT5 then
   --  FLIGHTGROUP.SetReadyForTakeoff(self, true)
   --end
-
+  
   -- Route group to mission zone.
   if self.speedMax>3.6 or true then
 
@@ -5400,7 +5402,18 @@ function OPSGROUP:onafterMissionExecute(From, Event, To, Mission)
   if Mission.engagedetectedOn then
     self:SetEngageDetectedOn(UTILS.MetersToNM(Mission.engagedetectedRmax), Mission.engagedetectedTypes, Mission.engagedetectedEngageZones, Mission.engagedetectedNoEngageZones)
   end
-
+  
+  -- Set AB usage for mission execution based on Mission entry, if the option was set in the mission
+  if self.isFlightgroup then
+    if Mission.prohibitABExecute == true then
+      self:SetProhibitAfterburner()
+      self:I("Set prohibit AB")
+    elseif Mission.prohibitABExecute == false then
+      self:SetAllowAfterburner()
+      self:T2("Set allow AB")
+    end
+  end
+  
 end
 
 --- On after "PauseMission" event.
@@ -5697,6 +5710,17 @@ function OPSGROUP:onafterMissionDone(From, Event, To, Mission)
     return
   end
   
+  -- Set AB usage based on Mission entry, if the option was set in the mission
+  if self.isFlightgroup then
+    if Mission.prohibitAB == true then
+      self:T2("Setting prohibit AB")
+      self:SetProhibitAfterburner()
+    elseif Mission.prohibitAB == false then
+      self:T2("Setting allow AB")
+      self:SetAllowAfterburner()
+    end
+  end
+  
   -- Check if group is done.
   self:_CheckGroupDone(delay)
 
@@ -6116,7 +6140,19 @@ function OPSGROUP:_SetMissionOptions(mission)
   if mission.icls then
     self:SwitchICLS(mission.icls.Channel, mission.icls.Morse, mission.icls.UnitName)
   end
+  
+  -- Set AB usage based on Mission entry, if the option was set in the mission
+  if self.isFlightgroup then
+    if mission.prohibitAB == true then
+      self:SetProhibitAfterburner()
+      self:T2("Set prohibit AB")
+    elseif mission.prohibitAB == false then
+      self:SetAllowAfterburner()
+      self:T2("Set allow AB")
+    end
+  end
 
+  return self
 end
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------