Fix likely output item identification for Y1 legacy armor focusing

DestinyItemManager · Nov 10, 2023 · 47b5403 · 47b5403
1 parent ab17836
commit 47b5403
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 44 deletions.
diff --git a/output/focusing-item-outputs.json b/output/focusing-item-outputs.json
@@ -14,29 +14,29 @@
   "175003048": 1987616650,
   "183582177": 197672677,
   "184019702": 3110377595,
-  "199445735": 178749005,
-  "202522666": 1727248109,
+  "199445735": 332170995,
+  "202522666": 2674680132,
   "207548065": 1314666277,
   "213151935": 1144014195,
-  "220051784": 693067797,
+  "220051784": 3408834730,
   "221852859": 4057299719,
   "231864088": 3288917178,
   "234708547": 3813221631,
   "253950230": 469333264,
   "279578169": 297009581,
-  "293795567": 178749005,
+  "293795567": 1812185909,
   "295845425": 874623537,
   "296152704": 1896287986,
   "296378791": 108286515,
   "316320631": 3193598749,
-  "316472157": 533855986,
+  "316472157": 1702245537,
   "330959343": 428806571,
   "332192961": 4161591237,
   "338446411": 18990920,
   "350442704": 125833536,
   "362902214": 3730575552,
-  "366078621": 768769183,
-  "378242631": 946526461,
+  "366078621": 3984883553,
+  "378242631": 1959285715,
   "390263398": 3583853408,
   "394983260": 297586990,
   "400987770": 3014775444,
@@ -51,21 +51,21 @@
   "457831324": 2779821308,
   "462967561": 2321120637,
   "465983464": 988330314,
-  "480579364": 1727248109,
+  "480579364": 1807196134,
   "520226975": 3473290087,
   "529088743": 2618417907,
   "533201397": 1160559849,
   "538538204": 511888814,
   "580045556": 105306149,
   "588861781": 1004538825,
-  "606510166": 533855986,
+  "606510166": 2454114768,
   "609164671": 3381022971,
   "622764187": 2217519207,
   "636465032": 1064132738,
   "646222889": 4238378141,
   "652077411": 768769183,
   "659786850": 3883866764,
-  "672369541": 178749005,
+  "672369541": 273457849,
   "673296954": 2082483156,
   "692720917": 1399243961,
   "698036864": 2715240478,
@@ -86,7 +86,7 @@
   "759005343": 2016308379,
   "764028378": 3258665412,
   "776110297": 1321354573,
-  "781313686": 119859462,
+  "781313686": 3684978064,
   "786697890": 3453042252,
   "787111830": 3299416208,
   "792320746": 886273156,
@@ -97,11 +97,11 @@
   "827034816": 2766109874,
   "828528775": 829330711,
   "837053731": 1215952756,
-  "854926798": 533855986,
+  "854926798": 2498588344,
   "859980511": 2268523867,
-  "865222334": 178749005,
+  "865222334": 1392054568,
   "871972058": 3682803680,
-  "879692448": 215768941,
+  "879692448": 1299272338,
   "891829968": 162269058,
   "895505967": 2510526114,
   "899122077": 1875512595,
@@ -128,9 +128,9 @@
   "1020750829": 1975125963,
   "1029950143": 676270382,
   "1036377184": 2922749929,
-  "1037962076": 768769183,
+  "1037962076": 4038429998,
   "1038737566": 3770087944,
-  "1055088541": 119859462,
+  "1055088541": 3441081953,
   "1059479825": 3651424085,
   "1063561075": 2314610827,
   "1064014305": 3312368357,
@@ -142,7 +142,7 @@
   "1103301267": 1654461647,
   "1104664699": 2381515079,
   "1106028100": 119859462,
-  "1120180351": 215768941,
+  "1120180351": 1765728763,
   "1125545953": 87665893,
   "1127615753": 241462141,
   "1130536756": 138282166,
@@ -184,7 +184,7 @@
   "1394030426": 411397829,
   "1413646678": 1207531728,
   "1421355221": 2780717641,
-  "1428449496": 2094233929,
+  "1428449496": 2492669178,
   "1437610838": 193869520,
   "1441098526": 268260373,
   "1447074729": 435339366,
@@ -199,10 +199,10 @@
   "1529271412": 2326396534,
   "1533952342": 433905699,
   "1547375670": 2766109872,
-  "1549471512": 178749005,
+  "1549471512": 1392054568,
   "1555319323": 106575079,
   "1560482644": 1788603939,
-  "1564178759": 657606375,
+  "1564178759": 1613581523,
   "1564784937": 1030017949,
   "1567834983": 2817251955,
   "1569427840": 3932952562,
@@ -279,9 +279,9 @@
   "2032674368": 4066778670,
   "2038568475": 4132072834,
   "2042553902": 1586231351,
-  "2042885489": 178749005,
+  "2042885489": 1812185909,
   "2059601679": 3275117874,
-  "2060830238": 2094233929,
+  "2060830238": 2680535688,
   "2063528865": 4132072834,
   "2064212142": 3106439832,
   "2068320776": 1734844650,
@@ -347,7 +347,7 @@
   "2497712996": 3031934630,
   "2506557403": 854379020,
   "2529663586": 3702689847,
-  "2532975303": 119859462,
+  "2532975303": 641063251,
   "2543057241": 3347946548,
   "2551249699": 2181242591,
   "2574258558": 3216110440,
@@ -369,13 +369,13 @@
   "2663334395": 3165143747,
   "2663848874": 4291183556,
   "2664742934": 3261819408,
-  "2664994076": 657606375,
+  "2664994076": 2899275886,
   "2677528310": 3934586864,
   "2691087957": 146223817,
   "2697286539": 3890055324,
   "2701632970": 1637326795,
   "2711683554": 575830664,
-  "2724714408": 946526461,
+  "2724714408": 1953621386,
   "2733913394": 2255073244,
   "2733974969": 597831725,
   "2738914052": 3316517958,
@@ -410,7 +410,7 @@
   "2928349050": 605724052,
   "2938674444": 2314610827,
   "2945177393": 1210111349,
-  "2947742646": 946526461,
+  "2947742646": 2408514352,
   "2950782681": 771104589,
   "2957859219": 2478547407,
   "2966525682": 1141586039,
@@ -419,27 +419,27 @@
   "2974942014": 4269346472,
   "2976734344": 3651039338,
   "2986968300": 241462142,
-  "2989732283": 178749005,
+  "2989732283": 1392054568,
   "2997491826": 2066074780,
   "2999252751": 3942036043,
   "3000094897": 105306149,
   "3003155525": 2563444729,
   "3021987691": 754069623,
   "3023605781": 3193598749,
-  "3034681814": 693067797,
+  "3034681814": 3091776080,
   "3041739793": 371726421,
-  "3041947774": 657606375,
+  "3041947774": 687386728,
   "3049663285": 2653171212,
   "3054001670": 874623537,
   "3054692414": 3125454907,
-  "3054751781": 693067797,
+  "3054751781": 3153956825,
   "3063795377": 1329892341,
   "3067591475": 2105414511,
   "3070765275": 1046651176,
   "3074765785": 178749005,
   "3074795460": 523074950,
   "3111111216": 1219761634,
-  "3112088101": 768769183,
+  "3112088101": 1276048857,
   "3117433295": 235591051,
   "3119153287": 2075703443,
   "3126228563": 854379020,
@@ -475,7 +475,7 @@
   "3287081371": 120441703,
   "3293679620": 938218310,
   "3310241668": 3747088838,
-  "3310367410": 1727248109,
+  "3310367410": 2845947996,
   "3310823353": 3070555693,
   "3318677781": 1571959827,
   "3323319039": 4287857019,
@@ -485,7 +485,7 @@
   "3345357730": 1321354572,
   "3368700430": 436615288,
   "3382832422": 2355943840,
-  "3384059383": 178749005,
+  "3384059383": 273457849,
   "3389132614": 2821430069,
   "3392204241": 2653171213,
   "3407894354": 555258620,
@@ -514,7 +514,7 @@
   "3553325799": 2717305289,
   "3566338354": 3487011804,
   "3569895394": 3565520715,
-  "3572799518": 178749005,
+  "3572799518": 1812185909,
   "3573404221": 609852545,
   "3580701310": 136355432,
   "3609776694": 854379020,
@@ -533,8 +533,8 @@
   "3685260456": 3016891299,
   "3691118312": 2883484461,
   "3695917044": 2400549110,
-  "3705995974": 2094233929,
-  "3711090475": 119859462,
+  "3705995974": 3797729472,
+  "3711090475": 2286507447,
   "3711997255": 4039572196,
   "3716635620": 1069002790,
   "3717480197": 1741360441,
@@ -568,19 +568,19 @@
   "3826355308": 3292795429,
   "3826782839": 3719480067,
   "3827697821": 1011882337,
-  "3847138256": 657606375,
+  "3847138256": 2389585538,
   "3848039961": 1805830669,
   "3850234099": 3517179757,
   "3852825844": 390139894,
   "3855438068": 1467044898,
   "3876713531": 268260373,
-  "3881082126": 693067797,
+  "3881082126": 1914589560,
   "3881746964": 3193598749,
   "3882493260": 1591207518,
   "3883022513": 1779796469,
   "3884696647": 736382419,
   "3891912205": 868732497,
-  "3895829948": 178749005,
+  "3895829948": 273457849,
   "3912211141": 1345569657,
   "3923407559": 1045743955,
   "3929896313": 2888266564,
@@ -592,7 +592,7 @@
   "4005950350": 2290416,
   "4005993978": 1466284308,
   "4021652784": 459833058,
-  "4021927132": 178749005,
+  "4021927132": 3722981806,
   "4027344350": 4021402824,
   "4033714251": 3738678140,
   "4036523431": 4255171531,
@@ -604,16 +604,16 @@
   "4073744300": 566740455,
   "4075404894": 1403800851,
   "4079614900": 2810038838,
-  "4096757830": 178749005,
+  "4096757830": 2629204288,
   "4099345916": 370930766,
   "4117476151": 1084190509,
-  "4119202577": 215768941,
+  "4119202577": 852430165,
   "4119408849": 2671639706,
   "4122177783": 896224899,
   "4124267393": 3236112986,
   "4127253158": 2598029856,
   "4129567135": 364665267,
-  "4141497761": 946526461,
+  "4141497761": 1269679141,
   "4153158613": 1190497097,
   "4155582683": 2850664015,
   "4155947523": 1884579135,

diff --git a/src/generate-focusing-item-outputs.ts b/src/generate-focusing-item-outputs.ts
@@ -49,7 +49,9 @@ for (const vendor of getAllDefs('Vendor')) {
       continue;
     }
     exampleDef ||= def;
-    const candidates = possibleOutputItemsByName[def.displayProperties.name];
+    const candidates = possibleOutputItemsByName[def.displayProperties.name].filter(
+      (c) => c.itemTypeDisplayName === def.itemTypeDisplayName
+    );
     if (candidates?.length) {
       let best =
         candidates.length > 1