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

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.
 --

Moose Development/Moose/Ops/ATIS.lua

@@ -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