Merge remote-tracking branch 'origin/master' into develop

Moose Development/Moose/Core/Set.lua

@@ -7835,12 +7835,15 @@ do -- SET_SCENERY
   end
   
   --- Calculate current relative lifepoints of the SET objects, i.e. Life divided by Life0 as percentage value, eg 75 meaning 75% alive. 
-  -- **CAVEAT**: Some objects change their life value or "hitpoints" **after** the first hit. Be aware that thus the relative life value might be > 100 after a hit.
+  -- **CAVEAT**: Some objects change their life value or "hitpoints" **after** the first hit. Hence we will adjust the Life0 value to 120% 
+  -- of the last life value if life exceeds life0 ata any point.
+  -- Thus will will get a smooth percentage decrease, if you use this e.g. as success criteria for a bombing task.
   -- @param #SET_SCENERY self
   -- @return #number LifePoints
   function SET_SCENERY:GetRelativeLife()
-    local life0 = self:GetLife0()
     local life = self:GetLife()
+    local life0 = self:GetLife0()
+    self:T3(string.format("Set Lifepoints: %d life0 | %d life",life0,life))
     local rlife = math.floor((life / life0) * 100)
     return rlife
   end

Moose Development/Moose/Wrapper/Scenery.lua

@@ -63,12 +63,18 @@ function SCENERY:GetDCSObject()
 end
 
 --- Get current life points from the SCENERY Object.
+--  **CAVEAT**: Some objects change their life value or "hitpoints" **after** the first hit. Hence we will adjust the life0 value to 120% 
+--  of the last life value if life exceeds life0 (initial life) at any point. Thus will will get a smooth percentage decrease, if you use this e.g. as success 
+--  criteria for a bombing task.
 --@param #SCENERY self
 --@return #number life
 function SCENERY:GetLife()
   local life = 0
   if self.SceneryObject then
     life = self.SceneryObject:getLife()
+    if life > self.Life0 then
+      self.Life0 = math.floor(life * 1.2)
+    end
   end
   return life
 end
@@ -110,11 +116,13 @@ end
 --@param #number Radius (optional) Search radius around coordinate, defaults to 100
 --@return #SCENERY Scenery Object or `nil` if it cannot be found
 function SCENERY:FindByName(Name, Coordinate, Radius)
-   
+  
   local radius = Radius or 100
   local name = Name or "unknown"
   local scenery = nil
   
+  BASE:T({name, radius, Coordinate:GetVec2()})
+  
   ---
   -- @param Core.Point#COORDINATE coordinate
   -- @param #number radius
@@ -170,6 +178,7 @@ function SCENERY:FindByZoneName( ZoneName )
   zone = ZONE:FindByName(ZoneName) 
   end
   local _id = zone:GetProperty('OBJECT ID')
+  BASE:T("Object ID ".._id)
   if not _id then
     -- this zone has no object ID
     BASE:E("**** Zone without object ID: "..ZoneName.." | Type: "..tostring(zone.ClassName))
@@ -235,4 +244,4 @@ end
 --@return #SCENERY self
 function SCENERY:Destroy()
   return self
-end
+end