gw2e-account-statistics 3.17.4 → 3.18.1

package/build/static/legendaryInsightItemIds.js

@@ -66,9 +66,15 @@ exports.default = {
   91241, // Cardinal Sabir's Coffer
   91200, // Cardinal Adina's Coffer
   91260, // Qadim the Peerless's Coffer
-  103783, // Greer's Coffer
-  103926, // Decima's Coffer
-  103946 // Ura's Coffer
+  103783, // Greer's Coffer (old)
+  104306, // Greer's Coffer
+  104399, // Greer's Magnificent Coffer
+  103926, // Decima's Coffer (old)
+  104410, // Decima's Coffer
+  104246, // Decima's Magnificent Coffer
+  103946, // Ura's Coffer (old)
+  104439, // Ura's Coffer
+  104355 // Ura's Magnificent Coffer
   ],
   strikeCmCoffers: [97269, // Mai Trin's Magnificent Coffer
   96638, // Ankka's Magnificent Coffer

package/build/static/walletIdMapping.js

@@ -72,5 +72,8 @@ exports.default = {
   pinchOfStardust: 73,
   calcifiedGasp: 75,
   ursusOblige: 76,
-  gaetingCrystals: 77
+  gaetingCrystals: 77,
+  _essenceOfDespairFromWallet: 78,
+  _essenceOfGreedFromWallet: 80,
+  _essenceOfTriumphFromWallet: 79
 };

package/build/statistics/aggregate.js

@@ -13,9 +13,13 @@ exports.default = function (accountStatistics) {
     blueProphetCrystal: blueProphetCrystal(accountStatistics),
     greenProphetCrystal: greenProphetCrystal(accountStatistics),
     redProphetCrystal: redProphetCrystal(accountStatistics),
+    commandersChoiceChestsCount: commandersChoiceChestsCount(accountStatistics),
 
     // We use the old key here because we want to continue the statistic for the user for the discontinued items
-    unstableCosmicEssences: unstableFractalEssence(accountStatistics)
+    unstableCosmicEssences: unstableFractalEssence(accountStatistics),
+    essenceOfDespair: fineRifEssenceCount(accountStatistics),
+    essenceOfGreed: masterworkRifEssenceCount(accountStatistics),
+    essenceOfTriumph: rareRifEssenceCount(accountStatistics)
   };
 };
 
@@ -43,7 +47,7 @@ function deathCountPerHour(accountStatistics) {
 
 // Get the total number of auras
 function totalAuras(accountStatistics) {
-  var keys = ['nightfury', 'wintersPresence', 'legendaryItemsTrinket'].concat(Object.keys(_cosmeticAuras2.default));
+  var keys = ['nightfury', 'wintersPresence', 'legendaryItemsTrinket', 'rimeRimmedRebreather'].concat(Object.keys(_cosmeticAuras2.default));
 
   // All keys have to be set
   var statisticsKeys = Object.keys(accountStatistics);
@@ -133,4 +137,36 @@ function raidTokenCount(accountStatistics) {
   }
 
   return accountStatistics._legendaryInsightsFromItems + accountStatistics._legendaryDivinationsFromItems + accountStatistics._legendaryInsightsFromWallet;
+}
+
+function fineRifEssenceCount(accountStatistics) {
+  if (accountStatistics._essenceOfDespairFromItems == null || accountStatistics._essenceOfDespairFromWallet == null) {
+    return null;
+  }
+
+  return accountStatistics._essenceOfDespairFromItems + accountStatistics._essenceOfDespairFromWallet;
+}
+
+function masterworkRifEssenceCount(accountStatistics) {
+  if (accountStatistics._essenceOfGreedFromItems == null || accountStatistics._essenceOfGreedFromWallet == null) {
+    return null;
+  }
+
+  return accountStatistics._essenceOfGreedFromItems + accountStatistics._essenceOfGreedFromWallet;
+}
+
+function rareRifEssenceCount(accountStatistics) {
+  if (accountStatistics._essenceOfTriumphFromItems == null || accountStatistics._essenceOfTriumphFromWallet == null) {
+    return null;
+  }
+
+  return accountStatistics._essenceOfTriumphFromItems + accountStatistics._essenceOfTriumphFromWallet;
+}
+
+function commandersChoiceChestsCount(accountStatistics) {
+  if (accountStatistics.vbHerosChoice == null || accountStatistics.tdHerosChoice == null || accountStatistics.abHerosChoice == null || accountStatistics.dsHerosChoice == null || accountStatistics.crystalOasisHerosChoice == null || accountStatistics.elonRiverlandsHerosChoice == null || accountStatistics.theDesolationHerosChoice == null || accountStatistics.domainOfVabbiHerosChoice == null || accountStatistics.seitungProvinceHerosChoice == null || accountStatistics.newKainengCityHerosChoice == null || accountStatistics.echovaldWildsHerosChoice == null || accountStatistics.dragonsEndHerosChoice == null || accountStatistics.gyalaDelveHerosChoice == null || accountStatistics.skywatchArchipelagoHerosChoice == null || accountStatistics.amnytasHerosChoice == null || accountStatistics.innerNayosEndHerosChoice == null || accountStatistics.convergenceHerosChoice == null || accountStatistics.convergenceMountBalriorWayfindersChoice == null || accountStatistics.citadelOfZakirosHerosChoice == null || accountStatistics.janthirSyntriHerosChoice == null || accountStatistics.bavaNisosCommandersChoice == null) {
+    return null;
+  }
+
+  return accountStatistics.vbHerosChoice + accountStatistics.tdHerosChoice + accountStatistics.abHerosChoice + accountStatistics.dsHerosChoice + accountStatistics.crystalOasisHerosChoice + accountStatistics.elonRiverlandsHerosChoice + accountStatistics.theDesolationHerosChoice + accountStatistics.domainOfVabbiHerosChoice + accountStatistics.seitungProvinceHerosChoice + accountStatistics.newKainengCityHerosChoice + accountStatistics.echovaldWildsHerosChoice + accountStatistics.dragonsEndHerosChoice + accountStatistics.gyalaDelveHerosChoice + accountStatistics.skywatchArchipelagoHerosChoice + accountStatistics.amnytasHerosChoice + accountStatistics.innerNayosEndHerosChoice + accountStatistics.convergenceHerosChoice + accountStatistics.convergenceMountBalriorWayfindersChoice + accountStatistics.citadelOfZakirosHerosChoice + accountStatistics.janthirSyntriHerosChoice + accountStatistics.bavaNisosCommandersChoice;
 }

package/build/statistics/items.js

@@ -51,9 +51,9 @@ exports.default = function (accountData, extraInformation) {
     hatchedChili: countItems(items, 92072),
     eternalIceShard: countItems(items, 92272),
     eitriteIngots: countItems(items, 92317),
-    essenceOfDespair: countItems(items, 100078),
-    essenceOfGreed: countItems(items, 100414),
-    essenceOfTriumph: countItems(items, 100055),
+    _essenceOfDespairFromItems: countItems(items, [100078, 104747]),
+    _essenceOfGreedFromItems: countItems(items, [100414, 104773]),
+    _essenceOfTriumphFromItems: countItems(items, [100055, 105009]),
 
     // (4) DUNGEONS
     chestOfDungeoneering: countItems(items, [78252, 98187]),
@@ -110,26 +110,27 @@ exports.default = function (accountData, extraInformation) {
     championBags: countItems(items, _championBagIds2.default),
     tripleTroubleChests: countItems(items, 49664),
     tequatlChests: countItems(items, 47836),
-    vbHerosChoice: countItems(items, [78171, 78743]),
-    tdHerosChoice: countItems(items, [78332, 78751]),
-    abHerosChoice: countItems(items, [78650, 78748]),
-    dsHerosChoice: countItems(items, [78617, 78783]),
-    crystalOasisHerosChoice: countItems(items, 90958),
-    elonRiverlandsHerosChoice: countItems(items, 91039),
-    theDesolationHerosChoice: countItems(items, [84360, 90994]),
-    domainOfVabbiHerosChoice: countItems(items, 83035),
-    seitungProvinceHerosChoice: countItems(items, 97895),
-    newKainengCityHerosChoice: countItems(items, 97901),
-    echovaldWildsHerosChoice: countItems(items, 97894),
-    dragonsEndHerosChoice: countItems(items, 97896),
-    gyalaDelveHerosChoice: countItems(items, 99704),
-    skywatchArchipelagoHerosChoice: countItems(items, 100547),
-    amnytasHerosChoice: countItems(items, 100193),
-    innerNayosEndHerosChoice: countItems(items, 101195),
-    convergenceHerosChoice: countItems(items, 101185),
+    vbHerosChoice: countItems(items, [78171, 78743, 104687]),
+    tdHerosChoice: countItems(items, [78332, 78751, 104884]),
+    abHerosChoice: countItems(items, [78650, 78748, 104944]),
+    dsHerosChoice: countItems(items, [78617, 78783, 104894]),
+    crystalOasisHerosChoice: countItems(items, [90958, 104798]),
+    elonRiverlandsHerosChoice: countItems(items, [91039, 104943]),
+    theDesolationHerosChoice: countItems(items, [84360, 90994, 104748]),
+    domainOfVabbiHerosChoice: countItems(items, [83035, 104803]),
+    seitungProvinceHerosChoice: countItems(items, [97895, 104973]),
+    newKainengCityHerosChoice: countItems(items, [97901, 104988]),
+    echovaldWildsHerosChoice: countItems(items, [97894, 104885]),
+    dragonsEndHerosChoice: countItems(items, [97896, 104910]),
+    gyalaDelveHerosChoice: countItems(items, [99704, 104738]),
+    skywatchArchipelagoHerosChoice: countItems(items, [100547, 104686]),
+    amnytasHerosChoice: countItems(items, [100193, 104730]),
+    innerNayosEndHerosChoice: countItems(items, [101195, 104856]),
+    convergenceHerosChoice: countItems(items, [101185, 104710, 104756]),
     convergenceMountBalriorWayfindersChoice: countItems(items, 103842),
-    citadelOfZakirosHerosChoice: countItems(items, 101748),
-    janthirSyntriHerosChoice: countItems(items, 102265),
+    citadelOfZakirosHerosChoice: countItems(items, [101748, 104728]),
+    janthirSyntriHerosChoice: countItems(items, [102265, 104832, 104942]),
+    bavaNisosCommandersChoice: countItems(items, 104714),
     giftsOfExploration: countItems(items, 19677),
     giftsOfBattle: countItems(items, 19678),
     tomesOfKnowledge: countItems(items, [43741, 43766]),

package/build/statistics/masteries.js

@@ -9,7 +9,10 @@ exports.default = function (accountData) {
       masteryPointsTyria: null,
       masteryPointsMaguuma: null,
       masteryPointsDesert: null,
-      masteryPointsCrystal: null
+      masteryPointsCrystal: null,
+      masteryPointsEndOfDragons: null,
+      masteryPointsSecretsOfTheObscure: null,
+      masteryPointsJanthirWilds: null
     };
   }
 
@@ -23,10 +26,13 @@ exports.default = function (accountData) {
 
   return {
     masteryPoints: (0, _sumBy2.default)(Object.values(earnedMasteryPoints)),
-    masteryPointsTyria: earnedMasteryPoints['Tyria'] || 0,
-    masteryPointsMaguuma: earnedMasteryPoints['Maguuma'] || 0,
-    masteryPointsDesert: earnedMasteryPoints['Desert'] || 0,
-    masteryPointsCrystal: earnedMasteryPoints['Tundra'] || 0
+    masteryPointsTyria: earnedMasteryPoints['Central Tyria'] || 0,
+    masteryPointsMaguuma: earnedMasteryPoints['Heart of Thorns'] || 0,
+    masteryPointsDesert: earnedMasteryPoints['Path of Fire'] || 0,
+    masteryPointsCrystal: earnedMasteryPoints['Icebrood Saga'] || 0,
+    masteryPointsEndOfDragons: earnedMasteryPoints['End of Dragons'] || 0,
+    masteryPointsSecretsOfTheObscure: earnedMasteryPoints['Secrets of the Obscure'] || 0,
+    masteryPointsJanthirWilds: earnedMasteryPoints['Janthir Wilds'] || 0
   };
 };
 

package/build/statistics/unlocks.js

@@ -31,6 +31,7 @@ exports.default = function (accountData, extraInformation) {
     fractalSkins: fractalSkins(accountData),
     immortalSkins: immortalSkins(accountData),
     wintersPresence: skinExists(accountData, 6577),
+    rimeRimmedRebreather: skinExists(accountData, 6891),
     nightfury: skinExists(accountData, 6161),
     _fractalRelicsFromTitles: fractalRelicsFromTitles(accountData),
     _pristineFractalRelicsFromTitles: pristineFractalRelicsFromTitles(accountData),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gw2e-account-statistics",
-  "version": "3.17.4",
+  "version": "3.18.1",
   "description": "Calculate statistics of guildwars2 accounts",
   "main": "./build/index.js",
   "scripts": {
@@ -19,7 +19,7 @@
     "mockdate": "^2.0.0"
   },
   "dependencies": {
-    "@gw2efficiency/game-data": "^0.1.50",
+    "@gw2efficiency/game-data": "^0.1.58",
     "array-unique": "^0.3.2",
     "gw2e-account-value": "^3.13.1",
     "gw2e-static-data": "^0.5.32",

package/tests/aggregate.spec.js

@@ -10,6 +10,7 @@ describe('statistics > aggregate', () => {
       nightfury: 0,
       wintersPresence: 1,
       legendaryItemsTrinket: 1,
+      rimeRimmedRebreather: 1,
 
       abyssalInfusion: 1,
       baubleInfusions: 1,
@@ -48,10 +49,13 @@ describe('statistics > aggregate', () => {
       silentSymphony: 1,
       arcaneFlowInfusion: 1,
       mistwalkerInfusion: 1,
+      bloodstoneInfusion: 1,
+      heatCoreInfusion: 1,
+      forestWispInfusion: 1,
 
       // (!) Has to be ignored, else it's counting double
       celestialInfusion: 999
-    }).totalAuras).to.equal(39)
+    }).totalAuras).to.equal(43)
   })
 
   it('can calculate death count per hour', () => {
@@ -176,4 +180,681 @@ describe('statistics > aggregate', () => {
       _unstableFractalEssenceFromItems: 1200
     }).unstableCosmicEssences).to.equal(1651 + 500 + 1200)
   })
+
+  it('can calculate fine rift essence count', () => {
+    expect(aggregateStatistics({}).essenceOfDespair).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfDespairFromItems: null,
+        _essenceOfDespairFromWallet: 1
+      }).essenceOfDespair
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfDespairFromItems: 1,
+        _essenceOfDespairFromWallet: null
+      }).essenceOfDespair
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfDespairFromItems: 1,
+        _essenceOfDespairFromWallet: 5
+      }).essenceOfDespair
+    ).to.equal(6)
+  })
+
+  it('can calculate masterwork rift essence count', () => {
+    expect(aggregateStatistics({}).essenceOfGreed).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfGreedFromItems: null,
+        _essenceOfGreedFromWallet: 1
+      }).essenceOfGreed
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfGreedFromItems: 1,
+        _essenceOfGreedFromWallet: null
+      }).essenceOfGreed
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfGreedFromItems: 1,
+        _essenceOfGreedFromWallet: 5
+      }).essenceOfGreed
+    ).to.equal(6)
+  })
+
+  it('can calculate fine rift essence count', () => {
+    expect(aggregateStatistics({}).essenceOfTriumph).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfTriumphFromItems: null,
+        _essenceOfTriumphFromWallet: 1
+      }).essenceOfTriumph
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfTriumphFromItems: 1,
+        _essenceOfTriumphFromWallet: null
+      }).essenceOfTriumph
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        _essenceOfTriumphFromItems: 1,
+        _essenceOfTriumphFromWallet: 5
+      }).essenceOfTriumph
+    ).to.equal(6)
+  })
+
+  it('can calculate commanders choice chests count', () => {
+    expect(aggregateStatistics({}).commandersChoiceChestsCount).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: 1,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: 1,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: 1,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: 1,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: 1,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: 1,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: 1,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: 1,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: 1,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: 1,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: 1,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: 1,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: 1,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: 1,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: 1,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: 1,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: 1,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: 1,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: 1,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: 1,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: null
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: null,
+        tdHerosChoice: null,
+        abHerosChoice: null,
+        dsHerosChoice: null,
+        crystalOasisHerosChoice: null,
+        elonRiverlandsHerosChoice: null,
+        theDesolationHerosChoice: null,
+        domainOfVabbiHerosChoice: null,
+        seitungProvinceHerosChoice: null,
+        newKainengCityHerosChoice: null,
+        echovaldWildsHerosChoice: null,
+        dragonsEndHerosChoice: null,
+        gyalaDelveHerosChoice: null,
+        skywatchArchipelagoHerosChoice: null,
+        amnytasHerosChoice: null,
+        innerNayosEndHerosChoice: null,
+        convergenceHerosChoice: null,
+        convergenceMountBalriorWayfindersChoice: null,
+        citadelOfZakirosHerosChoice: null,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: 1
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: 1,
+        tdHerosChoice: 1,
+        abHerosChoice: 1,
+        dsHerosChoice: 1,
+        crystalOasisHerosChoice: 1,
+        elonRiverlandsHerosChoice: 1,
+        theDesolationHerosChoice: 1,
+        domainOfVabbiHerosChoice: 1,
+        seitungProvinceHerosChoice: 1,
+        newKainengCityHerosChoice: 1,
+        echovaldWildsHerosChoice: 2,
+        dragonsEndHerosChoice: 5,
+        gyalaDelveHerosChoice: 6,
+        skywatchArchipelagoHerosChoice: 4,
+        amnytasHerosChoice: 3,
+        innerNayosEndHerosChoice: 1,
+        convergenceHerosChoice: 1,
+        convergenceMountBalriorWayfindersChoice: 5,
+        citadelOfZakirosHerosChoice: 3,
+        janthirSyntriHerosChoice: null,
+        bavaNisosCommandersChoice: 1
+      }).commandersChoiceChestsCount
+    ).to.equal(null)
+
+    expect(
+      aggregateStatistics({
+        vbHerosChoice: 1,
+        tdHerosChoice: 1,
+        abHerosChoice: 1,
+        dsHerosChoice: 1,
+        crystalOasisHerosChoice: 1,
+        elonRiverlandsHerosChoice: 1,
+        theDesolationHerosChoice: 1,
+        domainOfVabbiHerosChoice: 1,
+        seitungProvinceHerosChoice: 1,
+        newKainengCityHerosChoice: 1,
+        echovaldWildsHerosChoice: 2,
+        dragonsEndHerosChoice: 5,
+        gyalaDelveHerosChoice: 6,
+        skywatchArchipelagoHerosChoice: 4,
+        amnytasHerosChoice: 3,
+        innerNayosEndHerosChoice: 1,
+        convergenceHerosChoice: 1,
+        convergenceMountBalriorWayfindersChoice: 5,
+        citadelOfZakirosHerosChoice: 3,
+        janthirSyntriHerosChoice: 1,
+        bavaNisosCommandersChoice: 1
+      }).commandersChoiceChestsCount
+    ).to.equal(42)
+  })
 })

package/tests/items.spec.js

@@ -88,6 +88,7 @@ describe('statistics > items', () => {
       convergenceMountBalriorWayfindersChoice: null,
       citadelOfZakirosHerosChoice: null,
       janthirSyntriHerosChoice: null,
+      bavaNisosCommandersChoice: null,
       uniqueTonics: null,
       bloodRubies: null,
       petrifiedWood: null,
@@ -106,9 +107,9 @@ describe('statistics > items', () => {
       dragoniteOre: null,
       bloodstoneDust: null,
       empyrealFragments: null,
-      essenceOfDespair: null,
-      essenceOfGreed: null,
-      essenceOfTriumph: null,
+      _essenceOfDespairFromItems: null,
+      _essenceOfGreedFromItems: null,
+      _essenceOfTriumphFromItems: null,
       crystallineOre: null,
       airshipOil: null,
       auricDust: null,
@@ -179,7 +180,10 @@ describe('statistics > items', () => {
       arcaneFlowInfusion: null,
       mistwalkerInfusion: null,
       statInfusions: null,
-      infiniteWvwBlueprints: null
+      infiniteWvwBlueprints: null,
+      bloodstoneInfusion: null,
+      heatCoreInfusion: null,
+      forestWispInfusion: null
     }
 
     const bothPermissions = {bank: null, characters: null}

package/tests/masteries.spec.js

@@ -9,7 +9,10 @@ describe('statistics > masteries', () => {
       masteryPointsTyria: null,
       masteryPointsMaguuma: null,
       masteryPointsDesert: null,
-      masteryPointsCrystal: null
+      masteryPointsCrystal: null,
+      masteryPointsEndOfDragons: null,
+      masteryPointsSecretsOfTheObscure: null,
+      masteryPointsJanthirWilds: null
     }
 
     expect(masteriesStatistics({mastery: {points: null}})).to.deep.equal(empty)
@@ -18,26 +21,32 @@ describe('statistics > masteries', () => {
   it('can calculate the mastery points', () => {
     const accountData = {
       totals: [
-        {region: 'Tyria', spent: 49, earned: 58},
-        {region: 'Maguuma', spent: 85, earned: 106},
-        {region: 'Desert', spent: 12, earned: 32},
-        {region: 'Tundra', spent: 3, earned: 12}
+        {region: 'Central Tyria', spent: 49, earned: 58},
+        {region: 'Heart of Thorns', spent: 85, earned: 106},
+        {region: 'Path of Fire', spent: 12, earned: 32},
+        {region: 'Icebrood Saga', spent: 3, earned: 12},
+        {region: 'End of Dragons', spent: 7, earned: 9},
+        {region: 'Secrets of the Obscure', spent: 4, earned: 5},
+        {region: 'Janthir Wilds', spent: 15, earned: 22}
       ]
     }
 
     expect(masteriesStatistics({mastery: {points: accountData}})).to.deep.equal({
-      masteryPoints: 58 + 106 + 32 + 12,
+      masteryPoints: 58 + 106 + 32 + 12 + 9 + 5 + 22,
       masteryPointsTyria: 58,
       masteryPointsMaguuma: 106,
       masteryPointsDesert: 32,
-      masteryPointsCrystal: 12
+      masteryPointsCrystal: 12,
+      masteryPointsEndOfDragons: 9,
+      masteryPointsSecretsOfTheObscure: 5,
+      masteryPointsJanthirWilds: 22
     })
   })
 
   it('can calculate the mastery points with missing points', () => {
     const accountData = {
       totals: [
-        {region: 'Maguuma', spent: 0, earned: 1}
+        {region: 'Heart of Thorns', spent: 0, earned: 1}
       ]
     }
 
@@ -47,7 +56,10 @@ describe('statistics > masteries', () => {
       masteryPointsTyria: 0,
       masteryPointsMaguuma: 1,
       masteryPointsDesert: 0,
-      masteryPointsCrystal: 0
+      masteryPointsCrystal: 0,
+      masteryPointsEndOfDragons: 0,
+      masteryPointsSecretsOfTheObscure: 0,
+      masteryPointsJanthirWilds: 0
     })
   })
 
@@ -57,7 +69,10 @@ describe('statistics > masteries', () => {
       masteryPointsTyria: 0,
       masteryPointsMaguuma: 0,
       masteryPointsDesert: 0,
-      masteryPointsCrystal: 0
+      masteryPointsCrystal: 0,
+      masteryPointsEndOfDragons: 0,
+      masteryPointsSecretsOfTheObscure: 0,
+      masteryPointsJanthirWilds: 0
     })
   })
 })

package/tests/unlocks.spec.js

@@ -228,6 +228,13 @@ describe('statistics > unlocks', () => {
     expect(unlocksStatistics({skins: [1, 2, 6577, 6577]}, EXTRA_INFO).wintersPresence).to.equal(1)
   })
 
+  it('can calculate the rime rimmed rebreather unlock', () => {
+    expect(unlocksStatistics({}, EXTRA_INFO).rimeRimmedRebreather).to.equal(null)
+    expect(unlocksStatistics({skins: []}, EXTRA_INFO).rimeRimmedRebreather).to.equal(0)
+    expect(unlocksStatistics({skins: [1, 2, 7, 9, 10]}, EXTRA_INFO).rimeRimmedRebreather).to.equal(0)
+    expect(unlocksStatistics({skins: [1, 2, 6891, 6891]}, EXTRA_INFO).rimeRimmedRebreather).to.equal(1)
+  })
+
   it('can calculate the nightfury unlock', () => {
     expect(unlocksStatistics({}, EXTRA_INFO).nightfury).to.equal(null)
     expect(unlocksStatistics({skins: []}, EXTRA_INFO).nightfury).to.equal(0)

package/tests/wallet.spec.js

@@ -76,7 +76,10 @@ describe('statistics > wallet', () => {
       pinchOfStardust: null,
       staticCharge: null,
       ursusOblige: null,
-      gaetingCrystals: null
+      gaetingCrystals: null,
+      _essenceOfDespairFromWallet: null,
+      _essenceOfGreedFromWallet: null,
+      _essenceOfTriumphFromWallet: null
     })
   })
 
@@ -198,7 +201,10 @@ describe('statistics > wallet', () => {
       pinchOfStardust: 0,
       staticCharge: 0,
       ursusOblige: 0,
-      gaetingCrystals: 0
+      gaetingCrystals: 0,
+      _essenceOfDespairFromWallet: 0,
+      _essenceOfGreedFromWallet: 0,
+      _essenceOfTriumphFromWallet: 0
     })
   })