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

FlightControl-Master · Aug 18, 2024 · 4bd36a4 · 4bd36a4
2 parents 2836d7a + e746617
commit 4bd36a4
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua
@@ -27,7 +27,7 @@
 --   * @{#SET_CARGO}: Defines a collection of @{Cargo.Cargo}s filtered by filter criteria.
 --   * @{#SET_ZONE}: Defines a collection of @{Core.Zone}s filtered by filter criteria.
 --   * @{#SET_SCENERY}: Defines a collection of @{Wrapper.Scenery}s added via a filtered @{#SET_ZONE}.
---   * @{#SET_DYNAMICCARGO}: Defines a collection of @{Wrapper.DynamicCargo}s added via a filtered @{#SET_ZONE}.
+--   * @{#SET_DYNAMICCARGO}: Defines a collection of @{Wrapper.DynamicCargo}s filtered by filter criteria.
 --
 -- These classes are derived from @{#SET_BASE}, which contains the main methods to manage the collections.
 --

diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua
@@ -2137,7 +2137,7 @@ function ATIS:onafterBroadcast( From, Event, To )
   local cloudbase = clouds.base
   local cloudceil = clouds.base + clouds.thickness
   local clouddens = clouds.density
-
+    
   -- Cloud preset (DCS 2.7)
   local cloudspreset = clouds.preset or "Nothing"
 
@@ -2168,6 +2168,39 @@ function ATIS:onafterBroadcast( From, Event, To )
     else
       precepitation = 3 -- snow
     end
+  elseif cloudspreset:find( "RainyPreset4" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset5" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+  elseif cloudspreset:find( "RainyPreset6" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
+    -- NEWRAINPRESET4
+  elseif cloudspreset:find( "NEWRAINPRESET4" ) then
+    -- Overcast + Rain
+    clouddens = 5
+    if temperature > 5 then
+      precepitation = 1 -- rain
+    else
+      precepitation = 3 -- snow
+    end
   elseif cloudspreset:find( "RainyPreset" ) then
     -- Overcast + Rain
     clouddens = 9

diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua
@@ -2935,8 +2935,8 @@ function CTLD:_FindCratesNearby( _group, _unit, _dist, _ignoreweight)
       local agl = staticpos.y-landheight
       agl = UTILS.Round(agl,2)
       local GCloaded = agl > 0 and true or false
-      if IsNoHook == true then GCloaded = false end
-      --]]
+	    if IsNoHook == true then GCloaded = false end
+	    --]]
       --- Testing
       local distance = self:_GetDistance(location,staticpos)
       --self:T({name=static:GetName(),IsHook=IsHook,agl=agl,GCloaded=GCloaded,distance=string.format("%.2f",distance or 0)})