Merge pull request #2 from raggebatman/dev

Dev
raggebatman · Sep 30, 2023 · 68b8bfd · 68b8bfd
2 parents 052cce4 + 639b240
commit 68b8bfd
Show file tree

Hide file tree

Showing 16 changed files with 189 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -10,8 +10,6 @@ View the config file for details.
 
 ## Commands
 
-Radiation is managed using the `radiation` command.
-
 - `radiation start`
 - `radiation stop`
 - `radiation enable`
@@ -20,13 +18,10 @@ Radiation is managed using the `radiation` command.
 
 ## Permissions
 
-Each command has its own permission.
-
 - `radiation.start`
 - `radiation.stop`
 - `radiation.enable`
 - `radiation.disable`
-- `radiation.status`
 
 ## Details
 

diff --git a/Radiation/API/RadiationAPI.cs b/Radiation/API/RadiationAPI.cs
@@ -2,6 +2,7 @@
 using PlayerStatsSystem;
 using Radiation.Enums;
 using PlayerRoles;
+using System;
 
 namespace Radiation.API
 {
@@ -123,5 +124,36 @@ public static bool DealDamage(Player player)
 
             return true;
         }
+
+        public static Tuple<RadiationStatus, string> Status()
+        {
+            RadiationStatus status;
+            string response;
+
+            if (!Plugin.Singleton.radiationEnabled)
+            {
+                status = RadiationStatus.Disabled;
+                response = "Radiation is disabled.";
+            }
+            else
+            if (Plugin.Singleton.radiationDelayed)
+            {
+                status = RadiationStatus.Delayed;
+                response = "Radiation will occur soon.";
+            }
+            else
+            if (Plugin.Singleton.radiationStarted)
+            {
+                status = RadiationStatus.Started;
+                response = "Radiation is active.";
+            }
+            else
+            {
+                status = RadiationStatus.Stopped;
+                response = "Radiation is inactive.";
+            }
+
+            return Tuple.Create(status, response);
+        }
     }
 }
diff --git a/Radiation/Commands/Radiation/DisableCommand.cs b/Radiation/Commands/Radiation/DisableCommand.cs
@@ -18,16 +18,10 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (Plugin.Singleton.DisableRadiation())
-            {
-                response = "Radiation has been disabled.";
-                return true;
-            }
-            else
-            {
-                response = "Radiation is already disabled.";
-                return false;
-            }
+            var command = Plugin.Singleton.DisableRadiation();
+
+            response = command.Item2;
+            return command.Item1;
         }
     }
 }
diff --git a/Radiation/Commands/Radiation/EnableCommand.cs b/Radiation/Commands/Radiation/EnableCommand.cs
@@ -18,16 +18,10 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (Plugin.Singleton.EnableRadiation())
-            {
-                response = "Radiation has been enabled.";
-                return true;
-            }
-            else
-            {
-                response = "Radiation is already enabled.";
-                return false;
-            }
+            var command = Plugin.Singleton.EnableRadiation();
+
+            response = command.Item2;
+            return command.Item1;
         }
     }
 }
diff --git a/Radiation/Commands/Radiation/StartCommand.cs b/Radiation/Commands/Radiation/StartCommand.cs
@@ -18,16 +18,10 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (Plugin.Singleton.StartRadiation())
-            {
-                response = "Radiation has been started.";
-                return true;
-            }
-            else
-            {
-                response = "Radiation has already started.";
-                return false;
-            }
+            var command = Plugin.Singleton.StartRadiation();
+
+            response = command.Item2;
+            return command.Item1;
         }
     }
 }
diff --git a/Radiation/Commands/Radiation/StatusCommand.cs b/Radiation/Commands/Radiation/StatusCommand.cs
@@ -1,6 +1,6 @@
 using System;
 using CommandSystem;
-using NWAPIPermissionSystem;
+using Radiation.API;
 
 namespace Radiation.Commands
 {
@@ -12,31 +12,9 @@ public class StatusCommand : ICommand
 
         public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
         {
-            if (!sender.CheckPermission("radiation.status"))
-            {
-                response = "You do not have the required permission (radiation.status) to execute this command";
-                return false;
-            }
-
-            if (!Plugin.Singleton.radiationEnabled)
-            {
-                response = "Radiation is disabled.";
-            }
-            else
-            if (Plugin.Singleton.radiationDelayed)
-            {
-                response = "Radiation will occur soon.";
-            }
-            else
-            if (Plugin.Singleton.radiationStarted)
-            {
-                response = "Radiation is active.";
-            }
-            else
-            {
-                response = "Radiation is inactive.";
-            }
+            var status = RadiationAPI.Status();
 
+            response = status.Item2;
             return true;
         }
     }

diff --git a/Radiation/Commands/Radiation/StopCommand.cs b/Radiation/Commands/Radiation/StopCommand.cs
@@ -18,16 +18,10 @@ public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out s
                 return false;
             }
 
-            if (Plugin.Singleton.StopRadiation())
-            {
-                response = "Radiation has been stopped.";
-                return true;
-            }
-            else
-            {
-                response = "Radiation has already stopped.";
-                return false;
-            }
+            var command = Plugin.Singleton.StopRadiation();
+
+            response = command.Item2;
+            return command.Item1;
         }
     }
-}
+}
diff --git a/Radiation/Commands/Radiation/VersionCommand.cs b/Radiation/Commands/Radiation/VersionCommand.cs
@@ -0,0 +1,18 @@
+using System;
+using CommandSystem;
+
+namespace Radiation.Commands
+{
+    public class VersionCommand : ICommand
+    {
+        public string Command { get; } = "version";
+        public string Description { get; } = "Show plugin version";
+        public string[] Aliases { get; }
+
+        public bool Execute(ArraySegment<string> arguments, ICommandSender sender, out string response)
+        {
+            response = "This server is using Radiation v1.1.1";
+            return true;
+        }
+    }
+}
diff --git a/Radiation/Commands/RadiationCommand.cs b/Radiation/Commands/RadiationCommand.cs
@@ -25,6 +25,7 @@ public override void LoadGeneratedCommands()
                 RegisterCommand(new EnableCommand());
                 RegisterCommand(new DisableCommand());
                 RegisterCommand(new StatusCommand());
+                RegisterCommand(new VersionCommand());
             }
             catch (Exception e)
             {
@@ -49,6 +50,7 @@ protected override bool ExecuteParent(ArraySegment<string> arguments, ICommandSe
             stringBuilder.AppendLine("- radiation enable - Enable tick damage, will start tick damage if warhead is detonated");
             stringBuilder.AppendLine("- radiation disable - Disable tick damage, will not start tick damage if warhead detonates");
             stringBuilder.AppendLine("- radiation status - Show radiation status");
+            stringBuilder.AppendLine("- radiation version - Show plugin version");
 
             response = StringBuilderPool.Shared.ToStringReturn(stringBuilder);
 

diff --git a/Radiation/Enums/RadiationStatus.cs b/Radiation/Enums/RadiationStatus.cs
@@ -0,0 +1,10 @@
+namespace Radiation.Enums
+{
+    public enum RadiationStatus
+    {
+        Disabled,
+        Delayed,
+        Started,
+        Stopped
+    }
+}
diff --git a/Radiation/Events/ServerEvents.cs b/Radiation/Events/ServerEvents.cs
@@ -17,6 +17,7 @@ public ServerEvents()
         [PluginEvent(ServerEventType.RoundStart)]
         private void OnRoundStart(RoundStartEvent @event)
         {
+            Plugin.Singleton.StopDelay();
             Plugin.Singleton.StopRadiation();
 
             if (_config.EnableRadiationOnRoundStart)
@@ -28,12 +29,14 @@ private void OnRoundStart(RoundStartEvent @event)
         [PluginEvent(ServerEventType.RoundEnd)]
         private void OnRoundEnd(RoundEndEvent @event)
         {
+            Plugin.Singleton.StopDelay();
             Plugin.Singleton.StopRadiation();
         }
 
         [PluginEvent(ServerEventType.RoundRestart)]
         private void OnRoundRestart(RoundRestartEvent @event)
         {
+            Plugin.Singleton.StopDelay();
             Plugin.Singleton.StopRadiation();
         }