Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.211.1",
+  "version": "4.211.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.211.1",
+  "version": "4.211.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.16.0",

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

@@ -10,26 +10,16 @@ const gemsPromo = {
 
 export const EVENTS = {
   noCurrentEvent: {
-    start: '2021-10-31T20:00-04:00',
+    start: '2021-11-30T20:00-04:00',
     end: '2021-12-31T20:00-04:00',
     season: 'normal',
     npcImageSuffix: '',
   },
-  spooky_extra_gems: { // eslint-disable-line camelcase
-    start: '2021-10-29T08:00-04:00',
-    end: '2021-10-31T20:00-04:00',
-    npcImageSuffix: '_fall',
-    season: 'fall',
-    gemsPromo,
-    promo: 'spooky_extra_gems',
-  },
-  fall_extra_gems: { // eslint-disable-line camelcase
-    start: '2021-10-05T08:00-04:00',
-    end: '2021-10-12T20:00-04:00',
-    npcImageSuffix: '_fall',
-    season: 'fall',
-    gemsPromo,
-    promo: 'fall_extra_gems',
+  potions202111: {
+    start: '2021-11-09T08:00-05:00',
+    end: '2021-11-30T20:00-05:00',
+    season: 'normal',
+    npcImageSuffix: '',
   },
   fall2021: {
     start: '2021-09-21T08:00-04:00',

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

@@ -125,12 +125,13 @@ const premium = {
     value: 2,
     text: t('hatchingPotionEmber'),
     limited: true,
+    event: EVENTS.potions202111,
     _addlNotes: t('eventAvailabilityReturning', {
       availableDate: t('dateEndNovember'),
-      previousDate: t('augustYYYY', { year: 2017 }),
+      previousDate: t('novemberYYYY', { year: 2019 }),
     }),
     canBuy () {
-      return moment().isBetween('2019-11-12', '2019-12-02');
+      return moment().isBefore(EVENTS.potions202111.end);
     },
   },
   Thunderstorm: {
@@ -429,12 +430,14 @@ const premium = {
     value: 2,
     text: t('hatchingPotionAutumnLeaf'),
     limited: true,
-    canBuy () {
-      return moment().isBefore('2020-12-02');
-    },
-    _addlNotes: t('premiumPotionAddlNotes', {
-      date: t('dateEndNovember'),
+    event: EVENTS.potions202111,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndNovember'),
+      previousDate: t('novemberYYYY', { year: 2020 }),
     }),
+    canBuy () {
+      return moment().isBefore(EVENTS.potions202111.end);
+    },
   },
   BlackPearl: {
     value: 2,