diff --git a/RemnantSaveGuardian/RemnantItem.cs b/RemnantSaveGuardian/RemnantItem.cs index 4fc6dd9..e4c7c85 100644 --- a/RemnantSaveGuardian/RemnantItem.cs +++ b/RemnantSaveGuardian/RemnantItem.cs @@ -12,7 +12,7 @@ public class RemnantItem : IEquatable, IComparable @"/Items/(?Archetypes)/\w+/(?Archetype_\w+)(?:\.|$)", // archetypes @"/Items/Archetypes/(?\w+)/(?\w+)/\w+/(?\w+)(?:\.|$)", // perks and skills @"/Items/(?Traits)/(?\w+?/)?\w+?/(?\w+)(?:\.|$)", // traits - @"/Items/Archetypes/(?\w+)/PerksAnd(?Traits)/(?\w+)", // archetype traits dlc2 + @"/Items/Archetypes/(?\w+)/(?:PerksAnd)?(?Traits)/(?\w+)", // archetype traits dlc2 and dlc3 @"/Items/Archetypes/(?\w+)/(?Armor)/(?\w+)(?:\.|$)", // armors @"/Items/(?Armor)/(?:\w+/)?(?:(?\w+)/)?(?\w+)(?:\.|$)", // armor @"/Items/(?Weapons)/(?:\w+/)+(?\w+)(?:\.|$)", // weapons @@ -20,6 +20,7 @@ public class RemnantItem : IEquatable, IComparable @"/Items/Armor/(?:\w+/)?(?Relic)Testing/(?:\w+/)+(?\w+)(?:\.|$)", // relics @"/Items/(?Relic)s/(?:\w+/)+(?\w+)(?:\.|$)", // relics @"/Items/Materials/(?Engrams)/(?\w+)(?:\.|$)", // engrams + @"/Items/Archetypes/(?Warden)/(?Item_HiddenContainer_Material_Engram_Warden)", // warden engram @"/(?Quests)/Quest_\w+/Items/(?\w+)(?:\.|$)", // quest items @"/Items/(?Materials)/World/\w+/(?\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 index 2ee2f7d..6f1cdf9 100644 --- a/RemnantSaveGuardian/RemnantWorldEvent.cs +++ b/RemnantSaveGuardian/RemnantWorldEvent.cs @@ -1314,7 +1314,7 @@ static public void ProcessEvents(RemnantCharacter character, List areas, if (mode == ProcessMode.Campaign) { // Add Ward 13 events - List ward13Events = new() { "Ward13", "Cass", "Brabus", "Mudtooth", "Reggie", "Whispers", "McCabe", "Dwell" }; + List ward13Events = new() { "Ward13", "Cass", "Brabus", "Mudtooth", "Reggie", "Whispers", "McCabe", "Dwell", "Duane" }; foreach (var eName in ward13Events) { var wardEvent = new RemnantWorldEvent(eName, "World_Earth", "Home"); diff --git a/RemnantSaveGuardian/game.json b/RemnantSaveGuardian/game.json index b70b4bf..78610c6 100644 --- a/RemnantSaveGuardian/game.json +++ b/RemnantSaveGuardian/game.json @@ -1340,6 +1340,9 @@ { "name": "/Items/Armor/Base/RelicTesting/SiphonHeart/Relic_Consumable_SiphonHeart", "notes": "give Shining Essence to Custodian" + }, + { + "name": "/Items/Trinkets/Rings/CustodiansBastion/Ring_CustodiansBastion" } ], "DrzyrReplicator": [ @@ -1717,6 +1720,9 @@ { "name": "/Items/Trinkets/Rings/JewelOfTheBeholden/Ring_JewelOfTheBeholden", "notes": "Kill The One True King, then speak to Nimue" + }, + { + "name": "/Items/Trinkets/Amulets/InsipidTalon/Amulet_InsipidTalon" } ] }, @@ -2038,7 +2044,320 @@ "notes": "Destroy fifteen Traveler statues (appear when you die with Lydusa's Curse)" } ] - + }, + "DLC3": { + "Amulet_CanineKeepsake": [ + { + "name": "/Items/Trinkets/Amulets/CanineKeepsake/Amulet_CanineKeepsake" + } + ], + "Amulet_CrisisCore": [ + { + "name": "/Items/Trinkets/Amulets/CrisisCore/Amulet_CrisisCore" + } + ], + "Amulet_HangmansNoose": [ + { + "name": "/Items/Trinkets/Amulets/HangmansNoose/Amulet_HangmansNoose" + } + ], + "Amulet_OrnateAmulet": [ + { + "name": "/Items/Trinkets/Amulets/OrnateAmulet/Amulet_OrnateAmulet" + } + ], + "Amulet_ReactionChain": [ + { + "name": "/Items/Trinkets/Amulets/ReactionChain/Amulet_ReactionChain" + } + ], + "Amulet_TimekeepersForfeit": [ + { + "name": "/Items/Trinkets/Amulets/TimekeepersForfeit/Amulet_TimekeepersForfeit" + } + ], + "Amulet_VolatileCartridge": [ + { + "name": "/Items/Trinkets/Amulets/VolatileCartridge/Amulet_VolatileCartridge" + } + ], + "Amulet_ZeroHour": [ + { + "name": "/Items/Trinkets/Amulets/ZeroHour/Amulet_ZeroHour" + } + ], + "MetaGem_ChargedWounds": [ + { + "name": "/Items/Gems/Ranged/ChargedWounds/MetaGem_ChargedWounds" + } + ], + "MetaGem_HiddenPower": [ + { + "name": "/Items/Gems/Ranged/HiddenPower/MetaGem_HiddenPower" + } + ], + "MetaGem_VolatileStrike": [ + { + "name": "/Items/Gems/Melee/VolatileStrike/MetaGem_VolatileStrike" + } + ], + "Mod_HarvesterBots": [ + { + "name": "/Items/Mods/Harvester_Bots/Mod_HarvesterBots" + } + ], + "Mod_Voidlight": [ + { + "name": "/Items/Mods/Voidlight/Mod_Voidlight" + } + ], + "Relic_Consumable_LatentHeart": [ + { + "name": "/Items/Relics/LatentHeart/Relic_Consumable_LatentHeart" + } + ], + "Ring_DemolitionCoil": [ + { + "name": "/Items/Trinkets/Rings/DemolitionCoil/Ring_DemolitionCoil" + } + ], + "Ring_DetonatingCord": [ + { + "name": "/Items/Trinkets/Rings/DetonatingCord/Ring_DetonatingCord" + } + ], + "Ring_EmpoweringLoop": [ + { + "name": "/Items/Trinkets/Rings/EmpoweringLoop/Ring_EmpoweringLoop" + } + ], + "Ring_FeedingTube": [ + { + "name": "/Items/Trinkets/Rings/FeedingTube/Ring_FeedingTube" + } + ], + "Ring_ForceMultiplier": [ + { + "name": "/Items/Trinkets/Rings/ForceMultiplier/Ring_ForceMultiplier" + } + ], + "Ring_ImpactAugment": [ + { + "name": "/Items/Trinkets/Rings/ImpactAugment/Ring_ImpactAugment" + } + ], + "Ring_InfinityPocket": [ + { + "name": "/Items/Trinkets/Rings/InfinityPocket/Ring_InfinityPocket" + } + ], + "Ring_MortalCoil": [ + { + "name": "/Items/Trinkets/Rings/MortalCoil/Ring_MortalCoil" + } + ], + "Ring_NanoFiberStrand": [ + { + "name": "/Items/Trinkets/Rings/NanoFiberStrand/Ring_NanoFiberStrand" + } + ], + "Ring_NightmareSigil": [ + { + "name": "/Items/Trinkets/Rings/NightmareSigil/Ring_NightmareSigil" + } + ], + "Ring_RingOfAshes": [ + { + "name": "/Items/Trinkets/Rings/RingOfAshes/Ring_RingOfAshes" + } + ], + "Ring_RingOfBones": [ + { + "name": "/Items/Trinkets/Rings/RingOfBones/Ring_RingOfBones" + } + ], + "Ring_ShieldAlternator": [ + { + "name": "/Items/Trinkets/Rings/ShieldAlternator/Ring_ShieldAlternator" + } + ], + "Ring_SpiritAlternator": [ + { + "name": "/Items/Trinkets/Rings/SpiritAlternator/Ring_SpiritAlternator" + } + ], + "Ring_StoneOfRevalation": [ + { + "name": "/Items/Trinkets/Rings/StoneOfRevelation/Ring_StoneOfRevelation" + } + ], + "Ring_StrandOfSinew": [ + { + "name": "/Items/Trinkets/Rings/StrandOfSinew/Ring_StrandOfSinew" + } + ], + "Ring_SymbolOfRoyalty": [ + { + "name": "/Items/Trinkets/Rings/SymbolOfRoyalty/Ring_SymbolOfRoyalty" + } + ], + "Ring_ToleranceBand": [ + { + "name": "/Items/Trinkets/Rings/ToleranceBand/Ring_ToleranceBand" + } + ], + "Ring_TransientCord": [ + { + "name": "/Items/Trinkets/Rings/TransientCord/Ring_TransientCord" + } + ], + "Ring_WiredInhibitor": [ + { + "name": "/Items/Trinkets/Rings/WiredInhibitor/Ring_WiredInhibitor" + } + ], + "Trait_Barrier": [ + { + "name": "/Items/Archetypes/Warden/Traits/Trait_Barrier" + } + ], + "Trait_Insight": [ + { + "name": "/Items/Traits/Insight/Trait_Insight" + } + ], + "Weapon_DarkMatterGauntlets": [ + { + "name": "/Items/Weapons/DarkMatterGauntlets/Weapon_DarkMatterGauntlets" + } + ], + "Weapon_Monorail": [ + { + "name": "/Items/Weapons/Monorail/Weapon_Monorail" + } + ], + "DLC3Story": [ + { + "name": "/Items/Archetypes/Warden/Armor/Armor_Head_Warden" + }, + { + "name": "/Items/Archetypes/Warden/Armor/Armor_Body_Warden" + }, + { + "name": "/Items/Archetypes/Warden/Armor/Armor_Gloves_Warden" + }, + { + "name": "/Items/Archetypes/Warden/Armor/Armor_Legs_Warden" + }, + { + "name": "/Items/Gems/Ranged/Detonator/MetaGem_Detonator" + }, + { + "name": "/Items/Archetypes/Warden/Item_HiddenContainer_Material_Engram_Warden" + }, + { + "name": "/Items/Traits/Preservation/Trait_Preservation" + }, + { + "name": "/Items/Trinkets/Amulets/RelayDevice/Amulet_RelayDevice" + }, + { + "name": "/Items/Trinkets/Rings/BreachAccelerator/Ring_BreachAccelerator" + }, + { + "name": "/Items/Trinkets/Rings/DisasterConverter/Ring_DisasterConverter" + }, + { + "name": "/Items/Trinkets/Rings/SecurityHalfMeasure/Ring_SecurityHalfMeasure" + }, + { + "name": "/Items/Weapons/Genesis/Weapon_Genesis" + }, + { + "name": "/Items/Weapons/HarvesterScythe/Weapon_HarvesterScythe" + }, + { + "name": "/Items/Weapons/RepairTool/Weapon_RepairTool" + } + ], + "CargoBelt": [ + { + "name": "/Items/Armor/NErudWarrior/Armor_Head_NerudWarrior" + }, + { + "name": "/Items/Armor/NErudWarrior/Armor_Body_NerudWarrior" + }, + { + "name": "/Items/Armor/NErudWarrior/Armor_Gloves_NerudWarrior" + }, + { + "name": "/Items/Armor/NErudWarrior/Armor_Legs_NerudWarrior" + }, + { + "name": "/Items/Gems/Melee/HyperCharger/MetaGem_HyperCharger" + }, + { + "name": "/Items/Trinkets/Amulets/BrazenAlloy/Amulet_BrazenAlloy" + }, + { + "name": "/Items/Trinkets/Rings/BurdenOfTheExcavator/Ring_BurdenOfTheExcavator" + }, + { + "name": "/Items/Trinkets/Rings/SiphonFilter/Ring_SiphonFilter" + } + ], + "GasChamber": [ + { + "name": "/Items/Gems/Ranged/SuperHeated/MetaGem_SuperHeated" + }, + { + "name": "/Items/Trinkets/Amulets/ExhaustValve/Amulet_ExhaustValve" + }, + { + "name": "/Items/Traits/Perception/Trait_Perception" + } + ], + "Overload_DLC": [ + { + "name": "/Items/Trinkets/Amulets/ShortCircuit/Amulet_ShortCircuit" + }, + { + "name": "/Items/Trinkets/Rings/CombatShieldGenerator/Ring_CombatShieldGenerator" + } + ], + "SecurityDrone_DLC": [ + { + "name": "/Items/Trinkets/Rings/BurdenOfTheProtector/Ring_BurdenOfTheProtector" + }, + { + "name": "/Items/Trinkets/Rings/BypassPrimer/Ring_BypassPrimer" + } + ], + "ShiftingCitadel": [ + { + "name": "/Items/Gems/Ranged/Insulator/MetaGem_Insulator" + }, + { + "name": "/Items/Mods/ShieldingShot/Mod_ShieldingShot" + }, + { + "name": "/Items/Trinkets/Amulets/EchoChamber/Amulet_EchoChamber" + }, + { + "name": "/Items/Trinkets/Rings/ClearHalo/Ring_ClearHalo" + } + ], + "Tower_DLC": [ + { + "name": "/Items/Gems/Ranged/Repercussion/MetaGem_Repercussion" + }, + { + "name": "/Items/Relics/GossamerHeart/Relic_Consumable_GossamerHeart" + }, + { + "name": "/Items/Trinkets/Amulets/QuantumMemory/Amulet_QuantumMemory" + } + ] }, "Story": { "AshenWasteland": [ @@ -2157,6 +2476,9 @@ { "name": "/Items/Armor/Base/RelicTesting/LifelessHeart/Relic_Consumable_LifelessHeart", "notes": "eat fruit of death 3 times" + }, + { + "name": "/Items/Trinkets/Amulets/CessationBulbel/Amulet_CessationBulbel" } ], "Mudtooth": [ @@ -2262,6 +2584,9 @@ }, { "name": "/Items/Weapons/BasicShovel/Weapon_BasicShovel" + }, + { + "name": "/Items/Weapons/BlackGreatsword/Weapon_BlackGreatsword" } ], "Reggie": [ @@ -2313,6 +2638,9 @@ { "name": "/Items/Trinkets/Rings/DevouringLoop/Ring_DevouringLoop", "notes": "Purchased from Reggie at Ward 13 after completing the campaign on Apocalypse difficulty." + }, + { + "name": "/Items/Trinkets/Rings/RingOfPhantomPain/Ring_PhantomPain" } ], "Cass": [ @@ -2460,6 +2788,10 @@ }, { "name": "/Items/Trinkets/Rings/AnastasijasInspiration/Ring_AnastasijasInspiration" + }, + { + "name": "/Items/Armor/WeldingGoggles/Armor_Head_WeldingGoggles", + "armorSet": false } ], "McCabe": [ @@ -2532,6 +2864,11 @@ "name": "/Items/Weapons/Handguns/Special/CorruptedRunePistol/Weapon_CorruptedRunePistol" } ], + "Duane": [ + { + "name": "/Items/Trinkets/Amulets/ChefMedal/Amulet_ChefMedal" + } + ], "Labyrinth": [ { "name": "/Items/Trinkets/Rings/DenseSiliconRing/Ring_DenseSiliconRing" diff --git a/RemnantSaveGuardian/locales/GameStrings.resx b/RemnantSaveGuardian/locales/GameStrings.resx index a5813bb..6e63c8d 100644 --- a/RemnantSaveGuardian/locales/GameStrings.resx +++ b/RemnantSaveGuardian/locales/GameStrings.resx @@ -2511,4 +2511,247 @@ Lydusa's Temple - \ No newline at end of file + + The Dark Horizon + + + Train Platforms + + + Gas Chamber Maze + + + Power Circuit Puzzle + + + Security Drone Maze + + + Shifting Citadel + + + Botanical Research Tower + + + Brazen Amalgam + + + Canine Keepsake + + + Cessation Bulbel + + + Chef Medal + + + Crisis Core + + + Echo Chamber + + + Exhaust Valve + + + Hangmans Noose + + + Insipid Talon + + + Ornate Amulet + + + Quantum Memory + + + Reaction Chain + + + Relay Device + + + Short Circuit + + + Timekeepers Forfeit + + + Volatile Cartridge + + + Zero Hour + + + Phetyr + + + Warden + + + Welding Goggles + + + Warden + + + Detonator + + + Hidden Power + + + Hyper Charger + + + Insulator + + + Repercussion + + + Superheated + + + Volatile Strike + + + Harvester Bots + + + Shielding Shot + + + Voidlight + + + Gossamer Heart + + + Latent Heart + + + Breach Accelerator + + + Burden of the Excavator + + + Burden of the Protector + + + Bypass Primer + + + Clear Halo + + + Combat Shield Generator + + + Custodian's Bastion + + + Demolition Coil + + + Detonating Cord + + + Disaster Converter + + + Empowering Loop + + + Feeding Tube + + + Force Multiplier + + + Impact Augment + + + Infinity Pocket + + + Mortal Coil + + + Nanofiber Strand + + + Nightmare Sigil + + + Ring Of Phantom Pain + + + Ring of Ashes + + + Ring of Bones + + + Security Half-Measure + + + Shield Alternator + + + Siphon Filter + + + Spirit Alternator + + + Stone of Revelation + + + Strand of Sinew + + + Symbol of Royalty + + + Tolerance Band + + + Transient Cord + + + Wired Inhibitor + + + Barrier + + + Insight + + + Perception + + + Preservation + + + Black Greatsword + + + Dark Matter Guantlets + + + Genesis + + + Harvester Scythe + + + Monorail + + + Repair Tool + +