gw2e-account-statistics 3.15.2 → 3.16.0

package/build/gameData/arenanetEmployeeAchievements.js

@@ -0,0 +1,15 @@
+'use strict';
+
+exports.__esModule = true;
+
+var _arenanetEmployee = require('@gw2efficiency/game-data/achievements/categories/arenanet-employee');
+
+var _arenanetEmployee2 = _interopRequireDefault(_arenanetEmployee);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+var arenanetEmployeeAchievementIds = _arenanetEmployee2.default.map(function (x) {
+  return x.id;
+});
+
+exports.default = arenanetEmployeeAchievementIds;

package/build/static/walletIdMapping.js

@@ -70,5 +70,6 @@ exports.default = {
   jadeMinersKeycard: 71,
   staticCharge: 72,
   pinchOfStardust: 73,
-  calcifiedGasp: 75
+  calcifiedGasp: 75,
+  ursusOblige: 76
 };

package/build/statistics/items.js

@@ -113,6 +113,8 @@ exports.default = function (accountData) {
     amnytasHerosChoice: countItems(items, 100193),
     innerNayosEndHerosChoice: countItems(items, 101195),
     convergenceHerosChoice: countItems(items, 101185),
+    citadelOfZakirosHerosChoice: countItems(items, 101748),
+    janthirSyntriHerosChoice: countItems(items, 102265),
     giftsOfExploration: countItems(items, 19677),
     giftsOfBattle: countItems(items, 19678),
     tomesOfKnowledge: countItems(items, [43741, 43766]),

package/build/statistics/progression.js

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 
 exports.__esModule = true;
 
@@ -31,11 +31,19 @@ exports.default = function (accountData) {
     wvwDefendedCastles: achievementCurrent(accountData, 313),
     pvpKilledPlayers: achievementCurrent(accountData, 239),
     pvpKilledPlayersRanked: achievementCurrent(accountData, 240),
+    arenanetEmployeeAchievements: arenanetEmployeeAchievements(accountData),
+    convergenceCompletions: convergenceCompletions(accountData),
     homeCats: homeCats(accountData),
     homeNodes: homeNodes(accountData)
   };
 };
 
+var _arenanetEmployeeAchievements = require('../gameData/arenanetEmployeeAchievements');
+
+var _arenanetEmployeeAchievements2 = _interopRequireDefault(_arenanetEmployeeAchievements);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 // How many achievements the user did
 function achievementCount(accountData) {
   if (!accountData.achievements) {
@@ -97,6 +105,36 @@ function winterWonderlandCompletions(accountData) {
   return sum;
 }
 
+function arenanetEmployeeAchievements(accountData) {
+  if (!accountData.achievements) {
+    return null;
+  }
+
+  var sum = 0;
+  _arenanetEmployeeAchievements2.default.forEach(function (achievementId) {
+    sum += achievementCurrent(accountData, achievementId);
+  });
+
+  return sum;
+}
+
+function convergenceCompletions(accountData) {
+  if (!accountData.achievements) {
+    return null;
+  }
+
+  var achievements = [{ id: 7668, perRepeat: 100 }, // Convergence Conquerer
+  { id: 7720, perRepeat: 150 // Continuous Convergence Conqueror
+  }];
+
+  var sum = 0;
+  achievements.forEach(function (achievement) {
+    sum += achievementCurrent(accountData, achievement.id, achievement.perRepeat);
+  });
+
+  return sum;
+}
+
 // The unlocked home instance cats
 function homeCats(accountData) {
   if (!accountData.home) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gw2e-account-statistics",
-  "version": "3.15.2",
+  "version": "3.16.0",
   "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.43",
+    "@gw2efficiency/game-data": "^0.1.50",
     "array-unique": "^0.3.2",
     "gw2e-account-value": "^3.13.1",
     "gw2e-static-data": "^0.5.32",

package/tests/items.spec.js

@@ -68,6 +68,8 @@ describe('statistics > items', () => {
       amnytasHerosChoice: null,
       innerNayosEndHerosChoice: null,
       convergenceHerosChoice: null,
+      citadelOfZakirosHerosChoice: null,
+      janthirSyntriHerosChoice: null,
       uniqueTonics: null,
       bloodRubies: null,
       petrifiedWood: null,

package/tests/progression.spec.js

@@ -283,4 +283,37 @@ describe('statistics > progression', () => {
     expect(progressionStatistics({home: {}}).homeNodes).to.equal(null)
     expect(progressionStatistics({home: {nodes}}).homeNodes).to.equal(8)
   })
+
+  it('can calculate the completed arenanet employee achievements', () => {
+    expect(progressionStatistics({}).arenanetEmployeeAchievements).to.equal(null)
+    expect(progressionStatistics({achievements: []}).arenanetEmployeeAchievements).to.equal(0)
+    expect(progressionStatistics({
+      achievements: [
+        { id: 2037, current: 40, max: 40, done: true },
+        { id: 2150, current: 1, max: 1, done: true },
+        { id: 3067, current: 1, max: 1, done: true },
+        { id: 4501, current: 1, max: 1, done: true },
+        { id: 4537, current: 1, max: 1, done: true },
+        { id: 5457, current: 1, max: 1, done: true },
+        { id: 7779, current: 0, max: 1, done: false },
+        { id: 7853, current: 1, max: 1, done: true }
+      ]
+    }).arenanetEmployeeAchievements).to.equal(4)
+  })
+
+  it('can calculate the completed convergence completions', () => {
+    expect(progressionStatistics({}).convergenceCompletions).to.equal(null)
+    expect(progressionStatistics({achievements: []}).convergenceCompletions).to.equal(0)
+    expect(progressionStatistics({
+      achievements: [
+        { id: 7668, current: 15, max: 100, done: false }
+      ]
+    }).convergenceCompletions).to.equal(15)
+    expect(progressionStatistics({
+      achievements: [
+        { id: 7668, current: 100, max: 100, done: true },
+        { id: 7720, current: 18, max: 150, done: false, repeated: 1 }
+      ]
+    }).convergenceCompletions).to.equal(100 + 150 + 18)
+  })
 })

package/tests/wallet.spec.js

@@ -74,7 +74,8 @@ describe('statistics > wallet', () => {
       calcifiedGasp: null,
       jadeMinersKeycard: null,
       pinchOfStardust: null,
-      staticCharge: null
+      staticCharge: null,
+      ursusOblige: null
     })
   })
 
@@ -194,7 +195,8 @@ describe('statistics > wallet', () => {
       calcifiedGasp: 0,
       jadeMinersKeycard: 0,
       pinchOfStardust: 0,
-      staticCharge: 0
+      staticCharge: 0,
+      ursusOblige: 0
     })
   })