3.83.3

* feat(event): April Fools 2017

* feat(event): NPCs and Bailey

* fix(event): tweak NPCs, add challenge link

* chore(sprites): compile

* 3.83.2

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "3.83.1",
+  "version": "3.83.3",
   "dependencies": {
     "@gulp-sourcemaps/map-sources": {
       "version": "1.0.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "habitica",
   "description": "A habit tracker app which treats your goals like a Role Playing Game.",
-  "version": "3.83.1",
+  "version": "3.83.3",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

website/assets/sprites/dist/spritesmith-main-17.css

@@ -1,468 +1,552 @@
-.Pet-Triceratops-Golden {
+.Pet-TRex-Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Triceratops-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turkey-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turkey-Gilded {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Cupid {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Floral {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ghost {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Holly {
+.Pet-TRex-CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -492px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-TRex-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Gilded {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -574px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-Whale-Shade {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-RoyalPurple {
+.Pet-Whale-Skeleton {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-Whale-White {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shimmer {
+.Pet-Whale-Zombie {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-Wolf-Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Wolf-CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Thunderstorm {
+.Pet-Wolf-CottonCandyPink {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: 0px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Wolf-Cupid {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -82px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Wolf-Desert {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -164px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Wolf-Floral {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -246px -600px;
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Ghost {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -656px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -700px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -377px -600px;
+  background-position: -213px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -104px;
+  background-position: -654px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -426px -600px;
+  background-position: -262px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Cupid {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -475px -600px;
+  background-position: -311px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -524px -600px;
+  background-position: -360px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -573px -600px;
+  background-position: -409px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Ghost {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -622px -600px;
+  background-position: -458px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -671px -600px;
+  background-position: -507px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Holly {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px 0px;
+  background-position: -556px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -52px;
+  background-position: -605px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Purple {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -600px;
+  background-position: -164px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -156px;
+  background-position: -703px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_RoyalPurple {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -208px;
+  background-position: -752px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -260px;
+  background-position: -820px 0px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shimmer {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -312px;
+  background-position: -820px -52px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -364px;
+  background-position: -820px -104px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -416px;
+  background-position: -820px -156px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -468px;
+  background-position: -820px -208px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_White {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -520px;
+  background-position: -820px -260px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -572px;
+  background-position: -820px -312px;
   width: 48px;
   height: 51px;
 }

website/client-old/js/controllers/memberModalCtrl.js

@@ -80,5 +80,24 @@ habitrpg
             $scope.$close();
           });
       }
+      $scope.aprilFool = function (pet) {
+        if (!pet) return 'Pet-AprilFool-None';
+        if (pet === 'Phoenix-Base') return 'Pet-AprilFool-Red';
+        var petStringArray = pet.split('-');
+        var petColor = petStringArray[1];
+        var standardColors = ['Base', 'CottonCandyBlue', 'CottonCandyPink', 'Desert', 'Golden', 'Red', 'Shade', 'Skeleton', 'White', 'Zombie'];
+        if (standardColors.indexOf(petColor) !== -1) return 'Pet-AprilFool-' + petColor;
+        if (petColor === 'Cerberus') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Cupid') return 'Pet-AprilFool-CottonCandyPink';
+        if (petColor === 'Ghost') return 'Pet-AprilFool-Skeleton';
+        if (petColor === 'Gilded') return 'Pet-AprilFool-Golden';
+        if (petColor === 'Hydra') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Polar') return 'Pet-AprilFool-White';
+        if (petColor === 'RoyalPurple') return 'Pet-AprilFool-Golden';
+        if (petColor === 'Shimmer') return 'Pet-AprilFool-Red';
+        if (petColor === 'Spooky') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Veteran') return 'Pet-AprilFool-Shade';
+        return 'Pet-AprilFool-Magic';
+      }
     }
   ]);

website/client-old/js/controllers/partyCtrl.js

@@ -286,5 +286,25 @@ habitrpg.controller("PartyCtrl", ['$rootScope','$scope','Groups','Chat','User','
 
         return isQuestLeader;
       };
+
+      $scope.aprilFool = function (pet) {
+        if (!pet) return 'Pet-AprilFool-None';
+        if (pet === 'Phoenix-Base') return 'Pet-AprilFool-Red';
+        var petStringArray = pet.split('-');
+        var petColor = petStringArray[1];
+        var standardColors = ['Base', 'CottonCandyBlue', 'CottonCandyPink', 'Desert', 'Golden', 'Red', 'Shade', 'Skeleton', 'White', 'Zombie'];
+        if (standardColors.indexOf(petColor) !== -1) return 'Pet-AprilFool-' + petColor;
+        if (petColor === 'Cerberus') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Cupid') return 'Pet-AprilFool-CottonCandyPink';
+        if (petColor === 'Ghost') return 'Pet-AprilFool-Skeleton';
+        if (petColor === 'Gilded') return 'Pet-AprilFool-Golden';
+        if (petColor === 'Hydra') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Polar') return 'Pet-AprilFool-White';
+        if (petColor === 'RoyalPurple') return 'Pet-AprilFool-Golden';
+        if (petColor === 'Shimmer') return 'Pet-AprilFool-Red';
+        if (petColor === 'Spooky') return 'Pet-AprilFool-Zombie';
+        if (petColor === 'Veteran') return 'Pet-AprilFool-Shade';
+        return 'Pet-AprilFool-Magic';
+      }
     }
   ]);

website/client-old/js/controllers/userCtrl.js

@@ -117,5 +117,25 @@ habitrpg.controller("UserCtrl", ['$rootScope', '$scope', '$location', 'User', '$
     $scope.achievements = Shared.achievements.getAchievementsForProfile($scope.profile);
     $scope.achievPopoverPlacement = 'right';
     $scope.achievAppendToBody = 'true'; // append-to-body breaks popovers in modal windows
+
+    $scope.aprilFool = function (pet) {
+      if (!pet) return 'Pet-AprilFool-None';
+      if (pet === 'Phoenix-Base') return 'Pet-AprilFool-Red';
+      var petStringArray = pet.split('-');
+      var petColor = petStringArray[1];
+      var standardColors = ['Base', 'CottonCandyBlue', 'CottonCandyPink', 'Desert', 'Golden', 'Red', 'Shade', 'Skeleton', 'White', 'Zombie'];
+      if (standardColors.indexOf(petColor) !== -1) return 'Pet-AprilFool-' + petColor;
+      if (petColor === 'Cerberus') return 'Pet-AprilFool-Zombie';
+      if (petColor === 'Cupid') return 'Pet-AprilFool-CottonCandyPink';
+      if (petColor === 'Ghost') return 'Pet-AprilFool-Skeleton';
+      if (petColor === 'Gilded') return 'Pet-AprilFool-Golden';
+      if (petColor === 'Hydra') return 'Pet-AprilFool-Zombie';
+      if (petColor === 'Polar') return 'Pet-AprilFool-White';
+      if (petColor === 'RoyalPurple') return 'Pet-AprilFool-Golden';
+      if (petColor === 'Shimmer') return 'Pet-AprilFool-Red';
+      if (petColor === 'Spooky') return 'Pet-AprilFool-Zombie';
+      if (petColor === 'Veteran') return 'Pet-AprilFool-Shade';
+      return 'Pet-AprilFool-Magic';
+    }
   }
 ]);

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

@@ -1,468 +1,552 @@
-.Pet-Triceratops-Golden {
+.Pet-TRex-Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Triceratops-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Triceratops-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turkey-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turkey-Gilded {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Turtle-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Red {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Shade {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -492px -400px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Skeleton {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-White {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Zombie {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Base {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -574px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyBlue {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyPink {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: 0px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Cupid {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -82px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Desert {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -164px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Floral {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -246px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Ghost {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Golden {
-  background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -410px -500px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Holly {
+.Pet-TRex-CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -492px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-TRex-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Triceratops-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Gilded {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turtle-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -574px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-Whale-Shade {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-RoyalPurple {
+.Pet-Whale-Skeleton {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-Whale-White {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shimmer {
+.Pet-Whale-Zombie {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-Wolf-Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -400px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Wolf-CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -656px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Thunderstorm {
+.Pet-Wolf-CottonCandyPink {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: 0px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Wolf-Cupid {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -82px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Wolf-Desert {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -164px -600px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Wolf-Floral {
   background-image: url(/static/sprites/spritesmith-main-17.png);
   background-position: -246px -600px;
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-Ghost {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -328px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -410px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Holly {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -492px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -574px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -656px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-RoyalPurple {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shimmer {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Thunderstorm {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -738px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: 0px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(/static/sprites/spritesmith-main-17.png);
+  background-position: -82px -700px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Base {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -377px -600px;
+  background-position: -213px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -104px;
+  background-position: -654px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -426px -600px;
+  background-position: -262px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Cupid {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -475px -600px;
+  background-position: -311px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -524px -600px;
+  background-position: -360px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -573px -600px;
+  background-position: -409px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Ghost {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -622px -600px;
+  background-position: -458px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -671px -600px;
+  background-position: -507px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Holly {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px 0px;
+  background-position: -556px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -52px;
+  background-position: -605px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Purple {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -328px -600px;
+  background-position: -164px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -156px;
+  background-position: -703px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_RoyalPurple {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -208px;
+  background-position: -752px -700px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -260px;
+  background-position: -820px 0px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shimmer {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -312px;
+  background-position: -820px -52px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -364px;
+  background-position: -820px -104px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -416px;
+  background-position: -820px -156px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Thunderstorm {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -468px;
+  background-position: -820px -208px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_White {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -520px;
+  background-position: -820px -260px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url(/static/sprites/spritesmith-main-17.png);
-  background-position: -738px -572px;
+  background-position: -820px -312px;
   width: 48px;
   height: 51px;
 }

website/views/shared/avatar/appearance.jade

@@ -33,4 +33,4 @@ mixin avatar(opts)
 
     // Pet
     if !opts.minimal
-      span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='profile.items.currentPet')
+      span.current-pet(ng-class='aprilFool(profile.items.currentPet)')

website/views/shared/modals/hatch-pet.jade

@@ -8,7 +8,7 @@ script(type='text/ng-template', id='modals/hatchPet.html')
       .container-fluid
         .row(style='margin-bottom:1em', ng-controller='UserCtrl')
           .col-xs-4(style='padding:0')
-            div(class='{{::hatchedPet.pet}}').pull-right
+            div(ng-class='aprilFool(hatchedPet.pet.slice(4))').pull-right
           .col-xs-3
             .empty_bottles(style='margin-top:2.8em')
           .col-xs-5(style='padding:0')

website/views/shared/new-stuff.jade

@@ -1,28 +1,43 @@
-h2 3/30/2017 - LAST CHANCE FOR SHIMMER ARMOR SET, AND... WHAT IS THE APRIL FOOL UP TO?
+h2 4/1/2017 - THE APRIL FOOL'S DISTRACTION DISCOTHEQUE AND DAZZLE DANCE EMPORIUM
   hr
   tr
     td
-      .npc_aprilFool.pull-right
-      h3 Be on the Lookout for Weekend Shenanigans...
-      p The April Fool has been looking awfully cheerful recently. TOO cheerful... He promises that he's not planning any shenanigans at the turn of the month, but we suspect that this masterful Rogue may have some tricks up his sleeves.
-      br
-      p "Nonsense!" he says. "Me, interfere on April Fool's Day? Why, you won't even see me."
-      br
-      p Perhaps you should check back over the weekend, just in case...
+      h3 Welcome to the Distraction Discotheque and Dazzle Dance Emporium!
+      p "It's a marvelous day, and I, Bailey the Town DJ, would like to warmly welcome you to the Distraction Discotheque and Dazzle Dance Emporium! This festive location was set up by the dashing, brilliant, and humble April Fool. It's entirely devoted to sparkly diversion -- and avoiding productivity at all costs!
   tr
     td
-      .promo_mystery_201703.pull-left.slight-right-margin
-      h3 Last Chance for Shimmer Armor Set
-      p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Shimmer Armor Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!
+      h3 Rad New NPCs!
+      p Be sure to check out all your favorite places on Habitica today to visit the Non-Player Characters, a set of ENTIRELY unique individuals, as I... er, they... have a grand time and dance the day away!
+  tr
+    td
+      h3 Party with the April Fool and Win Gems!
+      p You're going to have a wonderful time, not least of all because the April Fool, in his endless magnanimity, is making the time to party with every single one of you -- take a peek at your avatar!
       br
-      p Thanks so much for your support! You help keep Habitica running.
-      p.small.muted by Lemoness
+      p For even more fun, check out <a href='/#/options/groups/challenges/f55bbda3-f14c-407e-b238-8f82b85f126f'>the official Challenge</a> posted especially for today! Share your avatar featuring that fantastic Fool on social media, and you'll have a chance to win gems. Now go boogie!"
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 3/30/2017 - LAST CHANCE FOR SHIMMER ARMOR SET, AND... WHAT IS THE APRIL FOOL UP TO?
+    tr
+      td
+        .npc_aprilFool.pull-right
+        h3 Be on the Lookout for Weekend Shenanigans...
+        p The April Fool has been looking awfully cheerful recently. TOO cheerful... He promises that he's not planning any shenanigans at the turn of the month, but we suspect that this masterful Rogue may have some tricks up his sleeves.
+        br
+        p "Nonsense!" he says. "Me, interfere on April Fool's Day? Why, you won't even see me."
+        br
+        p Perhaps you should check back over the weekend, just in case...
+    tr
+      td
+        .promo_mystery_201703.pull-left.slight-right-margin
+        h3 Last Chance for Shimmer Armor Set
+        p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Shimmer Armor Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!
+        br
+        p Thanks so much for your support! You help keep Habitica running.
+        p.small.muted by Lemoness
   h2 3/28/2017 - DEWINES CONTRIBUTOR SPOTLIGHT, ECO-FRIENDLY GUILD SPOTLIGHT, AND COMMUNITY GUIDELINES UPDATES
     tr
       td