Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.192.2",
+  "version": "4.193.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.192.2",
+  "version": "4.193.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.13.16",

website/common/locales/en/content.json

@@ -303,6 +303,7 @@
   "hatchingPotionBlackPearl": "Black Pearl",
   "hatchingPotionStainedGlass": "Stained Glass",
   "hatchingPotionPolkaDot": "Polka Dot",
+  "hatchingPotionMossyStone": "Mossy Stone",
 
   "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/locales/en/questsContent.json

@@ -842,5 +842,14 @@
   "questBlackPearlCompletion": "As you batter and blast the beastie, it sheds black pearls across the sands. Their glistening surfaces catch your eye as you dodge another smashing tentacle.<br><br>You may be in mortal peril, but you can’t help thinking of how beautifully they glimmer. Then you can’t help thinking that this is a terrible time for a new potion idea.<br><br>Suddenly the monster freezes. @jjgame83 and @PixelStormArt exchange baffled looks and lower their weapons.<br><br>“YOU HAVE YOUR WISH, MORTAL. MY WORK IS DONE.”<br><br>Asteroidea vanishes, and the sky and waters clear. @QuartzFox stares at you. “Care to explain?”<br><br>You try your best, and together you fill the picnic basket with black pearls. An afternoon of alchemy later, you have to admit it was a pretty good idea.",
   "questBlackPearlBoss": "Asteroidea",
   "questBlackPearlDropBlackPearlPotion": "Black Pearl Hatching Potion",
-  "questBlackPearlUnlockText": "Unlocks Black Pearl Hatching Potions for purchase in the Market"
+  "questBlackPearlUnlockText": "Unlocks Black Pearl Hatching Potions for purchase in the Market",
+
+  "questStoneText": "A Maze of Moss",
+  "questStoneNotes": "You open the gates to the Fortress of Neglect only to be surprised by the moss that has grown all over the statues, rocks and surfaces in the garden. “Oh no, the garden has been neglected for too long!” says @jjgame83.<br><br>“Well, it's never too late to start tending to the garden,” @PixelStormArt says enthusiastically, “but where shall we start tackling the maze of moss?”<br><br>“We can make and follow a plan so we don't get lost,” says @QuartzFox.<br><br>While clearing away the mossy rocks, @starsystemic spots Mars and Capricorn runes hidden underneath. “What are these for? Let's take them back to the Habit City Library to look them up when we're finished.”<br><br>That's assuming you find your way back out of here at all, you think, but don't say aloud.",
+  "questStoneCompletion": "The work clearing overgrowth and moving loose stones taxes you to the limits of your strength. But you divide the work among the team, and place stones in the paths behind you to help you find your way back to the others. The runes you find bolster your strength and determination, too, and in the end the garden doesn't look so neglected at all!<br><br>You convene at the Library as @starsystemic suggested, and find a Magic Potion formula that uses the runes you collected. “This is an unexpected reward for attending to our neglected tasks,” says @jjgame83.<br><br>@QuartzFox agrees, “And that is on top of having a beautiful garden to enjoy with our pets.”<br><br>“Let's start making some a-mazing Mossy Stone Hatching Potions!” says @starsystemic, and everyone joins in happily.",
+  "questStoneCollectMarsRunes": "Mars Runes",
+  "questStoneCollectCapricornRunes": "Capricorn Runes",
+  "questStoneCollectMossyStones": "Mossy Stones",
+  "questStoneDropMossyStonePotion": "Mossy Stone Hatching Potion",
+  "questStoneUnlockText": "Unlocks Mossy Stone Hatching Potions for purchase in the Market"
 }

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

@@ -452,6 +452,13 @@ const premium = {
       return moment().isBefore(EVENTS.spring2021.end);
     },
   },
+  MossyStone: {
+    value: 2,
+    text: t('hatchingPotionMossyStone'),
+    limited: true,
+    canBuy: hasQuestAchievementFunction('stone'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
+  },
 };
 
 const wacky = {

website/common/script/content/quests.js

@@ -3763,6 +3763,47 @@ const quests = {
       unlock: t('questBlackPearlUnlockText'),
     },
   },
+  stone: {
+    text: t('questStoneText'),
+    notes: t('questStoneNotes'),
+    completion: t('questStoneCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    collect: {
+      mossyStone: {
+        text: t('questStoneCollectMossyStones'),
+        count: 25,
+      },
+      marsRune: {
+        text: t('questStoneCollectMarsRunes'),
+        count: 10,
+      },
+      capricornRune: {
+        text: t('questStoneCollectCapricornRunes'),
+        count: 10,
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'MossyStone',
+          text: t('questStoneDropMossyStonePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'MossyStone',
+          text: t('questStoneDropMossyStonePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'MossyStone',
+          text: t('questStoneDropMossyStonePotion'),
+        },
+      ],
+      gp: 50,
+      exp: 100,
+      unlock: t('questStoneUnlockText'),
+    },
+  },
 };
 
 each(quests, (v, key) => {