-
- {traits[Number(traitHash)].displayProperties.name}
+
+ {trait.displayProperties.name}
{metrics.map((metric) => (
diff --git a/src/app/records/presentation-nodes.ts b/src/app/records/presentation-nodes.ts
index c8cbf10151..1d684d5fc9 100644
--- a/src/app/records/presentation-nodes.ts
+++ b/src/app/records/presentation-nodes.ts
@@ -27,7 +27,9 @@ import {
DestinyRecordDefinition,
DestinyRecordState,
DestinyScope,
+ DestinyTraitDefinition,
} from 'bungie-api-ts/destiny2';
+import { TraitHashes } from 'data/d2/generated-enums';
import { minBy } from 'es-toolkit';
import { unlockedItemsForCharacterOrProfilePlugSet } from './plugset-helpers';
@@ -609,6 +611,14 @@ export function getCollectibleState(
: profileResponse.profileCollectibles?.data?.collectibles[collectibleDef.hash]?.state;
}
+export function getMetricTimeScope(
+ defs: D2ManifestDefinitions,
+ metric: DestinyMetricDefinition,
+): DestinyTraitDefinition {
+ const traitHash = metric.traitHashes.find((h) => h !== TraitHashes.All);
+ return defs.Trait.get(traitHash ?? TraitHashes.All);
+}
+
function getMetricComponent(
metricDef: DestinyMetricDefinition,
profileResponse: DestinyProfileResponse,
diff --git a/src/data/d2/missing-source-info.ts b/src/data/d2/missing-source-info.ts
index 00678667ac..307482c6d4 100644
--- a/src/data/d2/missing-source-info.ts
+++ b/src/data/d2/missing-source-info.ts
@@ -2478,6 +2478,7 @@ const missingSources: { [key: string]: number[] } = {
2369496221, // Plate of Nohr
2480074702, // Forbearance
2513313400, // Insigne Shade Gloves
+ 2527555418, // Spoils of Conquest
2530113265, // Bulletsmith's Ire Plate
2537874394, // Boots of Sekris
2550116544, // Robes of the Great Hunt
diff --git a/src/data/d2/pursuits.json b/src/data/d2/pursuits.json
index 2a9fcf2c94..ec14b0a486 100644
--- a/src/data/d2/pursuits.json
+++ b/src/data/d2/pursuits.json
@@ -137,6 +137,9 @@
"147797594": {
"Destination": [697502628]
},
+ "156208848": {
+ "Destination": [677774031]
+ },
"169598011": {
"ActivityMode": [1848252830, 3789021730, 1164760504]
},
@@ -161,6 +164,9 @@
"170247375": {
"ActivityMode": [3789021730]
},
+ "172986435": {
+ "Destination": [677774031]
+ },
"179306417": {
"ItemCategory": [13]
},
@@ -172,6 +178,10 @@
"186303403": {
"Destination": [1729879943]
},
+ "189764150": {
+ "ActivityMode": [1848252830],
+ "Destination": [677774031]
+ },
"193645204": {
"ActivityMode": [1848252830],
"DamageType": [1847026933, 3454344768],
@@ -471,10 +481,16 @@
"459676116": {
"ActivityMode": [1848252830]
},
+ "459825958": {
+ "Destination": [3607432451]
+ },
"463685197": {
"Destination": [1729879943],
"ItemCategory": [11]
},
+ "480260823": {
+ "Destination": [677774031]
+ },
"484414765": {
"Destination": [2481646875]
},
@@ -485,6 +501,9 @@
"Destination": [3607432451],
"KillType": [4]
},
+ "488960532": {
+ "Destination": [677774031]
+ },
"489973662": {
"ItemCategory": [2489664120]
},
@@ -893,6 +912,10 @@
"973983256": {
"Destination": [1416096592]
},
+ "981036864": {
+ "ActivityMode": [332181804],
+ "Destination": [677774031]
+ },
"999548402": {
"Destination": [1729879943]
},
@@ -920,6 +943,9 @@
"1013534599": {
"Destination": [1729879943]
},
+ "1014592166": {
+ "Destination": [677774031]
+ },
"1019699039": {
"ItemCategory": [153950757]
},
@@ -933,6 +959,9 @@
"1025057518": {
"Destination": [677774031]
},
+ "1031369753": {
+ "Destination": [677774031]
+ },
"1041451527": {
"Destination": [3607432451]
},
@@ -1213,6 +1242,9 @@
"1246673684": {
"ActivityMode": [608898761]
},
+ "1251758727": {
+ "ActivityMode": [608898761]
+ },
"1257909267": {
"Destination": [677774031]
},
@@ -1223,6 +1255,9 @@
"ActivityMode": [1686739444],
"Destination": [677774031]
},
+ "1268536442": {
+ "Destination": [677774031]
+ },
"1272199270": {
"ItemCategory": [3317538576],
"KillType": [4]
@@ -1242,6 +1277,9 @@
"1272807303": {
"KillType": [0]
},
+ "1285314029": {
+ "Destination": [677774031]
+ },
"1285862604": {
"Destination": [677774031]
},
@@ -1958,7 +1996,7 @@
"Destination": [3990611421]
},
"2190858661": {
- "ActivityMode": [1164760504, 3199098480]
+ "ActivityMode": [1164760504]
},
"2192699203": {
"Destination": [1416096592]
@@ -2023,6 +2061,10 @@
"2235063232": {
"Destination": [3607432451]
},
+ "2238201420": {
+ "ActivityMode": [1848252830, 1164760504],
+ "ItemCategory": [6]
+ },
"2240389561": {
"Destination": [3607432451]
},
@@ -2042,6 +2084,9 @@
"2285406418": {
"ItemCategory": [3317538576]
},
+ "2288534277": {
+ "Destination": [677774031]
+ },
"2289410285": {
"Destination": [697502628]
},
@@ -2432,6 +2477,9 @@
"ActivityMode": [1673724806],
"DamageType": [3454344768]
},
+ "2786020195": {
+ "ActivityMode": [1848252830]
+ },
"2795447263": {
"ItemCategory": [8, 10],
"KillType": [4]
@@ -2442,6 +2490,9 @@
"2798544375": {
"Destination": [1729879943]
},
+ "2802797782": {
+ "Destination": [677774031]
+ },
"2808722824": {
"Destination": [2244580325],
"DamageType": [2303181850]
@@ -2557,6 +2608,9 @@
"2864963415": {
"ActivityMode": [1164760504, 3199098480]
},
+ "2876166746": {
+ "Destination": [1729879943]
+ },
"2876781672": {
"ItemCategory": [54, 3871742104]
},
@@ -3103,6 +3157,10 @@
"3401935316": {
"Destination": [1729879943]
},
+ "3403632781": {
+ "Destination": [1729879943],
+ "KillType": [0]
+ },
"3405012994": {
"Destination": [677774031]
},
@@ -3126,6 +3184,9 @@
"3438972653": {
"ItemCategory": [13]
},
+ "3446274852": {
+ "Destination": [677774031]
+ },
"3449625264": {
"Destination": [2481646875],
"ItemCategory": [5, 12, 7, 3954685534]
@@ -3165,6 +3226,9 @@
"3459548846": {
"Destination": [1729879943]
},
+ "3463052439": {
+ "Destination": [677774031]
+ },
"3480928862": {
"DamageType": [2303181850]
},
@@ -3181,6 +3245,9 @@
"3497386880": {
"ActivityMode": [1673724806]
},
+ "3502555217": {
+ "DamageType": [2303181850, 151347233]
+ },
"3502555218": {
"ItemCategory": [6]
},
@@ -3240,6 +3307,9 @@
"3533425632": {
"ItemCategory": [5]
},
+ "3533922969": {
+ "Destination": [677774031]
+ },
"3535121108": {
"ActivityMode": [1164760504, 910991990],
"DamageType": [3454344768, 3949783978]
@@ -3321,6 +3391,9 @@
"ActivityMode": [1848252830, 3789021730, 1164760504],
"ItemCategory": [5]
},
+ "3566271052": {
+ "Destination": [677774031]
+ },
"3568578179": {
"Destination": [677774031]
},
@@ -3337,6 +3410,9 @@
"DamageType": [1847026933],
"KillType": [1]
},
+ "3583048767": {
+ "Destination": [677774031]
+ },
"3586902510": {
"Destination": [3607432451]
},
@@ -3874,7 +3950,7 @@
"DamageType": [2303181850]
},
"4237477948": {
- "ActivityMode": [1164760504, 3199098480]
+ "ActivityMode": [1164760504]
},
"4237572676": {
"Destination": [3607432451]
diff --git a/src/data/d2/seasons.json b/src/data/d2/seasons.json
index 999648090e..7481d72ea4 100644
--- a/src/data/d2/seasons.json
+++ b/src/data/d2/seasons.json
@@ -168,7 +168,6 @@
"263371518": 2,
"263371519": 2,
"265428940": 1,
- "266033973": 25,
"267290351": 1,
"267916777": 6,
"268035671": 20,
@@ -209,9 +208,16 @@
"335763433": 3,
"335988632": 25,
"338612265": 3,
+ "342326464": 25,
+ "342326465": 25,
"342326472": 25,
"342326473": 25,
"342326474": 25,
+ "342326475": 25,
+ "342326476": 25,
+ "342326477": 25,
+ "342326478": 25,
+ "342326479": 25,
"343482208": 14,
"343482209": 14,
"343789488": 24,
@@ -489,6 +495,9 @@
"785442930": 4,
"787024992": 16,
"788073489": 25,
+ "788073490": 25,
+ "788073491": 25,
+ "788073493": 25,
"796298276": 15,
"796633253": 4,
"797283241": 23,
@@ -545,10 +554,10 @@
"873720784": 12,
"873770815": 3,
"874877120": 1,
- "875973109": 25,
"876119751": 11,
"880745877": 3,
"881651163": 15,
+ "884557971": 25,
"885593286": 1,
"889173106": 25,
"889413643": 2,
@@ -612,8 +621,15 @@
"968669761": 25,
"968669762": 25,
"969863968": 2,
+ "971525076": 25,
+ "971525077": 25,
+ "971525080": 25,
+ "971525081": 25,
+ "971525082": 25,
+ "971525083": 25,
"971525084": 25,
"971525085": 25,
+ "971525086": 25,
"971525087": 25,
"971728596": 6,
"971728597": 6,
@@ -634,7 +650,6 @@
"1007199041": 16,
"1011670904": 3,
"1011670905": 3,
- "1012689018": 25,
"1013401891": 20,
"1015069912": 25,
"1015730268": 24,
@@ -748,7 +763,6 @@
"1165452712": 22,
"1166152736": 5,
"1173354066": 25,
- "1173575437": 25,
"1177179936": 1,
"1181381245": 10,
"1181969391": 9,
@@ -787,6 +801,7 @@
"1242938629": 24,
"1242938630": 24,
"1242938631": 24,
+ "1245245018": 25,
"1249334869": 12,
"1250597597": 24,
"1256660988": 8,
@@ -843,6 +858,7 @@
"1291068172": 3,
"1293002379": 1,
"1294717622": 1,
+ "1294837133": 25,
"1296063121": 25,
"1296106843": 23,
"1298644738": 22,
@@ -891,7 +907,6 @@
"1363029409": 7,
"1363360060": 23,
"1364413233": 5,
- "1364828721": 25,
"1365413546": 2,
"1365491398": 7,
"1370302135": 8,
@@ -1040,7 +1055,6 @@
"1560678953": 3,
"1561249470": 6,
"1569145193": 24,
- "1576539044": 25,
"1577190509": 20,
"1579706082": 3,
"1579706083": 3,
@@ -1190,7 +1204,6 @@
"1751782730": 1,
"1752648948": 24,
"1752862708": 23,
- "1760150243": 25,
"1767312242": 5,
"1767664464": 20,
"1767664465": 20,
@@ -1224,7 +1237,6 @@
"1784442061": 19,
"1784442062": 19,
"1784442063": 19,
- "1784694924": 25,
"1785547370": 13,
"1788892384": 4,
"1788892385": 4,
@@ -1238,7 +1250,6 @@
"1808095285": 22,
"1808095286": 22,
"1808095287": 22,
- "1809209864": 25,
"1812385586": 2,
"1812385587": 2,
"1816495538": 2,
@@ -1303,7 +1314,6 @@
"1873857625": 1,
"1876000888": 25,
"1876000889": 25,
- "1879625121": 25,
"1884588413": 21,
"1885107794": 16,
"1885107795": 16,
@@ -1470,7 +1480,6 @@
"1997760146": 19,
"1997760147": 19,
"2000448433": 19,
- "2001163204": 25,
"2001563200": 10,
"2005133865": 14,
"2006002391": 25,
@@ -1491,6 +1500,7 @@
"2024188850": 4,
"2026109715": 19,
"2026109719": 19,
+ "2027583053": 25,
"2029506313": 1,
"2032131120": 3,
"2035035510": 14,
@@ -1500,6 +1510,7 @@
"2039712238": 25,
"2047844848": 3,
"2047844849": 3,
+ "2048663470": 25,
"2056606165": 22,
"2059442237": 12,
"2062419607": 7,
@@ -1546,7 +1557,6 @@
"2118730409": 9,
"2120905920": 6,
"2121445668": 15,
- "2124105119": 25,
"2127474099": 7,
"2128916453": 15,
"2132252935": 20,
@@ -1636,6 +1646,7 @@
"2231049635": 25,
"2231049636": 25,
"2231049637": 25,
+ "2231049638": 25,
"2231049639": 25,
"2231049641": 25,
"2234157635": 6,
@@ -1657,7 +1668,6 @@
"2266517764": 3,
"2268947984": 25,
"2273494378": 22,
- "2275021348": 25,
"2276139500": 2,
"2276139501": 2,
"2276139502": 2,
@@ -1720,14 +1730,16 @@
"2355278664": 22,
"2355278665": 22,
"2359582409": 12,
- "2364916608": 25,
"2367025562": 10,
"2367860679": 23,
- "2370020598": 25,
"2376081322": 2,
"2376234856": 10,
"2381907801": 3,
"2383793186": 16,
+ "2393153880": 25,
+ "2393153882": 25,
+ "2393153883": 25,
+ "2393153885": 25,
"2393591593": 23,
"2394866220": 5,
"2396888157": 3,
@@ -1755,7 +1767,6 @@
"2426387438": 4,
"2427328578": 3,
"2430770464": 25,
- "2431654834": 25,
"2433436300": 15,
"2433900295": 2,
"2437968453": 1,
@@ -1790,7 +1801,6 @@
"2489453969": 24,
"2492590623": 14,
"2492769187": 3,
- "2495830694": 25,
"2498589276": 25,
"2501396275": 16,
"2503665585": 16,
@@ -1900,9 +1910,6 @@
"2649911453": 1,
"2650481177": 11,
"2653114997": 8,
- "2653404784": 25,
- "2653404785": 25,
- "2653404786": 25,
"2655812783": 12,
"2657932152": 1,
"2657932153": 1,
@@ -2021,7 +2028,6 @@
"2779841501": 8,
"2779841502": 1,
"2779841503": 6,
- "2783926339": 25,
"2785855278": 21,
"2788609407": 10,
"2790542790": 23,
@@ -2044,7 +2050,6 @@
"2802789150": 25,
"2802789151": 25,
"2805101184": 7,
- "2805887366": 25,
"2805962096": 14,
"2809967986": 14,
"2809967987": 14,
@@ -2110,7 +2115,6 @@
"2871066718": 25,
"2871095181": 1,
"2871264750": 18,
- "2872020159": 25,
"2873488357": 16,
"2873900232": 22,
"2873996295": 6,
@@ -2129,7 +2133,6 @@
"2909846572": 16,
"2910312059": 22,
"2912265353": 3,
- "2913094034": 25,
"2915137853": 23,
"2916149327": 22,
"2916219759": 1,
@@ -2153,6 +2156,7 @@
"2931483505": 1,
"2932390016": 18,
"2933249366": 24,
+ "2933632313": 25,
"2934294259": 25,
"2934509775": 14,
"2936183184": 24,
@@ -2276,7 +2280,6 @@
"3087166452": 18,
"3088135833": 16,
"3090681042": 25,
- "3094014459": 25,
"3100848450": 24,
"3101012909": 23,
"3101709156": 24,
@@ -2393,9 +2396,16 @@
"3195506775": 25,
"3196288028": 2,
"3197331902": 15,
+ "3198019442": 25,
+ "3198019443": 25,
"3198019448": 25,
+ "3198019449": 25,
"3198019450": 25,
"3198019451": 25,
+ "3198019452": 25,
+ "3198019453": 25,
+ "3198019454": 25,
+ "3198019455": 25,
"3199368173": 1,
"3201839676": 1,
"3203489753": 25,
@@ -2467,7 +2477,6 @@
"3256453690": 21,
"3256698432": 14,
"3257147585": 1,
- "3257350604": 25,
"3257562381": 3,
"3257710283": 9,
"3258345482": 1,
@@ -2565,6 +2574,7 @@
"3351378143": 1,
"3352019292": 4,
"3352566658": 2,
+ "3355148056": 25,
"3355148057": 25,
"3355614447": 24,
"3358687360": 16,
@@ -2609,7 +2619,6 @@
"3403347111": 9,
"3408716127": 16,
"3416845915": 25,
- "3419235114": 25,
"3431752854": 25,
"3432146796": 23,
"3434490958": 17,
@@ -2645,6 +2654,7 @@
"3493861055": 20,
"3494199208": 2,
"3499472512": 15,
+ "3505911855": 25,
"3507133960": 15,
"3507818312": 3,
"3508236467": 8,
@@ -2720,6 +2730,7 @@
"3605490919": 8,
"3605490922": 8,
"3605490923": 8,
+ "3605848320": 25,
"3606661184": 25,
"3607928024": 13,
"3610131410": 25,
@@ -2877,7 +2888,6 @@
"3811760832": 1,
"3814697630": 24,
"3814697631": 24,
- "3819277880": 25,
"3820128352": 23,
"3820835868": 3,
"3825769808": 1,
@@ -2912,6 +2922,7 @@
"3874217663": 2,
"3875413893": 1,
"3876796314": 5,
+ "3878673071": 25,
"3884067141": 11,
"3886292674": 12,
"3886292675": 12,
@@ -3089,7 +3100,6 @@
"4032296272": 24,
"4034060602": 15,
"4035690282": 5,
- "4036491260": 25,
"4036779270": 16,
"4039169178": 20,
"4040221326": 24,
@@ -3099,14 +3109,12 @@
"4048021830": 25,
"4048186065": 3,
"4048242887": 20,
- "4048385024": 25,
"4049365947": 1,
"4049753919": 23,
"4050450481": 7,
"4052831236": 3,
"4054029966": 23,
"4054596410": 21,
- "4056052795": 25,
"4059030097": 2,
"4059318875": 2,
"4062073334": 23,
diff --git a/src/data/d2/seasons_backup.json b/src/data/d2/seasons_backup.json
index 72121bb47a..59305cc1fc 100644
--- a/src/data/d2/seasons_backup.json
+++ b/src/data/d2/seasons_backup.json
@@ -393,7 +393,6 @@
"1362709751": 14,
"1363029408": 7,
"1363029409": 7,
- "1364828721": 25,
"1365491398": 7,
"1372428179": 22,
"1376763596": 6,
@@ -467,7 +466,6 @@
"1559478790": 22,
"1561249470": 6,
"1566558387": 25,
- "1576539044": 25,
"1584837156": 2,
"1584837157": 2,
"1589318419": 3,
@@ -577,7 +575,6 @@
"1987263977": 5,
"1997760146": 19,
"1997760147": 19,
- "2001163204": 25,
"2005189570": 7,
"2006002391": 25,
"2009106091": 5,
@@ -669,7 +666,6 @@
"2272646881": 10,
"2272646882": 10,
"2274492816": 3,
- "2275021348": 25,
"2277536120": 4,
"2277536122": 4,
"2277536123": 4,
@@ -721,7 +717,6 @@
"2479769639": 11,
"2489453969": 24,
"2492769187": 3,
- "2495830694": 25,
"2504122740": 23,
"2505000979": 11,
"2505678740": 25,
@@ -760,9 +755,6 @@
"2637837647": 3,
"2642798136": 22,
"2644573111": 17,
- "2653404784": 25,
- "2653404785": 25,
- "2653404786": 25,
"2661272172": 2,
"2661272173": 2,
"2661326387": 7,
@@ -859,7 +851,6 @@
"2900154861": 7,
"2906201304": 23,
"2907310420": 23,
- "2913094034": 25,
"2916149327": 22,
"2924095235": 3,
"2924794318": 11,
@@ -1207,7 +1198,6 @@
"4031340274": 5,
"4031340275": 5,
"4036178150": 2,
- "4036491260": 25,
"4048242887": 20,
"4059030097": 2,
"4062073334": 23,
diff --git a/src/htaccess b/src/htaccess
index 55e420a70f..25507f08e9 100644
--- a/src/htaccess
+++ b/src/htaccess
@@ -469,14 +469,14 @@ AddEncoding br .br
# for any request, search for pre-compressed versions (gzip or brotli) and serve that directly if it's supported
# Serve pre-brotli stuff if we got it
- RewriteCond %{HTTP:Accept-encoding} br
- RewriteCond %{REQUEST_FILENAME}\.br -f
- RewriteRule ^(.*)$ <%= publicPath %>$1.br [QSA,L]
+ # RewriteCond %{HTTP:Accept-encoding} br
+ # RewriteCond %{REQUEST_FILENAME}\.br -f
+ # RewriteRule ^(.*)$ <%= publicPath %>$1.br [QSA,L]
# Serve pre-gzipped stuff if we got it
- RewriteCond %{HTTP:Accept-encoding} gzip
- RewriteCond %{REQUEST_FILENAME}\.gz -f
- RewriteRule ^(.*)$ <%= publicPath %>$1.gz [QSA,L]
+ # RewriteCond %{HTTP:Accept-encoding} gzip
+ # RewriteCond %{REQUEST_FILENAME}\.gz -f
+ # RewriteRule ^(.*)$ <%= publicPath %>$1.gz [QSA,L]
# Redirect unknown paths to index.html
RewriteCond %{REQUEST_FILENAME} !-f