diff --git a/src/app/progress/Ranks.tsx b/src/app/progress/Ranks.tsx index ca60b0ee6f..ecf46704a2 100644 --- a/src/app/progress/Ranks.tsx +++ b/src/app/progress/Ranks.tsx @@ -36,7 +36,6 @@ import { getCharacterProgressions } from './selectors'; const rankProgressionToStreakProgression: LookupTable = { [ProgressionHashes.CrucibleRank]: 2203850209, - [ProgressionHashes.GloryRank]: 2572719399, [ProgressionHashes.GambitRank]: 2939151659, [ProgressionHashes.VanguardRank]: 600547406, [ProgressionHashes.StrangeFavor]: 1999336308, diff --git a/src/data/d2/adept-weapon-hashes.json b/src/data/d2/adept-weapon-hashes.json index 1a172982e7..59a1f40491 100644 --- a/src/data/d2/adept-weapon-hashes.json +++ b/src/data/d2/adept-weapon-hashes.json @@ -1,12 +1,16 @@ [ 2307365, + 25228802, 128782990, 161675590, 172461430, 267089201, 276080079, + 282549639, 291092617, + 302039451, 303107619, + 337578911, 342514437, 364665267, 407511664, @@ -19,16 +23,21 @@ 555148853, 566740455, 578105049, + 601574723, 631439337, 672957262, 681067419, 690668916, + 704410186, 711889599, + 737409399, 786352912, 817909300, 825554997, + 851296754, 852228780, 854379020, + 861521336, 874623537, 892183998, 912150785, @@ -41,6 +50,7 @@ 1141586039, 1173780905, 1184692845, + 1201528146, 1216319404, 1239700299, 1292594730, @@ -51,6 +61,7 @@ 1466006054, 1481892490, 1492522228, + 1536325168, 1705843397, 1866778462, 1891996599, @@ -67,6 +78,8 @@ 2074041946, 2147010335, 2314610827, + 2334480463, + 2362652544, 2378101424, 2378785953, 2386979999, @@ -74,15 +87,22 @@ 2421180981, 2443900757, 2475355656, + 2501377328, 2527666306, + 2553380021, + 2697143634, + 2712683313, + 2755584425, 2759251821, 2839600459, + 2856225832, 2883684343, 2886339027, 2890082420, 2914913838, 2943293195, 3019024381, + 3054597646, 3106557243, 3123651616, 3193598749, @@ -92,11 +112,15 @@ 3332125295, 3407395594, 3444632029, + 3485029080, 3493494807, 3503019618, + 3503560035, 3514144928, 3610521673, + 3623686757, 3637570176, + 3734001727, 3782662983, 3796510434, 3836861464, @@ -105,10 +129,16 @@ 3915197957, 3920882229, 3926103986, + 3949253499, 3951511045, + 3953163559, 3997086838, 4023807721, 4038592169, 4074251943, - 4162642204 + 4077588826, + 4116546788, + 4162642204, + 4173311704, + 4219826183 ] diff --git a/src/data/d2/artifact-breaker-weapon-types.json b/src/data/d2/artifact-breaker-weapon-types.json index 19cee1f688..13555136fe 100644 --- a/src/data/d2/artifact-breaker-weapon-types.json +++ b/src/data/d2/artifact-breaker-weapon-types.json @@ -1,14 +1,13 @@ { "485622768": [ - 8, - 11 + 14, + 10 ], "2611060930": [ - 3954685534, - 153950757 + 12 ], "3178805705": [ - 7, - 153950757 + 9, + 3871742104 ] } diff --git a/src/data/d2/bright-engrams.json b/src/data/d2/bright-engrams.json index f8f200b31d..9119ea56ed 100644 --- a/src/data/d2/bright-engrams.json +++ b/src/data/d2/bright-engrams.json @@ -23,5 +23,6 @@ "22": 1968811824, "23": 1968811824, "24": 1968811824, - "25": 1968811824 + "25": 1968811824, + "26": 1968811824 } diff --git a/src/data/d2/catalyst-triumph-icons.json b/src/data/d2/catalyst-triumph-icons.json index 450c0261c9..69f7028477 100644 --- a/src/data/d2/catalyst-triumph-icons.json +++ b/src/data/d2/catalyst-triumph-icons.json @@ -55,7 +55,7 @@ "2329638530": "/common/destiny2_content/icons/f655ec9343e18cb811f69930d9cb426a.jpg", "2383994221": "/common/destiny2_content/icons/1d38c8d82f1bd1d22bf76314fe8764f9.jpg", "2387948227": "/common/destiny2_content/icons/a0ca8e1fddf00d1e2fa16357cabbd7f4.jpg", - "2395817019": "/common/destiny2_content/icons/3a3dff881138741dc701c44b9043f552.jpg", + "2395817019": "/common/destiny2_content/icons/6a69af7476c5cec54db55a7b507dff6c.jpg", "2479567609": "/common/destiny2_content/icons/544fe035ccdbaeceea70b1278e8285a0.jpg", "2524364954": "/common/destiny2_content/icons/45d19f57bcbb22fa70cedca91a3f987e.jpg", "2538406461": "/common/destiny2_content/icons/ed12186dd3abfe66b6b2bcb557319082.jpg", @@ -66,6 +66,7 @@ "2744508352": "/common/destiny2_content/icons/0bada21df8674cde30fcaac3e599ff6e.jpg", "2761319400": "/common/destiny2_content/icons/19e7c9a3d838e3801e7147975d173cb5.jpg", "2856496392": "/common/destiny2_content/icons/28355e0adda864289165854e376f86ee.jpg", + "2880917375": "/common/destiny2_content/icons/c4eadc82554420d33ecfb517416a9d1e.jpg", "2940589008": "/common/destiny2_content/icons/4a37bd1fc1756b09f509396557937832.jpg", "2960086668": "/common/destiny2_content/icons/23f4656a3dd3f4ee0e42d140ba251974.jpg", "3022631571": "/common/destiny2_content/icons/372ab21c37bd69c70e88860e4f6a8b7f.jpg", @@ -75,6 +76,8 @@ "3368860448": "/common/destiny2_content/icons/e444e97b9d2c368006272fc90eb1e022.jpg", "3371896300": "/common/destiny2_content/icons/e68a5dba35f4b96f7230e88666e416e6.jpg", "3381077691": "/common/destiny2_content/icons/d3fe6666df5dc374448a600e8b9744d6.jpg", + "3393121279": "/common/destiny2_content/icons/f2838bd9c7a5f45ce8df9ddb82eca8b9.jpg", + "3396973108": "/common/destiny2_content/icons/6bc8ba6e234d5f80b17ecbecd1268702.jpg", "3465971755": "/common/destiny2_content/icons/2305fe129af716dae7af521e1537748c.jpg", "3468043157": "/common/destiny2_content/icons/773f96cb2f9f2149ec31874cafec7528.jpg", "3518287681": "/common/destiny2_content/icons/3b8175fb92ee774d15d25fed58dca619.jpg", diff --git a/src/data/d2/craftable-hashes.json b/src/data/d2/craftable-hashes.json index 3671792361..ce25b9cd19 100644 --- a/src/data/d2/craftable-hashes.json +++ b/src/data/d2/craftable-hashes.json @@ -19,6 +19,7 @@ 291092617, 297296830, 318443586, + 337578911, 342514437, 392008588, 407511664, @@ -37,10 +38,12 @@ 548958835, 578105049, 613334176, + 694500607, 768621510, 786352912, 820890091, 833898322, + 851296754, 859869931, 892183998, 927567426, @@ -109,10 +112,13 @@ 2221264583, 2241507890, 2263839058, + 2265407516, 2272041093, 2302346155, 2323544076, + 2334480463, 2350330520, + 2362652544, 2490988246, 2508948099, 2531963421, @@ -165,6 +171,7 @@ 3388655311, 3407395594, 3428521585, + 3444688218, 3489657138, 3493494807, 3503019618, @@ -172,13 +179,16 @@ 3591141932, 3605603507, 3621336854, + 3623686757, 3635821806, + 3654744298, 3685470415, 3698448090, 3710082365, 3782662983, 3794274730, 3824673936, + 3844610113, 3849444474, 3849810018, 3865728990, @@ -198,8 +208,10 @@ 4096943616, 4132072834, 4153087276, + 4184168210, 4195186942, 4207120603, + 4219826183, 4225322581, 4230965989, 4248569242 diff --git a/src/data/d2/crafting-enhanced-intrinsics.ts b/src/data/d2/crafting-enhanced-intrinsics.ts index 552428ea14..f068281163 100644 --- a/src/data/d2/crafting-enhanced-intrinsics.ts +++ b/src/data/d2/crafting-enhanced-intrinsics.ts @@ -112,7 +112,6 @@ const enhancedIntrinsics = new Set([ 2105054824, // Lightweight Frame 687584589, // Rocket-Assisted Frame 368110299, // Rocket-Assisted Frame - 651554065, // Rocket-Assisted Frame 2100231191, // Rocket-Assisted Frame 3178379945, // Rocket-Assisted Frame 1225770249, // Rocket-Assisted Frame diff --git a/src/data/d2/crafting-mementos.json b/src/data/d2/crafting-mementos.json index 9b5af7d4cf..d855da7e02 100644 --- a/src/data/d2/crafting-mementos.json +++ b/src/data/d2/crafting-mementos.json @@ -1,6 +1,7 @@ { "games": [18179099, 1429874803, 3617209212], "monolithic": [461727014, 1745945065, 3100848450], + "vaultofglass": [574898816, 3179652816, 3752630563], "gardenofsalvation": [619391783, 1750913471, 2430770464], "solstice": [1257952519, 3481131423, 4160988416], "lost": [1261107326, 1971919313, 3686736741], diff --git a/src/data/d2/d2-season-info.ts b/src/data/d2/d2-season-info.ts index bf8ae7ae3f..49df89287f 100644 --- a/src/data/d2/d2-season-info.ts +++ b/src/data/d2/d2-season-info.ts @@ -368,6 +368,21 @@ export const D2SeasonInfo: Record< numWeeks: 17, episode: 2, }, + 26: { + DLCName: 'Heresy', + seasonName: 'Episode: Heresy', + seasonTag: 'heresy', + season: 26, + maxLevel: 50, + powerFloor: 1900, + softCap: 1960, + powerfulCap: 2010, + pinnacleCap: 2020, + releaseDate: '2025-02-04', + resetTime: '17:00:00Z', + numWeeks: 23, + episode: 3, + }, }; -export const D2CalculatedSeason = 25; +export const D2CalculatedSeason = 26; diff --git a/src/data/d2/events.json b/src/data/d2/events.json index 3070783032..03ae9be763 100644 --- a/src/data/d2/events.json +++ b/src/data/d2/events.json @@ -4,6 +4,7 @@ "18179099": 6, "53761356": 5, "63024229": 1, + "147902881": 1, "171748061": 4, "213458862": 6, "215596672": 1, @@ -25,6 +26,7 @@ "317465074": 1, "317465075": 1, "403465735": 3, + "407316269": 1, "437421244": 1, "450844637": 3, "494187468": 4, @@ -38,8 +40,11 @@ "611329864": 1, "654307116": 4, "671247011": 1, + "693901806": 4, + "707997638": 1, "779962716": 1, "796633253": 4, + "830789013": 4, "855351524": 1, "855351525": 1, "870019568": 5, @@ -87,6 +92,7 @@ "1261107326": 4, "1280755883": 1, "1288683596": 3, + "1289637143": 4, "1334842411": 2, "1356657785": 5, "1362642485": 5, @@ -103,7 +109,6 @@ "1423305598": 1, "1423305599": 1, "1429874803": 6, - "1443744070": 4, "1454610995": 3, "1473368760": 4, "1473368761": 4, @@ -130,15 +135,14 @@ "1623653771": 2, "1690059054": 4, "1695429263": 1, + "1719391718": 1, "1721185806": 4, "1721185807": 4, "1727527805": 4, - "1748148571": 1, "1750365155": 3, "1767312242": 1, "1771869770": 4, "1771869771": 4, - "1773501680": 1, "1775707016": 3, "1792195381": 1, "1817444308": 1, @@ -161,10 +165,8 @@ "1971919313": 4, "1987263977": 1, "2024188850": 4, - "2039712238": 4, "2073576287": 1, "2127474099": 3, - "2135702615": 1, "2156817213": 3, "2168550540": 1, "2179603792": 5, @@ -178,6 +180,7 @@ "2277536120": 4, "2277536122": 4, "2277536123": 4, + "2281501155": 1, "2291082292": 3, "2298896088": 3, "2298896090": 3, @@ -198,6 +201,7 @@ "2422643144": 5, "2433900295": 2, "2459768632": 5, + "2484811305": 4, "2526736328": 4, "2538439951": 1, "2546370410": 3, @@ -240,7 +244,6 @@ "3105972941": 5, "3105972942": 5, "3105972943": 5, - "3106070506": 1, "3140833553": 1, "3140833554": 1, "3140833555": 1, @@ -251,8 +254,8 @@ "3154516913": 1, "3159052337": 3, "3166802179": 1, - "3171327109": 4, "3171649853": 2, + "3175859009": 4, "3212701863": 1, "3222576960": 4, "3222576961": 4, @@ -295,6 +298,7 @@ "3425898631": 5, "3448772677": 4, "3449275624": 1, + "3450902429": 1, "3475074928": 3, "3481131423": 3, "3503026437": 5, @@ -302,7 +306,6 @@ "3539322898": 1, "3570942494": 3, "3587167050": 2, - "3610131410": 4, "3617209212": 6, "3624435060": 6, "3631905978": 3, @@ -322,8 +325,6 @@ "3727346032": 4, "3727346033": 4, "3734501342": 1, - "3749428427": 1, - "3753232378": 4, "3755201983": 4, "3785074629": 4, "3800267412": 1, @@ -365,7 +366,6 @@ "4213271811": 3, "4224972854": 4, "4224972855": 4, - "4233800814": 1, "4264904777": 1, "4283023978": 4, "4283023979": 4, diff --git a/src/data/d2/exotic-synergy.json b/src/data/d2/exotic-synergy.json index bc40fa7536..c000526964 100644 --- a/src/data/d2/exotic-synergy.json +++ b/src/data/d2/exotic-synergy.json @@ -230,7 +230,8 @@ }, "1996008488": { "damageType": [ - 2 + 2, + 4 ], "subclass": [ 1081893460 @@ -318,14 +319,6 @@ 4 ] }, - "2808156426": { - "damageType": [ - 2 - ], - "subclass": [ - 119041299 - ] - }, "2822465023": { "damageType": [ 4 diff --git a/src/data/d2/exotic-to-catalyst-record.json b/src/data/d2/exotic-to-catalyst-record.json index e1df35f142..2a3f5e18dc 100644 --- a/src/data/d2/exotic-to-catalyst-record.json +++ b/src/data/d2/exotic-to-catalyst-record.json @@ -4,6 +4,7 @@ "46524085": 494981303, "204878059": 2538406461, "219145368": 1144463862, + "331231237": 3396973108, "347366834": 836516980, "370712896": 3381077691, "374573733": 3318895306, @@ -37,6 +38,7 @@ "1864563948": 3468043157, "1891561814": 173502661, "1912669214": 1048178161, + "2044500762": 2880917375, "2084878005": 1514331782, "2130065553": 3835718947, "2179048386": 3574136388, @@ -81,6 +83,7 @@ "3659414143": 788492661, "3664831848": 1629497825, "3698448090": 812366033, + "3725585710": 3393121279, "3761898871": 2329638530, "3766045777": 252263460, "3821409356": 1605993075, diff --git a/src/data/d2/exotics-with-catalysts.ts b/src/data/d2/exotics-with-catalysts.ts index b408bfbfc2..8cc88dd84a 100644 --- a/src/data/d2/exotics-with-catalysts.ts +++ b/src/data/d2/exotics-with-catalysts.ts @@ -4,6 +4,7 @@ const exoticWeaponHashesWithCatalyst = new Set([ 46524085, // Osteo Striga 204878059, // Malfeasance 219145368, // The Manticore + 331231237, // Finality's Auger 347366834, // Ace of Spades 370712896, // Salvation's Grip 374573733, // Delicate Tomb @@ -37,6 +38,7 @@ const exoticWeaponHashesWithCatalyst = new Set([ 1864563948, // Worldline Zero 1891561814, // Whisper of the Worm 1912669214, // Centrifuse + 2044500762, // The Queenbreaker 2084878005, // Heir Apparent 2130065553, // Arbalest 2179048386, // Forerunner @@ -81,6 +83,7 @@ const exoticWeaponHashesWithCatalyst = new Set([ 3659414143, // Verglas Curve 3664831848, // Heartshadow 3698448090, // Choir of One + 3725585710, // Lodestar 3761898871, // Lorentz Driver 3766045777, // Black Talon 3821409356, // Ex Diris diff --git a/src/data/d2/extended-foundry.json b/src/data/d2/extended-foundry.json index 67969de474..936615fd79 100644 --- a/src/data/d2/extended-foundry.json +++ b/src/data/d2/extended-foundry.json @@ -2,14 +2,13 @@ "2307365": "suros", "4425887": "fotc", "20025671": "suros", - "42874240": "omolon", - "62937067": "suros", + "52790208": "suros", "105164264": "nadir", "137879537": "fotc", "153979396": "fotc", "153979397": "fotc", "153979399": "fotc", - "161675590": "veist", + "157601190": "nadir", "177568179": "nadir", "191996029": "fotc", "192784503": "cassoid", @@ -17,76 +16,59 @@ "205225492": "omolon", "253196586": "fotc", "276918162": "fotc", - "294129361": "hakke", "303107619": "cassoid", "339163900": "fotc", "358788212": "cassoid", "408440598": "fotc", - "411397829": "suros", "413901114": "nadir", "417100299": "nadir", "417474225": "cassoid", "425681240": "nadir", - "447296102": "field-forged", - "487361141": "suros", - "491078457": "omolon", - "495940989": "suros", "496556698": "cassoid", "499245245": "cassoid", "501345268": "nadir", - "540880995": "veist", - "542573208": "tex-mechanica", - "555148853": "omolon", "566740455": "suros", "580961571": "fotc", "586671776": "nadir", "614140575": "hakke", "627188188": "cassoid", "632597698": "hakke", - "655712834": "hakke", - "681067419": "omolon", "705774642": "cassoid", - "711889599": "veist", "717150101": "cassoid", - "772231794": "omolon", + "751880654": "cassoid", "781498181": "nadir", "792755504": "fotc", "806021398": "fotc", "807192446": "fotc", "819358961": "fotc", - "825554997": "suros", "834081972": "fotc", - "852228780": "omolon", "888872889": "cassoid", - "922005771": "suros", "930590127": "fotc", "990416096": "fotc", - "1028124540": "suros", "1048266744": "fotc", "1050806815": "veist", "1099433612": "fotc", "1120843239": "fotc", "1136510727": "omolon", "1137768695": "fotc", - "1144014195": "veist", "1161276682": "fotc", "1161561386": "nadir", "1172884782": "hakke", "1177293325": "omolon", "1177293326": "omolon", "1177293327": "omolon", - "1183116657": "omolon", "1189790632": "fotc", "1200414607": "fotc", + "1211155739": "suros", "1281822856": "fotc", "1289324202": "hakke", "1292594730": "cassoid", + "1293340523": "veist", "1296429091": "nadir", "1321626661": "cassoid", "1325579289": "fotc", "1377069894": "tex-mechanica", "1386601612": "suros", - "1389546626": "omolon", "1393021134": "cassoid", "1393021135": "cassoid", "1401300690": "cassoid", @@ -94,11 +76,9 @@ "1453235079": "omolon", "1457979868": "field-forged", "1489452902": "fotc", - "1492522228": "veist", "1529450902": "cassoid", "1531295694": "cassoid", "1547760589": "hakke", - "1574601402": "veist", "1612781792": "nadir", "1619016919": "suros", "1644162710": "fotc", @@ -113,13 +93,9 @@ "1760543913": "cassoid", "1773600468": "fotc", "1775804198": "suros", - "1788603939": "hakke", "1820994983": "cassoid", "1821724780": "suros", - "1845978721": "suros", - "1854753404": "omolon", "1890332078": "cassoid", - "1891996599": "omolon", "1948035256": "cassoid", "1960218487": "fotc", "1974641289": "nadir", @@ -132,7 +108,6 @@ "2039776723": "nadir", "2059255495": "cassoid", "2063217087": "cassoid", - "2065081837": "omolon", "2168486467": "fotc", "2171006181": "fotc", "2185327324": "suros", @@ -142,30 +117,21 @@ "2278995296": "fotc", "2287240026": "veist", "2290863050": "fotc", - "2298039571": "hakke", - "2326578623": "veist", + "2299191415": "tex-mechanica", "2351747819": "cassoid", "2422664927": "hakke", - "2450917538": "omolon", - "2470795406": "suros", "2478247171": "cassoid", - "2488587246": "suros", "2502422774": "cassoid", "2510526114": "nadir", "2581162758": "fotc", - "2591257541": "veist", "2605790033": "cassoid", "2605790034": "omolon", "2611861926": "fotc", "2621637518": "fotc", - "2644343417": "suros", - "2653171212": "suros", - "2657352423": "suros", "2658740569": "hakke", "2660862359": "fotc", "2693941407": "cassoid", "2694044461": "omolon", - "2728851518": "omolon", "2742838700": "fotc", "2759590322": "suros", "2763843899": "fotc", @@ -177,30 +143,27 @@ "2826850739": "nadir", "2848549302": "cassoid", "2860172150": "cassoid", - "2883684343": "omolon", - "2888266564": "omolon", + "2876244791": "cassoid", + "2888266564": "hakke", "2891672170": "cassoid", + "2898525497": "fotc", "2932922810": "cassoid", "2957542878": "fotc", "2961807684": "fotc", "3005879472": "fotc", - "3007479950": "omolon", "3009199534": "cassoid", "3040742682": "fotc", "3098328572": "veist", - "3099084679": "fotc", "3110698812": "tex-mechanica", "3163061743": "veist", - "3165143747": "veist", - "3183283212": "omolon", "3185293912": "cassoid", "3190698551": "fotc", + "3228993066": "hakke", "3246523831": "cassoid", "3337727085": "cassoid", "3356526253": "fotc", "3361694400": "cassoid", "3361694403": "omolon", - "3371413057": "veist", "3383958219": "fotc", "3409645497": "cassoid", "3435238842": "cassoid", @@ -210,37 +173,27 @@ "3445437901": "fotc", "3461377698": "hakke", "3465233192": "cassoid", - "3483485727": "veist", "3493948734": "fotc", "3505958430": "suros", "3529780349": "fotc", - "3543313962": "hakke", - "3559361670": "hakke", - "3573686365": "omolon", "3582424018": "fotc", "3583275737": "cassoid", - "3610521673": "omolon", "3637669759": "nadir", + "3649173192": "fotc", "3662200188": "cassoid", "3662200189": "cassoid", "3751622019": "suros", "3757612024": "fotc", "3826803617": "fotc", - "3832743906": "omolon", "3889907763": "cassoid", "3890960908": "fotc", - "3896249436": "fotc", "3906357377": "cassoid", - "3915197957": "omolon", "3929685100": "fotc", - "3997086838": "hakke", "3998080529": "nadir", "4024037919": "fotc", "4041111172": "fotc", - "4074251943": "omolon", "4083045006": "fotc", "4105447486": "cassoid", - "4106757302": "hakke", "4138415949": "cassoid", "4138415950": "cassoid", "4148143418": "hakke", @@ -255,9 +208,7 @@ "4193877020": "fotc", "4200654067": "veist", "4209476803": "suros", - "4220529694": "suros", "4230993599": "suros", "4238497225": "fotc", - "4272442416": "fotc", - "4281371574": "omolon" + "4272442416": "fotc" } diff --git a/src/data/d2/focusing-item-outputs.json b/src/data/d2/focusing-item-outputs.json index d024b81cbd..93bf427d3e 100644 --- a/src/data/d2/focusing-item-outputs.json +++ b/src/data/d2/focusing-item-outputs.json @@ -1,252 +1,257 @@ { + "944883": 3667553455, "1014208": 1703551922, - "4500656": 882778888, + "2363653": 491078457, "9788213": 2376585692, - "15760717": 1056103557, - "19334920": 3685470415, + "11400735": 2673925403, "30837423": 1734844651, - "32200569": 1197771438, "33903049": 3440927677, - "45790364": 2073794990, + "36747801": 2653171213, + "38855301": 4019668921, + "40290223": 2641704939, + "46196714": 1051949956, + "47389754": 1298672084, "52492571": 3074679271, + "52790208": 2759590322, "55944745": 1725332125, - "56087832": 1975125963, - "73819307": 2009277538, "77153391": 1909305643, + "83965148": 2073794990, "85648155": 144007143, "90822968": 53292762, - "98119707": 1331824604, + "91766129": 2821430069, + "99854075": 1886840007, "100404736": 3637722482, "102374420": 2809120022, - "110998651": 2233545123, + "104525723": 1606497639, + "117057140": 3997086838, "122152503": 2883045518, "124569297": 1537074069, - "137267597": 2022294213, - "138488170": 3794274730, "143601688": 3201140055, - "144255421": 2821677368, "152550357": 1959672649, + "154412394": 409551876, "156844620": 1188437342, - "169184833": 3947966653, + "173152368": 3221722018, "175003048": 1987616650, - "176328483": 3605603507, "179758314": 2509918852, "183582177": 197672677, - "189224310": 2889501828, - "189675718": 1916287826, "199445735": 332170995, + "201798442": 1719687748, "202522666": 2674680132, + "205680223": 2349907931, + "207081523": 3332125295, "207548065": 1314666277, - "213151935": 3428407746, + "218214716": 1661393678, "220051784": 3408834730, + "220944791": 2233545123, "221852859": 4057299719, "231864088": 3288917178, "234708547": 3813221631, - "241285460": 1796949035, "253950230": 469333264, - "259358118": 2850664015, + "264944861": 310708513, + "279354191": 417100299, "279578169": 297009581, - "293795567": 3207116971, + "284985776": 2009277538, + "285956507": 3473290087, + "293795567": 1812185909, "296152704": 1896287986, "296378791": 108286515, - "301198419": 3565520715, - "309462567": 2345794502, + "302053740": 4195186942, "313407897": 3234692237, "316472157": 1702245537, "316819918": 3797572280, "325108472": 241291034, + "325881855": 3110377595, "332192961": 4161591237, "332625175": 2248987683, - "334163123": 2988121501, "338446411": 18990920, "350442704": 125833536, - "350549470": 496728945, - "355618650": 1973107014, - "359044451": 303107619, + "356432935": 2826850739, "362902214": 3730575552, "366078621": 3984883553, - "369416367": 664109750, + "366482347": 2876244791, "374248557": 456484913, "378242631": 1959285715, "380543246": 2766527864, "384806842": 1265513556, "390263398": 3583853408, + "392547400": 3794274730, "394983260": 297586990, "397729467": 2580822279, - "399609973": 3962575203, "400987770": 3014775444, "405311520": 1254421266, - "413091525": 963710795, "415227049": 4091317789, "420543798": 3146160048, - "422598265": 417100299, "425782652": 978215630, "426311013": 3884544409, "428574585": 215768941, - "431324148": 2290416, "434356905": 124944413, - "441005677": 4255171531, + "435002917": 2249996761, "447839375": 3791868619, "448147429": 274659609, "449889866": 4277137508, "462967561": 2321120637, "476791533": 2320491441, + "479072281": 1141927949, "480579364": 1807196134, + "483006436": 3926811686, "487137411": 1740966079, "489274433": 39339589, - "502425410": 3686538757, + "508533863": 1144014195, "529088743": 2618417907, - "529248781": 4225322581, "533201397": 1160559849, - "538098823": 496728945, "538538204": 511888814, - "547791760": 1505862304, "547853538": 3150799884, - "563785171": 1948035256, - "566509595": 2322926844, + "567154700": 933455006, + "580541146": 501345268, "585603777": 3731378629, - "585851913": 435216110, + "588963177": 2513965917, + "589585329": 2767393525, + "593699562": 2889501828, "605025041": 341034325, "606510166": 2454114768, "609164671": 3381022971, - "616458509": 1028124540, + "609243450": 4146702548, "617836335": 4148887147, "622764187": 2217519207, - "624305650": 3605603507, "638850307": 2935526975, "646222889": 4238378141, "652077411": 768769183, + "654848542": 3211624072, "659786850": 3883866764, - "663794103": 188882152, "667818643": 3737404623, - "668806934": 3667553455, - "670213768": 1332123064, "672369541": 273457849, "673296954": 2082483156, - "673645496": 2099894368, + "683374858": 480368036, "683632999": 143821939, - "703117212": 433905699, + "698250007": 303107619, "704898505": 3829990714, "708773129": 3874247549, "709164353": 1394633029, - "712113909": 3009199534, "716883942": 417977312, "717710567": 3352415987, "720153764": 3419310182, - "727935166": 42874240, "736550308": 2448259942, "736571395": 1688602431, "737419447": 3118064579, + "737428704": 1916287826, "738161504": 193869522, + "740417776": 3568377122, "740593432": 3267996858, + "742707936": 2697143634, "746346035": 1848640623, - "748293293": 2891672170, "750483560": 978537162, - "753325306": 2671639706, "755662092": 469005214, "756971831": 896081219, - "757363969": 105164264, "759005343": 2016308379, "760706311": 2731689491, + "764975752": 2891672170, "766089081": 1952223085, "767948183": 3971188131, - "768414879": 1820994983, + "768346973": 2378785953, "776110297": 1321354573, - "776613950": 2653171212, + "780496764": 2313726158, "781313686": 3684978064, + "782991879": 2298039571, "786697890": 3453042252, "787111830": 3299416208, "789415529": 1528655453, + "791810866": 2199554524, "792320746": 886273156, - "792478228": 2653171213, "801895599": 3824918251, - "802524442": 1492522228, + "809709120": 3489657138, "812524306": 3115740538, - "814898891": 2513965917, + "816003836": 2448907086, "817162333": 2463947681, - "817926907": 1298672084, "819773640": 2870974250, "827034816": 2766109874, + "827599943": 2039776723, "837053731": 1215952756, + "839115995": 3867373351, + "850834881": 2022294213, "854926798": 2498588344, "859980511": 2268523867, "865222334": 1392054568, - "871223546": 3738678140, - "878814305": 2152484073, + "872190708": 557165046, "879692448": 1299272338, - "884119083": 3637669759, "891829968": 162269058, "892020293": 1032041977, "898459512": 2117889178, - "923235261": 213264394, + "918317154": 4233375372, "940822787": 3406291173, "941282909": 1005315489, "949131991": 691578979, + "953703634": 3738678140, "959456403": 4224804453, + "960363826": 1331824604, + "962058923": 1586231351, "964294291": 2374129871, "966848994": 138566412, "968289293": 3863492689, "981104658": 1183187516, "986956153": 685165933, "987042032": 1906093346, + "1005621537": 1456017061, "1009072908": 38792606, "1009346008": 1346827258, "1011791524": 2522706952, "1012826548": 791799769, "1016565787": 657606375, + "1017948510": 4114929480, + "1024892034": 991314988, + "1032901209": 2450049485, + "1034058285": 1601177201, "1037962076": 4038429998, "1038737566": 3770087944, "1055088541": 3441081953, + "1055356060": 435216110, "1059479825": 3651424085, "1064943697": 693067797, + "1069478322": 792171868, "1073231502": 3301944824, "1079930198": 3187320016, - "1087623621": 2638190703, - "1088436227": 1801007332, - "1099634737": 1711056134, - "1100524837": 1854753404, + "1100231689": 1354727549, "1101032348": 2177524718, "1103301267": 1654461647, + "1103701935": 62937067, "1104664699": 2381515079, "1106028100": 119859462, "1120180351": 1765728763, "1125545953": 87665893, "1127615753": 241462141, "1130536756": 138282166, - "1135209547": 1218113510, "1137434578": 2772262012, "1138336561": 1537128821, + "1140943142": 694275488, "1149271199": 438165659, "1152128861": 3948284065, - "1164082019": 1456017061, "1165790188": 3591512190, - "1171147547": 4019668921, - "1185962501": 1058098236, - "1190896009": 1019000888, + "1169027282": 1028124540, "1193316520": 2653909130, "1197776562": 1001356380, "1198134926": 2316914168, "1200919036": 2195587150, "1205337961": 1412970845, - "1207785157": 2119346509, + "1221110111": 4207120603, "1224060546": 1001798188, "1232437646": 619556600, + "1234612272": 3832743906, "1240056416": 1322042322, - "1242556131": 2009892127, + "1242556131": 178749005, "1243425594": 1630402260, "1245100546": 1474735276, + "1246618526": 882778888, "1249762845": 3426527713, + "1253982489": 2584830733, "1256736028": 1266712686, "1258973771": 2252757719, "1260343369": 3045642045, - "1262289634": 2591257541, "1264955704": 903984858, "1271294424": 4143415290, - "1284280897": 1854753405, + "1275523246": 2350330520, + "1290536011": 852551895, + "1291893472": 1201528146, "1294158516": 1183405878, "1294553754": 2651216180, - "1297705704": 1141927949, - "1304666522": 4100775158, "1304967988": 2203146422, "1313836869": 3381022969, "1317159774": 3844826440, @@ -255,89 +260,96 @@ "1336321181": 1322544481, "1339772536": 1053737370, "1343614591": 461841403, - "1344068687": 355382946, "1366750484": 2993008662, - "1388641546": 1903182562, + "1373116678": 1851521408, "1391595268": 960442438, "1392922876": 1453120846, - "1394030426": 557165046, - "1403892338": 3867373351, - "1408302568": 310708513, + "1393735405": 959037361, + "1401276266": 372697604, + "1408322960": 3428407746, + "1412510811": 1820994983, "1413646678": 1207531728, + "1418030349": 3437370193, "1421355221": 2780717641, - "1426642813": 2591241074, "1428449496": 2492669178, "1437610838": 193869520, "1444043170": 123879244, + "1444163150": 1019000888, "1447074729": 435339366, - "1451560288": 4207120603, - "1456431750": 1144014195, "1458342358": 1586932304, "1461236083": 3831935023, - "1462837803": 676270382, "1463684923": 3496016519, "1469355180": 2950045886, "1469993244": 2395939950, + "1470208358": 2099894368, "1470817006": 671423576, "1477422359": 3001449507, - "1505980150": 2896109856, + "1488099192": 2671639706, + "1500748594": 627188188, + "1515561791": 3125454907, + "1516075651": 4230993599, "1517474839": 959484195, + "1523208908": 3796795102, "1527328167": 3179623987, "1529271412": 2326396534, - "1534458575": 1051949956, + "1529835198": 1046651176, "1547375670": 2766109872, - "1548869837": 829330711, - "1549471512": 1524444346, + "1549471512": 1392054568, + "1551464092": 1893967086, + "1552702991": 3565520715, "1555319323": 106575079, - "1560482644": 2026755633, + "1560045930": 1968410628, + "1562141193": 1854753405, "1564178759": 1613581523, "1564784937": 1030017949, - "1567668434": 4114929480, + "1568976227": 3922217119, "1569427840": 3932952562, - "1578087745": 3221722018, + "1578915183": 1796949035, + "1585868599": 3341893443, "1588913887": 2655279451, "1593841906": 3611754012, "1599155324": 267960270, + "1613585882": 1492522228, "1624737700": 2066430310, "1625916736": 132486706, "1626181388": 2384488862, "1629007932": 938618741, - "1642389930": 3165143747, "1643656410": 2616071821, - "1652257364": 617501162, "1657208257": 2353371845, - "1662696701": 62937067, "1669660339": 1310207471, - "1671466931": 3341893443, - "1674839226": 4146702548, "1692118511": 2773056939, "1693103724": 4122447870, "1696802966": 2395788176, - "1699691308": 2496875173, + "1697968560": 4005780578, "1700920860": 1021381486, "1704880129": 300502917, - "1706194004": 3293524502, "1709963256": 1248530160, + "1715740932": 1968711238, "1726065449": 3671337107, + "1730148720": 2510526114, + "1732065014": 3166250992, "1734076444": 2385676654, "1739332121": 1310346765, "1740905008": 3601794530, "1750413635": 1624882687, + "1757424586": 1801007332, "1758382769": 2134769653, - "1760566536": 411397829, "1762083721": 1698660093, - "1767287717": 1107446438, + "1765702368": 3355385170, + "1771461428": 3754408118, "1809794768": 845422466, + "1816364190": 2300143112, "1817535839": 3652732123, + "1828328977": 4225322581, "1838197241": 1727248109, + "1842623742": 105164264, "1860140389": 1734144409, "1869654860": 4006721630, "1872688848": 1512386434, "1874827456": 682107058, "1879568799": 2169905051, - "1881106972": 1197771438, - "1888921546": 991314988, "1891772651": 2713820407, + "1891927373": 3998080529, "1896335568": 1267361154, "1896884883": 2335208655, "1900451399": 2969535443, @@ -348,29 +360,28 @@ "1912716657": 777526069, "1912718977": 3573144325, "1913013889": 2914474757, + "1915990532": 1973107014, "1923654025": 946526461, - "1926613346": 2856514843, "1929900447": 2857770907, - "1943526520": 3832743906, - "1945863786": 3355385170, - "1949976278": 2328531378, + "1937611370": 3232203524, + "1942251393": 3686538757, "1955453921": 3063765221, "1960898552": 2237216282, + "1961759511": 1788603939, + "1965867309": 496728945, "1976108766": 2351038408, "1981520313": 2576944173, "1992194968": 1482105402, - "2001654141": 4195186942, - "2001908703": 3867373351, + "1998829404": 676270382, "2001962619": 3991622471, "2002770452": 1852587798, + "2003638177": 3292795429, "2005232513": 2757274117, - "2011905615": 3125454907, - "2012234044": 575830664, - "2013720028": 1292594730, "2020782603": 2938035991, + "2028217633": 2496875173, + "2029585884": 378498222, "2032448300": 2578771006, "2042885489": 1812185909, - "2050879410": 875848769, "2055524983": 2151744259, "2057542406": 1233862528, "2059601679": 3275117874, @@ -378,109 +389,105 @@ "2064212142": 3106439832, "2068320776": 1734844650, "2069829085": 1139897377, + "2073348400": 222606050, "2077601806": 1260563064, "2077874558": 3104459624, - "2080370847": 1601177201, "2086016266": 1026828708, "2086437031": 1465405235, "2091225008": 714372706, "2094168185": 2368311917, "2111030142": 173787496, - "2126709519": 1354727549, + "2119147158": 412251536, + "2134085073": 1479465109, + "2144437236": 4100775158, + "2145353828": 157601190, "2147608557": 3574051505, "2150208209": 671664021, + "2153298319": 1106635211, + "2154456873": 2988121501, "2155785663": 2255796155, "2157486560": 3150852690, - "2158681379": 2591257541, "2159167152": 4266736482, - "2159906485": 2566006935, - "2161352153": 3947966653, "2161392874": 3259193988, + "2164131193": 4255586669, "2165423482": 1767106452, "2168238205": 1935198785, "2170616305": 3717431477, - "2172035686": 2510526114, - "2181013239": 906840740, "2182452253": 4076604385, + "2183966710": 2290416, + "2187992932": 1107446438, "2197274028": 2627533758, "2199102019": 90009855, "2204419101": 708549601, "2233602319": 1615052875, "2243205274": 3084282676, - "2243721915": 2889501828, "2248212155": 1627691271, - "2259181870": 372697604, "2262455308": 2347145374, + "2267066698": 155308388, "2271192476": 164221422, "2271876370": 2931145020, "2276310682": 2741247284, "2277184009": 546003581, + "2281936901": 1911060537, "2287231352": 2428181146, "2292621312": 1394979698, "2293707032": 230314682, "2300822101": 1724366537, - "2307767373": 1028582252, "2307892413": 2943943681, - "2310429141": 852551895, "2310598311": 3250247987, "2311186393": 2188974669, "2312764638": 860168648, "2322164035": 2822465023, - "2326146050": 2126178511, - "2328097465": 1332123064, "2340850909": 1619425569, "2341107225": 23061005, - "2344519869": 42874240, "2349487312": 1567525250, - "2349708432": 4230993599, - "2350052206": 3232203524, - "2352775355": 2039776723, + "2354898110": 3465233192, "2358069650": 2999584444, "2361452337": 2240152949, "2362430352": 266021826, "2366624690": 121305948, - "2371964808": 4152016199, + "2373970243": 216983039, + "2381507358": 511773064, "2387444228": 2348198214, - "2389782802": 2378785953, - "2389855961": 1911060537, "2397722856": 1066605642, + "2398130369": 2591257541, "2398693243": 3849754183, "2410737925": 2399134521, + "2413746134": 1076810832, "2417743858": 1740888860, - "2421977839": 3568377122, + "2423294139": 1687353095, "2427081642": 1177873348, "2432853034": 4144123204, + "2445219609": 1547183373, "2450060488": 298824490, "2453538631": 193869523, - "2459241935": 1788603939, "2461218970": 3641592628, + "2461407681": 411397829, "2467867662": 3977387640, "2470306500": 3539357318, - "2470795406": 2759590322, "2472122753": 1200256005, "2485608945": 1769846965, "2492527550": 684658728, - "2495630472": 1403800851, + "2495124174": 1332123064, "2510227202": 727872428, "2521243264": 2392432370, "2529663586": 3702689847, - "2532761634": 627188188, "2532975303": 641063251, "2535975195": 3423777255, - "2548657477": 480368036, "2551249699": 2181242591, - "2556354193": 3465233192, - "2563760503": 3794274730, + "2570717855": 3678653083, "2574258558": 3216110440, - "2588173309": 2826850739, - "2596160855": 222606050, "2602975238": 3414625920, - "2603847911": 3610521673, "2605320510": 735535272, + "2605892322": 2653171212, "2607072210": 1922402428, "2609207620": 3238797830, "2615541747": 3364817839, + "2617594621": 1141547457, "2628207034": 1127943297, + "2631606272": 2591241074, + "2640011174": 2896109856, + "2642969363": 2850664015, "2646648024": 3381022970, "2647373794": 3787517196, "2648146174": 2247299560, @@ -492,59 +499,58 @@ "2664742934": 3261819408, "2664825549": 3451283089, "2664994076": 2899275886, + "2666283098": 358788212, "2669950408": 1654117930, - "2671624238": 1687353095, "2677528310": 3934586864, "2691087957": 146223817, - "2694613907": 817909300, "2701632970": 1637326795, + "2718271926": 3504336176, + "2720725271": 433905699, "2721354951": 2557210451, "2724714408": 1953621386, + "2726396293": 1399243961, + "2730887956": 3293524502, "2733913394": 2255073244, "2733974969": 597831725, - "2735530398": 1399243961, "2738914052": 3316517958, - "2742003220": 1586231351, "2742898269": 806374817, - "2748655036": 2231910050, "2748982312": 921467658, + "2754445092": 1218113510, + "2755263039": 3106557243, + "2756838942": 575830664, + "2765551031": 3165143747, "2768502727": 4144779347, "2769684630": 3958993808, - "2769955568": 1046651176, "2772236585": 2447741853, "2780654660": 4057299718, "2792769622": 1958630864, - "2801586127": 3293524502, - "2807422555": 1968410628, + "2810404581": 4154074649, "2817346460": 2143618030, - "2825071664": 2767393525, + "2818658597": 3583275737, "2825573027": 3627185503, "2826830765": 4058198769, - "2841969397": 2715240478, "2843072129": 3132885765, "2849111819": 3273631255, "2851870940": 4057580974, - "2852100056": 548809020, + "2852649264": 1903182562, "2853425267": 931507503, "2854025240": 3741471003, "2854976081": 1981173269, "2855987957": 1703598057, "2859670382": 3219256792, - "2864139346": 4039572196, - "2864257856": 358788212, "2867485074": 3534173884, + "2871721702": 1612781792, "2875090959": 3844826443, "2876818003": 192896783, "2879305550": 2415768376, "2879998696": 1325838922, "2889504953": 1413409069, + "2898525497": 3356526253, "2899862144": 1832839922, "2902329623": 4039932861, "2905536492": 391384020, "2905700895": 2251614491, "2912463567": 3749277835, - "2921967794": 3504336176, - "2922048315": 2932922810, "2924540416": 1725917554, "2928349050": 605724052, "2930629196": 4150060382, @@ -552,49 +558,34 @@ "2947742646": 2408514352, "2950694244": 1431190694, "2950782681": 771104589, - "2954319306": 409551876, "2957859219": 2478547407, - "2962131771": 2584830733, "2967958507": 3570900471, "2970820409": 1474735277, "2974942014": 4269346472, - "2975831865": 2249996761, "2976734344": 3651039338, "2981276707": 2716373471, - "2983490507": 1084190509, "2986968300": 241462142, - "2989732283": 3631862279, + "2989732283": 1392054568, "2997491826": 2066074780, - "2998282114": 3997086838, "2999252751": 3942036043, "3003155525": 2563444729, - "3004927172": 959037361, "3010462832": 4156676002, - "3014947770": 3754408118, - "3015533776": 821154603, - "3016523637": 2349907931, "3021987691": 754069623, "3034681814": 3091776080, "3041739793": 371726421, "3041947774": 687386728, - "3043843956": 2298039571, "3054751781": 3153956825, "3063795377": 1329892341, "3067591475": 2105414511, - "3069584563": 1886840007, - "3071313306": 2350330520, "3074765785": 178749005, - "3096586593": 412251536, - "3099084679": 253196586, + "3076072398": 1948035256, + "3085357864": 213264394, "3106353652": 2645763830, - "3108599636": 216983039, "3111111216": 1219761634, "3112088101": 1276048857, - "3112667046": 1851521408, "3117433295": 235591051, "3119153287": 2075703443, - "3124166240": 2852052802, - "3124275920": 3489657138, + "3122430471": 1403800851, "3134564286": 1996008488, "3144750103": 2936230179, "3151924429": 2423243921, @@ -603,112 +594,127 @@ "3174721418": 3342536996, "3179227684": 1192890598, "3181759866": 175511444, - "3185454692": 1612781792, "3187046535": 3328811155, "3187910761": 2072548445, "3188702156": 2534676958, - "3191238503": 1886840007, + "3200105099": 2566006935, + "3200434396": 3009199534, "3204561957": 1630000089, - "3213282927": 3332125295, + "3210923996": 1197771438, "3215932179": 863163983, - "3224735856": 1108278178, - "3233041552": 2050789284, + "3217523599": 1975125963, + "3223869898": 4039572196, + "3223924017": 2832013173, + "3224735856": 178749005, + "3228993066": 2888266564, "3237668309": 2094233929, "3248496910": 2102025592, "3251175769": 2443507405, + "3254804681": 3947966653, "3256047672": 2147175386, "3259487516": 844443758, - "3264683058": 3473290087, "3268063974": 2390471904, "3272445958": 2002452096, "3281352910": 1602717624, "3282450867": 2344353519, "3287081371": 120441703, + "3290572354": 1028582252, "3292250861": 2935055281, "3293679620": 938218310, + "3296963846": 42874240, + "3300245016": 2932922810, + "3306576462": 2738601016, "3310241668": 3747088838, "3310367410": 2845947996, "3310823353": 3070555693, "3318677781": 1571959827, "3323319039": 4287857019, - "3331628275": 2126178511, "3332521187": 1849149215, - "3335470232": 5159537, "3337944718": 2097219064, "3345357730": 1321354572, - "3349513867": 3106557243, + "3346371707": 4152016199, "3359876034": 3303502828, "3368700430": 436615288, "3373908478": 1909470440, - "3377289784": 2300143112, "3382832422": 2355943840, - "3384059383": 3761819011, + "3384059383": 273457849, "3392240079": 2738060683, - "3396356011": 1801007332, + "3403264960": 2328531378, "3405211239": 50291571, - "3414637070": 1606497639, + "3415521860": 1711056134, + "3420177387": 615681527, + "3424709896": 617501162, + "3426900336": 355382946, "3434863786": 4201843274, "3437392668": 2741258862, "3437505629": 1637623713, "3437969024": 533855986, "3446623301": 4061292537, + "3450156559": 963710795, + "3453261711": 4255171531, + "3459488441": 1084190509, + "3460423082": 3258665412, "3464883458": 2304861612, + "3468506669": 5159537, "3469351144": 3281673290, "3471438865": 3093309525, "3471717205": 2565829065, "3475683133": 1856777089, "3477988437": 4165919945, - "3478212090": 867154247, - "3481070944": 933455006, "3484903008": 3775606738, "3486679768": 1060317946, "3487479939": 3974038291, "3487993338": 3403647252, - "3488121287": 1076810832, + "3489910822": 1505862304, "3498657110": 2195467472, - "3503452845": 3232203524, + "3500791139": 3436626079, "3506304844": 48110686, "3510230835": 1009385327, "3512588219": 1811579911, "3513036502": 1602419024, "3518379440": 691578978, + "3518768787": 2126178511, + "3532173875": 2638190703, "3533534867": 2671565007, + "3534797310": 188882152, + "3537285454": 2821677368, "3538579376": 91690594, - "3543313962": 2888266564, - "3544419970": 996109059, + "3541993780": 664109750, "3546314515": 2273643087, - "3551610760": 412251536, "3553325799": 2717305289, "3553875570": 2135836316, - "3554684907": 3292795429, + "3555286847": 267672635, + "3556063855": 821154603, "3557991772": 2472090414, "3562567620": 1674833286, "3566338354": 3487011804, - "3572799518": 4086100104, + "3572799518": 1812185909, "3573404221": 609852545, "3577148367": 3638406027, "3580701310": 136355432, + "3588527091": 198854575, "3598649636": 1955548646, - "3599042365": 2198166292, "3599713355": 3597838551, "3600661228": 3251195262, "3607545635": 1148781279, "3617033640": 2096711562, "3617994312": 2612856746, - "3618372582": 2199554524, + "3618831903": 2856514843, "3629641744": 3106222402, "3639816879": 606902507, "3640152843": 357179927, + "3649173192": 253196586, "3650390908": 1938324686, "3651818922": 212971972, "3656122215": 304385651, "3663176799": 2321064411, "3664957074": 2218948028, "3671588056": 1960663290, - "3673645044": 3685470415, + "3675599216": 2231910050, "3685096533": 1341951177, + "3688555794": 548809020, + "3691364362": 906840740, "3705995974": 3797729472, - "3708928651": 3166250992, "3711090475": 2286507447, "3716635620": 1069002790, "3717480197": 1741360441, @@ -716,43 +722,36 @@ "3731724843": 932578999, "3732407823": 1096253259, "3732924936": 1884301546, - "3737630378": 491078457, "3739489832": 2808156426, "3739947031": 3694642467, - "3742381985": 3969379530, "3742527360": 4032295410, "3743691434": 3624199242, + "3744426107": 867154247, "3749148603": 77816839, "3753382047": 1148460187, "3755738975": 486861531, - "3760168333": 4207120603, - "3760940359": 3678653083, "3765731481": 539816333, "3769720823": 2013313923, "3771606505": 1283202269, + "3771798522": 2198166292, + "3776165335": 3962575203, + "3776837386": 2050789284, "3784881871": 1080431755, - "3790887546": 2298039571, "3796222038": 3909729744, "3802805445": 1256804729, - "3809684989": 2381337281, + "3809684989": 371726421, "3812440761": 2820165421, "3814033537": 475652357, "3815376960": 2949791538, - "3817486366": 2673925403, + "3820433909": 2152484073, "3825975800": 3838077978, "3826782839": 3719480067, "3827697821": 1011882337, - "3843308263": 2448907086, "3847138256": 2389585538, "3848039961": 1805830669, "3850234099": 3517179757, - "3850560528": 4195186942, "3852825844": 390139894, - "3853063966": 2821677368, - "3853268371": 2738601016, "3855438068": 1467044898, - "3863574309": 2313726158, - "3868525094": 3796795102, "3870549112": 3252994970, "3876012135": 1659679091, "3881082126": 1914589560, @@ -761,74 +760,77 @@ "3884696647": 736382419, "3891912205": 868732497, "3894487223": 322173891, - "3895829948": 1578461326, - "3896249436": 3356526253, + "3895829948": 273457849, "3898129411": 1182214975, - "3903913748": 2328923181, - "3911059594": 3998080529, + "3920299599": 2751189771, "3923407559": 1045743955, "3924951683": 1737518783, - "3938564020": 1058098236, + "3930115709": 875848769, "3939284543": 2540765499, + "3940601453": 2026755633, "3946759767": 60193507, + "3947737539": 3637669759, + "3950759129": 2119346509, "3953384297": 1163283805, + "3959891474": 1058098236, + "3960749708": 2715240478, + "3960914123": 113167959, + "3967888097": 2035738085, "3970937914": 1854337492, - "3975089937": 4156253727, "3982212757": 2602559881, + "3989100739": 1054377087, "3991827892": 1443166262, "3992290300": 133666382, + "3998386647": 3503560035, + "4001764690": 2322926844, + "4001898131": 3685470415, "4005993978": 1466284308, - "4010675843": 2342054803, - "4013055243": 2450049485, "4021652784": 459833058, "4021927132": 3722981806, + "4023039160": 4077588826, + "4024310201": 2328923181, "4025410673": 3875549237, "4027344350": 4021402824, - "4033278404": 2198166292, + "4028427880": 3969379530, + "4039633424": 2852052802, "4044402424": 4136768282, - "4047291712": 378498222, "4050536705": 2437632645, "4055368305": 4060793397, - "4067562934": 3211624072, + "4061367591": 3605603507, + "4066300387": 4156253727, "4073332573": 3001229473, - "4078494680": 2821430069, + "4076975873": 1056103557, "4079614900": 2810038838, - "4080244203": 3110377595, "4084143604": 4139274998, - "4087887899": 4005780578, - "4092360875": 2350330520, - "4094461400": 198854575, "4096757830": 2629204288, "4099345916": 370930766, "4100036523": 1586892599, - "4110557383": 4255586669, "4119202577": 852430165, - "4121969391": 3258665412, + "4120943058": 1854753404, "4122177783": 896224899, "4130251279": 12440395, - "4133654499": 1141547457, + "4131549575": 2342054803, "4141497761": 1269679141, "4147463420": 1910323534, "4153158613": 1190497097, + "4155923794": 1435559164, "4155947523": 1884579135, - "4166606758": 3019024381, "4166850854": 1702288800, - "4177107292": 3686538757, "4178321775": 1262430251, "4181859860": 3949234966, "4195360985": 3691455821, "4198182657": 154944645, - "4202023285": 1106635211, "4206471995": 3539357319, "4222584181": 3570243433, - "4223163842": 2322926844, "4224297358": 1495869176, "4229934495": 4161524635, "4236667838": 3821828136, "4237588213": 1880357865, "4241589952": 725297842, "4245694331": 2321258055, + "4248710532": 2345794502, "4271865130": 810612804, - "4287959325": 1259299553, - "4293397471": 501345268 + "4273167814": 598995392, + "4280633975": 996109059, + "4287959325": 1259299553 } diff --git a/src/data/d2/generated-enums.ts b/src/data/d2/generated-enums.ts index e884700776..6737ab4a2f 100644 --- a/src/data/d2/generated-enums.ts +++ b/src/data/d2/generated-enums.ts @@ -18,6 +18,8 @@ export const enum PlugCategoryHashes { ArmorSkinsWarlockHead = 454950060, ArmorSkinsWarlockLegs = 3281006437, Arrows = 1257608559, + ArtifactBoostsColumn01 = 3904218908, + ArtifactBoostsColumn02 = 3904218911, Barrels = 2833605196, Batteries = 1757026848, Blades = 1041766312, @@ -159,6 +161,9 @@ export const enum PlugCategoryHashes { PlugsMasterworksArmorDefault = 2457930460, PlugsMasterworksWeaponsDefault = 782502718, RandomPerk = 1135709122, + RewardScrollsPermanent = 1210538619, + RewardScrollsRitual = 937336570, + RewardScrollsTemporary = 1694600712, SchismBoonsDestinationModsEfficiency = 3424523197, SchismBoonsDestinationModsInfo = 3096991326, SchismBoonsDestinationModsPlaystyle = 484496731, @@ -797,6 +802,7 @@ export const enum PlugCategoryHashes { V710NewTraceRifle0Skins = 2775050468, V710PursuitScoutRifle0Skins = 657820579, V710WarlockNewHead0Skins = 3579012546, + V720HunterNewArms0Skins = 3330370549, V720NewFusionRifle0Masterwork = 1306261452, V720NewFusionRifle0Skins = 129564502, V720NewGrenadeLauncher0Masterwork = 3535138282, @@ -804,6 +810,8 @@ export const enum PlugCategoryHashes { V720PursuitHandcannon0Skins = 3351746883, V720RepackageAutoRifle0Masterwork = 282796296, V720RepackageAutoRifle0Skins = 3113397682, + V720TitanNewArms0Skins = 2366391651, + V720WarlockNewArms0Skins = 3093470842, V730NewBow0Skins = 3480541086, V730NewSidearm0Masterwork = 4103783549, V730NewSidearm0Skins = 3206497209, @@ -839,6 +847,11 @@ export const enum PlugCategoryHashes { V810NewShotgun0Skins = 2093338915, V810PursuitAutoRifle0Skins = 4116933935, V810RepackageSniperRifle0Skins = 1428267180, + V820NewLinearFusionRifle0Masterwork = 3150802305, + V820NewLinearFusionRifle0Skins = 1322048781, + V820NewPulseRifle0Masterwork = 56525756, + V820NewPulseRifle0Skins = 382969102, + V820PursuitFusionRifle0Skins = 700552526, WarlockArcAspects = 2111409167, WarlockArcClassAbilities = 1308084083, WarlockArcMelee = 1387605624, @@ -1066,6 +1079,7 @@ export const enum ItemCategoryHashes { export const enum SocketCategoryHashes { Abilities_Abilities = 309722977, Abilities_Abilities_Ikora = 3218807805, + ActiveScriptureRewardsRemainingVar1701109840 = 726110240, ArmorCosmetics = 1926152773, ArmorMods = 590099826, ArmorPerks_LargePerk = 3154740035, @@ -1103,9 +1117,11 @@ export const enum SocketCategoryHashes { Reagents = 4289795259, Recipes_Consumable_Container = 3187525214, Recipes_Consumable_UNUSED = 2059652296, + RitualRites = 2638374927, RuneBonus = 879083882, RuneCompatibility = 2316895247, Super = 457473665, + TomeEngravings = 2099616010, Transcendence = 1905270138, VehicleMods_Consumable_Ship = 4265082475, VehicleMods_Consumable_Vehicle = 4243480345, @@ -1169,7 +1185,6 @@ export const enum ProgressionHashes { CompetitiveDivision = 3696598664, CrucibleRank = 2083746873, GambitRank = 3008065600, - GloryRank = 1647151960, StrangeFavor = 527867935, TrialsRank = 2755675426, VanguardRank = 457612306, @@ -1184,6 +1199,7 @@ export const enum TraitHashes { All = 1434215347, Amplified = 3291013836, Blind = 500183315, + BoltCharge = 2935077680, Career = 4263853822, Cure = 3263723277, DarknessBuffs = 1891050213, @@ -1244,6 +1260,7 @@ export const enum TraitHashes { ItemQuestOnramp = 170945933, ItemQuestSeasonalSeason24 = 3904180889, ItemQuestSeasonalSeason25 = 3904180888, + ItemQuestSeasonalSeason26 = 3904180891, ItemShader = 2652561225, ItemShip = 3607584152, ItemSpawnfx = 856705125, diff --git a/src/data/d2/lightcap-to-season.json b/src/data/d2/lightcap-to-season.json index 96f058b082..590cb5478c 100644 --- a/src/data/d2/lightcap-to-season.json +++ b/src/data/d2/lightcap-to-season.json @@ -20,5 +20,6 @@ "1590": 19, "1810": 23, "2000": 24, - "2010": 25 + "2010": 25, + "2020": 26 } diff --git a/src/data/d2/missing-source-info.ts b/src/data/d2/missing-source-info.ts index d57733abb3..6f9d1364c0 100644 --- a/src/data/d2/missing-source-info.ts +++ b/src/data/d2/missing-source-info.ts @@ -932,6 +932,7 @@ const missingSources: { [key: string]: number[] } = { 4229161783, // Boots of Feltroc ], events: [ + 55393445, // The Title 116784191, // Solstice Boots (Renewed) 140842223, // Solstice Mask (Drained) 143299650, // Solstice Plate (Renewed) @@ -1024,9 +1025,11 @@ const missingSources: { [key: string]: number[] } = { 2543971899, // Sublime Mark 2546370410, // Solstice Hood (Majestic) 2578820926, // Solstice Greaves (Majestic) + 2595813005, // Taraxippos 2603335652, // Jurassic Green 2616697701, // Sublime Robes 2618313500, // Solstice Greaves (Drained) + 2666273249, // Hullabaloo 2685001662, // Solstice Gloves (Rekindled) 2696245301, // Solstice Grasps (Scorched) 2720534902, // Solstice Grasps (Drained) @@ -1475,6 +1478,23 @@ const missingSources: { [key: string]: number[] } = { haunted: [ 3864896927, // Nightmare Harvester ], + heresy: [ + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) + 2501377328, // Division (Adept) + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) + 2987244302, // Adamantite + 3054597646, // Abyssal Edge (Adept) + 3840794631, // Psychopomp + 3949253499, // Anamnesis (Adept) + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge + ], ikora: [ 89175653, // Noble Constant Mark 185326970, // Noble Constant Type 2 @@ -1560,6 +1580,7 @@ const missingSources: { [key: string]: number[] } = { 744156528, // Iron Symmachy Mask 770140877, // Iron Will Greaves 808693674, // Iron Symmachy Mark + 829330711, // Peacebond 831464034, // Iron Truage Vest 863444264, // Iron Will Gloves 888872889, // Point of the Stag diff --git a/src/data/d2/objective-richTexts.ts b/src/data/d2/objective-richTexts.ts index db735b63de..69a54e92df 100644 --- a/src/data/d2/objective-richTexts.ts +++ b/src/data/d2/objective-richTexts.ts @@ -7,7 +7,7 @@ const richTextManifestSourceData = { '[Auto Rifle]': ['Objective', 28925697], '[Block]': ['SandboxPerk', 2236497009], '[Boost]': ['SandboxPerk', 3104860955], - '[Bow]': ['Objective', 1213975022], + '[Bow]': ['Objective', 901468309], '[Brake]': ['SandboxPerk', 4189070124], '[Disruption]': ['SandboxPerk', 669536781], '[Fusion Rifle]': ['Objective', 273967510], @@ -19,7 +19,7 @@ const richTextManifestSourceData = { '[Heavy Attack]': ['SandboxPerk', 390604159], '[Insert Medal Here]': ['Objective', 2254471463], '[Light Attack]': ['SandboxPerk', 355406666], - '[Linear Fusion Rifle]': ['Objective', 1878887814], + '[Linear Fusion Rifle]': ['Objective', 1848286660], '[Machine Gun]': ['Objective', 384756495], '[Melee]': ['Objective', 44811435], '[Pulse Rifle]': ['Objective', 189060104], @@ -43,7 +43,7 @@ const richTextManifestSourceData = { '[Stasis]': ['Objective', 270151386], '[Strand]': ['SandboxPerk', 381243875], '[Super]': ['SandboxPerk', 1330059512], - '[Sword]': ['Objective', 298337117], + '[Sword]': ['Objective', 419936834], '[Trace Rifle]': ['Objective', 1047174894], '[Void]': ['Objective', 33657378], '[afflicted|burdened|cursed]': ['SandboxPerk', 2208422697], diff --git a/src/data/d2/pursuits.json b/src/data/d2/pursuits.json index 13d2a7fa23..0007c76110 100644 --- a/src/data/d2/pursuits.json +++ b/src/data/d2/pursuits.json @@ -1778,6 +1778,9 @@ "1880745459": { "Destination": [3607432451] }, + "1885787371": { + "Destination": [677774031] + }, "1891580900": { "ActivityMode": [3789021730], "DamageType": [151347233] @@ -2462,6 +2465,9 @@ "Destination": [1729879943], "KillType": [0] }, + "2710814086": { + "Destination": [677774031] + }, "2719669554": { "ActivityMode": [1673724806], "KillType": [4] @@ -3208,6 +3214,9 @@ "3446274852": { "Destination": [677774031] }, + "3448899821": { + "Destination": [2244580325] + }, "3449625264": { "Destination": [2481646875], "ItemCategory": [5, 12, 7, 3954685534] @@ -3821,6 +3830,9 @@ "4023822046": { "ActivityMode": [1848252830, 3789021730, 1164760504] }, + "4042197035": { + "Destination": [677774031] + }, "4044330008": { "Destination": [1729879943] }, diff --git a/src/data/d2/reduced-cost-mod-mappings.ts b/src/data/d2/reduced-cost-mod-mappings.ts index f4fc7d9ccc..187d6001f0 100644 --- a/src/data/d2/reduced-cost-mod-mappings.ts +++ b/src/data/d2/reduced-cost-mod-mappings.ts @@ -53,6 +53,9 @@ export const normalToReducedMod: { [normalModHash: number]: number } = { '2059068466': 2794359402, '2076329105': 1561736585, '2257238439': 1305848463, + '2297703043': 1456244347, + '2297703046': 810675986, + '2297703047': 846698090, '2311625537': 1533272847, '2319885414': 2283894334, '2407398462': 2305736470, diff --git a/src/data/d2/season-tags.json b/src/data/d2/season-tags.json index e737f59b69..340ad74470 100644 --- a/src/data/d2/season-tags.json +++ b/src/data/d2/season-tags.json @@ -23,5 +23,6 @@ "witch": 22, "wish": 23, "echoes": 24, - "revenant": 25 + "revenant": 25, + "heresy": 26 } diff --git a/src/data/d2/season-to-source.json b/src/data/d2/season-to-source.json index 2e2753cdec..b363342dde 100644 --- a/src/data/d2/season-to-source.json +++ b/src/data/d2/season-to-source.json @@ -21,6 +21,7 @@ "406406003": 14, "409652252": 16, "443340273": 15, + "443793689": 26, "462484651": 14, "464727567": 15, "508245276": 13, @@ -44,6 +45,7 @@ "709680645": 20, "736336644": 4, "745186842": 9, + "745481267": 26, "772619302": 1, "794422188": 22, "817015032": 2, @@ -84,7 +86,6 @@ "1483048674": 5, "1497107113": 10, "1564061133": 9, - "1568732528": 23, "1581680964": 2, "1581731027": 24, "1596507419": 5, @@ -98,16 +99,18 @@ "1745960977": 8, "1751739544": 20, "1763998430": 15, + "1792957897": 26, "1897187034": 22, "1919933822": 11, + "1923289424": 10, "1924238751": 3, "1926923633": 22, + "1943976384": 26, "1992319882": 20, "1995616326": 14, "2011810450": 13, "2039343154": 11, "2050870152": 24, - "2065138144": 14, "2069903130": 22, "2085016678": 5, "2124937714": 22, @@ -135,6 +138,7 @@ "2585665369": 23, "2601524261": 9, "2607739079": 10, + "2607970476": 26, "2622122683": 22, "2648408612": 7, "2658055900": 8, @@ -202,6 +206,7 @@ "3942778906": 22, "3954922099": 16, "4006434081": 20, + "4008954452": 25, "4009509410": 1, "4066007318": 2, "4079816474": 13, diff --git a/src/data/d2/seasonal-challenges.json b/src/data/d2/seasonal-challenges.json index 2c57aee727..3a1fbe9d19 100644 --- a/src/data/d2/seasonal-challenges.json +++ b/src/data/d2/seasonal-challenges.json @@ -1,155 +1,190 @@ { - "71289411": { - "Destination": [3990611421] + "29952089": { + "KillType": [1] }, - "131444230": { - "ActivityMode": [1848252830, 1164760504] + "87592757": { + "ActivityMode": [1848252830] }, - "299141993": { - "ActivityMode": [1848252830, 1164760504], - "ItemCategory": [7, 3954685534, 8] + "142276901": { + "ActivityMode": [1164760504] }, - "326468049": { - "DamageType": [3373582085, 2303181850, 1847026933, 3454344768] + "196132834": { + "DamageType": [3454344768], + "KillType": [1] }, - "327586529": { - "ActivityMode": [3199098480] + "297625245": { + "ItemCategory": [12] }, - "374132521": { - "ItemCategory": [3954685534, 11, 14, 54, 3871742104] + "309512835": { + "ItemCategory": [1504945536] }, - "391171033": { - "ActivityMode": [1673724806] + "349525984": { + "ItemCategory": [5] }, - "466676431": { - "ActivityMode": [1848252830, 1164760504], - "ItemCategory": [153950757, -153950757, 7, 3954685534, 8, 11] + "375551804": { + "DamageType": [3454344768] }, - "525132820": { + "424685224": { "ActivityMode": [1164760504], - "DamageType": [151347233] + "ItemCategory": [153950757, -153950757, 12] }, - "565587006": { - "KillType": [4] + "424685225": { + "ItemCategory": [1504945536] }, - "593712326": { - "ActivityMode": [3789021730] + "424685228": { + "ActivityMode": [1164760504], + "ItemCategory": [3954685534, 14] }, - "648858980": { - "ItemCategory": [11] + "424685230": { + "ItemCategory": [9] }, - "681252641": { - "ActivityMode": [1164760504], - "DamageType": [3454344768] + "424685231": { + "ItemCategory": [5] }, - "689175418": { - "ActivityMode": [1848252830] + "474851391": { + "KillType": [1] }, - "726984365": { - "ItemCategory": [3317538576, 7, 2489664120] + "609219514": { + "ItemCategory": [3871742104] }, - "784486740": { + "682695394": { + "ItemCategory": [5, 9, 6, 12, 3871742104] + }, + "707344100": { + "ActivityMode": [1848252830, 1164760504], + "ItemCategory": [9, 12, 13, 2489664120, 3871742104] + }, + "732746327": { + "ItemCategory": [3954685534] + }, + "885835307": { + "ActivityMode": [1848252830, 1164760504] + }, + "950229912": { + "DamageType": [3949783978], + "KillType": [1] + }, + "1012071133": { "Destination": [1729879943] }, - "795729072": { - "ItemCategory": [11] + "1216874774": { + "ItemCategory": [3317538576, 7, 2489664120] + }, + "1253232085": { + "ItemCategory": [54] }, - "818207360": { - "DamageType": [3373582085] + "1317329571": { + "ActivityMode": [1164760504] }, - "1084325226": { - "DamageType": [2303181850, 1847026933, 3454344768] + "1418960775": { + "ActivityMode": [1826469369] }, - "1178567271": { - "ActivityMode": [1848252830], - "DamageType": [151347233] + "1446317416": { + "Destination": [3990611421] }, - "1273237368": { - "Destination": [2244580325] + "1530454792": { + "ActivityMode": [2394616003] }, - "1360474282": { - "ActivityMode": [1264443021], - "KillType": [1] + "1602505046": { + "ItemCategory": [9] }, - "1583950221": { + "1615717264": { + "ActivityMode": [1673724806] + }, + "1714805295": { "ActivityMode": [1848252830] }, - "1739983839": { + "1983116318": { "ActivityMode": [1848252830, 1164760504] }, - "1866249861": { + "1986147136": { "ItemCategory": [1504945536, 8, 10], "KillType": [4] }, - "1974073778": { - "ActivityMode": [1164760504] + "2003745131": { + "ItemCategory": [153950757, -153950757] }, - "2039987156": { - "ActivityMode": [1848252830, 1164760504] + "2230939374": { + "ActivityMode": [1164760504], + "DamageType": [3949783978] }, - "2136755278": { - "ActivityMode": [1848252830, 1164760504] + "2490790279": { + "ActivityMode": [1848252830] }, - "2236589223": { - "ItemCategory": [5, 9, 6, 12, 3871742104] + "2493792305": { + "DamageType": [151347233, 3949783978] }, - "2358970114": { - "ActivityMode": [3789021730] + "2493792306": { + "DamageType": [2303181850, 3454344768] }, - "2370573000": { - "ActivityMode": [1848252830], - "DamageType": [3454344768] + "2493792307": { + "ItemCategory": [7] }, - "2610239479": { - "ActivityMode": [2394616003] + "2493792308": { + "KillType": [2, 0] }, - "2760090062": { - "ItemCategory": [5] + "2535030075": { + "DamageType": [2303181850, 1847026933, 3454344768] }, - "2767621028": { - "ActivityMode": [1826469369] + "2585065211": { + "ItemCategory": [14] }, - "2832716127": { - "ActivityMode": [1848252830], - "DamageType": [2303181850, 3454344768, 151347233] + "2686329873": { + "ActivityMode": [3789021730] }, - "2957590632": { - "ActivityMode": [1848252830, 1164760504], - "ItemCategory": [153950757, -153950757, 11] + "2732018653": { + "DamageType": [3373582085] }, - "3021327494": { - "ActivityMode": [1848252830] + "2738822732": { + "DamageType": [2303181850, 3454344768, 3949783978], + "KillType": [1] }, - "3022372306": { + "2749397970": { "ActivityMode": [1848252830, 1164760504] }, - "3199758286": { - "ActivityMode": [3789021730] - }, - "3322807746": { - "Destination": [2481646875] + "2900767912": { + "ItemCategory": [3954685534, 11, 14, 54, 3871742104] }, - "3495269099": { - "ActivityMode": [1848252830, 1164760504] + "3110193754": { + "ItemCategory": [3317538576] }, - "3553971483": { - "ActivityMode": [1848252830, 1164760504] + "3193558862": { + "ActivityMode": [1164760504], + "ItemCategory": [9, 1504945536, 12, 13, 2489664120, 3871742104] }, - "3616974542": { + "3323173713": { "ActivityMode": [1848252830], - "DamageType": [2303181850] + "DamageType": [2303181850, 3454344768, 3949783978] }, - "3704731544": { + "3359627294": { "ActivityMode": [1848252830] }, - "4052284348": { - "Destination": [677774031] + "3447440399": { + "ActivityMode": [1848252830] }, - "4097516578": { + "3458436887": { "ActivityMode": [1848252830, 1164760504] }, - "4154038609": { + "3671329613": { + "ActivityMode": [3789021730] + }, + "3842565475": { + "ActivityMode": [3789021730] + }, + "3895182853": { + "ActivityMode": [1848252830] + }, + "3942444261": { + "Destination": [2481646875] + }, + "4131843971": { + "ItemCategory": [9] + }, + "4171557214": { "ActivityMode": [1164760504], "DamageType": [2303181850] + }, + "4257455019": { + "ActivityMode": [1848252830, 1164760504] } } diff --git a/src/data/d2/seasons.json b/src/data/d2/seasons.json index 43f0f1f3d5..ed6b9e7210 100644 --- a/src/data/d2/seasons.json +++ b/src/data/d2/seasons.json @@ -3,13 +3,13 @@ "7665310": 10, "9762701": 9, "10656656": 10, - "15534633": 25, "16277432": 1, "16277433": 1, "16638392": 24, "16638393": 24, "18179099": 19, "18743640": 25, + "25524335": 23, "29194593": 3, "31953744": 1, "31953746": 1, @@ -33,6 +33,7 @@ "54004491": 22, "54004492": 22, "54004495": 22, + "55393445": 26, "55826751": 9, "56435118": 24, "60802325": 7, @@ -67,6 +68,7 @@ "107607117": 24, "116784191": 7, "116918307": 12, + "117772190": 26, "125438212": 3, "127603177": 22, "128069444": 25, @@ -84,7 +86,9 @@ "143299650": 7, "145178484": 19, "146081606": 24, + "146236550": 26, "146910655": 23, + "147902881": 26, "147998763": 11, "153144587": 7, "156845152": 13, @@ -106,6 +110,7 @@ "177463495": 22, "177568179": 22, "178451227": 3, + "178757083": 26, "179202986": 3, "179654396": 24, "180108390": 4, @@ -118,6 +123,7 @@ "197822824": 8, "204059183": 11, "204918711": 1, + "211863483": 23, "213377779": 16, "213458862": 10, "214374661": 16, @@ -159,6 +165,7 @@ "260425472": 21, "260521462": 1, "261109332": 25, + "261232972": 26, "261886690": 11, "261886691": 11, "263371512": 2, @@ -175,6 +182,7 @@ "268035671": 20, "269052681": 11, "269339124": 2, + "269369740": 26, "273622970": 25, "278759146": 25, "279289257": 2, @@ -185,6 +193,7 @@ "286098606": 6, "286098607": 6, "289811733": 24, + "292230141": 26, "292778444": 1, "293622383": 12, "294129361": 16, @@ -200,6 +209,7 @@ "313685909": 2, "313685910": 2, "313685911": 2, + "314979874": 26, "317350029": 24, "317465074": 2, "317465075": 2, @@ -286,9 +296,11 @@ "393225356": 11, "396134792": 3, "400177089": 3, + "400623726": 26, "403465735": 7, "405115754": 1, "406674479": 23, + "407316269": 26, "410537200": 25, "411709610": 13, "412299646": 1, @@ -310,12 +322,15 @@ "433582103": 11, "436665408": 6, "437421244": 5, + "443010739": 26, "444202817": 14, "446299266": 8, "450844637": 7, "452400791": 3, "454583975": 1, + "455112322": 26, "456874738": 15, + "458642113": 26, "461171930": 1, "461727014": 24, "462395043": 20, @@ -369,6 +384,8 @@ "538867171": 22, "540603119": 4, "540653483": 3, + "540791504": 26, + "540791505": 26, "542198399": 18, "544464884": 25, "544720811": 10, @@ -389,6 +406,7 @@ "574433875": 17, "574694085": 7, "574790717": 7, + "574898816": 26, "576069028": 24, "577345565": 7, "581237363": 4, @@ -437,6 +455,8 @@ "646486611": 1, "650418244": 20, "655712834": 23, + "656200176": 26, + "657927352": 23, "659359923": 16, "659709387": 24, "664042851": 1, @@ -459,19 +479,23 @@ "690228054": 5, "691819782": 24, "691914261": 2, + "693901806": 26, "700322568": 1, "700322570": 1, "702981643": 2, "707118595": 15, + "707997638": 26, "710694221": 23, "712123915": 11, "712356937": 25, "713403449": 3, + "716099381": 26, "717767855": 21, "718136887": 1, "721146704": 3, "721740036": 23, "722346046": 25, + "723006641": 26, "724583642": 23, "736859723": 25, "738873646": 3, @@ -530,12 +554,14 @@ "814933120": 1, "817283478": 23, "818240646": 15, + "819060970": 26, "819191764": 4, "819191765": 4, "819191767": 4, "819232495": 16, "826128643": 19, "830497630": 3, + "830789013": 26, "834178986": 7, "837509459": 3, "838156448": 13, @@ -650,6 +676,8 @@ "971525087": 25, "971728596": 6, "971728597": 6, + "980366272": 26, + "980366275": 26, "980898608": 3, "980898609": 3, "980898610": 3, @@ -674,6 +702,7 @@ "1018190408": 9, "1020589069": 14, "1021165796": 6, + "1021443313": 26, "1021939294": 4, "1021939295": 4, "1024894484": 5, @@ -716,6 +745,7 @@ "1056992393": 6, "1057119308": 3, "1059304051": 4, + "1059396450": 26, "1061186327": 1, "1065911138": 10, "1067975722": 25, @@ -731,6 +761,7 @@ "1082407266": 5, "1083938223": 22, "1084954603": 21, + "1085403133": 26, "1089851988": 2, "1089851989": 2, "1091411796": 15, @@ -754,6 +785,7 @@ "1127128759": 10, "1131244817": 4, "1134447515": 16, + "1135392623": 26, "1135933726": 1, "1136270294": 23, "1137289077": 1, @@ -766,6 +798,7 @@ "1147673598": 20, "1147673599": 20, "1150304053": 12, + "1151530908": 26, "1152762705": 8, "1153991042": 24, "1153991043": 24, @@ -822,6 +855,7 @@ "1249334869": 12, "1250597597": 24, "1256660988": 8, + "1257250409": 26, "1257952519": 24, "1259278657": 3, "1260041928": 21, @@ -868,6 +902,7 @@ "1288683596": 7, "1289590866": 13, "1289622079": 20, + "1289637143": 26, "1290784012": 2, "1291068165": 3, "1291068170": 3, @@ -926,6 +961,8 @@ "1364413233": 5, "1365413546": 2, "1365491398": 7, + "1367348576": 26, + "1367348577": 26, "1370302135": 8, "1370974707": 2, "1372428179": 22, @@ -949,7 +986,7 @@ "1405321765": 21, "1410465636": 23, "1412999460": 18, - "1420354279": 25, + "1420928384": 26, "1422712818": 1, "1423305584": 2, "1423305585": 2, @@ -969,13 +1006,14 @@ "1431165322": 2, "1434789110": 25, "1440616900": 11, - "1443744070": 25, "1444655707": 1, "1448808637": 7, "1449701838": 1, "1450633717": 3, "1451091657": 4, + "1453761528": 26, "1454610995": 7, + "1456070807": 26, "1458722318": 23, "1459837414": 25, "1460790368": 25, @@ -984,7 +1022,6 @@ "1460790371": 25, "1460790372": 25, "1460790373": 25, - "1464191693": 25, "1465090512": 23, "1465090513": 23, "1465090515": 23, @@ -1032,6 +1069,7 @@ "1511744862": 23, "1511744863": 23, "1512491423": 22, + "1513642710": 26, "1514358116": 16, "1515861434": 6, "1517831918": 10, @@ -1049,6 +1087,7 @@ "1525328247": 25, "1527687869": 16, "1529650477": 11, + "1530312316": 26, "1531478589": 4, "1533012008": 1, "1533101114": 3, @@ -1061,12 +1100,15 @@ "1542058938": 25, "1545181237": 22, "1548056407": 7, + "1550197750": 26, "1552044323": 3, "1553202889": 14, + "1554459526": 26, "1554631969": 16, "1554631970": 16, "1554631971": 16, "1555316216": 7, + "1555733772": 26, "1556831535": 6, "1559478790": 22, "1560678953": 3, @@ -1135,9 +1177,14 @@ "1641589303": 25, "1644922223": 24, "1645521766": 12, + "1648817610": 26, "1649663920": 16, "1649929380": 3, "1651275175": 7, + "1652641560": 26, + "1652641561": 26, + "1652641563": 26, + "1653703252": 26, "1654077219": 20, "1654447548": 25, "1656278203": 8, @@ -1155,6 +1202,7 @@ "1661191198": 7, "1661191199": 7, "1662439581": 1, + "1664436452": 26, "1665551138": 9, "1666450988": 24, "1667376042": 2, @@ -1164,6 +1212,7 @@ "1674525506": 9, "1676252281": 23, "1676763078": 18, + "1681808329": 26, "1682610034": 25, "1682610035": 25, "1682610040": 25, @@ -1198,6 +1247,7 @@ "1714370698": 8, "1715842350": 8, "1715842351": 13, + "1719391718": 26, "1720894545": 3, "1721185806": 4, "1721185807": 4, @@ -1208,6 +1258,8 @@ "1724152705": 1, "1724152706": 1, "1729424352": 18, + "1731825007": 26, + "1735710919": 26, "1736897074": 9, "1736897077": 9, "1736897080": 9, @@ -1215,7 +1267,6 @@ "1739076285": 19, "1743191871": 22, "1745945065": 24, - "1748148571": 23, "1748608556": 19, "1750365155": 3, "1750913471": 25, @@ -1236,7 +1287,6 @@ "1770862260": 14, "1770862261": 14, "1773000505": 18, - "1773501680": 25, "1775707016": 7, "1776174698": 18, "1776174699": 18, @@ -1374,6 +1424,8 @@ "1902452687": 3, "1903259976": 11, "1905328541": 21, + "1907110519": 26, + "1908170679": 26, "1909657913": 5, "1911078836": 23, "1912033561": 25, @@ -1395,7 +1447,6 @@ "1918663081": 16, "1922808508": 16, "1923236933": 5, - "1923665010": 25, "1923817547": 8, "1926033630": 15, "1929361006": 25, @@ -1451,7 +1502,6 @@ "1954221115": 1, "1956273477": 2, "1958368075": 25, - "1959452212": 23, "1959648454": 1, "1961918267": 16, "1963292995": 25, @@ -1478,7 +1528,6 @@ "1981116089": 24, "1981661519": 12, "1983275378": 15, - "1983519830": 10, "1983519834": 10, "1983519837": 10, "1984190529": 2, @@ -1503,7 +1552,6 @@ "2000448433": 19, "2001563200": 10, "2005133865": 14, - "2006002391": 25, "2010554576": 1, "2010554578": 1, "2010554579": 1, @@ -1512,6 +1560,7 @@ "2013981053": 21, "2014411539": 1, "2015081171": 22, + "2015457838": 26, "2016937064": 3, "2021434466": 14, "2021594588": 15, @@ -1523,12 +1572,12 @@ "2026109719": 19, "2027583053": 25, "2029506313": 1, + "2029899814": 26, "2032131120": 3, "2035035510": 14, "2035035511": 14, "2038017661": 1, "2039333456": 7, - "2039712238": 25, "2047844848": 3, "2047844849": 3, "2048663470": 25, @@ -1548,11 +1597,13 @@ "2079349511": 24, "2079505484": 3, "2079505485": 3, + "2082825117": 26, "2083094901": 25, "2085536058": 24, "2087171913": 23, "2087899461": 3, "2088834049": 23, + "2090061023": 26, "2093762600": 1, "2094466368": 23, "2094466369": 23, @@ -1593,8 +1644,8 @@ "2133500862": 4, "2133500863": 4, "2134318165": 2, - "2135702615": 25, "2138467220": 24, + "2139224789": 26, "2140049750": 16, "2142666850": 25, "2142666851": 25, @@ -1612,6 +1663,8 @@ "2156531500": 22, "2156817213": 7, "2158080418": 23, + "2158247744": 26, + "2159113266": 26, "2160858284": 22, "2161024815": 2, "2162261876": 3, @@ -1636,6 +1689,7 @@ "2179902689": 15, "2182316188": 11, "2182330181": 3, + "2182765913": 26, "2184423372": 24, "2185547877": 25, "2185878931": 24, @@ -1686,10 +1740,12 @@ "2260280759": 10, "2260326783": 17, "2261046232": 15, + "2261367995": 26, "2263885190": 5, "2265583879": 9, "2266083651": 24, "2266517764": 3, + "2268509068": 26, "2268947984": 25, "2273494378": 22, "2276139500": 2, @@ -1699,6 +1755,7 @@ "2277536120": 4, "2277536122": 4, "2277536123": 4, + "2281501155": 26, "2285636663": 4, "2286474983": 22, "2287277682": 3, @@ -1708,6 +1765,7 @@ "2294119165": 1, "2295924648": 25, "2297249368": 15, + "2297479091": 26, "2298896088": 3, "2298896090": 3, "2298896091": 3, @@ -1754,6 +1812,7 @@ "2355278664": 22, "2355278665": 22, "2359582409": 12, + "2363985761": 26, "2367025562": 10, "2367860679": 23, "2376081322": 2, @@ -1775,6 +1834,12 @@ "2408788216": 21, "2409711982": 8, "2410421545": 16, + "2412961016": 26, + "2412961017": 26, + "2412961019": 26, + "2412961020": 26, + "2412961022": 26, + "2412961023": 26, "2414564781": 5, "2418053814": 1, "2418147569": 18, @@ -1801,6 +1866,7 @@ "2449623004": 10, "2450544934": 16, "2453351420": 16, + "2453921511": 26, "2459768632": 6, "2461358088": 1, "2462805782": 25, @@ -1822,9 +1888,11 @@ "2477028154": 6, "2477980485": 25, "2479583473": 25, + "2483701864": 26, "2484637936": 1, "2484637938": 1, "2484637939": 1, + "2484811305": 26, "2489453969": 24, "2492590623": 14, "2492769187": 3, @@ -1835,6 +1903,8 @@ "2505678740": 25, "2505678742": 25, "2505678743": 25, + "2510169794": 14, + "2510169795": 14, "2510169803": 14, "2510169805": 14, "2517318050": 3, @@ -1908,6 +1978,8 @@ "2588647362": 12, "2591111628": 14, "2593080269": 2, + "2595813005": 26, + "2596146975": 26, "2596801138": 9, "2598986457": 25, "2598986458": 25, @@ -1923,6 +1995,7 @@ "2607476205": 2, "2607476206": 2, "2607476207": 2, + "2607703203": 26, "2611348487": 23, "2615178429": 25, "2616697701": 24, @@ -1961,6 +2034,7 @@ "2664485243": 2, "2665176422": 6, "2665176423": 6, + "2666273249": 26, "2669452287": 22, "2671075344": 13, "2671982863": 3, @@ -1994,6 +2068,7 @@ "2717540198": 6, "2717540199": 6, "2720534902": 7, + "2720753042": 23, "2721442832": 23, "2721442833": 23, "2721442834": 23, @@ -2129,6 +2204,7 @@ "2854370169": 8, "2858342979": 5, "2859470126": 25, + "2865550327": 26, "2868525732": 6, "2868525736": 6, "2868525737": 6, @@ -2162,6 +2238,8 @@ "2891490654": 5, "2891979647": 4, "2892092373": 15, + "2894282039": 23, + "2896897122": 26, "2897206615": 22, "2899925137": 8, "2906201304": 23, @@ -2177,7 +2255,9 @@ "2919938481": 3, "2922275939": 10, "2922902263": 3, + "2923764557": 26, "2924095235": 3, + "2924129690": 26, "2924794318": 11, "2925817709": 3, "2926662833": 1, @@ -2248,14 +2328,25 @@ "2967332123": 11, "2969036437": 25, "2971194471": 14, + "2974160011": 26, "2975041411": 12, "2976357066": 21, "2978337238": 1, "2978747767": 3, + "2979324128": 26, + "2979324129": 26, + "2979324130": 26, "2979324131": 25, + "2979324132": 26, + "2979324133": 26, + "2979324134": 26, + "2979324135": 26, + "2979324138": 26, + "2979324139": 26, "2984888631": 15, "2985926430": 25, "2985926431": 25, + "2987334573": 26, "2988472426": 14, "2988472427": 14, "2989132488": 3, @@ -2285,6 +2376,7 @@ "3012879309": 24, "3012879310": 25, "3012879311": 24, + "3013191049": 26, "3013363601": 4, "3015197581": 3, "3018673173": 25, @@ -2296,6 +2388,7 @@ "3037589442": 22, "3039687635": 7, "3041136324": 1, + "3042607214": 26, "3044160466": 13, "3044482290": 25, "3051813095": 23, @@ -2304,15 +2397,29 @@ "3054638345": 3, "3055452222": 8, "3055626993": 23, + "3056926997": 26, "3057124503": 20, "3058007494": 19, "3060237106": 16, + "3063212160": 26, + "3063212161": 26, + "3063212162": 26, + "3063212163": 26, + "3063212164": 26, + "3063212165": 26, + "3063212166": 26, + "3063212167": 26, + "3063212170": 26, "3063212171": 25, "3065586312": 23, + "3066987345": 26, "3074755706": 16, "3077367255": 3, "3081047495": 8, "3082233610": 15, + "3085024168": 26, + "3085024169": 26, + "3085024171": 26, "3087166452": 18, "3088135833": 16, "3090681042": 25, @@ -2329,7 +2436,6 @@ "3105935002": 1, "3105953706": 2, "3105953707": 2, - "3106070506": 23, "3106736926": 25, "3110827848": 8, "3110986887": 21, @@ -2365,6 +2471,7 @@ "3123639228": 6, "3129418034": 1, "3130164381": 23, + "3131849739": 26, "3134905452": 1, "3136100690": 7, "3136552544": 5, @@ -2387,6 +2494,7 @@ "3159160837": 24, "3159710857": 20, "3160643158": 25, + "3161483583": 26, "3161524490": 2, "3163467796": 1, "3164464144": 25, @@ -2399,10 +2507,11 @@ "3168164098": 2, "3168934826": 24, "3168997075": 18, - "3171327109": 25, "3171649853": 2, "3175295830": 25, + "3175859009": 26, "3177119978": 2, + "3179652816": 26, "3179985807": 22, "3181241728": 25, "3181241729": 25, @@ -2467,6 +2576,7 @@ "3206190066": 23, "3207888297": 25, "3210200403": 25, + "3212065485": 26, "3212701863": 23, "3213186692": 25, "3214073080": 23, @@ -2497,6 +2607,7 @@ "3230867320": 4, "3230867321": 4, "3230867322": 4, + "3231433786": 26, "3232831379": 24, "3233781546": 17, "3234030313": 19, @@ -2527,6 +2638,7 @@ "3257710283": 9, "3258345482": 1, "3260482534": 2, + "3262398212": 26, "3264152240": 15, "3264577426": 23, "3264577427": 23, @@ -2608,6 +2720,8 @@ "3345862920": 3, "3345862921": 3, "3346875528": 23, + "3348194379": 26, + "3349747415": 26, "3351378128": 1, "3351378129": 1, "3351378130": 1, @@ -2675,10 +2789,10 @@ "3450065540": 1, "3450065541": 1, "3450065543": 1, + "3450902429": 26, "3451625162": 2, "3452825266": 9, "3455566107": 2, - "3458982631": 25, "3459379565": 13, "3466276695": 25, "3469344438": 21, @@ -2701,6 +2815,7 @@ "3493861055": 20, "3494199208": 2, "3499472512": 15, + "3500034511": 26, "3505911855": 25, "3507133960": 15, "3507818312": 3, @@ -2720,7 +2835,6 @@ "3526273117": 25, "3526595120": 22, "3527716502": 23, - "3531677275": 25, "3531985793": 8, "3536420626": 2, "3537745894": 8, @@ -2760,8 +2874,8 @@ "3594836183": 25, "3595878960": 23, "3596008431": 21, - "3597180064": 25, "3599111900": 14, + "3599131206": 26, "3599356244": 22, "3603558141": 19, "3605230072": 1, @@ -2779,9 +2893,7 @@ "3605490922": 8, "3605490923": 8, "3605848320": 25, - "3606661184": 25, "3607928024": 13, - "3610131410": 25, "3611487543": 3, "3612246790": 25, "3612254098": 14, @@ -2845,6 +2957,7 @@ "3655823807": 8, "3656394176": 11, "3656766039": 12, + "3659025146": 26, "3664536990": 14, "3665398231": 20, "3665594271": 4, @@ -2861,14 +2974,17 @@ "3690574071": 13, "3692806198": 7, "3696163951": 22, + "3708661256": 26, "3717471208": 3, "3717471209": 3, "3719164773": 2, + "3720087872": 23, "3721195043": 11, "3725942064": 24, "3727205096": 8, "3727346032": 15, "3727346033": 15, + "3728527334": 26, "3729709035": 2, "3730248014": 8, "3735037521": 7, @@ -2887,7 +3003,6 @@ "3744631007": 22, "3746956458": 19, "3748622249": 3, - "3749428427": 25, "3750893516": 19, "3752071760": 15, "3752071761": 15, @@ -2899,7 +3014,7 @@ "3752071767": 15, "3752071770": 15, "3752517619": 19, - "3753232378": 25, + "3752630563": 26, "3754910498": 2, "3755201983": 8, "3756389242": 1, @@ -2944,6 +3059,7 @@ "3830186047": 1, "3831031876": 16, "3835954362": 3, + "3839852673": 26, "3840083172": 3, "3844528610": 22, "3844703409": 7, @@ -2956,6 +3072,16 @@ "3853033161": 24, "3853033162": 24, "3853033163": 24, + "3854478320": 26, + "3854478321": 26, + "3854478328": 26, + "3854478329": 26, + "3854478330": 26, + "3854478331": 26, + "3854478332": 26, + "3854478333": 26, + "3854478334": 26, + "3854478335": 26, "3857100891": 9, "3859483818": 3, "3859483819": 3, @@ -2965,6 +3091,15 @@ "3869795067": 25, "3871226707": 22, "3871252980": 4, + "3871255906": 26, + "3871255907": 26, + "3871255912": 26, + "3871255913": 26, + "3871255914": 26, + "3871255916": 26, + "3871255917": 26, + "3871255918": 26, + "3871255919": 26, "3872116425": 1, "3872337571": 18, "3874217662": 2, @@ -3002,10 +3137,16 @@ "3903070398": 12, "3903070399": 12, "3903548288": 1, + "3904811184": 26, + "3904811185": 26, + "3904811186": 26, + "3904811187": 26, + "3904811189": 26, "3908760309": 3, "3910216754": 23, "3911008533": 14, "3911560897": 23, + "3912505557": 26, "3915764593": 16, "3915764594": 16, "3915764595": 16, @@ -3031,6 +3172,7 @@ "3929403535": 3, "3932439362": 5, "3932814032": 7, + "3932962120": 26, "3936625536": 13, "3936625537": 13, "3936625538": 13, @@ -3091,7 +3233,7 @@ "3970180847": 14, "3970398144": 3, "3970398145": 3, - "3970823221": 23, + "3974075603": 26, "3977496457": 25, "3978281650": 4, "3978281651": 4, @@ -3120,7 +3262,13 @@ "3988299563": 25, "3989967656": 25, "3990400405": 5, + "3992231371": 26, + "3992231372": 26, + "3992231374": 26, + "3992231375": 26, "4000300344": 25, + "4004720050": 23, + "4004720051": 23, "4006192308": 1, "4006192310": 1, "4006192311": 1, @@ -3139,6 +3287,7 @@ "4012977685": 14, "4015003047": 25, "4018523064": 23, + "4019038402": 26, "4025934129": 20, "4026515849": 5, "4029022121": 16, @@ -3158,6 +3307,7 @@ "4048021830": 25, "4048186065": 3, "4048242887": 20, + "4048947954": 26, "4049365947": 1, "4049753919": 23, "4050450481": 7, @@ -3169,6 +3319,7 @@ "4062073334": 23, "4072587059": 1, "4075522049": 6, + "4076827687": 26, "4078226397": 8, "4082425930": 24, "4085986809": 4, @@ -3327,8 +3478,8 @@ "4224972855": 4, "4229237079": 8, "4231293639": 11, - "4233800814": 25, "4236468733": 3, + "4236505649": 26, "4237817816": 25, "4240221838": 16, "4242592192": 1, @@ -3351,6 +3502,7 @@ "4264364347": 15, "4264494593": 11, "4266295281": 23, + "4266438808": 26, "4269600130": 21, "4272367383": 3, "4275472608": 20, diff --git a/src/data/d2/seasons_backup.json b/src/data/d2/seasons_backup.json index 59305cc1fc..2781ae997d 100644 --- a/src/data/d2/seasons_backup.json +++ b/src/data/d2/seasons_backup.json @@ -1,8 +1,8 @@ { - "15534633": 25, "25524335": 23, "40494562": 25, "52039562": 14, + "55393445": 26, "56435118": 24, "58945355": 17, "61740554": 22, @@ -16,6 +16,7 @@ "109666087": 3, "115961378": 23, "116784191": 7, + "117772190": 26, "123124985": 4, "128330886": 4, "130305507": 14, @@ -29,6 +30,7 @@ "140297755": 19, "140842223": 7, "143299650": 7, + "147902881": 26, "153144587": 7, "156518114": 6, "156845152": 13, @@ -132,6 +134,7 @@ "396910433": 19, "401345492": 3, "406674479": 23, + "407316269": 26, "412048979": 23, "413901114": 22, "418753772": 15, @@ -175,6 +178,8 @@ "537041732": 20, "539189884": 7, "540653483": 3, + "540791504": 26, + "540791505": 26, "545021994": 3, "550583155": 3, "558697641": 11, @@ -210,9 +215,11 @@ "689294985": 25, "691245913": 24, "692234472": 7, + "693901806": 26, "700322568": 1, "700322570": 1, "704309987": 19, + "707997638": 26, "721146704": 3, "721740036": 23, "724152384": 7, @@ -248,6 +255,7 @@ "826128643": 19, "829700536": 7, "830497630": 3, + "830789013": 26, "852817810": 25, "855351524": 5, "855351525": 5, @@ -307,6 +315,7 @@ "1052553862": 2, "1052553863": 2, "1056992393": 6, + "1059396450": 26, "1064497718": 23, "1068450901": 17, "1084954603": 21, @@ -354,6 +363,7 @@ "1241704260": 7, "1250597597": 24, "1253607903": 7, + "1257250409": 26, "1260041928": 21, "1266122672": 9, "1266122673": 9, @@ -369,6 +379,7 @@ "1286837122": 19, "1287851098": 5, "1288683596": 7, + "1289637143": 26, "1290784012": 2, "1292425061": 14, "1296106843": 23, @@ -385,6 +396,7 @@ "1317763555": 18, "1319537766": 14, "1319537767": 14, + "1330390301": 26, "1334842411": 2, "1341471164": 3, "1359567721": 7, @@ -403,7 +415,6 @@ "1406812800": 23, "1409670916": 19, "1412999460": 18, - "1420354279": 25, "1423305584": 2, "1423305585": 2, "1423305586": 2, @@ -417,11 +428,9 @@ "1430140002": 9, "1430140003": 9, "1437735332": 7, - "1443744070": 25, "1450633717": 3, "1454610995": 7, "1460885752": 3, - "1464191693": 25, "1468313766": 23, "1473368760": 4, "1473368761": 4, @@ -462,6 +471,7 @@ "1545181237": 22, "1548056407": 7, "1549308050": 7, + "1555733772": 26, "1556831535": 6, "1559478790": 22, "1561249470": 6, @@ -486,6 +496,9 @@ "1644922223": 24, "1649929380": 3, "1651275175": 7, + "1652641560": 26, + "1652641561": 26, + "1652641563": 26, "1658124146": 24, "1660362255": 7, "1683482799": 7, @@ -501,19 +514,20 @@ "1706874193": 6, "1710284674": 23, "1712065759": 23, + "1719391718": 26, "1721185806": 4, "1721185807": 4, "1724587366": 7, + "1731825007": 26, + "1735710919": 26, "1739076284": 19, "1739076285": 19, "1743191871": 22, - "1748148571": 23, "1752648948": 24, "1752862708": 23, "1767312242": 5, "1770862260": 14, "1770862261": 14, - "1773501680": 25, "1775707016": 7, "1776174698": 18, "1776174699": 18, @@ -556,7 +570,6 @@ "1914989540": 6, "1914989541": 6, "1918109014": 23, - "1923665010": 25, "1926033630": 15, "1926693852": 6, "1930161380": 21, @@ -566,7 +579,6 @@ "1947358241": 22, "1950868849": 23, "1956273477": 2, - "1959452212": 23, "1963513388": 23, "1963513389": 23, "1963513391": 23, @@ -576,19 +588,18 @@ "1997760146": 19, "1997760147": 19, "2005189570": 7, - "2006002391": 25, "2009106091": 5, "2013981053": 21, "2021594588": 15, "2021594589": 15, "2021594590": 15, "2022821262": 17, + "2029899814": 26, "2030596705": 3, "2032170279": 25, "2035035510": 14, "2035035511": 14, "2035692489": 7, - "2039712238": 25, "2040680321": 14, "2046798468": 3, "2056606165": 22, @@ -614,7 +625,6 @@ "2120905920": 6, "2127474099": 7, "2132252935": 20, - "2135702615": 25, "2138467220": 24, "2144864388": 25, "2147433548": 3, @@ -626,6 +636,7 @@ "2155928170": 3, "2156817213": 7, "2158678429": 3, + "2159113266": 26, "2160858284": 22, "2163610255": 7, "2168550540": 5, @@ -669,6 +680,7 @@ "2277536120": 4, "2277536122": 4, "2277536123": 4, + "2281501155": 26, "2283141005": 23, "2287277682": 3, "2291082292": 7, @@ -715,6 +727,7 @@ "2477028154": 6, "2477980485": 25, "2479769639": 11, + "2484811305": 26, "2489453969": 24, "2492769187": 3, "2504122740": 23, @@ -743,6 +756,7 @@ "2590810641": 23, "2591111628": 14, "2593080269": 2, + "2595813005": 26, "2603335652": 18, "2604511609": 23, "2616697701": 24, @@ -758,6 +772,7 @@ "2661272172": 2, "2661272173": 2, "2661326387": 7, + "2666273249": 26, "2680976411": 23, "2682876126": 25, "2683352144": 17, @@ -847,6 +862,7 @@ "2891490654": 5, "2892092373": 15, "2894282039": 23, + "2896897122": 26, "2897466191": 3, "2900154861": 7, "2906201304": 23, @@ -883,6 +899,7 @@ "3004379087": 14, "3007479950": 23, "3007586538": 3, + "3013191049": 26, "3015197581": 3, "3018673173": 25, "3039687635": 7, @@ -893,6 +910,9 @@ "3078552186": 15, "3082058813": 19, "3084686800": 7, + "3085024168": 26, + "3085024169": 26, + "3085024171": 26, "3087039277": 4, "3101012909": 23, "3101330395": 3, @@ -900,7 +920,6 @@ "3104384024": 3, "3105953706": 2, "3105953707": 2, - "3106070506": 23, "3110986887": 21, "3114383490": 23, "3114383491": 23, @@ -915,6 +934,7 @@ "3116258568": 14, "3116258570": 14, "3116258571": 14, + "3131849739": 26, "3140833552": 2, "3140833553": 2, "3140833554": 2, @@ -930,9 +950,10 @@ "3159052337": 7, "3159160837": 24, "3160643158": 25, + "3161483583": 26, "3161524490": 2, "3168934826": 24, - "3171327109": 25, + "3175859009": 26, "3177119978": 2, "3179985807": 22, "3186325460": 5, @@ -1055,8 +1076,8 @@ "3444687693": 3, "3446862222": 13, "3446862223": 13, + "3450902429": 26, "3455566107": 2, - "3458982631": 25, "3469344438": 21, "3469344439": 21, "3475074928": 3, @@ -1074,7 +1095,6 @@ "3522144647": 25, "3525545299": 3, "3526595120": 22, - "3531677275": 25, "3538363663": 14, "3542826854": 15, "3547113102": 15, @@ -1091,10 +1111,7 @@ "3594165338": 25, "3594165339": 25, "3596008431": 21, - "3597180064": 25, "3599356244": 22, - "3606661184": 25, - "3610131410": 25, "3611487543": 3, "3613939175": 7, "3618063085": 23, @@ -1130,8 +1147,6 @@ "3738044006": 6, "3744631007": 22, "3748622249": 3, - "3749428427": 25, - "3753232378": 25, "3755201983": 8, "3769043228": 22, "3782991997": 25, @@ -1181,7 +1196,6 @@ "3967067356": 17, "3968560442": 7, "3970040886": 24, - "3970823221": 23, "3971839985": 7, "3981634627": 9, "3983534173": 21, @@ -1192,6 +1206,7 @@ "4012977684": 14, "4012977685": 14, "4018727386": 4, + "4019038402": 26, "4019596374": 5, "4019596375": 9, "4027251027": 7, @@ -1203,6 +1218,7 @@ "4062073334": 23, "4070155602": 25, "4075522049": 6, + "4076827687": 26, "4082180156": 23, "4082425930": 24, "4087530286": 8, @@ -1248,7 +1264,6 @@ "4222561358": 19, "4224972854": 4, "4224972855": 4, - "4233800814": 25, "4242735326": 7, "4243004391": 3, "4245469491": 3, @@ -1258,6 +1273,7 @@ "4251951862": 5, "4251951863": 5, "4253857367": 21, + "4266438808": 26, "4272367383": 3, "4280200672": 11, "4282498224": 7, diff --git a/src/data/d2/source-info-v2.ts b/src/data/d2/source-info-v2.ts index a8ec9a6f90..37ebe6ab3c 100644 --- a/src/data/d2/source-info-v2.ts +++ b/src/data/d2/source-info-v2.ts @@ -179,6 +179,7 @@ const D2Sources: { 3532642391, // Source: Forsaken Campaign 3704442923, // Source: Curse of Osiris Campaign 3936473457, // Requires Warlock Class + 4008954452, // Requires Shaped or Enhanced Weapon 4288102251, // Requires 1,000 Titan Kills 4290499613, // Source: Complete the campaign as a Hunter. ], @@ -237,6 +238,7 @@ const D2Sources: { 874623537, // Cataphract GL3 (Adept) 906840740, // Unwavering Duty 1141586039, // Unexpected Resurgence (Adept) + 1201528146, // Exalted Truth (Adept) 1230660649, // Victory's Wreath 1292594730, // The Summoner (Adept) 1321626661, // Eye of Sol (Adept) @@ -246,6 +248,7 @@ const D2Sources: { 1705843397, // Exalted Truth (Adept) 1711056134, // Incisor 1820994983, // The Summoner + 1893967086, // Keen Thistle 1968410628, // The Prophet 1973107014, // Igneous Hammer 2022294213, // Shayura's Wrath @@ -273,7 +276,9 @@ const D2Sources: { 3165143747, // Whistler's Whim 3193598749, // The Immortal (Adept) 3332125295, // Aisha's Care (Adept) + 3436626079, // Exalted Truth 3444632029, // Unwavering Duty (Adept) + 3503560035, // Keen Thistle (Adept) 3624844116, // Unwavering Duty 3920882229, // Exalted Truth (Adept) 3928440584, // Crucible Carmine @@ -370,6 +375,7 @@ const D2Sources: { 3288974535, // Source: "Ghosts of the Deep" Dungeon ], itemHashes: [ + 32287609, // Boondoggle Mk. 55 185321778, // The Eternal Return 814876684, // Wish-Ender 2844014413, // Pallas Galliot @@ -422,6 +428,7 @@ const D2Sources: { }, events: { itemHashes: [ + 55393445, // The Title 425681240, // Acosmic 495940989, // Avalanche 601948197, // Zephyr @@ -431,8 +438,11 @@ const D2Sources: { 1280894514, // Mechabre 1845372864, // Albedo Wing 1845978721, // Avalanche + 2029899814, // Keraunios 2477980485, // Mechabre + 2595813005, // Taraxippos 2603335652, // Jurassic Green + 2666273249, // Hullabaloo 2812100428, // Stay Frosty 2814093983, // Cold Front 2869466318, // BrayTech Werewolf @@ -454,6 +464,7 @@ const D2Sources: { 923678151, // Source: Upgraded Event Card Reward 1054169368, // Source: Festival of the Lost 2021 1225476079, // Source: Moments of Triumph 2022 + 1232863328, // Source: Moments of Triumph 2024 1360005982, // Completed a Moment of Triumph in Destiny's second year. 1397119901, // Completed a Moment of Triumph in Destiny's first year. 1416471099, // Source: Moments of Triumph 2023 @@ -627,6 +638,12 @@ const D2Sources: { ], enteredDCV: 20, }, + heresy: { + sourceHashes: [ + 1341921330, // Source: Episode: Heresy Activities + 3507911332, // Source: Episode: Heresy + ], + }, ikora: { sourceHashes: [ 3075817319, // Source: Earn rank-up packages from Ikora Rey. @@ -678,6 +695,7 @@ const D2Sources: { 1448664467, // Iron Gold 1661191199, // Grizzled Wolf 1764868900, // Riiswalker + 1968711238, // Warlord's Spear 1987234560, // Iron Ruby 1999697514, // The Wizened Rebuke 2189073092, // Lethal Abundance @@ -697,6 +715,28 @@ const D2Sources: { ], }, kingsfall: { + itemHashes: [ + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) + 1834313033, // Afterlight + 2501377328, // Division (Adept) + 2671849376, // Refusal of the Call + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) + 2987244302, // Adamantite + 2992463569, // Division + 3054597646, // Abyssal Edge (Adept) + 3417731926, // Anamnesis + 3840794631, // Psychopomp + 3877448149, // Mirror Imago + 3949253499, // Anamnesis (Adept) + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge + ], sourceHashes: [ 160129377, // Source: "King's Fall" Raid ], @@ -864,7 +904,9 @@ const D2Sources: { 2322926844, // Shadow Price 2450917538, // Uzume RR4 2591257541, // Scintillation + 2697143634, // Lotus-Eater (Adept) 2759590322, // THE SWARM + 2876244791, // The Palindrome 2883684343, // Hung Jury SR4 (Adept) 2889501828, // The Slammer 2914913838, // Loaded Question (Adept) @@ -879,8 +921,10 @@ const D2Sources: { 3686538757, // Undercurrent 3832743906, // Hung Jury SR4 3915197957, // Wendigo GL3 (Adept) + 3922217119, // Lotus-Eater 3997086838, // Rake Angle (Adept) 4074251943, // Hung Jury SR4 (Adept) + 4077588826, // The Palindrome (Adept) 4162642204, // The Militia's Birthright (Adept) ], sourceHashes: [ @@ -1054,19 +1098,39 @@ const D2Sources: { 70083888, // Nation of Beasts 424291879, // Age-Old Bond 501329015, // Chattering Bone + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) 947448544, // Shadow of Earth Shell 1661191193, // Crown of Sorrow + 1834313033, // Afterlight 1851777734, // Apex Predator 2027598066, // Imperial Opulence 2027598067, // Imperial Dress + 2501377328, // Division (Adept) 2557722678, // Midnight Smith + 2671849376, // Refusal of the Call + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) 2884596447, // The Supremacy + 2987244302, // Adamantite + 2992463569, // Division + 3054597646, // Abyssal Edge (Adept) 3388655311, // Tyranny of Heaven + 3417731926, // Anamnesis 3580904580, // Legend of Acrius 3591141932, // Techeun Force 3668669364, // Dreaming Spectrum + 3840794631, // Psychopomp + 3877448149, // Mirror Imago 3885259140, // Transfiguration + 3949253499, // Anamnesis (Adept) 4103414242, // Divinity + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge ], }, rasputin: { @@ -1232,6 +1296,9 @@ const D2Sources: { enteredDCV: 20, }, spireofthewatcher: { + itemHashes: [ + 32287609, // Boondoggle Mk. 55 + ], sourceHashes: [ 1597738585, // Source: "Spire of the Watcher" Dungeon ], @@ -1266,6 +1333,7 @@ const D2Sources: { 2788911997, // Vanguard Divide 2788911998, // Vanguard Metallic 2788911999, // Vanguard Veteran + 2876244791, // The Palindrome 2889501828, // The Slammer 2932922810, // Pre Astyanax IV 3001205424, // Ecliptic Distaff @@ -1276,6 +1344,7 @@ const D2Sources: { 3667553455, // BrayTech Osprey 3686538757, // Undercurrent 3832743906, // Hung Jury SR4 + 3922217119, // Lotus-Eater 4060882458, // Balistraria Wrap (Ornament) ], sourceHashes: [ diff --git a/src/data/d2/source-info.ts b/src/data/d2/source-info.ts index acd011d76b..cab1765074 100644 --- a/src/data/d2/source-info.ts +++ b/src/data/d2/source-info.ts @@ -224,6 +224,7 @@ const D2Sources: { 3532642391, // Source: Forsaken Campaign 3704442923, // Source: Curse of Osiris Campaign 3936473457, // Requires Warlock Class + 4008954452, // Requires Shaped or Enhanced Weapon 4288102251, // Requires 1,000 Titan Kills 4290499613, // Source: Complete the campaign as a Hunter. ], @@ -318,6 +319,7 @@ const D2Sources: { 874623537, // Cataphract GL3 (Adept) 906840740, // Unwavering Duty 1141586039, // Unexpected Resurgence (Adept) + 1201528146, // Exalted Truth (Adept) 1230660649, // Victory's Wreath 1292594730, // The Summoner (Adept) 1321626661, // Eye of Sol (Adept) @@ -327,6 +329,7 @@ const D2Sources: { 1705843397, // Exalted Truth (Adept) 1711056134, // Incisor 1820994983, // The Summoner + 1893967086, // Keen Thistle 1968410628, // The Prophet 1973107014, // Igneous Hammer 2022294213, // Shayura's Wrath @@ -354,7 +357,9 @@ const D2Sources: { 3165143747, // Whistler's Whim 3193598749, // The Immortal (Adept) 3332125295, // Aisha's Care (Adept) + 3436626079, // Exalted Truth 3444632029, // Unwavering Duty (Adept) + 3503560035, // Keen Thistle (Adept) 3624844116, // Unwavering Duty 3920882229, // Exalted Truth (Adept) 3928440584, // Crucible Carmine @@ -731,6 +736,7 @@ const D2Sources: { }, dungeon: { itemHashes: [ + 32287609, // Boondoggle Mk. 55 185321778, // The Eternal Return 814876684, // Wish-Ender 2844014413, // Pallas Galliot @@ -810,6 +816,7 @@ const D2Sources: { }, events: { itemHashes: [ + 55393445, // The Title 425681240, // Acosmic 495940989, // Avalanche 601948197, // Zephyr @@ -819,8 +826,11 @@ const D2Sources: { 1280894514, // Mechabre 1845372864, // Albedo Wing 1845978721, // Avalanche + 2029899814, // Keraunios 2477980485, // Mechabre + 2595813005, // Taraxippos 2603335652, // Jurassic Green + 2666273249, // Hullabaloo 2812100428, // Stay Frosty 2814093983, // Cold Front 2869466318, // BrayTech Werewolf @@ -842,6 +852,7 @@ const D2Sources: { 923678151, // Source: Upgraded Event Card Reward 1054169368, // Source: Festival of the Lost 2021 1225476079, // Source: Moments of Triumph 2022 + 1232863328, // Source: Moments of Triumph 2024 1360005982, // Completed a Moment of Triumph in Destiny's second year. 1397119901, // Completed a Moment of Triumph in Destiny's first year. 1416471099, // Source: Moments of Triumph 2023 @@ -1053,6 +1064,14 @@ const D2Sources: { ], searchString: [], }, + heresy: { + itemHashes: [], + sourceHashes: [ + 1341921330, // Source: Episode: Heresy Activities + 3507911332, // Source: Episode: Heresy + ], + searchString: [], + }, ikora: { itemHashes: [], sourceHashes: [ @@ -1107,6 +1126,7 @@ const D2Sources: { 1448664467, // Iron Gold 1661191199, // Grizzled Wolf 1764868900, // Riiswalker + 1968711238, // Warlord's Spear 1987234560, // Iron Ruby 1999697514, // The Wizened Rebuke 2189073092, // Lethal Abundance @@ -1150,14 +1170,56 @@ const D2Sources: { searchString: [], }, kf: { - itemHashes: [], + itemHashes: [ + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) + 1834313033, // Afterlight + 2501377328, // Division (Adept) + 2671849376, // Refusal of the Call + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) + 2987244302, // Adamantite + 2992463569, // Division + 3054597646, // Abyssal Edge (Adept) + 3417731926, // Anamnesis + 3840794631, // Psychopomp + 3877448149, // Mirror Imago + 3949253499, // Anamnesis (Adept) + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge + ], sourceHashes: [ 160129377, // Source: "King's Fall" Raid ], searchString: [], }, kingsfall: { - itemHashes: [], + itemHashes: [ + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) + 1834313033, // Afterlight + 2501377328, // Division (Adept) + 2671849376, // Refusal of the Call + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) + 2987244302, // Adamantite + 2992463569, // Division + 3054597646, // Abyssal Edge (Adept) + 3417731926, // Anamnesis + 3840794631, // Psychopomp + 3877448149, // Mirror Imago + 3949253499, // Anamnesis (Adept) + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge + ], sourceHashes: [ 160129377, // Source: "King's Fall" Raid ], @@ -1372,7 +1434,9 @@ const D2Sources: { 2322926844, // Shadow Price 2450917538, // Uzume RR4 2591257541, // Scintillation + 2697143634, // Lotus-Eater (Adept) 2759590322, // THE SWARM + 2876244791, // The Palindrome 2883684343, // Hung Jury SR4 (Adept) 2889501828, // The Slammer 2914913838, // Loaded Question (Adept) @@ -1387,8 +1451,10 @@ const D2Sources: { 3686538757, // Undercurrent 3832743906, // Hung Jury SR4 3915197957, // Wendigo GL3 (Adept) + 3922217119, // Lotus-Eater 3997086838, // Rake Angle (Adept) 4074251943, // Hung Jury SR4 (Adept) + 4077588826, // The Palindrome (Adept) 4162642204, // The Militia's Birthright (Adept) ], sourceHashes: [ @@ -1545,19 +1611,39 @@ const D2Sources: { 70083888, // Nation of Beasts 424291879, // Age-Old Bond 501329015, // Chattering Bone + 601574723, // Adamantite (Adept) + 615373993, // Eyes Unveiled + 704410186, // Psychopomp (Adept) + 768610585, // Watchful Eye + 861521336, // Afterlight (Adept) 947448544, // Shadow of Earth Shell 1661191193, // Crown of Sorrow + 1834313033, // Afterlight 1851777734, // Apex Predator 2027598066, // Imperial Opulence 2027598067, // Imperial Dress + 2501377328, // Division (Adept) 2557722678, // Midnight Smith + 2671849376, // Refusal of the Call + 2755584425, // Refusal of the Call (Adept) + 2856225832, // Watchful Eye (Adept) 2884596447, // The Supremacy + 2987244302, // Adamantite + 2992463569, // Division + 3054597646, // Abyssal Edge (Adept) 3388655311, // Tyranny of Heaven + 3417731926, // Anamnesis 3580904580, // Legend of Acrius 3591141932, // Techeun Force 3668669364, // Dreaming Spectrum + 3840794631, // Psychopomp + 3877448149, // Mirror Imago 3885259140, // Transfiguration + 3949253499, // Anamnesis (Adept) 4103414242, // Divinity + 4116546788, // Mirror Imago (Adept) + 4173311704, // Eyes Unveiled (Adept) + 4221591387, // Abyssal Edge ], sourceHashes: [ 160129377, // Source: "King's Fall" Raid @@ -1773,6 +1859,7 @@ const D2Sources: { 874623537, // Cataphract GL3 (Adept) 906840740, // Unwavering Duty 1141586039, // Unexpected Resurgence (Adept) + 1201528146, // Exalted Truth (Adept) 1230660649, // Victory's Wreath 1292594730, // The Summoner (Adept) 1321626661, // Eye of Sol (Adept) @@ -1782,6 +1869,7 @@ const D2Sources: { 1705843397, // Exalted Truth (Adept) 1711056134, // Incisor 1820994983, // The Summoner + 1893967086, // Keen Thistle 1968410628, // The Prophet 1973107014, // Igneous Hammer 2022294213, // Shayura's Wrath @@ -1809,7 +1897,9 @@ const D2Sources: { 3165143747, // Whistler's Whim 3193598749, // The Immortal (Adept) 3332125295, // Aisha's Care (Adept) + 3436626079, // Exalted Truth 3444632029, // Unwavering Duty (Adept) + 3503560035, // Keen Thistle (Adept) 3624844116, // Unwavering Duty 3920882229, // Exalted Truth (Adept) 3928440584, // Crucible Carmine @@ -1894,7 +1984,9 @@ const D2Sources: { searchString: [], }, sotw: { - itemHashes: [], + itemHashes: [ + 32287609, // Boondoggle Mk. 55 + ], sourceHashes: [ 1597738585, // Source: "Spire of the Watcher" Dungeon ], @@ -1909,7 +2001,9 @@ const D2Sources: { searchString: [], }, spireofthewatcher: { - itemHashes: [], + itemHashes: [ + 32287609, // Boondoggle Mk. 55 + ], sourceHashes: [ 1597738585, // Source: "Spire of the Watcher" Dungeon ], @@ -1944,6 +2038,7 @@ const D2Sources: { 2788911997, // Vanguard Divide 2788911998, // Vanguard Metallic 2788911999, // Vanguard Veteran + 2876244791, // The Palindrome 2889501828, // The Slammer 2932922810, // Pre Astyanax IV 3001205424, // Ecliptic Distaff @@ -1954,6 +2049,7 @@ const D2Sources: { 3667553455, // BrayTech Osprey 3686538757, // Undercurrent 3832743906, // Hung Jury SR4 + 3922217119, // Lotus-Eater 4060882458, // Balistraria Wrap (Ornament) ], sourceHashes: [ @@ -2197,7 +2293,9 @@ const D2Sources: { searchString: [], }, watcher: { - itemHashes: [], + itemHashes: [ + 32287609, // Boondoggle Mk. 55 + ], sourceHashes: [ 1597738585, // Source: "Spire of the Watcher" Dungeon ], @@ -2270,6 +2368,7 @@ const D2Sources: { 2788911997, // Vanguard Divide 2788911998, // Vanguard Metallic 2788911999, // Vanguard Veteran + 2876244791, // The Palindrome 2889501828, // The Slammer 2932922810, // Pre Astyanax IV 3001205424, // Ecliptic Distaff @@ -2280,6 +2379,7 @@ const D2Sources: { 3667553455, // BrayTech Osprey 3686538757, // Undercurrent 3832743906, // Hung Jury SR4 + 3922217119, // Lotus-Eater 4060882458, // Balistraria Wrap (Ornament) ], sourceHashes: [ diff --git a/src/data/d2/source-to-season-v2.json b/src/data/d2/source-to-season-v2.json index 07e6c321b4..65e9b2d410 100644 --- a/src/data/d2/source-to-season-v2.json +++ b/src/data/d2/source-to-season-v2.json @@ -20,6 +20,7 @@ "406406003": 14, "409652252": 16, "443340273": 15, + "443793689": 26, "462484651": 14, "464727567": 15, "508245276": 13, @@ -43,6 +44,7 @@ "709680645": 20, "736336644": 4, "745186842": 9, + "745481267": 26, "772619302": 1, "794422188": 22, "817015032": 2, @@ -83,7 +85,6 @@ "1483048674": 5, "1497107113": 10, "1564061133": 9, - "1568732528": 23, "1581680964": 2, "1581731027": 24, "1596507419": 5, @@ -97,16 +98,18 @@ "1745960977": 8, "1751739544": 20, "1763998430": 15, + "1792957897": 26, "1897187034": 22, "1919933822": 11, + "1923289424": 10, "1924238751": 3, "1926923633": 22, + "1943976384": 26, "1992319882": 20, "1995616326": 14, "2011810450": 13, "2039343154": 11, "2050870152": 24, - "2065138144": 14, "2069903130": 22, "2085016678": 5, "2124937714": 22, @@ -134,6 +137,7 @@ "2585665369": 23, "2601524261": 9, "2607739079": 10, + "2607970476": 26, "2622122683": 22, "2648408612": 7, "2658055900": 8, @@ -201,6 +205,7 @@ "3942778906": 22, "3954922099": 16, "4006434081": 20, + "4008954452": 25, "4009509410": 1, "4066007318": 2, "4079816474": 13, diff --git a/src/data/d2/sources.json b/src/data/d2/sources.json index d6cc1b4421..fbee239fd2 100644 --- a/src/data/d2/sources.json +++ b/src/data/d2/sources.json @@ -37,6 +37,7 @@ "412991783": "Source: Strikes", "439994003": "Source: Complete the \"Master Smith\" Triumph.", "443340273": "Source: Xûr's Treasure Hoard in Eternity", + "443793689": "Source: Win games on a completed Lighthouse Passage after earning a weekly win streak of five or higher.", "450719423": "Source: Season of the Risen", "454115234": "Source: Associated Crucible Quest", "454251931": "Source: \"What Remains\" Exotic Quest", @@ -77,6 +78,7 @@ "709680645": "Source: \"Truly Satisfactory\" Triumph", "736336644": "Source: \"A Spark of Hope\" Quest", "745186842": "Source: Associated Crucible Quest", + "745481267": "Source: Intrinsic Iteration Triumph", "752988954": "Source: Flawless Chest in Trials of Osiris", "772619302": "Completed all 8 Moments of Triumph in Destiny's second year.", "783399508": "Source: Adventure \"Supply and Demand\" in the European Dead Zone", @@ -127,8 +129,10 @@ "1186140085": "Source: Adventure \"Unbreakable\" on Nessus", "1216155659": "Source: Complete the \"Season 8: First Watch\" quest.", "1217831333": "Source: Associated Crucible Quest", + "1218637862": "Source: Open the Lighthouse chest after earning a weekly win streak of five or higher.", "1223492644": "Source: Complete the \"Reconnaissance by Fire\" quest.", "1225476079": "Source: Moments of Triumph 2022", + "1232863328": "Source: Moments of Triumph 2024", "1244908294": "Source: Complete the \"Loaded Question\" quest from Zavala.", "1253026984": "Source: Among the lost Ghosts of the Moon.", "1266018974": "A collection of memories made real by the Traveler's Light.", @@ -142,6 +146,7 @@ "1302157812": "Source: Wild Card Exotic Quest", "1309588429": "Source: \"Chief Investigator\" Triumph", "1312894505": "Source: Iron Banner", + "1341921330": "Source: Episode: Heresy Activities", "1358645302": "Source: Unlocked by a special offer.", "1360005982": "Completed a Moment of Triumph in Destiny's second year.", "1373504223": "Acquired from completing a Season of Opulence Triumph.", @@ -202,6 +207,7 @@ "1763998430": "Source: Season Pass", "1771326504": "Source: Complete activities and earn rank-up packages on the Tangled Shore.", "1788267693": "Source: Earn rank-up packages from Banshee-44.", + "1792957897": "Source: \"Efficient Challenger\" Triumph", "1823766625": "Source: \"Vox Obscura\" Exotic Quest", "1828622510": "Source: Chance to acquire when you win Iron Banner matches.", "1832642406": "Source: World Quest \"Dynasty\" on Io.", @@ -213,8 +219,10 @@ "1902517582": "Source: Where's Archie?", "1906492169": "Source: Complete activities and earn rank-up packages on Nessus.", "1919933822": "Source: Festival of the Lost 2020", + "1923289424": "Source: Open the Lighthouse chest.", "1924238751": "Source: Complete Nightfall strike \"Will of the Thousands.\"", "1926923633": "Source: Lord Saladin Rank Up Reputation", + "1943976384": "A tonic receptacle of Eliksni make, traditionally crafted for high-ranking officials. \n\nGiven to you by Eido of House Light in honor of your role as Slayer Baron.", "1952675042": "Source: Complete Gambit Prime matches and increase your rank.", "1957611613": "Source: An Exotic quest or challenge.", "1992319882": "Source: Grandmaster Nightfalls", @@ -285,6 +293,7 @@ "2585665369": "A foreboding staff bearing engravings of Hive runes and bound with mystical charms.", "2601524261": "Source: Associated Gambit Quest", "2607739079": "Source: A Matter of Time", + "2607970476": "Source: Sundered Doctrine", "2622122683": "Source: Lord Shaxx Rank Up Reputation", "2627087475": "Source: Obelisk Bounties and Resonance Rank Increases Across the System", "2631398023": "Source: Radiolite Bay Deposits", @@ -317,6 +326,7 @@ "2851783112": "Source: Complete Nightfall strike \"Lake of Shadows.\"", "2856954949": "Source: \"Let Loose Thy Talons\" Exotic Quest", "2857787138": "Source: Trials of Osiris", + "2869564842": "Source: \"Vengeful Knife\" Triumph", "2882367429": "Source: Eververse\nComplete the \"Vault of Glass\" raid to unlock this in Eververse.", "2883838366": "Source: Complete the \"Breakneck\" quest from the Drifter.", "2892963218": "Source: Earned while leveling.", @@ -369,8 +379,10 @@ "3288974535": "Source: \"Ghosts of the Deep\" Dungeon", "3299964501": "Source: Earn Ranks in Vanguard, Crucible, or Gambit Playlists", "3308438907": "Source: Season of Plunder", + "3310034131": "Source: \"Crossed Blades\" Triumph", "3334812276": "Source: Open Legendary engrams and earn faction rank-up packages.", "3348906688": "Source: Ranks in Vanguard Strikes, Crucible, or Gambit", + "3358334503": "Source: \"Boon Ghost Mod Collector\" Triumph", "3359853911": "Source: Wellspring Boss Zeerik, Lightflayer", "3388021959": "Source: Guardian Games", "3389857033": "Earn Crucible Engrams during Season 3 to unlock and equip this ornament.", @@ -389,6 +401,7 @@ "3482766024": "Source: Festival of the Lost 2024", "3492941398": "Source: \"The Lie\" Quest", "3494247523": "Source: Complete the \"Season 8: Keepin' On\" quest.", + "3507911332": "Source: Episode: Heresy", "3512613235": "Source: \"A Sacred Fusion\" Quest", "3522070610": "Source: Gambit", "3528789901": "Source: Season of the Chosen Nightfall Grandmaster", @@ -427,6 +440,7 @@ "3964663093": "Source: Rare drop from high-scoring Nightfall strikes on Mercury.", "3965815470": "Source: Higher Difficulty Empire Hunts", "4006434081": "Source: Terminal Overload", + "4008954452": "Requires Shaped or Enhanced Weapon", "4009509410": "Source: Complete challenges in the Leviathan raid.", "4011186136": "Exotic Armor Focusing", "4036739795": "Source: Bright Engrams", diff --git a/src/data/d2/trait-definition-ids.json b/src/data/d2/trait-definition-ids.json index ea71e05067..93595a987a 100644 --- a/src/data/d2/trait-definition-ids.json +++ b/src/data/d2/trait-definition-ids.json @@ -73,6 +73,7 @@ "2891203715": "item.weapon.fusion_rifle", "2893978702": "item.engram", "2908763903": "item.quest.annual.v460", + "2935077680": "keywords.buffs.arc.static_charge", "2944045106": "activities.black_armory", "2951764300": "faction.crucible", "2968599152": "keywords.debuffs.stasis.freeze", @@ -112,6 +113,7 @@ "3828004164": "item.ornament.weapon", "3904180888": "item.quest.seasonal.season25", "3904180889": "item.quest.seasonal.season24", + "3904180891": "item.quest.seasonal.season26", "3906525419": "item.currency", "3925016055": "item.weapon.rocket_launcher", "3977049418": "item.vehicle", diff --git a/src/data/d2/trait-to-enhanced-trait.json b/src/data/d2/trait-to-enhanced-trait.json index 4480b7e783..04dfaed68f 100644 --- a/src/data/d2/trait-to-enhanced-trait.json +++ b/src/data/d2/trait-to-enhanced-trait.json @@ -26,6 +26,7 @@ "671806388": 595108252, "684456054": 2785334058, "691659142": 536173722, + "692399809": 4070834277, "699525795": 3719974635, "706527188": 1961144892, "744594675": 2139363611, @@ -37,10 +38,12 @@ "951095735": 3878366039, "957782887": 4116820839, "960810156": 1077019636, + "960997401": 3244229373, "968510818": 424370782, "972757866": 1685378950, "1015611457": 2923251173, "1048183818": 3431277734, + "1089671869": 496047945, "1119449540": 561986700, "1126264488": 2476672792, "1134488199": 2904194311, @@ -57,6 +60,7 @@ "1428297954": 2014892510, "1439600632": 2282937672, "1451849462": 4175584682, + "1464081238": 2813913866, "1523832109": 461595545, "1546637391": 3418165135, "1556840489": 3442762221, @@ -141,6 +145,7 @@ "3194351027": 2275087323, "3201496230": 1545231802, "3215448563": 3299896859, + "3218042543": 2633604463, "3300816228": 3528046508, "3324494224": 2562668800, "3350417888": 1537607344, @@ -163,8 +168,10 @@ "3700496672": 2840833776, "3705817207": 1646437399, "3708227201": 781192741, + "3713215006": 3555252274, "3722653512": 2898218424, "3751912585": 331667533, + "3773585912": 2817677128, "3800201097": 3674673997, "3824105627": 1183436451, "3828510309": 1771736209, @@ -182,6 +189,7 @@ "4082225868": 1161469972, "4104185692": 3007133316, "4152709778": 3609952942, + "4198902903": 222783511, "4252909580": 706172244, "4274614370": 4274613598, "4293542123": 2675184851 diff --git a/src/data/d2/universal-ornament-aux-sets.json b/src/data/d2/universal-ornament-aux-sets.json index 3a46dbdc8d..1e79fd4221 100644 --- a/src/data/d2/universal-ornament-aux-sets.json +++ b/src/data/d2/universal-ornament-aux-sets.json @@ -1,64 +1,16 @@ { "0": { - "aux-0": [ - 880861204, - 2067155809, - 141761093, - 3663467820, - 744142366 - ], - "aux-1": [ - 2166685180, - 2984466361, - 1514122509, - 1816178788, - 1169613062 - ] + "aux-0": [], + "aux-1": [] }, "1": { - "aux-0": [ - 389344040, - 2044322464, - 1731215697, - 971580893, - 1024752258 - ], - "aux-1": [ - 1961861544, - 2261200416, - 3303733201, - 1188458845, - 2597269762 - ], - "aux-2": [ - 476513004, - 1540650548, - 2013981053, - 2750411529, - 1122245142 - ], - "aux-3": [ - 3154193408, - 3987309016, - 3053891303, - 259522459, - 2339497078 - ] + "aux-0": [], + "aux-1": [], + "aux-2": [], + "aux-3": [] }, "2": { - "aux-0": [ - 3128930155, - 889513448, - 3670132590, - 2422973919, - 236847737 - ], - "aux-1": [ - 1634414641, - 2214399070, - 1016461220, - 3997262569, - 1018337679 - ] + "aux-0": [], + "aux-1": [] } } diff --git a/src/data/d2/voice-dim-valid-perks.json b/src/data/d2/voice-dim-valid-perks.json index ee3faa0791..bf7cd8a4d0 100644 --- a/src/data/d2/voice-dim-valid-perks.json +++ b/src/data/d2/voice-dim-valid-perks.json @@ -41,6 +41,7 @@ "Apollonic Tangent", "Appended Mag", "Aquila SS4", + "Arc Alignment", "Arc Conductor", "Arc Traps", "Archer's Gambit", @@ -192,11 +193,13 @@ "Deep Stone Crypt Armor", "Delayed Gratification", "Demolitionist", + "Demoralize", "Depths of Duskfield", "Desperado", "Desperate Measures", "Desperation", "Destabilizing Rounds", + "Detonator Beam", "Devil Scope D2", "Devouring Rift", "Disaster Plan", @@ -231,6 +234,7 @@ "Edge of Intent", "Eido's Apprentice", "Elemental Capacitor", + "Elemental Honing", "Embers of Light", "En Garde", "Encore", @@ -463,6 +467,7 @@ "Mecha Holster", "Mechanized Autoloader", "Meganeura", + "Melee Momentum", "Memento Mori", "Meyrin RDL", "Meyrin RDS", @@ -513,11 +518,18 @@ "Outlaw", "Overcharge Capacitor", "Overflow", + "Overflowing Corruption", "Overflowing Light", "Pace Yourself", "Pack Hunter", + "Panic Response", + "Panic Response II", + "Panic Response III", + "Panic Response IV", + "Panic Response V", "Paracausal Affinity", "Paracausal Beam", + "Paracausal Fluid", "Paracausal Imbuement", "Paracausal Pellets", "Paracausal Shot", @@ -534,6 +546,7 @@ "Perpetual Motion", "Perpetual Motion Enhanced", "Personal Assistant", + "Phase Converter", "Phase Magazine", "Photoinhibition", "Physic", @@ -584,8 +597,10 @@ "Reaper +1", "Reaper +2", "Reaper +3", + "Reciprocity", "Recombination", "Reconstruction", + "Recycled Energy", "Red Dot 2 MOA", "Red Dot Micro", "Red Dot-OAS", @@ -629,7 +644,10 @@ "Roast 'Em", "Rocket Tracers", "Rocket-Assisted Frame", + "Rolling Storm", "Roving Assassin", + "Ruinscribe's Beacon", + "Ruinscribe's Forge", "Runneth Over", "SC Holo", "SD Thermal", @@ -752,6 +770,7 @@ "Spread Shot Package", "Spring-Loaded Mounting", "Starless Night", + "Starlight Beam", "Stats for All", "Steady Hands", "Steady Rounds", @@ -790,11 +809,15 @@ "Tactic SAS", "Tactical Battery", "Tactical Mag", + "Taken Ambition", + "Taken Divergence", "Taken Predator", + "Taken Resolution", "Tap the Trigger", "Target Acquired", "Target Lock", "Target SAS", + "Tear", "Tempest Cascade", "Temporal Unlimiter", "Tesseract", @@ -826,6 +849,7 @@ "Time-Slip", "Timed Payload", "Timeless Mythoclast", + "Timelost Magazine", "Tireless Blade", "Tithing Harvest", "To Excess", @@ -898,6 +922,7 @@ "White Nail III", "White Nail IV", "Wild Card", + "Willing Vessel", "Winged Eclipse", "Wire Rifle", "Wish-Dragon Teeth", diff --git a/src/data/d2/watermark-to-season.json b/src/data/d2/watermark-to-season.json index b7143e875b..62ec38c290 100644 --- a/src/data/d2/watermark-to-season.json +++ b/src/data/d2/watermark-to-season.json @@ -50,5 +50,6 @@ "/common/destiny2_content/icons/0337ec21962f67c7c493fedb447c4a9b.png": 24, "/common/destiny2_content/icons/e3ea0bd2e889b605614276876667759c.png": 24, "/common/destiny2_content/icons/ecc0f87f0676df6c7fdd06bff5d2825c.png": 24, - "/common/destiny2_content/icons/5586f6a4193e34acc035209b5e9204d8.png": 25 + "/common/destiny2_content/icons/5586f6a4193e34acc035209b5e9204d8.png": 25, + "/common/destiny2_content/icons/428c962c15612ea89693349d1b84531a.png": 26 }