From 9cddca1af590c801c0e93fefacf274d4d849e955 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Tue, 8 Feb 2022 08:52:47 +0100
Subject: [PATCH] AUFTRAG and WAREHOUSE

- Added check for AUFTRAG that if it is executing and all groups are dead, it's done
- Added check in WAREHOUSE find parking that units need to be alive
---
 .../Moose/Functional/Warehouse.lua            | 27 ++++++++++++-------
 Moose Development/Moose/Ops/Auftrag.lua       | 20 ++++++++++++++
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/Moose Development/Moose/Functional/Warehouse.lua b/Moose Development/Moose/Functional/Warehouse.lua
index f38c71d8e..5b66b13d2 100644
--- a/Moose Development/Moose/Functional/Warehouse.lua	
+++ b/Moose Development/Moose/Functional/Warehouse.lua	
@@ -7850,7 +7850,9 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
       local _coord=unit:GetVec3()
       local _size=self:_GetObjectSize(unit:GetDCSObject())
       local _name=unit:GetName()
-      table.insert(obstacles, {coord=_coord, size=_size, name=_name, type="unit"})
+      if unit and unit:IsAlive() then
+        table.insert(obstacles, {coord=_coord, size=_size, name=_name, type="unit"})
+      end
     end
 
     -- Check all statics.
@@ -7892,6 +7894,9 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
 
     -- Loop over all units - each one needs a spot.
     for i=1,_asset.nunits do
+    
+      -- Asset name
+      local assetname=_asset.spawngroupname.."-"..tostring(i)
 
       -- Loop over all parking spots.
       local gotit=false
@@ -7916,13 +7921,13 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
 
             -- Spot is blocked.
             if not safe then
-              --env.info(string.format("FF asset=%s (id=%d): spot id=%d dist=%.1fm is NOT SAFE", _asset.templatename, _asset.uid, _termid, dist))
+              self:T3(self.lid..string.format("FF asset=%s (id=%d): spot id=%d dist=%.1fm is NOT SAFE", assetname, _asset.uid, _termid, dist))
               free=false
               problem=obstacle
               problem.dist=dist
               break
             else
-              --env.info(string.format("FF asset=%s (id=%d): spot id=%d dist=%.1fm is SAFE", _asset.templatename, _asset.uid, _termid, dist))
+              --env.info(string.format("FF asset=%s (id=%d): spot id=%d dist=%.1fm is SAFE", assetname, _asset.uid, _termid, dist))
             end
 
           end
@@ -7934,32 +7939,36 @@ function WAREHOUSE:_FindParkingForAssets(airbase, assets)
             table.insert(parking[_asset.uid], parkingspot)
 
             -- Debug
-            self:T(self.lid..string.format("Parking spot %d is free for asset id=%d!", _termid, _asset.uid))
+            self:T(self.lid..string.format("Parking spot %d is free for asset %s [id=%d]!", _termid, assetname, _asset.uid))
 
             -- Add the unit as obstacle so that this spot will not be available for the next unit.
-            table.insert(obstacles, {coord=_spot, size=_asset.size, name=_asset.templatename, type="asset"})
+            table.insert(obstacles, {coord=_spot, size=_asset.size, name=assetname, type="asset"})
 
             gotit=true
             break
 
           else
 
-            -- Debug output for occupied spots.
-            self:T(self.lid..string.format("Parking spot %d is occupied or not big enough!", _termid))
+            -- Debug output for occupied spots.            
             if self.Debug then
               local coord=problem.coord --Core.Point#COORDINATE
-              local text=string.format("Obstacle blocking spot #%d is %s type %s with size=%.1f m and distance=%.1f m.", _termid, problem.name, problem.type, problem.size, problem.dist)
+              local text=string.format("Obstacle %s [type=%s] blocking spot=%d! Size=%.1f m and distance=%.1f m.", problem.name, problem.type, _termid, problem.size, problem.dist)
+              self:I(self.lid..text)
               coord:MarkToAll(string.format(text))
+            else
+              self:T(self.lid..string.format("Parking spot %d is occupied or not big enough!", _termid))
             end
 
           end
 
+        else
+          self:T2(self.lid..string.format("Terminal ID=%d: type=%s not supported", parkingspot.TerminalID, parkingspot.TerminalType))
         end -- check terminal type
       end -- loop over parking spots
 
       -- No parking spot for at least one asset :(
       if not gotit then
-        self:I(self.lid..string.format("WARNING: No free parking spot for asset id=%d",_asset.uid))
+        self:I(self.lid..string.format("WARNING: No free parking spot for asset %s [id=%d]", assetname, _asset.uid))
         return nil
       end
     end -- loop over asset units
diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index 87b24efaf..f41e01e1b 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -3227,6 +3227,26 @@ function AUFTRAG:onafterStatus(From, Event, To)
       -- Cancel mission if mission targets are gone (if there were any in the beginning).
       -- TODO: I commented this out for some reason but I forgot why...
       self:Cancel()
+      
+    elseif self:IsExecuting() then
+    
+      -- Had the case that mission was in state Executing but all assigned groups were dead.
+      -- TODO: might need to loop over all assigned groups
+      if Ngroups==0 then
+        self:Done()
+      else
+        local done=true
+        for groupname,data in pairs(self.groupdata or {}) do
+          local groupdata=data --#AUFTRAG.GroupData
+          local opsgroup=groupdata.opsgroup
+          if opsgroup:IsAlive() then
+            done=false
+          end
+        end
+        if done then
+          self:Done()
+        end
+      end
             
     end