diff --git a/data/generated-enums.ts b/data/generated-enums.ts index bb233622..26f582ee 100644 --- a/data/generated-enums.ts +++ b/data/generated-enums.ts @@ -83,9 +83,6 @@ export const enum PlugCategoryHashes { EventsDawningTurnkeyOvenEmptyCombination = 3252134363, EventsDawningTurnkeyOvenNotMasterworked = 1631280048, EventsDawningTurnkeyRecipe = 2225149110, - EventsSolsticeEmbers = 3134612854, - EventsSolsticeEmbersEmpty = 566942471, - EventsSolsticeKindling = 115096268, ExoticAllSkins = 3940152116, ExoticNewAutoRifle0Skins = 3325876128, ExoticNewAutoRifle1Skins = 2618920869, @@ -808,6 +805,7 @@ export const enum PlugCategoryHashes { V800HunterNewChest0Skins = 171540076, V800HunterNewClass0Skins = 1319487721, V800HunterNewLegs0Skins = 2260466760, + V800NewAutoRifle0Skins = 3362902088, V800NewLinearFusionRifle0Masterwork = 3297970367, V800NewLinearFusionRifle0Skins = 2833377167, V800NewSniperRifle0Masterwork = 1615215818, @@ -1237,7 +1235,6 @@ export const enum TraitHashes { ItemSubclassLight = 482679394, ItemSubclassPrism = 3820193993, ItemVehicle = 3977049418, - ItemWeapon = 567594262, ItemWeaponAutoRifle = 2729780558, ItemWeaponBow = 195373008, ItemWeaponFusionRifle = 2891203715, diff --git a/data/seasons/all-watermarks.json b/data/seasons/all-watermarks.json index fa6e8d3c..032fc3d6 100644 --- a/data/seasons/all-watermarks.json +++ b/data/seasons/all-watermarks.json @@ -52,6 +52,7 @@ "/common/destiny2_content/icons/e775dcb3d47e3d54e0e24fbdb64b5763.png", "/common/destiny2_content/icons/e8fe681196baf74917fa3e6f125349b0.png", "/common/destiny2_content/icons/eb621df1be42ae5db9e8cd20eda17c44.png", + "/common/destiny2_content/icons/ecc0f87f0676df6c7fdd06bff5d2825c.png", "/common/destiny2_content/icons/ed6c4762c48bd132d538ced83c1699a6.png", "/common/destiny2_content/icons/ee3f5bb387298acbdb03c01940701e63.png", "/common/destiny2_content/icons/efdb35540cd169fa6e334995c2ce87b6.png", diff --git a/data/seasons/seasons_unfiltered.json b/data/seasons/seasons_unfiltered.json index 43b3fbed..232b7a80 100644 --- a/data/seasons/seasons_unfiltered.json +++ b/data/seasons/seasons_unfiltered.json @@ -96,11 +96,13 @@ "10190309": 23, "10307688": 1, "10308616": 17, + "10435290": 24, "10493725": 2, "10619764": 22, "10645177": 14, "10653108": 2, "10656656": 10, + "10826384": 24, "10861853": 8, "11037709": 22, "11126525": 21, @@ -110,6 +112,7 @@ "11686456": 1, "11686457": 1, "11686458": 1, + "11926187": 24, "11974904": 8, "12440395": 24, "12689138": 23, @@ -453,6 +456,7 @@ "51292090": 8, "51305742": 14, "51305743": 14, + "51367647": 24, "51755992": 11, "51755993": 11, "51786498": 21, @@ -514,6 +518,7 @@ "56137739": 20, "56157064": 7, "56164121": 8, + "56435118": 24, "56435119": 24, "56663992": 20, "56761761": 23, @@ -737,6 +742,7 @@ "83587485": 18, "83895521": 21, "83898430": 1, + "84084242": 24, "84244454": 17, "84296096": 3, "84503918": 20, @@ -892,6 +898,7 @@ "101023751": 4, "101423981": 18, "101524341": 12, + "101572561": 24, "101690262": 20, "101761654": 19, "101950167": 12, @@ -994,6 +1001,7 @@ "114537887": 4, "114668243": 20, "114887354": 1, + "115043205": 24, "115259028": 15, "115580637": 15, "115672088": 17, @@ -1016,6 +1024,7 @@ "117778172": 20, "117884138": 12, "117960780": 13, + "118227417": 24, "118249117": 22, "118439741": 16, "118504131": 3, @@ -1263,6 +1272,7 @@ "147394433": 17, "147536131": 15, "147537456": 12, + "147633954": 24, "147797594": 4, "147850787": 16, "147913470": 16, @@ -1315,6 +1325,7 @@ "152053718": 23, "152089301": 6, "152104176": 24, + "152180424": 24, "152550357": 20, "152583919": 9, "152729412": 5, @@ -1377,6 +1388,7 @@ "159084247": 4, "159093681": 23, "159303539": 9, + "159629318": 24, "159907007": 6, "159950601": 12, "159967058": 3, @@ -1544,6 +1556,7 @@ "179306417": 9, "179407571": 23, "179465689": 13, + "179654396": 24, "179758314": 20, "179876902": 23, "179876903": 23, @@ -1600,6 +1613,7 @@ "184550173": 16, "184867785": 19, "184867786": 19, + "184897051": 24, "184990290": 20, "185041502": 14, "185147220": 12, @@ -1717,6 +1731,7 @@ "197761153": 1, "197764097": 12, "197822824": 8, + "198017780": 24, "198099636": 3, "198280334": 17, "198282524": 24, @@ -1897,6 +1912,7 @@ "218471732": 8, "218523139": 4, "218851221": 4, + "219040194": 24, "219083386": 24, "219083387": 24, "219088948": 5, @@ -2236,6 +2252,7 @@ "252414402": 1, "252457468": 21, "252746229": 16, + "252993329": 24, "253003201": 7, "253003204": 7, "253003205": 7, @@ -2673,6 +2690,7 @@ "294080936": 1, "294080939": 1, "294129361": 16, + "294388569": 24, "294409479": 4, "294804932": 12, "295372194": 23, @@ -2754,6 +2772,10 @@ "302811710": 20, "302811711": 20, "302952062": 4, + "303153728": 24, + "303153729": 24, + "303153730": 24, + "303153731": 24, "303313537": 21, "303384168": 10, "303511301": 24, @@ -2969,6 +2991,7 @@ "327530279": 4, "327543209": 24, "327547301": 11, + "327680457": 24, "327719986": 20, "328129566": 1, "328238764": 21, @@ -3108,6 +3131,16 @@ "345100195": 14, "345205583": 9, "345235814": 23, + "345474886": 24, + "345474887": 24, + "345474888": 24, + "345474889": 24, + "345474890": 24, + "345474891": 24, + "345474892": 24, + "345474893": 24, + "345474894": 24, + "345474895": 24, "345536684": 20, "345644619": 2, "345965990": 8, @@ -3141,6 +3174,7 @@ "349652258": 7, "349778169": 1, "349860254": 15, + "350054538": 24, "350056552": 5, "350061697": 20, "350303820": 3, @@ -3711,6 +3745,7 @@ "408388879": 21, "408426860": 12, "408440598": 1, + "408629538": 24, "408783780": 14, "408787537": 18, "408789478": 6, @@ -4232,6 +4267,7 @@ "464314206": 23, "464380637": 18, "464789944": 1, + "464814870": 24, "465243501": 24, "465351846": 16, "465460556": 21, @@ -4562,6 +4598,7 @@ "502550538": 20, "502607996": 4, "502902682": 23, + "503145555": 24, "503192607": 14, "503306433": 4, "503394676": 16, @@ -4615,6 +4652,7 @@ "509574340": 5, "509594246": 16, "509615620": 16, + "509902436": 24, "509959057": 13, "510020159": 12, "510027376": 7, @@ -4640,6 +4678,7 @@ "512896491": 1, "512896963": 24, "512922312": 23, + "513012745": 24, "513068903": 7, "513355195": 1, "513376719": 13, @@ -5013,6 +5052,7 @@ "552095270": 24, "552112621": 2, "552151556": 9, + "552413134": 24, "552674567": 15, "552709552": 4, "552709553": 4, @@ -5026,6 +5066,7 @@ "552709561": 4, "552724561": 1, "552813909": 2, + "553066217": 24, "553093017": 13, "553373026": 4, "553429674": 9, @@ -5098,6 +5139,7 @@ "561964760": 1, "561986700": 22, "562103581": 6, + "562163470": 24, "562565940": 20, "562619521": 6, "562864974": 22, @@ -5121,6 +5163,7 @@ "566102034": 1, "566126302": 21, "566395092": 2, + "566654091": 24, "566732136": 4, "566740455": 20, "566815328": 19, @@ -5373,6 +5416,16 @@ "596633475": 14, "596773932": 6, "596833222": 2, + "597093632": 24, + "597093633": 24, + "597093634": 24, + "597093635": 24, + "597093636": 24, + "597093637": 24, + "597093638": 24, + "597093639": 24, + "597093644": 24, + "597093645": 24, "597199405": 19, "597281635": 8, "597612829": 20, @@ -5500,6 +5553,11 @@ "612839699": 23, "612987042": 20, "613001527": 9, + "613098968": 24, + "613098972": 24, + "613098973": 24, + "613098974": 24, + "613098975": 24, "613314188": 19, "613334176": 16, "613415534": 18, @@ -5606,6 +5664,7 @@ "627689864": 18, "627690043": 2, "627843714": 11, + "628413376": 24, "628604416": 24, "629005229": 17, "629139088": 15, @@ -5838,6 +5897,7 @@ "657400178": 23, "657452559": 18, "657606375": 11, + "657659170": 24, "657773637": 20, "657870035": 3, "657927352": 23, @@ -5875,6 +5935,7 @@ "661159596": 13, "661422601": 24, "661494271": 5, + "661600727": 24, "661658431": 23, "661733556": 21, "661782323": 4, @@ -5977,6 +6038,7 @@ "671806388": 16, "671889121": 8, "672179719": 9, + "672281666": 24, "672369541": 20, "672488948": 8, "672957262": 23, @@ -6043,6 +6105,7 @@ "680645011": 22, "680645013": 22, "680764635": 1, + "680885104": 24, "681067419": 14, "681158066": 18, "681317097": 21, @@ -6149,6 +6212,7 @@ "690823209": 8, "691192862": 8, "691207248": 1, + "691245913": 24, "691278431": 2, "691332172": 1, "691393048": 14, @@ -6404,6 +6468,7 @@ "722701037": 19, "722862450": 2, "723022031": 22, + "723133822": 24, "723146156": 12, "723463011": 24, "723898670": 10, @@ -6421,6 +6486,7 @@ "725297842": 11, "725313324": 21, "725408022": 15, + "725755352": 24, "725809663": 24, "725993895": 16, "726145097": 13, @@ -6428,6 +6494,7 @@ "726878794": 21, "726894353": 7, "726895548": 22, + "727013478": 24, "727110355": 1, "727169005": 24, "727327974": 10, @@ -6729,6 +6796,7 @@ "758129495": 20, "758259683": 6, "758263828": 20, + "758471979": 24, "758845267": 22, "759005343": 20, "759348512": 9, @@ -6827,6 +6895,7 @@ "768843511": 5, "768843514": 5, "768843515": 5, + "768898035": 24, "769049475": 20, "769099721": 5, "769138801": 23, @@ -7071,6 +7140,7 @@ "790664815": 24, "791389842": 23, "791435474": 7, + "791557695": 24, "791738556": 19, "791799769": 10, "791847893": 7, @@ -7218,6 +7288,7 @@ "807458182": 1, "807458183": 1, "807663752": 1, + "807693916": 24, "807761666": 12, "807774340": 4, "807866445": 1, @@ -7380,6 +7451,11 @@ "823490208": 14, "823759499": 18, "823833769": 20, + "824048506": 24, + "824048508": 24, + "824048509": 24, + "824048510": 24, + "824048511": 24, "824052295": 19, "824228793": 20, "824449758": 15, @@ -7395,6 +7471,7 @@ "826128643": 19, "826274615": 19, "826464855": 22, + "826568129": 24, "827034816": 21, "827183327": 9, "827309828": 3, @@ -7698,6 +7775,7 @@ "859054126": 15, "859054127": 15, "859087913": 18, + "859284756": 24, "859349334": 11, "859354675": 10, "859398064": 8, @@ -7805,6 +7883,7 @@ "871972058": 20, "872207875": 16, "872228802": 18, + "872282981": 24, "872284448": 1, "872328719": 16, "872344720": 23, @@ -8092,6 +8171,7 @@ "905869860": 4, "905940422": 4, "906236408": 7, + "906323688": 24, "906505391": 22, "906552696": 8, "906757661": 21, @@ -8122,6 +8202,7 @@ "909462732": 4, "909526361": 20, "909886694": 15, + "909924634": 24, "910251123": 23, "910459310": 18, "910588426": 21, @@ -8333,6 +8414,7 @@ "937464272": 14, "937752181": 3, "937919489": 20, + "938057615": 24, "938218310": 12, "938315758": 6, "938542991": 1, @@ -8372,6 +8454,7 @@ "942205921": 7, "942446392": 24, "942541111": 5, + "942668144": 24, "942888402": 3, "942888403": 3, "943181354": 1, @@ -8407,6 +8490,7 @@ "946714085": 20, "946832402": 24, "946867072": 20, + "947054280": 24, "947448544": 7, "947611617": 12, "947646934": 22, @@ -8517,6 +8601,11 @@ "959204306": 16, "959456403": 20, "959484195": 16, + "959733944": 24, + "959733945": 24, + "959733946": 24, + "959733947": 24, + "959733950": 24, "960191341": 17, "960442438": 19, "960701048": 13, @@ -9246,6 +9335,7 @@ "1036105302": 14, "1036105303": 14, "1036269296": 1, + "1036295794": 24, "1036377184": 22, "1036467370": 4, "1036557198": 20, @@ -9264,6 +9354,7 @@ "1037916674": 6, "1037921423": 19, "1037962076": 20, + "1038078082": 24, "1038135636": 16, "1038235598": 12, "1038737566": 20, @@ -9804,6 +9895,7 @@ "1106076228": 24, "1106076229": 24, "1106076231": 24, + "1106453307": 24, "1106615806": 2, "1106635211": 21, "1106697448": 4, @@ -10281,6 +10373,7 @@ "1162802884": 4, "1162875302": 1, "1162929425": 5, + "1162979757": 24, "1163145340": 19, "1163213078": 16, "1163283805": 2, @@ -10366,6 +10459,7 @@ "1172880465": 20, "1172884782": 19, "1173052383": 14, + "1173228025": 24, "1173249516": 11, "1173448301": 10, "1173452320": 17, @@ -10716,6 +10810,7 @@ "1208982392": 6, "1208982393": 6, "1208982395": 6, + "1209121316": 24, "1209914153": 17, "1210012576": 20, "1210107120": 8, @@ -10736,6 +10831,16 @@ "1212109224": 9, "1212116635": 15, "1212397474": 17, + "1212551702": 24, + "1212551703": 24, + "1212551704": 24, + "1212551705": 24, + "1212551706": 24, + "1212551707": 24, + "1212551708": 24, + "1212551709": 24, + "1212551710": 24, + "1212551711": 24, "1213492937": 24, "1213841242": 4, "1214004132": 21, @@ -10774,6 +10879,7 @@ "1216573272": 18, "1216597671": 23, "1216877608": 1, + "1216938185": 24, "1217115270": 20, "1217171744": 13, "1217171745": 13, @@ -11134,6 +11240,7 @@ "1250481499": 17, "1250519818": 4, "1250571424": 4, + "1250597597": 24, "1250649843": 7, "1250751335": 9, "1250905363": 21, @@ -11327,6 +11434,7 @@ "1269682391": 1, "1269697208": 5, "1269757144": 15, + "1269760161": 24, "1269789796": 2, "1269848819": 23, "1269969081": 24, @@ -11361,6 +11469,16 @@ "1272349641": 5, "1272406458": 22, "1272458185": 23, + "1272807296": 24, + "1272807297": 24, + "1272807298": 24, + "1272807299": 24, + "1272807300": 24, + "1272807301": 24, + "1272807302": 24, + "1272807303": 24, + "1272807306": 24, + "1272807307": 24, "1272828316": 8, "1273084616": 13, "1273090286": 23, @@ -11564,6 +11682,7 @@ "1289092817": 23, "1289177911": 14, "1289324202": 9, + "1289392745": 24, "1289563190": 15, "1289590866": 13, "1289604610": 4, @@ -12041,6 +12160,7 @@ "1334385023": 12, "1334592906": 4, "1334842411": 2, + "1334848405": 24, "1334940574": 19, "1334959255": 1, "1334978104": 5, @@ -12102,6 +12222,7 @@ "1341951177": 4, "1342036510": 7, "1342118617": 18, + "1342136984": 24, "1342539979": 17, "1342668638": 1, "1342734854": 3, @@ -12180,6 +12301,7 @@ "1351533424": 15, "1351606481": 21, "1351625431": 20, + "1351867523": 24, "1352027002": 24, "1352091900": 15, "1352108388": 12, @@ -12523,6 +12645,16 @@ "1389551711": 23, "1389946482": 20, "1390025282": 21, + "1390166864": 24, + "1390166865": 24, + "1390166866": 24, + "1390166867": 24, + "1390166868": 24, + "1390166869": 24, + "1390166870": 24, + "1390166871": 24, + "1390166876": 24, + "1390166877": 24, "1390278942": 8, "1390282760": 11, "1390282761": 11, @@ -12667,6 +12799,7 @@ "1406475890": 3, "1406737388": 19, "1406812800": 23, + "1406815911": 24, "1406846351": 11, "1407026808": 4, "1407272148": 23, @@ -12827,6 +12960,7 @@ "1425038744": 12, "1425077417": 4, "1425100824": 15, + "1425215686": 24, "1425343929": 20, "1425463779": 1, "1425490449": 17, @@ -12852,6 +12986,7 @@ "1427602615": 5, "1427620200": 1, "1427664187": 3, + "1427790750": 24, "1428068585": 24, "1428130848": 23, "1428161517": 3, @@ -12859,6 +12994,7 @@ "1428297954": 15, "1428449496": 20, "1428612407": 23, + "1428707463": 24, "1428740103": 9, "1429043018": 7, "1429228592": 12, @@ -12919,6 +13055,7 @@ "1435492828": 1, "1435557120": 20, "1435577594": 22, + "1435661214": 24, "1435681904": 1, "1435760473": 1, "1436643937": 16, @@ -12995,6 +13132,7 @@ "1442064747": 4, "1442425171": 23, "1442860559": 1, + "1442949761": 24, "1443049976": 2, "1443091319": 1, "1443166262": 17, @@ -13016,6 +13154,7 @@ "1445156671": 8, "1445212020": 1, "1445420672": 1, + "1445444705": 24, "1445565392": 9, "1445690096": 24, "1445719737": 11, @@ -13067,6 +13206,7 @@ "1451560288": 24, "1451602450": 16, "1451723779": 20, + "1451828077": 24, "1451831371": 15, "1451849462": 22, "1451959506": 4, @@ -13223,6 +13363,7 @@ "1469050017": 8, "1469173516": 21, "1469191439": 23, + "1469212984": 24, "1469302087": 16, "1469355180": 21, "1469431071": 16, @@ -13329,6 +13470,7 @@ "1477025073": 6, "1477025075": 6, "1477046559": 13, + "1477100072": 24, "1477271933": 11, "1477384052": 22, "1477422359": 24, @@ -13413,6 +13555,7 @@ "1486111804": 9, "1486292360": 4, "1486319393": 20, + "1486564541": 24, "1486600692": 24, "1486602573": 23, "1486613374": 17, @@ -13624,6 +13767,7 @@ "1510597169": 24, "1510606126": 20, "1510639514": 17, + "1511046071": 24, "1511127118": 6, "1511198888": 8, "1511198889": 8, @@ -13852,6 +13996,7 @@ "1536294536": 23, "1536545003": 24, "1536798515": 16, + "1536870767": 24, "1536915701": 4, "1536933453": 24, "1537074069": 8, @@ -13899,6 +14044,7 @@ "1539937265": 8, "1540031264": 3, "1540046410": 12, + "1540068657": 24, "1540346952": 13, "1540376513": 1, "1540530952": 14, @@ -13931,6 +14077,7 @@ "1542697275": 23, "1543279656": 24, "1543316902": 21, + "1543762570": 24, "1544361296": 2, "1544604424": 23, "1544960698": 8, @@ -14293,6 +14440,7 @@ "1589569998": 1, "1589569999": 1, "1589766118": 16, + "1589777557": 24, "1589874554": 12, "1590290995": 4, "1590375892": 4, @@ -14370,6 +14518,7 @@ "1599949358": 3, "1600065451": 10, "1600092898": 1, + "1600163186": 24, "1600224949": 1, "1600309958": 22, "1600484082": 12, @@ -14439,6 +14588,7 @@ "1607610663": 21, "1608112177": 4, "1608119540": 2, + "1608337935": 24, "1608630108": 8, "1608766312": 9, "1608766313": 9, @@ -14448,6 +14598,7 @@ "1608766317": 9, "1608766318": 9, "1609056795": 17, + "1609141880": 24, "1609340550": 7, "1609534648": 23, "1609534649": 23, @@ -14511,6 +14662,7 @@ "1615051908": 5, "1615052875": 15, "1615188781": 17, + "1615373434": 24, "1615970029": 15, "1616279522": 15, "1616317796": 1, @@ -14594,6 +14746,7 @@ "1625672312": 4, "1625672313": 4, "1625672315": 4, + "1625737280": 24, "1625916736": 19, "1625974211": 1, "1625986881": 1, @@ -14724,6 +14877,7 @@ "1644680957": 14, "1644761560": 4, "1644764626": 14, + "1644922223": 24, "1644978187": 5, "1645158859": 1, "1645283999": 17, @@ -14851,6 +15005,7 @@ "1657401727": 11, "1657427196": 4, "1658071472": 13, + "1658124146": 24, "1658124147": 24, "1658200446": 15, "1658294130": 11, @@ -15175,6 +15330,7 @@ "1691825975": 11, "1692109324": 24, "1692118511": 21, + "1692306441": 24, "1692416673": 17, "1692473496": 20, "1692586900": 10, @@ -15240,6 +15396,7 @@ "1700810598": 1, "1700819274": 5, "1700920860": 20, + "1700975995": 24, "1701005142": 1, "1701005143": 1, "1701106861": 15, @@ -15382,12 +15539,14 @@ "1716179979": 20, "1716241256": 23, "1716413779": 1, + "1716456528": 24, "1716643851": 4, "1716717668": 18, "1716988729": 2, "1717092331": 15, "1717277467": 3, "1717486905": 4, + "1717683000": 24, "1717767197": 2, "1717830540": 23, "1717855061": 24, @@ -15738,6 +15897,7 @@ "1752028469": 1, "1752237812": 9, "1752585070": 3, + "1752648948": 24, "1752725824": 13, "1752862708": 23, "1752938529": 22, @@ -15764,6 +15924,7 @@ "1756558505": 11, "1756661054": 19, "1756730947": 11, + "1756823706": 24, "1756946572": 1, "1757129747": 5, "1757202961": 21, @@ -15867,6 +16028,7 @@ "1768818273": 23, "1768913102": 19, "1768949382": 16, + "1768976368": 24, "1768984267": 17, "1768989017": 20, "1769115308": 6, @@ -16122,6 +16284,7 @@ "1798504264": 23, "1798504265": 23, "1798504267": 23, + "1798606018": 24, "1798676003": 1, "1798836563": 8, "1798874854": 3, @@ -16139,6 +16302,7 @@ "1800422906": 16, "1800484497": 14, "1800537035": 23, + "1800866764": 24, "1800924363": 7, "1800940324": 15, "1800975305": 20, @@ -16152,6 +16316,7 @@ "1801697307": 8, "1801729466": 19, "1801784637": 16, + "1801788772": 24, "1802086967": 22, "1802135586": 18, "1802180078": 24, @@ -16361,6 +16526,7 @@ "1823232652": 4, "1823465090": 2, "1823641159": 10, + "1823829158": 24, "1823966644": 6, "1823966645": 6, "1823966647": 6, @@ -16385,6 +16551,16 @@ "1827044758": 24, "1827197439": 20, "1827389998": 16, + "1827466498": 24, + "1827466499": 24, + "1827466504": 24, + "1827466505": 24, + "1827466506": 24, + "1827466507": 24, + "1827466508": 24, + "1827466509": 24, + "1827466510": 24, + "1827466511": 24, "1827753946": 24, "1827800764": 3, "1827816196": 1, @@ -16462,6 +16638,7 @@ "1836879403": 4, "1837000826": 9, "1837000827": 9, + "1837072550": 24, "1837151577": 5, "1837294881": 1, "1837324005": 19, @@ -16634,6 +16811,7 @@ "1855517848": 4, "1855640001": 21, "1855675471": 6, + "1855700614": 24, "1855720513": 8, "1855720514": 8, "1855720515": 8, @@ -16801,6 +16979,7 @@ "1874277072": 17, "1874277073": 17, "1874424704": 23, + "1874806534": 24, "1874827456": 20, "1875323682": 16, "1875342329": 3, @@ -16876,6 +17055,7 @@ "1882871700": 5, "1882871701": 5, "1882871702": 5, + "1882945288": 24, "1883013448": 9, "1883013449": 9, "1883013450": 9, @@ -16896,6 +17076,7 @@ "1883989897": 2, "1884027300": 23, "1884139133": 24, + "1884171613": 24, "1884301546": 12, "1884579135": 16, "1884588413": 21, @@ -17028,6 +17209,7 @@ "1895825075": 4, "1895949122": 9, "1896112341": 16, + "1896146275": 24, "1896287986": 12, "1896295346": 1, "1896309757": 23, @@ -17105,6 +17287,7 @@ "1901885391": 16, "1902412292": 2, "1902452687": 3, + "1902601581": 24, "1902811978": 18, "1903023095": 4, "1903182562": 19, @@ -17129,6 +17312,7 @@ "1904833517": 24, "1904833599": 7, "1905044254": 17, + "1905168732": 24, "1905273033": 19, "1905328541": 21, "1905540960": 20, @@ -17450,6 +17634,7 @@ "1937677973": 11, "1937694075": 12, "1937834292": 11, + "1937885359": 24, "1937967230": 5, "1937967231": 5, "1938005548": 12, @@ -17470,6 +17655,16 @@ "1938896448": 3, "1939096134": 20, "1939153390": 4, + "1939439780": 24, + "1939439781": 24, + "1939439784": 24, + "1939439785": 24, + "1939439786": 24, + "1939439787": 24, + "1939439788": 24, + "1939439789": 24, + "1939439790": 24, + "1939439791": 24, "1939669352": 23, "1939669353": 23, "1939669356": 23, @@ -17639,6 +17834,7 @@ "1956766793": 8, "1956782724": 16, "1956995775": 8, + "1957293355": 24, "1957318879": 4, "1957851633": 9, "1957909841": 21, @@ -18082,6 +18278,7 @@ "2003717903": 9, "2003833922": 24, "2003887571": 24, + "2004067462": 24, "2004141959": 23, "2004142280": 21, "2004184492": 9, @@ -18102,6 +18299,7 @@ "2005566727": 22, "2005782761": 5, "2005792304": 23, + "2005981509": 24, "2005998380": 6, "2005998382": 6, "2005998383": 6, @@ -18667,6 +18865,7 @@ "2078789916": 3, "2078873269": 18, "2078915253": 8, + "2079349511": 24, "2079454604": 7, "2079457774": 3, "2079505484": 3, @@ -18849,6 +19048,7 @@ "2097092608": 7, "2097219064": 16, "2097693203": 16, + "2097986902": 24, "2098166903": 13, "2098649123": 20, "2098778883": 7, @@ -18945,6 +19145,7 @@ "2110538051": 20, "2110811093": 15, "2110992349": 1, + "2111107535": 24, "2111111693": 3, "2111117883": 14, "2111120845": 23, @@ -18960,6 +19161,7 @@ "2111735666": 7, "2111743561": 22, "2111956477": 3, + "2112508290": 24, "2112541750": 11, "2112755457": 21, "2112808786": 24, @@ -19159,6 +19361,7 @@ "2138394740": 20, "2138431565": 4, "2138438796": 15, + "2138467220": 24, "2138550185": 19, "2138599001": 8, "2138625825": 10, @@ -19325,6 +19528,7 @@ "2155593793": 8, "2155593794": 8, "2155593795": 8, + "2155652547": 24, "2155736385": 23, "2155785663": 21, "2155913194": 9, @@ -19401,6 +19605,7 @@ "2163065962": 15, "2163065963": 15, "2163065967": 15, + "2163145080": 24, "2163383276": 4, "2163610255": 7, "2163782077": 16, @@ -19410,6 +19615,7 @@ "2164070257": 1, "2164090163": 14, "2164093822": 4, + "2164145814": 24, "2164210804": 3, "2164407902": 20, "2164448701": 8, @@ -19596,6 +19802,9 @@ "2183384906": 4, "2183861870": 1, "2183861871": 1, + "2183976852": 24, + "2184196645": 24, + "2184423372": 24, "2185034172": 20, "2185069086": 2, "2185244404": 15, @@ -19942,6 +20151,7 @@ "2217519207": 15, "2217600581": 3, "2217694130": 23, + "2217751623": 24, "2217754061": 19, "2217963031": 19, "2217978919": 21, @@ -20059,6 +20269,7 @@ "2231267741": 14, "2231267742": 14, "2231267743": 14, + "2231281470": 24, "2231409668": 15, "2231414196": 4, "2231414197": 4, @@ -20279,6 +20490,7 @@ "2256359240": 24, "2256480378": 4, "2256493484": 23, + "2256561760": 24, "2256700934": 24, "2257163624": 23, "2257180473": 10, @@ -20370,6 +20582,7 @@ "2265583879": 9, "2265599397": 22, "2265859909": 1, + "2266083651": 24, "2266122060": 7, "2266135479": 12, "2266517764": 3, @@ -20452,6 +20665,7 @@ "2272984669": 16, "2272984670": 16, "2272984671": 16, + "2273143517": 24, "2273200985": 20, "2273211710": 18, "2273483223": 1, @@ -20467,6 +20681,7 @@ "2274520361": 4, "2274579115": 2, "2274944459": 21, + "2274952964": 24, "2274954904": 24, "2275045983": 24, "2275087323": 16, @@ -20519,6 +20734,7 @@ "2280565321": 20, "2280771582": 24, "2281180042": 24, + "2281196142": 24, "2281231178": 9, "2281276269": 21, "2281431670": 8, @@ -20556,6 +20772,7 @@ "2284399303": 3, "2284653716": 23, "2284787283": 9, + "2285009454": 24, "2285070772": 3, "2285214166": 4, "2285214167": 4, @@ -20639,6 +20856,7 @@ "2292872001": 24, "2293199928": 13, "2293314698": 6, + "2293316036": 24, "2293476915": 1, "2293597301": 6, "2293707032": 20, @@ -20775,6 +20993,7 @@ "2308192895": 22, "2308577369": 12, "2308793821": 15, + "2308839898": 24, "2309619534": 8, "2309751073": 8, "2310030674": 21, @@ -20796,6 +21015,7 @@ "2311625543": 21, "2311637476": 17, "2311780078": 24, + "2312009715": 24, "2312363006": 2, "2312624988": 11, "2312764638": 20, @@ -20916,6 +21136,7 @@ "2322926844": 24, "2322948093": 23, "2323170449": 4, + "2323339168": 24, "2323544076": 17, "2323865727": 9, "2323986101": 4, @@ -21299,6 +21520,7 @@ "2369496221": 11, "2369859274": 20, "2369887879": 4, + "2370072441": 24, "2370089583": 16, "2370269384": 24, "2370269388": 24, @@ -21788,6 +22010,7 @@ "2424198040": 8, "2424446698": 22, "2424516271": 24, + "2424564383": 24, "2424588099": 12, "2424824187": 18, "2424958941": 15, @@ -21853,6 +22076,7 @@ "2433173867": 4, "2433223313": 4, "2433229738": 4, + "2433245060": 24, "2433436300": 15, "2433764085": 8, "2433826056": 3, @@ -21959,6 +22183,7 @@ "2446688290": 23, "2446688291": 23, "2446688293": 23, + "2446702198": 24, "2446730226": 23, "2446736719": 3, "2446854322": 22, @@ -22319,6 +22544,7 @@ "2489141150": 11, "2489277504": 22, "2489430594": 23, + "2489453969": 24, "2489456619": 20, "2489509734": 22, "2490306722": 1, @@ -22472,6 +22698,7 @@ "2505000979": 11, "2505385640": 24, "2505385643": 24, + "2505420496": 24, "2505533224": 1, "2505824339": 4, "2505943979": 20, @@ -22590,6 +22817,7 @@ "2518716062": 12, "2518901664": 4, "2518922544": 10, + "2518950753": 24, "2519247511": 23, "2519280691": 2, "2519597513": 20, @@ -22754,6 +22982,7 @@ "2533771627": 3, "2533822333": 4, "2533990645": 23, + "2534057869": 24, "2534462931": 23, "2534546147": 16, "2534610207": 11, @@ -22831,6 +23060,7 @@ "2543806755": 1, "2543903638": 7, "2543954091": 19, + "2543971899": 24, "2543982191": 3, "2544131466": 7, "2544285846": 3, @@ -22989,6 +23219,7 @@ "2564007183": 6, "2564164194": 6, "2564183153": 5, + "2564361489": 24, "2564393736": 22, "2564393737": 22, "2564476084": 14, @@ -23373,6 +23604,7 @@ "2603335652": 18, "2603400972": 16, "2603435366": 20, + "2603465648": 24, "2603483885": 12, "2603508311": 23, "2603702210": 2, @@ -23459,6 +23691,7 @@ "2612593449": 20, "2612593450": 20, "2612593451": 20, + "2612627561": 24, "2612707360": 8, "2612707361": 8, "2612707365": 8, @@ -23481,6 +23714,7 @@ "2614498064": 20, "2614785438": 23, "2614920426": 21, + "2615088909": 24, "2615482721": 12, "2615512594": 1, "2615541747": 24, @@ -23495,6 +23729,8 @@ "2616355862": 20, "2616420617": 23, "2616464530": 4, + "2616697701": 24, + "2617255407": 24, "2617324347": 16, "2617538380": 12, "2617538381": 12, @@ -23641,6 +23877,7 @@ "2634752262": 22, "2634752263": 22, "2634786903": 20, + "2635148716": 24, "2635164577": 6, "2635164578": 6, "2635164579": 6, @@ -23650,6 +23887,7 @@ "2635532173": 7, "2635605411": 23, "2635789286": 23, + "2635900721": 24, "2636190042": 16, "2636275908": 14, "2636275909": 14, @@ -23716,6 +23954,7 @@ "2642052565": 20, "2642052566": 20, "2642052567": 20, + "2642369485": 24, "2642597904": 13, "2642649962": 23, "2642728620": 9, @@ -23724,6 +23963,7 @@ "2643396214": 3, "2643564280": 23, "2643578823": 19, + "2643641068": 24, "2643676878": 23, "2643850526": 21, "2643903220": 17, @@ -23985,6 +24225,7 @@ "2671075344": 13, "2671200217": 5, "2671544961": 2, + "2671561830": 24, "2671565007": 13, "2671624238": 23, "2671639706": 18, @@ -24110,6 +24351,8 @@ "2687857837": 24, "2688111404": 1, "2688994496": 18, + "2689000870": 24, + "2689000871": 24, "2689268499": 4, "2689341528": 12, "2689341530": 12, @@ -24257,6 +24500,7 @@ "2704624943": 9, "2704843606": 8, "2704876322": 4, + "2705455302": 24, "2705494931": 15, "2706274587": 24, "2706461119": 19, @@ -24270,6 +24514,7 @@ "2707464805": 2, "2707470416": 3, "2707722364": 16, + "2707913128": 24, "2708128607": 16, "2708497504": 17, "2708585276": 18, @@ -24599,6 +24844,7 @@ "2742898269": 22, "2742930797": 4, "2743098132": 16, + "2743132477": 24, "2743180254": 8, "2743185250": 12, "2743269252": 11, @@ -24747,6 +24993,7 @@ "2759251821": 19, "2759477316": 23, "2759590322": 20, + "2759608248": 24, "2759704294": 10, "2759704295": 10, "2760076378": 1, @@ -24833,6 +25080,7 @@ "2768155748": 23, "2768185586": 23, "2768425135": 8, + "2768432983": 24, "2768498166": 15, "2768498167": 15, "2768502727": 20, @@ -24877,6 +25125,7 @@ "2772262012": 12, "2772358207": 4, "2772363503": 4, + "2772374639": 24, "2772485446": 4, "2772504773": 21, "2772538300": 24, @@ -25176,6 +25425,7 @@ "2807781581": 2, "2807917121": 12, "2808156426": 3, + "2808204875": 24, "2808362207": 11, "2808379196": 11, "2808445048": 4, @@ -25231,6 +25481,7 @@ "2812946864": 6, "2813078109": 13, "2813167325": 20, + "2813298149": 24, "2813695893": 1, "2813820790": 20, "2814093983": 19, @@ -25298,6 +25549,7 @@ "2818894176": 8, "2818919029": 16, "2818924418": 12, + "2818971729": 24, "2819436172": 20, "2819613314": 1, "2819810688": 17, @@ -25382,6 +25634,7 @@ "2829865752": 13, "2829974286": 4, "2830017061": 8, + "2830258806": 24, "2830633926": 21, "2830633927": 21, "2830633928": 21, @@ -25565,6 +25818,7 @@ "2847579025": 24, "2847579026": 24, "2847579027": 24, + "2847579028": 24, "2847579029": 24, "2847579030": 24, "2847579031": 24, @@ -26152,6 +26406,7 @@ "2913217908": 14, "2913284400": 1, "2913848309": 6, + "2913980509": 24, "2913992254": 1, "2913992255": 1, "2914167766": 23, @@ -26166,6 +26421,7 @@ "2915322487": 20, "2915388915": 12, "2915544509": 20, + "2915622931": 24, "2915803277": 24, "2915856823": 8, "2915937077": 20, @@ -26183,6 +26439,7 @@ "2918247569": 5, "2918278213": 17, "2918298692": 19, + "2918809436": 24, "2918819888": 20, "2918825526": 24, "2918840722": 20, @@ -26203,6 +26460,7 @@ "2919938481": 3, "2920072631": 18, "2920231040": 24, + "2920433728": 24, "2920601243": 3, "2921090754": 6, "2921126083": 2, @@ -26327,6 +26585,7 @@ "2933132219": 16, "2933160903": 12, "2933221739": 3, + "2933249366": 24, "2933633156": 8, "2933633157": 8, "2933666377": 3, @@ -26401,6 +26660,11 @@ "2940035732": 16, "2940269474": 10, "2940416351": 7, + "2940422168": 24, + "2940422169": 24, + "2940422170": 24, + "2940422171": 24, + "2940422175": 24, "2940586724": 1, "2940586725": 1, "2940586726": 1, @@ -26501,6 +26765,7 @@ "2950966011": 15, "2950995298": 20, "2951366222": 4, + "2951446848": 24, "2951499542": 8, "2951536384": 2, "2951725840": 4, @@ -26732,6 +26997,11 @@ "2978016230": 2, "2978031821": 22, "2978226043": 19, + "2978237185": 24, + "2978237188": 24, + "2978237189": 24, + "2978237190": 24, + "2978237191": 24, "2978337238": 1, "2978465325": 14, "2978558314": 8, @@ -27128,6 +27398,7 @@ "3018857481": 2, "3018997422": 20, "3019024381": 23, + "3019107947": 24, "3019204167": 20, "3019704432": 7, "3019704433": 7, @@ -27441,6 +27712,7 @@ "3056543888": 13, "3056543891": 13, "3056553352": 1, + "3056559520": 24, "3056827626": 23, "3056950148": 16, "3056970453": 23, @@ -27585,6 +27857,7 @@ "3075556640": 3, "3075932054": 20, "3076189282": 23, + "3076343411": 24, "3076431036": 1, "3076437306": 8, "3076446677": 15, @@ -27857,6 +28130,7 @@ "3106913644": 23, "3106913645": 12, "3107195131": 14, + "3107632797": 24, "3107649396": 20, "3107779168": 19, "3107853529": 17, @@ -28305,6 +28579,7 @@ "3154888563": 13, "3155153438": 13, "3155217769": 23, + "3155237152": 24, "3155320806": 11, "3155412907": 5, "3155634268": 18, @@ -28638,6 +28913,7 @@ "3186325462": 5, "3186325463": 5, "3186457725": 15, + "3186574155": 24, "3187008135": 17, "3187046535": 24, "3187101172": 24, @@ -28805,6 +29081,7 @@ "3203942298": 2, "3203965484": 20, "3204561957": 20, + "3204879766": 24, "3205137978": 5, "3205431489": 14, "3205628718": 23, @@ -28945,6 +29222,7 @@ "3217476784": 18, "3217477988": 5, "3217779897": 1, + "3217794538": 24, "3217885969": 4, "3217972777": 6, "3218066038": 1, @@ -28956,6 +29234,7 @@ "3219469610": 14, "3219544120": 20, "3219843890": 20, + "3219847280": 24, "3219933759": 23, "3219965079": 9, "3219975799": 8, @@ -29057,6 +29336,7 @@ "3232202236": 4, "3232203524": 24, "3232422679": 16, + "3232831379": 24, "3232982826": 4, "3233041552": 23, "3233390913": 9, @@ -29259,6 +29539,7 @@ "3254669317": 7, "3254670087": 6, "3255036626": 4, + "3255226835": 24, "3255228714": 1, "3255310006": 24, "3256047672": 22, @@ -29373,6 +29654,8 @@ "3266741334": 9, "3266752611": 20, "3267437183": 1, + "3267552998": 24, + "3267552999": 24, "3267969345": 15, "3267996858": 15, "3268063974": 21, @@ -29478,6 +29761,7 @@ "3280699112": 6, "3280699113": 6, "3280699114": 6, + "3280738875": 24, "3280858087": 15, "3280992127": 9, "3281237130": 19, @@ -29565,6 +29849,7 @@ "3289621657": 4, "3289783428": 13, "3289940630": 1, + "3290511811": 24, "3290540997": 20, "3290540999": 20, "3290874772": 4, @@ -29610,6 +29895,7 @@ "3296399440": 4, "3296524795": 16, "3297318847": 20, + "3297537117": 24, "3297863558": 4, "3297872976": 15, "3298272589": 23, @@ -29688,6 +29974,7 @@ "3306564654": 4, "3306727104": 5, "3306727105": 5, + "3306754793": 24, "3306784656": 20, "3306873822": 5, "3306947316": 8, @@ -29802,6 +30089,7 @@ "3319810952": 22, "3319810953": 22, "3319881022": 23, + "3319935156": 24, "3320129257": 2, "3320175784": 1, "3320253353": 4, @@ -29915,6 +30203,7 @@ "3329206472": 4, "3329220148": 1, "3329446191": 20, + "3329514528": 24, "3329627384": 24, "3329640351": 4, "3329682071": 17, @@ -30111,6 +30400,7 @@ "3349586629": 16, "3349733820": 16, "3349733823": 16, + "3349971731": 24, "3350146056": 6, "3350417888": 11, "3350493948": 20, @@ -30138,6 +30428,7 @@ "3352069677": 1, "3352182552": 17, "3352202537": 23, + "3352264425": 24, "3352275956": 6, "3352318036": 2, "3352415987": 19, @@ -30174,6 +30465,7 @@ "3355604850": 22, "3355614447": 24, "3355995799": 8, + "3356039644": 24, "3356279547": 15, "3356299403": 16, "3356346521": 23, @@ -30203,6 +30495,7 @@ "3358687360": 16, "3358915164": 11, "3358953321": 24, + "3358997915": 24, "3359067392": 20, "3359121706": 11, "3359370760": 24, @@ -30212,6 +30505,7 @@ "3360014173": 9, "3360070350": 4, "3360158272": 22, + "3360483257": 24, "3360543264": 3, "3360557690": 19, "3360898490": 4, @@ -31064,6 +31358,7 @@ "3456147612": 1, "3456250548": 20, "3456635674": 17, + "3456852421": 24, "3456918063": 24, "3457020513": 20, "3457039925": 20, @@ -31114,6 +31409,7 @@ "3463878722": 19, "3463996868": 24, "3464883458": 20, + "3465152776": 24, "3465198467": 1, "3465233192": 24, "3465323600": 1, @@ -31522,6 +31818,7 @@ "3513993870": 21, "3514096004": 13, "3514144928": 12, + "3514192102": 24, "3514252341": 10, "3514253563": 21, "3514681868": 7, @@ -31708,6 +32005,7 @@ "3530955149": 4, "3530997750": 1, "3531355350": 20, + "3531375693": 24, "3531414277": 1, "3531427692": 12, "3531427694": 12, @@ -31733,6 +32031,7 @@ "3534173884": 22, "3534439828": 22, "3534533410": 22, + "3534907758": 24, "3535121108": 23, "3535121110": 23, "3535121111": 23, @@ -31870,6 +32169,7 @@ "3545885625": 10, "3545885626": 10, "3545885627": 10, + "3545969536": 24, "3545981149": 7, "3546046147": 22, "3546168004": 10, @@ -31980,6 +32280,7 @@ "3556971406": 1, "3556999246": 14, "3557020689": 16, + "3557665230": 24, "3557991772": 24, "3558117017": 7, "3558143687": 10, @@ -32152,6 +32453,16 @@ "3578697915": 20, "3578708308": 10, "3578729114": 18, + "3578845648": 24, + "3578845649": 24, + "3578845650": 24, + "3578845651": 24, + "3578845652": 24, + "3578845653": 24, + "3578845654": 24, + "3578845655": 24, + "3578845658": 24, + "3578845659": 24, "3578952188": 22, "3579264196": 24, "3580122731": 12, @@ -32327,6 +32638,7 @@ "3599968586": 17, "3600056014": 23, "3600144112": 16, + "3600221887": 24, "3600237168": 4, "3600237169": 4, "3600237170": 4, @@ -32464,6 +32776,7 @@ "3613286014": 12, "3613939175": 7, "3613955012": 23, + "3614065846": 24, "3614211816": 4, "3614307300": 4, "3614544520": 24, @@ -32565,6 +32878,7 @@ "3625355092": 1, "3625465984": 19, "3625546921": 4, + "3625595801": 24, "3625698764": 1, "3625849667": 7, "3626028477": 20, @@ -32690,6 +33004,7 @@ "3637581406": 9, "3637669759": 22, "3637722482": 20, + "3637784828": 24, "3637823400": 16, "3637836092": 9, "3638113959": 1, @@ -32736,6 +33051,7 @@ "3640704251": 24, "3640744220": 1, "3640917386": 18, + "3640950733": 24, "3641242520": 3, "3641339029": 23, "3641410350": 5, @@ -32747,6 +33063,7 @@ "3642099597": 19, "3642146012": 15, "3642491337": 3, + "3642561323": 24, "3642889460": 22, "3643044286": 18, "3643144047": 1, @@ -32810,6 +33127,7 @@ "3649858345": 23, "3650390908": 20, "3650427855": 19, + "3650458128": 24, "3650577100": 23, "3650581584": 5, "3650581585": 5, @@ -32951,6 +33269,7 @@ "3666112472": 3, "3666208348": 1, "3666259949": 20, + "3666494067": 24, "3666681446": 4, "3666889414": 3, "3666954561": 1, @@ -32976,8 +33295,10 @@ "3670116308": 9, "3670132590": 1, "3670149407": 4, + "3670273806": 24, "3670562313": 20, "3670668729": 24, + "3670763683": 24, "3670792765": 4, "3670960347": 4, "3670996920": 11, @@ -33354,6 +33675,7 @@ "3714667144": 2, "3714678386": 10, "3714858266": 20, + "3714878655": 24, "3714896497": 22, "3714937821": 22, "3715136417": 19, @@ -33374,6 +33696,7 @@ "3716053150": 10, "3716053151": 10, "3716079445": 24, + "3716527434": 24, "3716635620": 20, "3716816813": 3, "3716820052": 15, @@ -33537,6 +33860,7 @@ "3733702440": 23, "3733702441": 23, "3733702443": 23, + "3733744968": 24, "3733752686": 3, "3734191679": 24, "3734248160": 21, @@ -33817,6 +34141,16 @@ "3759707664": 15, "3759764174": 7, "3759858535": 1, + "3759950066": 24, + "3759950067": 24, + "3759950072": 24, + "3759950073": 24, + "3759950074": 24, + "3759950075": 24, + "3759950076": 24, + "3759950077": 24, + "3759950078": 24, + "3759950079": 24, "3760001336": 24, "3760168333": 24, "3760675456": 24, @@ -33851,6 +34185,7 @@ "3763392098": 1, "3763392361": 1, "3763419925": 2, + "3763469974": 24, "3763470926": 20, "3763475984": 4, "3763516982": 17, @@ -33989,6 +34324,7 @@ "3777022373": 3, "3777298765": 18, "3777337478": 4, + "3777345696": 24, "3777789414": 6, "3777829357": 2, "3777965031": 5, @@ -34299,6 +34635,7 @@ "3809805229": 1, "3809805230": 1, "3809805231": 1, + "3809902215": 24, "3809938129": 1, "3810010787": 12, "3810050398": 21, @@ -35345,6 +35682,7 @@ "3923615467": 23, "3923638944": 4, "3923650007": 2, + "3923873857": 24, "3923895167": 21, "3924212056": 8, "3924249200": 12, @@ -35459,6 +35797,7 @@ "3936625543": 13, "3936625548": 14, "3936625549": 14, + "3936659015": 24, "3936838052": 17, "3936847655": 20, "3937103377": 7, @@ -35591,6 +35930,16 @@ "3953403255": 14, "3953403262": 14, "3953403263": 14, + "3953850592": 24, + "3953850593": 24, + "3953850594": 24, + "3953850595": 24, + "3953850596": 24, + "3953850597": 24, + "3953850598": 24, + "3953850599": 24, + "3953850604": 24, + "3953850605": 24, "3953986336": 3, "3954180285": 19, "3954464218": 20, @@ -35703,6 +36052,7 @@ "3965417933": 6, "3965549741": 14, "3965755651": 1, + "3965951219": 24, "3966078208": 12, "3966305065": 19, "3967067356": 17, @@ -35742,6 +36092,7 @@ "3969400656": 22, "3969669620": 8, "3969779337": 14, + "3970040886": 24, "3970180834": 14, "3970180835": 14, "3970180840": 14, @@ -35933,6 +36284,7 @@ "3990204598": 20, "3990233964": 1, "3990233965": 1, + "3990247390": 24, "3990378187": 4, "3990392880": 24, "3990400405": 5, @@ -35967,6 +36319,7 @@ "3993658232": 13, "3993827565": 2, "3993890817": 17, + "3993963432": 24, "3993972268": 2, "3994031968": 4, "3994043492": 20, @@ -36190,6 +36543,7 @@ "4016941122": 8, "4017272394": 21, "4017323452": 7, + "4017324409": 24, "4017738218": 16, "4017807189": 23, "4017853847": 7, @@ -36217,6 +36571,14 @@ "4020275385": 12, "4020425992": 2, "4020742303": 8, + "4021270928": 24, + "4021270929": 24, + "4021270930": 24, + "4021270931": 24, + "4021270932": 24, + "4021270933": 24, + "4021270934": 24, + "4021270935": 24, "4021402824": 12, "4021510192": 5, "4021652784": 20, @@ -36312,6 +36674,7 @@ "4029668386": 11, "4029814949": 11, "4029848814": 17, + "4030113762": 24, "4030297244": 4, "4030321364": 6, "4030348888": 2, @@ -36340,6 +36703,7 @@ "4035217656": 4, "4035222870": 10, "4035275107": 23, + "4035598116": 24, "4035690282": 5, "4035914127": 22, "4036115577": 3, @@ -36798,6 +37162,7 @@ "4082180156": 23, "4082217637": 2, "4082225868": 6, + "4082425930": 24, "4082425931": 24, "4082903308": 2, "4083045006": 5, @@ -36988,6 +37353,7 @@ "4100217959": 1, "4100222493": 3, "4100396181": 21, + "4100487764": 24, "4100615745": 13, "4100775158": 18, "4101005121": 22, @@ -37132,8 +37498,10 @@ "4117720514": 1, "4117747543": 2, "4117812885": 2, + "4117847739": 24, "4117871848": 22, "4118123292": 21, + "4118137186": 24, "4118245252": 23, "4118548161": 4, "4118865571": 21, @@ -37661,6 +38029,7 @@ "4176949501": 24, "4177213117": 1, "4177293424": 19, + "4177425952": 24, "4177448932": 1, "4177448933": 1, "4177468953": 23, @@ -37935,6 +38304,7 @@ "4204413574": 20, "4204482447": 23, "4204488676": 20, + "4204589777": 24, "4204781648": 2, "4204937008": 12, "4204937009": 12, @@ -38053,6 +38423,7 @@ "4218477208": 1, "4218477209": 1, "4218895524": 18, + "4218949995": 24, "4218954970": 9, "4219088013": 4, "4219181202": 12, @@ -38314,6 +38685,7 @@ "4245763411": 3, "4245865861": 16, "4246378958": 23, + "4246497199": 24, "4246887259": 24, "4246929450": 18, "4247056302": 17, @@ -38328,6 +38700,16 @@ "4248632159": 1, "4248662490": 8, "4248746874": 5, + "4248787952": 24, + "4248787953": 24, + "4248787954": 24, + "4248787955": 24, + "4248787956": 24, + "4248787957": 24, + "4248787958": 24, + "4248787959": 24, + "4248787960": 24, + "4248787961": 24, "4248834293": 4, "4248884704": 9, "4248884705": 9, @@ -38408,6 +38790,7 @@ "4256854144": 20, "4256971387": 12, "4257067040": 1, + "4257113467": 24, "4257122924": 16, "4257509593": 24, "4257510940": 12, @@ -38558,6 +38941,16 @@ "4272180935": 11, "4272367383": 3, "4272442416": 2, + "4272674720": 24, + "4272674721": 24, + "4272674722": 24, + "4272674723": 24, + "4272674724": 24, + "4272674725": 24, + "4272674726": 24, + "4272674727": 24, + "4272674730": 24, + "4272674731": 24, "4273043916": 12, "4273167814": 22, "4273298922": 9, @@ -38608,6 +39001,7 @@ "4277961992": 11, "4278213682": 23, "4278237608": 9, + "4278238761": 24, "4278404963": 17, "4278621285": 23, "4278918167": 16, diff --git a/data/sources/unassigned.json b/data/sources/unassigned.json index 0967ef42..e8a3e25b 100644 --- a/data/sources/unassigned.json +++ b/data/sources/unassigned.json @@ -1 +1,3 @@ -{} +{ + "941123623": "" +} diff --git a/output/artifact-breaker-weapon-types.json b/output/artifact-breaker-weapon-types.json index e426def1..9782ed2f 100644 --- a/output/artifact-breaker-weapon-types.json +++ b/output/artifact-breaker-weapon-types.json @@ -6,6 +6,7 @@ ], "2611060930": [ 6, + 5, 54 ], "3178805705": [ diff --git a/output/craftable-hashes.json b/output/craftable-hashes.json index b91bf2c2..956a180f 100644 --- a/output/craftable-hashes.json +++ b/output/craftable-hashes.json @@ -166,6 +166,7 @@ 3605603507, 3635821806, 3685470415, + 3698448090, 3710082365, 3782662983, 3794274730, diff --git a/output/d2-event-info-v2.ts b/output/d2-event-info-v2.ts index bccb587f..45c91743 100644 --- a/output/d2-event-info-v2.ts +++ b/output/d2-event-info-v2.ts @@ -23,7 +23,7 @@ export const D2EventInfo = { [D2EventEnum.SOLSTICE_OF_HEROES]: { name: 'Solstice', shortname: 'solstice', - sources: [151416041, 641018908, 1666677522, 3724111213], + sources: [151416041, 641018908, 1666677522, 2050870152, 3724111213], engram: [821844118], }, [D2EventEnum.FESTIVAL_OF_THE_LOST]: { diff --git a/output/d2-event-info.ts b/output/d2-event-info.ts index 86b3016d..b4d36e9f 100644 --- a/output/d2-event-info.ts +++ b/output/d2-event-info.ts @@ -23,7 +23,7 @@ export const D2EventInfo = { 3: { name: 'Solstice', shortname: 'solstice', - sources: [151416041, 641018908, 1666677522, 3724111213], + sources: [151416041, 641018908, 1666677522, 2050870152, 3724111213], engram: [821844118], }, 4: { @@ -69,6 +69,7 @@ export const D2SourcesToEvent = { 151416041: D2EventEnum.SOLSTICE_OF_HEROES, 641018908: D2EventEnum.SOLSTICE_OF_HEROES, 1666677522: D2EventEnum.SOLSTICE_OF_HEROES, + 2050870152: D2EventEnum.SOLSTICE_OF_HEROES, 3724111213: D2EventEnum.SOLSTICE_OF_HEROES, 1054169368: D2EventEnum.FESTIVAL_OF_THE_LOST, 1677921161: D2EventEnum.FESTIVAL_OF_THE_LOST, diff --git a/output/empty-plug-hashes.ts b/output/empty-plug-hashes.ts index 2b54080e..50910e29 100644 --- a/output/empty-plug-hashes.ts +++ b/output/empty-plug-hashes.ts @@ -72,7 +72,7 @@ export const emptyPlugHashes = new Set([ 1728096240, // Empty Mod Socket (King's Fall Mod, enhancements.raid_v620) 4144354978, // Empty Mod Socket (Root of Nightmares Armor Mod, enhancements.raid_v700) 717667840, // Empty Mod Socket (Crota's End Mod, enhancements.raid_v720) - 4059283783, // Empty Mod Socket (Salvation's Edge Armor Mod, enhancements.raid_v800) + 4059283783, // Empty Mod Socket (This mod's perks are only active in the "Salvation's Edge" raid. Multiple copies of this mod stack and improve its effects., enhancements.raid_v800) 720857, // Empty Mod Socket (Legacy Armor Mod, enhancements.season_forge) 1180997867, // Empty Mod Socket (Nightmare Mod, enhancements.season_maverick) 2620967748, // Empty Mod Socket (Legacy Armor Mod, enhancements.season_maverick) diff --git a/output/exotic-to-catalyst-record.json b/output/exotic-to-catalyst-record.json index c3f3dcf1..79bebb0f 100644 --- a/output/exotic-to-catalyst-record.json +++ b/output/exotic-to-catalyst-record.json @@ -76,6 +76,7 @@ "3654674561": 15917031, "3659414143": 788492661, "3664831848": 1629497825, + "3698448090": 812366033, "3761898871": 2329638530, "3766045777": 252263460, "3821409356": 1605993075, diff --git a/output/exotics-with-catalysts.ts b/output/exotics-with-catalysts.ts index e9d0faed..59308143 100644 --- a/output/exotics-with-catalysts.ts +++ b/output/exotics-with-catalysts.ts @@ -76,6 +76,7 @@ const exoticWeaponHashesWithCatalyst = new Set([ 3654674561, // Dead Man's Tale 3659414143, // Verglas Curve 3664831848, // Heartshadow + 3698448090, // Choir of One 3761898871, // Lorentz Driver 3766045777, // Black Talon 3821409356, // Ex Diris diff --git a/output/generated-enums.ts b/output/generated-enums.ts index bb233622..26f582ee 100644 --- a/output/generated-enums.ts +++ b/output/generated-enums.ts @@ -83,9 +83,6 @@ export const enum PlugCategoryHashes { EventsDawningTurnkeyOvenEmptyCombination = 3252134363, EventsDawningTurnkeyOvenNotMasterworked = 1631280048, EventsDawningTurnkeyRecipe = 2225149110, - EventsSolsticeEmbers = 3134612854, - EventsSolsticeEmbersEmpty = 566942471, - EventsSolsticeKindling = 115096268, ExoticAllSkins = 3940152116, ExoticNewAutoRifle0Skins = 3325876128, ExoticNewAutoRifle1Skins = 2618920869, @@ -808,6 +805,7 @@ export const enum PlugCategoryHashes { V800HunterNewChest0Skins = 171540076, V800HunterNewClass0Skins = 1319487721, V800HunterNewLegs0Skins = 2260466760, + V800NewAutoRifle0Skins = 3362902088, V800NewLinearFusionRifle0Masterwork = 3297970367, V800NewLinearFusionRifle0Skins = 2833377167, V800NewSniperRifle0Masterwork = 1615215818, @@ -1237,7 +1235,6 @@ export const enum TraitHashes { ItemSubclassLight = 482679394, ItemSubclassPrism = 3820193993, ItemVehicle = 3977049418, - ItemWeapon = 567594262, ItemWeaponAutoRifle = 2729780558, ItemWeaponBow = 195373008, ItemWeaponFusionRifle = 2891203715, diff --git a/output/missing-source-info.ts b/output/missing-source-info.ts index c2f01cda..5feb90f2 100644 --- a/output/missing-source-info.ts +++ b/output/missing-source-info.ts @@ -346,6 +346,7 @@ const missingSources: { [key: string]: number[] } = { 3164547673, // Atonement Tau 3174394351, // The Outlander's Grip 3174771856, // Stasis Scavenger + 3181984586, // Charged Up 3183585337, // Legion-Bane 3184690956, // Absolution 3188328909, // Stasis Siphon @@ -905,27 +906,32 @@ const missingSources: { [key: string]: number[] } = { 140842223, // Solstice Mask (Drained) 143299650, // Solstice Plate (Renewed) 153144587, // Solstice Cloak (Drained) + 179654396, // Sublime Vest 226436555, // Solstice Mask (Renewed) 231432261, // Solstice Bond (Resplendent) 234970842, // Solstice Boots (Resplendent) 250513201, // Solstice Greaves (Resplendent) + 327680457, // Sublime Boots 335763433, // Solstice Plate (Resplendent) 346065606, // Solstice Cloak (Rekindled) + 350054538, // Sublime Strides 391889347, // Solstice Robes (Drained) 419435523, // Inaugural Revelry Grips 450844637, // Solstice Robes (Majestic) + 464814870, // Sublime Greaves 492834021, // Inaugural Revelry Hood 495940989, // Avalanche + 503145555, // Sublime Gloves 518930465, // Solstice Grasps (Rekindled) 531005896, // Solstice Cloak (Resplendent) 540653483, // Solstice Vest (Scorched) 574167778, // Solstice Gauntlets (Drained) 574790717, // Solstice Gloves (Drained) - 586671776, // Something New 627596132, // Solstice Hood (Drained) 677939288, // Solstice Helm (Scorched) 721146704, // Solstice Mask (Rekindled) 784499738, // Solstice Bond (Renewed) + 807693916, // Sublime Hood 830497630, // Solstice Helm (Resplendent) 929148730, // Solstice Vest (Drained) 967650555, // Solstice Greaves (Scorched) @@ -947,15 +953,18 @@ const missingSources: { [key: string]: number[] } = { 1556831535, // Inaugural Revelry Gauntlets 1561249470, // Inaugural Revelry Boots 1589318419, // Solstice Strides (Rekindled) + 1609141880, // Sublime Plate 1649929380, // Solstice Mark (Resplendent) 1651275175, // Solstice Helm (Renewed) 1683482799, // Solstice Mark (Drained) 1706764072, // Quilted Winter Mark 1706874193, // Inaugural Revelry Greaves + 1752648948, // Sublime Sleeves 1775707016, // Solstice Grasps (Majestic) 1812385587, // Festive Winter Bond 1862324869, // Solstice Boots (Majestic) 1897528210, // Solstice Robes (Scorched) + 2079349511, // Sublime Helm 2105409832, // Solstice Greaves (Renewed) 2111111693, // Solstice Strides (Resplendent) 2120905920, // Inaugural Revelry Cloak @@ -974,8 +983,10 @@ const missingSources: { [key: string]: number[] } = { 2477028154, // Inaugural Revelry Mask 2492769187, // Solstice Bond (Scorched) 2523388612, // Solstice Hood (Renewed) + 2543971899, // Sublime Mark 2546370410, // Solstice Hood (Majestic) 2578820926, // Solstice Greaves (Majestic) + 2616697701, // Sublime Robes 2618313500, // Solstice Greaves (Drained) 2685001662, // Solstice Gloves (Rekindled) 2696245301, // Solstice Grasps (Scorched) @@ -999,14 +1010,17 @@ const missingSources: { [key: string]: number[] } = { 3104384024, // Solstice Boots (Rekindled) 3159052337, // Solstice Mask (Majestic) 3192336962, // Solstice Cloak (Scorched) + 3232831379, // Sublime Mask 3236510875, // Solstice Grasps (Resplendent) 3240434620, // Something New + 3329514528, // Sublime Gauntlets 3400256755, // Zephyr 3559361670, // The Title 3573686365, // Glacioclasm 3611487543, // Solstice Hood (Rekindled) 3685996623, // Solstice Greaves (Rekindled) 3748622249, // Solstice Hood (Resplendent) + 3809902215, // Sublime Cloak 3829285960, // Horror Story 3892841518, // Solstice Gauntlets (Renewed) 3929403535, // Solstice Gauntlets (Resplendent) @@ -1014,13 +1028,12 @@ const missingSources: { [key: string]: number[] } = { 3943394479, // Solstice Plate (Scorched) 3965417933, // Inaugural Revelry Vest 3968560442, // Solstice Bond (Drained) + 3970040886, // Sublime Bond 3987442049, // Solstice Mark (Majestic) 4075522049, // Inaugural Revelry Bond 4100029812, // Solstice Strides (Renewed) - 4106757302, // Crowning Duologue 4128297107, // Solstice Mark (Renewed) 4142792564, // Solstice Helm (Rekindled) - 4169225313, // Compass Rose 4245469491, // Solstice Plate (Rekindled) 4272367383, // Solstice Strides (Scorched) ], diff --git a/output/objective-richTexts.ts b/output/objective-richTexts.ts index d1ec89fe..456af30b 100644 --- a/output/objective-richTexts.ts +++ b/output/objective-richTexts.ts @@ -32,7 +32,7 @@ const richTextManifestSourceData = { '[Shotgun]': ['Objective', 139526739], '[Sidearm]': ['Objective', 141911950], '[Sniper Rifle]': ['Objective', 90309638], - '[Solar]': ['Objective', 76012872], + '[Solar]': ['Objective', 85535853], '[Special Grenade Launcher]': ['Objective', 1217177904], '[Sprint]': ['SandboxPerk', 1330059513], '[Stagger]': ['SandboxPerk', 72139184], @@ -41,7 +41,7 @@ const richTextManifestSourceData = { '[Stasis: Glyph 2 Locked]': ['Objective', 1857129539], '[Stasis: Glyph 3 Locked]': ['Objective', 1481711502], '[Stasis]': ['Objective', 20533663], - '[Strand]': ['SandboxPerk', 381243875], + '[Strand]': ['Objective', 46977068], '[Super]': ['SandboxPerk', 1330059512], '[Sword]': ['Objective', 259564494], '[Trace Rifle]': ['Objective', 1047174894], diff --git a/output/pursuits.json b/output/pursuits.json index 94eab0eb..86910105 100644 --- a/output/pursuits.json +++ b/output/pursuits.json @@ -1,28 +1,4 @@ { - "5190448": { - "ItemCategory": [11] - }, - "5190449": { - "ItemCategory": [3871742104] - }, - "5190450": { - "ItemCategory": [13] - }, - "5190451": { - "ItemCategory": [5] - }, - "5190452": { - "ItemCategory": [6] - }, - "5190453": { - "KillType": [3] - }, - "5190454": { - "ItemCategory": [8] - }, - "5190455": { - "ItemCategory": [54] - }, "8819107": { "Destination": [3607432451] }, @@ -201,6 +177,9 @@ "DamageType": [3454344768, 3949783978], "KillType": [1] }, + "204307491": { + "ItemCategory": [5, 14] + }, "204755896": { "ActivityMode": [332181804], "KillType": [4] @@ -233,6 +212,9 @@ "ActivityMode": [1673724806], "DamageType": [1847026933] }, + "221085078": { + "DamageType": [1847026933, 2303181850] + }, "221921328": { "Destination": [1729879943], "KillType": [4] @@ -262,6 +244,11 @@ "235749523": { "Destination": [2481646875] }, + "237862665": { + "ActivityMode": [1848252830, 1164760504], + "Destination": [3607432451], + "DamageType": [2303181850] + }, "242688673": { "ActivityMode": [2294590554], "ItemCategory": [9, 3954685534, 11, 14] @@ -293,12 +280,18 @@ "248734242": { "ActivityMode": [3789021730] }, + "254640380": { + "Destination": [3607432451] + }, "267578800": { "Destination": [1729879943] }, "267578801": { "Destination": [1729879943] }, + "277210320": { + "Destination": [1729879943] + }, "277768810": { "ActivityMode": [1164760504] }, @@ -328,6 +321,9 @@ "Destination": [1729879943], "ItemCategory": [2489664120] }, + "293987907": { + "Destination": [1729879943] + }, "299576120": { "ActivityMode": [2294590554], "ItemCategory": [153950757, -153950757], @@ -385,6 +381,41 @@ "341098154": { "ItemCategory": [2489664120] }, + "345474886": { + "DamageType": [151347233] + }, + "345474887": { + "DamageType": [3949783978] + }, + "345474888": { + "DamageType": [1847026933] + }, + "345474889": { + "DamageType": [3454344768] + }, + "345474890": { + "DamageType": [3949783978], + "KillType": [5] + }, + "345474891": { + "DamageType": [2303181850] + }, + "345474892": { + "DamageType": [3454344768], + "KillType": [5] + }, + "345474893": { + "DamageType": [151347233], + "KillType": [5] + }, + "345474894": { + "DamageType": [2303181850], + "KillType": [5] + }, + "345474895": { + "DamageType": [1847026933], + "KillType": [5] + }, "346263927": { "ActivityMode": [608898761] }, @@ -398,6 +429,9 @@ "Destination": [3990611421], "DamageType": [2303181850, 1847026933, 3454344768] }, + "361098383": { + "Destination": [3607432451] + }, "364003008": { "DamageType": [2303181850], "KillType": [4] @@ -523,6 +557,36 @@ "595255799": { "Destination": [1729879943] }, + "597093632": { + "DamageType": [1847026933] + }, + "597093633": { + "DamageType": [3949783978] + }, + "597093634": { + "DamageType": [3454344768] + }, + "597093635": { + "DamageType": [2303181850] + }, + "597093636": { + "DamageType": [1847026933] + }, + "597093637": { + "DamageType": [2303181850] + }, + "597093638": { + "DamageType": [151347233] + }, + "597093639": { + "DamageType": [3454344768] + }, + "597093644": { + "DamageType": [3949783978] + }, + "597093645": { + "DamageType": [151347233] + }, "598616135": { "Destination": [677774031] }, @@ -563,6 +627,18 @@ "610104115": { "ActivityMode": [2394616003] }, + "613098968": { + "ActivityMode": [3789021730] + }, + "613098972": { + "ActivityMode": [608898761] + }, + "613098973": { + "ActivityMode": [1673724806] + }, + "613098975": { + "ActivityMode": [3789021730] + }, "613601972": { "Destination": [677774031] }, @@ -570,6 +646,9 @@ "Destination": [1729879943], "DamageType": [151347233] }, + "675476774": { + "Destination": [3607432451] + }, "679437494": { "Destination": [1729879943], "ItemCategory": [8] @@ -621,6 +700,9 @@ "ActivityMode": [608898761], "Destination": [697502628] }, + "709031948": { + "Destination": [3607432451] + }, "709535744": { "Destination": [677774031], "DamageType": [2303181850, 1847026933, 3454344768] @@ -658,6 +740,10 @@ "ActivityMode": [1673724806], "ItemCategory": [3954685534] }, + "725809663": { + "Destination": [3607432451], + "DamageType": [2303181850, 3454344768] + }, "736610326": { "Destination": [1729879943], "DamageType": [3373582085, 2303181850, 1847026933, 3454344768] @@ -665,9 +751,6 @@ "736610327": { "Destination": [1729879943] }, - "738267611": { - "DamageType": [1847026933] - }, "743499071": { "ItemCategory": [1504945536], "KillType": [4] @@ -685,6 +768,9 @@ "Destination": [3607432451], "DamageType": [1847026933] }, + "759364805": { + "KillType": [3, 0] + }, "768824550": { "Destination": [1729879943], "ItemCategory": [12] @@ -705,6 +791,18 @@ "811475414": { "DamageType": [3949783978] }, + "824048506": { + "ActivityMode": [3789021730] + }, + "824048509": { + "ActivityMode": [3789021730] + }, + "824048510": { + "ActivityMode": [608898761] + }, + "824048511": { + "ActivityMode": [1673724806] + }, "836278577": { "KillType": [5] }, @@ -856,6 +954,18 @@ "Destination": [1729879943], "ItemCategory": [7] }, + "959733945": { + "ActivityMode": [3789021730] + }, + "959733946": { + "ActivityMode": [608898761] + }, + "959733947": { + "ActivityMode": [1673724806] + }, + "959733950": { + "ActivityMode": [3789021730] + }, "971074444": { "Destination": [1416096592, 1729879943] }, @@ -942,6 +1052,9 @@ "1092992613": { "Destination": [3990611421] }, + "1094625203": { + "Destination": [3607432451] + }, "1099249219": { "ActivityMode": [2394616003] }, @@ -1040,6 +1153,9 @@ "1143110718": { "Destination": [677774031] }, + "1144957964": { + "DamageType": [1847026933] + }, "1147672297": { "Destination": [1416096592] }, @@ -1087,6 +1203,9 @@ "Destination": [2244580325], "DamageType": [151347233] }, + "1178513234": { + "Destination": [3607432451] + }, "1181188552": { "DamageType": [3949783978] }, @@ -1123,12 +1242,45 @@ "1190558127": { "Destination": [1729879943] }, + "1195290821": { + "Destination": [3607432451] + }, "1202425489": { "Destination": [697502628] }, "1202973617": { "Destination": [1416096592] }, + "1212551702": { + "DamageType": [3949783978] + }, + "1212551703": { + "DamageType": [151347233] + }, + "1212551704": { + "DamageType": [3454344768] + }, + "1212551705": { + "DamageType": [2303181850] + }, + "1212551706": { + "DamageType": [1847026933] + }, + "1212551707": { + "DamageType": [3949783978] + }, + "1212551708": { + "DamageType": [151347233] + }, + "1212551709": { + "DamageType": [3454344768] + }, + "1212551710": { + "DamageType": [1847026933] + }, + "1212551711": { + "DamageType": [2303181850] + }, "1214796460": { "ActivityMode": [2394616003], "Destination": [3607432451], @@ -1193,6 +1345,21 @@ "ItemCategory": [3317538576], "KillType": [4] }, + "1272807296": { + "KillType": [2] + }, + "1272807298": { + "DamageType": [2303181850, 1847026933, 3454344768] + }, + "1272807299": { + "DamageType": [3373582085] + }, + "1272807302": { + "KillType": [1] + }, + "1272807303": { + "KillType": [0] + }, "1285862604": { "Destination": [677774031] }, @@ -1313,6 +1480,41 @@ "1388623635": { "DamageType": [3454344768] }, + "1390166864": { + "DamageType": [2303181850] + }, + "1390166865": { + "DamageType": [3949783978], + "KillType": [5] + }, + "1390166866": { + "DamageType": [3454344768] + }, + "1390166867": { + "DamageType": [1847026933] + }, + "1390166868": { + "DamageType": [1847026933], + "KillType": [5] + }, + "1390166869": { + "DamageType": [2303181850], + "KillType": [5] + }, + "1390166870": { + "DamageType": [151347233], + "KillType": [5] + }, + "1390166871": { + "DamageType": [3454344768], + "KillType": [5] + }, + "1390166876": { + "DamageType": [3949783978] + }, + "1390166877": { + "DamageType": [151347233] + }, "1390863957": { "DamageType": [1847026933] }, @@ -1463,9 +1665,15 @@ "Destination": [677774031], "ItemCategory": [7] }, + "1540784255": { + "Destination": [3607432451] + }, "1553536199": { "Destination": [677774031] }, + "1557561837": { + "Destination": [3607432451] + }, "1561597496": { "ItemCategory": [5] }, @@ -1627,6 +1835,36 @@ "Destination": [1729879943], "KillType": [4] }, + "1827466498": { + "DamageType": [3949783978] + }, + "1827466499": { + "DamageType": [151347233] + }, + "1827466504": { + "DamageType": [151347233] + }, + "1827466505": { + "DamageType": [3454344768] + }, + "1827466506": { + "DamageType": [1847026933] + }, + "1827466507": { + "DamageType": [2303181850] + }, + "1827466508": { + "DamageType": [3454344768] + }, + "1827466509": { + "DamageType": [2303181850] + }, + "1827466510": { + "DamageType": [1847026933] + }, + "1827466511": { + "DamageType": [3949783978] + }, "1838787439": { "ActivityMode": [608898761] }, @@ -1717,6 +1955,36 @@ "Destination": [1729879943], "ItemCategory": [5] }, + "1939439780": { + "DamageType": [151347233] + }, + "1939439781": { + "DamageType": [3949783978] + }, + "1939439784": { + "DamageType": [3949783978] + }, + "1939439785": { + "DamageType": [1847026933] + }, + "1939439786": { + "DamageType": [2303181850] + }, + "1939439787": { + "DamageType": [3454344768] + }, + "1939439788": { + "DamageType": [2303181850] + }, + "1939439789": { + "DamageType": [1847026933] + }, + "1939439790": { + "DamageType": [3454344768] + }, + "1939439791": { + "DamageType": [151347233] + }, "1940788333": { "Destination": [1416096592] }, @@ -1833,6 +2101,9 @@ "2104674665": { "Destination": [1416096592] }, + "2109789017": { + "Destination": [3607432451] + }, "2111258436": { "Destination": [1729879943] }, @@ -1846,15 +2117,14 @@ "2125848607": { "ActivityMode": [1848252830, 1164760504] }, - "2140947777": { - "DamageType": [1847026933], - "KillType": [1] + "2126566604": { + "Destination": [3607432451] }, - "2140947790": { - "ItemCategory": [11] + "2143344319": { + "Destination": [3607432451] }, - "2140947791": { - "ItemCategory": [6] + "2160121874": { + "Destination": [3607432451] }, "2169515393": { "ActivityMode": [1848252830] @@ -1896,21 +2166,6 @@ "2196850110": { "ActivityMode": [1848252830, 3789021730, 1164760504] }, - "2199659929": { - "KillType": [2] - }, - "2199659930": { - "DamageType": [3373582085] - }, - "2199659931": { - "DamageType": [2303181850, 1847026933, 3454344768] - }, - "2199659934": { - "KillType": [0] - }, - "2199659935": { - "KillType": [1] - }, "2205014136": { "Destination": [1729879943], "DamageType": [151347233] @@ -2329,6 +2584,9 @@ "2683598861": { "Destination": [1729879943] }, + "2689000870": { + "DamageType": [1847026933] + }, "2697214271": { "Destination": [1729879943], "KillType": [0] @@ -2643,6 +2901,18 @@ "ActivityMode": [1673724806], "KillType": [0] }, + "2940422168": { + "ActivityMode": [3789021730] + }, + "2940422170": { + "ActivityMode": [1673724806] + }, + "2940422171": { + "ActivityMode": [608898761] + }, + "2940422175": { + "ActivityMode": [3789021730] + }, "2941404267": { "Destination": [3607432451] }, @@ -2668,6 +2938,18 @@ "2975357707": { "DamageType": [151347233] }, + "2978237185": { + "ActivityMode": [3789021730] + }, + "2978237188": { + "ActivityMode": [1673724806] + }, + "2978237189": { + "ActivityMode": [608898761] + }, + "2978237190": { + "ActivityMode": [3789021730] + }, "2982138514": { "Destination": [1729879943], "ItemCategory": [5] @@ -2697,12 +2979,21 @@ "3039004941": { "Destination": [3990611421] }, + "3049649564": { + "Destination": [3607432451] + }, "3051422226": { "ActivityMode": [1673724806] }, "3061679979": { "Destination": [677774031] }, + "3066427146": { + "Destination": [3607432451] + }, + "3066427151": { + "Destination": [3607432451] + }, "3068019720": { "Destination": [2244580325] }, @@ -2724,6 +3015,9 @@ "ActivityMode": [1686739444], "Destination": [677774031] }, + "3083204834": { + "Destination": [3607432451] + }, "3083700040": { "ActivityMode": [1848252830, 3789021730, 1164760504] }, @@ -2737,6 +3031,9 @@ "ActivityMode": [1673724806], "KillType": [1] }, + "3099982421": { + "Destination": [3607432451] + }, "3106430225": { "Destination": [1729879943], "KillType": [3] @@ -2796,6 +3093,9 @@ "ItemCategory": [3871742104], "KillType": [0] }, + "3150315310": { + "Destination": [3607432451] + }, "3161484303": { "Destination": [2481646875], "DamageType": [3949783978] @@ -3077,6 +3377,9 @@ "DamageType": [2303181850], "KillType": [0] }, + "3527199087": { + "Destination": [1729879943] + }, "3531980021": { "Destination": [1416096592] }, @@ -3170,6 +3473,16 @@ "3577538269": { "Destination": [3990611421] }, + "3578845652": { + "ItemCategory": [6] + }, + "3578845653": { + "ItemCategory": [11] + }, + "3578845658": { + "DamageType": [1847026933], + "KillType": [1] + }, "3586902510": { "Destination": [3607432451] }, @@ -3305,6 +3618,41 @@ "ActivityMode": [2394616003], "Destination": [3990611421] }, + "3759950066": { + "DamageType": [3949783978] + }, + "3759950067": { + "DamageType": [151347233] + }, + "3759950072": { + "DamageType": [151347233], + "KillType": [5] + }, + "3759950073": { + "DamageType": [3454344768], + "KillType": [5] + }, + "3759950074": { + "DamageType": [1847026933], + "KillType": [5] + }, + "3759950075": { + "DamageType": [2303181850], + "KillType": [5] + }, + "3759950076": { + "DamageType": [3454344768] + }, + "3759950077": { + "DamageType": [1847026933] + }, + "3759950078": { + "DamageType": [2303181850] + }, + "3759950079": { + "DamageType": [3949783978], + "KillType": [5] + }, "3763552014": { "DamageType": [3454344768] }, @@ -3357,6 +3705,9 @@ "Destination": [1729879943], "ItemCategory": [2489664120] }, + "3840922406": { + "Destination": [3607432451] + }, "3846956448": { "Destination": [2481646875] }, @@ -3399,6 +3750,9 @@ "3848329302": { "DamageType": [151347233] }, + "3857699993": { + "Destination": [2481646875] + }, "3896716771": { "Destination": [1729879943], "ItemCategory": [5] @@ -3443,6 +3797,41 @@ "3939248478": { "Destination": [3607432451] }, + "3953850592": { + "DamageType": [3949783978], + "KillType": [5] + }, + "3953850593": { + "DamageType": [2303181850] + }, + "3953850594": { + "DamageType": [1847026933] + }, + "3953850595": { + "DamageType": [3454344768] + }, + "3953850596": { + "DamageType": [2303181850], + "KillType": [5] + }, + "3953850597": { + "DamageType": [1847026933], + "KillType": [5] + }, + "3953850598": { + "DamageType": [3454344768], + "KillType": [5] + }, + "3953850599": { + "DamageType": [151347233], + "KillType": [5] + }, + "3953850604": { + "DamageType": [151347233] + }, + "3953850605": { + "DamageType": [3949783978] + }, "3954920295": { "Destination": [697502628] }, @@ -3452,6 +3841,9 @@ "3958224565": { "Destination": [3607432451] }, + "3958365739": { + "Destination": [3607432451] + }, "3963636042": { "ActivityMode": [2394616003], "DamageType": [151347233] @@ -3493,6 +3885,30 @@ "4019596374": { "ActivityMode": [3789021730] }, + "4021270928": { + "ItemCategory": [54] + }, + "4021270929": { + "ItemCategory": [8] + }, + "4021270930": { + "KillType": [3] + }, + "4021270931": { + "ItemCategory": [6] + }, + "4021270932": { + "ItemCategory": [5] + }, + "4021270933": { + "ItemCategory": [13] + }, + "4021270934": { + "ItemCategory": [3871742104] + }, + "4021270935": { + "ItemCategory": [11] + }, "4023822046": { "ActivityMode": [1848252830, 3789021730, 1164760504] }, @@ -3667,6 +4083,41 @@ "ItemCategory": [5], "KillType": [4] }, + "4248787952": { + "DamageType": [2303181850], + "KillType": [5] + }, + "4248787953": { + "DamageType": [1847026933], + "KillType": [5] + }, + "4248787954": { + "DamageType": [3454344768], + "KillType": [5] + }, + "4248787955": { + "DamageType": [151347233], + "KillType": [5] + }, + "4248787956": { + "DamageType": [3949783978], + "KillType": [5] + }, + "4248787957": { + "DamageType": [2303181850] + }, + "4248787958": { + "DamageType": [1847026933] + }, + "4248787959": { + "DamageType": [3454344768] + }, + "4248787960": { + "DamageType": [151347233] + }, + "4248787961": { + "DamageType": [3949783978] + }, "4252762628": { "Destination": [2481646875] }, @@ -3696,6 +4147,36 @@ "Destination": [2481646875], "DamageType": [151347233] }, + "4272674720": { + "DamageType": [3454344768] + }, + "4272674721": { + "DamageType": [151347233] + }, + "4272674722": { + "DamageType": [2303181850] + }, + "4272674723": { + "DamageType": [1847026933] + }, + "4272674724": { + "DamageType": [2303181850] + }, + "4272674725": { + "DamageType": [3454344768] + }, + "4272674726": { + "DamageType": [3949783978] + }, + "4272674727": { + "DamageType": [1847026933] + }, + "4272674730": { + "DamageType": [151347233] + }, + "4272674731": { + "DamageType": [3949783978] + }, "4276814926": { "ActivityMode": [1848252830] }, diff --git a/output/reduced-cost-mod-mappings.ts b/output/reduced-cost-mod-mappings.ts index b71a67b3..4bdd051f 100644 --- a/output/reduced-cost-mod-mappings.ts +++ b/output/reduced-cost-mod-mappings.ts @@ -53,6 +53,7 @@ export const normalToReducedMod: { [normalModHash: number]: number } = { '2059068466': 2794359402, '2076329105': 1561736585, '2257238439': 1305848463, + '2311625537': 1533272847, '2319885414': 2283894334, '2407398462': 2305736470, '2414626352': 1604394872, @@ -62,6 +63,7 @@ export const normalToReducedMod: { [normalModHash: number]: number } = { '2485657760': 965934024, '2526773280': 411014648, '2532323436': 2113881316, + '2577472338': 3181984586, '2586562813': 2237975061, '2595839237': 3775800797, '2657604783': 1702273159, diff --git a/output/season-to-source.json b/output/season-to-source.json index 4504f00d..d2056399 100644 --- a/output/season-to-source.json +++ b/output/season-to-source.json @@ -103,6 +103,7 @@ "1995616326": 14, "2011810450": 13, "2039343154": 11, + "2050870152": 24, "2065138144": 14, "2069903130": 22, "2085016678": 5, @@ -114,6 +115,7 @@ "2242939082": 2, "2278847330": 20, "2292685703": 11, + "2296534980": 24, "2308290458": 2, "2335095658": 11, "2347293565": 2, diff --git a/output/seasonal-challenges.json b/output/seasonal-challenges.json index c281deb0..6bacfd7b 100644 --- a/output/seasonal-challenges.json +++ b/output/seasonal-challenges.json @@ -109,6 +109,9 @@ "ActivityMode": [1848252830], "DamageType": [1847026933, 2303181850, 3454344768, 151347233] }, + "2454419395": { + "ItemCategory": [12, 2489664120] + }, "2454419396": { "Destination": [3607432451] }, diff --git a/output/seasons.json b/output/seasons.json index 9815653c..44533873 100644 --- a/output/seasons.json +++ b/output/seasons.json @@ -31,6 +31,7 @@ "54004492": 22, "54004495": 22, "55826751": 9, + "56435118": 24, "60802325": 7, "60936592": 2, "61740554": 22, @@ -97,10 +98,10 @@ "177568179": 22, "178451227": 3, "179202986": 3, + "179654396": 24, "180108390": 4, "180108391": 4, "181754010": 3, - "182195738": 21, "183980811": 1, "185321778": 4, "185321779": 4, @@ -109,7 +110,6 @@ "204918711": 1, "213377779": 16, "213458862": 10, - "214247063": 21, "214374661": 16, "215596672": 2, "217626588": 11, @@ -182,6 +182,7 @@ "317465075": 2, "320750826": 11, "320750827": 11, + "327680457": 24, "333041308": 1, "335763433": 3, "338612265": 3, @@ -194,6 +195,7 @@ "346473619": 21, "346878928": 1, "346878930": 1, + "350054538": 24, "351707684": 19, "353932628": 9, "354227005": 23, @@ -232,7 +234,6 @@ "414874525": 24, "414874526": 24, "414874527": 24, - "415165004": 21, "418753772": 15, "418753773": 15, "419435523": 6, @@ -256,6 +257,7 @@ "461727014": 24, "462395043": 20, "463166592": 3, + "464814870": 24, "465351846": 16, "465808232": 22, "466236950": 9, @@ -285,6 +287,7 @@ "502120492": 22, "502120493": 22, "502120495": 22, + "503145555": 24, "510898033": 21, "510898034": 21, "510898035": 21, @@ -353,11 +356,11 @@ "613984400": 22, "616392721": 15, "617617371": 16, - "617983413": 21, "621701973": 3, "624775194": 6, "626649506": 2, "627596132": 7, + "628413376": 24, "629159779": 11, "629903347": 23, "637391773": 20, @@ -396,7 +399,6 @@ "718136887": 1, "721146704": 3, "721740036": 23, - "723022031": 22, "724583642": 23, "738873646": 3, "745759692": 2, @@ -437,6 +439,7 @@ "804309451": 15, "805381928": 24, "807186981": 1, + "807693916": 24, "810321696": 11, "810623803": 4, "811724212": 3, @@ -471,7 +474,6 @@ "866034302": 18, "871210651": 2, "873100338": 13, - "873166559": 21, "873720784": 12, "873770815": 3, "874877120": 1, @@ -481,7 +483,6 @@ "885593286": 1, "889413643": 2, "889443955": 9, - "895593526": 21, "897074661": 15, "905869860": 4, "906505391": 22, @@ -535,7 +536,6 @@ "1011670904": 3, "1011670905": 3, "1013401891": 20, - "1015625737": 21, "1015730268": 24, "1016114126": 8, "1018190408": 9, @@ -564,7 +564,6 @@ "1043883715": 13, "1044615214": 14, "1044615215": 14, - "1044911217": 21, "1045633725": 1, "1045633727": 1, "1045929536": 1, @@ -607,7 +606,6 @@ "1103965354": 22, "1105341592": 24, "1105928645": 2, - "1108316279": 21, "1109535462": 23, "1120048000": 5, "1120064792": 1, @@ -619,7 +617,6 @@ "1127128759": 10, "1131244817": 4, "1134447515": 16, - "1134714610": 21, "1135933726": 1, "1136270294": 23, "1137289077": 1, @@ -671,7 +668,12 @@ "1232390730": 16, "1240184693": 21, "1242865739": 24, + "1242938628": 24, + "1242938629": 24, + "1242938630": 24, + "1242938631": 24, "1249334869": 12, + "1250597597": 24, "1256660988": 8, "1257952519": 24, "1259278657": 3, @@ -726,7 +728,6 @@ "1291068172": 3, "1293002379": 1, "1294717622": 1, - "1294807946": 21, "1296106843": 23, "1298644738": 22, "1298682514": 1, @@ -735,10 +736,8 @@ "1302985294": 9, "1303706313": 13, "1305274547": 1, - "1310462707": 21, "1312472209": 2, "1312626341": 3, - "1314439396": 23, "1317763552": 18, "1317763554": 18, "1317763555": 18, @@ -761,7 +760,6 @@ "1345789366": 9, "1350878542": 1, "1352815976": 21, - "1356301964": 21, "1361620030": 3, "1362709750": 14, "1362709751": 14, @@ -830,6 +828,7 @@ "1473368765": 4, "1473368766": 4, "1473368767": 4, + "1477100072": 24, "1482931023": 7, "1483633423": 17, "1485222020": 8, @@ -897,7 +896,6 @@ "1579706082": 3, "1579706083": 3, "1581478491": 15, - "1581889666": 21, "1588254578": 3, "1589318419": 3, "1590407914": 24, @@ -913,9 +911,9 @@ "1599949358": 3, "1600065451": 10, "1602334068": 2, - "1603863150": 21, "1605596084": 2, "1608119540": 2, + "1609141880": 24, "1614326414": 10, "1614326415": 10, "1616346845": 24, @@ -933,12 +931,14 @@ "1633261020": 11, "1633854071": 4, "1640597844": 21, + "1644922223": 24, "1645521766": 12, "1649663920": 16, "1649929380": 3, "1651275175": 7, "1654077219": 20, "1656278203": 8, + "1658124146": 24, "1659393211": 1, "1660620605": 23, "1661191186": 7, @@ -988,7 +988,6 @@ "1720894545": 3, "1721185806": 4, "1721185807": 4, - "1721801083": 21, "1722920064": 23, "1723894000": 1, "1723894001": 1, @@ -1008,6 +1007,7 @@ "1748608556": 19, "1750365155": 3, "1751782730": 1, + "1752648948": 24, "1752862708": 23, "1767312242": 5, "1767664464": 20, @@ -1109,7 +1109,6 @@ "1871823355": 19, "1873273984": 2, "1873857625": 1, - "1881497005": 21, "1884588413": 21, "1885107794": 16, "1885107795": 16, @@ -1124,6 +1123,7 @@ "1887823827": 8, "1890164722": 1, "1891321753": 23, + "1896146275": 24, "1897528210": 3, "1897536429": 3, "1900594973": 19, @@ -1149,7 +1149,6 @@ "1901885391": 16, "1902452687": 3, "1903259976": 11, - "1903777475": 21, "1905328541": 21, "1909657913": 5, "1911078836": 23, @@ -1242,7 +1241,6 @@ "1971412320": 6, "1971919313": 22, "1972548224": 11, - "1976338154": 21, "1981116089": 24, "1981661519": 12, "1983275378": 15, @@ -1269,7 +1267,6 @@ "1997760147": 19, "2000448433": 19, "2001563200": 10, - "2001580515": 21, "2005133865": 14, "2010554576": 1, "2010554578": 1, @@ -1280,7 +1277,6 @@ "2014411539": 1, "2015081171": 22, "2016937064": 3, - "2018335269": 21, "2021434466": 14, "2021594588": 15, "2021594589": 15, @@ -1298,7 +1294,6 @@ "2039333456": 7, "2047844848": 3, "2047844849": 3, - "2053700715": 21, "2055296549": 22, "2056606165": 22, "2059442237": 12, @@ -1313,6 +1308,7 @@ "2077249154": 14, "2077249155": 14, "2078240126": 18, + "2079349511": 24, "2079505484": 3, "2079505485": 3, "2085536058": 24, @@ -1323,7 +1319,6 @@ "2094466368": 23, "2094466369": 23, "2094466371": 23, - "2095143806": 21, "2095897862": 22, "2097092608": 7, "2099710385": 17, @@ -1332,6 +1327,7 @@ "2106726848": 20, "2109561326": 4, "2111111693": 3, + "2112508290": 24, "2112889975": 2, "2113350276": 23, "2113350277": 23, @@ -1355,6 +1351,7 @@ "2133500862": 4, "2133500863": 4, "2134318165": 2, + "2138467220": 24, "2140049750": 16, "2146494981": 1, "2149696880": 22, @@ -1365,14 +1362,12 @@ "2156531500": 22, "2156817213": 7, "2158080418": 23, - "2158358658": 21, "2160858284": 22, "2161024815": 2, "2162261876": 3, "2162502468": 1, "2163922573": 3, "2168550540": 5, - "2169958680": 21, "2171727442": 10, "2171727443": 10, "2176571298": 4, @@ -1388,6 +1383,7 @@ "2179902689": 15, "2182316188": 11, "2182330181": 3, + "2184423372": 24, "2185878931": 24, "2189358721": 22, "2190633952": 18, @@ -1404,12 +1400,12 @@ "2214469173": 17, "2215619028": 20, "2217042834": 13, + "2217751623": 24, "2219573798": 23, "2219602427": 23, "2222286218": 13, "2223901117": 23, "2225838050": 1, - "2233704915": 21, "2234157635": 6, "2239429352": 23, "2240097604": 4, @@ -1423,6 +1419,7 @@ "2261046232": 15, "2263885190": 5, "2265583879": 9, + "2266083651": 24, "2266517764": 3, "2273494378": 22, "2276139500": 2, @@ -1461,6 +1458,7 @@ "2311027942": 1, "2311506225": 5, "2323170449": 4, + "2323339168": 24, "2324903362": 18, "2325217837": 7, "2325321839": 8, @@ -1468,8 +1466,6 @@ "2328211300": 18, "2328435454": 6, "2328497849": 1, - "2329379380": 21, - "2329379381": 21, "2330017983": 5, "2331063860": 3, "2331063861": 3, @@ -1519,7 +1515,6 @@ "2427328578": 3, "2433900295": 2, "2437968453": 1, - "2441736537": 21, "2446304953": 23, "2449203932": 7, "2449623004": 10, @@ -1536,6 +1531,7 @@ "2484637936": 1, "2484637938": 1, "2484637939": 1, + "2489453969": 24, "2492590623": 14, "2492769187": 3, "2501396275": 16, @@ -1578,6 +1574,7 @@ "2541494210": 1, "2542725780": 3, "2543806755": 1, + "2543971899": 24, "2544513644": 3, "2546370410": 7, "2549404869": 2, @@ -1615,6 +1612,7 @@ "2607476206": 2, "2607476207": 2, "2611348487": 23, + "2616697701": 24, "2618313500": 7, "2623660327": 2, "2624974641": 13, @@ -1627,7 +1625,6 @@ "2640973641": 1, "2649911453": 1, "2650481177": 11, - "2652078170": 21, "2653114997": 8, "2655812783": 12, "2657932152": 1, @@ -1650,7 +1647,6 @@ "2680976411": 23, "2683352144": 17, "2683352145": 17, - "2684298936": 21, "2685001662": 3, "2690382720": 23, "2692796380": 8, @@ -1689,10 +1685,8 @@ "2728416798": 20, "2728851518": 23, "2730176990": 12, - "2735230667": 21, "2737886288": 1, "2737886290": 1, - "2738596235": 21, "2741695224": 1, "2743185250": 12, "2749020594": 22, @@ -1700,6 +1694,10 @@ "2750411529": 21, "2752157162": 17, "2753228730": 24, + "2754658080": 24, + "2754658081": 24, + "2754658082": 24, + "2754658083": 24, "2756505818": 14, "2756505819": 14, "2757833801": 7, @@ -1713,7 +1711,6 @@ "2764644855": 2, "2764769717": 6, "2767412312": 19, - "2769671712": 21, "2769834047": 2, "2770157746": 3, "2770607176": 23, @@ -1746,7 +1743,6 @@ "2790542797": 23, "2790542798": 23, "2790542799": 23, - "2793853502": 21, "2794014115": 6, "2795689398": 14, "2795689399": 14, @@ -1762,16 +1758,17 @@ "2812100428": 19, "2814093983": 19, "2814383126": 3, - "2814513798": 21, "2816306775": 21, "2816485244": 3, "2818777309": 15, + "2818971729": 24, "2822855549": 24, "2822855550": 24, "2822855551": 24, "2824302184": 3, "2828252061": 2, "2829865752": 13, + "2830258806": 24, "2834933816": 3, "2835717213": 14, "2836298415": 16, @@ -1786,6 +1783,7 @@ "2845628878": 24, "2845628879": 24, "2847079604": 12, + "2847579028": 24, "2847579029": 24, "2847579035": 24, "2849050827": 16, @@ -1846,6 +1844,7 @@ "2928555615": 23, "2931483505": 1, "2932390016": 18, + "2933249366": 24, "2934509775": 14, "2936183184": 24, "2938523486": 1, @@ -1924,7 +1923,6 @@ "3031612900": 7, "3035129091": 6, "3037589442": 22, - "3038475950": 21, "3039687635": 7, "3041136324": 1, "3044160466": 13, @@ -1944,7 +1942,6 @@ "3082233610": 15, "3087166452": 18, "3088135833": 16, - "3092180969": 21, "3100848450": 24, "3101012909": 23, "3101709156": 24, @@ -2037,7 +2034,6 @@ "3205869484": 1, "3205869485": 1, "3206190066": 23, - "3208970320": 21, "3212701863": 23, "3214073080": 23, "3214073081": 23, @@ -2057,17 +2053,16 @@ "3230867320": 4, "3230867321": 4, "3230867322": 4, + "3232831379": 24, "3234030313": 19, "3234265291": 13, "3234744410": 14, "3234744411": 14, "3236510875": 3, "3240434620": 21, - "3241221125": 21, "3242972517": 14, "3244015567": 4, "3244569127": 3, - "3247850592": 21, "3249133238": 16, "3252358296": 6, "3252358297": 6, @@ -2095,6 +2090,7 @@ "3264577437": 23, "3264577438": 23, "3264577439": 23, + "3267552999": 24, "3269282583": 12, "3273280393": 21, "3278002119": 15, @@ -2121,6 +2117,7 @@ "3291545503": 12, "3292091251": 23, "3293251509": 15, + "3297537117": 24, "3299468272": 22, "3299468273": 22, "3299468275": 22, @@ -2128,6 +2125,7 @@ "3301342410": 12, "3301342411": 12, "3301429924": 5, + "3306754793": 24, "3314737869": 11, "3321444752": 12, "3321444753": 12, @@ -2139,6 +2137,7 @@ "3326837143": 11, "3328839466": 5, "3328839467": 5, + "3329514528": 24, "3332319890": 23, "3332509033": 19, "3333986015": 6, @@ -2215,7 +2214,6 @@ "3451625162": 2, "3452825266": 9, "3455566107": 2, - "3456126627": 21, "3459379565": 13, "3469344438": 21, "3469344439": 21, @@ -2268,7 +2266,6 @@ "3559361670": 20, "3560184043": 8, "3562697442": 7, - "3563278203": 21, "3564705134": 21, "3568351785": 12, "3569791559": 2, @@ -2436,11 +2433,11 @@ "3802876271": 2, "3803329707": 16, "3806887025": 23, - "3807116805": 21, "3807544519": 7, "3808901541": 6, "3809278479": 23, "3809722908": 2, + "3809902215": 24, "3811760832": 1, "3814697630": 24, "3814697631": 24, @@ -2492,7 +2489,6 @@ "3888701628": 23, "3892841518": 7, "3893112950": 24, - "3894472591": 21, "3898143407": 3, "3899548068": 1, "3899944893": 4, @@ -2507,7 +2503,6 @@ "3903070398": 12, "3903070399": 12, "3903548288": 1, - "3904743813": 21, "3908760309": 3, "3910216754": 23, "3911008533": 14, @@ -2584,6 +2579,7 @@ "3965417933": 6, "3968560442": 7, "3969043896": 3, + "3970040886": 24, "3970180834": 14, "3970180835": 14, "3970180840": 14, @@ -2642,7 +2638,6 @@ "4024425661": 22, "4025934129": 20, "4026515849": 5, - "4026871100": 21, "4029022121": 16, "4029346515": 16, "4029814949": 11, @@ -2670,6 +2665,7 @@ "4072587059": 1, "4075522049": 6, "4078226397": 8, + "4082425930": 24, "4085986809": 4, "4086164721": 19, "4087530286": 8, @@ -2736,7 +2732,6 @@ "4133455815": 22, "4133455820": 22, "4133455821": 22, - "4136066399": 21, "4136254009": 23, "4138697980": 21, "4140529506": 21, @@ -2773,7 +2768,6 @@ "4169903862": 23, "4173467416": 7, "4173467417": 7, - "4178846889": 21, "4179794597": 17, "4182480224": 1, "4182480225": 1, @@ -2795,14 +2789,12 @@ "4183788701": 20, "4183788702": 20, "4183788703": 20, - "4184108154": 21, "4187524534": 1, "4201697932": 3, "4201697933": 3, "4202615266": 19, "4204413574": 20, "4204482447": 23, - "4210771029": 21, "4211475741": 2, "4212410112": 1, "4213271810": 3, @@ -2815,7 +2807,6 @@ "4224972855": 4, "4229237079": 8, "4231293639": 11, - "4231420757": 21, "4236468733": 3, "4240221838": 16, "4242592192": 1, @@ -2838,7 +2829,6 @@ "4264364347": 15, "4264494593": 11, "4266295281": 23, - "4268968384": 21, "4269600130": 21, "4272367383": 3, "4275472608": 20, diff --git a/output/seasons_backup.json b/output/seasons_backup.json index 35709a60..5ed6298c 100644 --- a/output/seasons_backup.json +++ b/output/seasons_backup.json @@ -2,6 +2,7 @@ "25524335": 23, "49257107": 22, "52039562": 14, + "56435118": 24, "58945355": 17, "61740554": 22, "61740555": 22, @@ -43,10 +44,10 @@ "176118905": 4, "177463495": 22, "177568179": 22, + "179654396": 24, "195422190": 10, "199733460": 15, "204749352": 23, - "207655698": 21, "211863483": 23, "215596672": 2, "217626588": 11, @@ -106,6 +107,7 @@ "317465075": 2, "320750826": 11, "320750827": 11, + "327680457": 24, "335763433": 3, "343482208": 14, "343482209": 14, @@ -115,6 +117,7 @@ "346066663": 22, "346878928": 1, "346878930": 1, + "350054538": 24, "354227005": 23, "357618811": 22, "366019830": 20, @@ -139,6 +142,7 @@ "437421244": 5, "438524081": 6, "450844637": 7, + "464814870": 24, "466236950": 9, "466236951": 9, "467667358": 7, @@ -150,6 +154,7 @@ "478696310": 7, "492834021": 6, "495940989": 19, + "503145555": 24, "510027376": 7, "510898033": 21, "510898034": 21, @@ -172,6 +177,7 @@ "545021994": 3, "550583155": 3, "558697641": 11, + "562163470": 24, "566732136": 4, "574167778": 7, "574790717": 7, @@ -183,6 +189,7 @@ "617617371": 16, "622966241": 3, "627596132": 7, + "628413376": 24, "637391773": 20, "638752234": 7, "640136282": 11, @@ -198,6 +205,7 @@ "682455838": 20, "682455839": 20, "682682138": 3, + "691245913": 24, "692234472": 7, "700322568": 1, "700322570": 1, @@ -230,6 +238,7 @@ "785657282": 7, "796635575": 3, "798515257": 23, + "807693916": 24, "808331801": 7, "814520772": 23, "817808889": 7, @@ -279,6 +288,7 @@ "1028757559": 5, "1028757567": 5, "1033267050": 23, + "1036295794": 24, "1043609040": 17, "1044615214": 14, "1044615215": 14, @@ -319,7 +329,6 @@ "1157279525": 23, "1166603202": 11, "1167848164": 7, - "1170377876": 21, "1174021263": 3, "1190436705": 23, "1190436706": 23, @@ -335,6 +344,7 @@ "1239024834": 14, "1240184693": 21, "1241704260": 7, + "1250597597": 24, "1253607903": 7, "1260041928": 21, "1266122672": 9, @@ -367,7 +377,6 @@ "1334316247": 22, "1334842411": 2, "1341471164": 3, - "1356301964": 21, "1359567721": 7, "1361620030": 3, "1362709750": 14, @@ -410,6 +419,7 @@ "1473368767": 4, "1473923371": 3, "1474803667": 7, + "1477100072": 24, "1498848678": 7, "1502135233": 5, "1502135240": 5, @@ -451,8 +461,8 @@ "1597235361": 7, "1599443272": 16, "1602334068": 2, - "1603863150": 21, "1605596084": 2, + "1609141880": 24, "1614326414": 10, "1614326415": 10, "1623653768": 2, @@ -460,13 +470,16 @@ "1623653770": 2, "1623653771": 2, "1644189372": 3, + "1644922223": 24, "1649929380": 3, "1651275175": 7, + "1658124146": 24, "1660362255": 7, "1683482799": 7, "1684784588": 14, "1684784589": 14, "1685642729": 7, + "1692306441": 24, "1695429263": 5, "1706764072": 2, "1706764073": 2, @@ -482,6 +495,7 @@ "1739076285": 19, "1743191871": 22, "1748148571": 23, + "1752648948": 24, "1752862708": 23, "1767312242": 5, "1770862260": 14, @@ -517,6 +531,7 @@ "1889037296": 7, "1891321753": 23, "1891373428": 3, + "1896146275": 24, "1897528210": 3, "1905328541": 21, "1911078836": 23, @@ -565,6 +580,7 @@ "2073576287": 5, "2077249154": 14, "2077249155": 14, + "2079349511": 24, "2088834049": 23, "2094466368": 23, "2094466369": 23, @@ -572,6 +588,7 @@ "2099391953": 22, "2105409832": 7, "2111111693": 3, + "2112508290": 24, "2112889975": 2, "2115919719": 22, "2117628185": 23, @@ -581,6 +598,7 @@ "2122975014": 22, "2127474099": 7, "2132252935": 20, + "2138467220": 24, "2147433548": 3, "2149696880": 22, "2149696881": 22, @@ -601,6 +619,7 @@ "2179603795": 6, "2179603798": 6, "2179603799": 6, + "2184423372": 24, "2185878931": 24, "2189358721": 22, "2191200811": 23, @@ -615,6 +634,7 @@ "2214585028": 15, "2214585029": 15, "2217042834": 13, + "2217751623": 24, "2219573798": 23, "2223901117": 23, "2233576420": 8, @@ -622,7 +642,7 @@ "2245996336": 14, "2245996337": 14, "2261046232": 15, - "2269436000": 21, + "2266083651": 24, "2272646880": 10, "2272646881": 10, "2272646882": 10, @@ -647,6 +667,7 @@ "2307426898": 1, "2311506225": 5, "2319743206": 3, + "2323339168": 24, "2326578623": 24, "2328435454": 6, "2337290000": 7, @@ -661,6 +682,7 @@ "2393578168": 7, "2419100474": 7, "2420567618": 4, + "2424564383": 24, "2430095495": 7, "2436402701": 7, "2450544934": 16, @@ -670,6 +692,7 @@ "2470583197": 7, "2477028154": 6, "2479769639": 11, + "2489453969": 24, "2492769187": 3, "2504122740": 23, "2505000979": 11, @@ -678,6 +701,7 @@ "2531130673": 23, "2535002841": 22, "2538439951": 2, + "2543971899": 24, "2545426109": 15, "2546370410": 7, "2549404869": 2, @@ -697,6 +721,7 @@ "2593080269": 2, "2603335652": 18, "2604511609": 23, + "2616697701": 24, "2618313500": 7, "2623660327": 2, "2628466339": 23, @@ -769,6 +794,7 @@ "2812100428": 19, "2814093983": 19, "2816306775": 21, + "2818971729": 24, "2822855549": 24, "2822855550": 24, "2822855551": 24, @@ -776,6 +802,7 @@ "2826719795": 7, "2828252061": 2, "2829803132": 7, + "2830258806": 24, "2837295684": 6, "2838582256": 18, "2838582257": 18, @@ -812,6 +839,7 @@ "2928555612": 23, "2928555613": 23, "2928555615": 23, + "2933249366": 24, "2933904296": 11, "2940416351": 7, "2964031580": 17, @@ -896,6 +924,7 @@ "3214882532": 22, "3214882533": 22, "3224066584": 15, + "3232831379": 24, "3234744410": 14, "3234744411": 14, "3235287656": 11, @@ -952,6 +981,7 @@ "3287805180": 2, "3287805181": 2, "3287805183": 2, + "3297537117": 24, "3299468272": 22, "3299468273": 22, "3299468275": 22, @@ -960,6 +990,7 @@ "3301342411": 12, "3301429924": 5, "3306267716": 2, + "3306754793": 24, "3309556272": 2, "3322713366": 23, "3325463374": 4, @@ -967,6 +998,7 @@ "3328839466": 5, "3328839467": 5, "3329153302": 3, + "3329514528": 24, "3332319890": 23, "3350146056": 6, "3352566658": 2, @@ -987,7 +1019,6 @@ "3444687693": 3, "3446862222": 13, "3446862223": 13, - "3452648355": 21, "3455566107": 2, "3469344438": 21, "3469344439": 21, @@ -1030,7 +1061,8 @@ "3633213242": 21, "3634214125": 7, "3636889164": 14, - "3658398820": 21, + "3637784828": 24, + "3642561323": 24, "3659710187": 23, "3677746972": 8, "3677746973": 8, @@ -1043,7 +1075,6 @@ "3720087872": 23, "3721195043": 11, "3725260498": 7, - "3726365185": 21, "3729709035": 2, "3734501342": 2, "3738044006": 6, @@ -1052,7 +1083,6 @@ "3755201983": 8, "3763097355": 22, "3769043228": 22, - "3787793697": 21, "3791120690": 3, "3792590697": 5, "3796358144": 6, @@ -1062,6 +1092,7 @@ "3800267415": 2, "3802876271": 2, "3806887025": 23, + "3809902215": 24, "3823337168": 7, "3829285960": 4, "3830828709": 7, @@ -1094,6 +1125,7 @@ "3965417933": 6, "3967067356": 17, "3968560442": 7, + "3970040886": 24, "3970823221": 23, "3971839985": 7, "3981634627": 9, @@ -1116,6 +1148,7 @@ "4062073334": 23, "4075522049": 6, "4082180156": 23, + "4082425930": 24, "4087530286": 8, "4087530287": 8, "4088827200": 12, diff --git a/output/source-info-v2.ts b/output/source-info-v2.ts index 9bcf2a20..7d789ad6 100644 --- a/output/source-info-v2.ts +++ b/output/source-info-v2.ts @@ -418,17 +418,13 @@ const D2Sources: { events: { itemHashes: [ 495940989, // Avalanche - 586671776, // Something New 1280894514, // Mechabre - 2326578623, // 2812100428, // Stay Frosty 2814093983, // Cold Front 3240434620, // Something New 3400256755, // Zephyr 3559361670, // The Title 3573686365, // Glacioclasm - 4106757302, // Crowning Duologue - 4169225313, // Compass Rose ], sourceHashes: [ 32323943, // Source: Moments of Triumph @@ -452,6 +448,7 @@ const D2Sources: { 1919933822, // Source: Festival of the Lost 2020 2006303146, // Source: Guardian Games 2022 2011810450, // Source: Season 13 Guardian Games + 2050870152, // Source: Solstice 2187511136, // Source: Earned during the seasonal Revelry event. 2364515524, // Source: Dawning 2022 2473294025, // Source: Guardian Games 2023 @@ -501,6 +498,7 @@ const D2Sources: { 2055289873, // Source: "The Evidence Board" Exotic Quest 2068312112, // Source: Exotic Mission "Zero Hour" 2171520631, // Source: "Lost Lament" Exotic Quest + 2296534980, // Source: Exotic Mission Encore 2745272818, // Source: "Presage" Exotic Quest 2856954949, // Source: "Let Loose Thy Talons" Exotic Quest 3597879858, // Source: "Presage" Exotic Quest diff --git a/output/source-info.ts b/output/source-info.ts index 302dd1c8..0aa290b1 100644 --- a/output/source-info.ts +++ b/output/source-info.ts @@ -806,17 +806,13 @@ const D2Sources: { events: { itemHashes: [ 495940989, // Avalanche - 586671776, // Something New 1280894514, // Mechabre - 2326578623, // 2812100428, // Stay Frosty 2814093983, // Cold Front 3240434620, // Something New 3400256755, // Zephyr 3559361670, // The Title 3573686365, // Glacioclasm - 4106757302, // Crowning Duologue - 4169225313, // Compass Rose ], sourceHashes: [ 32323943, // Source: Moments of Triumph @@ -840,6 +836,7 @@ const D2Sources: { 1919933822, // Source: Festival of the Lost 2020 2006303146, // Source: Guardian Games 2022 2011810450, // Source: Season 13 Guardian Games + 2050870152, // Source: Solstice 2187511136, // Source: Earned during the seasonal Revelry event. 2364515524, // Source: Dawning 2022 2473294025, // Source: Guardian Games 2023 @@ -894,6 +891,7 @@ const D2Sources: { 2055289873, // Source: "The Evidence Board" Exotic Quest 2068312112, // Source: Exotic Mission "Zero Hour" 2171520631, // Source: "Lost Lament" Exotic Quest + 2296534980, // Source: Exotic Mission Encore 2745272818, // Source: "Presage" Exotic Quest 2856954949, // Source: "Let Loose Thy Talons" Exotic Quest 3597879858, // Source: "Presage" Exotic Quest diff --git a/output/source-to-season-v2.json b/output/source-to-season-v2.json index 681a87ac..4882d6f1 100644 --- a/output/source-to-season-v2.json +++ b/output/source-to-season-v2.json @@ -102,6 +102,7 @@ "1995616326": 14, "2011810450": 13, "2039343154": 11, + "2050870152": 24, "2065138144": 14, "2069903130": 22, "2085016678": 5, @@ -113,6 +114,7 @@ "2242939082": 2, "2278847330": 20, "2292685703": 11, + "2296534980": 24, "2308290458": 2, "2335095658": 11, "2347293565": 2, diff --git a/output/sources.json b/output/sources.json index 2f6cbc7e..dd22b46c 100644 --- a/output/sources.json +++ b/output/sources.json @@ -100,6 +100,7 @@ "925197669": "Source: Complete a Bergusia Forge ignition.", "927967626": "Source: Season of the Deep", "929025440": "Acquired by competing in the Crucible during the Prismatic Inferno.", + "941123623": "", "948753311": "Source: Found by completing Volundr Forge ignitions.", "958460845": "Source: The Final Shape Campaign", "976328308": "Source: The Derelict Leviathan", @@ -220,6 +221,7 @@ "2039343154": "Source: Contact Public Event", "2040548068": "Source: Adventure \"Release\" on Nessus", "2040801502": "Source: Season of the Splicer Triumph", + "2050870152": "Source: Solstice", "2055289873": "Source: \"The Evidence Board\" Exotic Quest", "2055470113": "Source: Chance to acquire when completing Crucible Survival matches after reaching Glory Rank \"Mythic.\"", "2062058385": "Source: Crafted in a Black Armory forge.", @@ -241,6 +243,7 @@ "2273761598": "Source: Season of the Haunted Activities", "2278847330": "Requires Guardian Rank 5", "2292685703": "Source: \"Xenology\" Quest from Xûr", + "2296534980": "Source: Exotic Mission Encore", "2306801178": "Source: Episode: Echoes Activities", "2308290458": "Requires 1,000 Warlock Kills", "2310754348": "Source: World Quest \"Data Recovery\" on Mars.", diff --git a/output/trait-definition-ids.json b/output/trait-definition-ids.json index 5a3baed6..05018667 100644 --- a/output/trait-definition-ids.json +++ b/output/trait-definition-ids.json @@ -18,7 +18,6 @@ "500105683": "item.quest.playlists", "500183315": "keywords.debuffs.arc.blind", "520867389": "item.quest.new_light", - "567594262": "item.weapon", "577926988": "item.plug.aspect", "655301426": "keywords.buffs.void.invisibility", "853784306": "activities.gambit", diff --git a/output/voice-dim-valid-perks.json b/output/voice-dim-valid-perks.json index 84a46724..3dfd9580 100644 --- a/output/voice-dim-valid-perks.json +++ b/output/voice-dim-valid-perks.json @@ -137,6 +137,10 @@ "Collector +3", "Combat Grip", "Combat Sights", + "Command Frame", + "Command Frame II", + "Command Frame III", + "Command Frame IV", "Composite Propellant", "Composite Stock", "Compounding Force", diff --git a/output/watermark-to-season.json b/output/watermark-to-season.json index c14031bd..078293ac 100644 --- a/output/watermark-to-season.json +++ b/output/watermark-to-season.json @@ -48,5 +48,6 @@ "/common/destiny2_content/icons/a2fb48090c8bc0e5785975fab9596ab5.png": 23, "/common/destiny2_content/icons/d5a3f4d7d20fefc781fea3c60bde9434.png": 23, "/common/destiny2_content/icons/0337ec21962f67c7c493fedb447c4a9b.png": 24, - "/common/destiny2_content/icons/e3ea0bd2e889b605614276876667759c.png": 24 + "/common/destiny2_content/icons/e3ea0bd2e889b605614276876667759c.png": 24, + "/common/destiny2_content/icons/ecc0f87f0676df6c7fdd06bff5d2825c.png": 24 } diff --git a/output/weapon-from-quest.json b/output/weapon-from-quest.json index 385d7920..bf6822a9 100644 --- a/output/weapon-from-quest.json +++ b/output/weapon-from-quest.json @@ -29,6 +29,7 @@ "2130065553": 2397886961, "2179048386": 2163065963, "2232171099": 613601972, + "2584830733": 1144957964, "2595497736": 1271443422, "2723909519": 3536491683, "2812324400": 472120382, @@ -45,6 +46,7 @@ "3512349612": 4204937010, "3605603507": 2617996611, "3690523502": 3424456965, + "3698448090": 3016094390, "3824673936": 1051536457, "3870811754": 2032932188, "3924212056": 1330233961, diff --git a/src/generate-empty-plugs.ts b/src/generate-empty-plugs.ts index 81b90cb9..55f82541 100644 --- a/src/generate-empty-plugs.ts +++ b/src/generate-empty-plugs.ts @@ -23,7 +23,7 @@ emptyPlugs.sort( const commentedEntries = emptyPlugs.map((i) => { const comment = `${i.displayProperties.name} (${ i.itemTypeDisplayName ? `${i.itemTypeDisplayName}, ` : '' - }${i.plug!.plugCategoryIdentifier})`; + }${i.plug!.plugCategoryIdentifier})`.replace(/\n/g, ' '); return `${i.hash}, // ${comment}`; }); diff --git a/src/generate-enums.ts b/src/generate-enums.ts index 1f2a19be..fd98735f 100644 --- a/src/generate-enums.ts +++ b/src/generate-enums.ts @@ -159,7 +159,7 @@ function convertMixedStringToLeadingCapCamelCase(input: string) { // and on the zero-width between a lowercase and uppercase letter (to preserve existing camel casing) .filter(Boolean) // dump empty strings .map((s) => s.toLowerCase()) - .map((s) => s[0].toUpperCase() + s.slice(1) ?? '') + .map((s) => s[0].toUpperCase() + s.slice(1)) .join('') ); }