Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.265.0",
+  "version": "4.266.0",
   "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.265.0",
+  "version": "4.266.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.20.12",

website/client/src/assets/css/sprites/spritesmith-main.css

@@ -58403,11 +58403,6 @@
   width: 81px;
   height: 99px;
 }
-.Pet-HatchingPotion-TeaShop {
-  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet-HatchingPotion-TeaShop.png');
-  width: 68px;
-  height: 68px;
-}
 .Pet_HatchingPotion_Amber {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Amber.png');
   width: 68px;
@@ -58653,6 +58648,11 @@
   width: 68px;
   height: 68px;
 }
+.Pet_HatchingPotion_TeaShop {
+  background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_TeaShop.png');
+  width: 68px;
+  height: 68px;
+}
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/Pet_HatchingPotion_Thunderstorm.png');
   width: 68px;

website/common/locales/en/content.json

@@ -311,6 +311,7 @@
   "hatchingPotionVirtualPet": "Virtual Pet",
   "hatchingPotionPorcelain": "Porcelain",
   "hatchingPotionPinkMarble": "Pink Marble",
+  "hatchingPotionTeaShop": "Tea Shop",
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
   "premiumPotionAddlNotes": "Not usable on quest pet eggs. Available for purchase until <%= date(locale) %>.",

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

@@ -15,6 +15,11 @@ export const EVENTS = {
     season: 'normal',
     npcImageSuffix: '',
   },
+  aprilFools2023: {
+    start: '2023-04-01T08:00-04:00',
+    end: '2023-04-02T08:00-04:00',
+    aprilFools: 'teaShop',
+  },
   spring2023: {
     start: '2023-03-21T08:00-04:00',
     end: '2023-04-30T23:59-04:00',

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

@@ -564,13 +564,13 @@ const wacky = {
   Veggie: {
     text: t('hatchingPotionVeggie'),
     limited: true,
-    event: EVENTS.spring2022,
+    event: EVENTS.spring2023,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndApril'),
-      previousDate: t('aprilYYYY', { year: 2021 }),
+      previousDate: t('aprilYYYY', { year: 2022 }),
     }),
     canBuy () {
-      return moment().isBetween('2022-04-07T08:00-05:00', EVENTS.spring2022.end);
+      return moment().isBetween('2023-04-06T08:00-04:00', EVENTS.spring2023.end);
     },
   },
   Dessert: {
@@ -585,6 +585,17 @@ const wacky = {
     _addlNotes: t('premiumPotionUnlimitedNotes'),
     canBuy: hasQuestAchievementFunction('virtualpet'),
   },
+  TeaShop: {
+    text: t('hatchingPotionTeaShop'),
+    limited: true,
+    event: EVENTS.spring2023,
+    _addlNotes: t('premiumPotionAddlNotes', {
+      date: t('dateEndApril'),
+    }),
+    canBuy () {
+      return moment().isBetween('2023-04-06T08:00-04:00', EVENTS.spring2023.end);
+    },
+  },
 };
 
 each(drops, (pot, key) => {