3.83.5

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "habitica",
-  "version": "3.83.4",
+  "version": "3.83.5",
   "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.4",
+  "version": "3.83.5",
   "main": "./website/server/index.js",
   "dependencies": {
     "@slack/client": "^3.8.1",

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

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

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

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

website/views/avatar-static.jade

@@ -24,25 +24,6 @@ html(ng-app="habitrpg")
       window.habitrpg
       .controller('StaticAvatarCtrl', ['$scope', function($scope){
         $scope.profile = window.env.user;
-        $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';
-        }
       }])
 
     //webfonts

website/views/shared/avatar/appearance.jade

@@ -33,4 +33,4 @@ mixin avatar(opts)
 
     // Pet
     if !opts.minimal
-      span.current-pet(ng-class='aprilFool(profile.items.currentPet)')
+      span.current-pet(class='Pet-{{profile.items.currentPet}}', ng-show='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(ng-class='aprilFool(hatchedPet.pet.slice(4))').pull-right
+            div(class='{{::hatchedPet.pet}}').pull-right
           .col-xs-3
             .empty_bottles(style='margin-top:2.8em')
           .col-xs-5(style='padding:0')