Rework

Common Utilities/Config.cs

@@ -71,7 +71,10 @@ public class Config : IConfig
         [Description("The multiplier applied to radio battery usage. Set to 0 to disable radio battery drain.")]
         public float RadioBatteryDrainMultiplier { get; set; } = 1f;
 
-        [Description("The color to use for lights while the warhead is active. In the RGBA format using values between 0 and 1.")]
+        [Description("Whether to change the color of lights while warhead is active.")] 
+        public bool ChangeWarheadColor { get; set; } = true;
+
+        [Description("The color to use for lights while the warhead is active. In the RGBA format using values between 0 and 1. Ignored if ChangeWarheadColor is set to false.")]
         public Color WarheadColor { get; set; } = new(1f, 0.2f, 0.2f, 1);
 
         [Description("The maximum time, in seconds, that a player can be AFK before being kicked. Set to -1 to disable AFK system.")]
@@ -88,7 +91,6 @@ public class Config : IConfig
         [Description("Whether or not probabilities should be additive (50 + 50 = 100) or not (50 + 50 = 2 seperate 50% chances)")]
         public bool AdditiveProbabilities { get; set; } = false;
 
-        // TODO: check out starting inventory logic
         [Description(
             "The list of starting items for roles. ItemName is the item to give them, and Chance is the percent chance of them spawning with it, and Group allows you to restrict the item to only players with certain RA groups (Leave this as 'none' to allow all players to get the item). You can specify the same item multiple times.")]
         public Dictionary<RoleTypeId, RoleInventory> StartingInventories { get; set; } = new()

Common Utilities/EventHandlers/MapHandlers.cs

@@ -17,9 +17,7 @@ namespace Common_Utilities.EventHandlers;
 
 public class MapHandlers
 {
-    private readonly Config config;
-
-    public MapHandlers(Plugin plugin) => config = plugin.Config;
+    private Config config => Plugin.Instance.Config;
 
     public void OnUpgradingPickup(UpgradingPickupEventArgs ev)
     {

Common Utilities/EventHandlers/PlayerHandlers.cs

@@ -17,10 +17,8 @@ namespace Common_Utilities.EventHandlers;
 
 public class PlayerHandlers
 {
-    private readonly Config config;
-
-    public PlayerHandlers(Plugin plugin) => config = plugin.Config;
-
+    private Config config => Plugin.Instance.Config;
+
     public void OnPlayerVerified(VerifiedEventArgs ev)
     {
         string message = FormatJoinMessage(ev.Player);

Common Utilities/EventHandlers/ServerHandlers.cs

@@ -16,11 +16,10 @@ namespace Common_Utilities.EventHandlers
 
     public class ServerHandlers
     {
-        private readonly Config config;
+        private Config config => Plugin.Instance.Config;
+
         private bool friendlyFireDisable;
 
-        public ServerHandlers(Plugin plugin) => config = plugin.Config;
-
         public void OnRoundStarted()
         {
             if (config.AutonukeTime > -1)
@@ -77,6 +76,9 @@ public void OnRestartingRound()
 
         public void OnWarheadStarting(StartingEventArgs _)
         {
+            if (!config.ChangeWarheadColor)
+                return;
+
             foreach (Room room in Room.List)
                 room.Color = config.WarheadColor;
         }

Common Utilities/Plugin.cs

@@ -39,7 +39,7 @@ public class Plugin : Plugin<Config>
 
     public override string Name { get; } = "Common Utilities";
 
-    public override string Author { get; } = "ExMod-Team, overhaul by Mikihero";
+    public override string Author { get; } = "ExMod-Team";
 
     public override Version Version { get; } = new(7, 1, 1);
 
@@ -58,13 +58,13 @@ public override void OnEnabled()
 
         Random = new Random();
 
-        Log.Info($"Instantiating Events..");
+        Log.Debug("Instantiating Events..");
 
-        playerHandlers = new PlayerHandlers(this);
-        serverHandlers = new ServerHandlers(this);
-        mapHandlers = new MapHandlers(this);
+        playerHandlers = new PlayerHandlers();
+        serverHandlers = new ServerHandlers();
+        mapHandlers = new MapHandlers();
 
-        Log.Info($"Registering EventHandlers..");
+        Log.Debug("Registering EventHandlers..");
 
         player.Hurting += playerHandlers.OnPlayerHurting;
         player.Verified += playerHandlers.OnPlayerVerified;
@@ -107,6 +107,8 @@ public override void OnEnabled()
 
         warhead.Starting += serverHandlers.OnWarheadStarting;
         warhead.Stopping += serverHandlers.OnWarheadStopping;
+
+        Log.Debug("Registered EventHandlers");
 
         base.OnEnabled();
     }