fix merge conflict

website/common/script/content/hatching-potions.js

@@ -62,6 +62,9 @@ const premium = {
     value: 2,
     text: t('hatchingPotionCupid'),
     limited: true,
+    canBuy () {
+      return moment().isBefore('2020-03-02');
+    },
   },
   Shimmer: {
     value: 2,
@@ -187,6 +190,9 @@ const premium = {
     value: 2,
     text: t('hatchingPotionRoseQuartz'),
     limited: true,
+    canBuy () {
+      return moment().isBefore('2020-03-02');
+    },
   },
   Celestial: {
     value: 2,
@@ -240,6 +246,13 @@ const premium = {
       date: t('dateEndJanuary'),
     }),
   },
+  Ruby: {
+    value: 2,
+    text: t('hatchingPotionRuby'),
+    limited: true,
+    canBuy: hasQuestAchievementFunction('ruby'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
+  },
 };
 
 const wacky = {

website/common/script/content/index.js

@@ -128,6 +128,7 @@ api.cardTypes = {
   valentine: {
     key: 'valentine',
     messageOptions: 4,
+    yearRound: moment().isBefore('2020-03-02'),
   },
   birthday: {
     key: 'birthday',

website/common/script/content/quests.js

@@ -3537,6 +3537,47 @@ const quests = {
       unlock: t('questAmberUnlockText'),
     },
   },
+  ruby: {
+    text: t('questRubyText'),
+    notes: t('questRubyNotes'),
+    completion: t('questRubyCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    collect: {
+      rubyGem: {
+        text: t('questRubyCollectRubyGems'),
+        count: 25,
+      },
+      venusRune: {
+        text: t('questRubyCollectVenusRunes'),
+        count: 10,
+      },
+      aquariusRune: {
+        text: t('questRubyCollectAquariusRunes'),
+        count: 10,
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Ruby',
+          text: t('questRubyDropRubyPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Ruby',
+          text: t('questRubyDropRubyPotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Ruby',
+          text: t('questRubyDropRubyPotion'),
+        },
+      ],
+      gp: 50,
+      exp: 100,
+      unlock: t('questRubyUnlockText'),
+    },
+  },
 };
 
 each(quests, (v, key) => {

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

@@ -5,43 +5,23 @@ import moment from 'moment';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween('2019-12-19', '2020-01-02')) {
+    if (moment().isBefore('2020-03-02')) {
       return [
         {
           type: 'card',
-          path: 'cardTypes.nye',
+          path: 'cardTypes.valentine',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Aurora',
+          path: 'premiumHatchingPotions.Cupid',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Holly',
+          path: 'premiumHatchingPotions.RoseQuartz',
         },
         {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.StarryNight',
-        },
-      ];
-    }
-    if (moment().isBetween('2019-12-19', '2020-02-02')) {
-      return [
-        {
-          type: 'armoire',
-          path: 'armoire',
-        },
-        {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Aurora',
-        },
-        {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Holly',
-        },
-        {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.StarryNight',
+          type: 'eggs',
+          path: 'eggs.Fox',
         },
       ];
     }
@@ -52,11 +32,11 @@ const featuredItems = {
       },
       {
         type: 'hatchingPotions',
-        path: 'hatchingPotions.White',
+        path: 'hatchingPotions.Golden',
       },
       {
         type: 'eggs',
-        path: 'eggs.PandaCub',
+        path: 'eggs.Wolf',
       },
       {
         type: 'food',
@@ -65,22 +45,6 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBetween('2019-12-19', '2020-02-02')) {
-      return [
-        {
-          type: 'bundles',
-          path: 'bundles.winterQuests',
-        },
-        {
-          type: 'quests',
-          path: 'quests.evilsanta',
-        },
-        {
-          type: 'quests',
-          path: 'quests.evilsanta2',
-        },
-      ];
-    }
     return [
       {
         type: 'quests',
@@ -92,7 +56,7 @@ const featuredItems = {
       },
       {
         type: 'quests',
-        path: 'quests.silver',
+        path: 'quests.ruby',
       },
     ];
   },