Blackout changes

* It is now possible to make it so that if the SCP-575 disappears before the end of the blackout, the blackout will end.

Author: SrLicht-1

SCP575/Config.cs

@@ -78,6 +78,9 @@ public class BlackoutConfig
         [Description("The minimum duration of a delay after a blackout")]
         public int MaxDelay { get; set; } = 400;
 
+        [Description("If the SCP-575 disappears before the duration of the blackout should the blackout end?")]
+        public bool EndBlackoutWhenDisappearing { get; set; } = true;
+
         [Description("Before starting the blackout Cassie will say this message")]
         public string CassieMessage { get; set; } =
             "facility power system failure in 3 . pitch_.80 2 . pitch_.60 1 . pitch_.49 . .g1 pitch_.42  .g2 pitch_.31  .g5";
@@ -198,6 +201,6 @@ public class ResponseCommandConfig
         public string Spawning { get; set; } = "Spawning a SCP-575 to hunt {0} for {1} seconds";
 
         [YamlMember(ScalarStyle = YamlDotNet.Core.ScalarStyle.DoubleQuoted)]
-        public string HelpResponse { get; set; } = "Correct use of the command {0}\nPlayer ID | It is a numerical ID that changes with each new round and each time someone connects to the server again.\nDuration | The time (in seconds) that the SCP-575 will hunt someone";
+        public string HelpResponse { get; set; } = "Correct use of the command {0}\nPlayer ID | It is a numerical ID that changes with each new round and each time someone connects to the server again.\nDuration | The time (in seconds) that the SCP-575 will hunt someone\n\nNote that this command does not turn off the lights, so if the SCP-575 is in a lit room for more than 5 seconds it will disappear.";
     }
 }

SCP575/Resources/Components/Scp575Component.cs

@@ -181,6 +181,9 @@ private IEnumerator<float> Checks()
         /// </summary>
         private void OnDestroy()
         {
+            if (Scp575.Instance.Config.BlackOut.EndBlackoutWhenDisappearing)
+                Extensions.EndBlackout();
+
             var dummyPlayer = Dummies.DummiesPlayers.FirstOrDefault(d => d.ReferenceHub == ReferenceHub);
 
             dummyPlayer?.StopAudio();

SCP575/Resources/Extensions.cs

@@ -1,7 +1,9 @@
 using MapGeneration;
 using Mirror;
 using PluginAPI.Core;
+using RemoteAdmin;
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
@@ -11,6 +13,7 @@ namespace SCP575.Resources
 {
     public static class Extensions
     {
+        private static List<RoomLightController> _roomLightsAffected = new();
         /// <summary>
         /// Checks for .ogg files in the sounds folder
         /// </summary>
@@ -60,9 +63,10 @@ public static bool IsDummy(ReferenceHub hub)
         /// Turns off the lights in the specified zone, for a period of time.
         /// </summary>
         /// <param name="duration">The duration in seconds of the blackout</param>
-        public static void FlickerLights(float duration, bool antiScp173 = false)
+        public static void StartBlackout(float duration, bool antiScp173 = false)
         {
             var roomLightControllers = RoomLightController.Instances;
+            _roomLightsAffected.Clear();
 
             if (Scp575.Instance.Config.ActiveInHeavy)
             {
@@ -71,7 +75,9 @@ public static void FlickerLights(float duration, bool antiScp173 = false)
                     if (controller.Room.Zone != FacilityZone.HeavyContainment ||
                         Scp575.Instance.Config.BlackOut.BlackListRooms.Count > 0 &&
                         Scp575.Instance.Config.BlackOut.BlackListRooms.Contains(controller.Room.Name)) continue;
+
                     controller.ServerFlickerLights(duration);
+                    _roomLightsAffected.Add(controller);
                 }
             }
 
@@ -85,6 +91,7 @@ public static void FlickerLights(float duration, bool antiScp173 = false)
                             Scp575.Instance.Config.BlackOut.BlackListRooms.Count > 0 &&
                             Scp575.Instance.Config.BlackOut.BlackListRooms.Contains(controller.Room.Name)) continue;
                         controller.ServerFlickerLights(duration);
+                        _roomLightsAffected.Add(controller);
                     }
                 }
             }
@@ -97,10 +104,22 @@ public static void FlickerLights(float duration, bool antiScp173 = false)
                         Scp575.Instance.Config.BlackOut.BlackListRooms.Count > 0 &&
                         Scp575.Instance.Config.BlackOut.BlackListRooms.Contains(controller.Room.Name)) continue;
                     controller.ServerFlickerLights(duration);
+                    _roomLightsAffected.Add(controller);
                 }
             }
         }
 
+        /// <summary>
+        /// End current blackout.
+        /// </summary>
+        public static void EndBlackout()
+        {
+            foreach(var roomLight in _roomLightsAffected)
+            {
+                roomLight.ServerFlickerLights(0);
+            }
+        }
+
         /// <summary>
         /// Check if the current room is with the lights on.
         /// </summary>

SCP575/Scp575.cs

@@ -167,7 +167,7 @@ private IEnumerator<float> Blackout()
                 }
 
                 // Turn off the lights in the area
-                Extensions.FlickerLights(blackoutDuration, antiScp173);
+                Extensions.StartBlackout(blackoutDuration, antiScp173);
 
                 // Decide the delay by calculating between the minimum and the maximum value.
                 yield return Timing.WaitForSeconds(_rng.Next(Config.BlackOut.MinDelay, Config.BlackOut.MaxDelay) +
@@ -349,6 +349,7 @@ private bool GetScp173()
                 if (player.Role == RoleTypeId.Scp173)
                 {
                     value = true;
+                    break;
                 }
             }