Merge pull request #31 from daffyyyy/patch-giving_knife

Improve knife giving

Config.cs

@@ -1,32 +1,56 @@
-using CounterStrikeSharp.API.Core;
+using CounterStrikeSharp.API.Core;
 using System.Text.Json.Serialization;
 
 namespace WeaponPaints
 {
+    public class Messages
+    {
+        [JsonPropertyName("WebsiteMessageCommand")]
+        public string WebsiteMessageCommand { get; set; } = "Visit {WEBSITE} where you can change skins.";
+        [JsonPropertyName("SynchronizeMessageCommand")]
+        public string SynchronizeMessageCommand { get; set; } = "Type !wp to synchronize chosen skins.";
+        [JsonPropertyName("KnifeMessageCommand")]
+        public string KnifeMessageCommand { get; set; } = "Type !knife to open knife menu.";
+        [JsonPropertyName("CooldownRefreshCommand")]
+        public string CooldownRefreshCommand { get; set; } = "You can't refresh weapon paints right now.";
+        [JsonPropertyName("SuccessRefreshCommand")]
+        public string SuccessRefreshCommand { get; set; } = "Refreshing weapon paints.";
+        [JsonPropertyName("ChosenKnifeMenu")]
+        public string ChosenKnifeMenu { get; set; } = "You have chosen {KNIFE} as your knife.";
+        [JsonPropertyName("KnifeMenuTitle")]
+        public string KnifeMenuTitle { get; set; } = "Knife Menu.";
+    }
+
     public class WeaponPaintsConfig : BasePluginConfig
     {
-        public override int Version { get; set; } = 1;
+        public override int Version { get; set; } = 2;
 
         [JsonPropertyName("DatabaseHost")]
-        public string DatabaseHost { get; set; } = "localhost";
+        public string DatabaseHost { get; set; } = "";
 
         [JsonPropertyName("DatabasePort")]
         public int DatabasePort { get; set; } = 3306;
 
         [JsonPropertyName("DatabaseUser")]
-        public string DatabaseUser { get; set; } = "dbuser";
+        public string DatabaseUser { get; set; } = "";
 
         [JsonPropertyName("DatabasePassword")]
-        public string DatabasePassword { get; set; } = "dbuserpw";
+        public string DatabasePassword { get; set; } = "";
 
         [JsonPropertyName("DatabaseName")]
-        public string DatabaseName { get; set; } = "dbname";
+        public string DatabaseName { get; set; } = "";
 
         [JsonPropertyName("CmdRefreshCooldownSeconds")]
         public int CmdRefreshCooldownSeconds { get; set; } = 60;
 
-        [JsonPropertyName("WebSite")]
-        public string WebSite { get; set; } = "http://wp.example.com";
-        
+        [JsonPropertyName("Prefix")]
+        public string Prefix { get; set; } = "[WeaponPaints]";
+
+        [JsonPropertyName("Website")]
+        public string Website { get; set; } = "example.com/skins";
+
+        [JsonPropertyName("Messages")]
+        public Messages Messages { get; set; } = new Messages();
     }
+    
 }

README.md

@@ -7,6 +7,8 @@
 ### Description
 Unfinished, unoptimized and not fully functional ugly demo weapon paints plugin for [CSSharp](https://docs.cssharp.dev/).
 
+### Created [Discord server](https://discord.gg/mwEQppJ5AT) where you can discus about plugin.
+
 ### Features
 - changes only paint, seed and wear on weapons and knives
 - mysql based

WeaponPaints.cs

@@ -9,6 +9,8 @@ using CounterStrikeSharp.API.Modules.Utils;
 using Nexd.MySQL;
 using System.Runtime.ExceptionServices;
 using static CounterStrikeSharp.API.Core.Listeners;
+using System.Reflection;
+
 
 namespace WeaponPaints;
 public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
@@ -22,11 +24,10 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 
     MySqlDb? MySql = null;
     private DateTime[] commandCooldown = new DateTime[Server.MaxPlayers];
-    private static string PluginPrefix = $" {ChatColors.Green}[WeaponPaints]{ChatColors.White}";
     private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponPaints = new();
     private Dictionary<ulong, Dictionary<nint, int>> gPlayerWeaponSeed = new();
     private Dictionary<ulong, Dictionary<nint, float>> gPlayerWeaponWear = new();
-    private Dictionary<int, string> g_playersKife = new();
+    private Dictionary<int, string> g_playersKnife = new();
     private static readonly Dictionary<string, string> knifeTypes = new()
     {
         { "m9", "weapon_knife_m9_bayonet" },
@@ -77,6 +78,11 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     public void OnConfigParsed(WeaponPaintsConfig config)
     {
+        if (config.DatabaseHost.Length < 1 || config.DatabaseName.Length < 1 || config.DatabaseUser.Length < 1)
+        {
+            throw new Exception("You need to setup Database credentials in config!");
+        }
+
         Config = config;
     }
     // TODO: fix for map which change mp_t_default_melee
@@ -126,16 +132,23 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     private void OnClientDisconnect(int playerSlot)
     {
         // TODO: Clean up after player
+        g_playersKnife.Remove(playerSlot+1);
     }
 
     private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
     {
         var player = @event.Userid;
-        if (!player.IsValid || !player.PlayerPawn.IsValid || player.IsBot)
+        if (!player.IsValid || !player.PlayerPawn.IsValid)
         {
             return HookResult.Continue;
         }
-        if (!PlayerHasKnife(player)) player.GiveNamedItem(g_playersKife[(int)player.EntityIndex!.Value.Value]);
+
+        GiveKnifeToPlayer(player);
+
+        // Check the best slot and set it. Weird solution but works xD
+        AddTimer(0.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot3"));
+        AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+        AddTimer(0.35f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
 
         return HookResult.Continue;
     }
@@ -162,7 +175,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             var player = Utilities.GetPlayerFromIndex(playerIndex);
             if (player == null || !player.IsValid || player.IsBot) return;
             // TODO: Remove knife crashes here, needs another solution
-            /*if (isKnife && g_playersKife[(int)player.EntityIndex!.Value.Value] != "weapon_knife" && (weapon.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.AttributeManager.Item.ItemDefinitionIndex == 59))
+            /*if (isKnife && g_playersKnife[(int)player.EntityIndex!.Value.Value] != "weapon_knife" && (weapon.AttributeManager.Item.ItemDefinitionIndex == 42 || weapon.AttributeManager.Item.ItemDefinitionIndex == 59))
             {
                 RemoveKnifeFromPlayer(player);
                 return;
@@ -184,9 +197,29 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
             }
         });
     }
+    public void GiveKnifeToPlayer(CCSPlayerController player)
+    {
+        if (player.IsBot) 
+        { 
+            player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
+            return;
+        }
+
+        if (!PlayerHasKnife(player))
+        {
+            if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
+            {
+                player.GiveNamedItem(knife);
+            }
+            else
+            {
+                player.GiveNamedItem((CsTeam)player.TeamNum == CsTeam.Terrorist ? "weapon_knife_t" : "weapon_knife");
+            }
+        }
+    }
     public void RemoveKnifeFromPlayer(CCSPlayerController player)
     {
-        if (!player.PawnIsAlive) return;
+        if (!g_playersKnife.ContainsKey((int)player.EntityIndex!.Value.Value)) return;
         var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
         foreach (var weapon in weapons)
         {
@@ -196,7 +229,6 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                 if (weapon.Value.DesignerName.Contains("knife"))
                 {
                     weapon.Value.Remove();
-                    player.GiveNamedItem(g_playersKife[(int)player.EntityIndex!.Value.Value]);
                     break;
                 }
             }
@@ -204,7 +236,6 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     public static bool PlayerHasKnife(CCSPlayerController player)
     {
-        if (!player.PawnIsAlive) return false;
         var weapons = player.PlayerPawn.Value.WeaponServices!.MyWeapons;
         foreach (var weapon in weapons)
         {
@@ -220,15 +251,19 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     }
     private void SetupMenus()
     {
-        var giveItemMenu = new ChatMenu("Knife Menu");
+        var giveItemMenu = new ChatMenu(ReplaceTags(Config.Messages.KnifeMenuTitle));
         var handleGive = (CCSPlayerController player, ChatMenuOption option) =>
         {
             if (knifeTypes.TryGetValue(option.Text, out var knife))
             {
                 Task.Run(() => SyncKnifeToDatabase((int)player.EntityIndex!.Value.Value, knife));
-                g_playersKife[(int)player.EntityIndex!.Value.Value] = knifeTypes[option.Text];
-                player.PrintToChat($"You have chosen {option.Text} as your knife.");
+                g_playersKnife[(int)player.EntityIndex!.Value.Value] = knifeTypes[option.Text];
+                if (!string.IsNullOrEmpty(Config.Messages.ChosenKnifeMenu)) {
+                    string temp = $"{Config.Prefix} {Config.Messages.ChosenKnifeMenu}".Replace("{KNIFE}", option.Text);
+                    player.PrintToChat(ReplaceTags(temp));
+                }
                 RemoveKnifeFromPlayer(player);
+                GiveKnifeToPlayer(player);
             }
         };
         foreach (var knife in knifeTypes)
@@ -241,23 +276,42 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     public void OnCommandRefresh(CCSPlayerController? player, CommandInfo command)
     {
         if (player == null) return;
+        string temp = "";
         int playerIndex = (int)player.EntityIndex!.Value.Value;
         if (DateTime.UtcNow >= commandCooldown[playerIndex].AddSeconds(Config.CmdRefreshCooldownSeconds))
         {
             commandCooldown[playerIndex] = DateTime.UtcNow;
             Task.Run(async () => await GetWeaponPaintsFromDatabase(playerIndex));
-            player.PrintToChat($"{PluginPrefix} Refreshing weapon paints.");
+            if (!string.IsNullOrEmpty(Config.Messages.SuccessRefreshCommand)) {
+                temp = $"{Config.Prefix} {Config.Messages.SuccessRefreshCommand}";
+                player.PrintToChat(ReplaceTags(temp));
+            }
             return;
         }
-        player.PrintToChat($"{PluginPrefix} You can't refresh weapon paints right now.");
+        if (!string.IsNullOrEmpty(Config.Messages.CooldownRefreshCommand)) {
+            temp = $"{Config.Prefix} {Config.Messages.CooldownRefreshCommand}";
+            player.PrintToChat(ReplaceTags(temp));
+        }
     }
     [ConsoleCommand("css_ws", "weaponskins")]
     public void OnCommandWS(CCSPlayerController? player, CommandInfo command)
     {
         if (player == null) return;
-        player.PrintToChat($"{PluginPrefix} Visit {ChatColors.Purple}{Config.WebSite} {ChatColors.White}where you can change skins.");
-        player.PrintToChat($"{PluginPrefix} Type {ChatColors.Purple}!wp  {ChatColors.White}in chat to synchronize chosen skins.");
-        player.PrintToChat($"{PluginPrefix} Type {ChatColors.Purple}!knife {ChatColors.White}in chat to open knife menu.");
+
+        string temp = "";
+
+        if (!string.IsNullOrEmpty(Config.Messages.WebsiteMessageCommand)) {
+            temp = $"{Config.Prefix} {Config.Messages.WebsiteMessageCommand}";
+            player.PrintToChat(ReplaceTags(temp));
+        }
+        if (!string.IsNullOrEmpty(Config.Messages.SynchronizeMessageCommand)) {
+            temp = $"{Config.Prefix} {Config.Messages.SynchronizeMessageCommand}";
+            player.PrintToChat(ReplaceTags(temp));
+        }
+        if (!string.IsNullOrEmpty(Config.Messages.KnifeMessageCommand)) {
+            temp = $"{Config.Prefix} {Config.Messages.KnifeMessageCommand}";
+            player.PrintToChat(ReplaceTags(temp));
+        }
     }
     public static CSkeletonInstance GetSkeletonInstance(CGameSceneNode node)
     {
@@ -276,7 +330,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                  .Add("steamid", "=", steamId.SteamId64.ToString());
 
             MySqlQueryResult result = await MySql!.Table("wp_player_skins").Where(conditions).SelectAsync();
-
+            if (result.Rows < 1) return;
             result.ToList().ForEach(pair =>
             {
                 int WeaponDefIndex = result.Get<int>(pair.Key, "weapon_defindex");
@@ -320,16 +374,18 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
 
             MySqlQueryResult result = await MySql!.Table("wp_player_knife").Where(conditions).SelectAsync();
 
+            if (result.Rows < 1)
+            {
+                //g_playersKnife[playerIndex] = "weapon_knife";
+                return;
+            }
+
             string knife = result.Get<string>(0, "knife");
             if (knife != null)
             {
-                g_playersKife[playerIndex] = knife;
+                g_playersKnife[playerIndex] = knife;
             }
-            else
-            {
-                g_playersKife[playerIndex] = "weapon_knife";
-            }
-            //Log($"{player.PlayerName} has this knife -> {g_playersKife[playerIndex]}");
+            //Log($"{player.PlayerName} has this knife -> {g_playersKnife[playerIndex]}");
         }
         catch (Exception e)
         {
@@ -353,6 +409,26 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         }
     }
 
+    private string ReplaceTags(string message)
+    {
+        if (message.Contains('{'))
+        {
+            string modifiedValue = message;
+            modifiedValue = modifiedValue.Replace("{WEBSITE}", Config.Website);
+            foreach (FieldInfo field in typeof(ChatColors).GetFields())
+            {
+                string pattern = $"{{{field.Name}}}";
+                if (message.Contains(pattern, StringComparison.OrdinalIgnoreCase))
+                {
+                    modifiedValue = modifiedValue.Replace(pattern, field.GetValue(null)!.ToString(), StringComparison.OrdinalIgnoreCase);
+                }
+            }
+            return modifiedValue;
+        }
+
+        return message;
+    }
+
     private static void Log(string message)
     {
         Console.BackgroundColor = ConsoleColor.DarkGray;
@@ -360,4 +436,4 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
         Console.WriteLine(message);
         Console.ResetColor();
     }
-}
+}