Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.230.0",
+  "version": "4.230.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.230.0",
+  "version": "4.230.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.17.10",

website/common/locales/en/questsContent.json

@@ -780,7 +780,7 @@
   "rockingReptilesNotes": "Contains 'The Insta-Gator,' 'The Serpent of Distraction,' and 'The Veloci-Rapper.' Available until September 30.",
 
   "delightfulDinosText": "Delightful Dinos Quest Bundle",
-  "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until November 30.",
+  "delightfulDinosNotes": "Contains 'The Pterror-dactyl,' 'The Trampling Triceratops,' and 'The Dinosaur Unearthed.' Available until May 31.",
 
   "questAmberText": "The Amber Alliance",
   "questAmberNotes": "You’re sitting in the Tavern with @beffymaroo and @-Tyr- when @Vikte bursts through the door and excitedly tells you about the rumors of another type of Magic Hatching Potion hidden in the Taskwoods. Having completed your Dailies, the three of you immediately agree to help @Vikte on their search. After all, what’s the harm in a little adventure?<br><br>After walking through the Taskwoods for hours, you’re beginning to regret joining such a wild chase. You’re about to head home, when you hear a surprised yelp and turn to see a huge lizard with shiny amber scales coiled around a tree, clutching @Vikte in her claws. @beffymaroo reaches for her sword.<br><br>“Wait!” cries @-Tyr-. “It’s the Trerezin! She’s not dangerous, just dangerously clingy!”",

website/common/script/content/bundles.js

@@ -220,7 +220,7 @@ const bundles = {
       'trex_undead',
     ],
     canBuy () {
-      return moment().isBetween('2019-11-14', '2019-12-02');
+      return moment().isBetween('2022-05-16', '2022-05-31');
     },
     type: 'quests',
     value: 7,

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

@@ -10,11 +10,17 @@ const gemsPromo = {
 
 export const EVENTS = {
   noCurrentEvent: {
-    start: '2022-04-30T20:00-05:00',
+    start: '2022-05-31T20:00-04:00',
     end: '2022-06-30T20:00-05:00',
     season: 'normal',
     npcImageSuffix: '',
   },
+  potions202205: {
+    start: '2022-05-17T08:00-04:00',
+    end: '2022-05-31T20:00-04:00',
+    season: 'normal',
+    npcImageSuffix: '',
+  },
   spring2022: {
     start: '2022-03-22T08:00-05:00',
     end: '2022-04-30T20:00-05:00',

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

@@ -96,13 +96,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionFloral'),
     limited: true,
-    event: EVENTS.potions202105,
+    event: EVENTS.potions202205,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMay'),
-      previousDate: t('mayYYYY', { year: 2019 }),
+      previousDate: t('mayYYYY', { year: 2021 }),
     }),
     canBuy () {
-      return moment().isBefore(EVENTS.potions202105.end);
+      return moment().isBefore(EVENTS.potions202205.end);
     },
   },
   Aquatic: {
@@ -297,12 +297,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionSunshine'),
     limited: true,
+    event: EVENTS.potions202205,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndMay'),
-      previousDate: t('mayYYYY', { year: 2019 }),
+      previousDate: t('mayYYYY', { year: 2020 }),
     }),
     canBuy () {
-      return moment().isBefore('2020-06-02');
+      return moment().isBefore(EVENTS.potions202205.end);
     },
   },
   Bronze: {

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

@@ -1,11 +1,11 @@
 import moment from 'moment';
-import { EVENTS } from './constants';
+// import { EVENTS } from './constants';
 // Magic Hatching Potions are configured like this:
 // type: 'premiumHatchingPotion',  // note no "s" at the end
 // path: 'premiumHatchingPotions.Rainbow',
 const featuredItems = {
   market () {
-    if (moment().isBefore(EVENTS.spring2022.end)) {
+    if (moment().isBefore('2022-05-31T20:00-04:00')) {
       return [
         {
           type: 'armoire',
@@ -13,15 +13,15 @@ const featuredItems = {
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Shimmer',
+          path: 'premiumHatchingPotions.Sunshine',
         },
         {
           type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.Celestial',
+          path: 'premiumHatchingPotions.Floral',
         },
         {
-          type: 'premiumHatchingPotion',
-          path: 'premiumHatchingPotions.PolkaDot',
+          type: 'hatchingPotions',
+          path: 'hatchingPotions.Golden',
         },
       ];
     }
@@ -45,19 +45,19 @@ const featuredItems = {
     ];
   },
   quests () {
-    if (moment().isBefore('2022-03-31T20:00-04:00')) {
+    if (moment().isBefore('2022-05-31T20:00-04:00')) {
       return [
         {
           type: 'bundles',
-          path: 'bundles.cuddleBuddies',
+          path: 'bundles.delightfulDinos',
         },
         {
           type: 'quests',
-          path: 'quests.egg',
+          path: 'quests.alligator',
         },
         {
           type: 'quests',
-          path: 'quests.ghost_stag',
+          path: 'quests.turtle',
         },
       ];
     }