From 2d900b0caed594725dbc5683d486504aa1cfd880 Mon Sep 17 00:00:00 2001
From: CrafterPika <g.mueller.warngau@gmail.com>
Date: Sat, 27 Jun 2026 18:38:56 +0200
Subject: [PATCH] allways set currently selected weapon as default in ui

---
 httpMenu.cs       | 4 ++++
 modmenu/script.js | 9 +++++++++
 2 files changed, 13 insertions(+)

diff --git a/httpMenu.cs b/httpMenu.cs
index e8f91c3..3378c25 100644
--- a/httpMenu.cs
+++ b/httpMenu.cs
@@ -140,6 +140,10 @@ namespace ModMenu {
                     HandleThread(WeaponChangeThread);
                     return "1";
 
+                case "EquippedWep":
+                    string weaponId = Codes.EquippedWep();
+                    return $"{{\"EquippedWepId\": \"{weaponId}\"}}";
+
                 default:
                     return "Not Found";
             }
diff --git a/modmenu/script.js b/modmenu/script.js
index 4eb6043..c6e6b82 100644
--- a/modmenu/script.js
+++ b/modmenu/script.js
@@ -82,6 +82,8 @@ function populateWeaponSets() {
         opt.textContent = name;
         select.appendChild(opt);
     }
+
+    sendToCSharp("EquippedWep");
 }
 
 window.external.receiveMessage(message => {
@@ -97,6 +99,13 @@ window.external.receiveMessage(message => {
     try {
         const data = JSON.parse(message);
         //console.log("Parsed Data:", data);
+
+        if (data.EquippedWepId !== undefined) {
+            const select = document.getElementById("weapon-sets");
+            select.value = data.EquippedWepId;
+            return;
+        }
+
         const container = document.getElementById("pid-display");
 
         if (data.Players) {