diff --git a/common/dist/sprites/spritesmith-largeSprites-0.css b/common/dist/sprites/spritesmith-largeSprites-0.css
index 5c816e1d99..913ca69e65 100644
--- a/common/dist/sprites/spritesmith-largeSprites-0.css
+++ b/common/dist/sprites/spritesmith-largeSprites-0.css
@@ -1,12 +1,12 @@
.2014_Fall_HealerPROMO2 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -943px -728px;
+ background-position: -455px -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;
}
@@ -24,7 +24,7 @@
}
.promo_android {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -943px 0px;
+ background-position: -452px -241px;
width: 175px;
height: 175px;
}
@@ -84,13 +84,13 @@
}
.promo_enchanted_armoire_201511 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1260px -493px;
+ background-position: -943px -176px;
width: 122px;
height: 90px;
}
.promo_habitica {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -452px -241px;
+ background-position: -943px 0px;
width: 175px;
height: 175px;
}
@@ -126,13 +126,13 @@
}
.promo_mystery_201406 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -943px -449px;
+ background-position: -943px -540px;
width: 90px;
height: 96px;
}
.promo_mystery_201407 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1034px -449px;
+ background-position: -1037px -637px;
width: 42px;
height: 62px;
}
@@ -162,13 +162,13 @@
}
.promo_mystery_201412 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1034px -343px;
+ background-position: -1034px -540px;
width: 42px;
height: 66px;
}
.promo_mystery_201501 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1333px -1006px;
+ background-position: -1066px -176px;
width: 48px;
height: 63px;
}
@@ -186,7 +186,7 @@
}
.promo_mystery_201504 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1272px -1006px;
+ background-position: -1034px -434px;
width: 60px;
height: 69px;
}
@@ -198,19 +198,19 @@
}
.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: -943px -343px;
+ background-position: -943px -434px;
width: 90px;
height: 105px;
}
.promo_mystery_201508 {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -943px -546px;
+ background-position: -943px -728px;
width: 93px;
height: 90px;
}
@@ -252,43 +252,49 @@
}
.promo_partyhats {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1260px -584px;
+ background-position: -1272px -1006px;
width: 115px;
height: 47px;
}
.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -331px -912px;
+ background-position: 0px -912px;
width: 330px;
height: 83px;
}
.customize-option.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -356px -927px;
+ background-position: -25px -927px;
width: 60px;
height: 60px;
}
-.promo_pet_skins {
+.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: -1260px -493px;
+ width: 140px;
+ height: 147px;
+}
.customize-option.promo_pet_skins {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -1144px -508px;
+ background-position: -1285px -508px;
width: 60px;
height: 60px;
}
.promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: 0px -912px;
+ background-position: -331px -912px;
width: 330px;
height: 83px;
}
.customize-option.promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -25px -927px;
+ background-position: -356px -927px;
width: 60px;
height: 60px;
}
@@ -336,7 +342,7 @@
}
.promo_veteran_pets {
background-image: url(spritesmith-largeSprites-0.png);
- background-position: -943px -176px;
+ background-position: -943px -267px;
width: 146px;
height: 75px;
}
diff --git a/common/dist/sprites/spritesmith-largeSprites-0.png b/common/dist/sprites/spritesmith-largeSprites-0.png
index 19bb8e6ae9..d00322eab1 100644
Binary files a/common/dist/sprites/spritesmith-largeSprites-0.png and b/common/dist/sprites/spritesmith-largeSprites-0.png differ
diff --git a/common/dist/sprites/spritesmith-main-4.css b/common/dist/sprites/spritesmith-main-4.css
index 1edc01cd0d..f259a4977d 100644
--- a/common/dist/sprites/spritesmith-main-4.css
+++ b/common/dist/sprites/spritesmith-main-4.css
@@ -1,6 +1,6 @@
.weapon_special_fallHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px -364px;
+ background-position: -1373px -273px;
width: 90px;
height: 90px;
}
@@ -18,31 +18,31 @@
}
.weapon_special_fallWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -819px -1334px;
+ background-position: -1373px -364px;
width: 90px;
height: 90px;
}
.broad_armor_special_gaymerx {
background-image: url(spritesmith-main-4.png);
- background-position: -1092px -1334px;
+ background-position: -1001px -1334px;
width: 90px;
height: 90px;
}
.head_special_gaymerx {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -1425px;
+ background-position: 0px -1425px;
width: 90px;
height: 90px;
}
.shop_armor_special_gaymerx {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -1025px;
+ background-position: -1646px -902px;
width: 40px;
height: 40px;
}
.shop_head_special_gaymerx {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -984px;
+ background-position: -1646px -861px;
width: 40px;
height: 40px;
}
@@ -60,43 +60,43 @@
}
.broad_armor_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -182px -879px;
+ background-position: -91px -879px;
width: 90px;
height: 90px;
}
.head_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -273px -879px;
+ background-position: -182px -879px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -943px;
+ background-position: -1476px -1598px;
width: 40px;
height: 40px;
}
.shop_back_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -902px;
+ background-position: -1435px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -1517px -1598px;
+ background-position: -1394px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201402 {
background-image: url(spritesmith-main-4.png);
- background-position: -728px -879px;
+ background-position: -637px -879px;
width: 90px;
height: 90px;
}
.broad_armor_mystery_201403 {
background-image: url(spritesmith-main-4.png);
- background-position: -910px -879px;
+ background-position: -728px -879px;
width: 90px;
height: 90px;
}
@@ -108,73 +108,73 @@
}
.shop_armor_mystery_201403 {
background-image: url(spritesmith-main-4.png);
- background-position: -1476px -1598px;
+ background-position: -1353px -1598px;
width: 40px;
height: 40px;
}
.shop_headAccessory_mystery_201403 {
background-image: url(spritesmith-main-4.png);
- background-position: -1435px -1598px;
+ background-position: -1312px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201403 {
background-image: url(spritesmith-main-4.png);
- background-position: -1100px -182px;
+ background-position: -728px -970px;
width: 90px;
height: 90px;
}
.back_mystery_201404 {
background-image: url(spritesmith-main-4.png);
- background-position: -1100px -364px;
+ background-position: -1100px -182px;
width: 90px;
height: 90px;
}
.headAccessory_mystery_201404 {
background-image: url(spritesmith-main-4.png);
- background-position: -1183px -1152px;
+ background-position: -1001px -1152px;
width: 90px;
height: 90px;
}
.shop_back_mystery_201404 {
background-image: url(spritesmith-main-4.png);
- background-position: -1394px -1598px;
+ background-position: -1271px -1598px;
width: 40px;
height: 40px;
}
.shop_headAccessory_mystery_201404 {
background-image: url(spritesmith-main-4.png);
- background-position: -1353px -1598px;
+ background-position: -1230px -1598px;
width: 40px;
height: 40px;
}
.broad_armor_mystery_201405 {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -819px;
+ background-position: -1282px -637px;
width: 90px;
height: 90px;
}
.head_mystery_201405 {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -1001px;
+ background-position: -1282px -819px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201405 {
background-image: url(spritesmith-main-4.png);
- background-position: -1312px -1598px;
+ background-position: -1189px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201405 {
background-image: url(spritesmith-main-4.png);
- background-position: -1271px -1598px;
+ background-position: -1148px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201405 {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px -273px;
+ background-position: -1373px -182px;
width: 90px;
height: 90px;
}
@@ -192,13 +192,13 @@
}
.shop_armor_mystery_201406 {
background-image: url(spritesmith-main-4.png);
- background-position: -1230px -1598px;
+ background-position: -1107px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201406 {
background-image: url(spritesmith-main-4.png);
- background-position: -1189px -1598px;
+ background-position: -1066px -1598px;
width: 40px;
height: 40px;
}
@@ -210,91 +210,91 @@
}
.broad_armor_mystery_201407 {
background-image: url(spritesmith-main-4.png);
- background-position: -1365px -1334px;
+ background-position: -1092px -1334px;
width: 90px;
height: 90px;
}
.head_mystery_201407 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px 0px;
+ background-position: -1365px -1334px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201407 {
background-image: url(spritesmith-main-4.png);
- background-position: -1148px -1598px;
+ background-position: -1025px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201407 {
background-image: url(spritesmith-main-4.png);
- background-position: -1107px -1598px;
+ background-position: -984px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201407 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -273px;
+ background-position: -1464px -182px;
width: 90px;
height: 90px;
}
.broad_armor_mystery_201408 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -364px;
+ background-position: -1464px -273px;
width: 90px;
height: 90px;
}
.head_mystery_201408 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -455px;
+ background-position: -1464px -364px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201408 {
background-image: url(spritesmith-main-4.png);
- background-position: -1066px -1598px;
+ background-position: -943px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201408 {
background-image: url(spritesmith-main-4.png);
- background-position: -1025px -1598px;
+ background-position: -902px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201408 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -910px;
+ background-position: -1464px -819px;
width: 90px;
height: 90px;
}
.broad_armor_mystery_201409 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -1001px;
+ background-position: -1464px -910px;
width: 90px;
height: 90px;
}
.headAccessory_mystery_201409 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -1092px;
+ background-position: -1464px -1001px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201409 {
background-image: url(spritesmith-main-4.png);
- background-position: -984px -1598px;
+ background-position: -861px -1598px;
width: 40px;
height: 40px;
}
.shop_headAccessory_mystery_201409 {
background-image: url(spritesmith-main-4.png);
- background-position: -943px -1598px;
+ background-position: -820px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201409 {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -1425px;
+ background-position: -1464px -1274px;
width: 90px;
height: 90px;
}
@@ -306,103 +306,103 @@
}
.broad_armor_mystery_201410 {
background-image: url(spritesmith-main-4.png);
- background-position: -824px 0px;
+ background-position: -414px -591px;
width: 93px;
height: 90px;
}
.shop_armor_mystery_201410 {
background-image: url(spritesmith-main-4.png);
- background-position: -902px -1598px;
+ background-position: -779px -1598px;
width: 40px;
height: 40px;
}
.shop_back_mystery_201410 {
background-image: url(spritesmith-main-4.png);
- background-position: -861px -1598px;
+ background-position: -738px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201410 {
background-image: url(spritesmith-main-4.png);
- background-position: -824px -455px;
+ background-position: -643px -682px;
width: 93px;
height: 90px;
}
.head_mystery_201411 {
background-image: url(spritesmith-main-4.png);
- background-position: -637px -1425px;
+ background-position: -546px -1425px;
width: 90px;
height: 90px;
}
.shop_head_mystery_201411 {
background-image: url(spritesmith-main-4.png);
- background-position: -820px -1598px;
+ background-position: -697px -1598px;
width: 40px;
height: 40px;
}
.shop_weapon_mystery_201411 {
background-image: url(spritesmith-main-4.png);
- background-position: -779px -1598px;
+ background-position: -656px -1598px;
width: 40px;
height: 40px;
}
.weapon_mystery_201411 {
background-image: url(spritesmith-main-4.png);
- background-position: -910px -1425px;
+ background-position: -819px -1425px;
width: 90px;
height: 90px;
}
.broad_armor_mystery_201412 {
background-image: url(spritesmith-main-4.png);
- background-position: -1001px -1425px;
+ background-position: -910px -1425px;
width: 90px;
height: 90px;
}
.head_mystery_201412 {
background-image: url(spritesmith-main-4.png);
- background-position: -1092px -1425px;
+ background-position: -1001px -1425px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201412 {
background-image: url(spritesmith-main-4.png);
- background-position: -738px -1598px;
+ background-position: -615px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201412 {
background-image: url(spritesmith-main-4.png);
- background-position: -697px -1598px;
+ background-position: -574px -1598px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201412 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px 0px;
+ background-position: -1456px -1425px;
width: 90px;
height: 90px;
}
.broad_armor_mystery_201501 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -91px;
+ background-position: -1555px 0px;
width: 90px;
height: 90px;
}
.head_mystery_201501 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -182px;
+ background-position: -1555px -91px;
width: 90px;
height: 90px;
}
.shop_armor_mystery_201501 {
background-image: url(spritesmith-main-4.png);
- background-position: -656px -1598px;
+ background-position: -246px -1598px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201501 {
background-image: url(spritesmith-main-4.png);
- background-position: -615px -1598px;
+ background-position: -205px -1598px;
width: 40px;
height: 40px;
}
@@ -420,13 +420,13 @@
}
.shop_headAccessory_mystery_201502 {
background-image: url(spritesmith-main-4.png);
- background-position: -287px -1598px;
+ background-position: -164px -1598px;
width: 40px;
height: 40px;
}
.shop_weapon_mystery_201502 {
background-image: url(spritesmith-main-4.png);
- background-position: -246px -1598px;
+ background-position: -123px -1598px;
width: 40px;
height: 40px;
}
@@ -450,13 +450,13 @@
}
.shop_armor_mystery_201503 {
background-image: url(spritesmith-main-4.png);
- background-position: -205px -1598px;
+ background-position: -82px -1598px;
width: 40px;
height: 40px;
}
.shop_eyewear_mystery_201503 {
background-image: url(spritesmith-main-4.png);
- background-position: -164px -1598px;
+ background-position: -41px -1598px;
width: 40px;
height: 40px;
}
@@ -480,13 +480,13 @@
}
.shop_armor_mystery_201504 {
background-image: url(spritesmith-main-4.png);
- background-position: -123px -1598px;
+ background-position: 0px -1598px;
width: 40px;
height: 40px;
}
.shop_back_mystery_201504 {
background-image: url(spritesmith-main-4.png);
- background-position: -82px -1598px;
+ background-position: -1599px -1557px;
width: 40px;
height: 40px;
}
@@ -504,13 +504,13 @@
}
.shop_head_mystery_201505 {
background-image: url(spritesmith-main-4.png);
- background-position: -41px -1598px;
+ background-position: -1558px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_mystery_201505 {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -1598px;
+ background-position: -1517px -1557px;
width: 40px;
height: 40px;
}
@@ -522,85 +522,85 @@
}
.broad_armor_mystery_201506 {
background-image: url(spritesmith-main-4.png);
- background-position: -551px -212px;
+ background-position: -551px -106px;
width: 90px;
height: 105px;
}
.eyewear_mystery_201506 {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -485px;
+ background-position: 0px -485px;
width: 90px;
height: 105px;
}
.shop_armor_mystery_201506 {
background-image: url(spritesmith-main-4.png);
- background-position: -1599px -1557px;
+ background-position: -1476px -1557px;
width: 40px;
height: 40px;
}
.shop_eyewear_mystery_201506 {
background-image: url(spritesmith-main-4.png);
- background-position: -1558px -1557px;
+ background-position: -1435px -1557px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201506 {
background-image: url(spritesmith-main-4.png);
- background-position: -182px -485px;
+ background-position: -364px -485px;
width: 90px;
height: 105px;
}
.back_mystery_201507 {
background-image: url(spritesmith-main-4.png);
- background-position: -364px -485px;
+ background-position: -455px -485px;
width: 90px;
height: 105px;
}
.eyewear_mystery_201507 {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -485px;
+ background-position: -642px 0px;
width: 90px;
height: 105px;
}
.shop_back_mystery_201507 {
background-image: url(spritesmith-main-4.png);
- background-position: -1517px -1557px;
+ background-position: -1394px -1557px;
width: 40px;
height: 40px;
}
.shop_eyewear_mystery_201507 {
background-image: url(spritesmith-main-4.png);
- background-position: -1476px -1557px;
+ background-position: -1353px -1557px;
width: 40px;
height: 40px;
}
.broad_armor_mystery_201508 {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -682px;
+ background-position: -602px -591px;
width: 93px;
height: 90px;
}
.head_mystery_201508 {
background-image: url(spritesmith-main-4.png);
- background-position: -602px -591px;
+ background-position: -824px -455px;
width: 93px;
height: 90px;
}
.shop_armor_mystery_201508 {
background-image: url(spritesmith-main-4.png);
- background-position: -1435px -1557px;
+ background-position: -1312px -1557px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201508 {
background-image: url(spritesmith-main-4.png);
- background-position: -1394px -1557px;
+ background-position: -1271px -1557px;
width: 40px;
height: 40px;
}
.slim_armor_mystery_201508 {
background-image: url(spritesmith-main-4.png);
- background-position: -643px -682px;
+ background-position: -508px -591px;
width: 93px;
height: 90px;
}
@@ -618,13 +618,13 @@
}
.shop_armor_mystery_201509 {
background-image: url(spritesmith-main-4.png);
- background-position: -1353px -1557px;
+ background-position: -1230px -1557px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201509 {
background-image: url(spritesmith-main-4.png);
- background-position: -1312px -1557px;
+ background-position: -1189px -1557px;
width: 40px;
height: 40px;
}
@@ -642,19 +642,19 @@
}
.headAccessory_mystery_201510 {
background-image: url(spritesmith-main-4.png);
- background-position: -414px -591px;
+ background-position: -455px -682px;
width: 93px;
height: 90px;
}
.shop_back_mystery_201510 {
background-image: url(spritesmith-main-4.png);
- background-position: -1271px -1557px;
+ background-position: -1148px -1557px;
width: 40px;
height: 40px;
}
.shop_headAccessory_mystery_201510 {
background-image: url(spritesmith-main-4.png);
- background-position: -1230px -1557px;
+ background-position: -1107px -1557px;
width: 40px;
height: 40px;
}
@@ -672,13 +672,13 @@
}
.shop_armor_mystery_201511 {
background-image: url(spritesmith-main-4.png);
- background-position: -1598px -728px;
+ background-position: -1598px -637px;
width: 42px;
height: 42px;
}
.shop_head_mystery_201511 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -728px;
+ background-position: -1555px -637px;
width: 42px;
height: 42px;
}
@@ -702,13 +702,13 @@
}
.shop_armor_mystery_201512 {
background-image: url(spritesmith-main-4.png);
- background-position: -1107px -1557px;
+ background-position: -984px -1557px;
width: 40px;
height: 40px;
}
.shop_head_mystery_201512 {
background-image: url(spritesmith-main-4.png);
- background-position: -1066px -1557px;
+ background-position: -943px -1557px;
width: 40px;
height: 40px;
}
@@ -738,25 +738,25 @@
}
.shop_armor_mystery_301404 {
background-image: url(spritesmith-main-4.png);
- background-position: -1025px -1557px;
+ background-position: -902px -1557px;
width: 40px;
height: 40px;
}
.shop_eyewear_mystery_301404 {
background-image: url(spritesmith-main-4.png);
- background-position: -984px -1557px;
+ background-position: -861px -1557px;
width: 40px;
height: 40px;
}
.shop_head_mystery_301404 {
background-image: url(spritesmith-main-4.png);
- background-position: -943px -1557px;
+ background-position: -820px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_mystery_301404 {
background-image: url(spritesmith-main-4.png);
- background-position: -902px -1557px;
+ background-position: -779px -1557px;
width: 40px;
height: 40px;
}
@@ -798,25 +798,25 @@
}
.shop_eyewear_mystery_301405 {
background-image: url(spritesmith-main-4.png);
- background-position: -861px -1557px;
+ background-position: -738px -1557px;
width: 40px;
height: 40px;
}
.shop_headAccessory_mystery_301405 {
background-image: url(spritesmith-main-4.png);
- background-position: -779px -1557px;
+ background-position: -656px -1557px;
width: 40px;
height: 40px;
}
.shop_head_mystery_301405 {
background-image: url(spritesmith-main-4.png);
- background-position: -820px -1557px;
+ background-position: -697px -1557px;
width: 40px;
height: 40px;
}
.shop_shield_mystery_301405 {
background-image: url(spritesmith-main-4.png);
- background-position: -738px -1557px;
+ background-position: -287px -1516px;
width: 40px;
height: 40px;
}
@@ -1002,229 +1002,229 @@
}
.shop_armor_special_spring2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -697px -1557px;
+ background-position: -246px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_spring2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -369px -1516px;
+ background-position: -205px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_spring2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -328px -1516px;
+ background-position: -164px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_spring2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -287px -1516px;
+ background-position: -123px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_springHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -246px -1516px;
+ background-position: -82px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_springMage {
background-image: url(spritesmith-main-4.png);
- background-position: -205px -1516px;
+ background-position: -41px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_springRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -164px -1516px;
+ background-position: 0px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_springWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -123px -1516px;
+ background-position: -778px -723px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_spring2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -551px -424px;
+ background-position: -733px -636px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_spring2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -683px -530px;
+ background-position: -865px -728px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_spring2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -642px -530px;
+ background-position: -824px -728px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_spring2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -774px -636px;
+ background-position: -959px -819px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_springHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -733px -636px;
+ background-position: -918px -819px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_springMage {
background-image: url(spritesmith-main-4.png);
- background-position: -865px -728px;
+ background-position: -1050px -910px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_springRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -824px -728px;
+ background-position: -1009px -910px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_springWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -959px -819px;
+ background-position: -1141px -1001px;
width: 40px;
height: 40px;
}
.shop_head_special_spring2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -82px -1516px;
+ background-position: -737px -723px;
width: 40px;
height: 40px;
}
.shop_head_special_spring2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -41px -1516px;
+ background-position: -778px -682px;
width: 40px;
height: 40px;
}
.shop_head_special_spring2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -1516px;
+ background-position: -737px -682px;
width: 40px;
height: 40px;
}
.shop_head_special_spring2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -778px -723px;
+ background-position: -592px -424px;
width: 40px;
height: 40px;
}
.shop_head_special_springHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -737px -723px;
+ background-position: -551px -424px;
width: 40px;
height: 40px;
}
.shop_head_special_springMage {
background-image: url(spritesmith-main-4.png);
- background-position: -778px -682px;
+ background-position: -683px -530px;
width: 40px;
height: 40px;
}
.shop_head_special_springRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -737px -682px;
+ background-position: -642px -530px;
width: 40px;
height: 40px;
}
.shop_head_special_springWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -592px -424px;
+ background-position: -774px -636px;
width: 40px;
height: 40px;
}
.shop_shield_special_spring2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -918px -819px;
+ background-position: -1100px -1001px;
width: 40px;
height: 40px;
}
.shop_shield_special_spring2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1050px -910px;
+ background-position: -1232px -1092px;
width: 40px;
height: 40px;
}
.shop_shield_special_spring2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -910px;
+ background-position: -1191px -1092px;
width: 40px;
height: 40px;
}
.shop_shield_special_springHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1141px -1001px;
+ background-position: -1323px -1183px;
width: 40px;
height: 40px;
}
.shop_shield_special_springRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1100px -1001px;
+ background-position: -1282px -1183px;
width: 40px;
height: 40px;
}
.shop_shield_special_springWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1232px -1092px;
+ background-position: -1414px -1274px;
width: 40px;
height: 40px;
}
.shop_weapon_special_spring2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1191px -1092px;
+ background-position: -1373px -1274px;
width: 40px;
height: 40px;
}
.shop_weapon_special_spring2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1323px -1183px;
+ background-position: -1505px -1365px;
width: 40px;
height: 40px;
}
.shop_weapon_special_spring2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -1183px;
+ background-position: -1464px -1365px;
width: 40px;
height: 40px;
}
.shop_weapon_special_spring2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1414px -1274px;
+ background-position: -1596px -1459px;
width: 40px;
height: 40px;
}
.shop_weapon_special_springHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px -1274px;
+ background-position: -1555px -1459px;
width: 40px;
height: 40px;
}
.shop_weapon_special_springMage {
background-image: url(spritesmith-main-4.png);
- background-position: -1505px -1365px;
+ background-position: -1596px -1418px;
width: 40px;
height: 40px;
}
.shop_weapon_special_springRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -1365px;
+ background-position: -1555px -1418px;
width: 40px;
height: 40px;
}
.shop_weapon_special_springWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1468px;
+ background-position: -1596px -1377px;
width: 40px;
height: 40px;
}
@@ -1344,19 +1344,19 @@
}
.body_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -642px 0px;
+ background-position: -642px -106px;
width: 90px;
height: 105px;
}
.body_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -642px -106px;
+ background-position: -91px -682px;
width: 90px;
height: 105px;
}
.body_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -682px;
+ background-position: -642px -212px;
width: 90px;
height: 105px;
}
@@ -1380,19 +1380,19 @@
}
.broad_armor_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -642px -318px;
+ background-position: -642px -424px;
width: 90px;
height: 105px;
}
.broad_armor_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -642px -424px;
+ background-position: -733px 0px;
width: 90px;
height: 105px;
}
.broad_armor_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -733px 0px;
+ background-position: -733px -106px;
width: 90px;
height: 105px;
}
@@ -1446,13 +1446,13 @@
}
.head_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -682px;
+ background-position: -273px -485px;
width: 90px;
height: 105px;
}
.head_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -273px -485px;
+ background-position: -182px -485px;
width: 90px;
height: 105px;
}
@@ -1470,13 +1470,13 @@
}
.Healer_Summer {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -485px;
+ background-position: -551px -318px;
width: 90px;
height: 105px;
}
.Mage_Summer {
background-image: url(spritesmith-main-4.png);
- background-position: -551px -318px;
+ background-position: -551px -212px;
width: 90px;
height: 105px;
}
@@ -1530,241 +1530,241 @@
}
.shop_armor_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1468px;
+ background-position: -1555px -1377px;
width: 40px;
height: 40px;
}
.shop_armor_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1427px;
+ background-position: -1596px -1336px;
width: 40px;
height: 40px;
}
.shop_armor_special_summer2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1427px;
+ background-position: -1555px -1336px;
width: 40px;
height: 40px;
}
.shop_armor_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1386px;
+ background-position: -1596px -1295px;
width: 40px;
height: 40px;
}
.shop_armor_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1386px;
+ background-position: -1555px -1295px;
width: 40px;
height: 40px;
}
.shop_armor_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1345px;
+ background-position: -1596px -1254px;
width: 40px;
height: 40px;
}
.shop_armor_special_summerRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1345px;
+ background-position: -1555px -1254px;
width: 40px;
height: 40px;
}
.shop_armor_special_summerWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1304px;
+ background-position: -1596px -1213px;
width: 40px;
height: 40px;
}
.shop_body_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1304px;
+ background-position: -1555px -1213px;
width: 40px;
height: 40px;
}
.shop_body_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1263px;
+ background-position: -1596px -1172px;
width: 40px;
height: 40px;
}
.shop_body_special_summer2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1263px;
+ background-position: -1555px -1172px;
width: 40px;
height: 40px;
}
.shop_body_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1222px;
+ background-position: -1596px -1131px;
width: 40px;
height: 40px;
}
.shop_body_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1222px;
+ background-position: -1555px -1131px;
width: 40px;
height: 40px;
}
.shop_body_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1181px;
+ background-position: -1025px -1557px;
width: 40px;
height: 40px;
}
.shop_eyewear_special_summerRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1148px -1557px;
+ background-position: -1517px -1516px;
width: 40px;
height: 40px;
}
.shop_eyewear_special_summerWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -41px -1557px;
+ background-position: -1066px -1557px;
width: 40px;
height: 40px;
}
.shop_head_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1189px -1557px;
+ background-position: -1555px -680px;
width: 40px;
height: 40px;
}
.shop_head_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -771px;
+ background-position: -1596px -680px;
width: 40px;
height: 40px;
}
.shop_head_special_summer2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -771px;
+ background-position: -1555px -721px;
width: 40px;
height: 40px;
}
.shop_head_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -812px;
+ background-position: -1596px -721px;
width: 40px;
height: 40px;
}
.shop_head_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -812px;
+ background-position: -1555px -762px;
width: 40px;
height: 40px;
}
.shop_head_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -853px;
+ background-position: -1596px -762px;
width: 40px;
height: 40px;
}
.shop_head_special_summerRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -853px;
+ background-position: -1555px -803px;
width: 40px;
height: 40px;
}
.shop_head_special_summerWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -894px;
+ background-position: -1596px -803px;
width: 40px;
height: 40px;
}
.shop_shield_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -894px;
+ background-position: -1555px -844px;
width: 40px;
height: 40px;
}
.shop_shield_special_summer2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -935px;
+ background-position: -1596px -844px;
width: 40px;
height: 40px;
}
.shop_shield_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -935px;
+ background-position: -1555px -885px;
width: 40px;
height: 40px;
}
.shop_shield_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -976px;
+ background-position: -1596px -885px;
width: 40px;
height: 40px;
}
.shop_shield_special_summerRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -976px;
+ background-position: -1555px -926px;
width: 40px;
height: 40px;
}
.shop_shield_special_summerWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1017px;
+ background-position: -1596px -926px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1017px;
+ background-position: -1555px -967px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1058px;
+ background-position: -1596px -967px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summer2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1058px;
+ background-position: -1555px -1008px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1099px;
+ background-position: -1596px -1008px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1099px;
+ background-position: -1555px -1049px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1140px;
+ background-position: -1596px -1049px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summerRogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1596px -1140px;
+ background-position: -1555px -1090px;
width: 40px;
height: 40px;
}
.shop_weapon_special_summerWarrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -1181px;
+ background-position: -1596px -1090px;
width: 40px;
height: 40px;
}
.slim_armor_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -546px;
+ background-position: -1555px -455px;
width: 90px;
height: 90px;
}
.slim_armor_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -455px;
+ background-position: -1555px -364px;
width: 90px;
height: 90px;
}
@@ -1776,13 +1776,13 @@
}
.slim_armor_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -551px 0px;
+ background-position: 0px -682px;
width: 90px;
height: 105px;
}
.slim_armor_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -551px -106px;
+ background-position: -551px 0px;
width: 90px;
height: 105px;
}
@@ -1806,13 +1806,13 @@
}
.weapon_special_summer2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1365px -1425px;
+ background-position: -1274px -1425px;
width: 90px;
height: 90px;
}
.weapon_special_summer2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1274px -1425px;
+ background-position: -1183px -1425px;
width: 90px;
height: 90px;
}
@@ -1824,19 +1824,19 @@
}
.weapon_special_summer2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -546px -485px;
+ background-position: -91px -485px;
width: 90px;
height: 105px;
}
.weapon_special_summerHealer {
background-image: url(spritesmith-main-4.png);
- background-position: -642px -212px;
+ background-position: -642px -318px;
width: 90px;
height: 105px;
}
.weapon_special_summerMage {
background-image: url(spritesmith-main-4.png);
- background-position: -733px -106px;
+ background-position: -546px -485px;
width: 90px;
height: 105px;
}
@@ -1854,31 +1854,31 @@
}
.broad_armor_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px -182px;
+ background-position: -1373px -91px;
width: 90px;
height: 90px;
}
.broad_armor_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px -91px;
+ background-position: -1373px 0px;
width: 90px;
height: 90px;
}
.broad_armor_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -1373px 0px;
+ background-position: -1274px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1274px -1243px;
+ background-position: -1183px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1183px -1243px;
+ background-position: -1092px -1243px;
width: 90px;
height: 90px;
}
@@ -1890,82 +1890,88 @@
}
.broad_armor_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1001px -1243px;
+ background-position: -910px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_winter2016Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -508px -591px;
+ background-position: -824px 0px;
width: 93px;
height: 90px;
}
.broad_armor_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -819px -1243px;
+ background-position: -728px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -728px -1243px;
+ background-position: -637px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -637px -1243px;
+ background-position: -546px -1243px;
width: 90px;
height: 90px;
}
.broad_armor_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -546px -1243px;
+ background-position: -455px -1243px;
width: 90px;
height: 90px;
}
.head_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -1243px;
+ background-position: -364px -1243px;
width: 90px;
height: 90px;
}
.head_special_nye {
background-image: url(spritesmith-main-4.png);
- background-position: -364px -1243px;
+ background-position: -273px -1243px;
width: 90px;
height: 90px;
}
.head_special_nye2014 {
- background-image: url(spritesmith-main-4.png);
- background-position: -273px -1243px;
- width: 90px;
- height: 90px;
-}
-.head_special_ski {
background-image: url(spritesmith-main-4.png);
background-position: -182px -1243px;
width: 90px;
height: 90px;
}
-.head_special_snowflake {
+.head_special_nye2015 {
background-image: url(spritesmith-main-4.png);
background-position: -91px -1243px;
width: 90px;
height: 90px;
}
-.head_special_winter2015Healer {
+.head_special_ski {
background-image: url(spritesmith-main-4.png);
background-position: 0px -1243px;
width: 90px;
height: 90px;
}
-.head_special_winter2015Mage {
+.head_special_snowflake {
background-image: url(spritesmith-main-4.png);
background-position: -1282px -1092px;
width: 90px;
height: 90px;
}
+.head_special_winter2015Healer {
+ background-image: url(spritesmith-main-4.png);
+ background-position: -1282px -1001px;
+ width: 90px;
+ height: 90px;
+}
+.head_special_winter2015Mage {
+ background-image: url(spritesmith-main-4.png);
+ background-position: -1282px -910px;
+ width: 90px;
+ height: 90px;
+}
.head_special_winter2015Rogue {
background-image: url(spritesmith-main-4.png);
background-position: -224px -106px;
@@ -1974,7 +1980,7 @@
}
.head_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -910px;
+ background-position: -1282px -728px;
width: 90px;
height: 90px;
}
@@ -1986,25 +1992,25 @@
}
.head_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -728px;
+ background-position: -1282px -546px;
width: 90px;
height: 90px;
}
.head_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -637px;
+ background-position: -1282px -455px;
width: 90px;
height: 90px;
}
.head_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -546px;
+ background-position: -1282px -364px;
width: 90px;
height: 90px;
}
.head_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -455px;
+ background-position: -1282px -273px;
width: 90px;
height: 90px;
}
@@ -2016,13 +2022,13 @@
}
.shield_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -273px;
+ background-position: -1282px -91px;
width: 90px;
height: 90px;
}
.shield_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -182px;
+ background-position: -1282px 0px;
width: 90px;
height: 90px;
}
@@ -2034,7 +2040,7 @@
}
.shield_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px 0px;
+ background-position: -1092px -1152px;
width: 90px;
height: 90px;
}
@@ -2046,331 +2052,337 @@
}
.shield_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1092px -1152px;
+ background-position: -910px -1152px;
width: 90px;
height: 90px;
}
.shield_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1001px -1152px;
+ background-position: -819px -1152px;
width: 90px;
height: 90px;
}
.shield_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -910px -1152px;
+ background-position: -273px -1061px;
width: 90px;
height: 90px;
}
.shop_armor_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -410px -1516px;
+ background-position: -328px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -451px -1516px;
+ background-position: -369px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -492px -1516px;
+ background-position: -410px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -533px -1516px;
+ background-position: -451px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -574px -1516px;
+ background-position: -492px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -615px -1516px;
+ background-position: -533px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -656px -1516px;
+ background-position: -574px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2016Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -697px -1516px;
+ background-position: -615px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -738px -1516px;
+ background-position: -656px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -779px -1516px;
+ background-position: -697px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -820px -1516px;
+ background-position: -738px -1516px;
width: 40px;
height: 40px;
}
.shop_armor_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -861px -1516px;
+ background-position: -779px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -902px -1516px;
+ background-position: -820px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_nye {
background-image: url(spritesmith-main-4.png);
- background-position: -943px -1516px;
+ background-position: -861px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_nye2014 {
background-image: url(spritesmith-main-4.png);
- background-position: -984px -1516px;
+ background-position: -902px -1516px;
+ width: 40px;
+ height: 40px;
+}
+.shop_head_special_nye2015 {
+ background-image: url(spritesmith-main-4.png);
+ background-position: -943px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -1025px -1516px;
+ background-position: -984px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -1066px -1516px;
+ background-position: -1025px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1107px -1516px;
+ background-position: -1066px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1148px -1516px;
+ background-position: -1107px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1189px -1516px;
+ background-position: -1148px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1230px -1516px;
+ background-position: -1189px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2016Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1271px -1516px;
+ background-position: -1230px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1312px -1516px;
+ background-position: -1271px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1353px -1516px;
+ background-position: -1312px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1394px -1516px;
+ background-position: -1353px -1516px;
width: 40px;
height: 40px;
}
.shop_head_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -1435px -1516px;
+ background-position: -1394px -1516px;
width: 40px;
height: 40px;
}
.shop_shield_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -1476px -1516px;
+ background-position: -1435px -1516px;
width: 40px;
height: 40px;
}
.shop_shield_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -1517px -1516px;
+ background-position: -1476px -1516px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1558px -1516px;
+ background-position: -1646px -943px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -1599px -1516px;
+ background-position: -1558px -1516px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -1557px;
+ background-position: -1599px -1516px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2016Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -1066px;
+ background-position: 0px -1557px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -82px -1557px;
+ background-position: -41px -1557px;
width: 40px;
height: 40px;
}
.shop_shield_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -123px -1557px;
+ background-position: -82px -1557px;
width: 40px;
height: 40px;
}
.shop_shield_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -164px -1557px;
+ background-position: -123px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -205px -1557px;
+ background-position: -164px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -246px -1557px;
+ background-position: -205px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -287px -1557px;
+ background-position: -246px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -328px -1557px;
+ background-position: -287px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -369px -1557px;
+ background-position: -328px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2015Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -410px -1557px;
+ background-position: -369px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -451px -1557px;
+ background-position: -410px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2016Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -492px -1557px;
+ background-position: -451px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -533px -1557px;
+ background-position: -492px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -574px -1557px;
+ background-position: -533px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -615px -1557px;
+ background-position: -574px -1557px;
width: 40px;
height: 40px;
}
.shop_weapon_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -656px -1557px;
+ background-position: -615px -1557px;
width: 40px;
height: 40px;
}
.slim_armor_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -819px -1152px;
+ background-position: -182px -1061px;
width: 90px;
height: 90px;
}
.slim_armor_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -273px -1061px;
+ background-position: -91px -1061px;
width: 90px;
height: 90px;
}
.slim_armor_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -182px -1061px;
+ background-position: 0px -1061px;
width: 90px;
height: 90px;
}
.slim_armor_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -1061px;
+ background-position: -1100px -364px;
width: 90px;
height: 90px;
}
.slim_armor_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -1061px;
+ background-position: -1100px -273px;
width: 90px;
height: 90px;
}
@@ -2382,7 +2394,7 @@
}
.slim_armor_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -1100px -273px;
+ background-position: -1100px -91px;
width: 90px;
height: 90px;
}
@@ -2394,55 +2406,55 @@
}
.slim_armor_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1100px -91px;
+ background-position: -637px -970px;
width: 90px;
height: 90px;
}
.slim_armor_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -728px -970px;
+ background-position: -273px -970px;
width: 90px;
height: 90px;
}
.slim_armor_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -637px -970px;
+ background-position: -182px -970px;
width: 90px;
height: 90px;
}
.slim_armor_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -273px -970px;
+ background-position: -1009px -819px;
width: 90px;
height: 90px;
}
.weapon_special_candycane {
background-image: url(spritesmith-main-4.png);
- background-position: -182px -970px;
+ background-position: -1009px -728px;
width: 90px;
height: 90px;
}
.weapon_special_ski {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -819px;
+ background-position: -1009px -364px;
width: 90px;
height: 90px;
}
.weapon_special_snowflake {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -728px;
+ background-position: -1009px -273px;
width: 90px;
height: 90px;
}
.weapon_special_winter2015Healer {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -364px;
+ background-position: -910px -879px;
width: 90px;
height: 90px;
}
.weapon_special_winter2015Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -273px;
+ background-position: -819px -879px;
width: 90px;
height: 90px;
}
@@ -2454,7 +2466,7 @@
}
.weapon_special_winter2015Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: -819px -879px;
+ background-position: -455px -879px;
width: 90px;
height: 90px;
}
@@ -2466,457 +2478,433 @@
}
.weapon_special_winter2016Mage {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -879px;
+ background-position: 0px -879px;
width: 90px;
height: 90px;
}
.weapon_special_winter2016Rogue {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -879px;
+ background-position: -918px -455px;
width: 90px;
height: 90px;
}
.weapon_special_winter2016Warrior {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -879px;
+ background-position: -918px -364px;
width: 90px;
height: 90px;
}
.weapon_special_yeti {
background-image: url(spritesmith-main-4.png);
- background-position: -918px -455px;
+ background-position: -918px -91px;
width: 90px;
height: 90px;
}
.back_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -918px -364px;
+ background-position: -918px 0px;
width: 90px;
height: 90px;
}
.back_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: -918px -91px;
+ background-position: -546px -788px;
width: 90px;
height: 90px;
}
.body_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -918px 0px;
+ background-position: -455px -788px;
width: 90px;
height: 90px;
}
.body_special_wondercon_gold {
background-image: url(spritesmith-main-4.png);
- background-position: -546px -788px;
+ background-position: -91px -788px;
width: 90px;
height: 90px;
}
.body_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -788px;
+ background-position: 0px -788px;
width: 90px;
height: 90px;
}
.eyewear_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -91px -788px;
+ background-position: -1555px -273px;
width: 90px;
height: 90px;
}
.eyewear_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: 0px -788px;
+ background-position: -1555px -182px;
width: 90px;
height: 90px;
}
.shop_back_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -328px -1598px;
+ background-position: -287px -1598px;
width: 40px;
height: 40px;
}
.shop_back_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: -369px -1598px;
+ background-position: -328px -1598px;
width: 40px;
height: 40px;
}
.shop_body_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -410px -1598px;
+ background-position: -369px -1598px;
width: 40px;
height: 40px;
}
.shop_body_special_wondercon_gold {
background-image: url(spritesmith-main-4.png);
- background-position: -451px -1598px;
+ background-position: -410px -1598px;
width: 40px;
height: 40px;
}
.shop_body_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: -492px -1598px;
+ background-position: -451px -1598px;
width: 40px;
height: 40px;
}
.shop_eyewear_special_wondercon_black {
background-image: url(spritesmith-main-4.png);
- background-position: -533px -1598px;
+ background-position: -492px -1598px;
width: 40px;
height: 40px;
}
.shop_eyewear_special_wondercon_red {
background-image: url(spritesmith-main-4.png);
- background-position: -574px -1598px;
+ background-position: -533px -1598px;
width: 40px;
height: 40px;
}
.head_0 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -364px;
+ background-position: -1365px -1425px;
width: 90px;
height: 90px;
}
.customize-option.head_0 {
background-image: url(spritesmith-main-4.png);
- background-position: -1580px -379px;
+ background-position: -1390px -1440px;
width: 60px;
height: 60px;
}
.head_healer_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1555px -273px;
+ background-position: -1092px -1425px;
width: 90px;
height: 90px;
}
.head_healer_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1456px -1425px;
+ background-position: -728px -1425px;
width: 90px;
height: 90px;
}
.head_healer_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1183px -1425px;
+ background-position: -637px -1425px;
width: 90px;
height: 90px;
}
.head_healer_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -819px -1425px;
+ background-position: -273px -1425px;
width: 90px;
height: 90px;
}
.head_healer_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -728px -1425px;
+ background-position: -182px -1425px;
width: 90px;
height: 90px;
}
.head_rogue_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -455px -1425px;
+ background-position: -1464px -1183px;
width: 90px;
height: 90px;
}
.head_rogue_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -273px -1425px;
+ background-position: -1464px -1092px;
width: 90px;
height: 90px;
}
.head_rogue_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -1274px;
+ background-position: -1464px -546px;
width: 90px;
height: 90px;
}
.head_rogue_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -1183px;
+ background-position: -1464px -455px;
width: 90px;
height: 90px;
}
.head_rogue_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -819px;
+ background-position: -1464px -91px;
width: 90px;
height: 90px;
}
.head_special_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -546px;
+ background-position: -1464px 0px;
width: 90px;
height: 90px;
}
.head_special_fireCoralCirclet {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -182px;
+ background-position: -910px -1334px;
width: 90px;
height: 90px;
}
.head_warrior_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1464px -91px;
+ background-position: -819px -1334px;
width: 90px;
height: 90px;
}
.head_warrior_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1001px -1334px;
+ background-position: -1001px -1243px;
width: 90px;
height: 90px;
}
.head_warrior_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -910px -1334px;
+ background-position: -819px -1243px;
width: 90px;
height: 90px;
}
.head_warrior_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1092px -1243px;
+ background-position: -1282px -182px;
width: 90px;
height: 90px;
}
.head_warrior_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -910px -1243px;
+ background-position: -1183px -1152px;
width: 90px;
height: 90px;
}
.head_wizard_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -364px;
+ background-position: -1009px -637px;
width: 90px;
height: 90px;
}
.head_wizard_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1282px -91px;
+ background-position: -1009px -546px;
width: 90px;
height: 90px;
}
.head_wizard_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -637px;
+ background-position: -546px -879px;
width: 90px;
height: 90px;
}
.head_wizard_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1009px -546px;
+ background-position: -364px -879px;
width: 90px;
height: 90px;
}
.head_wizard_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -637px -879px;
+ background-position: -273px -879px;
width: 90px;
height: 90px;
}
.shop_head_healer_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1558px -1598px;
+ background-position: -1517px -1598px;
width: 40px;
height: 40px;
}
.shop_head_healer_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1599px -1598px;
+ background-position: -1558px -1598px;
width: 40px;
height: 40px;
}
.shop_head_healer_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px 0px;
+ background-position: -1599px -1598px;
width: 40px;
height: 40px;
}
.shop_head_healer_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -41px;
+ background-position: -1646px 0px;
width: 40px;
height: 40px;
}
.shop_head_healer_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -82px;
+ background-position: -1646px -41px;
width: 40px;
height: 40px;
}
.shop_head_rogue_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -123px;
+ background-position: -1646px -82px;
width: 40px;
height: 40px;
}
.shop_head_rogue_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -164px;
+ background-position: -1646px -123px;
width: 40px;
height: 40px;
}
.shop_head_rogue_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -205px;
+ background-position: -1646px -164px;
width: 40px;
height: 40px;
}
.shop_head_rogue_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -246px;
+ background-position: -1646px -205px;
width: 40px;
height: 40px;
}
.shop_head_rogue_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -287px;
+ background-position: -1646px -246px;
width: 40px;
height: 40px;
}
.shop_head_special_0 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -328px;
+ background-position: -1646px -287px;
width: 40px;
height: 40px;
}
.shop_head_special_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -369px;
+ background-position: -1646px -328px;
width: 40px;
height: 40px;
}
.shop_head_special_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -410px;
+ background-position: -1646px -369px;
width: 40px;
height: 40px;
}
.shop_head_special_fireCoralCirclet {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -451px;
+ background-position: -1646px -410px;
width: 40px;
height: 40px;
}
.shop_head_warrior_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -492px;
+ background-position: -1646px -451px;
width: 40px;
height: 40px;
}
.shop_head_warrior_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -533px;
+ background-position: -1646px -492px;
width: 40px;
height: 40px;
}
.shop_head_warrior_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -574px;
+ background-position: -1646px -533px;
width: 40px;
height: 40px;
}
.shop_head_warrior_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -615px;
+ background-position: -1646px -574px;
width: 40px;
height: 40px;
}
.shop_head_warrior_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -656px;
+ background-position: -1646px -615px;
width: 40px;
height: 40px;
}
.shop_head_wizard_1 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -697px;
+ background-position: -1646px -656px;
width: 40px;
height: 40px;
}
.shop_head_wizard_2 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -738px;
+ background-position: -1646px -697px;
width: 40px;
height: 40px;
}
.shop_head_wizard_3 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -779px;
+ background-position: -1646px -738px;
width: 40px;
height: 40px;
}
.shop_head_wizard_4 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -820px;
+ background-position: -1646px -779px;
width: 40px;
height: 40px;
}
.shop_head_wizard_5 {
background-image: url(spritesmith-main-4.png);
- background-position: -1646px -861px;
+ background-position: -1646px -820px;
width: 40px;
height: 40px;
}
.headAccessory_special_bearEars {
background-image: url(spritesmith-main-4.png);
- background-position: -546px -879px;
+ background-position: -455px -1425px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_bearEars {
background-image: url(spritesmith-main-4.png);
- background-position: -571px -894px;
+ background-position: -480px -1440px;
width: 60px;
height: 60px;
}
.headAccessory_special_cactusEars {
background-image: url(spritesmith-main-4.png);
- background-position: -364px -879px;
+ background-position: -91px -1425px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_cactusEars {
background-image: url(spritesmith-main-4.png);
- background-position: -389px -894px;
+ background-position: -116px -1440px;
width: 60px;
height: 60px;
}
.headAccessory_special_foxEars {
background-image: url(spritesmith-main-4.png);
- background-position: -546px -1425px;
+ background-position: -1555px -546px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_foxEars {
background-image: url(spritesmith-main-4.png);
- background-position: -571px -1440px;
- width: 60px;
- height: 60px;
-}
-.headAccessory_special_lionEars {
- background-image: url(spritesmith-main-4.png);
- background-position: -182px -1425px;
- width: 90px;
- height: 90px;
-}
-.customize-option.headAccessory_special_lionEars {
- background-image: url(spritesmith-main-4.png);
- background-position: -207px -1440px;
- width: 60px;
- height: 60px;
-}
-.headAccessory_special_pandaEars {
- background-image: url(spritesmith-main-4.png);
- background-position: -1555px -637px;
- width: 90px;
- height: 90px;
-}
-.customize-option.headAccessory_special_pandaEars {
- background-image: url(spritesmith-main-4.png);
- background-position: -1580px -652px;
+ background-position: -1580px -561px;
width: 60px;
height: 60px;
}
diff --git a/common/dist/sprites/spritesmith-main-4.png b/common/dist/sprites/spritesmith-main-4.png
index 383268ac19..fdc498b7a9 100644
Binary files a/common/dist/sprites/spritesmith-main-4.png and b/common/dist/sprites/spritesmith-main-4.png differ
diff --git a/common/dist/sprites/spritesmith-main-5.css b/common/dist/sprites/spritesmith-main-5.css
index d06b481534..439f310c9c 100644
--- a/common/dist/sprites/spritesmith-main-5.css
+++ b/common/dist/sprites/spritesmith-main-5.css
@@ -1,36 +1,60 @@
+.headAccessory_special_lionEars {
+ background-image: url(spritesmith-main-5.png);
+ background-position: -1219px -1360px;
+ width: 90px;
+ height: 90px;
+}
+.customize-option.headAccessory_special_lionEars {
+ background-image: url(spritesmith-main-5.png);
+ background-position: -1244px -1375px;
+ width: 60px;
+ height: 60px;
+}
+.headAccessory_special_pandaEars {
+ background-image: url(spritesmith-main-5.png);
+ background-position: -546px -1481px;
+ width: 90px;
+ height: 90px;
+}
+.customize-option.headAccessory_special_pandaEars {
+ background-image: url(spritesmith-main-5.png);
+ background-position: -571px -1496px;
+ width: 60px;
+ height: 60px;
+}
.headAccessory_special_pigEars {
background-image: url(spritesmith-main-5.png);
- background-position: -728px -1481px;
+ background-position: -1310px -1360px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_pigEars {
background-image: url(spritesmith-main-5.png);
- background-position: -753px -1496px;
+ background-position: -1335px -1375px;
width: 60px;
height: 60px;
}
.headAccessory_special_tigerEars {
background-image: url(spritesmith-main-5.png);
- background-position: -364px -1481px;
+ background-position: -1401px -1360px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_tigerEars {
background-image: url(spritesmith-main-5.png);
- background-position: -389px -1496px;
+ background-position: -1426px -1375px;
width: 60px;
height: 60px;
}
.headAccessory_special_wolfEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -819px;
+ background-position: 0px -1481px;
width: 90px;
height: 90px;
}
.customize-option.headAccessory_special_wolfEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1612px -834px;
+ background-position: -25px -1496px;
width: 60px;
height: 60px;
}
@@ -54,67 +78,67 @@
}
.shop_headAccessory_special_lionEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1416px -1663px;
+ background-position: -1612px -1663px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_pandaEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -287px;
+ background-position: -1727px -492px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_pigEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -246px;
+ background-position: -1727px -451px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_tigerEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -205px;
+ background-position: -1727px -410px;
width: 40px;
height: 40px;
}
.shop_headAccessory_special_wolfEars {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -164px;
+ background-position: -1727px -369px;
width: 40px;
height: 40px;
}
.shield_healer_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -582px -1360px;
+ background-position: -91px -1481px;
width: 90px;
height: 90px;
}
.shield_healer_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -673px -1360px;
+ background-position: -182px -1481px;
width: 90px;
height: 90px;
}
.shield_healer_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -764px -1360px;
+ background-position: -728px -1481px;
width: 90px;
height: 90px;
}
.shield_healer_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -946px -1360px;
+ background-position: -855px -1360px;
width: 90px;
height: 90px;
}
.shield_healer_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -1128px -1360px;
+ background-position: -946px -1360px;
width: 90px;
height: 90px;
}
.shield_rogue_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -637px -1481px;
+ background-position: -1128px -1360px;
width: 90px;
height: 90px;
}
@@ -156,7 +180,7 @@
}
.shield_special_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1037px -1360px;
+ background-position: -637px -1481px;
width: 90px;
height: 90px;
}
@@ -168,175 +192,175 @@
}
.shield_special_moonpearlShield {
background-image: url(spritesmith-main-5.png);
- background-position: -1219px -1360px;
+ background-position: -819px -1481px;
width: 90px;
height: 90px;
}
.shield_warrior_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1310px -1360px;
+ background-position: -910px -1481px;
width: 90px;
height: 90px;
}
.shield_warrior_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1401px -1360px;
+ background-position: -1587px -1001px;
width: 90px;
height: 90px;
}
.shield_warrior_3 {
background-image: url(spritesmith-main-5.png);
- background-position: 0px -1481px;
+ background-position: -582px -1360px;
width: 90px;
height: 90px;
}
.shield_warrior_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -455px -1481px;
+ background-position: -673px -1360px;
width: 90px;
height: 90px;
}
.shield_warrior_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -546px -1481px;
+ background-position: -764px -1360px;
width: 90px;
height: 90px;
}
.shop_shield_healer_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -123px;
+ background-position: -1727px -328px;
width: 40px;
height: 40px;
}
.shop_shield_healer_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -82px;
+ background-position: -1727px -287px;
width: 40px;
height: 40px;
}
.shop_shield_healer_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -41px;
+ background-position: -1727px -246px;
width: 40px;
height: 40px;
}
.shop_shield_healer_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px 0px;
+ background-position: -1727px -205px;
width: 40px;
height: 40px;
}
.shop_shield_healer_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -1662px -1663px;
+ background-position: -1727px -164px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -1621px -1663px;
+ background-position: -1727px -123px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1580px -1663px;
+ background-position: -1727px -82px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1539px -1663px;
+ background-position: -1727px -41px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1498px -1663px;
+ background-position: -1727px 0px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1457px -1663px;
+ background-position: -1653px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -1375px -1663px;
+ background-position: -1571px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_rogue_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -1334px -1663px;
+ background-position: -1530px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_special_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -1293px -1663px;
+ background-position: -1489px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_special_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1252px -1663px;
+ background-position: -1448px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_special_goldenknight {
background-image: url(spritesmith-main-5.png);
- background-position: -1211px -1663px;
+ background-position: -1407px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_special_moonpearlShield {
background-image: url(spritesmith-main-5.png);
- background-position: -1170px -1663px;
+ background-position: -1366px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_warrior_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1129px -1663px;
+ background-position: -1325px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_warrior_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1088px -1663px;
+ background-position: -1284px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_warrior_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1006px -1663px;
+ background-position: -1202px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_warrior_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -965px -1663px;
+ background-position: -1161px -1663px;
width: 40px;
height: 40px;
}
.shop_shield_warrior_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -924px -1663px;
+ background-position: -1120px -1663px;
width: 40px;
height: 40px;
}
.shop_weapon_healer_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -883px -1663px;
+ background-position: -1079px -1663px;
width: 40px;
height: 40px;
}
.shop_weapon_healer_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -842px -1663px;
+ background-position: -1038px -1663px;
width: 40px;
height: 40px;
}
@@ -348,13 +372,13 @@
}
.shop_weapon_healer_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -719px -1663px;
+ background-position: -915px -1663px;
width: 40px;
height: 40px;
}
.shop_weapon_healer_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -678px -1663px;
+ background-position: -874px -1663px;
width: 40px;
height: 40px;
}
@@ -408,7 +432,7 @@
}
.shop_weapon_rogue_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -760px -1663px;
+ background-position: -956px -1663px;
width: 40px;
height: 40px;
}
@@ -504,19 +528,19 @@
}
.shop_weapon_wizard_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -637px -1663px;
+ background-position: -833px -1663px;
width: 40px;
height: 40px;
}
.shop_weapon_wizard_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -801px -1663px;
+ background-position: -997px -1663px;
width: 40px;
height: 40px;
}
.shop_weapon_wizard_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1047px -1663px;
+ background-position: -1243px -1663px;
width: 40px;
height: 40px;
}
@@ -528,91 +552,91 @@
}
.shop_weapon_wizard_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -328px;
+ background-position: -1727px -533px;
width: 40px;
height: 40px;
}
.weapon_healer_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -1092px -1481px;
+ background-position: -1274px -1481px;
width: 90px;
height: 90px;
}
.weapon_healer_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1183px -1481px;
+ background-position: -1365px -1481px;
width: 90px;
height: 90px;
}
.weapon_healer_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1274px -1481px;
+ background-position: -1456px -1481px;
width: 90px;
height: 90px;
}
.weapon_healer_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1365px -1481px;
+ background-position: -1587px 0px;
width: 90px;
height: 90px;
}
.weapon_healer_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1456px -1481px;
+ background-position: -1587px -91px;
width: 90px;
height: 90px;
}
.weapon_healer_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px 0px;
+ background-position: -1587px -182px;
width: 90px;
height: 90px;
}
.weapon_healer_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -91px;
+ background-position: -1587px -273px;
width: 90px;
height: 90px;
}
.weapon_rogue_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -182px;
+ background-position: -1587px -364px;
width: 90px;
height: 90px;
}
.weapon_rogue_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -273px;
+ background-position: -1587px -455px;
width: 90px;
height: 90px;
}
.weapon_rogue_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -364px;
+ background-position: -1587px -546px;
width: 90px;
height: 90px;
}
.weapon_rogue_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -455px;
+ background-position: -1587px -637px;
width: 90px;
height: 90px;
}
.weapon_rogue_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -546px;
+ background-position: -1587px -728px;
width: 90px;
height: 90px;
}
.weapon_rogue_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -637px;
+ background-position: -1587px -819px;
width: 90px;
height: 90px;
}
.weapon_rogue_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -728px;
+ background-position: -1587px -910px;
width: 90px;
height: 90px;
}
@@ -624,109 +648,109 @@
}
.weapon_special_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -910px;
+ background-position: -1587px -1092px;
width: 90px;
height: 90px;
}
.weapon_special_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1001px;
+ background-position: -1587px -1183px;
width: 90px;
height: 90px;
}
.weapon_special_tridentOfCrashingTides {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1092px;
+ background-position: -1587px -1274px;
width: 90px;
height: 90px;
}
.weapon_warrior_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1183px;
+ background-position: -1587px -1365px;
width: 90px;
height: 90px;
}
.weapon_warrior_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1274px;
+ background-position: -1587px -1456px;
width: 90px;
height: 90px;
}
.weapon_warrior_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1365px;
+ background-position: 0px -1572px;
width: 90px;
height: 90px;
}
.weapon_warrior_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1587px -1456px;
+ background-position: -91px -1572px;
width: 90px;
height: 90px;
}
.weapon_warrior_4 {
background-image: url(spritesmith-main-5.png);
- background-position: 0px -1572px;
+ background-position: -182px -1572px;
width: 90px;
height: 90px;
}
.weapon_warrior_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -91px -1572px;
+ background-position: -273px -1572px;
width: 90px;
height: 90px;
}
.weapon_warrior_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -182px -1572px;
+ background-position: -364px -1572px;
width: 90px;
height: 90px;
}
.weapon_wizard_0 {
background-image: url(spritesmith-main-5.png);
- background-position: -273px -1572px;
+ background-position: -455px -1572px;
width: 90px;
height: 90px;
}
.weapon_wizard_1 {
background-image: url(spritesmith-main-5.png);
- background-position: -364px -1572px;
+ background-position: -546px -1572px;
width: 90px;
height: 90px;
}
.weapon_wizard_2 {
background-image: url(spritesmith-main-5.png);
- background-position: -455px -1572px;
+ background-position: -637px -1572px;
width: 90px;
height: 90px;
}
.weapon_wizard_3 {
background-image: url(spritesmith-main-5.png);
- background-position: -546px -1572px;
+ background-position: -728px -1572px;
width: 90px;
height: 90px;
}
.weapon_wizard_4 {
background-image: url(spritesmith-main-5.png);
- background-position: -1001px -1481px;
+ background-position: -1183px -1481px;
width: 90px;
height: 90px;
}
.weapon_wizard_5 {
background-image: url(spritesmith-main-5.png);
- background-position: -910px -1481px;
+ background-position: -1092px -1481px;
width: 90px;
height: 90px;
}
.weapon_wizard_6 {
background-image: url(spritesmith-main-5.png);
- background-position: -819px -1481px;
+ background-position: -1001px -1481px;
width: 90px;
height: 90px;
}
.GrimReaper {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -223px;
+ background-position: -1513px -229px;
width: 57px;
height: 66px;
}
@@ -738,31 +762,31 @@
}
.Pet_Currency_Gem1x {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -467px;
+ background-position: -1727px -672px;
width: 15px;
height: 13px;
}
.Pet_Currency_Gem2x {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -440px;
+ background-position: -1727px -645px;
width: 30px;
height: 26px;
}
.PixelPaw-Gold {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1054px;
+ background-position: -1513px -1060px;
width: 51px;
height: 51px;
}
.PixelPaw {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -950px;
+ background-position: -1513px -956px;
width: 51px;
height: 51px;
}
.PixelPaw002 {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1002px;
+ background-position: -1513px -1008px;
width: 51px;
height: 51px;
}
@@ -792,115 +816,115 @@
}
.empty_bottles {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -290px;
+ background-position: -1513px -296px;
width: 64px;
height: 54px;
}
.inventory_present {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1262px;
+ background-position: -1513px -1268px;
width: 48px;
height: 51px;
}
.inventory_present_01 {
background-image: url(spritesmith-main-5.png);
- background-position: -735px -1572px;
+ background-position: -917px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_02 {
background-image: url(spritesmith-main-5.png);
- background-position: -833px -1572px;
+ background-position: -1015px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_03 {
background-image: url(spritesmith-main-5.png);
- background-position: -882px -1572px;
+ background-position: -1064px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_04 {
background-image: url(spritesmith-main-5.png);
- background-position: -1078px -1572px;
+ background-position: -1260px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_05 {
background-image: url(spritesmith-main-5.png);
- background-position: -1127px -1572px;
+ background-position: -1309px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_06 {
background-image: url(spritesmith-main-5.png);
- background-position: -1176px -1572px;
+ background-position: -1358px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_07 {
background-image: url(spritesmith-main-5.png);
- background-position: -1225px -1572px;
+ background-position: -1407px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_08 {
background-image: url(spritesmith-main-5.png);
- background-position: -1274px -1572px;
+ background-position: -1456px -1572px;
width: 48px;
height: 51px;
}
.inventory_present_09 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px 0px;
+ background-position: -1678px -208px;
width: 48px;
height: 51px;
}
.inventory_present_10 {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1106px;
+ background-position: -1513px -1112px;
width: 48px;
height: 51px;
}
.inventory_present_11 {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1158px;
+ background-position: -1513px -1164px;
width: 48px;
height: 51px;
}
.inventory_present_12 {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1210px;
+ background-position: -1513px -1216px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1366px;
+ background-position: -1513px -1372px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1314px;
+ background-position: -1513px -1320px;
width: 48px;
height: 51px;
}
.inventory_special_fortify {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -730px;
+ background-position: -1513px -736px;
width: 57px;
height: 54px;
}
.inventory_special_greeting {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -345px;
+ background-position: -1513px -626px;
width: 57px;
height: 54px;
}
.inventory_special_nye {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -620px;
+ background-position: -1513px -351px;
width: 57px;
height: 54px;
}
@@ -912,43 +936,43 @@
}
.inventory_special_seafoam {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -400px;
+ background-position: -1513px -406px;
width: 57px;
height: 54px;
}
.inventory_special_shinySeed {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -455px;
+ background-position: -1513px -461px;
width: 57px;
height: 54px;
}
.inventory_special_snowball {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -510px;
+ background-position: -1513px -516px;
width: 57px;
height: 54px;
}
.inventory_special_spookDust {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -565px;
+ background-position: -1513px -571px;
width: 57px;
height: 54px;
}
.inventory_special_thankyou {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -895px;
+ background-position: -1513px -901px;
width: 57px;
height: 54px;
}
.inventory_special_trinket {
background-image: url(spritesmith-main-5.png);
- background-position: -784px -1572px;
+ background-position: -966px -1572px;
width: 48px;
height: 51px;
}
.inventory_special_valentine {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -675px;
+ background-position: -1513px -681px;
width: 57px;
height: 54px;
}
@@ -960,19 +984,19 @@
}
.pet_key {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -785px;
+ background-position: -1513px -791px;
width: 57px;
height: 54px;
}
.rebirth_orb {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -840px;
+ background-position: -1513px -846px;
width: 57px;
height: 54px;
}
.seafoam_star {
background-image: url(spritesmith-main-5.png);
- background-position: -273px -1481px;
+ background-position: -455px -1481px;
width: 90px;
height: 90px;
}
@@ -984,13 +1008,13 @@
}
.snowman {
background-image: url(spritesmith-main-5.png);
- background-position: -182px -1481px;
+ background-position: -364px -1481px;
width: 90px;
height: 90px;
}
.spookman {
background-image: url(spritesmith-main-5.png);
- background-position: -91px -1481px;
+ background-position: -273px -1481px;
width: 90px;
height: 90px;
}
@@ -1015,8 +1039,8 @@
.npc_bailey {
background-image: url(spritesmith-main-5.png);
background-position: -1513px -135px;
- width: 57px;
- height: 87px;
+ width: 54px;
+ height: 93px;
}
.npc_daniel {
background-image: url(spritesmith-main-5.png);
@@ -1038,7 +1062,7 @@
}
.npc_justin_head {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -369px;
+ background-position: -1727px -574px;
width: 36px;
height: 39px;
}
@@ -1062,7 +1086,7 @@
}
.npc_tyler {
background-image: url(spritesmith-main-5.png);
- background-position: -855px -1360px;
+ background-position: -1037px -1360px;
width: 90px;
height: 90px;
}
@@ -1080,331 +1104,331 @@
}
.inventory_quest_scroll_atom1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -624px;
+ background-position: -1678px -832px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_atom1_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -572px;
+ background-position: -1678px -780px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_atom2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -728px;
+ background-position: -1678px -936px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_atom2_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -676px;
+ background-position: -1678px -884px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_atom3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -832px;
+ background-position: -1678px -1040px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_atom3_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -780px;
+ background-position: -1678px -988px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_basilist {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -884px;
+ background-position: -1678px -1092px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_bunny {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -936px;
+ background-position: -1678px -1144px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_cheetah {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -988px;
+ background-position: -1678px -1196px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatoryDistress1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1092px;
+ background-position: -1678px -1300px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatoryDistress2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1196px;
+ background-position: -1678px -1404px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatoryDistress2_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1144px;
+ background-position: -1678px -1352px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatoryDistress3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1300px;
+ background-position: -1678px -1508px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatoryDistress3_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1248px;
+ background-position: -1678px -1456px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_dilatory_derby {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1040px;
+ background-position: -1678px -1248px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_egg {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1352px;
+ background-position: -1678px -1560px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_evilsanta {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1404px;
+ background-position: 0px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_evilsanta2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1456px;
+ background-position: -49px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_frog {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1508px;
+ background-position: -98px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_ghost_stag {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -1560px;
+ background-position: -147px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight1 {
background-image: url(spritesmith-main-5.png);
- background-position: -637px -1572px;
+ background-position: -819px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight1_locked {
background-image: url(spritesmith-main-5.png);
- background-position: 0px -1663px;
+ background-position: -196px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight2 {
background-image: url(spritesmith-main-5.png);
- background-position: -147px -1663px;
+ background-position: -343px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight2_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -98px -1663px;
+ background-position: -294px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight3 {
background-image: url(spritesmith-main-5.png);
- background-position: -245px -1663px;
+ background-position: -441px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_goldenknight3_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -196px -1663px;
+ background-position: -392px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_gryphon {
background-image: url(spritesmith-main-5.png);
- background-position: -294px -1663px;
+ background-position: -490px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_harpy {
background-image: url(spritesmith-main-5.png);
- background-position: -343px -1663px;
+ background-position: -539px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_hedgehog {
background-image: url(spritesmith-main-5.png);
- background-position: -392px -1663px;
+ background-position: -588px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_horse {
background-image: url(spritesmith-main-5.png);
- background-position: -441px -1663px;
+ background-position: -637px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_kraken {
background-image: url(spritesmith-main-5.png);
- background-position: -490px -1663px;
+ background-position: -686px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone1 {
background-image: url(spritesmith-main-5.png);
- background-position: -588px -1663px;
+ background-position: -784px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone1_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -539px -1663px;
+ background-position: -735px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone2 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -520px;
+ background-position: -1678px -728px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone2_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -49px -1663px;
+ background-position: -245px -1663px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -416px;
+ background-position: -1678px -624px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_moonstone3_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -468px;
+ background-position: -1678px -676px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_octopus {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -364px;
+ background-position: -1678px -572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_owl {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -312px;
+ background-position: -1678px -520px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_penguin {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -260px;
+ background-position: -1678px -468px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_rat {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -208px;
+ background-position: -1678px -416px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_rock {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -156px;
+ background-position: -1678px -364px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_rooster {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -104px;
+ background-position: -1678px -312px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_sheep {
background-image: url(spritesmith-main-5.png);
- background-position: -1678px -52px;
+ background-position: -1678px -260px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_slime {
background-image: url(spritesmith-main-5.png);
- background-position: -1617px -1572px;
+ background-position: -1678px -156px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_snake {
background-image: url(spritesmith-main-5.png);
- background-position: -1568px -1572px;
+ background-position: -1678px -104px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_spider {
background-image: url(spritesmith-main-5.png);
- background-position: -1519px -1572px;
+ background-position: -1678px -52px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_trex {
background-image: url(spritesmith-main-5.png);
- background-position: -1421px -1572px;
+ background-position: -1603px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_trex_undead {
background-image: url(spritesmith-main-5.png);
- background-position: -1470px -1572px;
+ background-position: -1678px 0px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_unicorn {
background-image: url(spritesmith-main-5.png);
- background-position: -1372px -1572px;
+ background-position: -1554px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_vice1 {
background-image: url(spritesmith-main-5.png);
- background-position: -1029px -1572px;
+ background-position: -1211px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_vice1_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -1323px -1572px;
+ background-position: -1505px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_vice2 {
background-image: url(spritesmith-main-5.png);
- background-position: -931px -1572px;
+ background-position: -1113px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_vice2_locked {
background-image: url(spritesmith-main-5.png);
- background-position: -980px -1572px;
+ background-position: -1162px -1572px;
width: 48px;
height: 51px;
}
.inventory_quest_scroll_vice3 {
background-image: url(spritesmith-main-5.png);
- background-position: -1458px -946px;
+ background-position: -1458px -894px;
width: 48px;
height: 51px;
}
@@ -1482,7 +1506,7 @@
}
.quest_dilatoryDistress1_fireCoral {
background-image: url(spritesmith-main-5.png);
- background-position: -1458px -894px;
+ background-position: -1458px -946px;
width: 48px;
height: 51px;
}
@@ -1512,7 +1536,7 @@
}
.quest_egg_plainEgg {
background-image: url(spritesmith-main-5.png);
- background-position: -1513px -1418px;
+ background-position: -1513px -1424px;
width: 48px;
height: 51px;
}
@@ -1548,7 +1572,7 @@
}
.quest_goldenknight1_testimony {
background-image: url(spritesmith-main-5.png);
- background-position: -686px -1572px;
+ background-position: -868px -1572px;
width: 48px;
height: 51px;
}
@@ -1602,7 +1626,7 @@
}
.quest_moonstone1_moonstone {
background-image: url(spritesmith-main-5.png);
- background-position: -1727px -409px;
+ background-position: -1727px -614px;
width: 30px;
height: 30px;
}
diff --git a/common/dist/sprites/spritesmith-main-5.png b/common/dist/sprites/spritesmith-main-5.png
index b6c330e964..8aaed0220d 100644
Binary files a/common/dist/sprites/spritesmith-main-5.png and b/common/dist/sprites/spritesmith-main-5.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/winter/head_special_nye2015.png b/common/img/sprites/spritesmith/gear/events/winter/head_special_nye2015.png
new file mode 100644
index 0000000000..ac2be0c5d7
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/winter/head_special_nye2015.png differ
diff --git a/common/img/sprites/spritesmith/gear/events/winter/shop/shop_head_special_nye2015.png b/common/img/sprites/spritesmith/gear/events/winter/shop/shop_head_special_nye2015.png
new file mode 100644
index 0000000000..eafc231ead
Binary files /dev/null and b/common/img/sprites/spritesmith/gear/events/winter/shop/shop_head_special_nye2015.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_alex.png b/common/img/sprites/spritesmith/npcs/npc_alex.png
index 8d45538129..5fefa87f60 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_alex.png and b/common/img/sprites/spritesmith/npcs/npc_alex.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png
index 4b9e942222..d7659dfebe 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_bailey.png and b/common/img/sprites/spritesmith/npcs/npc_bailey.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_daniel.png b/common/img/sprites/spritesmith/npcs/npc_daniel.png
index f28a922a1a..224279c4de 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_daniel.png and b/common/img/sprites/spritesmith/npcs/npc_daniel.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_ian.png b/common/img/sprites/spritesmith/npcs/npc_ian.png
index 6d490c1152..b6ac8374eb 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_ian.png and b/common/img/sprites/spritesmith/npcs/npc_ian.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_justin.png b/common/img/sprites/spritesmith/npcs/npc_justin.png
index bf42f04508..1e8ed19c1c 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_justin.png and b/common/img/sprites/spritesmith/npcs/npc_justin.png differ
diff --git a/common/img/sprites/spritesmith/npcs/npc_matt.png b/common/img/sprites/spritesmith/npcs/npc_matt.png
index ed0e3bab59..123dc34233 100644
Binary files a/common/img/sprites/spritesmith/npcs/npc_matt.png and b/common/img/sprites/spritesmith/npcs/npc_matt.png differ
diff --git a/common/img/sprites/spritesmith/npcs/seasonalshop_open.png b/common/img/sprites/spritesmith/npcs/seasonalshop_open.png
index bf18da469c..f37b309c95 100644
Binary files a/common/img/sprites/spritesmith/npcs/seasonalshop_open.png and b/common/img/sprites/spritesmith/npcs/seasonalshop_open.png differ
diff --git a/common/img/sprites/spritesmith_large/promo/promo_peppermint_flame.png b/common/img/sprites/spritesmith_large/promo/promo_peppermint_flame.png
new file mode 100644
index 0000000000..05ecd6f99e
Binary files /dev/null and b/common/img/sprites/spritesmith_large/promo/promo_peppermint_flame.png differ
diff --git a/common/locales/en/gear.json b/common/locales/en/gear.json
index b0aa07d0af..2a45374413 100644
--- a/common/locales/en/gear.json
+++ b/common/locales/en/gear.json
@@ -524,6 +524,8 @@
"headSpecialFall2015HealerText": "Hat of Frog",
"headSpecialFall2015HealerNotes": "This is an extremely serious hat that is worthy of only the most advanced potioners. Increases Intelligence by <%= int %>. Limited Edition 2015 Autumn Gear.",
+ "headSpecialNye2015Text": "Ridiculous Party Hat",
+ "headSpecialNye2015Notes": "You've received a Ridiculous Party Hat! Wear it with pride while ringing in the New Year! Confers no benefit.",
"headSpecialWinter2016RogueText": "Cocoa Helm",
"headSpecialWinter2016RogueNotes": "The protective scarf on this cozy helm is only removed to sip warm winter beverages. Increases Perception by <%= per %>. Limited Edition 2015-2016 Winter Gear.",
"headSpecialWinter2016WarriorText": "Snowman Cap",
diff --git a/common/locales/en/subscriber.json b/common/locales/en/subscriber.json
index 68fbec445b..bcbf347519 100644
--- a/common/locales/en/subscriber.json
+++ b/common/locales/en/subscriber.json
@@ -86,6 +86,7 @@
"mysterySet201509": "Werewolf Set",
"mysterySet201510": "Horned Goblin Set",
"mysterySet201511": "Wood Warrior Set",
+ "mysterySet201512": "Winter Flame Set",
"mysterySet301404": "Steampunk Standard Set",
"mysterySet301405": "Steampunk Accessories Set",
diff --git a/common/script/content/gear/sets/special/index.js b/common/script/content/gear/sets/special/index.js
index 5d7ebb7886..de192f8428 100644
--- a/common/script/content/gear/sets/special/index.js
+++ b/common/script/content/gear/sets/special/index.js
@@ -786,6 +786,12 @@ let head = {
value: 60,
int: 7,
},
+ nye2015: {
+ text: t('headSpecialNye2015Text'),
+ notes: t('headSpecialNye2015Notes'),
+ value: 0,
+ canOwn: ownsItem('head_special_nye2015'),
+ },
};
let headAccessory = {
diff --git a/migrations/20151229_new_years_hats.js b/migrations/20151229_new_years_hats.js
new file mode 100644
index 0000000000..895e545dd0
--- /dev/null
+++ b/migrations/20151229_new_years_hats.js
@@ -0,0 +1,70 @@
+var migrationName = '20151229_new_years_hats.js';
+var authorName = 'Sabe'; // in case script author needs to know when their ...
+var authorUuid = '7f14ed62-5408-4e1b-be83-ada62d504931'; //... own data is done
+
+/*
+ * Award 2015 party hat if user has 2014 hat, 2014 hat if they have the 2013 hat,
+ * and 2013 hat otherwise
+ */
+
+var dbserver = 'localhost:27017'; // FOR TEST DATABASE
+// var dbserver = 'username:password@ds031379-a0.mongolab.com:31379'; // FOR PRODUCTION DATABASE
+var dbname = 'habitrpg';
+
+var mongo = require('mongoskin');
+var _ = require('lodash');
+
+var dbUsers = mongo.db(dbserver + '/' + dbname + '?auto_reconnect').collection('users');
+
+// specify a query to limit the affected users (empty for all users):
+var query = {
+};
+
+// specify fields we are interested in to limit retrieved data (empty if we're not reading data):
+var fields = {
+ 'items.gear.owned': 1,
+};
+
+console.warn('Updating users...');
+var progressCount = 1000;
+var count = 0;
+dbUsers.findEach(query, fields, {batchSize:250}, function(err, user) {
+ if (err) { return exiting(1, 'ERROR! ' + err); }
+ if (!user) {
+ console.warn('All appropriate users found and modified.');
+ return displayData();
+ }
+ count++;
+
+ // specify user data to change:
+ var set = {};
+ if (user.items && user.items.gear && user.items.gear.owned && user.items.gear.owned.hasOwnProperty('head_special_nye2014')) {
+ set = {'migration':migrationName, 'items.gear.owned.head_special_nye2015':false};
+ } else if (user.items && user.items.gear && user.items.gear.owned && user.items.gear.owned.hasOwnProperty('head_special_nye')) {
+ set = {'migration':migrationName, 'items.gear.owned.head_special_nye2014':false};
+ } else {
+ set = {'migration':migrationName, 'items.gear.owned.head_special_nye':false};
+ }
+
+ dbUsers.update({_id:user._id}, {$set:set});
+
+ if (count%progressCount == 0) console.warn(count + ' ' + user._id);
+ if (user._id == authorUuid) console.warn(authorName + ' processed');
+});
+
+
+function displayData() {
+ console.warn('\n' + count + ' users processed\n');
+ return exiting(0);
+}
+
+
+function exiting(code, msg) {
+ code = code || 0; // 0 = success
+ if (code && !msg) { msg = 'ERROR!'; }
+ if (msg) {
+ if (code) { console.error(msg); }
+ else { console.log( msg); }
+ }
+ process.exit(code);
+}
diff --git a/test/api/v2/groups/POST-groups.test.js b/test/api/v2/groups/POST-groups.test.js
index e6283806b7..90c3cbfcaa 100644
--- a/test/api/v2/groups/POST-groups.test.js
+++ b/test/api/v2/groups/POST-groups.test.js
@@ -5,14 +5,11 @@ import {
} from '../../../helpers/api-integration.helper';
describe('POST /groups', () => {
-
context('All groups', () => {
let leader;
- beforeEach(() => {
- return generateUser().then((user) => {
- leader = user;
- });
+ beforeEach(async () => {
+ leader = await generateUser();
});
xit('returns defaults? (TODO: it\'s possible to create a group without a type. Should the group default to party? Should we require type to be set?', () => {
@@ -24,61 +21,58 @@ describe('POST /groups', () => {
});
});
- it('returns a group object', () => {
- let group = {
+ it('returns a group object', async () => {
+ let group = await leader.post('/groups', {
name: 'Test Group',
type: 'party',
leaderOnly: { challenges: true },
description: 'Test Group Description',
leaderMessage: 'Test Group Message',
- };
-
- return leader.post('/groups', group).then((createdGroup) => {
- expect(createdGroup._id).to.exist;
- expect(createdGroup.leader).to.eql(leader._id);
- expect(createdGroup.name).to.eql(group.name);
- expect(createdGroup.description).to.eql(group.description);
- expect(createdGroup.leaderMessage).to.eql(group.leaderMessage);
- expect(createdGroup.leaderOnly).to.eql(group.leaderOnly);
- expect(createdGroup.memberCount).to.eql(1);
});
+
+ expect(group._id).to.exist;
+ expect(group.leader).to.eql(leader._id);
+ expect(group.name).to.eql(group.name);
+ expect(group.description).to.eql(group.description);
+ expect(group.leaderMessage).to.eql(group.leaderMessage);
+ expect(group.leaderOnly).to.eql(group.leaderOnly);
+ expect(group.memberCount).to.eql(1);
});
- it('returns a populated members array', () => {
- return leader.post('/groups', {
+ it('returns a populated members array', async () => {
+ let party = await leader.post('/groups', {
type: 'party',
- }).then((party) => {
- let member = party.members[0];
- expect(member._id).to.eql(leader._id);
- expect(member.profile).to.eql(leader.profile);
- expect(member.contributor).to.eql(leader.contributor);
});
+
+ let member = party.members[0];
+
+ expect(member._id).to.eql(leader._id);
+ expect(member.profile).to.eql(leader.profile);
+ expect(member.contributor).to.eql(leader.contributor);
});
});
context('Parties', () => {
let leader;
- beforeEach(() => {
- return generateUser().then((user) => {
- leader = user;
+ beforeEach(async () => {
+ leader = await generateUser();
+ });
+
+ it('allows party creation without gems', async () => {
+ let party = await leader.post('/groups', {
+ type: 'party',
});
+
+ expect(party._id).to.exist;
});
- it('allows party creation without gems', () => {
- return expect(leader.post('/groups', {
+ it('prevents party creation if user is already in party', async () => {
+ let party = await generateGroup(leader, {
type: 'party',
- })).to.eventually.have.property('_id');
- });
+ });
- it('prevents party creation if user is already in party', () => {
- return expect(generateGroup(leader, {
- type: 'party',
- }).then((group) => {
- return leader.post('/groups', {
- type: 'party',
- });
- })).to.eventually.be.rejected.and.eql({
+ await expect(leader.post('/groups', { type: 'party' })).to.eventually.be.rejected.and.eql({
code: 400,
text: t('messageGroupAlreadyInParty'),
});
@@ -98,49 +92,52 @@ describe('POST /groups', () => {
context('Guilds', () => {
let leader;
- beforeEach(() => {
- return generateUser({
+ beforeEach(async () => {
+ leader = await generateUser({
balance: 2,
- }).then((user) => {
- leader = user;
});
});
- it('prevents guild creation when user does not have enough gems', () => {
- return expect(generateUser({
+ it('prevents guild creation when user does not have enough gems', async () => {
+ let userWithoutGems = await generateUser({
balance: 0.75,
- }).then((user) => {
- return user.post('/groups', {
- type: 'guild',
- });
- })).to.eventually.be.rejected.and.eql({
+ });
+
+ await expect(userWithoutGems.post('/groups', { type: 'guild' })).to.eventually.be.rejected.and.eql({
code: 401,
text: t('messageInsufficientGems'),
});
});
- it('can create a public guild', () => {
- return expect(leader.post('/groups', {
+ it('can create a public guild', async () => {
+ let guild = await leader.post('/groups', {
type: 'guild',
privacy: 'public',
- })).to.eventually.have.property('leader', leader._id);
+ })
+
+ expect(guild.leader).to.eql(leader._id);
});
- it('can create a private guild', () => {
- return expect(leader.post('/groups', {
+ it('can create a private guild', async () => {
+ let privateGuild = await leader.post('/groups', {
type: 'guild',
privacy: 'private',
- })).to.eventually.have.property('leader', leader._id);
+ });
+
+ expect(privateGuild.leader).to.eql(leader._id);
});
- it('deducts gems from user and adds them to guild bank', () => {
- return expect(leader.post('/groups', {
+ it('deducts gems from user and adds them to guild bank', async () => {
+ let guild = await leader.post('/groups', {
type: 'guild',
privacy: 'private',
- }).then((group) => {
- expect(group.balance).to.eql(1);
- return leader.get('/user');
- })).to.eventually.have.deep.property('balance', 1);
+ });
+
+ expect(guild.balance).to.eql(1);
+
+ let updatedUser = await leader.get('/user');
+
+ expect(updatedUser.balance).to.eql(1);
});
});
});
diff --git a/test/api/v2/user/GET-user.test.js b/test/api/v2/user/GET-user.test.js
index 02e5e97ff6..4a245bf58a 100644
--- a/test/api/v2/user/GET-user.test.js
+++ b/test/api/v2/user/GET-user.test.js
@@ -5,12 +5,9 @@ import {
describe('GET /user', () => {
let user;
- before(() => {
- return generateUser().then((usr) => {
- return usr.get('/user');
- }).then((fetchedUser) => {
- user = fetchedUser;
- });
+ before(async () => {
+ let usr = await generateUser();
+ user = await usr.get('/user');
});
it('gets the user object', () => {
diff --git a/test/helpers/api-integration.helper.js b/test/helpers/api-integration.helper.js
index f01a0a5342..30898513e2 100644
--- a/test/helpers/api-integration.helper.js
+++ b/test/helpers/api-integration.helper.js
@@ -33,6 +33,12 @@ class ApiUser {
this.put = _requestMaker(this, 'put');
this.del = _requestMaker(this, 'del');
}
+
+ update (options) {
+ return new Promise((resolve) => {
+ _updateDocument('users', this, options, resolve);
+ });
+ }
}
// Sets up an abject that can make all REST requests
diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade
index 49ec0a0bc9..b7d3416310 100644
--- a/website/views/options/inventory/seasonal-shop.jade
+++ b/website/views/options/inventory/seasonal-shop.jade
@@ -51,8 +51,7 @@
ng-click='purchase("hatchingPotions", Content.hatchingPotions.Peppermint)')
p {{::Content.hatchingPotions.Peppermint.value}}
span.Pet_Currency_Gem1x.inline-gems
-
- // div
+ div
button.customize-option(popover='{{::Content.spells.special.nye.notes()}}', popover-title='{{::Content.spells.special.nye.text()}}', popover-trigger='mouseenter', popover-placement='right', popover-append-to-body='true', ng-click='castStart(Content.spells.special.nye)', class='inventory_special_nye')
- p {{Content.spells.special.nye.value}}
- span(class='shop_gold')
+ p {{Content.spells.special.nye.value}}
+ span(class='shop_gold')
diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade
index 647d8b9bbd..c6e91d79b5 100644
--- a/website/views/shared/new-stuff.jade
+++ b/website/views/shared/new-stuff.jade
@@ -1,27 +1,51 @@
-h2 12/23/2015 - SNOWBALL TRANSFORMATION ITEM, DECEMBER SUBSCRIBER ITEMS, AND ANDROID UPDATE
+h2 12/30/2015 - NEW YEAR'S EVE CELEBRATION: PARTY HATS, NEW YEAR'S CARDS, BEEMINDER GUEST POST, AND LAST CHANCE FOR WINTER FLAME ITEM SET
hr
tr
td
- .promo_mystery_201512.pull-right
- h3 December Subscriber Items
- p The December Subscriber Items have been revealed: the Winter Flame Item Set! All December subscribers will receive the Winter Flame and the Cold Fire Armor. You still have eight days to subscribe and receive the item set! Thank you so much for your support - we really do rely on you to keep Habitica free to use and running smoothly.
- p.small.muted by Lemoness
+ .npc_matt.pull-right
+ h3 Party Hats
+ p In honor of the new year, some free Party Hats are available in the Rewards store! New users get the ever-handsome Absurd Party Hat, and users who already received one last year get the Silly Party Hat or the new Ridiculous Party Hat. These hats will be available to purchase until January 31st, but once you've bought them, you'll have them forever. Enjoy!
+ p.small.muted by Lemoness and SabreCat
tr
td
- .snowman.pull-right
- h3 Snowball Transformation Item
- p Hit your party mates with a snowball and they will undergo a mysterious transformation until their next day rollover! You can buy the Snowballs in the Seasonal Shop for Gold. Don't want to be transformed? Just buy some Salt from the Rewards Column to reverse it.
+ .inventory_special_nye.pull-right
+ h3 New Year's Cards (Until Jan 1st Only!)
+ p Until January 1st only, the Seasonal Shop is stocking New Year's Cards! Now you can send cards to your friends (and yourself) to wish them a Happy Habit New Year. All senders and recipients will receive the Auld Acquaintance badge!
tr
td
- h3 Android Update
- p Thanks to our awesome open-source contributors, we've released a new Android update! It contains plenty of bug fixes and some small requested improvements, like the floating action button hiding on scroll. Be sure to download it now! And if you'd like to take a break between Dailies to leave a review, we would love that. It really helps us out :)
- p.small.muted by Data5tream, dlew, Vorgone, farsidesoul, viirus, negue and FranzeJR
+ .promo_peppermint_flame.pull-right
+ h3 Last Chance for Peppermint Potions and Winter Flame Set
+ p Reminder: this is the final day to buy Peppermint Hatching Potions! If you want to hatch some Peppermint Pets and Mounts, now is the time.
+ br
+ p It's also the final day to subscribe and receive the Winter Flame Item Set! Thanks so much for your support <3
+ p.small.muted by Lemoness and SabreCat
+ tr
+ td
+ h3 Beeminder Guest Post
+ p Our productivity pal Beeminder has written an awesome post on our blog about how Habitica and Beeminder can work together to help you with your life improvement goals. Go check it out!
if menuItem !== 'oldNews'
hr
a(href='/static/old-news', target='_blank') Read older news
mixin oldNews
+ h2 12/23/2015 - SNOWBALL TRANSFORMATION ITEM, DECEMBER SUBSCRIBER ITEMS, AND ANDROID UPDATE
+ tr
+ td
+ .promo_mystery_201512.pull-right
+ h3 December Subscriber Items
+ p The December Subscriber Items have been revealed: the Winter Flame Item Set! All December subscribers will receive the Winter Flame and the Cold Fire Armor. You still have eight days to subscribe and receive the item set! Thank you so much for your support - we really do rely on you to keep Habitica free to use and running smoothly.
+ p.small.muted by Lemoness
+ tr
+ td
+ .snowman.pull-right
+ h3 Snowball Transformation Item
+ p Hit your party mates with a snowball and they will undergo a mysterious transformation until their next day rollover! You can buy the Snowballs in the Seasonal Shop for Gold. Don't want to be transformed? Just buy some Salt from the Rewards Column to reverse it.
+ tr
+ td
+ h3 Android Update
+ p Thanks to our awesome open-source contributors, we've released a new Android update! It contains plenty of bug fixes and some small requested improvements, like the floating action button hiding on scroll. Be sure to download it now! And if you'd like to take a break between Dailies to leave a review, we would love that. It really helps us out :)
+ p.small.muted by Data5tream, dlew, Vorgone, farsidesoul, viirus, negue and FranzeJR
h2 12/18/2015 - WINTER WONDERLAND BEGINS: WINTER CLASS OUTFITS, SEASONAL SHOP, AND NPC DECORATIONS!
tr
td