gw2e-account-statistics 3.18.0 → 3.18.2

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/account.js

@@ -34,15 +34,15 @@ function guildCount(accountData) {
 
 // The wvw rank
 function wvwRank(accountData) {
-  if (!accountData.account) {
+  if (!accountData.account || !accountData.account.wvw) {
     return null;
   }
 
-  if (typeof accountData.account.wvw_rank === 'undefined') {
+  if (typeof accountData.account.wvw.rank === 'undefined') {
     return null;
   }
 
-  return accountData.account.wvw_rank;
+  return accountData.account.wvw.rank;
 }
 
 // The amount of seconds played on this account

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)
   };
 };
 
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gw2e-account-statistics",
-  "version": "3.18.0",
+  "version": "3.18.2",
   "description": "Calculate statistics of guildwars2 accounts",
   "main": "./build/index.js",
   "scripts": {

package/tests/account.spec.js

@@ -13,7 +13,7 @@ describe('statistics > account', () => {
   it('can calculate the wvw rank', () => {
     expect(accountStatistics({}).wvwRank).to.equal(null)
     expect(accountStatistics({account: {}}).wvwRank).to.equal(null)
-    expect(accountStatistics({account: {wvw_rank: 123}}).wvwRank).to.equal(123)
+    expect(accountStatistics({account: {wvw: {rank: 123}}}).wvwRank).to.equal(123)
   })
 
   it('can calculate the playtime', () => {

package/tests/aggregate.spec.js

@@ -180,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,

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
     })
   })