Merge branch 'release' into develop

migrations/users/bulk-email.js

@@ -8,13 +8,16 @@ const BASE_URL = nconf.get('BASE_URL');
 const EMAIL_SLUG = 'mandrill-email-slug'; // Set email template to send
 const MIGRATION_NAME = 'bulk-email';
 
-const progressCount = 1000;
+const progressCount = 250;
 let count = 0;
 
 async function updateUser (user) {
   count += 1;
 
-  if (count % progressCount === 0) console.warn(`${count} ${user._id}`);
+  if (count % progressCount === 0) {
+    console.warn(`${count} ${user._id}`);
+    await new Promise(resolve => setTimeout(resolve, 5000));
+  }
 
   await sendTxn(
     user,

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.134.4",
+  "version": "4.135.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.134.4",
+  "version": "4.135.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.8.4",

scripts/gdpr-delete-users.js

@@ -34,11 +34,12 @@ async function deleteAmplitudeData (userId, email) {
 }
 
 async function deleteHabiticaData (user, email) {
+  const truncatedEmail = email.slice(0, email.indexOf('@'));
   await User.update(
     { _id: user._id },
     {
       $set: {
-        'auth.local.email': email,
+        'auth.local.email': user.auth.local.email ? email : `${truncatedEmail}@example.com`,
         'auth.local.hashed_password': '$2a$10$QDnNh1j1yMPnTXDEOV38xOePEWFd4X8DSYwAM8XTmqmacG5X0DKjW',
         'auth.local.passwordHashMethod': 'bcrypt',
       },

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

@@ -10,7 +10,7 @@
   width: 423px;
   height: 147px;
 }
-.promo_mystery_022020 {
+.promo_mystery_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -668px -148px;
   width: 282px;

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

@@ -1,420 +1,444 @@
-.Pet-Wolf-IcySnow {
+.Pet-Wolf-Glass {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-Wolf-Glow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -164px -400px;
+  background-position: -492px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Rainbow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Red {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-RoseQuartz {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-RoyalPurple {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ruby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shade {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shadow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shimmer {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Silver {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Skeleton {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Spooky {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-StarryNight {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Sunshine {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -328px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Thunderstorm {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -328px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Veggie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Veteran {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -82px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Watery {
+.Pet-Wolf-Golden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -164px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Wolf-Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -246px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Wolf-Veggie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -328px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Base {
+.Pet-Wolf-Veteran {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -410px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-CottonCandyBlue {
+.Pet-Wolf-Watery {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -410px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-CottonCandyPink {
+.Pet-Wolf-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -410px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Desert {
+.Pet-Wolf-Zombie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -410px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Golden {
+.Pet-Yarn-Base {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -492px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Red {
+.Pet-Yarn-CottonCandyBlue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -492px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Shade {
+.Pet-Yarn-CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -492px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Skeleton {
+.Pet-Yarn-Desert {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-White {
+.Pet-Yarn-Golden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: 0px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Zombie {
+.Pet-Yarn-Red {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -82px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet_HatchingPotion_Amber {
+.Pet-Yarn-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: -246px -400px;
-  width: 68px;
-  height: 68px;
+  width: 81px;
+  height: 99px;
 }
-.Pet_HatchingPotion_Aquatic {
+.Pet-Yarn-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -315px -400px;
-  width: 68px;
-  height: 68px;
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
 }
-.Pet_HatchingPotion_Aurora {
+.Pet-Yarn-Zombie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -384px -400px;
-  width: 68px;
-  height: 68px;
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
 }
-.Pet_HatchingPotion_Base {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -453px -400px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Bronze {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px -638px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Celestial {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -69px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_CottonCandyBlue {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -138px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_CottonCandyPink {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -207px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Cupid {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -276px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Desert {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -345px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Ember {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -414px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Fairy {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -483px -500px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Floral {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px 0px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Frost {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -69px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Ghost {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -138px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Glass {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -207px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Glow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -276px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Golden {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -345px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Holly {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -414px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_IcySnow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -574px -483px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Peppermint {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: 0px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Purple {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -69px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Rainbow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -138px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Red {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -207px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_RoseQuartz {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -276px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_RoyalPurple {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -345px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Ruby {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -414px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Shade {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -483px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Shadow {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -552px -569px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Shimmer {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px 0px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Silver {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -69px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Skeleton {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -138px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Spooky {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -207px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_StarryNight {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -276px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Sunshine {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -345px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Thunderstorm {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -414px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Watery {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -483px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_White {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
-  background-position: -643px -552px;
-  width: 68px;
-  height: 68px;
-}
-.Pet_HatchingPotion_Zombie {
+.Pet_HatchingPotion_Amber {
   background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
   background-position: 0px -500px;
   width: 68px;
   height: 68px;
 }
+.Pet_HatchingPotion_Aquatic {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -69px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Aurora {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -276px -638px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Base {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -207px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Bronze {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -276px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Celestial {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -345px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -414px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -483px -500px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Cupid {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ember {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Fairy {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Floral {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Frost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ghost {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glass {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -574px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Glow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -69px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Holly {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -138px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_IcySnow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -207px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Peppermint {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -276px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Purple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -345px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Rainbow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -414px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -483px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoseQuartz {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -552px -569px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_RoyalPurple {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px 0px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Ruby {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -69px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -138px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -207px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -276px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -345px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -414px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -483px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -643px -552px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: 0px -638px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -69px -638px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -138px -638px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -207px -638px;
+  width: 68px;
+  height: 68px;
+}
+.Pet_HatchingPotion_Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-27.png');
+  background-position: -138px -500px;
+  width: 68px;
+  height: 68px;
+}

website/common/locales/en/gear.json

@@ -1458,6 +1458,8 @@
   "headMystery201912Notes": "This glittering snowflake grants you resistance to the biting cold no matter how high you fly! Confers no benefit. December 2019 Subscriber Item.",
   "headMystery202001Text": "Fabled Fox Ears",
   "headMystery202001Notes": "Your hearing will be so sharp, you'll hear the stars twinkling and the moon spinning. Confers no benefit. January 2020 Subscriber Item.",
+  "headMystery202003Text": "Barbed Helm",
+  "headMystery202003Notes": "Be careful, this helm is sharp in more ways than one! Confers no benefit. March 2020 Subscriber Item.",
   "headMystery301404Text": "Fancy Top Hat",
   "headMystery301404Notes": "A fancy top hat for the finest of gentlefolk! January 3015 Subscriber Item. Confers no benefit.",
   "headMystery301405Text": "Basic Top Hat",
@@ -2017,6 +2019,8 @@
   "bodyMystery201901Notes": "These shimmering pauldrons are strong, but will rest on your shoulders as weightlessly as a ray of dancing light. Confers no benefit. January 2019 Subscriber Item.",
   "bodyMystery202002Text": "Stylish Sweetheart Scarf",
   "bodyMystery202002Notes": "For when your heart is warm but the breezes of February are brisk. Confers no benefit. February 2020 Subscriber Item.",
+  "bodyMystery202003Text": "Barbed Pauldrons",
+  "bodyMystery202003Notes": "They're like shoulder pads that are on a whole other level. Confers no benefit. March 2020 Subscriber Item.",
 
   "bodyArmoireCozyScarfText": "Cozy Scarf",
   "bodyArmoireCozyScarfNotes": "This fine scarf will keep you warm as you go about your wintry business. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Lamplighter's Set (Item 4 of 4).",

website/common/locales/en/subscriber.json

@@ -171,6 +171,7 @@
     "mysterySet201912": "Polar Pixie Set",
     "mysterySet202001": "Fabled Fox Set",
     "mysterySet202002": "Stylish Sweetheart Set",
+    "mysterySet202003": "Barbed Battler Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

website/common/script/content/gear/sets/mystery.js

@@ -439,6 +439,12 @@ const body = {
     mystery: '202002',
     value: 0,
   },
+  202003: {
+    text: t('bodyMystery202003Text'),
+    notes: t('bodyMystery202003Notes'),
+    mystery: '202003',
+    value: 0,
+  },
 };
 
 const eyewear = {
@@ -793,6 +799,12 @@ const head = {
     mystery: '202001',
     value: 0,
   },
+  202003: {
+    text: t('headMystery202003Text'),
+    notes: t('headMystery202003Notes'),
+    mystery: '202003',
+    value: 0,
+  },
   301404: {
     text: t('headMystery301404Text'),
     notes: t('headMystery301404Notes'),