Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.146.7",
+  "version": "4.147.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.146.7",
+  "version": "4.147.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.10.3",

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

@@ -1,6 +1,18 @@
+.quest_amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1320px -220px;
+  width: 219px;
+  height: 219px;
+}
+.quest_armadillo {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
+  background-position: -1320px -660px;
+  width: 219px;
+  height: 219px;
+}
 .quest_atom1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1082px -1332px;
+  background-position: -1333px -1332px;
   width: 250px;
   height: 150px;
 }
@@ -18,13 +30,13 @@
 }
 .quest_axolotl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px 0px;
+  background-position: -440px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -232px;
+  background-position: -660px 0px;
   width: 219px;
   height: 219px;
 }
@@ -42,7 +54,7 @@
 }
 .quest_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px 0px;
+  background-position: -220px -452px;
   width: 219px;
   height: 219px;
 }
@@ -54,13 +66,13 @@
 }
 .quest_butterfly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -452px;
+  background-position: -660px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -452px;
+  background-position: -880px 0px;
   width: 219px;
   height: 219px;
 }
@@ -72,7 +84,7 @@
 }
 .quest_dilatory {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px 0px;
+  background-position: 0px -672px;
   width: 219px;
   height: 219px;
 }
@@ -84,31 +96,31 @@
 }
 .quest_dilatoryDistress2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1762px -422px;
+  background-position: -1762px -573px;
   width: 150px;
   height: 150px;
 }
 .quest_dilatoryDistress3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -672px;
+  background-position: -660px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -452px;
+  background-position: -880px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -672px;
+  background-position: -880px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -672px;
+  background-position: -1100px 0px;
   width: 219px;
   height: 219px;
 }
@@ -126,25 +138,25 @@
 }
 .quest_evilsanta2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px 0px;
+  background-position: -1100px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -220px;
+  background-position: 0px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -440px;
+  background-position: -220px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_fluorite {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -660px;
+  background-position: -440px -892px;
   width: 219px;
   height: 219px;
 }
@@ -156,19 +168,19 @@
 }
 .quest_ghost_stag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -892px;
+  background-position: -880px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -892px;
+  background-position: -1100px -892px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1333px -1332px;
+  background-position: -1082px -1332px;
   width: 250px;
   height: 150px;
 }
@@ -186,13 +198,13 @@
 }
 .quest_guineapig {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px 0px;
+  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -220px;
+  background-position: -1320px -880px;
   width: 219px;
   height: 219px;
 }
@@ -204,19 +216,19 @@
 }
 .quest_hippo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -660px;
+  background-position: -220px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -880px;
+  background-position: -440px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -1112px;
+  background-position: -660px -1112px;
   width: 219px;
   height: 219px;
 }
@@ -228,43 +240,43 @@
 }
 .quest_lostMasterclasser1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -1112px;
+  background-position: -1100px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -1112px;
+  background-position: -880px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -1112px;
+  background-position: 0px -1112px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1762px -573px;
+  background-position: -1762px -422px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -1112px;
+  background-position: -1320px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -1112px;
+  background-position: -1320px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -892px;
+  background-position: -660px -892px;
   width: 219px;
   height: 219px;
 }
@@ -276,37 +288,37 @@
 }
 .quest_moon2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -440px;
+  background-position: -1100px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -220px;
+  background-position: -1100px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -232px;
+  background-position: -440px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -892px;
+  background-position: -220px -672px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1100px -1112px;
+  background-position: -880px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -214px;
+  background-position: -1540px -865px;
   width: 216px;
   height: 216px;
 }
@@ -318,7 +330,7 @@
 }
 .quest_owl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1320px -440px;
+  background-position: -440px -452px;
   width: 219px;
   height: 219px;
 }
@@ -336,25 +348,25 @@
 }
 .quest_pterodactyl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -892px;
+  background-position: 0px -452px;
   width: 219px;
   height: 219px;
 }
 .quest_rat {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -880px -672px;
+  background-position: -660px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_robot {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -672px;
+  background-position: -220px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_rock {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -1540px -865px;
+  background-position: -1540px -214px;
   width: 216px;
   height: 216px;
 }
@@ -366,31 +378,19 @@
 }
 .quest_ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -440px -452px;
+  background-position: 0px -232px;
   width: 219px;
   height: 219px;
 }
 .quest_sabretooth {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -660px -220px;
+  background-position: -440px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_seaserpent {
   background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px -232px;
+  background-position: -1320px -1112px;
-  width: 219px;
-  height: 219px;
-}
-.quest_sheep {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: 0px -892px;
-  width: 219px;
-  height: 219px;
-}
-.quest_silver {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-13.png');
-  background-position: -220px 0px;
   width: 219px;
   height: 219px;
 }

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

@@ -1,348 +1,414 @@
-.Pet-Wolf-Thunderstorm {
+.Pet-Wolf-RoyalPurple {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veggie {
+.Pet-Wolf-Ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -300px;
+  background-position: -492px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Wolf-SandSculpture {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Watery {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-White {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Zombie {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Base {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-CottonCandyBlue {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-CottonCandyPink {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Desert {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Golden {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Red {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Shade {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-Skeleton {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Yarn-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
   background-position: -328px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Zombie {
+.Pet-Wolf-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shadow {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Silver {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Sunshine {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veggie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Watery {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
   background-position: -328px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet_HatchingPotion_Amber {
+.Pet-Wolf-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
   background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet_HatchingPotion_Amber {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
+  background-position: -492px -300px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Aquatic {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -151px -300px;
+  background-position: 0px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Aurora {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -220px -300px;
+  background-position: -69px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Base {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -289px -300px;
+  background-position: -138px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_BirchBark {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px 0px;
+  background-position: -207px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -69px;
+  background-position: -276px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Celestial {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -138px;
+  background-position: -345px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -207px;
+  background-position: 0px -607px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -410px -276px;
+  background-position: -483px -400px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Cupid {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -400px;
+  background-position: 0px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -69px -400px;
+  background-position: -69px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ember {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -138px -400px;
+  background-position: -138px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Fairy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -207px -400px;
+  background-position: -207px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -414px -538px;
+  background-position: -276px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Fluorite {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -345px -400px;
+  background-position: -345px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Frost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px 0px;
+  background-position: -414px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ghost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px -69px;
+  background-position: -483px -469px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glass {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px -138px;
+  background-position: -574px 0px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px -207px;
+  background-position: -574px -69px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px -276px;
+  background-position: -574px -138px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Holly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -479px -345px;
+  background-position: -574px -207px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_IcySnow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -469px;
+  background-position: -574px -276px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -69px -469px;
+  background-position: -574px -345px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Purple {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -138px -469px;
+  background-position: -574px -414px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Rainbow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -207px -469px;
+  background-position: 0px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -276px -469px;
+  background-position: -69px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_RoseQuartz {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -345px -469px;
+  background-position: -138px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_RoyalPurple {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -414px -469px;
+  background-position: -207px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px 0px;
+  background-position: -276px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_SandSculpture {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -69px;
+  background-position: -345px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -138px;
+  background-position: -414px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shadow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -207px;
+  background-position: -483px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shimmer {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -276px;
+  background-position: -552px -538px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Silver {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -345px;
+  background-position: -643px 0px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -548px -414px;
+  background-position: -643px -69px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: 0px -538px;
+  background-position: -643px -138px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_StarryNight {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -69px -538px;
+  background-position: -643px -207px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Sunshine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -138px -538px;
+  background-position: -643px -276px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -207px -538px;
+  background-position: -643px -345px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Watery {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -276px -538px;
+  background-position: -643px -414px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -345px -538px;
+  background-position: -643px -483px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-28.png');
-  background-position: -276px -400px;
+  background-position: -414px -400px;
   width: 68px;
   height: 68px;
 }

website/common/locales/en/gear.json

@@ -941,6 +941,8 @@
   "armorMystery201910Notes": "This enigmatic armor will protect you from terrors seen and unseen. Confers no benefit. October 2019 Subscriber Item.",
   "armorMystery202006Text": "Multichrome Merfolk Tail",
   "armorMystery202006Notes": "Even among the brightest corals and anemones, this tail proudly stands out from the crowd! Confers no benefit. June 2020 Subscriber Item.",
+  "armorMystery202007Text": "Outstanding Orca Costume",
+  "armorMystery202007Notes": "Swim, flip, dive, and race with this handsome and powerful tail! Confers no benefit. July 2020 Subscriber Item.",
   "armorMystery301404Text": "Steampunk Suit",
   "armorMystery301404Notes": "Dapper and dashing, wot! Confers no benefit. February 3015 Subscriber Item.",
   "armorMystery301703Text": "Steampunk Peacock Gown",
@@ -1532,6 +1534,8 @@
   "headMystery202003Notes": "Be careful, this helm is sharp in more ways than one! Confers no benefit. March 2020 Subscriber Item.",
   "headMystery202006Text": "Sugilite Circlet",
   "headMystery202006Notes": "The positive energy of these radiant purple stones will draw the sea's friendliest creatures to your side. Confers no benefit. June 2020 Subscriber Item.",
+  "headMystery202007Text": "Outstanding Orca Helm",
+  "headMystery202007Notes": "This helm will tune you in to the complex and beautiful songs of your fellow cetaceans. Confers no benefit. July 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",

website/common/locales/en/subscriber.json

@@ -174,6 +174,7 @@
     "mysterySet202004": "Mighty Monarch Set",
     "mysterySet202005": "Wondrous Wyvern Set",
     "mysterySet202006": "Multichrome Merfolk Set",
+    "mysterySet202007": "Outstanding Orca Set",
     "mysterySet301404": "Steampunk Standard Set",
     "mysterySet301405": "Steampunk Accessories Set",
     "mysterySet301703": "Peacock Steampunk Set",

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 POSTS: GUILD AND USE CASE SPOTLIGHTS';
+const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR MULTICHROME MERFOLK SET!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,41 +31,19 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>6/25/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>6/29/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_nakonana center-block"></div>
+        <div class="promo_mystery_202006 center-block"></div>
-        <h3>Guild Spotlight: Nakonana's Favorites</h3>
         <p>
-          For this year's Guild Spotlight series, we're highlighting some favorites from Habitica's
+          Reminder: this is the last day to receive the Multichrome Merfolk Set when you <a
-          staff, moderators, and some high-level contributors!
+          href='/user/settings/subscription'>sign up for a new Habitica subscription</a>!
+          Subscribing also lets you buy Gems with Gold. The longer your subscription, the more Gems
+          you can get!
         </p>
-        <p>
+        <p>Thanks so much for your support! You help keep Habitica running.</p>
-          This month we're sharing <a
+        <div class="small mb-3">by Beffymaroo</div>
-          href='https://habitica.wordpress.com/2020/06/25/guild-spotlights-our-favourites-5/'
-          target='_blank'>picks from socialite and translator Nakonana</a>! If you want to curate
-          your Habitica experience and join active, positive Guilds, this is a great way to pick up
-          some new ideas for Guilds to join.
-        </p>
-        <div class="small mb-3">by shanaqui</div>
-        <div class="scene_strength center-block"></div>
-        <h3>Use Case Spotlight: Adapting to Life Changes</h3>
-        <p>
-          This month's <a href='https://habitica.wordpress.com/2020/06/25/use-case-spotlight-adapting-to-life-changes/'
-          target='_blank'>Use Case Spotlight</a> is about Adapting to Life Changes! It features a
-          number of great suggestions submitted by Habiticans in the <a
-          href='/groups/guild/1d3a10bf-60aa-4806-a38b-82d1084a59e6'>Use Case Spotlights Guild</a>.
-          We hope it helps any of you who might be facing changes in your routine.
-        </p>
-        <p>
-          Plus, we're collecting user submissions for the next spotlight! How do you use Challenges
-          to enhance your Habitica experience? We’ll be featuring player-submitted examples in Use
-          Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case
-          Spotlight Guild now. We look forward to learning more about how you use Habitica to
-          improve your life and get things done!
-        </p>
-        <div class="small mb-3">by shanaqui</div>
       </div>
       `,
     });