Merge pull request #62 from ggggg/master

Added levenshtein to setjob (plasma's idea)

Author: UserR00T

dist/localization.json

@@ -106,8 +106,9 @@
     "received_from" : "Received ${0} from {1}.",
     "job_set" : "{0} now has the job: {1}.",
     "new_job" : "{0} gave you a new job of {1}.",
+    "job_notFound": "The job {0} was not found.",
     "player_jail" : "You have placed {0} in prison for {1} seconds",
-    "target_jail" : "{0} has placed you in prison for {1} seconds",
+    "target_jail" : "{0} has placed you in prison for {1} seconds"
   },
   "BR": {
     "arrested": "Preso {0}.",

dist/settings.json

@@ -15,7 +15,8 @@
   "Levenshtein": {
     "GiveMode": "Automatic",
     "WarpMode": "Suggest",
-    "KitMode": "Suggest"
+    "KitMode": "Suggest",
+    "SetJobMode": "Suggest"
   },
   "Commands": [
     {

src/BPEssentials/BPEssentials.csproj

@@ -300,7 +300,6 @@
     <Compile Include="Commands\Moderation\Ban.cs" />
     <Compile Include="Commands\Moderation\Kick.cs" />
     <Compile Include="Commands\Teleport\TeleportCoordinates.cs" />
-    <Compile Include="Commands\Player\ToggleGodmode.cs" />
     <Compile Include="Commands\Teleport\TeleportHere.cs" />
     <Compile Include="Commands\Teleport\Teleport.cs" />
     <Compile Include="Commands\Misc\Launch.cs" />
@@ -340,7 +339,6 @@
     <Compile Include="Core.cs" />
     <Compile Include="Enums\Chat.cs" />
     <Compile Include="Events\OnDropDead.cs" />
-    <Compile Include="Events\OnDamage.cs" />
     <Compile Include="Events\OnRegister.cs" />
     <Compile Include="Events\OnStarted.cs" />
     <Compile Include="Events\OnLeave.cs" />

src/BPEssentials/ChatHandlers/GlobalChat.cs

@@ -13,7 +13,7 @@ public class GlobalChat : IScript
         [Target(GameSourceEvent.PlayerGlobalChatMessage, ExecutionMode.Override)]
         public void OnEvent(ShPlayer player, string message)
         {
-            if (player.manager.svManager.chatted.OverLimit(player))
+            if (player.manager.svManager.chatted.Limit(player))
             {
                 return;
             }
@@ -23,8 +23,6 @@ public void OnEvent(ShPlayer player, string message)
                 return;
             }
 
-            player.manager.svManager.chatted.Add(player);
-
             Core.Instance.Logger.LogInfo($"[GLOBAL] {player.username}: {message}");
 
             switch (player.GetExtendedPlayer().CurrentChat)

src/BPEssentials/ChatHandlers/LocalChat.cs

@@ -13,7 +13,7 @@ public class LocalChat : IScript
         [Target(GameSourceEvent.PlayerLocalChatMessage, ExecutionMode.Override)]
         public void OnEvent(ShPlayer player, string message)
         {
-            if (player.manager.svManager.chatted.OverLimit(player))
+            if (player.manager.svManager.chatted.Limit(player))
             {
                 return;
             }
@@ -26,8 +26,6 @@ public void OnEvent(ShPlayer player, string message)
                 return;
             }
 
-            player.manager.svManager.chatted.Add(player);
-
             if (Core.Instance.Settings.General.LocalChatOverHead)
             {
                 player.svPlayer.Send(SvSendType.LocalOthers, Channel.Unsequenced, ClPacket.LocalChatMessage, player.ID, message.CleanerMessage());

src/BPEssentials/Commands/Player/Heal.cs

@@ -10,6 +10,7 @@ public class Heal : Command
         public void Invoke(ShPlayer player, ShPlayer target = null)
         {
             target = target ?? player;
+            target.svPlayer.SvClearInjuries();
             target.svPlayer.Heal(target.maxStat);
             player.TS("healed", target.username.CleanerMessage());
         }

src/BPEssentials/Commands/Player/Inventory/Give.cs

@@ -22,7 +22,6 @@ public void Invoke(ShPlayer player, string name, int amount = 1, ShPlayer target
                     return;
                 }
                 item = Core.Instance.EntityHandler.Items.OrderByDescending(x => LevenshteinDistance.CalculateSimilarity(x.Key, name)).FirstOrDefault();
-
                 if (Core.Instance.Settings.Levenshtein.GiveMode == Configuration.Models.SettingsModel.LevenshteinMode.Suggest)
                 {
                     player.TS("give_notFound", name);

src/BPEssentials/Commands/Player/SetJob.cs

@@ -3,20 +3,47 @@
 using BrokeProtocol.Entities;
 using BrokeProtocol.Utility;
 using BrokeProtocol.Required;
+using System.Collections.Generic;
+using System;
+using System.Linq;
+using BPEssentials.Utils;
 
 namespace BPEssentials.Commands
 {
     public class SetJob : Command
     {
-        public void Invoke(ShPlayer player, JobIndex job, ShPlayer target = null)
+        public void Invoke(ShPlayer player, string jobName, ShPlayer target = null)
         {
 
             target = target ?? player;
-            target.svPlayer.SvTrySetJob(job, true, false);
-            player.TS("job_set", target.username.CleanerMessage(), job.ToString());
+            var jobs = new Dictionary<string, JobIndex>();
+            foreach (var jobType in Enum.GetValues(typeof(JobIndex)))
+            {
+                jobs.Add(jobType.ToString(), jobType);
+            }           
+
+            var wantedJob = jobs.FirstOrDefault(x => x.Key == jobName);
+            if (wantedJob.Key == null)
+            {
+                if (Core.Instance.Settings.Levenshtein.SetJobMode == Configuration.Models.SettingsModel.LevenshteinMode.None)
+                {
+                    player.TS("job_notFound", jobName);
+                    return;
+                }
+                wantedJob = jobs.OrderByDescending(x => LevenshteinDistance.CalculateSimilarity(x.Key, jobName)).FirstOrDefault();
+
+                if (Core.Instance.Settings.Levenshtein.SetJobMode == Configuration.Models.SettingsModel.LevenshteinMode.Suggest)
+                {
+                    player.TS("job_notFound", jobName);
+                    player.TS("levenshteinSuggest", wantedJob.Key);
+                    return;
+                }
+            }
+            target.svPlayer.SvTrySetJob(wantedJob.Value, true, false);
+            player.TS("job_set", target.username.CleanerMessage(), jobName);
             if (target != player) 
             {
-                target.TS("new_job", player.username.CleanerMessage(), job.ToString());
+                target.TS("new_job", player.username.CleanerMessage(), wantedJob.Key);
             }
         }
     }

src/BPEssentials/Commands/Player/ToggleGodmode.cs

@@ -49,6 +49,7 @@ public class Levenshtein
         public LevenshteinMode GiveMode { get; set; }
         public LevenshteinMode WarpMode { get; set; }
         public LevenshteinMode KitMode { get; set; }
+        public LevenshteinMode SetJobMode { get; set; }
     }
 
     public class ReportOptions