Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.138.0",
+  "version": "4.138.1",
   "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.138.0",
+  "version": "4.138.1",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.9.0",

website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css

@@ -1,12 +1,12 @@
 .promo_achievement_CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -328px -316px;
+  background-position: -952px -740px;
   width: 204px;
   height: 102px;
 }
 .promo_armoire_backgrounds_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -433px -445px;
+  background-position: -340px -659px;
   width: 423px;
   height: 147px;
 }
@@ -16,69 +16,81 @@
   width: 623px;
   height: 167px;
 }
+.promo_egg_quest {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -952px -296px;
+  width: 354px;
+  height: 147px;
+}
 .promo_hugabug_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -424px -608px;
+  background-position: -952px -148px;
   width: 420px;
   height: 147px;
 }
 .promo_mystery_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -328px -168px;
+  background-position: -952px -444px;
   width: 282px;
   height: 147px;
 }
 .promo_pi_day {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -283px -756px;
+  background-position: -624px -277px;
   width: 273px;
   height: 147px;
 }
 .promo_seasonal_shop_spring {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -857px -445px;
+  background-position: -316px -168px;
   width: 162px;
   height: 138px;
 }
 .promo_spring_2019 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -445px;
+  background-position: -430px -475px;
   width: 432px;
   height: 162px;
 }
 .promo_spring_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -624px 0px;
+  background-position: 0px -475px;
   width: 429px;
   height: 183px;
 }
 .promo_spring_potions_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -608px;
+  background-position: -952px 0px;
   width: 423px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -845px -608px;
+  background-position: -1235px -444px;
   width: 96px;
   height: 69px;
 }
 .scene_dailies {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -168px;
+  background-position: -624px 0px;
   width: 327px;
   height: 276px;
 }
 .scene_gaining_achievement {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -624px -184px;
+  background-position: 0px -659px;
   width: 339px;
   height: 210px;
 }
 .scene_shanaqui {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: 0px -756px;
+  background-position: -952px -592px;
   width: 282px;
   height: 147px;
 }
+.scene_tough_times {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: 0px -168px;
+  width: 315px;
+  height: 306px;
+}

website/common/script/content/quests.js

@@ -514,7 +514,7 @@ const quests = {
     value: 1,
     category: 'pet',
     canBuy () {
-      return false;
+      return true;
     },
     collect: {
       plainEgg: {

website/common/script/libs/shops-seasonal.config.js

@@ -22,6 +22,7 @@ export default {
   ],
 
   availableQuests: [
+    'egg',
   ],
 
   featuredSet: 'spring2020PuddleMageSet',

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 = 'SPRING FLING BEGINS! LIMITED EDITION EQUIPMENT, SEASONAL SHOP, AND MAGIC HATCHING POTIONS!';
+const LAST_ANNOUNCEMENT_TITLE = 'EGG QUEST IN THE SEASONAL SHOP! AND HELPFUL RESOURCES FOR TOUGH TIMES';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,50 +31,28 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>3/19/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>3/24/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_spring_2020 center-block"></div>
-        <h3>Limited Edition Class Outfits</h3>
+        <div class="promo_egg_quest center-block"></div>
+        <h3>Egg Quest Available</h3>
         <p>
-          From now until April 30th, limited edition outfits are available in the Rewards column!
-          Depending on your class, you can be a Rhinoceros Beetle Warrior, Iris Healer, Lapis
-          Lazuli Rogue, or Puddle Mage. You'd better get productive to earn enough Gold before your
-          time runs out...
+          The Egg Quest is available again in the <a href='/shops/seasonal'>Seasonal Shop</a>!
+          Strange eggs are appearing all over Habitica. Can you collect them all to earn some
+          colorful Egg pets and mounts?
         </p>
-        <div class="small mb-3">by Vikte, gawrone, jjgame83, Shine Caramia, and SabreCat</div>
-        <div class="promo_seasonal_shop_spring center-block"></div>
-        <h3>Seasonal Shop Opens</h3>
+        <div class="small mb-3">by Megan, Beffymaroo, and Lemoness</div>
+        <div class="scene_tough_times center-block"></div>
+        <h3>Blog Post: Helpful Resources for Tough Times</h3>
         <p>
-          The <a href='/shops/seasonal'>Seasonal Shop</a> has opened! It's stocking springtime
-          Seasonal Edition goodies at the moment, including past spring outfits. Everything there
-          will be available to purchase during the Spring Fling event each year, but it's only open
-          until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these
-          items again!
+          Hey Habiticans! We hope you're all staying safe and well during this stressful time.
+          We've put together some <a
+          href='https://habitica.wordpress.com/2020/03/20/helpful-resources-for-tough-times/'
+          target='_blank'>resources on the Habitica blog</a> for help with maintaining health and
+          wellness, setting up or changing a routine, and more! Take care, we love y'all.
         </p>
-        <div class="small mb-3">
-          by Eslyn, Aspiring Advocate, OuttaMyMind, Lt. Cabel, Vikte, Lalaitha, DialFForFunky,
-          Gerald the Pixel, Scarvia, Awesome kitty, usnbfs, Lemoness, Balduranne, PainterProphet,
-          Beffymaroo, and SabreCat
-        </div>
-        <div class="promo_spring_potions_2020 center-block"></div>
-        <h3>Spring Fling Magic Hatching Potions</h3>
-        <p>
-          There's a new pet breed in town! Check out the brand-new Birch Bark Potions and the
-          return of Shimmer and Celestial Potions to brighten your Spring avatar look from <a
-          href='/shops/market'>the Market</a> and use them to hatch any standard pet egg. (Magic
-          Hatching Potions do not work on Quest Pet eggs.) Magic Hatching Potion Pets aren't picky,
-          so they'll happily eat any kind of food that you feed them!
-        </p>
-        <p>
-          These potions will be available until Spring Fling ends on April 30. After they're gone,
-          it will be at least a year before these Hatching Potions return, so be sure to get them
-          now!
-        </p>
-        <div class="small mb-3">
-          by Teto Forever, tricksy.fox, Bonogo, Mara, ravenlune, Ricardo, and SabreCat
-        </div>
+        <div class="small mb-3">by the Habitica Team</div>
       </div>
       `,
     });