Merge pull request #10748 from DestinyItemManager/more-revenant

DestinyItemManager · Oct 9, 2024 · 2d9b712 · 2d9b712
2 parents 1e4bbdb + 89c9bec
commit 2d9b712
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 11 deletions.
diff --git a/config/i18n.json b/config/i18n.json
@@ -1119,7 +1119,9 @@
     "RecordValue": "{{value}}pts",
     "Resets": "1 reset",
     "Resets_plural": "{{count}} resets",
-    "RitualPathfinder": "Ritual Pathfinder",
+    "GambitPathfinder": "Gambit Pathfinder",
+    "CruciblePathfinder": "Crucible Pathfinder",
+    "VanguardPathfinder": "Vanguard Pathfinder",
     "SecretTriumph": "Secret Triumph",
     "StatTrackers": "Stat Trackers",
     "TrackedTriumphs": "Tracked Triumphs",

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Next
 
+* Show the new pathfinders on the Progress page.
+* Add Accessories (Tonic Capsule) to the inventory screen.
+
 ## 8.41.0 <span class="changelog-date">(2024-10-08)</span>
 
 * Updated for Episode: Revenant.

diff --git a/src/app/destiny2/d2-bucket-categories.ts b/src/app/destiny2/d2-bucket-categories.ts
@@ -28,5 +28,5 @@ export const D2Categories: {
     BucketHashes.Finishers,
     BucketHashes.SeasonalArtifact,
   ],
-  Inventory: [BucketHashes.Consumables, BucketHashes.Modifications],
+  Inventory: [BucketHashes.Accessories, BucketHashes.Consumables, BucketHashes.Modifications],
 };
diff --git a/src/app/progress/Progress.tsx b/src/app/progress/Progress.tsx
@@ -92,7 +92,9 @@ export default function Progress({ account }: { account: DestinyAccount }) {
     defs.PresentationNode.get(coreSettings.seasonalChallengesPresentationNodeHash);
 
   const paleHeartPathfinderNode = defs.PresentationNode.get(1062988660);
-  const ritualsPathfinderNode = defs.PresentationNode.get(622609416);
+  const gambitPathfinderNode = defs.PresentationNode.get(1190294990);
+  const cruciblePathfinderNode = defs.PresentationNode.get(1289679000);
+  const vanguardPathfinderNode = defs.PresentationNode.get(2968370335);
 
   const menuItems = _.compact([
     { id: 'ranks', title: t('Progress.CrucibleRank') },
@@ -103,7 +105,9 @@ export default function Progress({ account }: { account: DestinyAccount }) {
       id: 'paleHeartPathfinder',
       title: t('Progress.PaleHeartPathfinder'),
     },
-    ritualsPathfinderNode && { id: 'ritualPathfinder', title: t('Progress.RitualPathfinder') },
+    gambitPathfinderNode && { id: 'gambitPathfinder', title: t('Progress.GambitPathfinder') },
+    cruciblePathfinderNode && { id: 'cruciblePathfinder', title: t('Progress.CruciblePathfinder') },
+    vanguardPathfinderNode && { id: 'vanguardPathfinder', title: t('Progress.VanguardPathfinder') },
     seasonalChallengesPresentationNode && {
       id: 'seasonal-challenges',
       title: seasonalChallengesPresentationNode.displayProperties.name,
@@ -191,12 +195,33 @@ export default function Progress({ account }: { account: DestinyAccount }) {
               </ErrorBoundary>
             )}
 
-            {ritualsPathfinderNode && (
-              <ErrorBoundary name={t('Progress.RitualPathfinder')}>
+            {gambitPathfinderNode && (
+              <ErrorBoundary name={t('Progress.GambitPathfinder')}>
                 <Pathfinder
-                  id="ritualPathfinder"
-                  name={t('Progress.RitualPathfinder')}
-                  presentationNode={ritualsPathfinderNode}
+                  id="gambitPathfinder"
+                  name={t('Progress.GambitPathfinder')}
+                  presentationNode={gambitPathfinderNode}
+                  store={selectedStore}
+                />
+              </ErrorBoundary>
+            )}
+
+            {cruciblePathfinderNode && (
+              <ErrorBoundary name={t('Progress.CruciblePathfinder')}>
+                <Pathfinder
+                  id="cruciblePathfinder"
+                  name={t('Progress.CruciblePathfinder')}
+                  presentationNode={cruciblePathfinderNode}
+                  store={selectedStore}
+                />
+              </ErrorBoundary>
+            )}
+            {vanguardPathfinderNode && (
+              <ErrorBoundary name={t('Progress.VanguardPathfinder')}>
+                <Pathfinder
+                  id="vanguardPathfinder"
+                  name={t('Progress.VanguardPathfinder')}
+                  presentationNode={vanguardPathfinderNode}
                   store={selectedStore}
                 />
               </ErrorBoundary>

diff --git a/src/app/search/__snapshots__/search-config.test.ts.snap b/src/app/search/__snapshots__/search-config.test.ts.snap
@@ -2,6 +2,7 @@
 
 exports[`buildSearchConfig generates a reasonable filter map: is filters 1`] = `
 [
+  "accessories",
   "adept",
   "arc",
   "armor",

diff --git a/src/app/search/items/search-filters/known-values.ts b/src/app/search/items/search-filters/known-values.ts
@@ -136,6 +136,7 @@ const bucketToType: LookupTable<BucketHashes, string> = {
   [BucketHashes.Finishers]: 'finishers',
   [BucketHashes.SeasonalArtifact]: 'seasonalartifacts',
 
+  [BucketHashes.Accessories]: 'accessories',
   [BucketHashes.Consumables]: 'consumables',
   [BucketHashes.Modifications]: 'modifications',
 };

diff --git a/src/locale/en.json b/src/locale/en.json
@@ -1092,7 +1092,9 @@
   },
   "Progress": {
     "Bounties": "Bounties",
+    "CruciblePathfinder": "Crucible Pathfinder",
     "CrucibleRank": "Ranks",
+    "GambitPathfinder": "Gambit Pathfinder",
     "Items": "Quest Items",
     "Milestones": "Milestones & Challenges",
     "NoEventChallenges": "You have completed all event challenges",
@@ -1112,10 +1114,10 @@
     "RecordValue": "{{value}}pts",
     "Resets": "1 reset",
     "Resets_plural": "{{count}} resets",
-    "RitualPathfinder": "Ritual Pathfinder",
     "SecretTriumph": "Secret Triumph",
     "StatTrackers": "Stat Trackers",
-    "TrackedTriumphs": "Tracked Triumphs"
+    "TrackedTriumphs": "Tracked Triumphs",
+    "VanguardPathfinder": "Vanguard Pathfinder"
   },
   "RecordBooks": {
     "HideCompleted": "Hide completed records",