Fixed issue with give, added staff chat

UserR00T · UserR00T · commit 2b289f7f4e11 · 2018-05-24T17:29:24.000+02:00
* Fixed issue with give that would give the item you requested by one off
* Fixed issue with giving items through the functionUI
* Added staff chat! Players can now type /staffchat (can be changed, of course) to enable staff chat. All admins that didn't disable receiving staff messages by typing /disablestaffchat (/dsc) will get that message.
* It now shows how many IDs are loaded in! whooo
diff --git a/source/BP-Essentials/BP-Essentials.csproj b/source/BP-Essentials/BP-Essentials.csproj
@@ -61,6 +61,8 @@
     <Compile Include="Chat\Commands\Admin\Restrain.cs" />
     <Compile Include="Chat\Commands\Admin\Say.cs" />
     <Compile Include="Chat\Commands\Admin\Search.cs" />
+    <Compile Include="Chat\Commands\Admin\ToggleReceiveStaffChat.cs" />
+    <Compile Include="Chat\Commands\Admin\ToggleStaffChat.cs" />
     <Compile Include="Chat\Commands\Admin\_SetJob.cs" />
     <Compile Include="Chat\Commands\Admin\Slap.cs" />
     <Compile Include="Chat\Commands\Admin\Strip.cs" />
@@ -118,6 +120,7 @@
     <Compile Include="Methods\misc\SavePeriodically.cs" />
     <Compile Include="Methods\GameMethods\SendToJail.cs" />
     <Compile Include="Methods\misc\SendChatMessage.cs" />
+    <Compile Include="Methods\misc\SendChatMessageToAdmins.cs" />
     <Compile Include="Methods\misc\SetTimeStamp.cs" />
     <Compile Include="Methods\FileHandler\WriteIpToFile.cs" />
   </ItemGroup>
diff --git a/source/BP-Essentials/Chat/Commands/Admin/Give.cs b/source/BP-Essentials/Chat/Commands/Admin/Give.cs
@@ -25,24 +25,24 @@ public static bool Run(object oPlayer, string message)
                         return true;
                     }
                     int arg1int, arg2int;
-                    bool Parsed = Int32.TryParse(arg1, out arg1int);
+                    bool Parsed = int.TryParse(arg1, out arg1int);
                     Parsed = int.TryParse(arg2, out arg2int);
                     if (Parsed)
                     {
-                        if (arg1int > 1 && arg1int <= IDs.Length -1)
+                        if (arg1int > 0 && arg1int <= IDs.Length)
                         {
-                            foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
+                            foreach (var shPlayer in FindObjectsOfType<ShPlayer>())
                                 if (shPlayer.svPlayer == player && shPlayer.IsRealPlayer())
                                 {
                                     if (arg1.Length > 4)
                                         shPlayer.TransferItem(1, arg1int, arg2int, true);
                                     else
-                                        shPlayer.TransferItem(1, IDs[arg1int], arg2int, true);
+                                        shPlayer.TransferItem(1, IDs[arg1int - 1], arg2int, true);
                                     player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Giving you item ID: </color><color={argColor}>{arg1}</color>");
                                 }
                         }
                         else
-                            player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: The ID must be between 1 and {IDs.Length -1}.</color>");
+                            player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: The ID must be between 1 and {IDs.Length}.</color>");
                     }
                     else
                         player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: Is that a valid number you provided as argument?</color>");
diff --git a/source/BP-Essentials/Chat/Commands/Admin/ToggleReceiveStaffChat.cs b/source/BP-Essentials/Chat/Commands/Admin/ToggleReceiveStaffChat.cs
@@ -0,0 +1,35 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using static BP_Essentials.EssentialsVariablesPlugin;
+using static BP_Essentials.EssentialsMethodsPlugin;
+
+namespace BP_Essentials.Commands
+{
+    class ToggleReceiveStaffChat : EssentialsChatPlugin
+    {
+        public static bool Run(object oPlayer, string message)
+        {
+            var player = (SvPlayer)oPlayer;
+            if (HasPermission.Run(player, CmdStaffChatMessagesExecutableBy))
+            {
+                var shplayer = GetShBySv.Run(player);
+                if (playerList[shplayer.ID].receiveStaffChat)
+                {
+                    playerList[shplayer.ID].receiveStaffChat = false;
+                    player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Staff chat messages disabled. You'll not receive any staff chat messages anymore.</color>");
+                }
+                else
+                {
+                    playerList[shplayer.ID].receiveStaffChat = true;
+                    player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Staff chat message enabled. You'll now receive staff messages.</color>");
+                }
+            }
+            else
+                player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, MsgNoPerm);
+            return true;
+        }
+    }
+}
diff --git a/source/BP-Essentials/Chat/Commands/Admin/ToggleStaffChat.cs b/source/BP-Essentials/Chat/Commands/Admin/ToggleStaffChat.cs
@@ -0,0 +1,59 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using static BP_Essentials.EssentialsVariablesPlugin;
+using static BP_Essentials.EssentialsMethodsPlugin;
+using System.Text.RegularExpressions;
+
+namespace BP_Essentials.Commands
+{
+    class ToggleStaffChat : EssentialsChatPlugin
+    {
+        public static bool Run(object oPlayer, string message)
+        {
+            try
+            {
+                var player = (SvPlayer)oPlayer;
+                if (HasPermission.Run(player, CmdStaffChatExecutableBy))
+                {
+                    var arg1 = GetArgument.Run(1, false, true, message);
+                    var shplayer = GetShBySv.Run(player);
+                    if (string.IsNullOrEmpty(arg1))
+                    {
+                        if (playerList[shplayer.ID].staffChatEnabled)
+                        {
+                            playerList[shplayer.ID].staffChatEnabled = false;
+                            player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Staff chat disabled.</color>");
+                        }
+                        else
+                        {
+                            playerList[shplayer.ID].staffChatEnabled = true;
+                            player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Staff chat enabled.</color>");
+                        }
+                    }
+                    else
+                    {
+                        if (playerList[shplayer.ID].staffChatEnabled)
+                        {
+                            _msg = AdminChatMessage;
+                            _msg = _msg.Replace("{username}", new Regex("(<)").Replace(player.playerData.username, "<<b></b>"));
+                            _msg = _msg.Replace("{message}", new Regex("(<)").Replace(Chat.LangAndChatBlock.Run(player, arg1), "<<b></b>"));
+                            SendChatMessageToAdmins.Run(_msg);
+                        }
+                        else
+                            player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={warningColor}>You must enable staff chat first before you can send a message.</color>");
+                    }
+                }
+                else
+                    player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, MsgNoPerm);
+            }
+            catch (Exception ex)
+            {
+                ErrorLogging.Run(ex);
+            }
+            return true;
+        }
+    }
+}
diff --git a/source/BP-Essentials/EssentialsChat.cs b/source/BP-Essentials/EssentialsChat.cs
@@ -203,6 +203,18 @@ public static bool SvGlobalChatMessage(SvPlayer player, ref string message)
                             return Commands.ToggleChat.Run(player);
                     else
                         { player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, DisabledCommand); return true; }
+                    else if (message.StartsWith(CmdStaffChat) || message.StartsWith(CmdStaffChat2))
+                        if (!CmdStaffChatDisabled)
+                            return Commands.ToggleStaffChat.Run(player, message);
+                        else
+                        { player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, DisabledCommand); return true; }
+                    else if (message.StartsWith(CmdStaffChatMessages) || message.StartsWith(CmdStaffChatMessages2))
+                        if (!CmdStaffChatMessagesDisabled)
+                            return Commands.ToggleReceiveStaffChat.Run(player, message);
+                        else
+                        { player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, DisabledCommand); return true; }
+
+
                     if (MsgUnknownCommand)
                     {
                         player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Unknown command. Type</color><color={argColor}> {CmdCommandCharacter}essentials cmds </color><color={errorColor}>for more info.</color>");
@@ -221,11 +233,20 @@ public static bool SvGlobalChatMessage(SvPlayer player, ref string message)
                     player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, PlayerIsAFK);
                     return true;
                 }
-                if (!playerList[GetShBySv.Run(player).ID].chatEnabled)
+                var shplayer = GetShBySv.Run(player);
+                if (!playerList[shplayer.ID].chatEnabled)
                 {
                     player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={warningColor}>Please enable your chat again by typing</color> <color={argColor}>{CmdToggleChat}</color><color={warningColor}>.</color>");
                     return true;
                 }
+                if (playerList[shplayer.ID].staffChatEnabled)
+                {
+                    _msg = AdminChatMessage;
+                    _msg = _msg.Replace("{username}", new Regex("(<)").Replace(shplayer.username, "<<b></b>"));
+                    _msg = _msg.Replace("{message}", new Regex("(<)").Replace(Chat.LangAndChatBlock.Run(player, message), "<<b></b>"));
+                    SendChatMessageToAdmins.Run(_msg);
+                    return true;
+                }
                 // Will improve this someday..
                 foreach (KeyValuePair<string, _Group> curr in Groups)
                 {
diff --git a/source/BP-Essentials/EssentialsVariables.cs b/source/BP-Essentials/EssentialsVariables.cs
@@ -7,7 +7,7 @@ namespace BP_Essentials
 {
     public class EssentialsVariablesPlugin : EssentialsCorePlugin
     {
-        public const string Version = "2.3.0";
+        public const string Version = "2.4.0";
 
         // Generic Constants
         public const string FileDirectory = "Essentials/";
@@ -76,6 +76,7 @@ public class EssentialsVariablesPlugin : EssentialsCorePlugin
         public static string AdminSearchingInv;
         public static string PlayerMessage;
         public static string AdminMessage;
+        public static string AdminChatMessage;
 
         public static string infoColor, errorColor, warningColor, argColor;
         // Strings
@@ -132,6 +133,8 @@ public class EssentialsVariablesPlugin : EssentialsCorePlugin
         public static string CmdReload, CmdReload2;
         public static string CmdClearChat, CmdClearChat2;
         public static string CmdReport, CmdReport2;
+        public static string CmdStaffChat, CmdStaffChat2, CmdStaffChatExecutableBy;
+        public static string CmdStaffChatMessages, CmdStaffChatMessages2, CmdStaffChatMessagesExecutableBy;
         public static string CmdHelp;
         public static string CmdCommandCharacter;
         public static bool CmdClearChatDisabled;
@@ -161,6 +164,8 @@ public class EssentialsVariablesPlugin : EssentialsCorePlugin
         public static bool CmdJailDisabled;
         public static bool CmdKnockoutDisabled;
         public static bool CmdToggleChatDisabled;
+        public static bool CmdStaffChatDisabled;
+        public static bool CmdStaffChatMessagesDisabled;
         #endregion
 
         // Ints
@@ -192,9 +197,10 @@ public class EssentialsVariablesPlugin : EssentialsCorePlugin
         };
         public static int[] CommonIDs =
         {
-            1530892865, // Pistol Ammo
+            // need a better way of doing this
+            493970259, // Pistol Ammo
             -479434394, // Handcuffs
-            -1113305847, // Taser Ammo
+            -906852676, // Taser Ammo
             -700261193, //License Boating
             1695812550, //License Drivers
             499504400, //License Gun
@@ -975,6 +981,8 @@ public class _PlayerList
         public ShPlayer reportedPlayer { get; set; }
         public string reportedReason;
         public bool chatEnabled = true;
+        public bool staffChatEnabled;
+        public bool receiveStaffChat = true;
     }
 
     public class _Group
diff --git a/source/BP-Essentials/Methods/FileHandler/ReadFile.cs b/source/BP-Essentials/Methods/FileHandler/ReadFile.cs
@@ -41,6 +41,7 @@ public class _Messages
         public string AdminSearchingInv { get; set; }
         public string PlayerMessage { get; set; }
         public string AdminMessage { get; set; }
+        public string AdminChatMessage { get; set; }
     }
     [Serializable]
     public class MessageColors
@@ -137,6 +138,7 @@ public static void Run(string fileName)
                         AdminSearchingInv = $"<color={errorColor}>{m.Messages.AdminSearchingInv}</color>";
                         PlayerMessage = m.Messages.PlayerMessage;
                         AdminMessage = m.Messages.AdminMessage;
+                        AdminChatMessage = m.Messages.AdminChatMessage;
 
                         AccessMoneyMenu = m.FunctionUI.AccessMoneyMenu;
                         AccessItemMenu = m.FunctionUI.AccessItemMenu;
diff --git a/source/BP-Essentials/Methods/misc/GetIdList.cs b/source/BP-Essentials/Methods/misc/GetIdList.cs
@@ -25,7 +25,7 @@ public static bool Run(bool silent)
                 Debug.Log("[OK] ID list downloaded");
                 Debug.Log("Reloading ID list..");
                 ReadFile.Run(IdListFile);
-                Debug.Log("[OK] Downloaded newest ID list and reloaded it!");
+                Debug.Log($"[OK] Downloaded newest ID list and reloaded it! ({IDs.Length} entries loaded in.)");
             }
             return true;
         }
diff --git a/source/BP-Essentials/Methods/misc/SendChatMessageToAdmins.cs b/source/BP-Essentials/Methods/misc/SendChatMessageToAdmins.cs
@@ -0,0 +1,22 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using UnityEngine;
+using static BP_Essentials.EssentialsVariablesPlugin;
+using static BP_Essentials.EssentialsMethodsPlugin;
+using System.IO;
+using System.Threading;
+using System.Reflection;
+
+namespace BP_Essentials
+{
+    class SendChatMessageToAdmins : EssentialsChatPlugin
+    {
+        public static void Run(string message)
+        {
+            foreach (var player in playerList.Where(x =>x.Value.receiveStaffChat && HasPermission.Run(x.Value.shplayer.svPlayer, CmdStaffChatExecutableBy)))
+                player.Value.shplayer.svPlayer.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, message);
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -25,24 +25,24 @@ public static bool Run(object oPlayer, string message)`
`25`	`25`	`return true;`
`26`	`26`	`}`
`27`	`27`	`int arg1int, arg2int;`
`28`		`- bool Parsed = Int32.TryParse(arg1, out arg1int);`
	`28`	`+ bool Parsed = int.TryParse(arg1, out arg1int);`
`29`	`29`	`Parsed = int.TryParse(arg2, out arg2int);`
`30`	`30`	`if (Parsed)`
`31`	`31`	`{`
`32`		`- if (arg1int > 1 && arg1int <= IDs.Length -1)`
	`32`	`+ if (arg1int > 0 && arg1int <= IDs.Length)`
`33`	`33`	`{`
`34`		`- foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())`
	`34`	`+ foreach (var shPlayer in FindObjectsOfType<ShPlayer>())`
`35`	`35`	`if (shPlayer.svPlayer == player && shPlayer.IsRealPlayer())`
`36`	`36`	`{`
`37`	`37`	`if (arg1.Length > 4)`
`38`	`38`	`shPlayer.TransferItem(1, arg1int, arg2int, true);`
`39`	`39`	`else`
`40`		`- shPlayer.TransferItem(1, IDs[arg1int], arg2int, true);`
	`40`	`+ shPlayer.TransferItem(1, IDs[arg1int - 1], arg2int, true);`
`41`	`41`	`player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Giving you item ID: </color><color={argColor}>{arg1}</color>");`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`else`
`45`		`- player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: The ID must be between 1 and {IDs.Length -1}.</color>");`
	`45`	`+ player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: The ID must be between 1 and {IDs.Length}.</color>");`
`46`	`46`	`}`
`47`	`47`	`else`
`48`	`48`	`player.SendToSelf(Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Error: Is that a valid number you provided as argument?</color>");`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static bool Run(bool silent)`
`25`	`25`	`Debug.Log("[OK] ID list downloaded");`
`26`	`26`	`Debug.Log("Reloading ID list..");`
`27`	`27`	`ReadFile.Run(IdListFile);`
`28`		`- Debug.Log("[OK] Downloaded newest ID list and reloaded it!");`
	`28`	`+ Debug.Log($"[OK] Downloaded newest ID list and reloaded it! ({IDs.Length} entries loaded in.)");`
`29`	`29`	`}`
`30`	`30`	`return true;`
`31`	`31`	`}`