Merge branch 'release' into develop

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.85.5",
+  "version": "4.86.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.85.5",
+  "version": "4.86.0",
   "main": "./website/server/index.js",
   "dependencies": {
     "@google-cloud/trace-agent": "^3.5.2",

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

@@ -1,4 +1,4 @@
-.promo_armoire_backgrounds_201902 {
+.promo_armoire_backgrounds_201903 {
   background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: 0px -220px;
   width: 423px;

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

@@ -1,348 +1,474 @@
+.weapon_warrior_6 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -737px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_0 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -646px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_1 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -828px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_2 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -919px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_3 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -100px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_4 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -282px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_5 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -464px -1529px;
+  width: 90px;
+  height: 90px;
+}
+.weapon_wizard_6 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -555px -1529px;
+  width: 90px;
+  height: 90px;
+}
 .Pet_Currency_Gem {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1062px;
+  background-position: -276px -1629px;
   width: 68px;
   height: 68px;
 }
 .Pet_Currency_Gem1x {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1992px -592px;
+  background-position: -1802px -735px;
   width: 15px;
   height: 13px;
 }
 .Pet_Currency_Gem2x {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -1067px;
+  background-position: -307px -407px;
   width: 30px;
   height: 26px;
 }
 .PixelPaw-Gold {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1929px -711px;
+  background-position: -1791px -1529px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1765px -1444px;
+  background-position: -479px -1629px;
   width: 51px;
   height: 51px;
 }
 .PixelPaw002 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -276px;
+  background-position: -531px -1629px;
   width: 51px;
   height: 51px;
 }
+.avatar_floral_healer {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: 0px -1529px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_rogue {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1449px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_warrior {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1249px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.avatar_floral_wizard {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -1349px -1315px;
+  width: 99px;
+  height: 99px;
+}
+.empty_bottles {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -414px -1629px;
+  width: 64px;
+  height: 54px;
+}
+.ghost {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -373px -1529px;
+  width: 90px;
+  height: 90px;
+}
 .inventory_present {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1269px;
+  background-position: -1100px -944px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_01 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -220px -341px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_02 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -660px -435px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_03 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -660px -504px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_04 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -880px -655px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_05 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -138px -1629px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_06 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -207px -1629px;
+  width: 68px;
+  height: 68px;
+}
+.inventory_present_07 {
+  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
+  background-position: -345px -1629px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_08 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1062px;
+  background-position: -220px -272px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_09 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1545px;
+  background-position: -660px -573px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_10 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1131px;
+  background-position: -880px -724px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_11 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1131px;
+  background-position: -880px -793px;
   width: 68px;
   height: 68px;
 }
 .inventory_present_12 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1200px;
+  background-position: -1100px -875px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_birthday {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1269px;
+  background-position: -1100px -1013px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_congrats {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1338px;
+  background-position: -1320px -1095px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_fortify {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1407px;
+  background-position: -1320px -1164px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_getwell {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1476px;
+  background-position: -1320px -1233px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_goodluck {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1476px;
+  background-position: -1549px -1315px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_greeting {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1545px;
+  background-position: -1101px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_nye {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1614px;
+  background-position: -1170px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_opaquePotion {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -1614px;
+  background-position: -1239px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_seafoam {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -1444px;
+  background-position: -1308px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_shinySeed {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1696px -1444px;
+  background-position: -1377px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_snowball {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1929px -642px;
+  background-position: -1584px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_spookySparkles {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1935px -763px;
+  background-position: -1653px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_thankyou {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1935px -854px;
+  background-position: -1722px -1529px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_trinket {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -993px;
+  background-position: 0px -1629px;
   width: 68px;
   height: 68px;
 }
 .inventory_special_valentine {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1913px -993px;
+  background-position: -69px -1629px;
   width: 68px;
   height: 68px;
 }
 .knockout {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -945px;
+  background-position: -1249px -1415px;
   width: 120px;
   height: 47px;
 }
 .pet_key {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1200px;
+  background-position: -220px -203px;
   width: 68px;
   height: 68px;
 }
 .rebirth_orb {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1338px;
+  background-position: -1515px -1529px;
   width: 68px;
   height: 68px;
 }
 .seafoam_star {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -854px;
+  background-position: -1010px -1529px;
   width: 90px;
   height: 90px;
 }
 .shop_armoire {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1407px;
+  background-position: -1446px -1529px;
   width: 68px;
   height: 68px;
 }
 .snowman {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -763px;
+  background-position: -191px -1529px;
   width: 90px;
   height: 90px;
 }
 .zzz {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1963px -551px;
+  background-position: -1802px -578px;
   width: 40px;
   height: 40px;
 }
 .zzz_light {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1963px -510px;
+  background-position: -1802px -537px;
   width: 40px;
   height: 40px;
 }
 .notif_inventory_present_01 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1960px -1683px;
+  background-position: -1793px -925px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_02 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1054px -841px;
+  background-position: -1549px -1384px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_03 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1963px -592px;
+  background-position: -1802px -619px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_04 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1025px -841px;
+  background-position: -1802px -648px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_05 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -996px -841px;
+  background-position: -1802px -677px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_06 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -967px -841px;
+  background-position: -1802px -706px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_07 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1981px -711px;
+  background-position: -1793px -751px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_08 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1931px -1683px;
+  background-position: -1793px -780px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_09 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1902px -1683px;
+  background-position: -1793px -809px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_10 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1873px -1683px;
+  background-position: -1793px -838px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_11 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -1683px;
+  background-position: -1793px -867px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_present_12 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1965px -945px;
+  background-position: -1793px -896px;
   width: 28px;
   height: 28px;
 }
 .notif_inventory_special_birthday {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1062px;
+  background-position: -1822px -838px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_congrats {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1200px;
+  background-position: -1822px -867px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_getwell {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1981px -740px;
+  background-position: -1822px -896px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_goodluck {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1020px;
+  background-position: -1822px -751px;
   width: 20px;
   height: 26px;
 }
 .notif_inventory_special_greeting {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1156px;
+  background-position: -1822px -925px;
   width: 20px;
   height: 22px;
 }
 .notif_inventory_special_nye {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -993px;
+  background-position: -1817px -1237px;
   width: 24px;
   height: 26px;
 }
 .notif_inventory_special_thankyou {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1131px;
+  background-position: -1822px -780px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_valentine {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1982px -1087px;
+  background-position: -1822px -809px;
   width: 20px;
   height: 24px;
 }
 .npc_bailey {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -203px;
+  background-position: 0px -1698px;
   width: 60px;
   height: 72px;
 }
 .npc_justin {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -642px;
+  background-position: -1746px -1379px;
   width: 84px;
   height: 120px;
 }
 .npc_matt {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1155px -1315px;
+  background-position: -1627px -1098px;
   width: 195px;
   height: 138px;
 }
@@ -354,109 +480,109 @@
 }
 .banner_flair_dysheartener {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1935px -832px;
+  background-position: -747px -627px;
   width: 69px;
   height: 18px;
 }
 .phobia_dysheartener {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -1061px;
+  background-position: -527px -220px;
   width: 201px;
   height: 195px;
 }
 .quest_alligator {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -645px;
+  background-position: -1187px -880px;
   width: 201px;
   height: 213px;
 }
 .quest_armadillo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -440px;
+  background-position: -220px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_atom1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -445px -1315px;
+  background-position: -696px -1315px;
   width: 250px;
   height: 150px;
 }
 .quest_atom2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -947px -1315px;
+  background-position: -1627px -959px;
   width: 207px;
   height: 138px;
 }
 .quest_atom3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -967px -660px;
+  background-position: -1627px 0px;
   width: 216px;
   height: 180px;
 }
 .quest_axolotl {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1100px -1095px;
+  background-position: -527px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -435px;
+  background-position: -220px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_basilist {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -191px -1529px;
+  background-position: -1627px -1237px;
   width: 189px;
   height: 141px;
 }
 .quest_beetle {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -859px;
+  background-position: -967px -660px;
   width: 204px;
   height: 201px;
 }
 .quest_bunny {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -1257px;
+  background-position: -307px -220px;
   width: 210px;
   height: 186px;
 }
 .quest_butterfly {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -220px;
+  background-position: -967px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px 0px;
+  background-position: -440px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_cow {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -307px -220px;
+  background-position: -1627px -537px;
   width: 174px;
   height: 213px;
 }
 .quest_dilatory {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -1095px;
+  background-position: 0px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatoryDistress1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -434px;
+  background-position: -1407px -1091px;
   width: 210px;
   height: 210px;
 }
 .quest_dilatoryDistress2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -359px;
+  background-position: -947px -1315px;
   width: 150px;
   height: 150px;
 }
@@ -468,43 +594,43 @@
 }
 .quest_dilatory_derby {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -880px -1095px;
+  background-position: -1187px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -660px;
+  background-position: -660px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_egg {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px 0px;
+  background-position: -1627px -751px;
   width: 165px;
   height: 207px;
 }
 .quest_evilsanta {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -510px;
+  background-position: -1627px -1379px;
   width: 118px;
   height: 131px;
 }
 .quest_evilsanta2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -880px -875px;
+  background-position: -1407px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_falcon {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -875px;
+  background-position: -1100px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_ferret {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -747px 0px;
+  background-position: -1407px 0px;
   width: 219px;
   height: 219px;
 }
@@ -516,19 +642,19 @@
 }
 .quest_ghost_stag {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -435px;
+  background-position: -880px -1095px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -527px 0px;
+  background-position: -220px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_goldenknight2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -696px -1315px;
+  background-position: -445px -1315px;
   width: 250px;
   height: 150px;
 }
@@ -540,133 +666,133 @@
 }
 .quest_gryphon {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -747px -440px;
+  background-position: -1627px -359px;
   width: 216px;
   height: 177px;
 }
 .quest_guineapig {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -1095px;
+  background-position: -1187px -660px;
   width: 219px;
   height: 219px;
 }
 .quest_harpy {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -1095px;
+  background-position: -1187px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_hedgehog {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -880px;
+  background-position: -747px -440px;
   width: 219px;
   height: 186px;
 }
 .quest_hippo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -440px;
+  background-position: -1187px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_horse {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px -220px;
+  background-position: -880px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_kangaroo {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1187px 0px;
+  background-position: -660px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_kraken {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -527px -220px;
+  background-position: -1627px -181px;
   width: 216px;
   height: 177px;
 }
 .quest_lostMasterclasser1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -875px;
+  background-position: -307px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -660px;
+  background-position: 0px -875px;
   width: 219px;
   height: 219px;
 }
 .quest_lostMasterclasser3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -875px;
+  background-position: -967px -440px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1844px -208px;
+  background-position: -1098px -1315px;
   width: 150px;
   height: 150px;
 }
 .quest_mayhemMistiflying2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -967px -440px;
+  background-position: -967px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_mayhemMistiflying3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -967px -220px;
+  background-position: -660px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_monkey {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -967px 0px;
+  background-position: -440px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moon1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -880px;
+  background-position: -1407px -440px;
   width: 216px;
   height: 216px;
 }
 .quest_moon2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -660px -655px;
+  background-position: -220px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moon3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -655px;
+  background-position: 0px -655px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone1 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -220px -655px;
+  background-position: -747px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone2 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -655px;
+  background-position: -747px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_moonstone3 {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -747px -220px;
+  background-position: -440px -435px;
   width: 219px;
   height: 219px;
 }
 .quest_nudibranch {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1407px -1097px;
+  background-position: -1407px -657px;
   width: 216px;
   height: 216px;
 }
@@ -684,31 +810,7 @@
 }
 .quest_peacock {
   background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px -217px;
-  width: 216px;
-  height: 216px;
-}
-.quest_penguin {
-  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: 0px -1529px;
-  width: 190px;
-  height: 183px;
-}
-.quest_pterodactyl {
-  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -307px 0px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rat {
-  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -440px -875px;
-  width: 219px;
-  height: 219px;
-}
-.quest_rock {
-  background-image: url('~assets/images/sprites/spritesmith-main-11.png');
-  background-position: -1627px 0px;
+  background-position: -1407px -874px;
   width: 216px;
   height: 216px;
 }

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

@@ -1,390 +1,510 @@
-.Pet-Wolf-Desert {
+.Pet-Velociraptor-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Ember {
+.Pet-Velociraptor-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -328px -400px;
+  background-position: -164px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Fairy {
+.Pet-Velociraptor-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Floral {
+.Pet-Velociraptor-White {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Frost {
+.Pet-Velociraptor-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Ghost {
+.Pet-Whale-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Glass {
+.Pet-Whale-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Glow {
+.Pet-Whale-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Golden {
+.Pet-Whale-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Holly {
+.Pet-Whale-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-IcySnow {
+.Pet-Whale-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-Whale-Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Rainbow {
+.Pet-Whale-Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -328px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-Whale-White {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -328px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-RoseQuartz {
+.Pet-Whale-Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -328px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-RoyalPurple {
+.Pet-Wolf-Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-Wolf-Base {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shimmer {
+.Pet-Wolf-CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-Wolf-CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Wolf-Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -328px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-StarryNight {
+.Pet-Wolf-Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Thunderstorm {
+.Pet-Wolf-Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Wolf-Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Wolf-Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Wolf-Frost {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Base {
+.Pet-Wolf-Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-CottonCandyBlue {
+.Pet-Wolf-Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-CottonCandyPink {
+.Pet-Wolf-Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Desert {
+.Pet-Wolf-Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Golden {
+.Pet-Wolf-Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Red {
+.Pet-Wolf-IcySnow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Shade {
+.Pet-Wolf-Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Skeleton {
+.Pet-Wolf-Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: 0px 0px;
+  background-position: -328px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-White {
+.Pet-Wolf-Red {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Yarn-Zombie {
+.Pet-Wolf-RoseQuartz {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px -400px;
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-RoyalPurple {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-StarryNight {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Base {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyBlue {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-CottonCandyPink {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Desert {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Golden {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Red {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Shade {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Skeleton {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-White {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: -656px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Yarn-Zombie {
+  background-image: url('~assets/images/sprites/spritesmith-main-24.png');
+  background-position: 0px -600px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Aquatic {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -69px -500px;
+  background-position: -151px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Base {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -483px;
+  background-position: -738px -414px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -138px -500px;
+  background-position: -220px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -207px -500px;
+  background-position: -289px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Cupid {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -276px -500px;
+  background-position: -358px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -345px -500px;
+  background-position: -427px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ember {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -414px -500px;
+  background-position: -496px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Fairy {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -483px -500px;
+  background-position: -565px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px 0px;
+  background-position: -634px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Frost {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -69px;
+  background-position: -738px 0px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Ghost {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -138px;
+  background-position: -738px -69px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glass {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -207px;
+  background-position: -738px -138px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Glow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -276px;
+  background-position: -738px -207px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -345px;
+  background-position: -738px -276px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Holly {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -574px -414px;
+  background-position: -738px -345px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_IcySnow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: 0px -500px;
+  background-position: -82px -600px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: 0px -569px;
+  background-position: -738px -483px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Purple {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -69px -569px;
+  background-position: -738px -552px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Rainbow {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -138px -569px;
+  background-position: -738px -621px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -207px -569px;
+  background-position: 0px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_RoseQuartz {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -276px -569px;
+  background-position: -69px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_RoyalPurple {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -345px -569px;
+  background-position: -138px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -414px -569px;
+  background-position: -207px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Shimmer {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -483px -569px;
+  background-position: -276px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -552px -569px;
+  background-position: -345px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -643px 0px;
+  background-position: -414px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_StarryNight {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -643px -69px;
+  background-position: -483px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -643px -138px;
+  background-position: -552px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_White {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -643px -207px;
+  background-position: -621px -700px;
   width: 68px;
   height: 68px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url('~assets/images/sprites/spritesmith-main-24.png');
-  background-position: -643px -276px;
+  background-position: -690px -700px;
   width: 68px;
   height: 68px;
 }

website/common/locales/en/backgrounds.json

@@ -473,5 +473,13 @@
   "backgroundOldFashionedBakeryText": "Old-Fashioned Bakery",
   "backgroundOldFashionedBakeryNotes": "Enjoy delicious smells outside an Old-Fashioned Bakery.",
   "backgroundValentinesDayFeastingHallText": "Valentine's Day Feasting Hall",
-  "backgroundValentinesDayFeastingHallNotes": "Feel the love in a Valentine's Day Feasting Hall."
+  "backgroundValentinesDayFeastingHallNotes": "Feel the love in a Valentine's Day Feasting Hall.",
+
+  "backgrounds032019": "SET 58: Released March 2019",
+  "backgroundDuckPondText": "Duck Pond",
+  "backgroundDuckPondNotes": "Feed aquatic birds at the Duck Pond.",
+  "backgroundFieldWithColoredEggsText": "Field with Colored Eggs",
+  "backgroundFieldWithColoredEggsNotes": "Hunt for springtime treasure in a Field with Colored Eggs.",
+  "backgroundFlowerMarketText": "Flower Market",
+  "backgroundFlowerMarketNotes": "Find the perfect colors for bouquet or garden in a Flower Market."
 }

website/common/locales/en/gear.json

@@ -406,7 +406,9 @@
   "weaponArmoireArcaneScrollText": "Arcane Scroll",
   "weaponArmoireArcaneScrollNotes": "This ancient To-Do list is filled with strange symbols and spells from a forgotten age. Increases Intelligence by <%= int %>. Enchanted Armoire: Scribe Set (Item 3 of 3).",
   "weaponArmoireChefsSpoonText": "Chef's Spoon",
-  "weaponArmoireChefsSpoonNotes": "Raise it as you release your battle cry: “SPOOOON!!” Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 3 of 4). ",
+  "weaponArmoireChefsSpoonNotes": "Raise it as you release your battle cry: “SPOOOON!!” Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 3 of 4).",
+  "weaponArmoireVernalTaperText": "Vernal Taper",
+  "weaponArmoireVernalTaperNotes": "The days are getting longer, but this candle will help you find your way before sunrise. Increases Constitution by <%= con %>. Enchanted Armoire: Vernal Vestments Set (Item 3 of 3).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -881,7 +883,9 @@
   "armorArmoireScribesRobeText": "Scribe's Robes",
   "armorArmoireScribesRobeNotes": "These velvety robes are woven with inspirational and motivational magic. Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Scribe Set (Item 1 of 3).",
   "armorArmoireChefsJacketText": "Chef's Jacket",
-  "armorArmoireChefsJacketNotes": "This thick cotton jacket is double-breasted to protect you from spills (and conveniently reversible…). Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 2 of 4). ",
+  "armorArmoireChefsJacketNotes": "This thick cotton jacket is double-breasted to protect you from spills (and conveniently reversible…). Increases Intelligence by <%= int %>. Enchanted Armoire: Chef Set (Item 2 of 4).",
+  "armorArmoireVernalVestmentText": "Vernal Vestment",
+  "armorArmoireVernalVestmentNotes": "This silky garment is perfect for enjoying mild spring weather in style. Increases Strength and Intelligence by <%= attrs %> each. Enchanted Armoire: Vernal Vestments Set (Item 2 of 3).",
 
   "headgear": "helm",
   "headgearCapitalized": "Headgear",
@@ -1366,7 +1370,9 @@
   "headArmoireVeilOfSpadesText": "Veil of Spades",
   "headArmoireVeilOfSpadesNotes": "A shadowy and mysterious veil that will boost your stealth. Increases Perception by <%= per %>. Enchanted Armoire: Ace of Spades Set (Item 1 of 3).",
   "headArmoireToqueBlancheText": "Toque Blanche",
-  "headArmoireToqueBlancheNotes": "According to legend, the number of folds in this hat indicate the number of ways you know how to cook an egg! Is it accurate? Increases Perception by <%= per %>. Enchanted Armoire: Chef Set (Item 1 of 4). ",
+  "headArmoireToqueBlancheNotes": "According to legend, the number of folds in this hat indicate the number of ways you know how to cook an egg! Is it accurate? Increases Perception by <%= per %>. Enchanted Armoire: Chef Set (Item 1 of 4).",
+  "headArmoireVernalHenninText": "Vernal Hennin",
+  "headArmoireVernalHenninNotes": "More than just a pretty hat, this conical chapeau can also hold a rolled-up To-Do list inside. Increases Perception by <%= per %>. Enchanted Armoire: Vernal Vestments Set (Item 1 of 3).",
 
   "offhand": "off-hand item",
   "offhandCapitalized": "Off-Hand Item",

website/common/script/content/appearance/backgrounds.js

@@ -801,6 +801,20 @@ let backgrounds = {
       notes: t('backgroundValentinesDayFeastingHallNotes'),
     },
   },
+  backgrounds032019: {
+    duck_pond: {
+      text: t('backgroundDuckPondText'),
+      notes: t('backgroundDuckPondNotes'),
+    },
+    field_with_colored_eggs: {
+      text: t('backgroundFieldWithColoredEggsText'),
+      notes: t('backgroundFieldWithColoredEggsNotes'),
+    },
+    flower_market: {
+      text: t('backgroundFlowerMarketText'),
+      notes: t('backgroundFlowerMarketNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

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

@@ -444,6 +444,15 @@ let armor = {
     set: 'chef',
     canOwn: ownsItem('armor_armoire_chefsJacket'),
   },
+  vernalVestment: {
+    text: t('armorArmoireVernalVestmentText'),
+    notes: t('armorArmoireVernalVestmentNotes', { attrs: 6 }),
+    value: 100,
+    str: 6,
+    int: 6,
+    set: 'vernalVestments',
+    canOwn: ownsItem('armor_armoire_vernalVestment'),
+  },
 };
 
 let body = {
@@ -907,6 +916,14 @@ let head = {
     set: 'chef',
     canOwn: ownsItem('head_armoire_toqueBlanche'),
   },
+  vernalHennin: {
+    text: t('headArmoireVernalHenninText'),
+    notes: t('headArmoireVernalHenninNotes', { per: 12 }),
+    value: 100,
+    per: 12,
+    set: 'vernalVestments',
+    canOwn: ownsItem('head_armoire_vernalHennin'),
+  },
 };
 
 let shield = {
@@ -1528,6 +1545,14 @@ let weapon = {
     set: 'chef',
     canOwn: ownsItem('weapon_armoire_chefsSpoon'),
   },
+  vernalTaper: {
+    text: t('weaponArmoireVernalTaperText'),
+    notes: t('weaponArmoireVernalTaperNotes', { con: 8 }),
+    value: 100,
+    con: 8,
+    set: 'vernalVestments',
+    canOwn: ownsItem('weapon_armoire_vernalTaper'),
+  },
 };
 
 let armoireSet = {

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 = 'MARCH RESOLUTION SUCCESS CHALLENGE AND NEW TAKE THIS CHALLENGE';
+const LAST_ANNOUNCEMENT_TITLE = 'MARCH BACKGROUNDS AND ARMOIRE ITEMS!';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -30,18 +30,14 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>3/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>3/5/2019 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="scene_achievement center-block"></div>
-        <p>The Habitica team has launched a special official Challenge series hosted in the <a href='/groups/guild/6e6a8bd3-9f5f-4351-9188-9f11fcd80a99' target='_blank'>Official New Year's Resolution Guild</a>. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, <a href='/challenges/00bbaeaa-d4e0-4eab-92e8-78ba1e754229'>Reach for Your First Achievement</a>, we're focusing on setting smaller mini-goals as milestones! It has a 15 Gem prize, which will be awarded to five lucky winners on April 1st.</p>
-        <p>Congratulations to the winners of the February Challenge, Mistress Cerny, Zsuzsa, Chelusine, Sparks, and Jinmav!</p>
-        <p>The next Take This Challenge has also launched, "<a href='/challenges/7d199231-f3de-4d93-9765-06392f521e96'>Do One Thing Well!</a>", with a focus on minimizing multitasking. Be sure to check it out to earn additional pieces of the Take This armor set!</p>
-        <p><a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.</p>
-        <p>Congratulations to the winners of the last Take This Challenge, "Achievement Unlocked: Self-Care!": grand prize winner orli, and runners-up Hoofter, Fluor, wema, Shilo_The_Eldest, and selesnyancat! Plus, all participants in that Challenge have received a piece of the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target='_blank'>Take This item set</a> if they hadn't completed it already. It is located in your Rewards column. Enjoy!</p>
-        <div class="small mb-3">by Doctor B, the Take This team, Lemoness, Beffymaroo, shanaqui, and SabreCat</div>
-        <div class="promo_take_this center-block"></div>
+        <div class="promo_armoire_backgrounds_201903 center-block"></div>
+        <p>We’ve added three new backgrounds to the Background Shop! Now your avatar can feed the birds at the Duck Pond, browse the Flower Market and go on the hunt for Spring goodies in a Field with Colored Eggs. Check them out under User Icon > Backgrounds!</p>
+        <p>Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the Vernal Vestment set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)</p>
+        <div class="small mb-3">by AnneDeLune, GeraldThePixel, QuartzFox, Vikte, gawrone, astigmatism, and SabreCat</div>
       </div>
       `,
     });

website/server/libs/auth/social.js

@@ -88,7 +88,13 @@ async function loginSocial (req, res) {
       .remove({email: savedUser.auth[network].emails[0].value.toLowerCase()})
       .exec()
       .then(() => {
-        if (!existingUser) sendTxnEmail(savedUser, 'welcome');
+        if (!existingUser) {
+          if (savedUser._ABtests && savedUser._ABtests.welcomeEmailSplit) {
+            sendTxnEmail(savedUser, savedUser._ABtests.welcomeEmailSplit);
+          } else {
+            sendTxnEmail(savedUser, 'welcome');
+          }
+        }
       }); // eslint-disable-line max-nested-callbacks
   }
 

website/server/models/user/hooks.js

@@ -129,14 +129,16 @@ function _setUpNewUser (user) {
   user.preferences.background = 'violet';
 
   const testGroup = Math.random();
-  if (testGroup < 0.25) {
+  if (testGroup < 0.2) {
     user._ABtests.welcomeEmailSplit = 'welcome-v2';
-  } else if (testGroup < 0.5) {
+  } else if (testGroup < 0.4) {
     user._ABtests.welcomeEmailSplit = 'welcome-v2b';
-  } else if (testGroup < 0.75) {
+  } else if (testGroup < 0.6) {
     user._ABtests.welcomeEmailSplit = 'welcome-v2c';
-  } else {
+  } else if (testGroup < 0.8) {
     user._ABtests.welcomeEmailSplit = 'welcome-v2d';
+  } else {
+    user._ABtests.welcomeEmailSplit = 'welcome';
   }
 
   if (user.registeredThrough === 'habitica-web') {