OPS

Moose Development/Moose/Ops/OpsGroup.lua

@@ -90,6 +90,7 @@
 -- @field #OPSGROUP.Spot spot Laser and IR spot.
 -- 
 -- @field #OPSGROUP.Ammo ammo Initial ammount of ammo.
+-- @field #OPSGROUP.WeaponData weaponData Weapon data table with key=BitType.
 -- 
 -- @extends Core.Fsm#FSM
 
@@ -144,6 +145,7 @@ OPSGROUP = {
   callsign           =    {},
   Ndestroyed         =     0,
   Nkills             =     0,
+  weaponData         =    {},
 }
 
 
@@ -601,14 +603,14 @@ end
 
 --- Add a weapon range for ARTY auftrag. 
 -- @param #OPSGROUP self
--- @param #number RangeMin Minimum range in kilometers. Default 0 km.
+-- @param #number RangeMin Minimum range in nautical miles. Default 0 NM.
--- @param #number RangeMax Maximum range in kilometers. Default 10 km.
+-- @param #number RangeMax Maximum range in nautical miles. Default 10 NM.
 -- @param #number BitType Bit mask of weapon type for which the given min/max ranges apply. Default is `ENUMS.WeaponFlag.Auto`, i.e. for all weapon types.
 -- @return #OPSGROUP self
 function OPSGROUP:AddWeaponRange(RangeMin, RangeMax, BitType)
 
-  RangeMin=(RangeMin or 0)*1000
+  RangeMin=UTILS.NMToMeters(RangeMin or 0)
-  RangeMax=(RangeMax or 10)*1000
+  RangeMax=UTILS.NMToMeters(RangeMax or 10)
 
   local weapon={} --#OPSGROUP.WeaponData
 

Moose Development/Moose/Utilities/Utils.lua

@@ -324,18 +324,34 @@ UTILS.MetersToNM = function(meters)
   return meters/1852
 end
 
+UTILS.KiloMetersToNM = function(kilometers)
+  return kilometers/1852*1000
+end
+
 UTILS.MetersToSM = function(meters)
   return meters/1609.34
 end
 
+UTILS.KiloMetersToSM = function(kilometers)
+  return kilometers/1609.34*1000
+end
+
 UTILS.MetersToFeet = function(meters)
   return meters/0.3048
 end
 
+UTILS.KiloMetersToFeet = function(kilometers)
+  return kilometers/0.3048*1000
+end
+
 UTILS.NMToMeters = function(NM)
   return NM*1852
 end
 
+UTILS.NMToKiloMeters = function(NM)
+  return NM*1852/1000
+end
+
 UTILS.FeetToMeters = function(feet)
   return feet*0.3048
 end