Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.94.1",
+  "version": "4.95.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.94.1",
+  "version": "4.95.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.6.0",

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

@@ -10,15 +10,21 @@
   width: 423px;
   height: 147px;
 }
-.promo_mystery_201904 {
+.promo_floral_sunshine_potions {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -641px 0px;
+  width: 423px;
+  height: 147px;
+}
+.promo_mystery_201904 {
+  background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -641px -148px;
   width: 282px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -641px -148px;
+  background-position: -924px -148px;
   width: 96px;
   height: 69px;
 }

website/client/assets/css/sprites/spritesmith-main-13.css

@@ -922,144 +922,150 @@
   width: 120px;
   height: 120px;
 }
-.Mount_Body_BearCub-Thunderstorm {
+.Mount_Body_BearCub-Sunshine {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1166px -1232px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_BearCub-White {
+.Mount_Body_BearCub-Thunderstorm {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1272px -1232px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_BearCub-Zombie {
+.Mount_Body_BearCub-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px 0px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Base {
+.Mount_Body_BearCub-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -106px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-CottonCandyBlue {
+.Mount_Body_Beetle-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -212px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-CottonCandyPink {
+.Mount_Body_Beetle-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -318px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Desert {
+.Mount_Body_Beetle-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -424px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Golden {
+.Mount_Body_Beetle-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -530px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Red {
+.Mount_Body_Beetle-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -636px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Shade {
+.Mount_Body_Beetle-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -742px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Skeleton {
+.Mount_Body_Beetle-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -848px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-White {
+.Mount_Body_Beetle-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -954px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Beetle-Zombie {
+.Mount_Body_Beetle-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -1060px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Base {
+.Mount_Body_Beetle-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -1408px -1166px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-CottonCandyBlue {
+.Mount_Body_Bunny-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: 0px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-CottonCandyPink {
+.Mount_Body_Bunny-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -106px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Desert {
+.Mount_Body_Bunny-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -212px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Golden {
+.Mount_Body_Bunny-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -318px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Red {
+.Mount_Body_Bunny-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -424px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Shade {
+.Mount_Body_Bunny-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -530px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Skeleton {
+.Mount_Body_Bunny-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -636px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-White {
+.Mount_Body_Bunny-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -742px -1338px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Bunny-Zombie {
+.Mount_Body_Bunny-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -848px -1338px;
   width: 105px;
   height: 105px;
 }
+.Mount_Body_Bunny-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
+  background-position: -954px -1338px;
+  width: 105px;
+  height: 105px;
+}
 .Mount_Body_Butterfly-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -454px -124px;
@@ -1122,157 +1128,157 @@
 }
 .Mount_Body_Cactus-Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -530px;
+  background-position: -1514px -636px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -636px;
+  background-position: -1514px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Celestial {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -742px;
+  background-position: -1514px -848px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -848px;
+  background-position: -1514px -954px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -954px;
+  background-position: -1514px -1060px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -1060px;
+  background-position: -1514px -1166px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -1166px;
+  background-position: -1514px -1272px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -1272px;
+  background-position: 0px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1444px;
+  background-position: -106px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -106px -1444px;
+  background-position: -212px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Frost {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -1444px;
+  background-position: -318px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -318px -1444px;
+  background-position: -424px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -424px -1444px;
+  background-position: -530px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -530px -1444px;
+  background-position: -636px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -636px -1444px;
+  background-position: -742px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -742px -1444px;
+  background-position: -848px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-IcySnow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -848px -1444px;
+  background-position: -954px -1444px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -954px -1444px;
+  background-position: -212px -1232px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -1232px;
+  background-position: -530px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -530px -914px;
+  background-position: -424px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-RoseQuartz {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -424px -914px;
+  background-position: -318px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -318px -914px;
+  background-position: -212px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -914px;
+  background-position: -106px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Shimmer {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -106px -914px;
+  background-position: 0px -914px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -914px;
+  background-position: -984px -742px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Cactus-Spooky {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -984px -742px;
+  background-position: -984px -636px;
   width: 105px;
   height: 105px;
 }
@@ -1282,144 +1288,150 @@
   width: 120px;
   height: 120px;
 }
-.Mount_Body_Cactus-Thunderstorm {
-  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -984px -530px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Cactus-White {
+.Mount_Body_Cactus-Sunshine {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -984px -424px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cactus-Zombie {
+.Mount_Body_Cactus-Thunderstorm {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -984px -318px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Base {
+.Mount_Body_Cactus-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -984px -212px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-CottonCandyBlue {
+.Mount_Body_Cactus-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -984px -106px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-CottonCandyPink {
+.Mount_Body_Cheetah-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -984px 0px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Desert {
+.Mount_Body_Cheetah-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -848px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Golden {
+.Mount_Body_Cheetah-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -742px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Red {
+.Mount_Body_Cheetah-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -636px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Shade {
+.Mount_Body_Cheetah-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -530px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Skeleton {
+.Mount_Body_Cheetah-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -424px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-White {
+.Mount_Body_Cheetah-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -318px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cheetah-Zombie {
+.Mount_Body_Cheetah-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -212px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Base {
+.Mount_Body_Cheetah-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -106px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-CottonCandyBlue {
+.Mount_Body_Cheetah-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: 0px -808px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-CottonCandyPink {
+.Mount_Body_Cow-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -636px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Desert {
+.Mount_Body_Cow-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -530px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Golden {
+.Mount_Body_Cow-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -424px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Red {
+.Mount_Body_Cow-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -318px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Shade {
+.Mount_Body_Cow-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -212px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Skeleton {
+.Mount_Body_Cow-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px -106px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-White {
+.Mount_Body_Cow-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -878px 0px;
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Cow-Zombie {
+.Mount_Body_Cow-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -742px -702px;
   width: 105px;
   height: 105px;
 }
+.Mount_Body_Cow-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
+  background-position: -636px -702px;
+  width: 105px;
+  height: 105px;
+}
+.Mount_Body_Cow-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
+  background-position: -530px -702px;
+  width: 105px;
+  height: 105px;
+}
 .Mount_Body_Cuttlefish-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
   background-position: -348px -124px;
@@ -1482,217 +1494,217 @@
 }
 .Mount_Body_Deer-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -772px -212px;
+  background-position: -772px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -772px -106px;
+  background-position: -636px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -772px 0px;
+  background-position: -530px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -636px -596px;
+  background-position: -424px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -530px -596px;
+  background-position: -318px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -424px -596px;
+  background-position: -212px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -318px -596px;
+  background-position: -106px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -596px;
+  background-position: 0px -596px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -106px -596px;
+  background-position: -666px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Deer-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -596px;
+  background-position: -666px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -666px -424px;
+  background-position: -666px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -666px -318px;
+  background-position: -666px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Celestial {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -666px -212px;
+  background-position: -666px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -666px -106px;
+  background-position: -530px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -666px 0px;
+  background-position: -424px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -530px -490px;
+  background-position: -318px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -424px -490px;
+  background-position: -212px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -318px -490px;
+  background-position: -106px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -490px;
+  background-position: 0px -490px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -106px -490px;
+  background-position: -1514px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Frost {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -490px;
+  background-position: -1514px -424px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -424px;
+  background-position: -1514px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -318px;
+  background-position: -1514px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -212px;
+  background-position: -1514px -106px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px -106px;
+  background-position: -1514px 0px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1514px 0px;
+  background-position: -1378px -1338px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-IcySnow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1378px -1338px;
+  background-position: -1272px -1338px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1272px -1338px;
+  background-position: -1166px -1338px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1166px -1338px;
+  background-position: -1060px -1338px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1060px -1338px;
+  background-position: -1060px -1232px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-RoseQuartz {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -954px -1338px;
+  background-position: -984px -530px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1060px -1232px;
+  background-position: -424px -702px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -984px -636px;
+  background-position: -318px -702px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Shimmer {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -636px -702px;
+  background-position: -212px -702px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -530px -702px;
+  background-position: -106px -702px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Spooky {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -424px -702px;
+  background-position: 0px -702px;
   width: 105px;
   height: 105px;
 }
@@ -1702,21 +1714,27 @@
   width: 120px;
   height: 120px;
 }
+.Mount_Body_Dragon-Sunshine {
+  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
+  background-position: -772px -424px;
+  width: 105px;
+  height: 105px;
+}
 .Mount_Body_Dragon-Thunderstorm {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -212px -702px;
+  background-position: -772px -318px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-White {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -106px -702px;
+  background-position: -772px -212px;
   width: 105px;
   height: 105px;
 }
 .Mount_Body_Dragon-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -702px;
+  background-position: -772px -106px;
   width: 105px;
   height: 105px;
 }
@@ -1726,21 +1744,3 @@
   width: 105px;
   height: 105px;
 }
-.Mount_Body_Egg-CottonCandyBlue {
-  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -772px -424px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Egg-CottonCandyPink {
-  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -772px -318px;
-  width: 105px;
-  height: 105px;
-}
-.Mount_Body_Egg-Desert {
-  background-image: url('~assets/images/sprites/spritesmith-main-13.png');
-  background-position: -318px -702px;
-  width: 105px;
-  height: 105px;
-}

website/common/locales/en/content.json

@@ -282,6 +282,7 @@
   "hatchingPotionRoseQuartz": "Rose Quartz",
   "hatchingPotionCelestial": "Celestial",
   "hatchingPotionVeggie": "Garden",
+  "hatchingPotionSunshine": "Sunshine",
 
   "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.",
   "premiumPotionAddlNotes": "Not usable on quest pet eggs.",

website/common/locales/zh_TW/gear.json

@@ -1757,7 +1757,7 @@
     "armorArmoireVernalVestmentText": "春季聖袍",
     "armorArmoireVernalVestmentNotes": "這件柔順的聖袍能以最時髦的方式享受溫和春日。增加力量、智力各 <%= per %> 點。來自神祕寶箱: 春季聖袍套裝(2/3)",
     "headArmoireToqueBlancheText": "廚師帽",
-    "headArmoireToqueBlancheNotes": "根據傳說，這頂帽子的褶皺數量就代表著您學會用不同方式煮蛋的數目! 真的還假的? 增加 <%= int %> 點感知。 來自神祕寶箱: 大廚套裝(1/4)",
+    "headArmoireToqueBlancheNotes": "根據傳說，這頂帽子的褶皺數量就代表著您學會用不同方式煮蛋的數目! 真的還假的? 增加 <%= per %> 點感知。 來自神祕寶箱: 大廚套裝(1/4)",
     "headArmoireVernalHenninText": "春季圓錐高帽",
     "headArmoireVernalHenninNotes": "這頂錐形的帽子不僅好看，同時還能塞進一張捲起來的代辦事項清單。增加 <%= per %> 點感知。來自神祕寶箱: 春季聖袍套裝(1/3)",
     "shieldMystery201902Text": "神秘的五彩紙屑",

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

@@ -3,7 +3,7 @@ import defaults from 'lodash/defaults';
 import each from 'lodash/each';
 import t from './translation';
 
-const CURRENT_SEASON = '_NONE_';
+const CURRENT_SEASON = 'May';
 
 let drops = {
   Base: {
@@ -76,7 +76,7 @@ let premium = {
     value: 2,
     text: t('hatchingPotionFloral'),
     limited: true,
-    _season: '_PENDING_',
+    _season: 'May',
   },
   Aquatic: {
     value: 2,
@@ -130,7 +130,7 @@ let premium = {
     value: 2,
     text: t('hatchingPotionRainbow'),
     limited: true,
-    _season: 'March',
+    _season: '_PENDING_',
   },
   Glass: {
     value: 2,
@@ -166,7 +166,13 @@ let premium = {
     value: 2,
     text: t('hatchingPotionCelestial'),
     limited: true,
-    _season: 'March',
+    _season: '_PENDING_',
+  },
+  Sunshine: {
+    value: 2,
+    text: t('hatchingPotionSunshine'),
+    limited: true,
+    _season: 'May',
   },
 };
 
@@ -174,7 +180,7 @@ const wacky = {
   Veggie: {
     text: t('hatchingPotionVeggie'),
     limited: true,
-    _season: 'March',
+    _season: '_PENDING_',
   },
 };
 

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

@@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth';
 let api = {};
 
 // @TODO export this const, cannot export it from here because only routes are exported from controllers
-const LAST_ANNOUNCEMENT_TITLE = 'QUEST BUNDLE: FEATHERED FRIENDS!';
+const LAST_ANNOUNCEMENT_TITLE = 'SUNSHINE AND FLORAL HATCHING POTIONS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,15 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>5/9/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>5/14/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_feathered_friends_bundle center-block"></div>
-        <p>If you're a fan of bird pets and mounts, you're in luck! From now until May 31, you can purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the <a href='/shops/quests'>Quest Shop</a> today!</p>
-        <div class="small">by Lemoness and SabreCat</div>
-        <div class="small">Art by Casey, Teto Forever, Eevachu, UncommonCriminal, JonArinbjorn, Trogdorina, Onheiron, Squish</div>
-        <div class="small mb-3">Writing by Lemoness, Token, and Bartelmy</div>
+        <div class="promo_floral_sunshine_potions center-block"></div>
+        <p>There's a new pet breed in town! Check out the brand-new Sunshine Potions and the return of Floral Potions. You can get them in <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>After they're gone, it will be at least a year before the Sunshine or Floral Hatching Potions are available again, so be sure to get them now!</p>
+        <div class="small mb-3">by OuttaMyMind, Lt.Cabel, Eslyn, Mako, and SabreCat</div>
       </div>
       `,
     });