gw2e-account-statistics 3.19.0 → 3.21.0

package/build/static/walletIdMapping.js

@@ -75,5 +75,8 @@ exports.default = {
   gaetingCrystals: 77,
   _essenceOfDespairFromWallet: 78,
   _essenceOfGreedFromWallet: 80,
-  _essenceOfTriumphFromWallet: 79
+  _essenceOfTriumphFromWallet: 79,
+  antiquatedDucat: 81,
+  testimonyOfCastoranHeroics: 82,
+  aetherRichSap: 83
 };

package/build/statistics/aggregate.js

@@ -164,9 +164,9 @@ function rareRifEssenceCount(accountStatistics) {
 }
 
 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) {
+  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 || accountStatistics.castoraHeroesChoiceChest == 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;
+  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 + accountStatistics.castoraHeroesChoiceChest;
 }

package/build/statistics/items.js

@@ -131,6 +131,7 @@ exports.default = function (accountData, extraInformation) {
     citadelOfZakirosHerosChoice: countItems(items, [101748, 104728]),
     janthirSyntriHerosChoice: countItems(items, [102265, 104832, 104942]),
     bavaNisosCommandersChoice: countItems(items, 104714),
+    castoraHeroesChoiceChest: countItems(items, 105822),
     giftsOfExploration: countItems(items, 19677),
     giftsOfBattle: countItems(items, 19678),
     tomesOfKnowledge: countItems(items, [43741, 43766]),

package/build/statistics/masteries.js

@@ -32,7 +32,8 @@ exports.default = function (accountData) {
     masteryPointsCrystal: earnedMasteryPoints['Icebrood Saga'] || 0,
     masteryPointsEndOfDragons: earnedMasteryPoints['End of Dragons'] || 0,
     masteryPointsSecretsOfTheObscure: earnedMasteryPoints['Secrets of the Obscure'] || 0,
-    masteryPointsJanthirWilds: earnedMasteryPoints['Janthir Wilds'] || 0
+    masteryPointsJanthirWilds: earnedMasteryPoints['Janthir Wilds'] || 0,
+    masteryPointsVisionsOfEternity: earnedMasteryPoints['Visions of Eternity'] || 0
   };
 };
 

package/build/statistics/unlocks.js

@@ -39,7 +39,8 @@ exports.default = function (accountData, extraInformation) {
     aureneLegendaryVariantSkins: aureneLegendaryVariantSkins(accountData),
     suffusedObsidianArmorSkins: suffusedObsidianArmorSkins(accountData),
     coloredTitleCount: coloredTitleCount(accountData),
-    homesteadDecorationCount: homesteadDecorationCount(accountData)
+    homesteadDecorationCount: homesteadDecorationCount(accountData),
+    homesteadDecorationCountUnique: homesteadDecorationCountUnique(accountData)
   };
 };
 
@@ -408,4 +409,14 @@ function homesteadDecorationCount(accountData) {
   return accountData.homestead.decorations.reduce(function (sum, decoration) {
     return sum + decoration.count;
   }, 0);
+}
+
+function homesteadDecorationCountUnique(accountData) {
+  if (!accountData.homestead || !accountData.homestead.decorations) {
+    return null;
+  }
+
+  return accountData.homestead.decorations.filter(function (d) {
+    return d.count > 0;
+  }).length;
 }

package/package.json

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

package/tests/aggregate.spec.js

@@ -52,10 +52,13 @@ describe('statistics > aggregate', () => {
       bloodstoneInfusion: 1,
       heatCoreInfusion: 1,
       forestWispInfusion: 1,
+      chromaticBubbles: 1,
+      etherealSeaLifeInfusion: 1,
+      agonyLens: 1,
 
       // (!) Has to be ignored, else it's counting double
       celestialInfusion: 999
-    }).totalAuras).to.equal(43)
+    }).totalAuras).to.equal(46)
   })
 
   it('can calculate death count per hour', () => {
@@ -281,7 +284,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: 1,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -307,7 +311,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: 1,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -333,7 +338,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: 1,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -359,7 +365,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -385,7 +392,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -411,7 +419,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -437,7 +446,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -463,7 +473,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -489,7 +500,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -515,7 +527,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -541,7 +554,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -567,7 +581,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -593,7 +608,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -619,7 +635,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -645,7 +662,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -671,7 +689,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -697,7 +716,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -723,7 +743,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -749,7 +770,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -775,7 +797,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: null
+        bavaNisosCommandersChoice: null,
+        castoraHeroesChoiceChest: null
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -801,7 +824,35 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: null,
         citadelOfZakirosHerosChoice: null,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: 1
+        bavaNisosCommandersChoice: 1,
+        castoraHeroesChoiceChest: 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: null,
+        castoraHeroesChoiceChest: 1
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -827,7 +878,8 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: 5,
         citadelOfZakirosHerosChoice: 3,
         janthirSyntriHerosChoice: null,
-        bavaNisosCommandersChoice: 1
+        bavaNisosCommandersChoice: 1,
+        castoraHeroesChoiceChest: 5
       }).commandersChoiceChestsCount
     ).to.equal(null)
 
@@ -853,8 +905,9 @@ describe('statistics > aggregate', () => {
         convergenceMountBalriorWayfindersChoice: 5,
         citadelOfZakirosHerosChoice: 3,
         janthirSyntriHerosChoice: 1,
-        bavaNisosCommandersChoice: 1
+        bavaNisosCommandersChoice: 1,
+        castoraHeroesChoiceChest: 5
       }).commandersChoiceChestsCount
-    ).to.equal(42)
+    ).to.equal(47)
   })
 })

package/tests/items.spec.js

@@ -89,6 +89,7 @@ describe('statistics > items', () => {
       citadelOfZakirosHerosChoice: null,
       janthirSyntriHerosChoice: null,
       bavaNisosCommandersChoice: null,
+      castoraHeroesChoiceChest: null,
       uniqueTonics: null,
       bloodRubies: null,
       petrifiedWood: null,
@@ -183,7 +184,10 @@ describe('statistics > items', () => {
       infiniteWvwBlueprints: null,
       bloodstoneInfusion: null,
       heatCoreInfusion: null,
-      forestWispInfusion: null
+      forestWispInfusion: null,
+      chromaticBubbles: null,
+      etherealSeaLifeInfusion: null,
+      agonyLens: null
     }
 
     const bothPermissions = {bank: null, characters: null}

package/tests/masteries.spec.js

@@ -27,19 +27,21 @@ describe('statistics > masteries', () => {
         {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}
+        {region: 'Janthir Wilds', spent: 15, earned: 22},
+        {region: 'Visions of Eternity', spent: 8, earned: 12}
       ]
     }
 
     expect(masteriesStatistics({mastery: {points: accountData}})).to.deep.equal({
-      masteryPoints: 58 + 106 + 32 + 12 + 9 + 5 + 22,
+      masteryPoints: 58 + 106 + 32 + 12 + 9 + 5 + 22 + 12,
       masteryPointsTyria: 58,
       masteryPointsMaguuma: 106,
       masteryPointsDesert: 32,
       masteryPointsCrystal: 12,
       masteryPointsEndOfDragons: 9,
       masteryPointsSecretsOfTheObscure: 5,
-      masteryPointsJanthirWilds: 22
+      masteryPointsJanthirWilds: 22,
+      masteryPointsVisionsOfEternity: 12
     })
   })
 
@@ -59,7 +61,8 @@ describe('statistics > masteries', () => {
       masteryPointsCrystal: 0,
       masteryPointsEndOfDragons: 0,
       masteryPointsSecretsOfTheObscure: 0,
-      masteryPointsJanthirWilds: 0
+      masteryPointsJanthirWilds: 0,
+      masteryPointsVisionsOfEternity: 0
     })
   })
 
@@ -72,7 +75,8 @@ describe('statistics > masteries', () => {
       masteryPointsCrystal: 0,
       masteryPointsEndOfDragons: 0,
       masteryPointsSecretsOfTheObscure: 0,
-      masteryPointsJanthirWilds: 0
+      masteryPointsJanthirWilds: 0,
+      masteryPointsVisionsOfEternity: 0
     })
   })
 })

package/tests/unlocks.spec.js

@@ -282,4 +282,10 @@ describe('statistics > unlocks', () => {
     expect(unlocksStatistics({ homestead: { decorations: [] } }, EXTRA_INFO).homesteadDecorationCount).to.equal(0)
     expect(unlocksStatistics({ homestead: { decorations: [{ id: 1, count: 1 }, { id: 2, count: 2 }] } }, EXTRA_INFO).homesteadDecorationCount).to.equal(3)
   })
+
+  it('can calculate homestead decoration count uniquely', () => {
+    expect(unlocksStatistics({}, EXTRA_INFO).homesteadDecorationCountUnique).to.equal(null)
+    expect(unlocksStatistics({ homestead: { decorations: [] } }, EXTRA_INFO).homesteadDecorationCountUnique).to.equal(0)
+    expect(unlocksStatistics({ homestead: { decorations: [{ id: 1, count: 1 }, { id: 2, count: 2 }] } }, EXTRA_INFO).homesteadDecorationCountUnique).to.equal(2)
+  })
 })

package/tests/wallet.spec.js

@@ -79,7 +79,10 @@ describe('statistics > wallet', () => {
       gaetingCrystals: null,
       _essenceOfDespairFromWallet: null,
       _essenceOfGreedFromWallet: null,
-      _essenceOfTriumphFromWallet: null
+      _essenceOfTriumphFromWallet: null,
+      antiquatedDucat: null,
+      testimonyOfCastoranHeroics: null,
+      aetherRichSap: null
     })
   })
 
@@ -204,7 +207,10 @@ describe('statistics > wallet', () => {
       gaetingCrystals: 0,
       _essenceOfDespairFromWallet: 0,
       _essenceOfGreedFromWallet: 0,
-      _essenceOfTriumphFromWallet: 0
+      _essenceOfTriumphFromWallet: 0,
+      antiquatedDucat: 0,
+      testimonyOfCastoranHeroics: 0,
+      aetherRichSap: 0
     })
   })