Merge branch 'FF/Ops' into FF/OpsDev

Moose Development/Moose/Wrapper/Airbase.lua

@@ -2083,8 +2083,17 @@ function AIRBASE:_InitRunways(IncludeInverse)
     local heading=math.deg(bearing)
       
     -- Data table.
-    local runway={} --#AIRBASE.Runway      
-    runway.name=string.format("%02d", tonumber(name))
+    local runway={} --#AIRBASE.Runway
+    
+    local namefromheading = math.floor(heading/10)
+
+    if self.AirbaseName == AIRBASE.Syria.Beirut_Rafic_Hariri and math.abs(namefromheading-name) > 1 then
+      runway.name=string.format("%02d", tonumber(namefromheading))
+    else
+     runway.name=string.format("%02d", tonumber(name))
+    end
+       
+    --runway.name=string.format("%02d", tonumber(name))
     runway.magheading=tonumber(runway.name)*10
     runway.heading=heading
     runway.width=width or 0

Moose Development/Moose/Wrapper/Controllable.lua

@@ -938,20 +938,22 @@ end
 -- @param #CONTROLLABLE self
 -- @param #number Frequency Radio frequency in MHz.
 -- @param #number Modulation Radio modulation. Default `radio.modulation.AM`.
+-- @param #number Power (Optional) Power of the Radio in Watts. Defaults to 10.
 -- @param #number Delay (Optional) Delay in seconds before the frequency is set. Default is immediately.
 -- @return #CONTROLLABLE self
-function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Delay )
+function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Power, Delay )
 
   local CommandSetFrequency = {
     id = 'SetFrequency',
     params = {
       frequency = Frequency * 1000000,
       modulation = Modulation or radio.modulation.AM,
+      power=Power or 10,
     },
   }
 
   if Delay and Delay > 0 then
-    SCHEDULER:New( nil, self.CommandSetFrequency, { self, Frequency, Modulation }, Delay )
+    SCHEDULER:New( nil, self.CommandSetFrequency, { self, Frequency, Modulation, Power } )
   else
     self:SetCommand( CommandSetFrequency )
   end
@@ -959,6 +961,32 @@ function CONTROLLABLE:CommandSetFrequency( Frequency, Modulation, Delay )
   return self
 end
 
+--- [AIR] Set radio frequency. See [DCS command EPLRS](https://wiki.hoggitworld.com/view/DCS_command_setFrequencyForUnit)
+-- @param #CONTROLLABLE self
+-- @param #number Frequency Radio frequency in MHz.
+-- @param #number Modulation Radio modulation. Default `radio.modulation.AM`.
+-- @param #number Power (Optional) Power of the Radio in Watts. Defaults to 10.
+-- @param #UnitID UnitID (Optional, if your object is a UNIT) The UNIT ID this is for. 
+-- @param #number Delay (Optional) Delay in seconds before the frequency is set. Default is immediately.
+-- @return #CONTROLLABLE self
+function CONTROLLABLE:CommandSetFrequencyForUnit(Frequency,Modulation,Power,UnitID,Delay)
+  local CommandSetFrequencyForUnit={
+    id='SetFrequencyForUnit',
+    params={
+        frequency=Frequency*1000000,
+        modulation=Modulation or radio.modulation.AM,
+        unitId=UnitID or self:GetID(),
+        power=Power or 10,
+    },
+  }
+  if Delay and Delay>0 then
+    SCHEDULER:New(nil,self.CommandSetFrequencyForUnit,{self,Frequency,Modulation,Power,UnitID})
+  else
+    self:SetCommand(CommandSetFrequencyForUnit)
+  end
+  return self
+end
+
 --- Set EPLRS data link on/off.
 -- @param #CONTROLLABLE self
 -- @param #boolean SwitchOnOff If true (or nil) switch EPLRS on. If false switch off.

Moose Development/Moose/Wrapper/Scenery.lua

@@ -123,16 +123,36 @@ end
 
 --- Check if SCENERY Object is alive.
 --@param #SCENERY self
+--@param #number Threshold (Optional) If given, SCENERY counts as alive above this relative life in percent (1..100).
 --@return #number life
-function SCENERY:IsAlive()
-  return self:GetLife() >= 1 and true or false
-end
+function SCENERY:IsAlive(Threshold)
+  if not Threshold then
+    return self:GetLife() >= 1 and true or false
+  else
+    return self:GetRelativeLife() > Threshold and true or false
+  end
+end 
 
 --- Check if SCENERY Object is dead.
 --@param #SCENERY self
+--@param #number Threshold (Optional) If given, SCENERY counts as dead below this relative life in percent (1..100).
 --@return #number life
-function SCENERY:IsDead()
-  return self:GetLife() < 1 and true or false
+function SCENERY:IsDead(Threshold)
+  if not Threshold then
+    return self:GetLife() < 1 and true or false
+  else
+    return self:GetRelativeLife() <= Threshold and true or false
+  end
+end 
+
+--- Get SCENERY relative life in percent, e.g. 75.
+--@param #SCENERY self
+--@return #number rlife
+function SCENERY:GetRelativeLife()
+  local life = self:GetLife()
+  local life0 = self:GetLife0()
+  local rlife = math.floor((life/life0)*100)
+  return rlife
 end
 
 --- Get the threat level of a SCENERY object. Always 0 as scenery does not pose a threat to anyone.