#AIRBOSS - prevent too early LSO calls

#EASYGCICAP - make CAP points honor grouping

Moose Development/Moose/Core/Database.lua

@@ -92,8 +92,6 @@ DATABASE = {
   ZONES_GOAL = {},
   WAREHOUSES = {},
   FLIGHTGROUPS = {},
-  COHORTS={},
-  LEGIONS={},
   FLIGHTCONTROLS = {},
   OPSZONES = {},
   PATHLINES = {},
@@ -2089,40 +2087,6 @@ function DATABASE:FindOpsGroupFromUnit(unitname)
   end
 end
 
---
-
---- Add an OPS COHORT (SQUADRON, PLATOON, FLOTILLA) to the data base.
--- @param #DATABASE self
--- @param Ops.Cohort#COHORT cohort The cohort added to the DB.
-function DATABASE:AddCohort(cohort)
-  self.COHORTS[cohort.name]=cohort
-end
-
---- Find an OPS COHORT (SQUADRON, PLATOON, FLOTILLA) in the data base.
--- @param #DATABASE self
--- @param #string cohortname Name of the cohort.
--- @return Ops.Cohort#COHORT Cohort object.
-function DATABASE:FindCohort(cohortname)
-  return self.COHORTS[cohortname]
-end
-
---- Add an OPS LEGION (AIRWING, BRIGADE, FLEET) to the data base.
--- @param #DATABASE self
--- @param Ops.Legion#LEGION legion The legion added to the DB.
-function DATABASE:AddLegion(legion)
-  self.LEGIONS[legion.alias]=legion
-end
-
---- Find an OPS LEGION (AIRWING, BRIGADE, FLEET) in the data base.
--- @param #DATABASE self
--- @param #string legionname Name of the legion.
--- @return Ops.Legion#LEGION Legion object.
-function DATABASE:FindLegion(legionname)
-  return self.LEGIONS[legionname]
-end
-
---
-
 --- Add a flight control to the data base.
 -- @param #DATABASE self
 -- @param OPS.FlightControl#FLIGHTCONTROL flightcontrol

Moose Development/Moose/Core/Event.lua

@@ -278,7 +278,6 @@ EVENTS = {
   SimulationUnfreeze        = world.event.S_EVENT_SIMULATION_UNFREEZE or -1, 
   HumanAircraftRepairStart  = world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_START or -1, 
   HumanAircraftRepairFinish = world.event.S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH or -1,
-  GroupChangeOption         = world.event.S_EVENT_GROUP_CHANGE_OPTION or -1,
   -- dynamic cargo
   NewDynamicCargo           = world.event.S_EVENT_NEW_DYNAMIC_CARGO or -1,
   DynamicCargoLoaded        = world.event.S_EVENT_DYNAMIC_CARGO_LOADED or -1,
@@ -292,25 +291,23 @@ EVENTS = {
 --
 --   * A (Object.Category.)UNIT : A UNIT object type is involved in the Event.
 --   * A (Object.Category.)STATIC : A STATIC object type is involved in the Event.
---   * A GROUP : A DCS Group object is involved in the Event.
 --
 -- @type EVENTDATA
 -- @field #number id The identifier of the event.
 --
--- @field DCS#Unit initiator (UNIT/STATIC/SCENERY/GROUP) The initiating @{DCS#Unit} or @{DCS#StaticObject}. For `S_EVENT_GROUP_CHANGE_OPTION`, this is a DCS Group.
+-- @field DCS#Unit initiator (UNIT/STATIC/SCENERY) The initiating @{DCS#Unit} or @{DCS#StaticObject}.
 -- @field DCS#Object.Category IniObjectCategory (UNIT/STATIC/SCENERY) The initiator object category ( Object.Category.UNIT or Object.Category.STATIC ).
 -- @field DCS#Unit IniDCSUnit (UNIT/STATIC) The initiating @{DCS#Unit} or @{DCS#StaticObject}.
 -- @field #string IniDCSUnitName (UNIT/STATIC) The initiating Unit name.
 -- @field Wrapper.Unit#UNIT IniUnit (UNIT/STATIC) The initiating MOOSE wrapper @{Wrapper.Unit#UNIT} of the initiator Unit object.
 -- @field #string IniUnitName (UNIT/STATIC) The initiating UNIT name (same as IniDCSUnitName).
--- @field DCS#Group IniDCSGroup (UNIT/GROUP) The initiating @{DCS#Group}.
+-- @field DCS#Group IniDCSGroup (UNIT) The initiating {DCSGroup#Group}.
--- @field #string IniDCSGroupName (UNIT/GROUP) The initiating Group name.
+-- @field #string IniDCSGroupName (UNIT) The initiating Group name.
--- @field Wrapper.Group#GROUP IniGroup (UNIT/GROUP) The initiating MOOSE wrapper @{Wrapper.Group#GROUP} of the initiator Group object.
+-- @field Wrapper.Group#GROUP IniGroup (UNIT) The initiating MOOSE wrapper @{Wrapper.Group#GROUP} of the initiator Group object.
--- @field #string IniGroupName (UNIT/GROUP) The initiating GROUP name (same as IniDCSGroupName).
+-- @field #string IniGroupName UNIT) The initiating GROUP name (same as IniDCSGroupName).
--- @field DCS#Group.Category IniGroupCategory (GROUP) The category of the initiating group.
 -- @field #string IniPlayerName (UNIT) The name of the initiating player in case the Unit is a client or player slot.
 -- @field #string IniPlayerUCID (UNIT) The UCID of the initiating player in case the Unit is a client or player slot and on a multi-player server.
--- @field DCS#coalition.side IniCoalition (UNIT/GROUP) The coalition of the initiator.
+-- @field DCS#coalition.side IniCoalition (UNIT) The coalition of the initiator.
 -- @field DCS#Unit.Category IniCategory (UNIT) The category of the initiator.
 -- @field #string IniTypeName (UNIT) The type name of the initiator.
 --
@@ -737,12 +734,6 @@ local _EVENTMETA = {
      Side = "I",
      Event = "OnEventHumanAircraftRepairFinish",
      Text = "S_EVENT_HUMAN_AIRCRAFT_REPAIR_FINISH"
-   },
-     [EVENTS.GroupChangeOption] = {
-     Order = 1,
-     Side = "I",
-     Event = "OnEventGroupChangeOption",
-     Text = "S_EVENT_GROUP_CHANGE_OPTION"
    },
    -- dynamic cargo
      [EVENTS.NewDynamicCargo] = {
@@ -1243,16 +1234,7 @@ function EVENT:onEvent( Event )
 
       if Event.initiator then
 
-        if Event.id == EVENTS.GroupChangeOption then
-          Event.IniDCSGroup = Event.initiator
-          Event.IniDCSGroupName = Group.getName(Event.initiator)
-          Event.IniGroupName = Event.IniDCSGroupName
-          Event.IniGroup = GROUP:FindByName(Event.IniDCSGroupName)
-          Event.IniCoalition = Group.getCoalition(Event.initiator)
-          Event.IniGroupCategory = Group.getCategory(Event.initiator)
-        else
         Event.IniObjectCategory = Object.getCategory(Event.initiator)
-        end
         
         if Event.IniObjectCategory == Object.Category.STATIC then
           ---
@@ -1681,8 +1663,10 @@ function EVENT:onEvent( Event )
       self:T( { EventMeta.Text, Event } )
     end
   else
+    if Event.id ~= 61 then --- TODO Event 61 is new, but seems to have no real data to be useable, something like option changed.
       self:E(string.format("WARNING: Could not get EVENTMETA data for event ID=%d! Is this an unknown/new DCS event?", tostring(Event.id)))
     end
+  end
 
   Event = nil
 end

Moose Development/Moose/Functional/Territory.lua

@@ -1,292 +0,0 @@
---- **Ops** - Passive strategic territory.
---
--- **Main Features:**
---
---    * Associate a static MOOSE zone with a coalition
---    * Keep strategic territory geometry separate from OPSZONE scanning
---    * Register territories in the MOOSE database
---    * Delegate coordinate checks and F10 drawing to the underlying zone
---
--- A TERRITORY is deliberately passive. It does not scan DCS objects, evaluate
--- ownership, run a scheduler, or make tactical or strategic decisions.
---
--- ===
---
--- @module Ops.Territory
-
-
---- TERRITORY class.
--- @type TERRITORY
--- @field #string ClassName Name of the class.
--- @field #string version Class version.
--- @field #number verbose Verbosity level.
--- @field #string lid Log ID string.
--- @field #string name Unique territory name.
--- @field #string zoneName Name of the underlying MOOSE zone.
--- @field Core.Zone#ZONE_BASE zone Underlying MOOSE zone.
--- @field #number coalition Coalition associated with the territory.
--- @extends Core.Base#BASE
-
---- A passive strategic area defined by an existing MOOSE zone.
---
--- TERRITORY contains geometry and declarative ownership only. Unlike
--- @{Ops.OpsZone#OPSZONE}, it performs no periodic object scans and has no FSM.
---
--- @field #TERRITORY
-TERRITORY = {
-  ClassName = "TERRITORY",
-  verbose = 0,
-}
-
---- TERRITORY class version.
--- @field #string version
-TERRITORY.version = "0.1.0"
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- DATABASE extension
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Finds a TERRITORY based on its name.
--- @param Core.Database#DATABASE self
--- @param #string TerritoryName Name of the territory.
--- @return #TERRITORY The found territory or `nil`.
-function DATABASE:FindTerritory(TerritoryName)
-  local territories = self.TERRITORIES or {}
-  return territories[TerritoryName]
-end
-
---- Adds a TERRITORY to the database.
--- @param Core.Database#DATABASE self
--- @param #TERRITORY Territory Territory to add.
--- @return #TERRITORY The registered territory or `nil`.
-function DATABASE:AddTerritory(Territory)
-  if not Territory then
-    return nil
-  end
-
-  self.TERRITORIES = self.TERRITORIES or {}
-
-  local territoryName = Territory:GetName()
-  if not self.TERRITORIES[territoryName] then
-    self.TERRITORIES[territoryName] = Territory
-  end
-
-  return self.TERRITORIES[territoryName]
-end
-
---- Deletes a TERRITORY from the database.
--- @param Core.Database#DATABASE self
--- @param #string TerritoryName Name of the territory.
--- @return Core.Database#DATABASE self
-function DATABASE:DeleteTerritory(TerritoryName)
-  if self.TERRITORIES then
-    self.TERRITORIES[TerritoryName] = nil
-  end
-  return self
-end
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Constructor
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Create a new TERRITORY class object.
--- @param #TERRITORY self
--- @param Core.Zone#ZONE_BASE Zone The underlying MOOSE zone or its Mission Editor name.
--- @param #number Coalition (Optional) Associated coalition. Default `coalition.side.NEUTRAL`.
--- @param #string Name (Optional) Unique territory name. Default is the zone name.
--- @return #TERRITORY self
--- @usage
--- local north = TERRITORY:New("Territory North", coalition.side.BLUE)
--- local southZone = ZONE:FindByName("Territory South")
--- local south = TERRITORY:New(southZone, coalition.side.RED, "Southern Territory")
-function TERRITORY:New(Zone, Coalition, Name)
-
-  -- Inherit everything from BASE class.
-  local self = BASE:Inherit(self, BASE:New()) -- #TERRITORY
-
-  -- Resolve a Mission Editor zone name.
-  if type(Zone) == "string" then
-    local zoneName = Zone
-    Zone = ZONE:FindByName(zoneName)
-    if not Zone then
-      self:E(string.format("ERROR: No ZONE found for name: %s", tostring(zoneName)))
-      return nil
-    end
-  elseif not Zone then
-    self:E("ERROR: First parameter Zone is nil in TERRITORY:New(Zone) call!")
-    return nil
-  end
-
-  -- A territory relies only on the common ZONE_BASE interface.
-  if type(Zone.GetName) ~= "function"
-    or type(Zone.GetCoordinate) ~= "function"
-    or type(Zone.IsCoordinateInZone) ~= "function" then
-    self:E("ERROR: TERRITORY requires a ZONE_BASE derived object!")
-    return nil
-  end
-
-  local zoneName = Zone:GetName()
-  local territoryName = Name or zoneName
-  if type(territoryName) ~= "string" or territoryName == "" then
-    self:E("ERROR: TERRITORY requires a non-empty name!")
-    return nil
-  end
-
-  self.zone = Zone
-  self.zoneName = zoneName
-  self.name = territoryName
-  self.lid = string.format("TERRITORY %s | ", territoryName)
-
-  if not self:SetCoalition(Coalition or coalition.side.NEUTRAL) then
-    return nil
-  end
-
-  -- Register in the MOOSE database.
-  _DATABASE:AddTerritory(self)
-
-  return self
-end
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Set functions
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Set the coalition associated with this territory.
--- This method only changes declarative ownership. It does not evaluate DCS
--- units or trigger any capture logic.
--- @param #TERRITORY self
--- @param #number Coalition Coalition side number.
--- @return #TERRITORY self or `nil` if the coalition is invalid.
-function TERRITORY:SetCoalition(Coalition)
-  if Coalition ~= coalition.side.NEUTRAL
-    and Coalition ~= coalition.side.RED
-    and Coalition ~= coalition.side.BLUE then
-    self:E(self.lid .. string.format("ERROR: Invalid coalition: %s", tostring(Coalition)))
-    return nil
-  end
-
-  self.coalition = Coalition
-  return self
-end
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Get functions
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Find a TERRITORY by name.
--- @param #TERRITORY self
--- @param #string Name Name of the territory.
--- @return #TERRITORY The found territory or `nil`.
-function TERRITORY:FindByName(Name)
-  return _DATABASE:FindTerritory(Name)
-end
-
---- Get the territory name.
--- @param #TERRITORY self
--- @return #string Territory name.
-function TERRITORY:GetName()
-  return self.name
-end
-
---- Get the underlying zone name.
--- @param #TERRITORY self
--- @return #string Zone name.
-function TERRITORY:GetZoneName()
-  return self.zoneName
-end
-
---- Get the underlying MOOSE zone.
--- @param #TERRITORY self
--- @return Core.Zone#ZONE_BASE The underlying zone.
-function TERRITORY:GetZone()
-  return self.zone
-end
-
---- Get the territory center coordinate.
--- @param #TERRITORY self
--- @return Core.Point#COORDINATE Territory center coordinate.
-function TERRITORY:GetCoordinate()
-  return self.zone:GetCoordinate()
-end
-
---- Get the coalition associated with the territory.
--- @param #TERRITORY self
--- @return #number Coalition side number.
-function TERRITORY:GetCoalition()
-  return self.coalition
-end
-
---- Get the name of the coalition associated with the territory.
--- @param #TERRITORY self
--- @return #string Coalition name.
-function TERRITORY:GetCoalitionName()
-  return UTILS.GetCoalitionName(self.coalition)
-end
-
---- Get the owner of the territory.
--- This is an alias for @{#TERRITORY.GetCoalition}.
--- @param #TERRITORY self
--- @return #number Coalition side number.
-function TERRITORY:GetOwner()
-  return self:GetCoalition()
-end
-
---- Get the owner coalition name.
--- This is an alias for @{#TERRITORY.GetCoalitionName}.
--- @param #TERRITORY self
--- @return #string Coalition name.
-function TERRITORY:GetOwnerName()
-  return self:GetCoalitionName()
-end
-
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
--- Zone functions
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
---- Test whether a coordinate lies inside the territory.
--- @param #TERRITORY self
--- @param Core.Point#COORDINATE Coordinate Coordinate to test.
--- @return #boolean `true` if the coordinate lies inside the territory.
-function TERRITORY:ContainsCoordinate(Coordinate)
-  return self.zone:IsCoordinateInZone(Coordinate)
-end
-
---- Test whether a Vec2 lies inside the territory.
--- @param #TERRITORY self
--- @param DCS#Vec2 Vec2 Vec2 to test.
--- @return #boolean `true` if the Vec2 lies inside the territory.
-function TERRITORY:ContainsVec2(Vec2)
-  return self.zone:IsVec2InZone(Vec2)
-end
-
---- Draw the territory on the F10 map.
--- Drawing is delegated to the underlying MOOSE zone.
--- @param #TERRITORY self
--- @param #number Coalition (Optional) Coalition visibility. Default `-1` for all.
--- @param #table Color (Optional) RGB line color.
--- @param #number Alpha (Optional) Line alpha.
--- @param #table FillColor (Optional) RGB fill color.
--- @param #number FillAlpha (Optional) Fill alpha.
--- @param #number LineType (Optional) DCS line type.
--- @return #TERRITORY self
-function TERRITORY:Draw(Coalition, Color, Alpha, FillColor, FillAlpha, LineType)
-  self.zone:DrawZone(Coalition, Color, Alpha, FillColor, FillAlpha, LineType)
-  return self
-end
-
---- Remove the territory drawing from the F10 map.
--- @param #TERRITORY self
--- @return #TERRITORY self
-function TERRITORY:Undraw()
-  self.zone:UndrawZone()
-  return self
-end
-
---- Remove the territory from the MOOSE database.
--- The underlying zone is not deleted.
--- @param #TERRITORY self
--- @return #TERRITORY self
-function TERRITORY:Remove()
-  _DATABASE:DeleteTerritory(self.name)
-  return self
-end

Moose Development/Moose/Modules.lua

@@ -79,7 +79,6 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua')
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Formation.lua')
-__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Territory.lua')
 
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
 __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )

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
@@ -290,9 +292,6 @@ function AIRWING:New(warehousename, airwingname)
   -- @param Ops.FlightGroup#FLIGHTGROUP FlightGroup  The FLIGHTGROUP on mission.
   -- @param Ops.Auftrag#AUFTRAG Mission The mission.
 
-  -- Add legion to DB
-  _DATABASE:AddLegion(self)
-
   return self
 end
 
@@ -544,47 +543,6 @@ function AIRWING:AddPayloadCapability(Payload, MissionTypes, Performance)
   return self
 end
 
---- Filter available payloads for a given aircraft type and mission type.
--- @param #AIRWING self
--- @param #string UnitType The type of the unit.
--- @param #string MissionType The mission type.
--- @param #table Payloads Specific payloads only to be considered.
--- @return #AIRWING.Payload Payload table or *nil*.
-function AIRWING:_FilterPlayloads(UnitType, MissionType, Payloads)
-
-  local function _checkPayloads(payload)
-    if Payloads then
-      for _,Payload in pairs(Payloads) do
-        if Payload.uid==payload.uid then
-          return true
-        end
-      end
-    else
-      -- Payload was not specified.
-      return nil
-    end
-    return false
-  end
-
-  -- Pre-selection: filter out only those payloads that are valid for the airframe and mission type and are available.
-  local payloads={}
-  
-  for _,_payload in pairs(self.payloads) do
-    local payload=_payload --#AIRWING.Payload
-
-    local specialpayload=_checkPayloads(payload)
-    local compatible=AUFTRAG.CheckMissionCapability(MissionType, payload.capabilities)
-
-    local goforit = specialpayload or (specialpayload==nil and compatible)
-
-    if payload.aircrafttype==UnitType and payload.navail>0 and goforit then
-      table.insert(payloads, payload)
-    end
-  end
-
-  return payloads
-end
-
 --- Fetch a payload from the airwing resources for a given unit and mission type.
 -- The payload with the highest priority is preferred.
 -- @param #AIRWING self
@@ -633,7 +591,34 @@ function AIRWING:FetchPayloadFromStock(UnitType, MissionType, Payloads)
     end
   end
 
-  local payloads=self:_FilterPlayloads(UnitType, MissionType, Payloads)
+  local function _checkPayloads(payload)
+    if Payloads then
+      for _,Payload in pairs(Payloads) do
+        if Payload.uid==payload.uid then
+          return true
+        end
+      end
+    else
+      -- Payload was not specified.
+      return nil
+    end
+    return false
+  end
+
+  -- Pre-selection: filter out only those payloads that are valid for the airframe and mission type and are available.
+  local payloads={}
+  for _,_payload in pairs(self.payloads) do
+    local payload=_payload --#AIRWING.Payload
+
+    local specialpayload=_checkPayloads(payload)
+    local compatible=AUFTRAG.CheckMissionCapability(MissionType, payload.capabilities)
+
+    local goforit = specialpayload or (specialpayload==nil and compatible)
+
+    if payload.aircrafttype==UnitType and payload.navail>0 and goforit then
+      table.insert(payloads, payload)
+    end
+  end
 
   -- Debug.
   if self.verbose>=4 then
@@ -757,9 +742,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
 
@@ -1287,10 +1274,12 @@ 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
     

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/Auftrag.lua

@@ -192,8 +192,6 @@
 -- @field #boolean optionInvisible Invisible is on/off.
 -- @field #boolean optionImmortal Immortal is on/off.
 --
--- @field #AUFTRAG.Summary summary Auftrag summary.
---
 -- @extends Core.Fsm#FSM
 
 --- *A warrior's mission is to foster the success of others.* -- Morihei Ueshiba
@@ -658,19 +656,6 @@ AUFTRAG.Category={
 -- @field #string DAMAGED Target was damaged.
 -- @field #string DESTROYED Target was destroyed.
 
---- Mission summary.
--- @type AUFTRAG.Summary
--- @field #boolean success If true, mission was successful.
--- @field #number Ntargets0 Number of initial targets.
--- @field #number Ntargets Number of final targets after mission is done.
--- @field #number damage Target damage in per cent.
--- @field #number Ndestroyed Number of destroyed targets.
--- @field #number Nkills Number of kills from assigned groups.
--- @field #number Nelements Number of elements assigned to mission.
--- @field #number targetLife Target life points after mission is over.
--- @field #number category Target category.
--- @field #number Ncasualties Number of own casualties.
-
 --- Generic mission condition.
 -- @type AUFTRAG.Condition
 -- @field #function func Callback function to check for a condition. Should return a #boolean.
@@ -691,7 +676,7 @@ AUFTRAG.Category={
 
 --- AUFTRAG class version.
 -- @field #string version
-AUFTRAG.version="1.5.0"
+AUFTRAG.version="1.4.2"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -791,7 +776,6 @@ function AUFTRAG:New(Type)
 
   self:AddTransition("*",                      "Cancel",           AUFTRAG.Status.CANCELLED)   -- Command to cancel the mission.
 
-  self:AddTransition("*",                      "Evaluated",        "*")
   self:AddTransition("*",                      "Success",          AUFTRAG.Status.SUCCESS)
   self:AddTransition("*",                      "Failed",           AUFTRAG.Status.FAILED)
 
@@ -962,24 +946,6 @@ function AUFTRAG:New(Type)
   -- @param #string Event Event.
   -- @param #string To To state.
 
-  --- Triggers the FSM event "Evaluated".
-  -- @function [parent=#AUFTRAG] Evaluated
-  -- @param #AUFTRAG self
-  -- @param #AUFTRAG.Summary
-
-  --- Triggers the FSM event "Evaluated" after a delay.
-  -- @function [parent=#AUFTRAG] __Evaluated
-  -- @param #AUFTRAG self
-  -- @param #number delay Delay in seconds.
-  -- @param #AUFTRAG.Summary Summary Mission summary.
-
-  --- On after "Evaluated" event.
-  -- @function [parent=#AUFTRAG] OnAfterEvaluated
-  -- @param #AUFTRAG self
-  -- @param #string From From state.
-  -- @param #string Event Event.
-  -- @param #string To To state.
-  -- @param #AUFTRAG.Summary Summary Mission summary.
 
   --- Triggers the FSM event "Success".
   -- @function [parent=#AUFTRAG] Success
@@ -1785,9 +1751,6 @@ function AUFTRAG:NewBAI(Target, Altitude)
   mission.optionROE=ENUMS.ROE.OpenFire
   mission.optionROT=ENUMS.ROT.PassiveDefense
 
-  -- Evaluate result after 5 min. We might need time until the bombs have dropped and targets have been detroyed.
-  mission.dTevaluate=5*60  
-
   mission.categories={AUFTRAG.Category.AIRCRAFT}
 
   mission.DCStask=mission:GetDCSMissionTask()
@@ -2341,9 +2304,6 @@ function AUFTRAG:NewARTY(Target, Nshots, Radius, Altitude)
 
   local mission=AUFTRAG:New(AUFTRAG.Type.ARTY)
 
-  printf("FF nshots=%s", tostring(Nshots))
-  printf("FF radius=%s", tostring(Radius))
-
   mission:_TargetFromObject(Target)
 
   mission.artyShots=Nshots or nil
@@ -2447,7 +2407,7 @@ end
 -- @param #AUFTRAG self
 -- @param Ops.OpsZone#OPSZONE OpsZone The OPS zone to capture.
 -- @param #number Coalition The coalition which should capture the zone for the mission to be successful.
--- @param #number Speed (Optional) Speed in knots.
+-- @param #number Speed Speed in knots.
 -- @param #number Altitude (Optional) Altitude in feet. Only for airborne units. Default 2000 feet ASL.
 -- @param #string Formation (Optional) Formation used by ground units during patrol. Default "Off Road".
 -- @param #number StayInZoneTime Stay this many seconds in the zone when done, only then drive back.
@@ -4730,18 +4690,6 @@ function AUFTRAG:Evaluate()
     failed=false
   end
 
-  self.summary={} --#AUFTRAG.Summary
-  self.summary.success=not failed
-  self.summary.damage=targetdamage
-  self.summary.Ntargets=Ntargets
-  self.summary.Ntargets0=Ntargets0
-  self.summary.Ncasualties=self.Ncasualties
-  self.summary.Ndestroyed=self.engageTarget.Ndestroyed
-  self.summary.Nelements=self.Nelements
-  self.summary.Nkills=self.Nkills
-  self.summary.category=self.engageTarget:GetCategory()
-  self.summary.targetLife=Life
-
   -- Debug text.
   if self.verbose > 0 then
     local text=string.format("Evaluating mission:\n")
@@ -4761,9 +4709,6 @@ function AUFTRAG:Evaluate()
     self:I(self.lid..text)
   end
 
-  -- Trigger evaluated result and pass summary.
-  self:Evaluated(self.summary)
-
   -- Trigger events.
   if failed then
     self:I(self.lid..string.format("Mission %d [%s] failed!", self.auftragsnummer, self.type))
@@ -5175,6 +5120,7 @@ end
 -- FSM Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+
 --- On after "Planned" event.
 -- @param #AUFTRAG self
 -- @param #string From From state.
@@ -5484,7 +5430,7 @@ function AUFTRAG:onafterSuccess(From, Event, To)
 
     -- Stop mission.
     self:T(self.lid..string.format("Mission SUCCESS! Number of max repeats %d reached  ==> Stopping mission!", self.repeated+1))
-    self:__Stop(-120)
+    self:Stop()
 
   end
 
@@ -5526,7 +5472,7 @@ function AUFTRAG:onafterFailed(From, Event, To)
 
     -- Stop mission.
     self:T(self.lid..string.format("Mission FAILED! Number of max repeats %d reached ==> Stopping mission!", self.repeated+1))
-    self:__Stop(-120)
+    self:Stop()
 
   end
 
@@ -5639,7 +5585,6 @@ function AUFTRAG:onafterRepeat(From, Event, To)
   self.Ngroups=0
   self.Nassigned=nil
   self.Ndead=0
-  self.summary=nil
 
   -- Update DCS mission task. Could be that the initial task (e.g. for bombing) was destroyed. Then we need to update the coordinate.
   self.DCStask=self:GetDCSMissionTask()
@@ -5691,8 +5636,6 @@ function AUFTRAG:onafterStop(From, Event, To)
   -- No group data.
   self.groupdata={}
 
-  self.summary=nil
-
   -- Clear pending scheduler calls.
   self.CallScheduler:Clear()
 

Moose Development/Moose/Ops/Brigade.lua

@@ -150,9 +150,6 @@ function BRIGADE:New(WarehouseName, BrigadeName)
   -- @param Ops.ArmyGroup#ARMYGROUP ArmyGroup The ARMYGROUP on mission.
   -- @param Ops.Auftrag#AUFTRAG Mission The mission.
 
-  -- Add legion to DB
-  _DATABASE:AddLegion(self)
-
   return self
 end
 

Moose Development/Moose/Ops/Cohort.lua

@@ -1102,31 +1102,6 @@ function COHORT:CountAssets(InStock, MissionTypes, Attributes)
   return N
 end
 
---- Count available assets in legion warehouse stock. Spawned, requested and reserved assets are not counted. 
--- @param #COHORT self
--- @param #table MissionTypes (Optional) Count only assest that can perform certain mission type(s). Default is all types.
--- @param #table Attributes (Optional) Count only assest that have a certain attribute(s), e.g. `WAREHOUSE.Attribute.AIR_BOMBER`.
--- @return #number Number of assets.
-function COHORT:CountAvailableAssets(MissionTypes, Attributes)
-
-  local N=0
-  for _,_asset in pairs(self.assets) do
-    local asset=_asset --Functional.Warehouse#WAREHOUSE.Assetitem
-    
-    if not (asset.spawned or asset.requested or asset.isReserved) then
-    
-      if MissionTypes==nil or AUFTRAG.CheckMissionCapability(MissionTypes, self.missiontypes) then
-        if Attributes==nil or self:CheckAttribute(Attributes) then
-          N=N+1 --This is in stock.
-        end
-      end
-    end
-  end
-
-  return N
-end
-
-
 --- Get OPSGROUPs.
 -- @param #COHORT self
 -- @param #table MissionTypes (Optional) Count only assest that can perform certain mission type(s). Default is all types.

Moose Development/Moose/Ops/Commander.lua

@@ -2112,22 +2112,6 @@ function COMMANDER:CountAssets(InStock, MissionTypes, Attributes)
   return N
 end
 
---- Count available assets of all assigned legions, which are in stock. Spawned and reserved assets are not counted.
--- @param #COMMANDER self
--- @param #table MissionTypes (Optional) Count only assest that can perform certain mission type(s). Default is all types.
--- @param #table Attributes (Optional) Count only assest that have a certain attribute(s), e.g. `WAREHOUSE.Attribute.AIR_BOMBER`.
--- @return #number Amount of asset groups.
-function COMMANDER:CountAvailableAssets(MissionTypes, Attributes)
-
-  local N=0
-  for _,_legion in pairs(self.legions) do
-    local legion=_legion --Ops.Legion#LEGION
-    N=N+legion:CountAvailableAssets(MissionTypes, Attributes)
-  end
-
-  return N
-end
-
 --- Count assets of all assigned legions.
 -- @param #COMMANDER self
 -- @param #table MissionTypes (Optional) Count only missions of these types. Default is all types.

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
+  local nCapPoints = counttable(self.ManagedCP)
-    CAP_Wing:SetNumberCAP(self.capgrouping)
+  if nCapPoints >0 then
+    CAP_Wing:SetNumberCAP(nCapPoints,self.capgrouping)
   end
   CAP_Wing:SetCapCloseRaceTrack(true)
     

Moose Development/Moose/Ops/Fleet.lua

@@ -167,9 +167,6 @@ function FLEET:New(WarehouseName, FleetName)
   -- @param Ops.NavyGroup#NAVYGROUP NavyGroup The NAVYGROUP on mission.
   -- @param Ops.Auftrag#AUFTRAG Mission The mission.
 
-  -- Add legion to DB
-  _DATABASE:AddLegion(self)
-
   return self
 end
 

Moose Development/Moose/Ops/Flotilla.lua

@@ -73,9 +73,6 @@ function FLOTILLA:New(TemplateGroupName, Ngroups, FlotillaName)
   -- Get initial ammo.
   self.ammo=self:_CheckAmmo()
 
-  -- Add cohort to DB
-  _DATABASE:AddCohort(self)
-
   return self
 end
 

Moose Development/Moose/Ops/Intelligence.lua

@@ -350,18 +350,6 @@ INTEL.RCS_NoseOnFraction = 0.15
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Constructor
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
---- Create a new INTEL object and start the FSM.
--- @param #INTEL self
--- @return #INTEL self
-function INTEL:_UpdateAgents()
-
-  -- Filter coalition.
-  if self.coalition then
-    local coalitionname=UTILS.GetCoalitionName(self.coalition):lower()
-    self.detectionset:FilterCoalitions(coalitionname):FilterAlive():FilterOnce()
-  end
-  
-end
 
 --- Create a new INTEL object and start the FSM.
 -- @param #INTEL self
@@ -849,18 +837,6 @@ function INTEL:AddAgent(AgentGroup)
   return self
 end
 
---- Set whether the detection set, aka agents, are updated periodically. With this all alive groups of the INTEL coalition are included.
--- @param #INTEL self
--- @param #boolean switch If `true` or nil, all groups of the coalition will be added automatically to the Agent set.
--- @return #INTEL self
-function INTEL:SetAgentAuto(switch)
-  if switch==nil then 
-    switch=true 
-  end
-  self.update_detectionset=switch
-  return self
-end
-
 --- Enable or disable cluster analysis of detected targets.
 -- Targets will be grouped in coupled clusters.
 -- @param #INTEL self
@@ -1050,10 +1026,6 @@ function INTEL:onafterStatus(From, Event, To)
   -- FSM state.
   local fsmstate=self:GetState()
 
-  if self.update_detectionset then
-    self:_UpdateAgents()
-  end
-
   -- Fresh arrays.
   self.ContactsLost={}
   self.ContactsUnknown={}

Moose Development/Moose/Ops/Legion.lua

@@ -306,6 +306,7 @@ function LEGION:New(WarehouseName, LegionName)
   -- @param Ops.Cohort#COHORT Cohort The cohort the asset belongs to.
   -- @param Functional.Warehouse#WAREHOUSE.Assetitem Asset The asset that returned.
 
+
   return self
 end
 
@@ -2098,23 +2099,6 @@ function LEGION:CountAssets(InStock, MissionTypes, Attributes)
   return N
 end
 
---- Count total number of available assets in the legion stock.
--- @param #LEGION self
--- @param #table MissionTypes (Optional) Count only assest that can perform certain mission type(s). Default is all types.
--- @param #table Attributes (Optional) Count only assest that have a certain attribute(s), e.g. `GROUP.Attribute.AIR_BOMBER`.
--- @return #number Amount of asset groups in stock.
-function LEGION:CountAvailableAssets(MissionTypes, Attributes)
-
-  local N=0
-
-  for _,_cohort in pairs(self.cohorts) do
-    local cohort=_cohort --Ops.Cohort#COHORT
-    N=N+cohort:CountAvailableAssets(MissionTypes,Attributes)
-  end
-
-  return N
-end
-
 --- Get OPSGROUPs that are spawned and alive.
 -- @param #LEGION self
 -- @param #table MissionTypes (Optional) Get only assest that can perform certain mission type(s). Default is all types.

Moose Development/Moose/Ops/OpsGroup.lua

@@ -4691,7 +4691,7 @@ function OPSGROUP:_UpdateTask(Task, Mission)
           self:T(self.lid..string.format("Zone %s captured ==> Task DONE!", zoneCurr:GetName()))
           
           -- Task done.
-          if Task.StayInZoneTime and Task.StayInZoneTime>0 then
+          if Task.StayInZoneTime then
             local stay = Task.StayInZoneTime
             self:__TaskDone(stay,Task)
           else

Moose Development/Moose/Ops/Platoon.lua

@@ -72,9 +72,6 @@ function PLATOON:New(TemplateGroupName, Ngroups, PlatoonName)
   -- Get ammo.
   self.ammo=self:_CheckAmmo()
 
-  -- Add cohort to DB
-  _DATABASE:AddCohort(self)  
-
   return self
 end
 

Moose Development/Moose/Ops/Squadron.lua

@@ -116,9 +116,6 @@ function SQUADRON:New(TemplateGroupName, Ngroups, SquadronName)
 
   -- See COHORT class
 
-  -- Add cohort to DB
-  _DATABASE:AddCohort(self)
-
   return self
 end
 

Moose Development/Moose/Ops/Target.lua

@@ -153,7 +153,7 @@ _TARGETID=0
 
 --- TARGET class version.
 -- @field #string version
-TARGET.version="0.8.0"
+TARGET.version="0.7.1"
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- TODO list
@@ -206,9 +206,6 @@ function TARGET:New(TargetObject)
   self:AddTransition("*",                  "Status",              "*")           -- Status update.
   self:AddTransition("*",                  "Stop",                "Stopped")     -- Stop FSM.
   
-  self:AddTransition("*",                  "ElementDestroyed",     "*")           -- A target element was destroyed.
-  self:AddTransition("*",                  "ElementDead",          "*")           -- A target element is dead (destroyed or despawned).
-    
   self:AddTransition("*",                  "ObjectDamaged",       "*")           -- A target object was damaged.  
   self:AddTransition("*",                  "ObjectDestroyed",     "*")           -- A target object was destroyed.
   self:AddTransition("*",                  "ObjectDead",          "*")           -- A target object is dead (destroyed or despawned).
@@ -248,19 +245,6 @@ function TARGET:New(TargetObject)
   -- @param #number delay Delay in seconds.
 
 
-  --- Triggers the FSM event "ElementDestroyed".
-  -- @function [parent=#TARGET] ElementDestroyed
-  -- @param #TARGET self
-  -- @param #string ElementName Name of the element.
-  -- @param #TARGET.Object Target Target object.
-
-  --- Triggers the FSM event "ElementDead".
-  -- @function [parent=#TARGET] ElementDead
-  -- @param #TARGET self
-  -- @param #string ElementName Name of the element.
-  -- @param #TARGET.Object Target Target object.
-
-
   --- Triggers the FSM event "ObjectDamaged".
   -- @function [parent=#TARGET] ObjectDamaged
   -- @param #TARGET self
@@ -659,19 +643,6 @@ function TARGET:onafterStatus(From, Event, To)
   -- FSM state.
   local fsmstate=self:GetState()
     
-  -- First we check any target has been destroyed and the dead/unitlost event was not fired
-  for i,_target in pairs(self.targets) do
-    local target=_target --#TARGET.Object
-    local life=self:GetTargetLife(target)
-    if life<1 and target.Status~=TARGET.ObjectStatus.DEAD then
-      self:E(self.lid..string.format("FF life is zero but no object dead event fired ==> waiting for target object %s events!", tostring(target.Name)))
-      -- We wait 60 seconds for the events to occur
-      self:__Status(-60)
-      return self
-    end
-    
-  end  
-    
   -- Update damage.
   local damaged=false
   for i,_target in pairs(self.targets) do
@@ -765,61 +736,6 @@ end
 -- FSM Events
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
---- On after "ElementDestroyed" event.
--- @param #TARGET self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
--- @param #string Name Name of the element.
--- @param #TARGET.Object Target Target object.
-function TARGET:onafterElementDestroyed(From, Event, To, Name, Target)
-  -- Debug message.
-  self:T(self.lid..string.format("Element %s of target object %s destroyed", Name, Target.Name))
-  
-  -- Increase destroyed counter.
-  Target.Ndestroyed=Target.Ndestroyed+1
-  
-  -- Increase dead counter.
-  self.Ndestroyed=self.Ndestroyed+1
-  
-  self:ElementDead(Name, Target)
-  
-  return self
-end
-
-
---- On after "ElementDead" event.
--- @param #TARGET self
--- @param #string From From state.
--- @param #string Event Event.
--- @param #string To To state.
--- @param #string Name Name of the element.
--- @param #TARGET.Object Target Target object.
-function TARGET:onafterElementDead(From, Event, To, Name, Target)
-  -- Debug message.
-  self:T(self.lid..string.format("Element %s of target object %s dead", Name, Target.Name))
-  
-  -- Increase dead counter.
-  Target.Ndead=Target.Ndead+1
-  
-  -- Increase dead counter.
-  self.Ndead=self.Ndead+1
-  
-  -- All dead ==> Trigger event.
-  if Target.Ndestroyed==Target.N0 then
-      
-    self:ObjectDestroyed(Target)
-      
-  elseif Target.Ndead==Target.N0 then
-    
-    self:ObjectDead(Target)
-    
-  end
-  
-  return self
-end
-
-
 --- On after "ObjectDamaged" event.
 -- @param #TARGET self
 -- @param #string From From state.
@@ -845,6 +761,11 @@ function TARGET:onafterObjectDestroyed(From, Event, To, Target)
   -- Debug message.
   self:T(self.lid..string.format("Object %s destroyed", Target.Name))
   
+  -- Increase destroyed counter.
+  self.Ndestroyed=self.Ndestroyed+1
+  
+  Target.Ndestroyed=Target.Ndestroyed+1
+  
   Target.Life=0
   
   -- Call object dead event.
@@ -867,9 +788,15 @@ function TARGET:onafterObjectDead(From, Event, To, Target)
   -- Set target status.
   Target.Status=TARGET.ObjectStatus.DEAD
   
+  -- Increase dead object counter
+  Target.Ndead=Target.Ndead+1
+  
   -- Set target object life to 0.
   Target.Life=0
   
+  -- Increase dead counter.
+  self.Ndead=self.Ndead+1
+  
   -- Check if anyone is alive?
   local dead=true
   for _,_target in pairs(self.targets) do
@@ -962,21 +889,54 @@ function TARGET:OnEventUnitDeadOrLost(EventData)
     -- Add to the list of casualties.
     table.insert(self.casualties, Name)
         
-    -- Get target from Group or Unit.
+    -- Try to get target Group.
-    local target=self:GetTargetByName(EventData.IniGroupName) or self:GetTargetByName(EventData.IniUnitName)
+    local target=self:GetTargetByName(EventData.IniGroupName)
+    
+    -- Try unit target.
+    if not target then    
+      target=self:GetTargetByName(EventData.IniUnitName)      
+    end
     
     -- Check if we could find a target object.
     if target then
     
-      -- Increase dead/destroyed counter
+      local Ndead=target.Ndead
+      local Ndestroyed=target.Ndestroyed
       if EventData.id==EVENTS.RemoveUnit then
-        self:ElementDead(Name, target)
+        Ndead=Ndead+1
       else
-        self:ElementDestroyed(Name, target)
+        Ndestroyed=Ndestroyed+1
+        Ndead=Ndead+1
       end
       
+      
+      -- Check if ALL objects are dead
+      if Ndead==target.N0 then
+      
+        if Ndestroyed>=target.N0 then
+
+          -- Debug message.
+          self:T2(self.lid..string.format("EVENT ID=%d: target %s dead/lost ==> destroyed", EventData.id, tostring(target.Name)))
+          
+          target.Life = 0
+          
+          -- Trigger object destroyed event. This sets the Life to zero and increases Ndestroyed
+          self:ObjectDestroyed(target)
+          
         else
-      self:E(self.lid..string.format("ERROR: Could not get target from IniGroup or IniUnit name when event Dead or UnitLost occured! Stats are not correctly updated :("))
+        
+          -- Debug message.
+          self:T2(self.lid..string.format("EVENT ID=%d: target %s removed ==> dead", EventData.id, tostring(target.Name)))
+          
+          target.Life = 0
+          
+          -- Trigger object dead event.  This sets the Life to zero and increases Ndead counter
+          self:ObjectDead(target)
+        
+        end
+      
+      end
+
     end -- Event belongs to this TARGET 
     
   end

Moose Development/Moose/Wrapper/Airbase.lua

@@ -1964,25 +1964,6 @@ function AIRBASE:Register(AirbaseName)
   -- Category.
   self.category=self.descriptors and self.descriptors.category or Airbase.Category.AIRDROME
 
-  -- Get DCS object.
-  local airbase=self:GetDCSObject()
-
-  if airbase then
-    self.objectcategory=Object.getCategory(airbase)
-  else
-    self.objectcategory=Object.Category.BASE
-  end
-  
-  if self.objectcategory==Object.Category.BASE then
-    self.objectcategoryName="BASE"
-  elseif self.objectcategory==Object.Category.STATIC then
-    self.objectcategoryName="STATIC"
-  elseif self.objectcategory==Object.Category.UNIT then
-    self.objectcategoryName="UNIT"
-  else
-    self.objectcategoryName="OTHER"
-  end
-
   -- H2 is bugged
   --if self.AirbaseName == "H4" and self.descriptors == nil then
     --self:E("***** H4 on Syria map is currently bugged!")
@@ -2633,7 +2614,7 @@ function AIRBASE:GetMinimumBoundingCircleFromParkingSpots(mark)
       local spots = self:GetParkingSpotsVec2s()
       if #spots == 0 then return self.AirbaseZone  end
       local center, radius = UTILS.GetMinimumBoundingCircle(spots)
-      self.parkingCircle = ZONE_RADIUS:New(self.AirbaseName.." ParkingCircle", center, radius+50, true)
+      self.parkingCircle = ZONE_RADIUS:New(self.AirbaseName.." ParkingCircle",center,radius+50)
       if mark == true then
          self.parkingCircle:DrawZone(-1,{1,0,0},1,{0,1,0},0.2,3)
       end