Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.146.0",
+  "version": "4.146.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.146.0",
+  "version": "4.146.2",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.10.2",

website/common/locales/en/limited.json

@@ -130,7 +130,6 @@
     "fall2018CandymancerMageSet": "Candymancer (Mage)",
     "fall2018CarnivorousPlantSet": "Carnivorous Plant (Healer)",
     "fall2018AlterEgoSet": "Alter Ego (Rogue)",
-    "june2018": "June 2018",
     "winter2019BlizzardSet": "Blizzard (Warrior)",
     "winter2019PyrotechnicSet": "Pyrotechnic (Mage)",
     "winter2019WinterStarSet": "Winter Star (Healer)",
@@ -169,6 +168,7 @@
     "decemberYYYY": "December <%= year %>",
     "marchYYYY": "March <%= year %>",
     "mayYYYY": "May <%= year %>",
+    "juneYYYY": "June <%= year %>",
     "dateEndJuly": "July 31",
     "dateEndAugust": "August 31",
     "dateEndSeptember": "September 21",

website/common/script/content/gear/sets/special/index.js

@@ -1043,6 +1043,7 @@ const armor = {
     notes: t('armorSpecialSummer2019RogueNotes', { per: 15 }),
     value: 90,
     per: 15,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Warrior: {
     event: EVENTS.summer2019,
@@ -1052,6 +1053,7 @@ const armor = {
     notes: t('armorSpecialSummer2019WarriorNotes', { con: 9 }),
     value: 90,
     con: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Mage: {
     event: EVENTS.summer2019,
@@ -1061,6 +1063,7 @@ const armor = {
     notes: t('armorSpecialSummer2019MageNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Healer: {
     event: EVENTS.summer2019,
@@ -1070,6 +1073,7 @@ const armor = {
     notes: t('armorSpecialSummer2019HealerNotes', { con: 15 }),
     value: 90,
     con: 15,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   fall2019Rogue: {
     event: EVENTS.fall2019,
@@ -2594,6 +2598,7 @@ const head = {
     notes: t('headSpecialSummer2019RogueNotes', { per: 9 }),
     value: 60,
     per: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Warrior: {
     event: EVENTS.summer2019,
@@ -2603,6 +2608,7 @@ const head = {
     notes: t('headSpecialSummer2019WarriorNotes', { str: 9 }),
     value: 60,
     str: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Mage: {
     event: EVENTS.summer2019,
@@ -2612,6 +2618,7 @@ const head = {
     notes: t('headSpecialSummer2019MageNotes', { per: 7 }),
     value: 60,
     per: 7,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Healer: {
     event: EVENTS.summer2019,
@@ -2621,6 +2628,7 @@ const head = {
     notes: t('headSpecialSummer2019HealerNotes', { int: 7 }),
     value: 60,
     int: 7,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   fall2019Rogue: {
     event: EVENTS.fall2019,
@@ -3776,6 +3784,7 @@ const shield = {
     notes: t('weaponSpecialSummer2019RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Warrior: {
     event: EVENTS.summer2019,
@@ -3785,6 +3794,7 @@ const shield = {
     notes: t('shieldSpecialSummer2019WarriorNotes', { con: 7 }),
     value: 70,
     con: 7,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Healer: {
     event: EVENTS.summer2019,
@@ -3794,6 +3804,7 @@ const shield = {
     notes: t('shieldSpecialSummer2019HealerNotes', { con: 9 }),
     value: 70,
     con: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Mage: {
     event: EVENTS.summer2019,
@@ -3803,6 +3814,7 @@ const shield = {
     notes: t('shieldSpecialSummer2019MageNotes', { per: 7 }),
     value: 70,
     per: 7,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   fall2019Rogue: {
     event: EVENTS.fall2019,
@@ -4954,6 +4966,7 @@ const weapon = {
     notes: t('weaponSpecialSummer2019RogueNotes', { str: 8 }),
     value: 80,
     str: 8,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Warrior: {
     event: EVENTS.summer2019,
@@ -4963,6 +4976,7 @@ const weapon = {
     notes: t('weaponSpecialSummer2019WarriorNotes', { str: 15 }),
     value: 90,
     str: 15,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Mage: {
     event: EVENTS.summer2019,
@@ -4972,6 +4986,7 @@ const weapon = {
     notes: t('weaponSpecialSummer2019MageNotes', { int: 15 }),
     value: 90,
     int: 15,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   summer2019Healer: {
     event: EVENTS.summer2019,
@@ -4981,6 +4996,7 @@ const weapon = {
     notes: t('weaponSpecialSummer2019HealerNotes', { int: 9 }),
     value: 90,
     int: 9,
+    canBuy: () => CURRENT_SEASON === 'summer',
   },
   fall2019Rogue: {
     event: EVENTS.fall2019,

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

@@ -103,6 +103,14 @@ const premium = {
     value: 2,
     text: t('hatchingPotionAquatic'),
     limited: true,
+    event: EVENTS.summer2020,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndJuly'),
+      previousDate: t('juneYYYY', { year: 2017 }),
+    }),
+    canBuy () {
+      return moment().isBefore('2020-08-02');
+    },
   },
   Ember: {
     value: 2,
@@ -248,6 +256,14 @@ const premium = {
     value: 2,
     text: t('hatchingPotionWatery'),
     limited: true,
+    event: EVENTS.summer2020,
+    _addlNotes: t('eventAvailabilityReturning', {
+      availableDate: t('dateEndJuly'),
+      previousDate: t('juneYYYY', { year: 2019 }),
+    }),
+    canBuy () {
+      return moment().isBefore('2020-08-02');
+    },
   },
   Silver: {
     value: 2,