Update 2.6.0

Updated to game version 0.88 Added kit price, set to 0 to disable Added delete kit command Added warps, *almost* the same as kits
BPEssentials · Nov 11, 2018 · 7a9ea6a · 7a9ea6a
1 parent 8433b4b
commit 7a9ea6a
Show file tree

Hide file tree

Showing 34 changed files with 384 additions and 41 deletions.
diff --git a/source/BP-Essentials/BP-Essentials.csproj b/source/BP-Essentials/BP-Essentials.csproj
@@ -45,6 +45,9 @@
     <Compile Include="Chat\Commands\Admin\CheckAlts.cs" />
     <Compile Include="Chat\Commands\Admin\Clear.cs" />
     <Compile Include="Chat\Commands\Admin\ClearWanted.cs" />
+    <Compile Include="Chat\Commands\Admin\DeleteKit.cs" />
+    <Compile Include="Chat\Commands\Admin\DeleteWarp.cs" />
+    <Compile Include="Chat\Commands\Admin\CreateWarp.cs" />
     <Compile Include="Chat\Commands\Admin\CreateKit.cs" />
     <Compile Include="Chat\Commands\Admin\Disconnect.cs" />
     <Compile Include="Chat\Commands\Admin\FakeJoin.cs" />
@@ -87,8 +90,10 @@
     <Compile Include="Chat\Commands\Admin\GodMode.cs" />
     <Compile Include="Chat\Commands\Admin\Mute.cs" />
     <Compile Include="Chat\Commands\Everyone\GetKit.cs" />
+    <Compile Include="Chat\Commands\Everyone\GoToWarp.cs" />
     <Compile Include="Chat\Commands\Everyone\Home.cs" />
     <Compile Include="Chat\Commands\Everyone\ListKits.cs" />
+    <Compile Include="Chat\Commands\Everyone\ListWarps.cs" />
     <Compile Include="Chat\Commands\Everyone\OnlinePlayers.cs" />
     <Compile Include="Chat\Commands\Everyone\Pay.cs" />
     <Compile Include="Chat\Commands\Admin\Reload.cs" />
@@ -108,6 +113,7 @@
     <Compile Include="EssentialsVariables.cs" />
     <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Chat\Announce.cs" />
+    <Compile Include="Methods\FileHandler\Warps.cs" />
     <Compile Include="Methods\Utils\FillPlaceholders.cs" />
     <Compile Include="Methods\Utils\FilterComments.cs" />
     <Compile Include="Methods\Utils\GetShByStr.cs" />

diff --git a/source/BP-Essentials/Chat/Commands/Admin/ClearWanted.cs b/source/BP-Essentials/Chat/Commands/Admin/ClearWanted.cs
@@ -21,7 +21,7 @@ public static void Run(SvPlayer player, string message)
                 msg = "yourself";
             }
             foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                if (shPlayer.username == arg1 && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == arg1.ToString() && !shPlayer.svPlayer.IsServerside())
+                if (shPlayer.username == arg1 && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == arg1.ToString() && !shPlayer.svPlayer.serverside)
                 {
                     msg = shPlayer.username;
                     shPlayer.ClearCrimes();

diff --git a/source/BP-Essentials/Chat/Commands/Admin/CreateKit.cs b/source/BP-Essentials/Chat/Commands/Admin/CreateKit.cs
@@ -12,15 +12,16 @@ public class CreateKit
         public static void Run(SvPlayer player, string message)
         {
             var arg1 = GetArgument.Run(1, false, false, message);
-            var arg2 = GetArgument.Run(2, false, true, message);
-            if (string.IsNullOrEmpty(arg1.Trim()) || string.IsNullOrEmpty(arg2.Trim()))
+            var arg2 = GetArgument.Run(2, false, false, message);
+            var arg3 = GetArgument.Run(3, false, true, message);
+            if (string.IsNullOrEmpty(arg1.Trim()) || string.IsNullOrEmpty(arg2.Trim()) || string.IsNullOrEmpty(arg3.Trim()))
             {
                 player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, ArgRequired);
                 return;
             }
-            if (!int.TryParse(arg1, out int arg1i))
+            if (!int.TryParse(arg1, out int arg1i) || !int.TryParse(arg2, out int arg2i))
             {
-                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Cannot convert {arg1} to a integer.</color>");
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Cannot convert {arg1} or {arg2} to a integer.</color>");
                 return;
             }
             if (arg1i < 0)
@@ -34,7 +35,7 @@ public static void Run(SvPlayer player, string message)
                 player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>A kit already exists with that name.</color>");
                 return;
             }
-            Kits.CreateKit(player, arg2, arg1i, file);
+            Kits.CreateKit(player, arg3, arg1i, arg2i, file);
             player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Kit created. Please edit </color><color={argColor}>{file}</color> <color={infoColor}>to add ExecuteableBy.</color>");
         }
     }

diff --git a/source/BP-Essentials/Chat/Commands/Admin/CreateWarp.cs b/source/BP-Essentials/Chat/Commands/Admin/CreateWarp.cs
@@ -0,0 +1,42 @@
+using static BP_Essentials.EssentialsVariablesPlugin;
+using System;
+using static BP_Essentials.EssentialsMethodsPlugin;
+using System.IO;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BP_Essentials.Commands
+{
+    public class CreateWarp
+    {
+        public static void Run(SvPlayer player, string message)
+        {
+            var arg1 = GetArgument.Run(1, false, false, message);
+            var arg2 = GetArgument.Run(2, false, false, message);
+            var arg3 = GetArgument.Run(3, false, true, message);
+            if (string.IsNullOrEmpty(arg1.Trim()) || string.IsNullOrEmpty(arg2.Trim()) || string.IsNullOrEmpty(arg3.Trim()))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, ArgRequired);
+                return;
+            }
+            if (!int.TryParse(arg1, out int arg1i) || !int.TryParse(arg2, out int arg2i))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>Cannot convert {arg1} or {arg2} to a integer.</color>");
+                return;
+            }
+            if (arg1i < 0)
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>The delay must be a positive number (0 to disable)</color>");
+                return;
+            }
+            var file = Path.Combine(WarpDirectory, $"{arg3}.json");
+            if (File.Exists(file))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>A warp already exists with that name.</color>");
+                return;
+            }
+            Warps.CreateWarp(player, arg3, arg1i, arg2i, file);
+            player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Warp created. Please edit </color><color={argColor}>{file}</color> <color={infoColor}>to add ExecuteableBy and Price.</color>");
+        }
+    }
+}
diff --git a/source/BP-Essentials/Chat/Commands/Admin/DeleteKit.cs b/source/BP-Essentials/Chat/Commands/Admin/DeleteKit.cs
@@ -0,0 +1,30 @@
+using static BP_Essentials.EssentialsVariablesPlugin;
+using System;
+using static BP_Essentials.EssentialsMethodsPlugin;
+using System.IO;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BP_Essentials.Commands
+{
+    public class DeleteKit
+    {
+        public static void Run(SvPlayer player, string message)
+        {
+            var arg1 = GetArgument.Run(1, false, true, message);
+            if (string.IsNullOrEmpty(arg1.Trim()))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, ArgRequired);
+                return;
+            }
+            var file = Path.Combine(KitDirectory, $"{arg1}.json");
+            if (!File.Exists(file))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>No kits exist with that name.</color>");
+                return;
+            }
+            Kits.DeleteKit(player, file, arg1);
+            player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Kit deleted.</color>");
+        }
+    }
+}
diff --git a/source/BP-Essentials/Chat/Commands/Admin/DeleteWarp.cs b/source/BP-Essentials/Chat/Commands/Admin/DeleteWarp.cs
@@ -0,0 +1,30 @@
+using static BP_Essentials.EssentialsVariablesPlugin;
+using System;
+using static BP_Essentials.EssentialsMethodsPlugin;
+using System.IO;
+using System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace BP_Essentials.Commands
+{
+    public class DeleteWarp
+    {
+        public static void Run(SvPlayer player, string message)
+        {
+            var arg1 = GetArgument.Run(1, false, true, message);
+            if (string.IsNullOrEmpty(arg1.Trim()))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, ArgRequired);
+                return;
+            }
+            var file = Path.Combine(WarpDirectory, $"{arg1}.json");
+            if (!File.Exists(file))
+            {
+                player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>No warps exist with that name.</color>");
+                return;
+            }
+            Warps.DeleteWarp(player, file, arg1);
+            player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Warp deleted.</color>");
+        }
+    }
+}
diff --git a/source/BP-Essentials/Chat/Commands/Admin/Feed.cs b/source/BP-Essentials/Chat/Commands/Admin/Feed.cs
@@ -24,7 +24,7 @@ public static void Run(SvPlayer player, string message)
                 bool found = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                     if (shPlayer.username == arg1 || shPlayer.ID.ToString() == arg1.ToString())
-                        if (!shPlayer.svPlayer.IsServerside())
+                        if (!shPlayer.svPlayer.serverside)
                         {
                             shPlayer.svPlayer.UpdateStats(100F, 100F, 100F, 100F);
                             player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, String.Format(msg, shPlayer.username));

diff --git a/source/BP-Essentials/Chat/Commands/Admin/GodMode.cs b/source/BP-Essentials/Chat/Commands/Admin/GodMode.cs
@@ -19,7 +19,7 @@ public static void Run(SvPlayer player, string message) {
                 }
                 else
                     foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                        if (shPlayer.username == name && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == name && !shPlayer.svPlayer.IsServerside())
+                        if (shPlayer.username == name && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == name && !shPlayer.svPlayer.serverside)
                         {
                             name = shPlayer.username;
                             msg = $"<color={infoColor}>Godmode </color><color={argColor}>{{0}}</color><color={infoColor}> for </color><color={argColor}>'{name}'</color><color={infoColor}>.</color>";

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Heal.cs b/source/BP-Essentials/Chat/Commands/Admin/Heal.cs
@@ -24,7 +24,7 @@ public static void Run(SvPlayer player, string message)
                 bool found = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                     if (shPlayer.username == arg1 || shPlayer.ID.ToString() == arg1.ToString())
-                        if (!shPlayer.svPlayer.IsServerside())
+                        if (!shPlayer.svPlayer.serverside)
                         {
                             shPlayer.svPlayer.Heal(100);
                             player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, String.Format(msg, shPlayer.username));

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Info.cs b/source/BP-Essentials/Chat/Commands/Admin/Info.cs
@@ -18,7 +18,7 @@ public static void Run(SvPlayer player, string message)
             {
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                     if (shPlayer.username == arg1 || shPlayer.ID.ToString() == arg1.ToString())
-                        if (!shPlayer.svPlayer.IsServerside())
+                        if (!shPlayer.svPlayer.serverside)
                         {
                             player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "Info about: '" + shPlayer.username + "'.");
                             string[] contentarray = {
@@ -33,7 +33,7 @@ public static void Run(SvPlayer player, string message)
                                     "IsAdmin:                 " + shPlayer.admin,
                                     "BankBalance:         " + shPlayer.svPlayer.bankBalance,
                                     "ChatEnabled:         " + playerList[shPlayer.ID].chatEnabled,
-                                    "IP:                            " + shPlayer.svPlayer.svManager.GetAddress(shPlayer.svPlayer.connection)
+                                    "IP:                            " + shPlayer.svPlayer.connection.IP
                                 };
 
                             var content = string.Join("\r\n", contentarray);

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Launch.cs b/source/BP-Essentials/Chat/Commands/Admin/Launch.cs
@@ -19,7 +19,7 @@ public static void Run(SvPlayer player, string message)
             {
                 bool playerfound = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.IsServerside())
+                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.serverside)
                     {
                         shPlayer.svPlayer.SvForce(new Vector3(0f, 6500f, 0f));
                         shPlayer.svPlayer.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={warningColor}>Off you go!</color>");

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Money.cs b/source/BP-Essentials/Chat/Commands/Admin/Money.cs
@@ -31,7 +31,7 @@ public static void Run(SvPlayer player, string message)
             {
                 bool found = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.IsServerside())
+                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.serverside)
                     {
                         shPlayer.TransferMoney(DeltaInv.AddToMe, arg2int, true);
                         player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Successfully gave</color><color={argColor}> " + shPlayer.username + " " + arg2int + $"</color><color={infoColor}>$</color>");

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Mute.cs b/source/BP-Essentials/Chat/Commands/Admin/Mute.cs
@@ -18,7 +18,7 @@ public static void Run(SvPlayer player, string message)
             muteuser = GetArgument.Run(1, false, true, message);
             foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
                 if (shPlayer.username == muteuser.ToString() || shPlayer.ID.ToString() == muteuser.ToString())
-                    if (!shPlayer.svPlayer.IsServerside())
+                    if (!shPlayer.svPlayer.serverside)
                     {
                         muteuser = shPlayer.username;
                         found = true;

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Restrain.cs b/source/BP-Essentials/Chat/Commands/Admin/Restrain.cs
@@ -24,7 +24,7 @@ public static void Run(SvPlayer player, string message)
                 shPlayer.svPlayer.Restrain(shPlayer.manager.handcuffed);
                 var shRetained = shPlayer.curEquipable as ShRestrained;
                 shPlayer.svPlayer.SvSetEquipable(shRetained.otherRestrained.index);
-                if (!shPlayer.svPlayer.IsServerside())
+                if (!shPlayer.svPlayer.serverside)
                     shPlayer.svPlayer.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, "You've been restrained");
                 player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Restrained</color> <color={argColor}>" + shPlayer.username + $"</color><color={infoColor}>.</color>");
             }

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Search.cs b/source/BP-Essentials/Chat/Commands/Admin/Search.cs
@@ -18,10 +18,10 @@ public static void Run(SvPlayer player, string message)
             else
             {
                 foreach (var shPlayer2 in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                    if (shPlayer2.username == arg1 && !shPlayer2.svPlayer.IsServerside() || shPlayer2.ID.ToString() == arg1 && !shPlayer2.svPlayer.IsServerside())
+                    if (shPlayer2.username == arg1 && !shPlayer2.svPlayer.serverside || shPlayer2.ID.ToString() == arg1 && !shPlayer2.svPlayer.serverside)
                     {
                         foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                            if (shPlayer.svPlayer == player && !shPlayer.svPlayer.IsServerside())
+                            if (shPlayer.svPlayer == player && !shPlayer.svPlayer.serverside)
                             {
                                 if (!shPlayer2.IsDead())
                                 {
@@ -30,7 +30,7 @@ public static void Run(SvPlayer player, string message)
                                     shPlayer2.viewers.Add(shPlayer);
                                     shPlayer.otherEntity = shPlayer2;
                                     player.Send(SvSendType.Self, Channel.Fragmented, 13, shPlayer.otherEntity.ID, shPlayer.otherEntity.SerializeMyItems());
-                                    if (!shPlayer2.svPlayer.IsServerside() && shPlayer2.viewers.Count == 1)
+                                    if (!shPlayer2.svPlayer.serverside && shPlayer2.viewers.Count == 1)
                                         shPlayer2.svPlayer.Send(SvSendType.Self, Channel.Reliable, 16, new System.Object[] { });
                                     player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={infoColor}>Viewing inventory of</color> <color={argColor}>{shPlayer2.username}</color>");
                                     shPlayer2.svPlayer.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"{AdminSearchingInv}");

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Slap.cs b/source/BP-Essentials/Chat/Commands/Admin/Slap.cs
@@ -19,10 +19,10 @@ public static void Run(SvPlayer player, string message)
             {
                 bool playerfound = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.IsServerside())
+                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.serverside)
                     {
                         foreach (var shPlayer2 in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                            if (shPlayer2.svPlayer == player && !shPlayer2.svPlayer.IsServerside())
+                            if (shPlayer2.svPlayer == player && !shPlayer2.svPlayer.serverside)
                             {
                                 int amount = new System.Random().Next(4, 15);
                                 shPlayer.svPlayer.Damage(DamageIndex.Null, amount, null, null);

diff --git a/source/BP-Essentials/Chat/Commands/Admin/Strip.cs b/source/BP-Essentials/Chat/Commands/Admin/Strip.cs
@@ -19,7 +19,7 @@ public static void Run(SvPlayer player, string message)
             {
                 bool playerfound = false;
                 foreach (var shPlayer in UnityEngine.Object.FindObjectsOfType<ShPlayer>())
-                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.IsServerside() || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.IsServerside())
+                    if (shPlayer.username == arg1 && !shPlayer.svPlayer.serverside || shPlayer.ID.ToString() == arg1 && !shPlayer.svPlayer.serverside)
                     {
                         // To be improved
                         shPlayer.svPlayer.SvSetWearable(-1626497894);  //NullArmor

diff --git a/source/BP-Essentials/Chat/Commands/Everyone/GetKit.cs b/source/BP-Essentials/Chat/Commands/Everyone/GetKit.cs
@@ -40,6 +40,15 @@ public static void Run(SvPlayer player, string message)
                 player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>You already used this kit. Please wait</color> <color={argColor}>{obj.CurrentlyInCooldown[player.player.username]}</color> <color={errorColor}>second(s) before executing this command again.</color>");
                 return;
             }
+            if (obj.Price > 0)
+            {
+                if (player.player.MyMoneyCount() < obj.Price)
+                {
+                    player.Send(SvSendType.Self, Channel.Unsequenced, ClPacket.GameMessage, $"<color={errorColor}>You do not have enough money to get this kit. (You have: {player.player.MyMoneyCount()} | Needed: {obj.Price})</color>");
+                    return;
+                }
+                player.player.TransferMoney(DeltaInv.RemoveFromMe, obj.Price, true);
+            }
             foreach (var item in obj.Items)
             {
                 player.player.TransferItem(DeltaInv.AddToMe, item.Id, item.Amount, true);