More improvements to Good Morning routine

packages/lighting_and_scenes.yaml

@@ -1185,9 +1185,16 @@ script:
         target:
           entity_id: input_boolean.master_bedroom_sleeping
       - if:
-        - condition: numeric_state
+        - condition: template
-          entity_id: sensor.pirateweather_cloud_coverage
+          value_template: >
-          above: 50
+            {% set weather = states('weather.iron_nerd_weather_station') %}
+            {% if weather in ['cloudy','partlycloudy','rainy','snowy','hail','lightning','lightning-rainy','pouring','snowy-rainy'] %}
+              true
+            {% elif (states('sensor.pirateweather_cloud_coverage') | int) > 50 %}
+              true
+            {% else %}
+              false
+            {% endif %}
         then:
         - if:
           - condition: template