Merge branch 'release' into develop

migrations/migration-runner.js

@@ -18,7 +18,7 @@ function setUpServer () {
 setUpServer();
 
 // Replace this with your migration
-const processUsers = require('./tasks/rewards-flip-negative-costs').default;
+const processUsers = require().default;
 
 processUsers()
   .then(() => {

migrations/users/full-stable.js

@@ -33,6 +33,9 @@ async function updateUser (user) {
   each(keys(content.specialPets), pet => {
     set[`items.pets.${pet}`] = 5;
   });
+  each(keys(content.wackyPets), pet => {
+    set[`items.pets.${pet}`] = 5;
+  });
   each(keys(content.mounts), mount => {
     set[`items.mounts.${mount}`] = true;
   });
@@ -54,7 +57,7 @@ async function updateUser (user) {
 export default async function processUsers () {
   const query = {
     migration: { $ne: MIGRATION_NAME },
-    'auth.local.username': 'olson22',
+    'auth.local.username': 'SabreTest',
   };
 
   const fields = {

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "4.138.3",
+  "version": "4.138.4",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "4.138.3",
+  "version": "4.138.4",
   "main": "./website/server/index.js",
   "dependencies": {
     "@babel/core": "^7.9.0",

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

@@ -4,6 +4,12 @@
   width: 204px;
   height: 102px;
 }
+.promo_april_fools_2020 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -952px 0px;
+  width: 423px;
+  height: 147px;
+}
 .promo_armoire_backgrounds_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
   background-position: -340px -659px;
@@ -18,31 +24,37 @@
 }
 .promo_egg_quest {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -952px -296px;
+  background-position: -952px -444px;
   width: 354px;
   height: 147px;
 }
 .promo_hugabug_bundle {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -952px -148px;
+  background-position: -952px -296px;
   width: 420px;
   height: 147px;
 }
 .promo_mystery_202003 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -952px -444px;
+  background-position: -952px -592px;
+  width: 282px;
+  height: 147px;
+}
+.promo_mystery_202004 {
+  background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
+  background-position: -624px -277px;
   width: 282px;
   height: 147px;
 }
 .promo_pi_day {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -624px -277px;
+  background-position: -316px -316px;
   width: 273px;
   height: 147px;
 }
 .promo_seasonal_shop_spring {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -316px -168px;
+  background-position: -764px -659px;
   width: 162px;
   height: 138px;
 }
@@ -60,19 +72,19 @@
 }
 .promo_spring_potions_2020 {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -952px 0px;
+  background-position: -952px -148px;
   width: 423px;
   height: 147px;
 }
 .promo_take_this {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -1235px -444px;
+  background-position: -1235px -592px;
   width: 96px;
   height: 69px;
 }
 .scene_QuartzFox {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -316px -307px;
+  background-position: 0px -870px;
   width: 141px;
   height: 147px;
 }
@@ -90,7 +102,7 @@
 }
 .scene_shanaqui {
   background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png');
-  background-position: -952px -592px;
+  background-position: -316px -168px;
   width: 282px;
   height: 147px;
 }

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

@@ -1,114 +1,114 @@
 .headAccessory_special_bearEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -819px -1347px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_bearEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -844px -1362px;
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_blackHeadband {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -650px -1014px;
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_blueHeadband {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1034px -863px;
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_cactusEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
   background-position: -273px -1438px;
   width: 90px;
   height: 90px;
 }
-.customize-option.headAccessory_special_cactusEars {
+.customize-option.headAccessory_special_bearEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
   background-position: -298px -1453px;
   width: 60px;
   height: 60px;
 }
-.headAccessory_special_foxEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -182px -1438px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_foxEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -207px -1453px;
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_greenHeadband {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1178px -917px;
-  width: 114px;
-  height: 90px;
-}
-.headAccessory_special_lionEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -91px -1438px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_lionEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -116px -1453px;
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pandaEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1438px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pandaEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -25px -1453px;
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pigEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -1274px;
-  width: 90px;
-  height: 90px;
-}
-.customize-option.headAccessory_special_pigEars {
-  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1469px -1289px;
-  width: 60px;
-  height: 60px;
-}
-.headAccessory_special_pinkHeadband {
+.headAccessory_special_blackHeadband {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
   background-position: -804px -863px;
   width: 114px;
   height: 90px;
 }
+.headAccessory_special_blueHeadband {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -919px -863px;
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_cactusEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: 0px -1438px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_cactusEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -25px -1453px;
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_foxEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1444px -1274px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_foxEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1469px -1289px;
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_greenHeadband {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1034px -863px;
+  width: 114px;
+  height: 90px;
+}
+.headAccessory_special_lionEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1444px -1092px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_lionEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1469px -1107px;
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pandaEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1444px -1001px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pandaEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1469px -1016px;
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pigEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1444px -910px;
+  width: 90px;
+  height: 90px;
+}
+.customize-option.headAccessory_special_pigEars {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1469px -925px;
+  width: 60px;
+  height: 60px;
+}
+.headAccessory_special_pinkHeadband {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -305px -1014px;
+  width: 114px;
+  height: 90px;
+}
 .headAccessory_special_redHeadband {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -689px -863px;
+  background-position: -420px -1014px;
   width: 114px;
   height: 90px;
 }
 .headAccessory_special_tigerEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -1183px;
+  background-position: -1444px -637px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_tigerEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1469px -1198px;
+  background-position: -1469px -652px;
   width: 60px;
   height: 60px;
 }
@@ -120,19 +120,19 @@
 }
 .headAccessory_special_wolfEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -1092px;
+  background-position: -1444px -455px;
   width: 90px;
   height: 90px;
 }
 .customize-option.headAccessory_special_wolfEars {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1469px -1107px;
+  background-position: -1469px -470px;
   width: 60px;
   height: 60px;
 }
 .headAccessory_special_yellowHeadband {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -420px -1014px;
+  background-position: -650px -1014px;
   width: 114px;
   height: 90px;
 }
@@ -234,7 +234,7 @@
 }
 .shop_head_special_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1352px -1438px;
+  background-position: -1421px -1438px;
   width: 68px;
   height: 68px;
 }
@@ -390,55 +390,55 @@
 }
 .shield_healer_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -1001px;
+  background-position: -1444px -273px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -910px;
+  background-position: -1444px -182px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -819px;
+  background-position: -1444px -91px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -728px;
+  background-position: -1444px 0px;
   width: 90px;
   height: 90px;
 }
 .shield_healer_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -637px;
+  background-position: -1183px -1347px;
   width: 90px;
   height: 90px;
 }
 .shield_rogue_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -546px;
+  background-position: -1092px -1347px;
   width: 90px;
   height: 90px;
 }
 .shield_rogue_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -400px -1156px;
+  background-position: -504px -1156px;
   width: 103px;
   height: 90px;
 }
 .shield_rogue_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -504px -1156px;
+  background-position: -400px -1156px;
   width: 103px;
   height: 90px;
 }
 .shield_rogue_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -305px -1014px;
+  background-position: -765px -1014px;
   width: 114px;
   height: 90px;
 }
@@ -450,19 +450,19 @@
 }
 .shield_rogue_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -919px -863px;
+  background-position: -689px -863px;
   width: 114px;
   height: 90px;
 }
 .shield_rogue_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -190px -1014px;
+  background-position: -880px -1014px;
   width: 114px;
   height: 90px;
 }
 .shield_special_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -182px;
+  background-position: -273px -1347px;
   width: 90px;
   height: 90px;
 }
@@ -474,73 +474,73 @@
 }
 .shield_special_goldenknight {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -1014px;
+  background-position: -995px -1014px;
   width: 111px;
   height: 90px;
 }
 .shield_special_lootBag {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1183px -1347px;
+  background-position: 0px -1256px;
   width: 90px;
   height: 90px;
 }
 .shield_special_mammothRiderHorn {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1092px -1347px;
+  background-position: -1353px -364px;
   width: 90px;
   height: 90px;
 }
 .shield_special_moonpearlShield {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1001px -1347px;
+  background-position: -182px -1256px;
   width: 90px;
   height: 90px;
 }
 .shield_special_roguishRainbowMessage {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -910px -1347px;
+  background-position: -1002px -1156px;
   width: 90px;
   height: 90px;
 }
 .shield_special_wakizashi {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1107px -1014px;
+  background-position: -1222px -1014px;
   width: 114px;
   height: 87px;
 }
 .shield_special_wintryMirror {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -992px -1014px;
+  background-position: -1107px -1014px;
   width: 114px;
   height: 87px;
 }
 .shield_warrior_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -455px -1347px;
+  background-position: -1353px -1092px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -364px -1347px;
+  background-position: -1353px -1183px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -273px -1347px;
+  background-position: 0px -1347px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -182px -1256px;
+  background-position: -91px -1347px;
   width: 90px;
   height: 90px;
 }
 .shield_warrior_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -91px -1256px;
+  background-position: -182px -1347px;
   width: 90px;
   height: 90px;
 }
@@ -786,61 +786,61 @@
 }
 .shop_weapon_rogue_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -1365px;
+  background-position: 0px -1667px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -1274px;
+  background-position: -1444px -1365px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -324px;
+  background-position: -1353px -1274px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -423px;
+  background-position: -220px -324px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -492px;
+  background-position: -660px -423px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_aetherCrystals {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -561px;
+  background-position: -660px -492px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_bardInstrument {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -643px;
+  background-position: -660px -561px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_critical {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -712px;
+  background-position: -880px -643px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_fencingFoil {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -880px -781px;
+  background-position: -880px -712px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_special_lunarScythe {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1222px -1014px;
+  background-position: -880px -781px;
   width: 68px;
   height: 68px;
 }
@@ -942,13 +942,13 @@
 }
 .shop_weapon_wizard_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1667px;
+  background-position: -1352px -1438px;
   width: 68px;
   height: 68px;
 }
 .shop_weapon_wizard_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1421px -1438px;
+  background-position: -69px -1667px;
   width: 68px;
   height: 68px;
 }
@@ -978,85 +978,85 @@
 }
 .weapon_healer_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1093px -1156px;
+  background-position: -364px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -910px;
+  background-position: -455px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -1183px;
+  background-position: -546px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1347px;
+  background-position: -728px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -91px -1347px;
+  background-position: -819px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -182px -1347px;
+  background-position: -910px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_healer_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -546px -1347px;
+  background-position: -1001px -1347px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -637px -1347px;
+  background-position: -1444px -364px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1274px -1347px;
+  background-position: -1444px -546px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -91px;
+  background-position: -1444px -728px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -273px;
+  background-position: -1444px -819px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -364px;
+  background-position: -1444px -1183px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px -455px;
+  background-position: -91px -1438px;
   width: 90px;
   height: 90px;
 }
 .weapon_rogue_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1002px -1156px;
+  background-position: -182px -1438px;
   width: 90px;
   height: 90px;
 }
@@ -1068,169 +1068,169 @@
 }
 .weapon_special_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1184px -1156px;
+  background-position: -1093px -1156px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1256px;
+  background-position: -1184px -1156px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_aetherCrystals {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -765px -1014px;
+  background-position: -190px -1014px;
   width: 114px;
   height: 90px;
 }
 .weapon_special_bardInstrument {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -364px -1438px;
+  background-position: -91px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_fencingFoil {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -273px -1256px;
+  background-position: -364px -1438px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_lunarScythe {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -364px -1256px;
+  background-position: -273px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_mammothRiderSpear {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -455px -1256px;
+  background-position: -364px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_nomadsScimitar {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -546px -1256px;
+  background-position: -455px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_pageBanner {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -637px -1256px;
+  background-position: -546px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_roguishRainbowMessage {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -728px -1256px;
+  background-position: -637px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_skeletonKey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -819px -1256px;
+  background-position: -728px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tachi {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -910px -1256px;
+  background-position: -819px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_taskwoodsLantern {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1001px -1256px;
+  background-position: -910px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_special_tridentOfCrashingTides {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1092px -1256px;
+  background-position: -1001px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1183px -1256px;
+  background-position: -1092px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px 0px;
+  background-position: -1183px -1256px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -91px;
+  background-position: -1353px 0px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -182px;
+  background-position: -1353px -91px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -273px;
+  background-position: -1353px -182px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -364px;
+  background-position: -1353px -273px;
   width: 90px;
   height: 90px;
 }
 .weapon_warrior_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -455px;
+  background-position: -911px -1156px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_0 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -546px;
+  background-position: -1353px -455px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_1 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -637px;
+  background-position: -1353px -546px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_2 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -728px;
+  background-position: -1353px -637px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -819px;
+  background-position: -1353px -728px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_4 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -911px -1156px;
+  background-position: -1353px -819px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_5 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -1001px;
+  background-position: -1353px -910px;
   width: 90px;
   height: 90px;
 }
 .weapon_wizard_6 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1353px -1092px;
+  background-position: -1353px -1001px;
   width: 90px;
   height: 90px;
 }
@@ -1272,25 +1272,25 @@
 }
 .avatar_floral_healer {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -1156px;
+  background-position: -300px -1156px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_rogue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -100px -1156px;
+  background-position: -200px -1156px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_warrior {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -200px -1156px;
+  background-position: 0px -1156px;
   width: 99px;
   height: 99px;
 }
 .avatar_floral_wizard {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -300px -1156px;
+  background-position: -100px -1156px;
   width: 99px;
   height: 99px;
 }
@@ -1320,13 +1320,13 @@
 }
 .empty_bottles {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -69px -1667px;
+  background-position: -138px -1667px;
   width: 64px;
   height: 54px;
 }
 .ghost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -728px -1347px;
+  background-position: -637px -1347px;
   width: 90px;
   height: 90px;
 }
@@ -1518,7 +1518,7 @@
 }
 .seafoam_star {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1444px 0px;
+  background-position: -1274px -1347px;
   width: 90px;
   height: 90px;
 }
@@ -1650,16 +1650,22 @@
 }
 .notif_inventory_special_thankyou {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1763px -580px;
+  background-position: -1763px -553px;
   width: 20px;
   height: 24px;
 }
 .notif_inventory_special_valentine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -1763px -553px;
+  background-position: -1763px -580px;
   width: 20px;
   height: 24px;
 }
+.npc_aprilFool {
+  background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
+  background-position: -1178px -917px;
+  width: 114px;
+  height: 93px;
+}
 .npc_bailey {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
   background-position: -1742px 0px;
@@ -1704,13 +1710,13 @@
 }
 .quest_amber {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -423px;
+  background-position: -527px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_armadillo {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -423px;
+  background-position: 0px -423px;
   width: 219px;
   height: 219px;
 }
@@ -1734,13 +1740,13 @@
 }
 .quest_axolotl {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -423px;
+  background-position: -747px -220px;
   width: 219px;
   height: 219px;
 }
 .quest_badger {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -307px 0px;
+  background-position: 0px -643px;
   width: 219px;
   height: 219px;
 }
@@ -1758,7 +1764,7 @@
 }
 .quest_bronze {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px -220px;
+  background-position: -660px -643px;
   width: 219px;
   height: 219px;
 }
@@ -1770,13 +1776,13 @@
 }
 .quest_butterfly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -660px -643px;
+  background-position: -747px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_cheetah {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -203px;
+  background-position: -220px -423px;
   width: 219px;
   height: 219px;
 }
@@ -1788,7 +1794,7 @@
 }
 .quest_dilatory {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -220px -643px;
+  background-position: -440px -423px;
   width: 219px;
   height: 219px;
 }
@@ -1806,25 +1812,25 @@
 }
 .quest_dilatoryDistress3 {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -747px 0px;
+  background-position: -440px -643px;
   width: 219px;
   height: 219px;
 }
 .quest_dilatory_derby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -440px -643px;
+  background-position: -307px 0px;
   width: 219px;
   height: 219px;
 }
 .quest_dolphin {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: -527px 0px;
+  background-position: -220px -643px;
   width: 219px;
   height: 219px;
 }
 .quest_dustbunnies {
   background-image: url('~@/assets/images/sprites/spritesmith-main-12.png');
-  background-position: 0px -643px;
+  background-position: 0px -203px;
   width: 219px;
   height: 219px;
 }

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

@@ -1738,265 +1738,265 @@
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Ember {
+.Pet-BearCub-Dessert {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Fairy {
+.Pet-BearCub-Ember {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Floral {
+.Pet-BearCub-Fairy {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Frost {
+.Pet-BearCub-Floral {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Ghost {
+.Pet-BearCub-Frost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -900px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Glass {
+.Pet-BearCub-Ghost {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1000px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Glow {
+.Pet-BearCub-Glass {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Golden {
+.Pet-BearCub-Glow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1200px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Holly {
+.Pet-BearCub-Golden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1300px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-IcySnow {
+.Pet-BearCub-Holly {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1400px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Peppermint {
+.Pet-BearCub-IcySnow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: 0px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Polar {
+.Pet-BearCub-Peppermint {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -82px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Rainbow {
+.Pet-BearCub-Polar {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -164px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Red {
+.Pet-BearCub-Rainbow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -246px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-RoseQuartz {
+.Pet-BearCub-Red {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -328px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-RoyalPurple {
+.Pet-BearCub-RoseQuartz {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -410px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Ruby {
+.Pet-BearCub-RoyalPurple {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -492px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Shade {
+.Pet-BearCub-Ruby {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -574px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Shadow {
+.Pet-BearCub-Shade {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -656px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Shimmer {
+.Pet-BearCub-Shadow {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -738px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Silver {
+.Pet-BearCub-Shimmer {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -820px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Skeleton {
+.Pet-BearCub-Silver {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -902px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Spooky {
+.Pet-BearCub-Skeleton {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -984px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-StarryNight {
+.Pet-BearCub-Spooky {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1066px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Sunshine {
+.Pet-BearCub-StarryNight {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1148px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Thunderstorm {
+.Pet-BearCub-Sunshine {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Veggie {
+.Pet-BearCub-Thunderstorm {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1312px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Watery {
+.Pet-BearCub-Veggie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1394px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-White {
+.Pet-BearCub-Watery {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1476px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-BearCub-Zombie {
+.Pet-BearCub-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1558px -1500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Base {
+.Pet-BearCub-Zombie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1640px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-CottonCandyBlue {
+.Pet-Beetle-Base {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1640px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-CottonCandyPink {
+.Pet-Beetle-CottonCandyBlue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1640px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Desert {
+.Pet-Beetle-CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -800px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Golden {
+.Pet-Beetle-Desert {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -700px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Red {
+.Pet-Beetle-Golden {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Shade {
+.Pet-Beetle-Red {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Skeleton {
+.Pet-Beetle-Shade {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-White {
+.Pet-Beetle-Skeleton {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Beetle-Zombie {
+.Pet-Beetle-White {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Bunny-Base {
+.Pet-Beetle-Zombie {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Bunny-CottonCandyBlue {
+.Pet-Bunny-Base {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1230px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Bunny-CottonCandyPink {
+.Pet-Bunny-CottonCandyBlue {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1148px -1100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Bunny-Desert {
+.Pet-Bunny-CottonCandyPink {
   background-image: url('~@/assets/images/sprites/spritesmith-main-24.png');
   background-position: -1640px -300px;
   width: 81px;

website/client/src/assets/scss/animals.scss

@@ -5,14 +5,7 @@
   right: 0;
   bottom: 0;
   left: 0;
-
-  &:not([class*="FlyingPig"]) {
-    top: -28px !important;
-  }
-}
-
-.Pet[class*="FlyingPig"] {
-  top: 7px !important;
+  top: -28px !important;
 }
 
 .Pet.Pet-Dragon-Hydra {

website/client/src/assets/scss/variables.scss

@@ -2,11 +2,11 @@
 // possible values are: normal, fall, habitoween, thanksgiving, winter, nye, birthday, valentines, spring, summer
 // more to be added on future seasons
 
-$npc_market_flavor: 'spring';
-$npc_quests_flavor: 'spring';
-$npc_seasonal_flavor: 'spring';
-$npc_timetravelers_flavor: 'spring';
-$npc_tavern_flavor: 'spring';
+$npc_market_flavor: 'aprilfools';
+$npc_quests_flavor: 'aprilfools';
+$npc_seasonal_flavor: 'aprilfools';
+$npc_timetravelers_flavor: 'aprilfools';
+$npc_tavern_flavor: 'aprilfools';
 
 $restingToolbarHeight: 40px;
 $menuToolbarHeight: 56px;

website/client/src/components/avatar.vue

@@ -79,9 +79,8 @@
         ></span>
         <!-- Pet-->
         <span
-          v-if="member.items.currentPet"
           class="current-pet"
-          :class="'Pet-' + member.items.currentPet"
+          :class="foolPet(member.items.currentPet)"
         ></span>
       </template>
     </div>
@@ -124,6 +123,7 @@
 </style>
 
 <script>
+import includes from 'lodash/includes';
 import { mapState } from '@/libs/store';
 
 import ClassBadge from '@/components/members/classBadge';
@@ -189,7 +189,7 @@ export default {
       let val = '27px';
 
       if (!this.avatarOnly) {
-        if (this.member.items.currentPet) val = '24px';
+        // if (this.member.items.currentPet) val = '24px';
         if (this.member.items.currentMount) val = '0px';
       }
 
@@ -276,6 +276,52 @@ export default {
 
       return !buffs.snowball && !buffs.spookySparkles && !buffs.shinySeed && !buffs.seafoam;
     },
+    foolPet (pet) {
+      const SPECIAL_PETS = [
+        'Wolf-Veteran',
+        'Wolf-Cerberus',
+        'Dragon-Hydra',
+        'Turkey-Base',
+        'BearCub-Polar',
+        'MantisShrimp-Base',
+        'JackOLantern-Base',
+        'Mammoth-Base',
+        'Tiger-Veteran',
+        'Phoenix-Base',
+        'Turkey-Gilded',
+        'MagicalBee-Base',
+        'Lion-Veteran',
+        'Gryphon-RoyalPurple',
+        'JackOLantern-Ghost',
+        'Jackalope-RoyalPurple',
+        'Orca-Base',
+        'Bear-Veteran',
+        'Hippogriff-Hopeful',
+        'Fox-Veteran',
+        'JackOLantern-Glow',
+        'Gryphon-Gryphatrice',
+      ];
+      const BASE_PETS = [
+        'Wolf',
+        'TigerCub',
+        'PandaCub',
+        'LionCub',
+        'Fox',
+        'FlyingPig',
+        'BearCub',
+        'Dragon',
+        'Cactus',
+      ];
+      if (!pet) return 'Pet-Cactus-Dessert';
+      if (SPECIAL_PETS.indexOf(pet) !== -1) {
+        return 'Pet-LionCub-Dessert';
+      }
+      const species = pet.slice(0, pet.indexOf('-'));
+      if (includes(BASE_PETS, species)) {
+        return `Pet-${species}-Dessert`;
+      }
+      return 'Pet-FlyingPig-Dessert';
+    },
   },
 };
 </script>

website/client/src/components/inventory/stable/petItem.vue

@@ -161,7 +161,10 @@ export default {
     },
     getPetItemClass () {
       if (this.isOwned() || (this.mountOwned() && this.isHatchable())) {
-        return `Pet Pet-${this.item.key} ${this.item.eggKey}`;
+        if (this.isSpecial()) {
+          return 'Pet Pet-LionCub-Dessert';
+        }
+        return `${this.item.class} ${this.item.eggKey}`;
       }
 
       if (!this.isOwned() && this.isSpecial()) {
@@ -173,7 +176,7 @@ export default {
       }
 
       if (this.mountOwned()) {
-        return `GreyedOut Pet Pet-${this.item.key} ${this.item.eggKey}`;
+        return `GreyedOut ${this.item.class} ${this.item.eggKey}`;
       }
 
       // Can't hatch

website/client/src/libs/createAnimal.js

@@ -1,8 +1,10 @@
-
 import content from '@/../../common/script/content';
 
 const specialPets = Object.keys(content.specialPets);
 const wackyPets = Object.keys(content.wackyPets);
+const questPets = Object.keys(content.questPets);
+const premiumPets = Object.keys(content.premiumPets);
+const dropPets = Object.keys(content.pets);
 
 function getText (textOrFunction) {
   if (textOrFunction instanceof Function) {
@@ -34,10 +36,20 @@ export function isSpecial (animal) {
 
 export function createAnimal (egg, potion, type, _content, userItems) {
   const animalKey = `${egg.key}-${potion.key}`;
+  let fooledKey = '';
+  if (questPets.includes(animalKey)) {
+    fooledKey = 'FlyingPig-Dessert';
+  } else if (dropPets.includes(animalKey)
+    || premiumPets.includes(animalKey)
+    || wackyPets.includes(animalKey)) {
+    fooledKey = `${egg.key}-Dessert`;
+  } else {
+    fooledKey = animalKey;
+  }
 
   return {
     key: animalKey,
-    class: type === 'pet' ? `Pet Pet-${animalKey}` : `Mount_Icon_${animalKey}`,
+    class: type === 'pet' ? `Pet Pet-${fooledKey}` : `Mount_Icon_${animalKey}`,
     eggKey: egg.key,
     eggName: getText(egg.text),
     potionKey: potion.key,

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 = 'LAST CHANCE FOR MARCH SUBSCRIBER ITEMS AND HUG A BUG BUNDLE!';
+const LAST_ANNOUNCEMENT_TITLE = 'HAPPY APRIL FOOLS DAY! (ALSO SUBSCRIBER MYSTERY ITEMS)';
 const worldDmg = { // @TODO
   bailey: false,
 };
@@ -31,27 +31,53 @@ api.getNews = {
           <div class="mr-3 ${baileyClass}"></div>
           <div class="media-body">
             <h1 class="align-self-center">${res.t('newStuff')}</h1>
-            <h2>3/30/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
+            <h2>4/1/2020 - ${LAST_ANNOUNCEMENT_TITLE}</h2>
           </div>
         </div>
         <hr/>
-        <div class="promo_mystery_202003 center-block"></div>
-        <h3>Last Chance for Barbed Battler Set</h3>
+        <div class="promo_april_fools_2020 center-block"></div>
+        <h3>Dessert Pets!</h3>
         <p>
-          Reminder: this is the last day to receive the Barbed Battler Set when you <a
-          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!
+          The April Fool rushes into the Tavern, clearly out of breath, with a gigantic picnic
+          basket in tow. The heavenly smell of icing and chocolate wafts from the open basket into
+          the crowd.
+        </p>
+        <p>
+          "HABITICANS!" he cries. "I have heard you are all in need of some good cheer and comfort,
+          and here I am! I hope you don't mind, in rather a turnaround from last year, I've brought
+          along some treats to brighten your day."
+        </p>
+        <p>
+          "Looks like this year he's turned our pets into desserts!" says Piyo. She picks up her
+          new cinnamon bun companion gently. "Awww, they're so perfect and sweet!"
+        </p>
+        <p>
+          Equipping different pets will show different desserts. Have fun discovering them all!
+        </p>
+        <div class="npc_aprilFool center-block"></div>
+        <h3>Special April Fool's Social Media Challenge!</h3>
+        <p>
+          For even more fun, check out the <a href='/challenges/'>official Challenge</a> posted
+          especially for today! Share your avatar featuring your new dessert pet on social media
+          between now and April 3, and you'll have a chance to win Gems and have your avatar
+          featured on the Habitica Blog!
+        </p>
+        <div class="small mb-3">by Beffymaroo, SabreCat, Piyo, and Viirus</div>
+        <div class="promo_mystery_202004 center-block"></div>
+        <h3>April Subscriber Items Revealed!</h3>
+        <p>
+          The April Subscriber Items have been revealed: the Majestic Monarch Item Set! <a
+          href='/user/settings/subscription'>Subscribe to Habitica</a> by April 30 to receive this
+          exciting set! If you're already an active subscriber, reload the site and then head to
+          Inventory > Items to claim your gear!
+        </p>
+        <p>
+          Subscribers also receive the ability to buy Gems with Gold -- the longer you subscribe,
+          the more Gems you can buy per month! There are other perks as well, such as longer access
+          to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep
+          Habitica running. Thank you very much for your support -- it means a lot to us.
         </p>
-        <p>Thanks so much for your support! You help keep Habitica running.</p>
         <div class="small mb-3">by Beffymaroo</div>
-        <div class="promo_hugabug_bundle center-block"></div>
-        <h3>Last Chance for Hug a Bug Pet Quest Bundle</h3>
-        <p>
-          This is also the final day to buy the discounted Hug a Bug Pet Quest Bundle, featuring
-          the Snail, Beetle, and Butterfly quests, all for seven Gems! Be sure to take your bug-
-          catching net over to the <a href='/shops/quests'>Quest Shop</a> before it bugs out!
-        </p>
       </div>
       `,
     });