From 029afa197e8064419faf540a3d4396954bee6790 Mon Sep 17 00:00:00 2001
From: SabreCat <sabrecat@gmail.com>
Date: Wed, 7 Jun 2017 02:41:13 +0000
Subject: [PATCH] fix(achievements): move year-round cards out of seasonal

---
 test/common/libs/achievements.test.js      | 13 ++++++++++++-
 website/common/script/libs/achievements.js |  7 ++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/common/libs/achievements.test.js b/test/common/libs/achievements.test.js
index 390f3bf7bf..ebb385bb66 100644
--- a/test/common/libs/achievements.test.js
+++ b/test/common/libs/achievements.test.js
@@ -121,6 +121,17 @@ describe('achievements', () => {
       });
     });
 
+    it('card achievements exist with counts', () => {
+      let cardTypes = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell'];
+      cardTypes.forEach((card) => {
+        let cardAchiev = basicAchievs[`${card}Cards`];
+
+        expect(cardAchiev).to.exist;
+        expect(cardAchiev).to.have.property('optionalCount')
+          .that.is.a('number');
+      });
+    });
+
     it('rebirth achievement exists with no count', () => {
       let rebirth = basicAchievs.rebirth;
 
@@ -174,7 +185,7 @@ describe('achievements', () => {
     });
 
     it('card achievements exist with counts', () => {
-      let cardTypes = ['greeting', 'thankyou', 'nye', 'valentine', 'birthday', 'congrats', 'getwell'];
+      let cardTypes = ['nye', 'valentine'];
       cardTypes.forEach((card) => {
         let cardAchiev = seasonalAchievs[`${card}Cards`];
 
diff --git a/website/common/script/libs/achievements.js b/website/common/script/libs/achievements.js
index b587dc4411..5c8fcba92b 100644
--- a/website/common/script/libs/achievements.js
+++ b/website/common/script/libs/achievements.js
@@ -191,6 +191,11 @@ function _getBasicAchievements (user, language) {
   _addUltimateGear(result, user, {path: 'warrior', language});
   _addUltimateGear(result, user, {path: 'mage', altPath: 'wizard', language});
 
+  let cardAchievements = ['greeting', 'thankyou', 'birthday', 'congrats', 'getwell'];
+  cardAchievements.forEach(path => {
+    _addSimpleWithCount(result, user, {path, key: `${path}Cards`, language});
+  });
+
   let rebirthTitle;
   let rebirthText;
 
@@ -240,7 +245,7 @@ function _getSeasonalAchievements (user, language) {
 
   _addPlural(result, user, {path: 'costumeContests', language});
 
-  let cardAchievements = ['greeting', 'thankyou', 'nye', 'valentine', 'birthday', 'congrats', 'getwell'];
+  let cardAchievements = ['nye', 'valentine'];
   cardAchievements.forEach(path => {
     _addSimpleWithCount(result, user, {path, key: `${path}Cards`, language});
   });