Added SynapseTranslation and improved Config

GrafDimenzio · GrafDimenzio · commit 6e9f510ae8bc · 2021-02-21T15:02:46.000+01:00
diff --git a/Scp079Rework/Commands/BlackOutCommand.cs b/Scp079Rework/Commands/BlackOutCommand.cs
@@ -6,19 +6,19 @@ namespace Scp079Rework.Commands
 {
     public class BlackOutCommand : I079Command
     {
-        public int RequiredLevel => 3;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 3);
 
-        public float Energy => 125f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 125f);
 
         public string Name => "blackout";
 
         public string Description => "Deactivates all Lights in Heavy/Light";
 
         public KeyCode Key => KeyCode.Alpha1;
 
-        public float Exp => 15f;
+        public float Exp => PluginExtensions.GetExp(Name, 15f);
 
-        public float Cooldown => 10f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 20f);
 
         public CommandResult Execute(CommandContext context)
         {
@@ -29,7 +29,7 @@ public CommandResult Execute(CommandContext context)
                     State = CommandResultState.Error
                 };
 
-            Generator079.mainGenerator.ServerOvercharge(10f, false);
+            Map.Get.HeavyController.LightsOut(10f, false);
             Map.Get.GlitchedCassie("Black out through Scp 0 7 9 Now");
 
             return new CommandResult
diff --git a/Scp079Rework/Commands/DeathCommand.cs b/Scp079Rework/Commands/DeathCommand.cs
@@ -9,17 +9,17 @@ public class DeathCommand : I079Command
     {
         public KeyCode Key => KeyCode.None;
 
-        public int RequiredLevel => 3;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 3);
 
-        public float Energy => 100f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 100f);
 
-        public float Exp => 20;
+        public float Exp => PluginExtensions.GetExp(Name, 20f);
 
         public string Name => "death";
 
         public string Description => "sends a fake scp death announcement";
 
-        public float Cooldown => 20f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 20f);
 
         public CommandResult Execute(CommandContext context)
         {
diff --git a/Scp079Rework/Commands/FlashCommand.cs b/Scp079Rework/Commands/FlashCommand.cs
@@ -7,17 +7,17 @@ public class FlashCommand : I079Command
     {
         public KeyCode Key => KeyCode.Alpha3;
 
-        public int RequiredLevel => 1;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 1);
 
-        public float Energy => 50f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 50f);
 
         public string Name => "flash";
 
         public string Description => "Throws a flash at your camera";
 
-        public float Exp => 5f;
+        public float Exp => PluginExtensions.GetExp(Name, 5f);
 
-        public float Cooldown => 2f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 2f);
 
         public CommandResult Execute(CommandContext context)
         {
diff --git a/Scp079Rework/Commands/MtfAnnounceCommand.cs b/Scp079Rework/Commands/MtfAnnounceCommand.cs
@@ -5,19 +5,19 @@ namespace Scp079Rework.Commands
 {
     public class MtfAnnounceCommand : I079Command
     {
-        public int RequiredLevel => 2;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 2);
 
-        public float Energy => 50;
+        public float Energy => PluginExtensions.GetEnergy(Name, 50f);
 
         public string Name => "mtf";
 
         public string Description => "Sends a fake Mtf Announcement";
 
         public KeyCode Key => KeyCode.Alpha2;
 
-        public float Exp => 5f;
+        public float Exp => PluginExtensions.GetExp(Name, 1f);
 
-        public float Cooldown => 15f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 120f);
 
         public CommandResult Execute(CommandContext context)
         {
diff --git a/Scp079Rework/Commands/RobotCommand.cs b/Scp079Rework/Commands/RobotCommand.cs
@@ -6,19 +6,19 @@ namespace Scp079Rework.Commands
 {
     public class RobotCommand : I079Command
     {
-        public int RequiredLevel => 3;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 3);
 
-        public float Energy => 100f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 100f);
 
         public string Name => "robot";
 
         public string Description => "A Command which spawns you as robot into the Map";
 
         public KeyCode Key => KeyCode.None;
 
-        public float Exp => 10f;
+        public float Exp => PluginExtensions.GetExp(Name, 1f);
 
-        public float Cooldown => 0f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 0f);
 
         public CommandResult Execute(CommandContext context)
         {
diff --git a/Scp079Rework/Commands/ScanCommand.cs b/Scp079Rework/Commands/ScanCommand.cs
@@ -9,17 +9,17 @@ public class ScanCommand : I079Command
     {
         public KeyCode Key => KeyCode.None;
 
-        public int RequiredLevel => 3;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 3);
 
-        public float Energy => 100f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 100f);
 
-        public float Exp => 5f;
+        public float Exp => PluginExtensions.GetExp(Name, 5f);
 
         public string Name => "scan";
 
         public string Description => "Shows you where youre Targets are";
 
-        public float Cooldown => 0f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 0f);
 
         public CommandResult Execute(CommandContext context)
         {
@@ -32,7 +32,9 @@ public CommandResult Execute(CommandContext context)
             var pocket = "";
             foreach(var player in Server.Get.Players)
             {
-                switch (player.Room.Zone)
+                if (player.RoleType == RoleType.Spectator || player.RoleType == RoleType.None || player.RoleID == (int)RoleType.Tutorial) continue;
+
+                switch (player.Room?.Zone)
                 {
                     case ZoneType.LCZ:
                         lcz += $"\n    - {player} : {player.RoleName}";
diff --git a/Scp079Rework/Commands/ScpCommand.cs b/Scp079Rework/Commands/ScpCommand.cs
@@ -9,17 +9,17 @@ public class ScpCommand : I079Command
     {
         public KeyCode Key => KeyCode.Alpha4;
 
-        public int RequiredLevel => 2;
+        public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 2);
 
-        public float Energy => 50f;
+        public float Energy => PluginExtensions.GetEnergy(Name, 50f);
 
-        public float Exp => 1f;
+        public float Exp => PluginExtensions.GetExp(Name, 1f);
 
         public string Name => "scp";
 
         public string Description => "brings you near a other Scp";
 
-        public float Cooldown => 0f;
+        public float Cooldown => PluginExtensions.GetCooldown(Name, 0f);
 
         public CommandResult Execute(CommandContext context)
         {
diff --git a/Scp079Rework/Handlers/CommandHandler.cs b/Scp079Rework/Handlers/CommandHandler.cs
@@ -3,7 +3,7 @@
 using System.Reflection;
 using System;
 
-namespace Scp079Rework.Commands
+namespace Scp079Rework.Handlers
 {
     public class CommandHandler
     {
diff --git a/Scp079Rework/Handlers/EventHandlers.cs b/Scp079Rework/Handlers/EventHandlers.cs
@@ -2,7 +2,7 @@
 using UnityEngine;
 using System.Linq;
 
-namespace Scp079Rework
+namespace Scp079Rework.Handlers
 {
     public class EventHandlers
     {
@@ -34,7 +34,7 @@ private void OnDeath(Synapse.Api.Events.SynapseEventArguments.PlayerDeathEventAr
 
         private void OnKeyPress(Synapse.Api.Events.SynapseEventArguments.PlayerKeyPressEventArgs ev)
         {
-            if((ev.Player.RoleID == (int)RoleType.Scp079 || ev.Player.RoleID == 79) && Commands.CommandHandler.Handler.GetCommand(ev.KeyCode,out var cmd))
+            if((ev.Player.RoleID == (int)RoleType.Scp079 || ev.Player.RoleID == 79) && CommandHandler.Handler.GetCommand(ev.KeyCode,out var cmd))
             {
                 if (Scp079SynapseCommand.cooldown.TryGetValue(cmd.Name, out var time) && Time.time < time)
                 {
diff --git a/Scp079Rework/Interfaces/I079Command.cs b/Scp079Rework/Interfaces/I079Command.cs
diff --git a/Scp079Rework/Plugin/PluginClass.cs b/Scp079Rework/Plugin/PluginClass.cs
@@ -1,7 +1,9 @@
 ﻿using Synapse.Api.Plugin;
+using Synapse.Translation;
 using System.Reflection;
 using System.IO;
 using System;
+using Scp079Rework.Handlers;
 
 namespace Scp079Rework
 {
@@ -20,17 +22,33 @@ public class PluginClass : AbstractPlugin
         [Config(section = "Scp079Rework")]
         public static PluginConfig Config { get; set; }
 
+        [SynapseTranslation]
+        public static new SynapseTranslation<PluginTranslation> Translation { get; set; }
+
         public override void Load()
         {
             SynapseController.Server.RoleManager.RegisterCustomRole<Scp079Robot>();
-            Commands.CommandHandler.Handler.RegisterCommands(Assembly.GetExecutingAssembly());
+
+            Translation.AddTranslation(new PluginTranslation());
+            Translation.AddTranslation(new PluginTranslation
+            {
+                Not079 = "Du bist nicht SCP-079.",
+                Help = "Alle SCP-079 Befehle:",
+                Cooldown = "Du musst noch %seconds% Sekunden abwarten bevor du den Befehl wieder ausführen kannst.",
+                LowLevel = "Dein Level ist nich hoch genug!Du brauchst mindestens Level %level%.",
+                LowEnergy = "Du braucht mindestens %energy% Energie um diesen Befehl auszuführen.",
+                Error = "Ein Fehler ist aufgetreten während dem Ausführen des Befehls.",
+                NoCommand = "Kein solcher Unter befehl mit dem namen %command% wurde gefunden."
+            }, "GERMAN");
+
+            CommandHandler.Handler.RegisterCommands(Assembly.GetExecutingAssembly());
 
             foreach(var path in Directory.GetFiles(this.PluginDirectory,"*.dll"))
             {
                 try
                 {
                     var assembly = Assembly.Load(File.ReadAllBytes(path));
-                    Commands.CommandHandler.Handler.RegisterCommands(assembly);
+                    CommandHandler.Handler.RegisterCommands(assembly);
                 }
                 catch(Exception e)
                 {
diff --git a/Scp079Rework/Plugin/PluginConfig.cs b/Scp079Rework/Plugin/PluginConfig.cs
@@ -36,5 +36,27 @@ public class PluginConfig : AbstractConfigSection
 
         [Description("The Amount of MTF Robots Scp-079 can use")]
         public int Scp079MRobot = 1;
+
+        [Description("Here can you setup the configuration of the existing Commands. You cant create Commands with this")]
+        public List<CommandConfiguration> CommandConfigurations = new List<CommandConfiguration>
+        {
+            new CommandConfiguration
+            {
+                Name = "ExampleThatYouCanDelete",
+                Cooldown = 30,
+                Energy = 50,
+                Exp = 5,
+                RequiredLevel = 2
+            }
+        };
+    }
+
+    public class CommandConfiguration
+    {
+        public string Name { get; set; }
+        public int RequiredLevel { get; set; }
+        public float Energy { get; set; }
+        public float Exp { get; set; }
+        public float Cooldown { get; set; }
     }
 }
diff --git a/Scp079Rework/Plugin/PluginExtensions.cs b/Scp079Rework/Plugin/PluginExtensions.cs
@@ -0,0 +1,35 @@
+﻿using System.Linq;
+
+namespace Scp079Rework
+{
+    public static class PluginExtensions
+    {
+        public static int GetRequiredLevel(string commandName, int def)
+        {
+            var config = PluginClass.Config.CommandConfigurations.FirstOrDefault(x => x.Name.ToLower() == commandName.ToLower());
+            if (config == null) return def;
+            return config.RequiredLevel;
+        }
+
+        public static float GetEnergy(string commandName, float def)
+        {
+            var config = PluginClass.Config.CommandConfigurations.FirstOrDefault(x => x.Name.ToLower() == commandName.ToLower());
+            if (config == null) return def;
+            return config.Energy;
+        }
+
+        public static float GetExp(string commandName, float def)
+        {
+            var config = PluginClass.Config.CommandConfigurations.FirstOrDefault(x => x.Name.ToLower() == commandName.ToLower());
+            if (config == null) return def;
+            return config.Exp;
+        }
+
+        public static float GetCooldown(string commandName, float def)
+        {
+            var config = PluginClass.Config.CommandConfigurations.FirstOrDefault(x => x.Name.ToLower() == commandName.ToLower());
+            if (config == null) return def;
+            return config.Cooldown;
+        }
+    }
+}
diff --git a/Scp079Rework/Plugin/PluginTranslation.cs b/Scp079Rework/Plugin/PluginTranslation.cs
@@ -0,0 +1,23 @@
+﻿using Synapse.Translation;
+
+namespace Scp079Rework
+{
+    public class PluginTranslation : IPluginTranslation
+    {
+        public string Not079 { get; set; } = "You are not SCP-079";
+
+        public string Help { get; set; } = "All Scp-079 commands that you can execute:";
+
+        public string Cooldown { get; set; } = "You have to wait %seconds% more seoncds until you can execute this command again";
+
+        public string LowLevel { get; set; } = "You`re level are to low! You need at least level %level%";
+
+        public string LowEnergy { get; set; } = "You need at least %energy% Energy for executing this Command";
+
+        public string Error { get; set; } = "Error while Executing this Command";
+
+        public string NoCommand { get; set; } = "No Scp-079 Command was found for %command%";
+
+        public string NotAsRobot { get; set; } = "As Scp079-robot you can't use this Command";
+    }
+}
diff --git a/Scp079Rework/Scp079Rework.csproj b/Scp079Rework/Scp079Rework.csproj
diff --git a/Scp079Rework/Scp079Robot.cs b/Scp079Rework/Scp079Robot.cs
diff --git a/Scp079Rework/Scp079SynapseCommand.cs b/Scp079Rework/Scp079SynapseCommand.cs
diff --git a/Scp079Rework/packages.config b/Scp079Rework/packages.config

Original file line number	Diff line number	Diff line change
`@@ -5,19 +5,19 @@ namespace Scp079Rework.Commands`
`5`	`5`	`{`
`6`	`6`	`public class MtfAnnounceCommand : I079Command`
`7`	`7`	`{`
`8`		`- public int RequiredLevel => 2;`
	`8`	`+ public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 2);`
`9`	`9`
`10`		`- public float Energy => 50;`
	`10`	`+ public float Energy => PluginExtensions.GetEnergy(Name, 50f);`
`11`	`11`
`12`	`12`	`public string Name => "mtf";`
`13`	`13`
`14`	`14`	`public string Description => "Sends a fake Mtf Announcement";`
`15`	`15`
`16`	`16`	`public KeyCode Key => KeyCode.Alpha2;`
`17`	`17`
`18`		`- public float Exp => 5f;`
	`18`	`+ public float Exp => PluginExtensions.GetExp(Name, 1f);`
`19`	`19`
`20`		`- public float Cooldown => 15f;`
	`20`	`+ public float Cooldown => PluginExtensions.GetCooldown(Name, 120f);`
`21`	`21`
`22`	`22`	`public CommandResult Execute(CommandContext context)`
`23`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -6,19 +6,19 @@ namespace Scp079Rework.Commands`
`6`	`6`	`{`
`7`	`7`	`public class RobotCommand : I079Command`
`8`	`8`	`{`
`9`		`- public int RequiredLevel => 3;`
	`9`	`+ public int RequiredLevel => PluginExtensions.GetRequiredLevel(Name, 3);`
`10`	`10`
`11`		`- public float Energy => 100f;`
	`11`	`+ public float Energy => PluginExtensions.GetEnergy(Name, 100f);`
`12`	`12`
`13`	`13`	`public string Name => "robot";`
`14`	`14`
`15`	`15`	`public string Description => "A Command which spawns you as robot into the Map";`
`16`	`16`
`17`	`17`	`public KeyCode Key => KeyCode.None;`
`18`	`18`
`19`		`- public float Exp => 10f;`
	`19`	`+ public float Exp => PluginExtensions.GetExp(Name, 1f);`
`20`	`20`
`21`		`- public float Cooldown => 0f;`
	`21`	`+ public float Cooldown => PluginExtensions.GetCooldown(Name, 0f);`
`22`	`22`
`23`	`23`	`public CommandResult Execute(CommandContext context)`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`using System.Reflection;`
`4`	`4`	`using System;`
`5`	`5`
`6`		`-namespace Scp079Rework.Commands`
	`6`	`+namespace Scp079Rework.Handlers`
`7`	`7`	`{`
`8`	`8`	`public class CommandHandler`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using UnityEngine;`
`3`	`3`	`using System.Linq;`
`4`	`4`
`5`		`-namespace Scp079Rework`
	`5`	`+namespace Scp079Rework.Handlers`
`6`	`6`	`{`
`7`	`7`	`public class EventHandlers`
`8`	`8`	`{`
`@@ -34,7 +34,7 @@ private void OnDeath(Synapse.Api.Events.SynapseEventArguments.PlayerDeathEventAr`
`34`	`34`
`35`	`35`	`private void OnKeyPress(Synapse.Api.Events.SynapseEventArguments.PlayerKeyPressEventArgs ev)`
`36`	`36`	`{`
`37`		`- if((ev.Player.RoleID == (int)RoleType.Scp079 \|\| ev.Player.RoleID == 79) && Commands.CommandHandler.Handler.GetCommand(ev.KeyCode,out var cmd))`
	`37`	`+ if((ev.Player.RoleID == (int)RoleType.Scp079 \|\| ev.Player.RoleID == 79) && CommandHandler.Handler.GetCommand(ev.KeyCode,out var cmd))`
`38`	`38`	`{`
`39`	`39`	`if (Scp079SynapseCommand.cooldown.TryGetValue(cmd.Name, out var time) && Time.time < time)`
`40`	`40`	`{`