Update build.yml

Website now use json file to load skins

.github/workflows/build.yml

@@ -34,13 +34,16 @@ jobs:
           ${{ env.OUTPUT_PATH }}/CounterStrikeSharp.API.dll \
           ${{ env.OUTPUT_PATH }}/McMaster.NETCore.Plugins.dll \
           ${{ env.OUTPUT_PATH }}/Microsoft.DotNet.PlatformAbstractions.dll \
-          ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll 
+          ${{ env.OUTPUT_PATH }}/Microsoft.Extensions.DependencyModel.dll \
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:
         type: 'zip'
         filename: '${{ env.PROJECT_NAME }}.zip'
         path: ${{ env.OUTPUT_PATH }}
+    - name: Clean files Website
+      run: |
+        rm -rf website/img/
     - name: Zip
       uses: thedoctor0/zip-release@0.7.5
       with:
@@ -54,4 +57,4 @@ jobs:
         name: "Build ${{ env.BUILD_NUMBER }}"
         tag: "build-${{ env.BUILD_NUMBER }}"
         body: |
-          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints
+          Place the plugin in game/csgo/addons/counterstrikesharp/plugins/WeaponPaints

WeaponPaints.cs

@@ -138,32 +138,17 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
     private HookResult OnPlayerSpawn(EventPlayerSpawn @event, GameEventInfo info)
     {
         var player = @event.Userid;
-        if (!player.IsValid || !player.PlayerPawn.IsValid || !player.PawnIsAlive)
+        if (!player.IsValid || !player.PlayerPawn.IsValid)
         {
             return HookResult.Continue;
         }
-        if (player.IsBot) 
-        { 
-            player.GiveNamedItem("weapon_knife");
-            return HookResult.Continue;
-        }
 
-        if (!PlayerHasKnife(player))
+        GiveKnifeToPlayer(player);
-        {
-            if (g_playersKnife.TryGetValue((int)player.EntityIndex!.Value.Value, out var knife))
-            {
-                player.GiveNamedItem(knife);
-            }
-            else
-            {
-                player.GiveNamedItem("weapon_knife");
-            }
-        }
 
         // 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.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
+        AddTimer(0.25f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot2"));
-        AddTimer(0.1f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
+        AddTimer(0.35f, () => NativeAPI.IssueClientCommand((int)player.EntityIndex!.Value.Value - 1, "slot1"));
 
         return HookResult.Continue;
     }
@@ -212,9 +197,28 @@ 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)
@@ -225,7 +229,6 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                 if (weapon.Value.DesignerName.Contains("knife"))
                 {
                     weapon.Value.Remove();
-                    player.GiveNamedItem(g_playersKnife[(int)player.EntityIndex!.Value.Value]);
                     break;
                 }
             }
@@ -233,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)
         {
@@ -261,6 +263,7 @@ public class WeaponPaints : BasePlugin, IPluginConfig<WeaponPaintsConfig>
                     player.PrintToChat(ReplaceTags(temp));
                 }
                 RemoveKnifeFromPlayer(player);
+                GiveKnifeToPlayer(player);
             }
         };
         foreach (var knife in knifeTypes)

website/class/utils.php

@@ -0,0 +1,48 @@
+<?php
+class UtilsClass
+{
+    public static function skinsFromJson(): array
+    {
+        $skins = [];
+        $json = json_decode(file_get_contents(__DIR__ . "/../data/skins.json"), true);
+
+        foreach ($json as $skin) {
+            $skins[(int)$skin['weapon_defindex']][(int)$skin['paint']] = [
+                'paint_name' => $skin['paint_name'],
+                'image_url' => $skin['image'],
+            ];
+        }
+
+        return $skins;
+    }
+
+    public static function getWeaponsFromArray()
+    {
+        $weapons = [];
+        $temp = self::skinsFromJson();
+
+        foreach ($temp as $key => $value)
+        {
+            if (key_exists($key, $weapons)) continue;
+
+            $weapons[$key] = [
+                'paint_name' => $value[0]['paint_name'],
+                'image_url' => $value[0]['image_url'],
+            ];
+        }
+
+        return $weapons;
+    }
+
+    public static function getSelectedSkins(array $temp)
+    {
+        $selected = [];
+
+        foreach ($temp as $weapon)
+        {
+            $selected[$weapon['weapon_defindex']] = $weapon['weapon_paint_id'];
+        }
+
+        return $selected;
+    }
+}

website/index.php

@@ -2,26 +2,30 @@
 require_once 'class/config.php';
 require_once 'class/database.php';
 require_once 'steamauth/steamauth.php';
+require_once 'class/utils.php';
+
 
 $db = new DataBase();
+if (isset($_SESSION['steamid'])) {
 
-if(isset($_SESSION['steamid']))
+	include('steamauth/userInfo.php');
-{
-	include ('steamauth/userInfo.php');
 	$steamid = $steamprofile['steamid'];
-	
+
-	if(isset($_POST['forma'])) {
+	$weapons = UtilsClass::getWeaponsFromArray();
+	$skins = UtilsClass::skinsFromJson();
+	$querySelected = $query3 = $db->select("SELECT `weapon_defindex`, `weapon_paint_id` FROM `wp_player_skins` WHERE `wp_player_skins`.`steamid` = :steamid", ["steamid" => $steamid]);
+	$selectedSkins = UtilsClass::getSelectedSkins($querySelected);
+
+	if (isset($_POST['forma'])) {
 		$ex = explode("-", $_POST['forma']);
-		
+
-		$query2 = $db->select("SELECT * FROM wp_weapons_paints WHERE weapon_defindex = :weapon_defindex AND paint = :paint", ["weapon_defindex" => $ex[0], "paint" => $ex[1]]);
+		if (array_key_exists($ex[1], $skins[$ex[0]])) {
-		
+			if (array_key_exists($ex[0], $selectedSkins)) {
-		if($query2) {
+				$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
-			$check = $db->select("SELECT * FROM wp_weapons_paints LEFT JOIN wp_player_skins ON wp_player_skins.weapon_paint_id = wp_weapons_paints.paint AND wp_player_skins.weapon_defindex = wp_weapons_paints.weapon_defindex WHERE wp_weapons_paints.weapon_defindex = :weapon_defindex AND wp_player_skins.steamid = :steamid", ["weapon_defindex" => $ex[0], "steamid" => $steamid]);
-			if($check) {
-				$db->query("UPDATE wp_player_skins SET weapon_paint_id = :weapon_paint_id WHERE steamid = :steamid AND weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $query2[0]['paint']]);
 			} else {
-				$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id)", ["steamid" => $steamid, "weapon_defindex" => $ex[0],"weapon_paint_id" => $query2[0]["paint"]]);
+				$db->query("INSERT INTO wp_player_skins (`steamid`, `weapon_defindex`, `weapon_paint_id`) VALUES (:steamid, :weapon_defindex, :weapon_paint_id)", ["steamid" => $steamid, "weapon_defindex" => $ex[0], "weapon_paint_id" => $ex[1]]);
 			}
+			header("Location: index.php");
 		}
 	}
 }
@@ -29,70 +33,67 @@ if(isset($_SESSION['steamid']))
 
 <!DOCTYPE html>
 <html lang="en">
-  <head>
+
-    <meta charset="utf-8">
+<head>
-	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+	<meta charset="utf-8">
-	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js" integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL" crossorigin="anonymous"></script>
+	<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/css/bootstrap.min.css" rel="stylesheet"
+		integrity="sha384-T3c6CoIi6uLrA9TneNEoa7RxnatzjcDSCmG1MXxSR1GAsXEV/Dwwykc2MPK8M2HN" crossorigin="anonymous">
+	<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.2/dist/js/bootstrap.bundle.min.js"
+		integrity="sha384-C6RzsynM9kWDrMNeT87bh95OGNyZPhcTNXj1NW7RuBCsyN/o0jlpcV8Qyq46cDfL"
+		crossorigin="anonymous"></script>
 	<link rel="stylesheet" href="style.css">
 	<title>CS2 Simple Weapon Paints</title>
 </head>
+
 <body>
 
-<?php
+	<?php
-if(!isset($_SESSION['steamid']))
+	if (!isset($_SESSION['steamid'])) {
-{
+		echo "<div class='bg-primary'><h2>To choose weapon paints loadout, you need to ";
-	echo "<div class='bg-primary'><h2>To choose weapon paints loadout, you need to ";
+		loginbutton("rectangle");
-	loginbutton("rectangle");
+		echo "</h2></div>";
-	echo "</h2></div>";
+	} else {
-}
+		echo "<div class='bg-primary'>Your current weapon skin loadout<form action='' method='get'><button class='btn btn-secondary' name='logout' type='submit'>Logout</button></form></div>";
-else
+		echo "<div class='card-group'>";
-{
+		foreach ($weapons as $defindex => $default) { ?>
-	echo "<div class='bg-primary'>Your current weapon skin loadout<form action='' method='get'><button class='btn btn-secondary' name='logout' type='submit'>Logout</button></form></div>";
+			<div class="col-sm-2">
-	echo "<div class='card-group'>";
+				<div class="card text-center mb-3">
-	$query = $db->select("SELECT * FROM wp_weapons_paints GROUP BY weapon_defindex ORDER BY weapon_defindex");
+					<div class="card-body">
-	foreach($query as $key) { ?>
+						<?php
-    <div class="col-sm-2">
+						if (array_key_exists($defindex, $selectedSkins)) {
-        <div class="card text-center mb-3">
+							echo "<div class='card-header'>";
-			<div class="card-body">
+							echo "<h5 class='card-title item-name'>{$skins[$defindex][$selectedSkins[$defindex]]["paint_name"]}</h5>";
-				<?php
+							echo "</div>";
-				if($query3 = $db->select("SELECT * FROM wp_weapons_paints LEFT JOIN wp_player_skins ON wp_player_skins.weapon_paint_id = wp_weapons_paints.paint AND wp_player_skins.weapon_defindex = wp_weapons_paints.weapon_defindex WHERE wp_player_skins.steamid = :steamid AND wp_weapons_paints.weapon_defindex = :weapon_defindex", ["steamid" => $steamid, "weapon_defindex" => $key['weapon_defindex']]))
+							echo "<img src='{$skins[$defindex][$selectedSkins[$defindex]]['image_url']}' class='skin-image' >";
-				{
+						} else {
-					echo "<div class='card-header'>";
+							echo "<div class='card-header'>";
-					echo"<h5 class='card-title item-name'>{$query3[0]["paint_name"]}</h5>";
+							echo "<h5 class='card-title item-name'>{$default["paint_name"]}</h5>";
-					echo "</div>";
+							echo "</div>";
-					echo "<img src='{$query3[0]["image"]}' class='skin-image' >";
+							echo "<img src='{$default["image_url"]}' class='skin-image'>";
-				}
+						}
-				else
+						?>
-				{
+					</div>
-					echo "<div class='card-header'>";
+					<div class="card-footer">
-					echo"<h5 class='card-title item-name'>{$key["paint_name"]}</h5>";
+						<form action="" method="POST">
-					echo "</div>";
+							<select name="forma" class="form-control select" onchange="this.form.submit()" class="SelectWeapon">
-					echo"<img src='{$key["image"]}' class='skin-image'>";
+								<option>Select skin</option>
-				}
+								<?php
-				?>
+								foreach ($skins[$defindex] as $paintKey => $paint) {
+									if (array_key_exists($defindex, $selectedSkins) && $selectedSkins[$defindex] == $paintKey)
+										echo "<option selected value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
+									else
+										echo "<option value=\"{$defindex}-{$paintKey}\">{$paint['paint_name']}</option>";
+								}
+								?>
+							</select>
+						</form>
+					</div>
+				</div>
 			</div>
-			<div class="card-footer">
+		<?php } ?>
-				<form action="" method="POST">
-					<select name="forma" class="form-control select" onchange="this.form.submit()" class="SelectWeapon">
-					<option>Select skin</option>
-					<?php
-					$list = $db->select("SELECT * FROM wp_weapons_paints WHERE weapon_defindex = \"{$key["weapon_defindex"]}\"");
-					foreach ($list as $list) {
-						if ($list['paint_name'] == $query3[0]["paint_name"])
-							echo "<option selected value=\"{$list['weapon_defindex']}-{$list['paint']}\">{$list['paint_name']}</option>";
-						else
-							echo "<option value=\"{$list['weapon_defindex']}-{$list['paint']}\">{$list['paint_name']}</option>";
-					}
-					?>
-					</select>
-				</form>
-			</div>
-        </div>
-    </div>
 	<?php } ?>
 	</div>
-<?php } ?>
-
 
 </body>
+
 </html>