Initial Presets & Color reset fix

SebasCapo · Nov 29, 2021 · f4f9324 · f4f9324
1 parent deea627
commit f4f9324
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/Lights/Configs/Presets.cs b/Lights/Configs/Presets.cs
@@ -40,12 +40,6 @@ public class Presets
         [Description("How many times this plugin will loop through the preset order.")]
         public uint LoopCount { get; set; } = 5;
 
-        /// <summary>
-        /// Gets or sets the minimum amount of time until presets begin getting looped through.
-        /// </summary>
-        [Description("The delay until the plugin begins going through the presets.")]
-        public float InitialDelay { get; set; } = 32;
-
         /// <summary>
         /// Gets or sets the minimum amount of time that will pass until next preset is ran.
         /// </summary>
@@ -58,11 +52,23 @@ public class Presets
         [Description("The maximum amount of time that might pass until next preset is ran.")]
         public float TimeBetweenMax { get; set; } = 82;
 
+        /// <summary>
+        /// Gets or sets the minimum amount of time until presets begin getting looped through.
+        /// </summary>
+        [Description("The delay until the plugin begins going through the presets.")]
+        public float InitialDelay { get; set; } = 32;
+
+        /// <summary>
+        /// Gets or sets a list of presets, one of which will be selected as the first preset ran, taking from <see cref="PerZone"/> and <see cref="PerRoom"/>.
+        /// </summary>
+        [Description("One of the presets listed here will be randomly selected to be the first preset ran. (Starting a line with \"!\" will make it be ignored, use this if you don't wanna use this system)")]
+        public string[] InitialPreset { get; set; } = { "!ignore", "!ignored2" };
+
         /// <summary>
         /// Gets or sets the order on which presets will be ran, taking from <see cref="PerZone"/> and <see cref="PerRoom"/>.
         /// </summary>
         [Description("The order on which presets will be ran.")]
-        public string[] Order { get; set; } = { "myZonePreset1", "myZonePreset2", "myRoomPreset1", "myRoomPreset2", };
+        public string[] Order { get; set; } = { "myZonePreset2", "myRoomPreset1", "myRoomPreset2", };
 
         /// <summary>
         /// Gets or sets a dictionary containing all <see cref="ZoneType"/>-exclusive presets.

diff --git a/Lights/EventHandlers.cs b/Lights/EventHandlers.cs
@@ -86,6 +86,29 @@ private IEnumerator<float> RunBlackouts()
 
             yield return Timing.WaitForSeconds(config.Presets.InitialDelay);
 
+            if (!config.Presets.InitialPreset.IsEmpty())
+            {
+                var id = config.Presets.InitialPreset[UnityEngine.Random.Range(0, config.Presets.InitialPreset.Length)];
+
+                if (!string.IsNullOrEmpty(id) && !id.StartsWith("!"))
+                {
+                    if (config.Presets.PerZone.TryTriggerPreset(id))
+                    {
+                        Log.Debug($"Automatically ran initial zone preset: \"{id}\"", config.Debug);
+                        yield return Timing.WaitForSeconds(UnityEngine.Random.Range(config.Presets.TimeBetweenMin, config.Presets.TimeBetweenMax));
+                    }
+                    else if (config.Presets.PerRoom.TryTriggerPreset(id))
+                    {
+                        Log.Debug($"Automatically ran initial room preset: \"{id}\"", config.Debug);
+                        yield return Timing.WaitForSeconds(UnityEngine.Random.Range(config.Presets.TimeBetweenMin, config.Presets.TimeBetweenMax));
+                    }
+                    else
+                    {
+                        Log.Error($"Couldn't find any presets with ID \"{id}\", make sure there's no typos.");
+                    }
+                }
+            }
+
             for (int i = 0; i < config.Presets.LoopCount; i++)
             {
                 string id;

diff --git a/Lights/Extensions.cs b/Lights/Extensions.cs
@@ -89,7 +89,7 @@ public static bool TryExecute(this Room room, ModifierType modifierType, float d
                     {
                         Plugin.Coroutines.Add(Timing.CallDelayed(duration, () =>
                         {
-                            room.Color = color;
+                            room.ResetColor();
                             Plugin.EventHandlers.DisabledTeslas.Remove(id);
                         }));
                     }