Merge branch 'master-ng' into FF/PyBridge

Moose Development/Moose/Ops/AirWing.lua

@@ -189,13 +189,14 @@ AIRWING = {
 
 --- AIRWING class version.
 -- @field #string version
-AIRWING.version="0.9.7"
+AIRWING.version="0.9.8"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- ToDo list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- TODO: Check that airbase has enough parking spots if a request is BIG.
+-- DONE: Allow groupping parameter for CAP flights
 -- DONE: Allow (moving) zones as base for patrol points.
 -- DONE: Spawn in air ==> Needs WAREHOUSE update.
 -- DONE: Spawn hot.
@@ -233,6 +234,7 @@ function AIRWING:New(warehousename, airwingname)
   
   -- Defaults:
   self.nflightsCAP=0
+  self.nCAPgrouping=1
   self.nflightsAWACS=0
   self.nflightsRecon=0
   self.nflightsTANKERboom=0
@@ -765,9 +767,11 @@ end
 --- Set number of CAP flights constantly carried out.
 -- @param #AIRWING self
 -- @param #number n (Optional) Number of flights. Default 1.
+-- @param #number grouping (optional) Number of assets per flight. Default 1.
 -- @return #AIRWING self
-function AIRWING:SetNumberCAP(n)
+function AIRWING:SetNumberCAP(n,grouping)
   self.nflightsCAP=n or 1
+  self.nCAPgrouping = grouping or 1
   return self
 end
 
@@ -1295,11 +1299,13 @@ function AIRWING:CheckCAP()
     if self.capOptionPatrolRaceTrack then
       
       missionCAP=AUFTRAG:NewPATROL_RACETRACK(patrol.coord,altitude,patrol.speed,patrol.heading,patrol.leg, self.capFormation)
+      missionCAP:SetRequiredAssets(self.nCAPgrouping,self.nCAPgrouping)
       
     else
         
       missionCAP=AUFTRAG:NewGCICAP(patrol.coord, altitude, patrol.speed, patrol.heading, patrol.leg)
-    
+      missionCAP:SetRequiredAssets(self.nCAPgrouping,self.nCAPgrouping)
+      
     end
     
     if self.capOptionVaryStartTime then

Moose Development/Moose/Ops/Airboss.lua

@@ -10410,7 +10410,7 @@ function AIRBOSS:_Groove( playerData )
 
     -- Wait until player passed the 0.75 NM distance.
     local _advice = true
-    if playerData.TIG0 == nil and playerData.difficulty ~= AIRBOSS.Difficulty.EASY then -- rho>RXX
+    if (playerData.TIG0 == nil or playerData.TIG0 == 0) and playerData.difficulty ~= AIRBOSS.Difficulty.EASY then -- rho>RXX
       _advice = false
     end
 

Moose Development/Moose/Ops/EasyGCICAP.lua

@@ -288,7 +288,7 @@ EASYGCICAP = {
 
 --- EASYGCICAP class version.
 -- @field #string version
-EASYGCICAP.version="0.1.38"
+EASYGCICAP.version="0.1.39"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- 
@@ -796,8 +796,9 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias)
   CAP_Wing:SetRespawnAfterDestroyed()
   
   --- #DONE avoid wings with no CAP points starting CAP anyhow; AirWing uses this to start CAP and creates points when there are none.
-  if counttable(self.ManagedCP) >0 then
-    CAP_Wing:SetNumberCAP(self.capgrouping)
+  local nCapPoints = counttable(self.ManagedCP)
+  if nCapPoints >0 then
+    CAP_Wing:SetNumberCAP(nCapPoints,self.capgrouping)
   end
   CAP_Wing:SetCapCloseRaceTrack(true)
     

Moose Development/Moose/Ops/FlightControl.lua

@@ -19,7 +19,7 @@
 -- ### Author: **funkyfranky**
 --
 -- ===
--- @module OPS.FlightControl
+-- @module Ops.FlightControl
 -- @image OPS_FlightControl.png