Merge branch 'release' into develop

website/common/script/content/gear/sets/mystery.js

@@ -400,6 +400,12 @@ const back = {
     mystery: '201912',
     value: 0,
   },
+  202001: {
+    text: t('backMystery202001Text'),
+    notes: t('backMystery202001Notes'),
+    mystery: '202001',
+    value: 0,
+  },
 };
 
 const body = {
@@ -775,6 +781,12 @@ const head = {
     mystery: '201912',
     value: 0,
   },
+  202001: {
+    text: t('headMystery202001Text'),
+    notes: t('headMystery202001Notes'),
+    mystery: '202001',
+    value: 0,
+  },
   301404: {
     text: t('headMystery301404Text'),
     notes: t('headMystery301404Notes'),

website/common/script/content/gear/sets/special/index.js

@@ -2614,6 +2614,12 @@ const head = {
     value: 60,
     int: 7,
   },
+  nye2019: {
+    text: t('headSpecialNye2019Text'),
+    notes: t('headSpecialNye2019Notes'),
+    value: 0,
+    canOwn: ownsItem('head_special_nye2019'),
+  },
 };
 
 const headAccessory = {

website/common/script/content/index.js

@@ -1,5 +1,6 @@
 import defaults from 'lodash/defaults';
 import each from 'lodash/each';
+import moment from 'moment';
 import t from './translation';
 import { tasksByCategory } from './tasks';
 
@@ -117,6 +118,7 @@ api.cardTypes = {
   nye: {
     key: 'nye',
     messageOptions: 5,
+    yearRound: moment().isBefore('2020-01-02'),
   },
   thankyou: {
     key: 'thankyou',

website/common/script/content/shop-featuredItems.js

@@ -8,8 +8,8 @@ const featuredItems = {
     if (moment().isBetween('2019-12-19', '2020-02-02')) {
       return [
         {
-          type: 'armoire',
-          path: 'armoire',
+          type: 'card',
+          path: 'cardTypes.nye',
         },
         {
           type: 'premiumHatchingPotion',

website/common/script/libs/shops-seasonal.config.js

@@ -19,6 +19,7 @@ export default {
   },
 
   availableSpells: [
+    'snowball',
   ],
 
   availableQuests: [