Add known DLC3 items

Razzmatazzz · Sep 28, 2024 · 0615102 · 0615102
1 parent 8a411c1
commit 0615102
Show file tree

Hide file tree

Showing 4 changed files with 590 additions and 5 deletions.
diff --git a/RemnantSaveGuardian/RemnantItem.cs b/RemnantSaveGuardian/RemnantItem.cs
@@ -12,14 +12,15 @@ public class RemnantItem : IEquatable<Object>, IComparable
             @"/Items/(?<itemType>Archetypes)/\w+/(?<itemName>Archetype_\w+)(?:\.|$)", // archetypes
             @"/Items/Archetypes/(?<archetypeName>\w+)/(?<itemType>\w+)/\w+/(?<itemName>\w+)(?:\.|$)", // perks and skills
             @"/Items/(?<itemType>Traits)/(?<traitType>\w+?/)?\w+?/(?<itemName>\w+)(?:\.|$)", // traits
-            @"/Items/Archetypes/(?<archetypeName>\w+)/PerksAnd(?<itemType>Traits)/(?<itemName>\w+)", // archetype traits dlc2
+            @"/Items/Archetypes/(?<archetypeName>\w+)/(?:PerksAnd)?(?<itemType>Traits)/(?<itemName>\w+)", // archetype traits dlc2 and dlc3
             @"/Items/Archetypes/(?<armorSet>\w+)/(?<itemType>Armor)/(?<itemName>\w+)(?:\.|$)", // armors
             @"/Items/(?<itemType>Armor)/(?:\w+/)?(?:(?<armorSet>\w+)/)?(?<itemName>\w+)(?:\.|$)", // armor
             @"/Items/(?<itemType>Weapons)/(?:\w+/)+(?<itemName>\w+)(?:\.|$)", // weapons
             @"/Items/(?<itemType>Gems)/(?:\w+/)+(?<itemName>\w+)(?:\.|$)", // gems
             @"/Items/Armor/(?:\w+/)?(?<itemType>Relic)Testing/(?:\w+/)+(?<itemName>\w+)(?:\.|$)", // relics
             @"/Items/(?<itemType>Relic)s/(?:\w+/)+(?<itemName>\w+)(?:\.|$)", // relics
             @"/Items/Materials/(?<itemType>Engrams)/(?<itemName>\w+)(?:\.|$)", // engrams
+            @"/Items/Archetypes/(?<archetypeName>Warden)/(?<itemName>Item_HiddenContainer_Material_Engram_Warden)", // warden engram
             @"/(?<itemType>Quests)/Quest_\w+/Items/(?<itemName>\w+)(?:\.|$)", // quest items
             @"/Items/(?<itemType>Materials)/World/\w+/(?<itemName>\w+)(?:\.|$)", // materials
         };
@@ -106,7 +107,11 @@ public RemnantItem(string nameOrKey)
                     continue;
                 }
                 this._key = this._key.Replace(".", "");
-                this._type = nameMatch.Groups["itemType"].Value;
+                if (nameMatch.Groups["archetypeName"].Value == "Warden") {
+                    this._type = "Engrams";
+                } else {
+                    this._type = nameMatch.Groups["itemType"].Value;
+                }
                 this._name = nameMatch.Groups["itemName"].Value;
                 if (nameMatch.Groups.ContainsKey("armorSet"))
                 {

diff --git a/RemnantSaveGuardian/RemnantWorldEvent.cs b/RemnantSaveGuardian/RemnantWorldEvent.cs
@@ -1314,7 +1314,7 @@ static public void ProcessEvents(RemnantCharacter character, List<Match> areas,
             if (mode == ProcessMode.Campaign)
             {
                 // Add Ward 13 events
-                List<string> ward13Events = new() { "Ward13", "Cass", "Brabus", "Mudtooth", "Reggie", "Whispers", "McCabe", "Dwell" };
+                List<string> ward13Events = new() { "Ward13", "Cass", "Brabus", "Mudtooth", "Reggie", "Whispers", "McCabe", "Dwell", "Duane" };
                 foreach (var eName in ward13Events)
                 {
                     var wardEvent = new RemnantWorldEvent(eName, "World_Earth", "Home");