fix: The default weapons are now customizable

Author: K4ryuu

CHANGELOG

@@ -1,3 +1,9 @@
+-- 2024.04.13 - 1.3.4
+
+- fix: Possible fix for GiveNamedItem2 problems on some servers
+- fix: The default weapons are now customizable
+
+
 -- 2024.04.11 - 1.3.3
 
 - fix: Remove HLTV from queues(?)

src-plugin/Plugin/Models/ArenaPlayerModel.cs

@@ -214,16 +214,12 @@ public void ShowWeaponSubPreferenceMenu(WeaponType weaponType)
 		MenuManager.OpenChatMenu(Controller, primaryPreferenceMenu);
 	}
 
-	public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr> GiveNamedItem2Linux = new(@"\x55\x48\x89\xE5\x41\x57\x41\x56\x41\x55\x41\x54\x53\x48\x83\xEC\x18\x48\x89\x7D\xC8\x48\x85\xF6\x74");
-	public static MemoryFunctionVoid<IntPtr, string, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr, IntPtr> GiveNamedItem2Windows = new(@"\x48\x83\xEC\x38\x48\xC7\x44\x24\x28\x00\x00\x00\x00\x45\x33\xC9\x45\x33\xC0\xC6\x44\x24\x20\x00\xE8\x2A\x2A\x2A\x2A\x48\x85");
 	public void PlayerGiveNamedItem(CCSPlayerController player, CsItem item)
 	{
 		if (!player.PlayerPawn.IsValid || player.PlayerPawn.Value == null || !player.PlayerPawn.Value.IsValid || player.PlayerPawn.Value.ItemServices == null)
 			return;
 
-		var GiveNamedItem2 = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? GiveNamedItem2Linux : RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? GiveNamedItem2Windows : null;
-
-		if (!Plugin.Config.CompatibilitySettings.MetamodSkinchanger || GiveNamedItem2 is null)
+		if (!Plugin.Config.CompatibilitySettings.MetamodSkinchanger || Plugin.GiveNamedItem2 is null)
 		{
 			player.GiveNamedItem(item);
 			return;
@@ -236,7 +232,7 @@ public void PlayerGiveNamedItem(CCSPlayerController player, CsItem item)
 
 		try
 		{
-			GiveNamedItem2.Invoke(player.PlayerPawn.Value.ItemServices.Handle, itemName, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
+			Plugin.GiveNamedItem2.Invoke(player.PlayerPawn.Value.ItemServices.Handle, itemName, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero, IntPtr.Zero);
 		}
 		catch (Exception e)
 		{

src-plugin/Plugin/PluginConfig.cs

@@ -132,6 +132,9 @@ public sealed class PluginConfig : BasePluginConfig
 		[JsonPropertyName("compatibility-settings")]
 		public CompatibilitySettings CompatibilitySettings { get; set; } = new CompatibilitySettings();
 
+		[JsonPropertyName("default-weapon-settings")]
+		public DefaultWeaponSettings DefaultWeaponSettings { get; set; } = new DefaultWeaponSettings();
+
 		[JsonPropertyName("ConfigVersion")]
 		public override int Version { get; set; } = 1;
 	}
@@ -196,6 +199,27 @@ public sealed class CommandSettings
 		};
 	}
 
+	public sealed class DefaultWeaponSettings
+	{
+		[JsonPropertyName("default-rifle")]
+		public int? DefaultRifle { get; set; } = null;
+
+		[JsonPropertyName("default-sniper")]
+		public int? DefaultSniper { get; set; } = null;
+
+		[JsonPropertyName("default-smg")]
+		public int? DefaultSMG { get; set; } = null;
+
+		[JsonPropertyName("default-lmg")]
+		public int? DefaultLMG { get; set; } = null;
+
+		[JsonPropertyName("default-shotgun")]
+		public int? DefaultShotgun { get; set; } = null;
+
+		[JsonPropertyName("default-pistol")]
+		public int? DefaultPistol { get; set; } = null;
+	}
+
 	public sealed class DatabaseSettings
 	{
 		[JsonPropertyName("host")]

src-plugin/Plugin/PluginDatabase.cs

@@ -52,14 +52,16 @@ public async Task LoadPlayerAsync(ulong SteamID)
 	{
 		string tablePrefix = Config.DatabaseSettings.TablePrefix;
 
+		DefaultWeaponSettings dws = Config.DefaultWeaponSettings;
+
 		string sqlInsertOrUpdate = $@"
-		INSERT INTO `{tablePrefix}k4-arenas` (`steamid64`, `lastseen`, `rounds`)
-		VALUES (@SteamID, CURRENT_TIMESTAMP, @Rounds)
-		ON DUPLICATE KEY UPDATE `lastseen` = CURRENT_TIMESTAMP;";
+				INSERT INTO `{tablePrefix}k4-arenas` (`steamid64`, `lastseen`, `rifle`, `sniper`, `shotgun`, `smg`, `lmg`, `pistol`, `rounds`)
+				VALUES (@SteamID, CURRENT_TIMESTAMP, {dws.DefaultRifle}, {dws.DefaultRifle}, {dws.DefaultShotgun}, {dws.DefaultSMG}, {dws.DefaultLMG}, {dws.DefaultPistol}, @Rounds)
+				ON DUPLICATE KEY UPDATE `lastseen` = CURRENT_TIMESTAMP;";
 
 		string sqlSelect = $@"
-		SELECT `rifle`, `sniper`, `shotgun`, `smg`, `lmg`, `pistol`, `rounds`
-		FROM `{tablePrefix}k4-arenas` WHERE `steamid64` = @SteamID;";
+				SELECT `rifle`, `sniper`, `shotgun`, `smg`, `lmg`, `pistol`, `rounds`
+				FROM `{tablePrefix}k4-arenas` WHERE `steamid64` = @SteamID;";
 
 		using MySqlConnection connection = CreateConnection(Config);
 		await connection.OpenAsync();