diff --git a/src/Perpetuum/Services/EventServices/EventProcessors/EnvironmentalEffectHandler.cs b/src/Perpetuum/Services/EventServices/EventProcessors/EnvironmentalEffectHandler.cs
index 7594a25a2..4b502437c 100644
--- a/src/Perpetuum/Services/EventServices/EventProcessors/EnvironmentalEffectHandler.cs
+++ b/src/Perpetuum/Services/EventServices/EventProcessors/EnvironmentalEffectHandler.cs
@@ -4,6 +4,7 @@
 using Perpetuum.Services.Weather;
 using Perpetuum.Zones;
 using Perpetuum.Zones.Effects.ZoneEffects;
+using System;
 using System.Collections.Generic;
 
 namespace Perpetuum.Services.EventServices.EventProcessors
@@ -17,36 +18,35 @@ public class EnvironmentalEffectHandler : EventProcessor
         private WeatherInfo _weatherState;
         private GameTimeInfo _gameTime;
         private ZoneEffect _currentEffect;
-        private readonly EffectType[] _effectTypes = new EffectType[] {
-            EffectType.effect_day,
-            EffectType.effect_day_clear,
-            EffectType.effect_day_overcast,
-            EffectType.effect_night,
-            EffectType.effect_night_clear,
-            EffectType.effect_night_overcast,
-            EffectType.effect_weather_good,
-            EffectType.effect_weather_bad
-        };
-        private readonly IDictionary<EffectType, ZoneEffect> _effects = new Dictionary<EffectType, ZoneEffect>();
+        private readonly IDictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect> _effects = new Dictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect>();
+
         public EnvironmentalEffectHandler(IZone zone)
         {
             _zone = zone;
-            _effects = InitEffectCollection(_effectTypes);
+            _effects = InitEffectCollection();
         }
 
-        private IDictionary<EffectType, ZoneEffect> InitEffectCollection(EffectType[] effectTypes)
+        private IDictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect> InitEffectCollection()
         {
-            var dict = new Dictionary<EffectType, ZoneEffect>();
-            foreach (var effType in effectTypes)
+            var dict = new Dictionary<Tuple<GameTimeInfo.DayState, WeatherInfo.WeatherState>, ZoneEffect>()
             {
-                dict.Add(effType, new ZoneEffect(_zone.Id, effType, true));
-            }
+                { Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.NEUTRAL_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day, true) },
+                { Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day_clear, true) },
+                { Tuple.Create(GameTimeInfo.DayState.DAY, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_day_overcast, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.NEUTRAL_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night_clear, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NIGHT, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_night_overcast, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.GOOD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_weather_good, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.BAD_WEATHER), new ZoneEffect(_zone.Id, EffectType.effect_weather_bad, true) },
+                { Tuple.Create(GameTimeInfo.DayState.NEUTRAL, WeatherInfo.WeatherState.NEUTRAL_WEATHER), null }
+            };
             return dict;
         }
 
-        private ZoneEffect GetEffect(EffectType type)
+        private ZoneEffect GetEffect(GameTimeInfo.DayState dayState, WeatherInfo.WeatherState weatherState)
         {
-            if (_effects.TryGetValue(type, out ZoneEffect effect))
+            var lookupEffect = Tuple.Create(dayState, weatherState);
+            if (_effects.TryGetValue(lookupEffect, out ZoneEffect effect))
             {
                 return effect;
             }
@@ -58,48 +58,7 @@ private void OnStateChange()
             if (_gameTime == null || _weatherState == null)
                 return;
 
-            ZoneEffect nextEffect = null;
-            if (_gameTime.IsDay)
-            {
-                if (_weatherState.IsGoodWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_day_clear);
-                }
-                else if (_weatherState.IsBadWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_day_overcast);
-                }
-                else
-                {
-                    nextEffect = GetEffect(EffectType.effect_day);
-                }
-            }
-            else if (_gameTime.IsNight)
-            {
-                if (_weatherState.IsGoodWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_night_clear);
-                }
-                else if (_weatherState.IsBadWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_night_overcast);
-                }
-                else
-                {
-                    nextEffect = GetEffect(EffectType.effect_night);
-                }
-            }
-            else
-            {
-                if (_weatherState.IsGoodWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_weather_good);
-                }
-                else if (_weatherState.IsBadWeather)
-                {
-                    nextEffect = GetEffect(EffectType.effect_weather_bad);
-                }
-            }
+            var nextEffect = GetEffect(_gameTime.GetDayState(), _weatherState.getWeatherState());
 
             var isSameEffect = ReferenceEquals(_currentEffect, nextEffect) ||
                 (_currentEffect != null && _currentEffect.Equals(nextEffect));
diff --git a/src/Perpetuum/Services/GameTime/GameTimeInfo.cs b/src/Perpetuum/Services/GameTime/GameTimeInfo.cs
index 45d5f7300..a1d5f6460 100644
--- a/src/Perpetuum/Services/GameTime/GameTimeInfo.cs
+++ b/src/Perpetuum/Services/GameTime/GameTimeInfo.cs
@@ -33,19 +33,26 @@ public GameTimeInfo(int gameTime)
             GameTimeStamp = gameTime;
         }
 
-        public bool IsDay
+        public enum DayState
         {
-            get
-            {
-                return GameTimeStamp > DAY_START && GameTimeStamp < DAY_END;
-            }
+            DAY,
+            NEUTRAL,
+            NIGHT
         }
 
-        public bool IsNight
+        public DayState GetDayState()
         {
-            get
+            if (GameTimeStamp > DAY_START && GameTimeStamp < DAY_END)
+            {
+                return DayState.DAY;
+            } 
+            else if (GameTimeStamp > NIGHT_START || GameTimeStamp < NIGHT_END)
+            {
+                return DayState.NIGHT;
+            } 
+            else
             {
-                return GameTimeStamp > NIGHT_START || GameTimeStamp < NIGHT_END;
+                return DayState.NEUTRAL;
             }
         }
     }
diff --git a/src/Perpetuum/Services/Weather/WeatherInfo.cs b/src/Perpetuum/Services/Weather/WeatherInfo.cs
index 40b336e20..859c558cd 100644
--- a/src/Perpetuum/Services/Weather/WeatherInfo.cs
+++ b/src/Perpetuum/Services/Weather/WeatherInfo.cs
@@ -47,19 +47,26 @@ public override string ToString()
             return sb.ToString();
         }
 
-        public bool IsBadWeather
+        public enum WeatherState
         {
-            get
-            {
-                return Current > BAD_WEATHER && Next > BAD_WEATHER;
-            }
+            GOOD_WEATHER,
+            NEUTRAL_WEATHER,
+            BAD_WEATHER
         }
 
-        public bool IsGoodWeather
+        public WeatherState getWeatherState()
         {
-            get
+            if(Current > BAD_WEATHER && Next > BAD_WEATHER)
+            {
+                return WeatherState.BAD_WEATHER;
+            } 
+            else if (Current < GOOD_WEATHER && Next < GOOD_WEATHER)
+            {
+                return WeatherState.GOOD_WEATHER;
+            }
+            else
             {
-                return Current < GOOD_WEATHER && Next < GOOD_WEATHER;
+                return WeatherState.NEUTRAL_WEATHER;
             }
         }
     }