Merge branch 'main' of https://github.com/Razzmatazzz/RemnantSaveGuar…

…dian
Razzmatazzz · Aug 24, 2023 · 70c761f · 70c761f
2 parents 5e12f80 + a3ad4c1
commit 70c761f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/RemnantSaveGuardian/GameInfo.cs b/RemnantSaveGuardian/GameInfo.cs
@@ -162,6 +162,10 @@ public static void RefreshGameInfo()
                         {
                             rItem.TileSet = item["tileSet"].ToString();
                         }
+                        if (item["armorSet"] != null)
+                        {
+                            rItem.IsArmorSet = item["armorSet"].GetValue<bool>();
+                        }
                         eventItems.Add(rItem);
                     }
                     eventItem.Add(kvp.Key, eventItems);

diff --git a/RemnantSaveGuardian/RemnantItem.cs b/RemnantSaveGuardian/RemnantItem.cs
@@ -83,6 +83,7 @@ public string Key
         public string ItemNotes { get; set; }
         public bool Coop { get; set;  }
         public string TileSet { get; set; }
+        public bool IsArmorSet { get; set; }
         public RemnantItem(string nameOrKey)
         {
             this._key = nameOrKey;
@@ -94,6 +95,7 @@ public RemnantItem(string nameOrKey)
             this.ItemNotes = "";
             this.Coop = false;
             TileSet = "";
+            IsArmorSet = true;
             foreach (string pattern in ItemKeyPatterns) { 
                 var nameMatch = Regex.Match(nameOrKey, pattern);
                 if (!nameMatch.Success)

diff --git a/RemnantSaveGuardian/Views/Pages/WorldAnalyzerPage.xaml.cs b/RemnantSaveGuardian/Views/Pages/WorldAnalyzerPage.xaml.cs
@@ -477,9 +477,12 @@ private void SearchItem(RemnantItem item)
                 }
             }
 
-            if (item.RawType == "Armor")
+            if (item.RawType == "Armor" && item.IsArmorSet)
             {
                 itemname = itemname?.Substring(0, itemname.IndexOf("(")) + "Set";
+            } else if (item.RawType == "Armor")
+            {
+                itemname = itemname?.Substring(0, itemname.IndexOf(" ("));
             }
             Process.Start("explorer.exe", $"https://remnant2.wiki.fextralife.com/{itemname}");
         }

diff --git a/RemnantSaveGuardian/game.json b/RemnantSaveGuardian/game.json
@@ -441,7 +441,8 @@
       "TheLament": [
         {
           "name": "/Items/Armor/Armor_Head_LodestoneCrown",
-          "notes": "On the boat inside Kolkets locked room"
+          "notes": "On the boat inside Kolkets locked room",
+          "armorSet":  false
         },
         {
           "name": "/Items/Trinkets/Rings/BloodTingedRing/Ring_BloodTingedRing"
@@ -883,7 +884,8 @@
         },
         {
           "name": "/Items/Armor/Misc/Armor_Head_RedPrince",
-          "notes": "kill with Assassins Dagger"
+          "notes": "kill with Assassins Dagger",
+          "armorSet":  false
         }
       ],
       "NightWeaver": [
@@ -1279,7 +1281,8 @@
       ],
       "OilField": [
         {
-          "name": "/Items/Armor/Nerud_Pilot/Armor_Head_PilotsHelm"
+          "name": "/Items/Armor/Nerud_Pilot/Armor_Head_PilotsHelm",
+          "armorSet":  false
         },
         {
           "name": "/Items/Trinkets/Amulets/DetonationTrigger/Amulet_DetonationTrigger"