Merge branch 'develop' into FF/Ops

Moose Development/Moose/Wrapper/Controllable.lua

@@ -3687,3 +3687,57 @@ function CONTROLLABLE:OptionAAAttackRange(range)
   end
   return nil
 end
+
+--- Defines the range at which a GROUND unit/group is allowed to use its weapons automatically.
+-- @param #CONTROLLABLE self
+-- @param #number EngageRange Engage range limit in percent (a number between 0 and 100). Default 100.
+-- @return #CONTROLLABLE self
+function CONTROLLABLE:OptionEngageRange(EngageRange)
+  self:F2( { self.ControllableName } ) 
+  -- Set default if not specified.
+  EngageRange=EngageRange or 100
+  if EngageRange < 0  or EngageRange > 100 then
+    EngageRange = 100
+  end
+  local DCSControllable = self:GetDCSObject()
+  if DCSControllable then
+    local Controller = self:_GetController()
+    if Controller then 
+     if self:IsGround() then
+        self:SetOption(AI.Option.Ground.id.AC_ENGAGEMENT_RANGE_RESTRICTION, EngageRange)     
+     end
+    end
+   return self
+  end
+  return nil
+end
+
+--- (GROUND) Relocate controllable to a random point within a given radius; use e.g.for evasive actions; Note that not all ground controllables can actually drive, also the alarm state of the controllable might stop it from moving.
+-- @param #CONTROLLABLE self
+-- @param  #number speed Speed of the controllable, default 20
+-- @param  #number radius Radius of the relocation zone, default 500
+-- @param  #boolean onroad If true, route on road (less problems with AI way finding), default true
+-- @param  #boolean shortcut If true and onroad is set, take a shorter route - if available - off road, default false
+function CONTROLLABLE:RelocateGroundRandomInRadius(speed, radius, onroad, shortcut)
+  self:F2( { self.ControllableName } ) 
+
+    local _coord = self:GetCoordinate() 
+    local _radius = radius or 500
+    local _speed = speed or 20
+    local _tocoord = _coord:GetRandomCoordinateInRadius(_radius,100)
+    local _onroad = onroad or true
+    local _grptsk = {}
+    local _candoroad = false
+    local _shortcut = shortcut or false
+    
+    -- create a DCS Task an push it on the group
+    -- TaskGroundOnRoad(ToCoordinate,Speed,OffRoadFormation,Shortcut,FromCoordinate,WaypointFunction,WaypointFunctionArguments)
+    if onroad then
+      _grptsk, _candoroad = self:TaskGroundOnRoad(_tocoord,_speed,"Off Road",_shortcut)
+      self:Route(_grptsk,5)
+    else
+      self:TaskRouteToVec2(_tocoord:GetVec2(),_speed,"Off Road")
+    end
+
+  return self    
+end

Moose Development/Moose/Wrapper/Positionable.lua

@@ -598,16 +598,16 @@ function POSITIONABLE:GetHeading()
   if DCSPositionable then
 
     local PositionablePosition = DCSPositionable:getPosition()
-    
+
     if PositionablePosition then
       local PositionableHeading = math.atan2( PositionablePosition.x.z, PositionablePosition.x.x )
-      
+
       if PositionableHeading < 0 then
         PositionableHeading = PositionableHeading + 2 * math.pi
       end
-      
+
       PositionableHeading = PositionableHeading * 180 / math.pi
-      
+
       return PositionableHeading
     end
   end
@@ -1446,6 +1446,7 @@ do -- Cargo
           ["Dry-cargo ship-2"] =  70000,
           ["Higgins_boat"]     =   3700, -- Higgins Boat can load 3700 kg of general cargo or 36 men (source wikipedia).
           ["USS_Samuel_Chase"] =  25000, -- Let's say 25 tons for now. Wiki says 33 Higgins boats, which would be 264 tons (can't be right!) and/or 578 troops.
+          ["LST_Mk2"]          =2100000, -- Can carry 2100 tons according to wiki source!
         }
         self.__.CargoBayWeightLimit = ( Weights[Desc.typeName] or 50000 )
 
@@ -1453,48 +1454,55 @@ do -- Cargo
         local Desc = self:GetDesc()
 
         local Weights = {
-          ["M1126 Stryker ICV"] = 9,
-          ["M-113"] = 9,
           ["AAV7"] = 25,
-          ["M2A1_halftrack"] = 9,
-          ["BMD-1"] = 9,
+          ["Bedford_MWD"] = 8, -- new by kappa
+          ["Blitz_36-6700A"] = 10, -- new by kappa
+          ["BMD-1"] = 9,  -- IRL should be 4 passengers
           ["BMP-1"] = 8,
           ["BMP-2"] = 7,
-          ["BMP-3"] = 8,
+          ["BMP-3"] = 8,  -- IRL should be 7+2 passengers
           ["Boman"] = 25,
-          ["BTR-80"] = 9,
-          ["BTR_D"] = 12,
+          ["BTR-80"] = 9, -- IRL should be 7 passengers
+          ["BTR-82A"] = 9, -- new by kappa -- IRL should be 7 passengers
+          ["BTR_D"] = 12,  -- IRL should be 10 passengers
           ["Cobra"] = 8,
+          ["Land_Rover_101_FC"] = 11, -- new by kappa
+          ["Land_Rover_109_S3"] = 7, -- new by kappa
           ["LAV-25"] = 6,
           ["M-2 Bradley"] = 6,
           ["M1043 HMMWV Armament"] = 4,
           ["M1045 HMMWV TOW"] = 4,
           ["M1126 Stryker ICV"] = 9,
           ["M1134 Stryker ATGM"] = 9,
+          ["M2A1_halftrack"] = 9,
+          ["M-113"] = 9,   -- IRL should be 11 passengers
           ["Marder"] = 6,
-          ["MCV-80"] = 9,
+          ["MCV-80"] = 9, -- IRL should be 7 passengers
           ["MLRS FDDM"] = 4,
-          ["MTLB"] = 25,
-          ["TPZ"] = 10,
-          ["Ural-4320 APA-5D"] = 10,
+          ["MTLB"] = 25,    -- IRL should be 11 passengers
           ["GAZ-66"] = 8,
           ["GAZ-3307"] = 12,
           ["GAZ-3308"] = 14,
-          ["Tigr_233036"] = 6,
+          ["Grad_FDDM"] = 6, -- new by kappa
           ["KAMAZ Truck"] = 12,
           ["KrAZ6322"] = 12,
           ["M 818"] = 12,
+          ["Tigr_233036"] = 6,
+          ["TPZ"] = 10,
+          ["UAZ-469"] = 4, -- new by kappa
           ["Ural-375"] = 12,
           ["Ural-4320-31"] = 14,
+          ["Ural-4320 APA-5D"] = 10,
           ["Ural-4320T"] = 14,
+          ["ZBD04A"] = 7, -- new by kappa
         }
 
         local CargoBayWeightLimit = ( Weights[Desc.typeName] or 0 ) * 95
-        
+
         self.__.CargoBayWeightLimit = CargoBayWeightLimit
       end
     end
-    
+
     self:F({CargoBayWeightLimit = self.__.CargoBayWeightLimit})
   end
 end --- Cargo