Merge branch 'develop' into static-page-merch

.eslintrc

@@ -1,6 +1,8 @@
 {
+    "parser": "babel-eslint",
+    "plugins": ["babel"],
     "rules": {
-        "indent": [2, 2],
+        "indent": [2, 2, {"SwitchCase": 1}],
         "quotes": [2, "single"],
         "linebreak-style": [2, "unix"],
         "semi": [2, "always"],
@@ -43,13 +45,13 @@
         "no-self-compare": 2,
         "no-return-assign": 2,
         "no-redeclare": 2,
-        "strict": [2, "global"],
+        "strict": [0, "global"],
         "no-delete-var": 2,
         "no-label-var": 2,
         "no-shadow-restricted-names": 2,
         "no-shadow": [2, { "builtinGlobals": true }],
         "no-undef-init": 2,
-        "no-undef": [2, { typeof: true }],
+        "no-undef": [2, { "typeof": true }],
         "no-unused-vars": 2,
         "no-use-before-define": 2,
         "global-require": 2,
@@ -64,7 +66,7 @@
         "no-dupe-class-members": 2,
         "no-this-before-super": 2,
         "no-var": 2,
-        "object-shorthand": 2,
+        "object-shorthand": 0,
         "prefer-const": 0,
         "prefer-spread": 2,
         "prefer-template": 2,
@@ -75,15 +77,15 @@
         "comma-style": [2, "last"],
         "comma-dangle": [2, "always-multiline"],
         "computed-property-spacing": [2, "never"],
-        "consistent-this": [2, "self"],
+        "consistent-this": [0, "self"],
         "func-names": 2,
         "func-style": [2, "declaration", { "allowArrowFunctions": true }],
         "block-spacing": [2, "always"],
         "key-spacing": [2, {"beforeColon": false, "afterColon": true}],
         "max-nested-callbacks": [2, 3],
-        "new-cap": 2,
+        "new-cap": 0,
         "new-parens": 2,
-        "newline-after-var": 2,
+        "newline-after-var": 0,
         "no-array-constructor": 2,
         "no-continue": 2,
         "no-lonely-if": 2,
@@ -104,17 +106,21 @@
         "space-infix-ops": 2,
         "space-return-throw-case": 2,
         "space-unary-ops": 2,
-        "spaced-comment": [2, "always", { exceptions: ["-"]}],
+        "spaced-comment": [2, "always", { "exceptions": ["-"]}],
         "padded-blocks": [2, "never"],
-        "no-multiple-empty-lines": [2, {max: 2}]
+        "no-multiple-empty-lines": [2, {"max": 2}],
+        "generator-star-spacing": 0,
+        "babel/new-cap": 2,
+        "babel/object-shorthand": 2,
+        "babel/no-await-in-loop": 2
     },
     "env": {
         "es6": true,
         "mocha": true,
         "node": true
     },
-    ecmaFeatures : {
-        modules: true
+    "ecmaFeatures" : {
+        "modules": true
     },
     "extends": "eslint:recommended"
 }

common/css/index.css

@@ -1,9 +1,9 @@
 /* Comment out for holiday events */
-.npc_ian {
+/* .npc_ian {
   background: url("/common/img/sprites/npc_ian.gif") no-repeat;
   width: 78px;
   height: 135px;
-}
+} */
 
 .quest_burnout {
   background: url("/common/img/sprites/quest_burnout.gif") no-repeat;

common/dist/sprites/spritesmith-largeSprites-0.css

@@ -1,18 +1,18 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -616px;
+  background-position: 0px -1085px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -252px;
+  background-position: -943px -343px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -343px;
+  background-position: -1300px -915px;
   width: 105px;
   height: 90px;
 }
@@ -24,13 +24,13 @@
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px 0px;
+  background-position: -452px -241px;
   width: 175px;
   height: 175px;
 }
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -251px;
+  background-position: -1119px -342px;
   width: 150px;
   height: 150px;
 }
@@ -54,43 +54,49 @@
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -417px;
+  background-position: -364px -1085px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -499px -525px;
+  background-position: 0px -835px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -550px;
+  background-position: -1119px -641px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -824px;
+  background-position: -1119px -915px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -543px -417px;
+  background-position: -91px -1085px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1225px -991px;
+  background-position: -943px -176px;
   width: 122px;
   height: 90px;
 }
+.promo_enchanted_armoire_201601 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -452px -417px;
+  width: 90px;
+  height: 90px;
+}
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px -241px;
+  background-position: -943px 0px;
   width: 175px;
   height: 175px;
 }
@@ -102,211 +108,223 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1260px -402px;
+  background-position: -1276px -194px;
   width: 100px;
   height: 137px;
 }
 .customize-option.promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1285px -417px;
+  background-position: -1301px -209px;
   width: 60px;
   height: 60px;
 }
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px 0px;
+  background-position: -1119px -91px;
   width: 249px;
   height: 102px;
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -380px -1008px;
+  background-position: -543px -417px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1270px -251px;
+  background-position: -943px -540px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1037px -525px;
+  background-position: -1037px -637px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1300px -824px;
+  background-position: -1337px -732px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -311px;
+  background-position: -182px -1085px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1272px -915px;
+  background-position: -1318px -823px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -808px -621px;
+  background-position: -546px -1085px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1037px -434px;
+  background-position: -1034px -540px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1318px -732px;
+  background-position: -1066px -176px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -707px;
+  background-position: -306px -220px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -562px -1008px;
+  background-position: -306px -311px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1049px -343px;
+  background-position: -1034px -434px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -808px -621px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1064px -252px;
+  background-position: -1064px -343px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1276px -103px;
+  background-position: -943px -434px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -525px;
+  background-position: -943px -728px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -1008px;
+  background-position: -273px -1085px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -434px;
+  background-position: -943px -637px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -471px -1008px;
+  background-position: -455px -1085px;
   width: 90px;
   height: 90px;
 }
+.promo_mystery_201512 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1337px -641px;
+  width: 60px;
+  height: 81px;
+}
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -641px;
+  background-position: -1119px -732px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -991px;
+  background-position: -1270px -342px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -662px -835px;
+  background-position: -1272px -1006px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -835px;
+  background-position: 0px -912px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -25px -850px;
+  background-position: -25px -927px;
   width: 60px;
   height: 60px;
 }
+.promo_peppermint_flame {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -1119px -493px;
+  width: 140px;
+  height: 147px;
+}
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -402px;
+  background-position: -1260px -493px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1144px -417px;
+  background-position: -1285px -508px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -331px -835px;
+  background-position: -331px -912px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -356px -850px;
+  background-position: -356px -927px;
   width: 60px;
   height: 60px;
 }
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -732px;
+  background-position: -1119px -823px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1144px -747px;
+  background-position: -1144px -838px;
   width: 60px;
   height: 60px;
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -648px -724px;
+  background-position: -1119px 0px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1008px;
+  background-position: -648px -724px;
   width: 288px;
   height: 90px;
 }
@@ -318,22 +336,28 @@
 }
 .promo_summer_classes_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -919px;
+  background-position: 0px -996px;
   width: 300px;
   height: 88px;
 }
 .promo_updos {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -103px;
+  background-position: -1119px -194px;
   width: 156px;
   height: 147px;
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -943px -176px;
+  background-position: -943px -267px;
   width: 146px;
   height: 75px;
 }
+.promo_winter_classes_2016 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: -499px -525px;
+  width: 360px;
+  height: 90px;
+}
 .promo_winterclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
   background-position: 0px -724px;
@@ -342,13 +366,13 @@
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1119px -915px;
+  background-position: -1119px -1006px;
   width: 152px;
   height: 75px;
 }
 .customize-option.promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1144px -930px;
+  background-position: -1144px -1021px;
   width: 60px;
   height: 60px;
 }

common/dist/sprites/spritesmith-main-11.css

@@ -1,204 +1,816 @@
-.Pet-Whale-CottonCandyBlue {
+.Pet-Rock-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-CottonCandyPink {
+.Pet-Rock-Red {
   background-image: url(spritesmith-main-11.png);
-  background-position: -164px -300px;
+  background-position: -738px -500px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Desert {
+.Pet-Rock-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Golden {
+.Pet-Rock-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Red {
+.Pet-Rock-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Shade {
+.Pet-Rock-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Skeleton {
+.Pet-Rooster-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-White {
+.Pet-Rooster-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Whale-Zombie {
+.Pet-Rooster-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Base {
+.Pet-Rooster-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-CottonCandyBlue {
+.Pet-Rooster-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -164px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-CottonCandyPink {
+.Pet-Rooster-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Desert {
+.Pet-Rooster-Shade {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Golden {
+.Pet-Rooster-Skeleton {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -100px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Peppermint {
+.Pet-Rooster-White {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -200px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Red {
+.Pet-Rooster-Zombie {
   background-image: url(spritesmith-main-11.png);
   background-position: 0px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Shade {
+.Pet-Seahorse-Base {
   background-image: url(spritesmith-main-11.png);
   background-position: -82px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Skeleton {
+.Pet-Seahorse-CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
-  background-position: 0px 0px;
+  background-position: -164px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Spooky {
+.Pet-Seahorse-CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
   background-position: -246px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Veteran {
+.Pet-Seahorse-Desert {
   background-image: url(spritesmith-main-11.png);
   background-position: -328px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-White {
+.Pet-Seahorse-Golden {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-Seahorse-Red {
   background-image: url(spritesmith-main-11.png);
   background-position: -410px -100px;
   width: 81px;
   height: 99px;
 }
+.Pet-Seahorse-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Seahorse-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Seahorse-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Seahorse-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Sheep-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Slime-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Snake-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Spider-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Tiger-Veteran {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Peppermint {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Spooky {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TigerCub-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Gilded {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -574px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -656px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -738px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -820px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -902px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyPink {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -500px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -600px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -700px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -984px -800px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(spritesmith-main-11.png);
+  background-position: 0px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -82px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -164px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -246px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -328px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -410px -900px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(spritesmith-main-11.png);
+  background-position: -492px -900px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Base {
   background-image: url(spritesmith-main-11.png);
-  background-position: -410px -252px;
+  background-position: -623px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url(spritesmith-main-11.png);
-  background-position: -147px -400px;
+  background-position: -868px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url(spritesmith-main-11.png);
-  background-position: -410px -304px;
+  background-position: -672px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url(spritesmith-main-11.png);
-  background-position: 0px -400px;
+  background-position: -721px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url(spritesmith-main-11.png);
-  background-position: -49px -400px;
+  background-position: -770px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url(spritesmith-main-11.png);
-  background-position: -98px -400px;
+  background-position: -819px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url(spritesmith-main-11.png);
-  background-position: -410px -200px;
+  background-position: -574px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url(spritesmith-main-11.png);
-  background-position: -196px -400px;
+  background-position: -917px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url(spritesmith-main-11.png);
-  background-position: -245px -400px;
+  background-position: -966px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url(spritesmith-main-11.png);
-  background-position: -294px -400px;
+  background-position: -1015px -900px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_White {
   background-image: url(spritesmith-main-11.png);
-  background-position: -343px -400px;
+  background-position: 0px -1000px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url(spritesmith-main-11.png);
-  background-position: -392px -400px;
+  background-position: -49px -1000px;
   width: 48px;
   height: 51px;
 }