Merge pull request #462 from DestinyItemManager/d2ai-manifest-v114394…

….23.03.18.1900-1-bnet.49365 [D2AI] Manifest Update
DestinyItemManager · Mar 23, 2023 · 59c2b00 · 59c2b00
2 parents 8c455bb + 7cd2d0a
commit 59c2b00
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/output/pursuits.json b/output/pursuits.json
@@ -891,6 +891,9 @@
   "926942410": {
     "ActivityMode": [2394616003]
   },
+  "928491049": {
+    "Destination": [697502628]
+  },
   "934885902": {
     "ActivityMode": [2394616003],
     "DamageType": [2303181850, 151347233],
@@ -2973,6 +2976,9 @@
     "ActivityMode": [1848252830, 1164760504],
     "ItemCategory": [153950757, -153950757]
   },
+  "3435799703": {
+    "Destination": [697502628]
+  },
   "3438132458": {
     "Destination": [677774031, 1729879943, 2244580325]
   },

diff --git a/output/seasons.json b/output/seasons.json
@@ -1902,6 +1902,7 @@
   "892374270": 4,
   "892374271": 4,
   "894798478": 20,
+  "894935747": 20,
   "895031268": 14,
   "896553940": 4,
   "897074661": 15,
@@ -1947,6 +1948,7 @@
   "909526361": 20,
   "910975608": 2,
   "911356576": 10,
+  "911713462": 20,
   "912222548": 5,
   "912276057": 12,
   "912515804": 5,
@@ -1985,6 +1987,7 @@
   "928095170": 6,
   "928095171": 6,
   "928186993": 8,
+  "928491049": 20,
   "929374195": 9,
   "929438819": 8,
   "930064526": 1,
@@ -2006,6 +2009,7 @@
   "942888403": 3,
   "943593515": 20,
   "945219177": 2,
+  "945268636": 20,
   "945907382": 1,
   "945907383": 1,
   "946357053": 2,
@@ -2028,6 +2032,7 @@
   "959144972": 1,
   "961465568": 19,
   "961496619": 3,
+  "962046223": 20,
   "963778029": 8,
   "964176440": 2,
   "964709622": 11,
@@ -2053,6 +2058,7 @@
   "975033209": 20,
   "975449263": 8,
   "978192344": 16,
+  "978823906": 20,
   "980586240": 4,
   "980898608": 3,
   "980898609": 3,
@@ -2083,6 +2089,7 @@
   "993006552": 1,
   "993395957": 8,
   "994729458": 4,
+  "995601493": 20,
   "995614939": 2,
   "996259007": 3,
   "996371370": 19,
@@ -7220,6 +7227,7 @@
   "3351378135": 1,
   "3351378142": 1,
   "3351378143": 1,
+  "3351911672": 20,
   "3352019292": 4,
   "3352275956": 6,
   "3352318036": 2,
@@ -7408,6 +7416,7 @@
   "3434280692": 1,
   "3434490958": 17,
   "3435239180": 16,
+  "3435799703": 20,
   "3436915924": 3,
   "3437002240": 10,
   "3437002241": 10,
@@ -7452,6 +7461,7 @@
   "3450065543": 1,
   "3451625162": 2,
   "3452090911": 15,
+  "3452577290": 20,
   "3452825266": 9,
   "3454491031": 6,
   "3454910045": 19,
@@ -7476,6 +7486,7 @@
   "3466057365": 3,
   "3467984096": 11,
   "3468066869": 8,
+  "3469355005": 20,
   "3469412968": 12,
   "3469412969": 12,
   "3469412970": 12,

diff --git a/src/generate-mod-cost-reductions.ts b/src/generate-mod-cost-reductions.ts
@@ -38,9 +38,10 @@ for (const slot of Object.values(modsMap)) {
         `this is getting out of hand, ${mods.length} copies of ${displayName}?`
       );
     } else if (mods.length === 2) {
-      const [reducedMod, normalMod] = mods.sort(
-        (modA, modB) => modA.plug!.energyCost!.energyCost - modB.plug!.energyCost!.energyCost
-      );
+      // In these mods, one is the "canonical" copy and one is the other copy.
+      // It seems when Bungie reduces the regular cost to 1, they don't get rid of
+      // the other 1-cost copy, so we use the collectibleHash instead of the cost here.
+      const [reducedMod, normalMod] = mods[0].collectibleHash ? mods.reverse() : mods;
       normalToReducedMod[normalMod.hash] = reducedMod.hash;
     }
   }