feat(content): Armoire and BGs 2016-07 (#7762)

* feat(content): Armoire and BGs 2016-07

* fix(backgrounds): resize Dilatory Castle
Also fixes a long-overlooked issue where the Egg Hunt quest remained available long after its event ended.

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

@@ -1,150 +1,156 @@
 .2014_Fall_HealerPROMO2 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -949px -1310px;
+  background-position: -306px -402px;
   width: 90px;
   height: 90px;
 }
 .2014_Fall_Mage_PROMO9 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -866px;
+  background-position: -1493px -1160px;
   width: 120px;
   height: 90px;
 }
 .2014_Fall_RoguePROMO3 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -109px -1310px;
+  background-position: -864px -392px;
   width: 105px;
   height: 90px;
 }
 .2014_Fall_Warrior_PROMO {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -403px -1310px;
+  background-position: -1104px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_android {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -508px;
+  background-position: -1278px -199px;
   width: 175px;
   height: 175px;
 }
 .promo_backgrounds_armoire_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -306px -220px;
+  background-position: -1136px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -241px;
+  background-position: -994px -199px;
   width: 141px;
   height: 294px;
 }
 .promo_backgrounds_armoire_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -593px 0px;
+  background-position: -281px -525px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px 0px;
+  background-position: -452px 0px;
   width: 140px;
   height: 441px;
 }
 .promo_backgrounds_armoire_201606 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -452px 0px;
+  background-position: -140px -525px;
   width: 140px;
   height: 447px;
 }
+.promo_backgrounds_armoire_201607 {
+  background-image: url(spritesmith-largeSprites-0.png);
+  background-position: 0px -525px;
+  width: 139px;
+  height: 588px;
+}
 .promo_backtoschool {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -553px;
+  background-position: -1493px 0px;
   width: 150px;
   height: 150px;
 }
 .promo_burnout {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px 0px;
+  background-position: -593px -151px;
   width: 219px;
   height: 240px;
 }
 .promo_chairs_glasses {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1017px -241px;
+  background-position: -452px -442px;
   width: 51px;
   height: 210px;
 }
 .promo_classes_fall_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -363px -1005px;
+  background-position: -593px -684px;
   width: 321px;
   height: 100px;
 }
 .promo_classes_fall_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -281px -857px;
+  background-position: -994px -808px;
   width: 377px;
   height: 99px;
 }
 .promo_dilatoryDistress {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1401px;
+  background-position: -273px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_egg_mounts {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -857px;
+  background-position: -994px -494px;
   width: 280px;
   height: 147px;
 }
 .promo_enchanted_armoire {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -271px -772px;
+  background-position: 0px -1114px;
   width: 374px;
   height: 76px;
 }
 .promo_enchanted_armoire_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1000px;
+  background-position: -699px -967px;
   width: 217px;
   height: 90px;
 }
 .promo_enchanted_armoire_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -536px;
+  background-position: -468px -1275px;
   width: 180px;
   height: 90px;
 }
 .promo_enchanted_armoire_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -182px -1401px;
+  background-position: -455px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_enchanted_armoire_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -684px;
+  background-position: -1493px -993px;
   width: 122px;
   height: 90px;
 }
 .promo_enchanted_armoire_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -676px -1310px;
+  background-position: -831px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_floral_potions {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -684px;
+  background-position: -593px -785px;
   width: 105px;
   height: 273px;
 }
 .promo_habitica {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -332px;
+  background-position: -813px -151px;
   width: 175px;
   height: 175px;
 }
@@ -156,325 +162,325 @@
 }
 .promo_haunted_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1483px -704px;
+  background-position: -1493px -749px;
   width: 100px;
   height: 137px;
 }
 .promo_item_notif {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px 0px;
+  background-position: 0px -1275px;
   width: 249px;
   height: 102px;
 }
 .promo_mystery_201405 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1222px -1310px;
+  background-position: -1377px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201406 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -402px;
+  background-position: -452px -865px;
   width: 90px;
   height: 96px;
 }
 .promo_mystery_201407 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -777px -442px;
+  background-position: -937px -483px;
   width: 42px;
   height: 62px;
 }
 .promo_mystery_201408 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -414px;
+  background-position: -1432px -494px;
   width: 60px;
   height: 71px;
 }
 .promo_mystery_201409 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -494px -1310px;
+  background-position: -649px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201410 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1017px -452px;
+  background-position: -864px -483px;
   width: 72px;
   height: 63px;
 }
 .promo_mystery_201411 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -858px -1310px;
+  background-position: -1013px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201412 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -734px -442px;
+  background-position: -1599px -887px;
   width: 42px;
   height: 66px;
 }
 .promo_mystery_201501 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1541px -1182px;
+  background-position: -1594px -749px;
   width: 48px;
   height: 63px;
 }
 .promo_mystery_201502 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1404px -1310px;
+  background-position: -91px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201503 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1495px -1310px;
+  background-position: -182px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201504 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -508px;
+  background-position: -1432px -566px;
   width: 60px;
   height: 69px;
 }
 .promo_mystery_201505 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -91px -1401px;
+  background-position: -364px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201506 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -578px;
+  background-position: -1594px -813px;
   width: 42px;
   height: 69px;
 }
 .promo_mystery_201507 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1499px -103px;
+  background-position: -452px -653px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_201508 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -553px;
+  background-position: -306px -220px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201509 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -585px -1310px;
+  background-position: -740px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201510 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -215px -1310px;
+  background-position: -452px -962px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201511 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -767px -1310px;
+  background-position: -922px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201512 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1271px -332px;
+  background-position: -1424px -96px;
   width: 60px;
   height: 81px;
 }
 .promo_mystery_201601 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1201px -775px;
+  background-position: -1493px -1251px;
   width: 120px;
   height: 90px;
 }
 .promo_mystery_201602 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1040px -1310px;
+  background-position: -1195px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201603 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1131px -1310px;
+  background-position: -1286px -1275px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201604 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -309px -1310px;
+  background-position: -306px -311px;
   width: 93px;
   height: 90px;
 }
 .promo_mystery_201605 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1313px -1310px;
+  background-position: 0px -1378px;
   width: 90px;
   height: 90px;
 }
 .promo_mystery_201606 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1493px -251px;
+  background-position: -452px -759px;
   width: 90px;
   height: 105px;
 }
 .promo_mystery_3014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1091px;
+  background-position: -250px -1275px;
   width: 217px;
   height: 90px;
 }
 .promo_orca {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1483px -852px;
+  background-position: -1493px -887px;
   width: 105px;
   height: 105px;
 }
 .promo_partyhats {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -875px -627px;
+  background-position: -813px -327px;
   width: 115px;
   height: 47px;
 }
 .promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -326px -1108px;
+  background-position: 0px -1191px;
   width: 330px;
   height: 83px;
 }
 .customize-option.promo_pastel_skin {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -351px -1123px;
+  background-position: -25px -1206px;
   width: 60px;
   height: 60px;
 }
 .promo_peppermint_flame {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -852px;
+  background-position: -1493px -601px;
   width: 140px;
   height: 147px;
 }
 .promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -704px;
+  background-position: -1493px -453px;
   width: 140px;
   height: 147px;
 }
 .customize-option.promo_pet_skins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1367px -719px;
+  background-position: -1518px -468px;
   width: 60px;
   height: 60px;
 }
 .promo_shimmer_hair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -685px -1005px;
+  background-position: -331px -1191px;
   width: 330px;
   height: 83px;
 }
 .promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -1182px;
+  background-position: -1278px -375px;
   width: 198px;
   height: 91px;
 }
 .customize-option.promo_splashyskins {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1367px -1197px;
+  background-position: -1303px -390px;
   width: 60px;
   height: 60px;
 }
 .promo_spring_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1005px;
+  background-position: -994px -908px;
   width: 362px;
   height: 102px;
 }
 .promo_springclasses2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -289px -1219px;
+  background-position: -699px -876px;
   width: 288px;
   height: 90px;
 }
 .promo_springclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1219px;
+  background-position: -699px -785px;
   width: 288px;
   height: 90px;
 }
 .promo_summer_classes_2014 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -401px -525px;
+  background-position: -994px -96px;
   width: 429px;
   height: 102px;
 }
 .promo_summer_classes_2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -770px -676px;
+  background-position: -140px -973px;
   width: 300px;
   height: 88px;
 }
 .promo_summer_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -525px;
+  background-position: -593px 0px;
   width: 400px;
   height: 150px;
 }
 .promo_takeThis_gear {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -578px -1219px;
+  background-position: -1357px -908px;
   width: 114px;
   height: 87px;
 }
 .promo_takethis_armor {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -693px -1219px;
+  background-position: -1372px -808px;
   width: 114px;
   height: 87px;
 }
 .promo_updos {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -103px;
+  background-position: -1275px -494px;
   width: 156px;
   height: 147px;
 }
 .promo_veteran_pets {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -799px -772px;
+  background-position: -1493px -1084px;
   width: 146px;
   height: 75px;
 }
 .promo_winter_classes_2016 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -659px -857px;
+  background-position: -994px -1011px;
   width: 360px;
   height: 90px;
 }
 .promo_winterclasses2015 {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1108px;
+  background-position: -593px -573px;
   width: 325px;
   height: 110px;
 }
 .promo_winteryhair {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -646px -772px;
+  background-position: -375px -1114px;
   width: 152px;
   height: 75px;
 }
 .avatar_variety {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -271px -676px;
+  background-position: -994px 0px;
   width: 498px;
   height: 95px;
 }
 .npc_viirus {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -1310px;
+  background-position: -1355px -1011px;
   width: 108px;
   height: 90px;
 }
@@ -486,31 +492,31 @@
 }
 .scene_coding {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -402px;
+  background-position: -1493px -151px;
   width: 150px;
   height: 150px;
 }
 .scene_phone_peek {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1342px -251px;
+  background-position: -1493px -302px;
   width: 150px;
   height: 150px;
 }
 .welcome_basic_avatars {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px 0px;
+  background-position: -994px -642px;
   width: 246px;
   height: 165px;
 }
 .welcome_promo_party {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: 0px -676px;
+  background-position: -593px -392px;
   width: 270px;
   height: 180px;
 }
 .welcome_sample_tasks {
   background-image: url(spritesmith-largeSprites-0.png);
-  background-position: -1095px -166px;
+  background-position: -1241px -642px;
   width: 246px;
   height: 165px;
 }

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

@@ -1,252 +1,324 @@
-.Pet-Unicorn-Red {
+.Pet-TRex-Red {
   background-image: url(spritesmith-main-13.png);
   background-position: -82px 0px;
   width: 81px;
   height: 99px;
 }
-.Pet-Unicorn-Shade {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -410px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Skeleton {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -164px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-White {
-  background-image: url(spritesmith-main-13.png);
-  background-position: 0px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Unicorn-Zombie {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -82px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Base {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -164px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyBlue {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -246px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-CottonCandyPink {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -246px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Desert {
-  background-image: url(spritesmith-main-13.png);
-  background-position: 0px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Golden {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -82px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Red {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -164px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Shade {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -246px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Skeleton {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -328px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-White {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -328px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Whale-Zombie {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -328px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Base {
-  background-image: url(spritesmith-main-13.png);
-  background-position: 0px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyBlue {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -82px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-CottonCandyPink {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -164px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Desert {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -246px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Floral {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -328px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Golden {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -410px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Peppermint {
-  background-image: url(spritesmith-main-13.png);
-  background-position: 0px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Red {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -410px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Shade {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -410px -300px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Skeleton {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -492px 0px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Spooky {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -492px -100px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-Veteran {
-  background-image: url(spritesmith-main-13.png);
-  background-position: -492px -200px;
-  width: 81px;
-  height: 99px;
-}
-.Pet-Wolf-White {
+.Pet-TRex-Shade {
   background-image: url(spritesmith-main-13.png);
   background-position: -492px -300px;
   width: 81px;
   height: 99px;
 }
-.Pet-Wolf-Zombie {
+.Pet-TRex-Skeleton {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -164px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-White {
+  background-image: url(spritesmith-main-13.png);
+  background-position: 0px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-TRex-Zombie {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -82px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Base {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -164px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Turkey-Gilded {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -246px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Base {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -246px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyBlue {
+  background-image: url(spritesmith-main-13.png);
+  background-position: 0px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-CottonCandyPink {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -82px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Desert {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -164px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Golden {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -246px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Red {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -328px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Shade {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -328px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Skeleton {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -328px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-White {
+  background-image: url(spritesmith-main-13.png);
+  background-position: 0px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Unicorn-Zombie {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -82px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Base {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -164px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyBlue {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -246px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-CottonCandyPink {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -328px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Desert {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -410px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Golden {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -410px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Red {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -410px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Shade {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -410px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Skeleton {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -492px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-White {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -492px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Whale-Zombie {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -492px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Base {
+  background-image: url(spritesmith-main-13.png);
+  background-position: 0px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-CottonCandyBlue {
   background-image: url(spritesmith-main-13.png);
   background-position: 0px -400px;
   width: 81px;
   height: 99px;
 }
+.Pet-Wolf-CottonCandyPink {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -82px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Desert {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -164px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Floral {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -246px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Golden {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -328px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Peppermint {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -410px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Red {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -492px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Shade {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -574px 0px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Skeleton {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -574px -100px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Spooky {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -574px -200px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Veteran {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -574px -300px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-White {
+  background-image: url(spritesmith-main-13.png);
+  background-position: -574px -400px;
+  width: 81px;
+  height: 99px;
+}
+.Pet-Wolf-Zombie {
+  background-image: url(spritesmith-main-13.png);
+  background-position: 0px -500px;
+  width: 81px;
+  height: 99px;
+}
 .Pet_HatchingPotion_Base {
   background-image: url(spritesmith-main-13.png);
-  background-position: -131px -400px;
+  background-position: -131px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyBlue {
   background-image: url(spritesmith-main-13.png);
-  background-position: -376px -400px;
+  background-position: -376px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_CottonCandyPink {
   background-image: url(spritesmith-main-13.png);
-  background-position: -180px -400px;
+  background-position: -180px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Desert {
   background-image: url(spritesmith-main-13.png);
-  background-position: -229px -400px;
+  background-position: -229px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Floral {
   background-image: url(spritesmith-main-13.png);
-  background-position: -278px -400px;
+  background-position: -278px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Golden {
   background-image: url(spritesmith-main-13.png);
-  background-position: -327px -400px;
+  background-position: -327px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Peppermint {
   background-image: url(spritesmith-main-13.png);
-  background-position: -82px -400px;
+  background-position: -82px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Red {
   background-image: url(spritesmith-main-13.png);
-  background-position: -425px -400px;
+  background-position: -425px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Shade {
   background-image: url(spritesmith-main-13.png);
-  background-position: -474px -400px;
+  background-position: -474px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Skeleton {
   background-image: url(spritesmith-main-13.png);
-  background-position: -523px -400px;
+  background-position: -523px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Spooky {
   background-image: url(spritesmith-main-13.png);
-  background-position: 0px -500px;
+  background-position: -572px -500px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_White {
   background-image: url(spritesmith-main-13.png);
-  background-position: -49px -500px;
+  background-position: 0px -600px;
   width: 48px;
   height: 51px;
 }
 .Pet_HatchingPotion_Zombie {
   background-image: url(spritesmith-main-13.png);
-  background-position: -98px -500px;
+  background-position: -49px -600px;
   width: 48px;
   height: 51px;
 }

common/locales/en/backgrounds.json

@@ -199,5 +199,13 @@
   "backgroundLilypadText": "Lilypad",
   "backgroundLilypadNotes": "Hop on a Lilypad.",
   "backgroundWaterfallRockText": "Waterfall Rock",
-  "backgroundWaterfallRockNotes": "Splash on a Waterfall Rock."
+  "backgroundWaterfallRockNotes": "Splash on a Waterfall Rock.",
+
+  "backgrounds072016": "SET 26: Released July 2016",
+  "backgroundAquariumText": "Aquarium",
+  "backgroundAquariumNotes": "Bob in an Aquarium.",
+  "backgroundDeepSeaText": "Deep Sea",
+  "backgroundDeepSeaNotes": "Dive to the Deep Sea.",
+  "backgroundDilatoryCastleText": "Castle of Dilatory",
+  "backgroundDilatoryCastleNotes": "Swim past the Castle of Dilatory."
 }

common/locales/en/gear.json

@@ -228,6 +228,8 @@
   "weaponArmoireHabiticanDiplomaNotes": "A certificate of significant achievement -- well done! Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 1 of 3).",
   "weaponArmoireSandySpadeText": "Sandy Spade",
   "weaponArmoireSandySpadeNotes": "A tool for digging, as well as flicking sand into the eyes of enemy monsters. Increases Strength by <%= str %>. Enchanted Armoire: Seaside Set (Item 1 of 3).",
+  "weaponArmoireCannonText": "Cannon",
+  "weaponArmoireCannonNotes": "Arr! Set your aim with determination. Increases Strength by <%= str %>. Enchanted Armoire: Cannoneer Set (Item 1 of 3).",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -475,6 +477,8 @@
   "armorArmoireGraduateRobeNotes": "Congratulations! This weighty robe hangs heavy with all the knowledge you have accrued. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 2 of 3).",
   "armorArmoireStripedSwimsuitText": "Striped Swimsuit",
   "armorArmoireStripedSwimsuitNotes": "What could be more fun than battling sea monsters on the beach? Increases Constitution by <%= con %>. Enchanted Armoire: Seaside Set (Item 2 of 3).",
+  "armorArmoireCannoneerRagsText": "Cannoneer Rags",
+  "armorArmoireCannoneerRagsNotes": "These rags be tougher than they look. Increases Constitution by <%= con %>. Enchanted Armoire: Cannoneer Set (Item 2 of 3).",
 
   "headgear": "headgear",
   "headgearCapitalized": "Headgear",
@@ -736,6 +740,8 @@
   "headArmoireGraduateCapNotes": "Congratulations! Your deep thoughts have earned you this thinking cap. Increases Intelligence by <%= int %>. Enchanted Armoire: Graduate Set (Item 3 of 3).",
   "headArmoireGreenFloppyHatText": "Green Floppy Hat",
   "headArmoireGreenFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a gorgeous green color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+  "headArmoireCannoneerBandannaText": "Cannoneer Bandanna",
+  "headArmoireCannoneerBandannaNotes": "'Tis a cannoneer's life for me! Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Cannoneer Set (Item 3 of 3).",
 
   "offhand": "shield-hand item",
   "offhandCapitalized": "Shield-Hand Item",

common/script/content/appearance/backgrounds.js

@@ -353,6 +353,20 @@ let backgrounds = {
       notes: t('backgroundWaterfallRockNotes'),
     },
   },
+  backgrounds072016: {
+    aquarium: {
+      text: t('backgroundAquariumText'),
+      notes: t('backgroundAquariumNotes'),
+    },
+    dilatory_castle: {
+      text: t('backgroundDilatoryCastleText'),
+      notes: t('backgroundDilatoryCastleNotes'),
+    },
+    deep_sea: {
+      text: t('backgroundDeepSeaText'),
+      notes: t('backgroundDeepSeaNotes'),
+    },
+  },
 };
 /* eslint-enable quote-props */
 

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

@@ -142,6 +142,14 @@ let armor = {
     set: 'seaside',
     canOwn: ownsItem('armor_armoire_stripedSwimsuit'),
   },
+  cannoneerRags: {
+    text: t('armorArmoireCannoneerRagsText'),
+    notes: t('armorArmoireCannoneerRagsNotes', { con: 15 }),
+    value: 100,
+    con: 15,
+    set: 'cannoneer',
+    canOwn: ownsItem('armor_armoire_cannoneerRags'),
+  },
 };
 
 let eyewear = {
@@ -363,6 +371,15 @@ let head = {
     con: 8,
     canOwn: ownsItem('head_armoire_greenFloppyHat'),
   },
+  cannoneerBandanna: {
+    text: t('headArmoireCannoneerBandannaText'),
+    notes: t('headArmoireCannoneerBandannaNotes', { attrs: 15 }),
+    value: 100,
+    int: 15,
+    per: 15,
+    set: 'cannoneer',
+    canOwn: ownsItem('head_armoire_cannoneerBandanna'),
+  },
 };
 
 let shield = {
@@ -585,6 +602,14 @@ let weapon = {
     set: 'seaside',
     canOwn: ownsItem('weapon_armoire_sandySpade'),
   },
+  cannon: {
+    text: t('weaponArmoireCannonText'),
+    notes: t('weaponArmoireCannonNotes', { str: 15 }),
+    value: 100,
+    str: 15,
+    set: 'cannoneer',
+    canOwn: ownsItem('weapon_armoire_cannon'),
+  },
 };
 
 let armoireSet = {

common/script/content/index.js

@@ -1327,7 +1327,7 @@ api.quests = {
     completion: t('questEggHuntCompletion'),
     value: 1,
     canBuy: (function() {
-      return true;
+      return false;
     }),
     category: 'pet',
     collect: {

website/views/shared/new-stuff.jade

@@ -1,30 +1,47 @@
-h2 7/1/2016 - iOS UPDATE AND NEW TAKE THIS CHALLENGE
+h2 7/5/2016 - JULY BACKGROUNDS AND ARMOIRE ITEMS REVEALED!
+  .promo_backgrounds_armoire_201607.pull-right
   hr
   tr
     td
-      h3 iOS Update: Notifications and Private Messages
-      p We've released a new <a href='https://itunes.apple.com/us/app/habitica-stay-motivated-gamified/id994882113?mt=8' target='_blank'>iOS update</a>!
-      br
-      p Now you can send and read private messages on the app! Plus, you can now receive notifications for important events, like being invited to a party, guild, or quest, receiving a private message, and beginning a battle. Don’t want a certain type of notification? Simply adjust your preferences under Settings.
-      br
-      p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Old reviews get hidden with each new release, but if you go to the review section you can re-post old reviews with a single tap. Thanks for using Habitica!
-      p.small.muted by viirus and Nivl4
+      h3 July Backgrounds
+      p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop</a>! Now your avatar can dive to the Deep Sea, bob in an Aquarium, or swim past the Castle of Dilatory!
+      p.small.muted by Jessica Chase and DialFForFunky
   tr
     td
-      .promo_takethis_armor.pull-right
-      h3 New Take This Challenge!
-      p The next Take This Challenge has launched, <a href='https://habitica.com/#/options/groups/challenges/da8859b2-5c6e-4aa5-b8b2-8db93d5de9fc' target='_blank'>Check Your HP</a>, with a focus on tracking your mood. Be sure to check it out to earn additional pieces of the Take This armor set!
+      h3 July Armoire Items Revealed
+      p There is new equipment in Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear!
       br
-      p <a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.
+      p Click on the Enchanted Armoire for a random chance at special Equipment, including the Cannoneer Item Set! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
       br
-      p Congratulations to the winners of the last Take This Challenge, "It's Dangerous to Go Alone": grand prize winner janey_p, and runners-up Dennis Charles Puerto Calubia, lamachine, Didit, mykabot, and Deiket. Plus, all participants in that Challenge have received the Take This Shield. Enjoy!
-      p.small.muted by Lemoness, SabreCat, Doctor B, and the Take This team
+      p Now go spend all that accumulated Gold! May the Random Number Generator smile upon you...
+      p.small.muted By Lemoness and SabreCat
+      p.small.muted Art by Kai-Wen
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 7/1/2016 - iOS UPDATE AND NEW TAKE THIS CHALLENGE
+    tr
+      td
+        h3 iOS Update: Notifications and Private Messages
+        p We've released a new <a href='https://itunes.apple.com/us/app/habitica-stay-motivated-gamified/id994882113?mt=8' target='_blank'>iOS update</a>!
+        br
+        p Now you can send and read private messages on the app! Plus, you can now receive notifications for important events, like being invited to a party, guild, or quest, receiving a private message, and beginning a battle. Don’t want a certain type of notification? Simply adjust your preferences under Settings.
+        br
+        p If you like the improvements that we’ve been making to our app, please consider reviewing this new version. It really helps us out! Old reviews get hidden with each new release, but if you go to the review section you can re-post old reviews with a single tap. Thanks for using Habitica!
+        p.small.muted by viirus and Nivl4
+    tr
+      td
+        .promo_takethis_armor.pull-right
+        h3 New Take This Challenge!
+        p The next Take This Challenge has launched, <a href='https://habitica.com/#/options/groups/challenges/da8859b2-5c6e-4aa5-b8b2-8db93d5de9fc' target='_blank'>Check Your HP</a>, with a focus on tracking your mood. Be sure to check it out to earn additional pieces of the Take This armor set!
+        br
+        p <a href='http://www.takethis.org/' target='_blank'>Take This</a> is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.
+        br
+        p Congratulations to the winners of the last Take This Challenge, "It's Dangerous to Go Alone": grand prize winner janey_p, and runners-up Dennis Charles Puerto Calubia, lamachine, Didit, mykabot, and Deiket. Plus, all participants in that Challenge have received the Take This Shield. Enjoy!
+        p.small.muted by Lemoness, SabreCat, Doctor B, and the Take This team
   h2 SPLASHY SKINS! LAST CHANCE FOR SELKIE ITEM SET!
     tr
       td