From 32c9a59ff0ee785938c8b11105be1f4887e08c7c Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Fri, 14 Aug 2020 18:09:13 +0200
Subject: [PATCH] Ops

---
 Moose Development/Moose/Core/Astar.lua    |  2 +-
 Moose Development/Moose/Ops/AirWing.lua   | 65 +++++++++++++++++++----
 Moose Development/Moose/Ops/Auftrag.lua   | 65 ++++++++++++++++-------
 Moose Development/Moose/Ops/OpsGroup.lua  | 11 +++-
 Moose Development/Moose/Ops/Squadron.lua  |  5 +-
 Moose Development/Moose/Ops/Target.lua    |  6 +--
 Moose Development/Moose/Wrapper/Group.lua | 26 +++++++++
 7 files changed, 143 insertions(+), 37 deletions(-)

diff --git a/Moose Development/Moose/Core/Astar.lua b/Moose Development/Moose/Core/Astar.lua
index 984f67df0..435bec5a4 100644
--- a/Moose Development/Moose/Core/Astar.lua	
+++ b/Moose Development/Moose/Core/Astar.lua	
@@ -550,7 +550,7 @@ end
 -- @return #number Distance between the two nodes.
 function ASTAR.DistRoad(nodeA, nodeB)
 
-  local path, dist, gotpath=nodeA.coordinate:GetPathOnRoad(nodeB.coordinate,IncludeEndpoints,Railroad,MarkPath,SmokePath)
+  local path, dist, gotpath=nodeA.coordinate:GetPathOnRoad(nodeB.coordinate, IncludeEndpoints, Railroad, MarkPath, SmokePath)
   
   if gotpath then
     return dist
diff --git a/Moose Development/Moose/Ops/AirWing.lua b/Moose Development/Moose/Ops/AirWing.lua
index 0138f78b4..40e65adad 100644
--- a/Moose Development/Moose/Ops/AirWing.lua	
+++ b/Moose Development/Moose/Ops/AirWing.lua	
@@ -116,6 +116,7 @@ AIRWING = {
   squadrons      =    {},
   missionqueue   =    {},
   payloads       =    {},
+  payloadcounter =     0,
   pointsCAP      =    {},
   pointsTANKER   =    {},
   pointsAWACS    =    {},
@@ -132,6 +133,7 @@ AIRWING = {
 
 --- Payload data.
 -- @type AIRWING.Payload
+-- @field #number uid Unique payload ID.
 -- @field #string unitname Name of the unit this pylon was extracted from.
 -- @field #string aircrafttype Type of aircraft, which can use this payload.
 -- @field #table capabilities Mission types and performances for which this payload can be used.
@@ -309,7 +311,8 @@ function AIRWING:NewPayload(Unit, Npayloads, MissionTypes,  Performance)
     end
     
     -- Create payload.
-    local payload={} --#AIRWING.Payload    
+    local payload={} --#AIRWING.Payload
+    payload.uid=self.payloadcounter
     payload.unitname=Unit:GetName()
     payload.aircrafttype=Unit:GetTypeName()    
     payload.pylons=Unit:GetTemplatePayload()
@@ -343,6 +346,9 @@ function AIRWING:NewPayload(Unit, Npayloads, MissionTypes,  Performance)
     -- Add payload
     table.insert(self.payloads, payload)
     
+    -- Increase counter
+    self.payloadcounter=self.payloadcounter+1
+    
     return payload
     
   end
@@ -385,8 +391,9 @@ end
 -- @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:FetchPayloadFromStock(UnitType, MissionType)
+function AIRWING:FetchPayloadFromStock(UnitType, MissionType, Payloads)
 
   -- Quick check if we have any payloads.
   if not self.payloads or #self.payloads==0 then
@@ -427,11 +434,25 @@ function AIRWING:FetchPayloadFromStock(UnitType, MissionType)
     end
   end
 
+  local function _checkPayloads(payload)
+    if Payloads then
+      for _,Payload in pairs(Payloads) do
+        if Payload.uid==payload.id then
+          return true
+        end
+      end
+    else
+      -- Payload was not specified.
+      return true
+    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
-    if payload.aircrafttype==UnitType and self:CheckMissionCapability(MissionType, payload.capabilities) and payload.navail>0 then
+    if payload.aircrafttype==UnitType and self:CheckMissionCapability(MissionType, payload.capabilities) and payload.navail>0 and _checkPayloads(payload) then
       table.insert(payloads, payload)
     end
   end
@@ -1119,6 +1140,15 @@ function AIRWING:_GetNextMission()
   end
   table.sort(self.missionqueue, _sort)
   
+  -- Look for first mission that is SCHEDULED.
+  local importance=math.huge
+  for _,_mission in pairs(self.missionqueue) do
+    local mission=_mission --Ops.Auftrag#AUFTRAG    
+    if mission.importance<importance then
+      importance=mission.importance
+    end
+  end  
+  
   -- Current time.
   local time=timer.getAbsTime()
 
@@ -1127,7 +1157,7 @@ function AIRWING:_GetNextMission()
     local mission=_mission --Ops.Auftrag#AUFTRAG
     
     -- Firstly, check if mission is due?
-    if mission:IsQueued() and mission:IsReadyToGo() then
+    if mission:IsQueued() and mission:IsReadyToGo() and mission.importance<=importance then
         
       -- Check if airwing can do the mission and gather required assets.
       local can, assets=self:CanMission(mission)
@@ -1146,7 +1176,7 @@ function AIRWING:_GetNextMission()
           
           -- Get payload for the asset.
           if not asset.payload then
-            local payload=self:FetchPayloadFromStock(asset.unittype, mission.type)
+            local payload=self:FetchPayloadFromStock(asset.unittype, mission.type, mission.payloads)
             if payload then
               asset.payload=payload
               table.insert(gotpayload, asset.uid)
@@ -1832,8 +1862,9 @@ end
 -- @param #AIRWING self
 -- @param #table MissionTypes Types on mission to be checked. Default *all* possible types `AUFTRAG.Type`.
 -- @param #table UnitTypes Types of units.
+-- @param #table Payloads Specific payloads to be counted only.
 -- @return #number Count of available payloads in stock.
-function AIRWING:CountPayloadsInStock(MissionTypes, UnitTypes)
+function AIRWING:CountPayloadsInStock(MissionTypes, UnitTypes, Payloads)
 
   if MissionTypes then
     if type(MissionTypes)=="string" then
@@ -1860,6 +1891,20 @@ function AIRWING:CountPayloadsInStock(MissionTypes, UnitTypes)
     end
     return false
   end
+  
+  local function _checkPayloads(payload)
+    if Payloads then
+      for _,Payload in pairs(Payloads) do
+        if Payload.uid==payload.id then
+          return true
+        end
+      end
+    else
+      -- Payload was not specified.
+      return true
+    end
+    return false
+  end  
 
   local n=0
   for _,_payload in pairs(self.payloads) do
@@ -1867,7 +1912,7 @@ function AIRWING:CountPayloadsInStock(MissionTypes, UnitTypes)
     
     for _,MissionType in pairs(MissionTypes) do
     
-      if self:CheckMissionCapability(MissionType, payload.capabilities) and _checkUnitTypes(payload) then
+      if self:CheckMissionCapability(MissionType, payload.capabilities) and _checkUnitTypes(payload) and _checkPayloads(payload) then
       
         if payload.unlimited then
           -- Payload is unlimited. Return a BIG number.
@@ -1950,7 +1995,7 @@ end
 -- @param #AIRWING self
 -- @param #table MissionTypes Types on mission to be checked. Default all.
 -- @return #table Assets on pending requests.
-function AIRWING:GetAssetsOnMission(MissionTypes, IncludeQueued)
+function AIRWING:GetAssetsOnMission(MissionTypes)
   
   local assets={}
   local Np=0
@@ -2024,7 +2069,7 @@ function AIRWING:CanMission(Mission)
   local unittypes=self:GetAircraftTypes(true, squadrons)
   
   -- Count all payloads in stock.
-  local Npayloads=self:CountPayloadsInStock(Mission.type, unittypes)
+  local Npayloads=self:CountPayloadsInStock(Mission.type, unittypes, Mission.payloads)
   
   if Npayloads<Mission.nassets then
     self:I(self.lid..string.format("INFO: Not enough PAYLOADS available! Got %d but need at least %d", Npayloads, Mission.nassets))
@@ -2040,7 +2085,7 @@ function AIRWING:CanMission(Mission)
     if can then
     
       -- Number of payloads available.
-      local Npayloads=self:CountPayloadsInStock(Mission.type, squadron.aircrafttype)
+      local Npayloads=self:CountPayloadsInStock(Mission.type, squadron.aircrafttype, Mission.payloads)
       
       local assets=squadron:RecruitAssets(Mission, Npayloads)    
           
diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index d22d07960..0c01db6e3 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -30,6 +30,7 @@
 -- @field #string name Mission name.
 -- @field #number prio Mission priority.
 -- @field #boolean urgent Mission is urgent. Running missions with lower prio might be cancelled.
+-- @field #number importance Importance.
 -- @field #number Tstart Mission start time in seconds.
 -- @field #number Tstop Mission stop time in seconds.
 -- @field #number duration Mission duration in seconds.
@@ -86,7 +87,8 @@
 -- @field #number nassets Number of required assets by the Airwing.
 -- @field #number requestID The ID of the queued warehouse request. Necessary to cancel the request if the mission was cancelled before the request is processed.
 -- @field #boolean cancelContactLost If true, cancel mission if the contact is lost.
--- @field #table squadrons User specifed airwing squadrons assigned for this mission. Only these will be considered for the job!
+-- @field #table squadrons User specified airwing squadrons assigned for this mission. Only these will be considered for the job!
+-- @field #table payloads User specified airwing payloads for this mission. Only these will be considered for the job! 
 -- @field Ops.AirWing#AIRWING.PatrolData patroldata Patrol data.
 -- 
 -- @field #string missionTask Mission task. See `ENUMS.MissionTask`.
@@ -1147,7 +1149,9 @@ function AUFTRAG:NewARTY(Target, Nshots, Radius)
   mission.artyShots=Nshots or 3
   mission.artyRadius=Radius or 100
   
-  mission.optionROE=ENUMS.ROE.OpenFire
+  mission.optionROE=ENUMS.ROE.OpenFire   -- Ground/naval need open fire!
+  mission.optionAlarm=0
+  
   mission.missionFraction=0.1
   
   mission.DCStask=mission:GetDCSMissionTask()
@@ -1159,22 +1163,31 @@ end
 -- @param #AUFTRAG self
 -- @param Ops.Target#TARGET Target The target.
 -- @return #AUFTRAG self
-function AUFTRAG:NewTARGET(Target)
+function AUFTRAG:NewTargetAir(Target)
 
   local mission=nil --#AUFTRAG
   
+  self.engageTarget=Target
+  
   if Target.category==TARGET.Category.GROUND then
   
   
   elseif Target.category==TARGET.Category.AIRCRAFT then
   
+    mission=AUFTRAG:NewINTERCEPT(Target)
+  
   elseif Target.category==TARGET.Category.AIRBASE then
   
+    mission=AUFTRAG:NewBOMBRUNWAY(Airdrome,Altitude)
+  
   elseif Target.category==TARGET.Category.COORDINATE then
+  
  
   end
-
-
+  
+  local mission=self:NewAUTO()
+  
+  
   if mission then
     mission:SetPriority(10, true)
   end
@@ -1288,7 +1301,7 @@ function AUFTRAG:NewAUTO(EngageGroup)
   elseif auftrag==AUFTRAG.Type.ARTY then
     mission=AUFTRAG:NewARTY(Target)
   elseif auftrag==AUFTRAG.Type.AWACS then
-    mission=AUFTRAG:NewAWACS(Coordinate,Altitude,Speed,Heading,Leg)
+    mission=AUFTRAG:NewAWACS(Coordinate, Altitude,Speed,Heading,Leg)
   elseif auftrag==AUFTRAG.Type.BAI then
     mission=AUFTRAG:NewBAI(Target,Altitude)
   elseif auftrag==AUFTRAG.Type.BOMBING then
@@ -1336,20 +1349,6 @@ function AUFTRAG:NewAUTO(EngageGroup)
   return mission
 end
 
---- Create a mission to attack a group. Mission type is automatically chosen from the group category.
--- @param #AUFTRAG self
--- @param Ops.Target#TARGET Target Target to engage.
--- @return #AUFTRAG self
-function AUFTRAG:NewTARGET(Target)
-
-  for _,_target in pairs(Target) do
-    local target=_target --Ops.Target#TARGET.Object
-    a=target.Object
-  end
-
-  return mission
-end
-
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- User API Functions
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -1394,10 +1393,12 @@ end
 -- @param #AUFTRAG self
 -- @param #number Prio Priority 1=high, 100=low. Default 50.
 -- @param #boolean Urgent If *true*, another running mission might be cancelled if it has a lower priority.
+-- @param #number Importance Number 1-10. If missions with lower value are in the queue, these have to be finished first.
 -- @return #AUFTRAG self
 function AUFTRAG:SetPriority(Prio, Urgent)
   self.prio=Prio or 50
   self.urgent=Urgent
+  self.importance=5
   return self
 end
 
@@ -1687,6 +1688,18 @@ function AUFTRAG:AssignSquadrons(Squadrons)
   self.squadrons=Squadrons
 end
 
+--- Set the required payload for this mission.
+-- @param #AUFTRAG self
+-- @param Ops.AirWing#AIRWING.Payload Required payload 
+-- @return #AUFTRAG self
+function AUFTRAG:AddRequiredPayload(Payload)
+
+  self.payloads=self.payloads or {}
+
+  table.insert(self.payload, Payload)
+  
+end
+
 
 --- Add a Ops group to the mission.
 -- @param #AUFTRAG self
@@ -2875,12 +2888,24 @@ function AUFTRAG:GetMissionTypesText(MissionTypes)
   return text
 end
 
+--- Set the mission waypoint coordinate where the mission is executed. This is 
+-- @param #AUFTRAG self
+-- @return Core.Point#COORDINATE Coordinate where the mission is executed.
+-- @return #AUFTRAG self
+function AUFTRAG:SetMissionWaypointCoord(Coordinate)
+  self.missionWaypointCoord=Coordinate
+end
+
 --- Get coordinate of target. First unit/group of the set is used.
 -- @param #AUFTRAG self
 -- @param Wrapper.Group#GROUP group Group.
 -- @return Core.Point#COORDINATE Coordinate where the mission is executed.
 function AUFTRAG:GetMissionWaypointCoord(group)
 
+  if self.missionWaypointCoord then
+    return self.missionWaypointCoord
+  end
+
   -- Create waypoint coordinate half way between us and the target.
   local waypointcoord=group:GetCoordinate():GetIntermediateCoordinate(self:GetTargetCoordinate(), self.missionFraction)
   local alt=waypointcoord.y
diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua
index fd5f5b6f8..2d909b00b 100644
--- a/Moose Development/Moose/Ops/OpsGroup.lua	
+++ b/Moose Development/Moose/Ops/OpsGroup.lua	
@@ -1759,11 +1759,20 @@ function OPSGROUP:_GetNextMission()
   -- Current time.
   local time=timer.getAbsTime()
 
+  -- Look for first mission that is SCHEDULED.
+  local importance=math.huge
+  for _,_mission in pairs(self.missionqueue) do
+    local mission=_mission --Ops.Auftrag#AUFTRAG    
+    if mission.importance<importance then
+      importance=mission.importance
+    end
+  end
+
   -- Look for first mission that is SCHEDULED.
   for _,_mission in pairs(self.missionqueue) do
     local mission=_mission --Ops.Auftrag#AUFTRAG
     
-    if mission:GetGroupStatus(self)==AUFTRAG.Status.SCHEDULED and (mission:IsReadyToGo() or self.airwing) then
+    if mission:GetGroupStatus(self)==AUFTRAG.Status.SCHEDULED and (mission:IsReadyToGo() or self.airwing) and mission.importance<=importance then
       return mission
     end
   end
diff --git a/Moose Development/Moose/Ops/Squadron.lua b/Moose Development/Moose/Ops/Squadron.lua
index ac57544e4..2be46ec38 100644
--- a/Moose Development/Moose/Ops/Squadron.lua	
+++ b/Moose Development/Moose/Ops/Squadron.lua	
@@ -758,11 +758,12 @@ end
 --- Get assets for a mission.
 -- @param #SQUADRON self
 -- @param Ops.Auftrag#AUFTRAG Mission The mission.
+-- @param #number Nplayloads Number of payloads available.
 -- @return #table Assets that can do the required mission.
-function SQUADRON:RecruitAssets(Mission)
+function SQUADRON:RecruitAssets(Mission, Npayloads)
 
   -- Number of payloads available.
-  local Npayloads=self.airwing:CountPayloadsInStock(Mission.type, self.aircrafttype)      
+  Npayloads=Npayloads or self.airwing:CountPayloadsInStock(Mission.type, self.aircrafttype, Mission.payloads)      
 
   local assets={}
 
diff --git a/Moose Development/Moose/Ops/Target.lua b/Moose Development/Moose/Ops/Target.lua
index d2e9acc88..caa714069 100644
--- a/Moose Development/Moose/Ops/Target.lua	
+++ b/Moose Development/Moose/Ops/Target.lua	
@@ -4,7 +4,7 @@
 --
 --    * Manages target, number alive, life points, damage etc.
 --    * Events when targets are damaged or destroyed
---    * Various target objects: UNIT, GROUP, STATIC, SET_UNIT, AIRBASE, COORDINATE, SET_GROUP, SET_UNIT
+--    * Various target objects: UNIT, GROUP, STATIC, AIRBASE, COORDINATE, SET_GROUP, SET_UNIT
 --
 -- ===
 --
@@ -114,7 +114,7 @@ TARGET.version="0.0.1"
 -- TODO list
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
--- TODO: Improve airwing selection. Mostly done!
+-- TODO: A lot.
 
 -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 -- Constructor
@@ -680,7 +680,7 @@ function TARGET:GetCoordinate()
 end
 
 
---- Get target category
+--- Get target category.
 -- @param #TARGET self
 -- @param #TARGET.Object Target Target object.
 -- @return #TARGET.Category Target category.
diff --git a/Moose Development/Moose/Wrapper/Group.lua b/Moose Development/Moose/Wrapper/Group.lua
index ccd19ae60..82b0ea1c7 100644
--- a/Moose Development/Moose/Wrapper/Group.lua	
+++ b/Moose Development/Moose/Wrapper/Group.lua	
@@ -1166,6 +1166,32 @@ end
 
 do -- Is Zone methods
 
+
+--- Check if any unit of a group is inside a @{Zone}.
+-- @param #GROUP self
+-- @param Core.Zone#ZONE_BASE Zone The zone to test.
+-- @return #boolean Returns true if at least one unit is inside the zone or false if no unit is inside.
+function GROUP:IsInZone( Zone )
+  
+  if self:IsAlive() then
+  
+    for UnitID, UnitData in pairs(self:GetUnits()) do
+      local Unit = UnitData -- Wrapper.Unit#UNIT
+      
+      if Zone:IsVec3InZone(Unit:GetVec3()) then
+        return true  -- At least one unit is in the zone. That is enough.
+      else
+        -- This one is not but another could be.
+      end
+      
+    end
+    
+    return false
+  end
+  
+  return nil
+end
+
 --- Returns true if all units of the group are within a @{Zone}.
 -- @param #GROUP self
 -- @param Core.Zone#ZONE_BASE Zone The zone to test.