Merge branch 'master' into d2ai-speedup-paths

data/sources/categories.json

@@ -107,7 +107,7 @@
     "eververse": { "includes": ["Bright Engrams", "Eververse"] },
     "fwc": { "includes": ["Lakshmi-2"] },
     "gambit": {
-      "includes": ["from the Drifter", "Gambit quest", "Clean Getaway", "Keepin' On", "Gambit"],
+      "includes": ["from the Drifter", "Gambit quest", "Clean Getaway", "Keepin' On", "Gambit", "Source: Drifter Rank Up Reputation" ],
       "items": [
         "Dance the Demons Away",
         "Gambit Blackguard",
@@ -325,7 +325,7 @@
     },
     "titan": { "includes": ["Saturn's moon, Titan", "Savathûn's Song"] },
     "trials": {
-      "includes": ["Trials", "Saint-14"],
+      "includes": ["Trials", "Saint-14", "Source: Flawless Win with a \"Flight of the Pigeon\" Medal"],
       "items": [
         "Hardened by Trial",
         "Light for the Lost",
@@ -612,6 +612,16 @@
     "sonar": {
       "includes": ["Season of the Deep"]
     },
+    "avalon": {
+      "includes": [
+        "Source: \"Truly Satisfactory\" Triumph",
+        "Source: \"Firmware Update\" Triumph",
+        "Source: //node.ovrd.AVALON// Exotic Quest"
+      ]
+    },
+    "warlordsruin": {
+      "includes": ["Warlord's Ruin"]
+    },
     "ignore": {
       "includes": [
         "Forging Your Own Path",
@@ -629,7 +639,20 @@
         "Source: Season of the Lost",
         "Source: Acquired from Xûr",
         "Source: Exotic Archive at the Tower",
-        "Source: Star Chart Reputation Reset"
+        "Source: Star Chart Reputation Reset",
+        "Source: High-Difficulty Activities or Dismantled Exotic or Legendary Gear",
+        "Source: Low chance to drop from defeating combatants or opening chests.",
+        "Source: High-Difficulty Activities",
+        "Source: Exchange for Synthcord at the Loom",
+        "Source: Threader Bounties from Ada-1",
+        "Source: Dismantle Exotic or Legendary Equipment",
+        "Source: Defeat Combatants with Active Prime Attunement Buff",
+        "Source: Defeat Combatants, Loot Chests, or Complete Activities",
+        "Source: \"Xenology\" Quest from Xûr",
+        "Source: Purchase from Suraya Hawthorne",
+        "Source: Seasonal Challenges or Repeatable Bounties",
+        "Source: Defeat Combatants or Open Chests",
+        "Source: \"Legendary Trifecta\" Triumph"
       ]
     }
   },

data/sources/unassigned.json

@@ -1,29 +1,11 @@
 {
-  "11666839": "Source: High-Difficulty Activities or Dismantled Exotic or Legendary Gear",
-  "43842395": "Source: Low chance to drop from defeating combatants or opening chests.",
-  "276398507": "Source: High-Difficulty Activities",
-  "406406003": "Source: Exchange for Synthcord at the Loom",
-  "462484651": "Source: Threader Bounties from Ada-1",
   "561126969": "Source: \"Starcrossed\" Mission",
-  "709680645": "Source: \"Truly Satisfactory\" Triumph",
-  "711005105": "Source: Dismantle Exotic or Legendary Equipment",
-  "840425455": "Source: \"Legendary Trifecta\" Triumph",
   "1035822060": "",
   "1085506849": "Source: \"We Stand Unbroken\" Quest, Week 8",
-  "1476475066": "Source: \"Firmware Update\" Triumph",
   "1664308183": "Source: Season of the Wish Activities",
-  "1730197643": "Source: //node.ovrd.AVALON// Exotic Quest",
   "1751739544": "Source: \"We Stand Unbroken\" Quest, Week 5",
-  "2069903130": "Source: Defeat Combatants with Active Prime Attunement Buff",
-  "2223404774": "Source: Defeat Combatants, Loot Chests, or Complete Activities",
-  "2292685703": "Source: \"Xenology\" Quest from Xûr",
   "2585665369": "A foreboding staff bearing engravings of Hive runes and bound with mystical charms.",
   "2671038131": "",
-  "2675385179": "Source: Purchase from Suraya Hawthorne",
   "2959452483": "",
-  "3100467592": "Source: Seasonal Challenges or Repeatable Bounties",
-  "3564069447": "Source: Flawless Win with a \"Flight of the Pigeon\" Medal",
-  "3747711246": "Source: Defeat Combatants or Open Chests",
-  "3942778906": "Source: Drifter Rank Up Reputation",
   "4278841194": "Source: Season of the Wish Triumphs"
 }

output/source-info.ts

@@ -73,6 +73,15 @@ const D2Sources: {
     ],
     searchString: [],
   },
+  avalon: {
+    itemHashes: [],
+    sourceHashes: [
+      709680645, // Source: "Truly Satisfactory" Triumph
+      1476475066, // Source: "Firmware Update" Triumph
+      1730197643, // Source: //node.ovrd.AVALON// Exotic Quest
+    ],
+    searchString: [],
+  },
   banshee: {
     itemHashes: [],
     sourceHashes: [
@@ -476,6 +485,7 @@ const D2Sources: {
       3422985544, // Source: Associated Gambit Quest
       3494247523, // Source: Complete the "Season 8: Keepin' On" quest.
       3522070610, // Source: Gambit
+      3942778906, // Source: Drifter Rank Up Reputation
     ],
     searchString: [],
   },
@@ -665,6 +675,7 @@ const D2Sources: {
       3422985544, // Source: Associated Gambit Quest
       3494247523, // Source: Complete the "Season 8: Keepin' On" quest.
       3522070610, // Source: Gambit
+      3942778906, // Source: Drifter Rank Up Reputation
     ],
     searchString: [],
   },
@@ -1498,6 +1509,7 @@ const D2Sources: {
       3390015730, // Source: Trials of Osiris Challenges
       3471208558, // Source: Trials of Osiris Wins
       3543690049, // Source: Complete a flawless Trials ticket.
+      3564069447, // Source: Flawless Win with a "Flight of the Pigeon" Medal
     ],
     searchString: [],
   },
@@ -1612,6 +1624,13 @@ const D2Sources: {
     ],
     searchString: [],
   },
+  warlordsruin: {
+    itemHashes: [],
+    sourceHashes: [
+      613435025, // Source: "Warlord's Ruin" Dungeon
+    ],
+    searchString: [],
+  },
   wartable: {
     itemHashes: [],
     sourceHashes: [

output/unstackable-mods.json

@@ -0,0 +1,37 @@
+[
+  56663992,
+  534479613,
+  539051925,
+  579997810,
+  688956976,
+  802695661,
+  877723168,
+  1097608874,
+  1125986156,
+  1170405455,
+  1301391064,
+  1305848463,
+  1389309840,
+  1627901452,
+  1947468772,
+  2158846614,
+  2175577211,
+  2199590568,
+  2245839670,
+  2257238439,
+  2436471653,
+  2649291407,
+  2734674728,
+  2815817957,
+  3064687909,
+  3174771856,
+  3994043492,
+  4004774872,
+  4004774873,
+  4004774874,
+  4004774875,
+  4004774876,
+  4004774877,
+  4081595582,
+  4243059257
+]

src/generate-unstackable-mods.ts

@@ -0,0 +1,25 @@
+import { getAllDefs } from '@d2api/manifest-node';
+import { writeFile } from './helpers.js';
+
+const inventoryItems = getAllDefs('InventoryItem');
+
+function findAllUnstackableMods() {
+  const unstackableModHashes = new Set<number>();
+
+  for (const { tooltipNotifications, hash, displayProperties } of inventoryItems) {
+    if (
+      tooltipNotifications &&
+      (tooltipNotifications[0]?.displayString.includes('no benefit') ||
+        displayProperties.description.includes('will not improve')) &&
+      !displayProperties.name.includes('Deprecated Armor Mod')
+    ) {
+      unstackableModHashes.add(hash);
+    }
+  }
+
+  return Array.from(unstackableModHashes);
+}
+
+const unstackModHashes = findAllUnstackableMods();
+
+writeFile('./output/unstackable-mods.json', unstackModHashes);

yarn.lock

@@ -3189,9 +3189,9 @@ wide-align@^1.1.0:
     string-width "^1.0.2 || 2 || 3 || 4"
 
 word-wrap@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.4.tgz#cb4b50ec9aca570abd1f52f33cd45b6c61739a9f"
+  integrity sha512-2V81OA4ugVo5pRo46hAoD2ivUJx8jXmWXfUkY4KFNw0hEptvN0QfH3K4nHiwzGeKl5rFKedV48QVoqYavy4YpA==
 
 wrap-ansi@^7.0.0:
   version "7.0.0"