Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.156.3",
+  "version": "4.157.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.156.3",
+  "version": "4.157.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.11.6",

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

@@ -2170,7 +2170,7 @@
   width: 68px;
   height: 68px;
 }
-.shop_set_mystery202009 {
+.shop_set_mystery_202009 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-9.png');
   background-position: -690px -1593px;
   width: 68px;

website/common/locales/en/content.json

@@ -303,6 +303,7 @@
   "hatchingPotionFluorite": "Fluorite",
   "hatchingPotionSandSculpture": "Sand Sculpture",
   "hatchingPotionWindup": "Wind-Up",
+  "hatchingPotionTurquoise": "Turquoise",
 
   "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

@@ -823,5 +823,14 @@
   "questWindupCompletion": "As you dodge the attacks, you notice something odd: a stripy brass tail sticking out of the robot’s chassis. You plunge a hand amid the grinding gears and pull out… a trembling wind-up tiger cub. It snuggles against your shirt.<br><br>The clockwork robot immediately stops flailing and smiles, its cogs clicking back into place. “Ki-Ki-Kitty! Kitty got in me!”<br><br>“Great!” the Powerful says, blushing. “I’ve been working hard on these wind-up pet potions. I guess I lost track of my new creations. I’ve been missing my ‘Tidy the workshop’ daily a lot lately…”<br><br>You follow the tinkerer and Clankton inside. Parts, tools and potions cover every surface. “Powerful” takes your watch, but hands you a few potions.<br><br>“Take these. Clearly they’ll be safer with you!”",
   "questWindupBoss": "Clankton",
   "questWindupDropWindupPotion": "Wind-Up Hatching Potion",
-  "questWindupUnlockText": "Unlocks Wind-Up Hatching Potions for purchase in the Market"
+  "questWindupUnlockText": "Unlocks Wind-Up Hatching Potions for purchase in the Market",
+
+  "questTurquoiseText": "Turquoise Treasure Toil",
+  "questTurquoiseNotes": "@gawrone runs into your room holding their Habitican Diploma in one hand and an extraordinarily large and dusty leather-bound tome in the other.<br><br>“You’ll never guess what I’ve discovered!” they say. “The reason the Flourishing Fields are so fertile is that they were once covered with a vast ocean. It’s rumored that an ancient people once inhabited that ocean floor in enchanted cities. I’ve used forgotten maps to find the most likely location! Get your shovel!”<br><br>The next evening you meet up, @QuartzFox and @starsystemic joining the party, and begin to dig. Deep in the ground you find a rune, with a turquoise gem nearby!<br><br>“Keep digging!” @gawrone urges. “If we find enough, we can make one of their ancient potions and history at the same time!”",
+  "questTurquoiseCompletion": "Hot and sweaty, your team finally stops to rest beside the upturned dirt and looks at the pile of runes and gems you’ve found.<br><br>“Unbelievable,” murmurs @QuartzFox. “This will rewrite the history books.”<br><br>“Let me take these materials back to Habitica University for analysis,” says @gawrone. “There should be plenty to study and to make some turquoise potions for all of us! Who knows what else we could find buried around here?”<br><br>@starsystemic chimes in: “It’s amazing how much you can get accomplished with some hard work!”",
+  "questTurquoiseCollectSagittariusRunes": "Sagittarius Runes",
+  "questTurquoiseCollectNeptuneRunes": "Neptune Runes",
+  "questTurquoiseCollectTurquoiseGems": "Turquoise Gems",
+  "questTurquoiseDropTurquoisePotion": "Turquoise Hatching Potion",
+  "questTurquoiseUnlockText": "Unlocks Turquoise Hatching Potions for purchase in the Market"
 }

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

@@ -340,6 +340,13 @@ const premium = {
     canBuy: hasQuestAchievementFunction('windup'),
     _addlNotes: t('premiumPotionUnlimitedNotes'),
   },
+  Turquoise: {
+    value: 2,
+    text: t('hatchingPotionTurquoise'),
+    limited: true,
+    canBuy: hasQuestAchievementFunction('turquoise'),
+    _addlNotes: t('premiumPotionUnlimitedNotes'),
+  },
 };
 
 const wacky = {

website/common/script/content/quests.js

@@ -3682,6 +3682,47 @@ const quests = {
       unlock: t('questWindupUnlockText'),
     },
   },
+  turquoise: {
+    text: t('questTurquoiseText'),
+    notes: t('questTurquoiseNotes'),
+    completion: t('questTurquoiseCompletion'),
+    value: 4,
+    category: 'hatchingPotion',
+    collect: {
+      turquoiseGem: {
+        text: t('questTurquoiseCollectTurquoiseGems'),
+        count: 25,
+      },
+      sagittariusRune: {
+        text: t('questTurquoiseCollectSagittariusRunes'),
+        count: 10,
+      },
+      neptuneRune: {
+        text: t('questTurquoiseCollectNeptuneRunes'),
+        count: 10,
+      },
+    },
+    drop: {
+      items: [
+        {
+          type: 'hatchingPotions',
+          key: 'Turquoise',
+          text: t('questTurquoiseDropTurquoisePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Turquoise',
+          text: t('questTurquoiseDropTurquoisePotion'),
+        }, {
+          type: 'hatchingPotions',
+          key: 'Turquoise',
+          text: t('questTurquoiseDropTurquoisePotion'),
+        },
+      ],
+      gp: 50,
+      exp: 100,
+      unlock: t('questTurquoiseUnlockText'),
+    },
+  },
 };
 
 each(quests, (v, key) => {

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

@@ -26,15 +26,15 @@ const featuredItems = {
     return [
       {
         type: 'quests',
-        path: 'quests.snail',
+        path: 'quests.squirrel',
       },
       {
         type: 'quests',
-        path: 'quests.alligator',
+        path: 'quests.cow',
       },
       {
         type: 'quests',
-        path: 'quests.fluorite',
+        path: 'quests.turquoise',
       },
     ];
   },

website/server/controllers/api-v3/news.js

@@ -4,7 +4,7 @@ const api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from
 // controllers
-const LAST_ANNOUNCEMENT_TITLE = 'BLOG POST: MYSTERY ITEMS!';
+const LAST_ANNOUNCEMENT_TITLE = 'NEW MAGIC HATCHING POTION QUEST: TURQUOISE!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,23 +31,20 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>9/10/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>9/15/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_mystery_202009 center-block"></div>
+        <div class="quest_turquoise center-block"></div>
         <p>
-          This month's <a href='https://habitica.wordpress.com/2020/09/09/mystery-item/'
-          target='_blank'>featured Wiki article</a> is about Mystery Items (also known as
-          Subscriber Gear)! We hope that it will help you as learn about the benefits of a Habitica
-          Subscription. Be sure to check it out, and let us know what you think by reaching out on
-          <a href='https://twitter.com/habitica' target='_blank'>Twitter</a>, <a
-          href='http://blog.habitrpg.com' target='_blank'>Tumblr</a>, and <a
-          href='https://facebook.com/habitica' target='_blank'>Facebook</a>.
+          Grab your shovel and head for the Flourishing Fields--treasure awaits! Get the latest
+          Magic Hatching Potion quest, "Turquoise Treasure Toil", to earn historic Turquoise Magic
+          Hatching Potions by completing your real-life tasks!
         </p>
-        <div class="small mb-3">
-          by shanaqui and the Wiki Wizards
+        <div class="small">
+          Art by gawrone, QuartzFox, beffymaroo, starsystemic, Tyche_Alba, and loremi
         </div>
+        <div class="small mb-3">Writing by FactAndFiction</div>
       </div>
       `,
     });