Merge remote-tracking branch 'origin/develop' into apple_sub_fix

website/common/script/content/bundles.js

@@ -194,8 +194,9 @@ const bundles = {
       'seaserpent',
       'gryphon',
     ],
+    event: EVENTS.bundle202302,
     canBuy () {
-      return moment().isBefore('2022-02-28T20:00-05:00');
+      return moment().isBetween(EVENTS.bundle202302.start, EVENTS.bundle202302.end);
     },
     type: 'quests',
     value: 7,

website/common/script/content/constants/events.js

@@ -10,11 +10,25 @@ const gemsPromo = {
 
 export const EVENTS = {
   noEvent: {
-    start: '2023-02-08T23:59-05:00',
-    end: '2023-02-14T08:00-05:00',
+    start: '2023-02-28T23:59-05:00',
+    end: '2023-03-21T08:00-05:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  bundle202302: {
+    start: '2023-02-21T08:00-05:00',
+    end: '2023-02-28T23:59-05:00',
+  },
+  potions202302:{
+    start: '2023-02-13T08:00-05:00',
+    end: '2023-02-28T23:59-05:00',
+  },
+  valentines2023: {
+    start: '2023-02-13T08:00-05:00',
+    end: '2023-02-17T23:59-05:00',
+    season: 'valentines',
+    npcImageSuffix: '_valentines',
+  },
   birthday10: {
     start: '2023-01-30T08:00-05:00',
     end: '2023-02-08T23:59-05:00',

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

@@ -62,8 +62,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionCupid'),
     limited: true,
+    event: EVENTS.potions202302,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndFebruary'),
+      previousDate: t('februaryYYYY', { year: 2022 }),
+    }),
     canBuy () {
-      return moment().isBefore('2022-02-28T20:00-05:00');
+      return moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end);
     },
   },
   Shimmer: {
@@ -278,8 +283,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionRoseQuartz'),
     limited: true,
+    event: EVENTS.potions202302,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndFebruary'),
+      previousDate: t('februaryYYYY', { year: 2022 }),
+    }),
     canBuy () {
-      return moment().isBefore('2022-02-28T20:00-05:00');
+      return moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end);
     },
   },
   Celestial: {
@@ -541,6 +551,13 @@ const premium = {
       return moment().isBetween(EVENTS.birthday10.start, EVENTS.birthday10.end);
     },
   },
+  PinkMarble: {
+    value: 2,
+    text: t('hatchingPotionPinkMarble'),
+    limited: true,
+    canBuy: hasQuestAchievementFunction('pinkMarble'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
+  },
 };
 
 const wacky = {

website/common/script/content/index.js

@@ -137,7 +137,7 @@ api.cardTypes = {
   valentine: {
     key: 'valentine',
     messageOptions: 4,
-    yearRound: moment().isBefore('2022-02-18T20:00-05:00'),
+    yearRound: moment().isBefore('2023-02-17T23:59-05:00'),
   },
   birthday: {
     key: 'birthday',

website/common/script/content/quests/potions.js

@@ -170,6 +170,45 @@ const QUEST_POTIONS = {
       unlock: t('questOnyxUnlockText'),
     },
   },
+  pinkMarble: {
+    text: t('questPinkMarbleText'),
+    notes: t('questPinkMarbleNotes'),
+    completion: t('questPinkMarbleCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    boss: {
+      name: t('questPinkMarbleBoss'),
+      hp: 1200,
+      str: 2,
+      rage: {
+        title: t('questPinkMarbleRageTitle'),
+        description: t('questPinkMarbleRageDescription'),
+        value: 50,
+        progressDrain: 0.5,
+        effect: t('questPinkMarbleRageEffect'),
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'PinkMarble',
+          text: t('questPinkMarbleDropPinkMarblePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'PinkMarble',
+          text: t('questPinkMarbleDropPinkMarblePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'PinkMarble',
+          text: t('questPinkMarbleDropPinkMarblePotion'),
+        },
+      ],
+      gp: 75,
+      exp: 800,
+      unlock: t('questPinkMarbleUnlockText'),
+    },
+  },
   ruby: {
     text: t('questRubyText'),
     notes: t('questRubyNotes'),

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

@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
+    if (moment().isBetween(EVENTS.potions202302.start, EVENTS.potions202302.end)) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.StarryNight',
+          path: 'premiumHatchingPotions.RoseQuartz',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Holly',
+          path: 'premiumHatchingPotions.Cupid',
         },
         {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Aurora',
+          type: 'hatchingPotions',
+          path: 'hatchingPotions.CottonCandyPink',
         },
       ];
     }
@@ -45,19 +45,19 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
+    if (moment().isBetween(EVENTS.bundle202302.start, EVENTS.bundle202302.end)) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.winterQuests',
+          path: 'bundles.mythicalMarvels',
         },
         {
           type: 'quests',
-          path: 'quests.whale',
+          path: 'quests.treeling',
         },
         {
           type: 'quests',
-          path: 'quests.turtle',
+          path: 'quests.rock',
         },
       ];
     }

website/common/script/content/spells.js

@@ -475,7 +475,7 @@ spells.special = {
     target: 'user',
     notes: t('valentineCardNotes'),
     canOwn () {
-      return false;
+      return moment().isBetween('2023-02-13T08:00-05:00', '2023-02-17T23:59-05:00');
     },
     cast (user, target) {
       if (user === target) {