From d497bb25f3c3d825e8fd11348543545ea3c373f9 Mon Sep 17 00:00:00 2001
From: Frank <frank@inter-zone.de>
Date: Fri, 18 Sep 2020 18:07:10 +0200
Subject: [PATCH] Ops

---
 Moose Development/Moose/Core/Point.lua   | 48 +++++++++++++++++++-
 Moose Development/Moose/Ops/Auftrag.lua  | 10 ++++-
 Moose Development/Moose/Ops/OpsGroup.lua |  2 +-
 Moose Development/Moose/Ops/Target.lua   | 56 +++++++++++++++++++++++-
 4 files changed, 110 insertions(+), 6 deletions(-)

diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua
index 8d4bf015c..6c9975ff1 100644
--- a/Moose Development/Moose/Core/Point.lua	
+++ b/Moose Development/Moose/Core/Point.lua	
@@ -389,7 +389,7 @@ do -- COORDINATE
   -- @return #boolean True if units were found.
   -- @return #boolean True if statics were found.
   -- @return #boolean True if scenery objects were found.
-  -- @return #table Table of MOOSE @[#Wrapper.Unit#UNIT} objects found.
+  -- @return #table Table of MOOSE @{Wrapper.Unit#UNIT} objects found.
   -- @return #table Table of DCS static objects found.
   -- @return #table Table of DCS scenery objects found.
   function COORDINATE:ScanObjects(radius, scanunits, scanstatics, scanscenery)
@@ -477,7 +477,7 @@ do -- COORDINATE
     end
     for _,scenery in pairs(Scenery) do
       self:T(string.format("Scan found scenery %s typename=%s", scenery:getName(), scenery:getTypeName()))
-      SCENERY:Register(scenery:getName(), scenery)
+      --SCENERY:Register(scenery:getName(), scenery)
     end
     
     return gotunits, gotstatics, gotscenery, Units, Statics, Scenery
@@ -522,7 +522,51 @@ do -- COORDINATE
   
     return umin
   end  
+
+  --- Scan/find SCENERY objects within a certain radius around the coordinate using the world.searchObjects() DCS API function.
+  -- @param #COORDINATE self
+  -- @param #number radius (Optional) Scan radius in meters. Default 100 m.
+  -- @return table Set of scenery objects.
+  function COORDINATE:ScanScenery(radius)
   
+    local _,_,_,_,_,scenerys=self:ScanObjects(radius, false, false, true)
+        
+    local set={}
+    
+    for _,_scenery in pairs(scenerys) do
+      local scenery=_scenery --DCS#Object
+      
+      local name=scenery:getName()
+      local s=SCENERY:Register(name, scenery)
+      table.insert(set, s)
+
+    end
+  
+    return set
+  end  
+
+  --- Find the closest scenery to the COORDINATE within a certain radius. 
+  -- @param #COORDINATE self
+  -- @param #number radius Scan radius in meters. Default 100 m.
+  -- @return Wrapper.Scenery#SCENERY The closest scenery or #nil if no object is inside the given radius.
+  function COORDINATE:FindClosestScenery(radius)
+  
+    local sceneries=self:ScanScenery(radius)
+    
+    local umin=nil --Wrapper.Scenery#SCENERY
+    local dmin=math.huge
+    for _,_scenery in pairs(sceneries) do
+      local scenery=_scenery --Wrapper.Scenery#SCENERY
+      local coordinate=scenery:GetCoordinate()
+      local d=self:Get2DDistance(coordinate)
+      if d<dmin then
+        dmin=d
+        umin=scenery
+      end
+    end    
+  
+    return umin
+  end  
  
   --- Calculate the distance from a reference @{#COORDINATE}.
   -- @param #COORDINATE self
diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua
index 3bffa6b66..affd7e1b3 100644
--- a/Moose Development/Moose/Ops/Auftrag.lua	
+++ b/Moose Development/Moose/Ops/Auftrag.lua	
@@ -2795,7 +2795,15 @@ function AUFTRAG:_TargetFromObject(Object)
 
   if not self.engageTarget then
   
-    self.engageTarget=TARGET:New(Object)
+    if Object:IsInstanceOf("TARGET") then
+    
+      self.engageTarget=Object
+    
+    else
+  
+      self.engageTarget=TARGET:New(Object)
+      
+    end
 
   else
   
diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua
index 800ca42bf..ade31b594 100644
--- a/Moose Development/Moose/Ops/OpsGroup.lua	
+++ b/Moose Development/Moose/Ops/OpsGroup.lua	
@@ -3543,7 +3543,7 @@ end
 
 --- Set the default ROT for the group. This is the ROT state gets when the group is spawned or to which it defaults back after a mission.
 -- @param #OPSGROUP self
--- @param #number rot ROT of group. Default is ENUMS.ROT.PassiveDefense.
+-- @param #number rot ROT of group. Default is `ENUMS.ROT.PassiveDefense`.
 -- @return #OPSGROUP self
 function OPSGROUP:SetDefaultROT(rot)
   self.optionDefault.ROT=rot or ENUMS.ROT.PassiveDefense
diff --git a/Moose Development/Moose/Ops/Target.lua b/Moose Development/Moose/Ops/Target.lua
index 233558e8b..b6f9c396c 100644
--- a/Moose Development/Moose/Ops/Target.lua	
+++ b/Moose Development/Moose/Ops/Target.lua	
@@ -58,14 +58,17 @@ TARGET = {
 
 --- Type.
 -- @type TARGET.ObjectType
+-- @field #string GROUP Target is a GROUP object.
 -- @field #string UNIT Target is a UNIT object.
 -- @field #string STATIC Target is a STATIC object.
+-- @field #string SCENERY Target is a SCENERY object.
 -- @field #string COORDINATE Target is a COORDINATE.
 -- @field #string AIRBASE Target is an AIRBASE.
 TARGET.ObjectType={
   GROUP="Group",
   UNIT="Unit",
   STATIC="Static",
+  SCENERY="Scenery",
   COORDINATE="Coordinate",
   AIRBASE="Airbase",
 }
@@ -491,7 +494,20 @@ function TARGET:_AddObject(Object)
       
       self.Ntargets0=self.Ntargets0+1
     end
+
+  elseif Object:IsInstanceOf("SCENERY") then
+  
+    local scenery=Object --Wrapper.Scenery#SCENERY
     
+    target.Type=TARGET.ObjectType.SCENERY
+    target.Name=scenery:GetName()
+    
+    target.Coordinate=scenery:GetCoordinate()
+
+    target.Life0=1
+    target.Life=1
+    
+    self.Ntargets0=self.Ntargets0+1
 
   elseif Object:IsInstanceOf("AIRBASE") then
   
@@ -518,9 +534,19 @@ function TARGET:_AddObject(Object)
 
     target.Life0=1
     target.Life=1
+      
+  elseif Object:IsInstanceOf("ZONE_BASE") then
+  
+    local zone=Object --Core.Zone#ZONE_BASE
+    Object=zone:GetCoordinate()
     
-    -- TODO: does this make sense for a coordinate?
-    --self.Ntargets0=self.Ntargets0+1
+    target.Type=TARGET.ObjectType.COORDINATE
+    target.Name=zone:GetName()
+    
+    target.Coordinate=Object
+
+    target.Life0=1
+    target.Life=1
   
   else
     self:E(self.lid.."ERROR: Unknown object type!")
@@ -604,6 +630,14 @@ function TARGET:GetTargetLife(Target)
     else
       return 0
     end
+
+  elseif Target.Type==TARGET.ObjectType.SCENERY then
+  
+    if Target.Status==TARGET.ObjectStatus.ALIVE then
+      return 1
+    else
+      return 0
+    end
     
   elseif Target.Type==TARGET.ObjectType.AIRBASE then
   
@@ -669,6 +703,14 @@ function TARGET:GetTargetVec3(Target)
     if object and object:IsAlive() then
       return object:GetVec3()
     end
+
+  elseif Target.Type==TARGET.ObjectType.SCENERY then
+  
+    local object=Target.Object --Wrapper.Scenery#SCENERY
+  
+    if object then
+      return object:GetVec3()
+    end
     
   elseif Target.Type==TARGET.ObjectType.AIRBASE then
   
@@ -840,6 +882,10 @@ function TARGET:GetTargetCategory(Target)
   elseif Target.Type==TARGET.ObjectType.STATIC then
   
     return TARGET.Category.GROUND
+    
+  elseif Target.Type==TARGET.ObjectType.SCENERY then
+  
+    return TARGET.Category.GROUND
       
   elseif Target.Type==TARGET.ObjectType.AIRBASE then
   
@@ -943,6 +989,12 @@ function TARGET:CountTargets()
       if target and target:IsAlive() then
         N=N+1
       end
+
+    elseif Target.Type==TARGET.ObjectType.SCENERY then
+    
+      if Target.Status==TARGET.ObjectStatus.ALIVE then
+        N=N+1
+      end
       
     elseif Target.Type==TARGET.ObjectType.AIRBASE then