From 92cc79f707e531a013b125a2a9bc4a08a515cd3f Mon Sep 17 00:00:00 2001
From: glax <johanna@bernloehr.eu>
Date: Fri, 19 Jan 2024 03:08:03 +0100
Subject: [PATCH] Improved Setup Update Dependency

---
 OpenCS2hock/OpenCS2hock.csproj |  2 +-
 OpenCS2hock/Setup.cs           | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/OpenCS2hock/OpenCS2hock.csproj b/OpenCS2hock/OpenCS2hock.csproj
index 072a853..a5b5a5a 100644
--- a/OpenCS2hock/OpenCS2hock.csproj
+++ b/OpenCS2hock/OpenCS2hock.csproj
@@ -11,7 +11,7 @@
 
     <ItemGroup>
       <PackageReference Include="CS2GSI" Version="1.0.7" />
-      <PackageReference Include="CShocker" Version="1.2.3" />
+      <PackageReference Include="CShocker" Version="1.2.5" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 
diff --git a/OpenCS2hock/Setup.cs b/OpenCS2hock/Setup.cs
index 4634ae9..2cd49a5 100644
--- a/OpenCS2hock/Setup.cs
+++ b/OpenCS2hock/Setup.cs
@@ -218,23 +218,26 @@ public static class Setup
 
     private static List<string> GetShockerIds(List<Shocker> shockers)
     {
-        List<string> allShockerIds = new();
-        foreach(Shocker shocker in shockers)
-            allShockerIds.AddRange(shocker.ShockerIds);
-
         List<string> ids = new();
         bool addAnother = true;
         while (ids.Count < 1 || addAnother)
         {
+            Console.WriteLine("Select Shocker API:");
+                for(int i = 0; i < shockers.Count; i++)
+                    Console.WriteLine($"{i}) {shockers[i]}");
             
-            for (int i = 0; i < allShockerIds.Count; i++)
-                Console.WriteLine($"{i}) {allShockerIds[i]}");
+            int selectedShocker;
+            while (!int.TryParse(Console.ReadLine(), out selectedShocker) || selectedShocker < 0 || selectedShocker >= shockers.Count)
+                Console.WriteLine("Select Shocker API:");
+            
+            for (int i = 0; i < shockers[selectedShocker].ShockerIds.Count; i++)
+                Console.WriteLine($"{i}) {shockers[selectedShocker].ShockerIds[i]}");
 
             int selectedIndex;
-            while (!int.TryParse(Console.ReadLine(), out selectedIndex) || selectedIndex < 0 || selectedIndex >= allShockerIds.Count)
+            while (!int.TryParse(Console.ReadLine(), out selectedIndex) || selectedIndex < 0 || selectedIndex >= shockers[selectedShocker].ShockerIds.Count)
                 Console.WriteLine("Select ID:");
             
-            ids.Add(allShockerIds[selectedIndex]);
+            ids.Add(shockers[selectedShocker].ShockerIds[selectedIndex]);
             
             Console.WriteLine("Add another ID? (Y/N):");
             addAnother = Console.ReadKey().Key == ConsoleKey.Y;