diff --git a/common/css/index.css b/common/css/index.css index c5c00de4a2..deec1cd518 100644 --- a/common/css/index.css +++ b/common/css/index.css @@ -1,9 +1,9 @@ /* Comment out for holiday events */ -/* .npc_ian { +.npc_ian { background: url("/common/img/sprites/npc_ian.gif") no-repeat; width: 78px; height: 135px; -} */ +} .quest_burnout { background: url("/common/img/sprites/quest_burnout.gif") no-repeat; diff --git a/common/dist/sprites/spritesmith-main-5.css b/common/dist/sprites/spritesmith-main-5.css index 5bdceda94b..8a3de8d2e0 100644 --- a/common/dist/sprites/spritesmith-main-5.css +++ b/common/dist/sprites/spritesmith-main-5.css @@ -1,396 +1,396 @@ .head_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -546px -1389px; + background-position: -546px -1345px; width: 90px; height: 90px; } .head_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -546px; + background-position: -1507px -455px; width: 90px; height: 90px; } .head_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -1507px 0px; + background-position: -728px -1436px; width: 90px; height: 90px; } .head_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -573px -1254px; + background-position: -590px -1254px; width: 90px; height: 90px; } .head_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -664px -1254px; + background-position: -681px -1254px; width: 90px; height: 90px; } .head_wizard_1 { background-image: url(spritesmith-main-5.png); - background-position: -846px -1254px; + background-position: -863px -1254px; width: 90px; height: 90px; } .head_wizard_2 { background-image: url(spritesmith-main-5.png); - background-position: 0px -1389px; + background-position: 0px -1345px; width: 90px; height: 90px; } .head_wizard_3 { background-image: url(spritesmith-main-5.png); - background-position: -91px -1389px; + background-position: -91px -1345px; width: 90px; height: 90px; } .head_wizard_4 { background-image: url(spritesmith-main-5.png); - background-position: -182px -1389px; + background-position: -182px -1345px; width: 90px; height: 90px; } .head_wizard_5 { background-image: url(spritesmith-main-5.png); - background-position: -273px -1389px; + background-position: -273px -1345px; width: 90px; height: 90px; } .shop_head_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -492px -1675px; + background-position: -164px -1683px; width: 40px; height: 40px; } .shop_head_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -451px -1675px; + background-position: -123px -1683px; width: 40px; height: 40px; } .shop_head_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -410px -1675px; + background-position: -82px -1683px; width: 40px; height: 40px; } .shop_head_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -369px -1675px; + background-position: -41px -1683px; width: 40px; height: 40px; } .shop_head_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -246px -1675px; + background-position: -1689px -1599px; width: 40px; height: 40px; } .shop_head_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -205px -1675px; + background-position: -1689px -1558px; width: 40px; height: 40px; } .shop_head_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -164px -1675px; + background-position: -1689px -1517px; width: 40px; height: 40px; } .shop_head_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -123px -1675px; + background-position: -1689px -1476px; width: 40px; height: 40px; } .shop_head_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -82px -1675px; + background-position: -1689px -1435px; width: 40px; height: 40px; } .shop_head_rogue_5 { background-image: url(spritesmith-main-5.png); - background-position: -41px -1675px; + background-position: -1689px -1394px; width: 40px; height: 40px; } .shop_head_special_0 { background-image: url(spritesmith-main-5.png); - background-position: 0px -1675px; + background-position: -1689px -1353px; width: 40px; height: 40px; } .shop_head_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -1547px -1571px; + background-position: -1689px -1230px; width: 40px; height: 40px; } .shop_head_special_2 { background-image: url(spritesmith-main-5.png); - background-position: -1506px -1571px; + background-position: -1689px -1189px; width: 40px; height: 40px; } .shop_head_special_fireCoralCirclet { background-image: url(spritesmith-main-5.png); - background-position: -1465px -1571px; + background-position: -1689px -1148px; width: 40px; height: 40px; } .shop_head_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -1424px -1571px; + background-position: -1689px -1107px; width: 40px; height: 40px; } .shop_head_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -1345px -1345px; + background-position: -1689px -984px; width: 40px; height: 40px; } .shop_head_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -1304px -1345px; + background-position: -1689px -943px; width: 40px; height: 40px; } .shop_head_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -1140px -1345px; + background-position: -1689px -779px; width: 40px; height: 40px; } .shop_head_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -1099px -1345px; + background-position: -1689px -738px; width: 40px; height: 40px; } .shop_head_wizard_1 { background-image: url(spritesmith-main-5.png); - background-position: -1058px -1345px; + background-position: -1689px -697px; width: 40px; height: 40px; } .shop_head_wizard_2 { background-image: url(spritesmith-main-5.png); - background-position: -1017px -1345px; + background-position: -1689px -656px; width: 40px; height: 40px; } .shop_head_wizard_3 { background-image: url(spritesmith-main-5.png); - background-position: -976px -1345px; + background-position: -1689px -615px; width: 40px; height: 40px; } .shop_head_wizard_4 { background-image: url(spritesmith-main-5.png); - background-position: -935px -1345px; + background-position: -1689px -574px; width: 40px; height: 40px; } .shop_head_wizard_5 { background-image: url(spritesmith-main-5.png); - background-position: -894px -1345px; + background-position: -1689px -533px; width: 40px; height: 40px; } .headAccessory_special_bearEars { background-image: url(spritesmith-main-5.png); - background-position: -728px -1389px; + background-position: -728px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_bearEars { background-image: url(spritesmith-main-5.png); - background-position: -753px -1404px; + background-position: -753px -1360px; width: 60px; height: 60px; } .headAccessory_special_cactusEars { background-image: url(spritesmith-main-5.png); - background-position: -819px -1389px; + background-position: -819px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_cactusEars { background-image: url(spritesmith-main-5.png); - background-position: -844px -1404px; + background-position: -844px -1360px; width: 60px; height: 60px; } .headAccessory_special_foxEars { background-image: url(spritesmith-main-5.png); - background-position: -910px -1389px; + background-position: -910px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_foxEars { background-image: url(spritesmith-main-5.png); - background-position: -935px -1404px; + background-position: -935px -1360px; width: 60px; height: 60px; } .headAccessory_special_lionEars { background-image: url(spritesmith-main-5.png); - background-position: -1092px -1389px; + background-position: -1092px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_lionEars { background-image: url(spritesmith-main-5.png); - background-position: -1117px -1404px; + background-position: -1117px -1360px; width: 60px; height: 60px; } .headAccessory_special_pandaEars { background-image: url(spritesmith-main-5.png); - background-position: -1183px -1389px; + background-position: -1183px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_pandaEars { background-image: url(spritesmith-main-5.png); - background-position: -1208px -1404px; + background-position: -1208px -1360px; width: 60px; height: 60px; } .headAccessory_special_pigEars { background-image: url(spritesmith-main-5.png); - background-position: -1274px -1389px; + background-position: -1274px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_pigEars { background-image: url(spritesmith-main-5.png); - background-position: -1299px -1404px; + background-position: -1299px -1360px; width: 60px; height: 60px; } .headAccessory_special_tigerEars { background-image: url(spritesmith-main-5.png); - background-position: -1365px -1389px; + background-position: -1365px -1345px; width: 90px; height: 90px; } .customize-option.headAccessory_special_tigerEars { background-image: url(spritesmith-main-5.png); - background-position: -1390px -1404px; + background-position: -1390px -1360px; width: 60px; height: 60px; } .headAccessory_special_wolfEars { background-image: url(spritesmith-main-5.png); - background-position: -1507px -91px; + background-position: -1507px 0px; width: 90px; height: 90px; } .customize-option.headAccessory_special_wolfEars { background-image: url(spritesmith-main-5.png); - background-position: -1532px -106px; + background-position: -1532px -15px; width: 60px; height: 60px; } .shop_headAccessory_special_bearEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -814px; + background-position: -417px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_cactusEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1306px; + background-position: -909px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_foxEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1388px; + background-position: -950px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_lionEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1429px; + background-position: -1032px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_pandaEars { background-image: url(spritesmith-main-5.png); - background-position: -287px -1675px; + background-position: -1689px -1640px; width: 40px; height: 40px; } .shop_headAccessory_special_pigEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1142px; + background-position: -745px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_tigerEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1101px; + background-position: -704px -1631px; width: 40px; height: 40px; } .shop_headAccessory_special_wolfEars { background-image: url(spritesmith-main-5.png); - background-position: -1689px -691px; + background-position: -335px -1631px; width: 40px; height: 40px; } .shield_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -482px -1254px; + background-position: -408px -1254px; width: 90px; height: 90px; } .shield_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -455px; + background-position: -1507px -364px; width: 90px; height: 90px; } .shield_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -637px -1389px; + background-position: -637px -1345px; width: 90px; height: 90px; } .shield_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -728px -1480px; + background-position: -499px -1254px; width: 90px; height: 90px; } .shield_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -364px -1389px; + background-position: -364px -1345px; width: 90px; height: 90px; } .shield_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -455px -1389px; + background-position: -455px -1345px; width: 90px; height: 90px; } .shield_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -74px -1254px; + background-position: 0px -1254px; width: 103px; height: 90px; } .shield_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -178px -1254px; + background-position: -104px -1254px; width: 103px; height: 90px; } @@ -402,7 +402,7 @@ } .shield_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -385px -1254px; + background-position: -311px -1254px; width: 96px; height: 90px; } @@ -420,7 +420,7 @@ } .shield_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -755px -1254px; + background-position: -772px -1254px; width: 90px; height: 90px; } @@ -432,367 +432,367 @@ } .shield_special_moonpearlShield { background-image: url(spritesmith-main-5.png); - background-position: -937px -1254px; + background-position: -954px -1254px; width: 90px; height: 90px; } .shield_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -1028px -1254px; + background-position: -1045px -1254px; width: 90px; height: 90px; } .shield_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -1119px -1254px; + background-position: -1136px -1254px; width: 90px; height: 90px; } .shield_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -1210px -1254px; + background-position: -1227px -1254px; width: 90px; height: 90px; } .shield_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -1301px -1254px; + background-position: -1318px -1254px; width: 90px; height: 90px; } .shield_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -1392px -1254px; + background-position: -1409px -1254px; width: 90px; height: 90px; } .shop_shield_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -656px -1675px; + background-position: -328px -1683px; width: 40px; height: 40px; } .shop_shield_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -615px -1675px; + background-position: -287px -1683px; width: 40px; height: 40px; } .shop_shield_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -574px -1675px; + background-position: -246px -1683px; width: 40px; height: 40px; } .shop_shield_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -533px -1675px; + background-position: -205px -1683px; width: 40px; height: 40px; } .shop_shield_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -328px -1675px; + background-position: 0px -1683px; width: 40px; height: 40px; } .shop_shield_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -1629px -1571px; + background-position: -1689px -1312px; width: 40px; height: 40px; } .shop_shield_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -1427px -1345px; + background-position: -1689px -1066px; width: 40px; height: 40px; } .shop_shield_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -1263px -1345px; + background-position: -1689px -902px; width: 40px; height: 40px; } .shop_shield_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -853px -1345px; + background-position: -1689px -492px; width: 40px; height: 40px; } .shop_shield_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -648px -1345px; + background-position: -1689px -287px; width: 40px; height: 40px; } .shop_shield_rogue_5 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -445px; + background-position: -1465px -1527px; width: 40px; height: 40px; } .shop_shield_rogue_6 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -486px; + background-position: -1506px -1527px; width: 40px; height: 40px; } .shop_shield_special_0 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -527px; + background-position: -1547px -1527px; width: 40px; height: 40px; } .shop_shield_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -568px; + background-position: -1588px -1527px; width: 40px; height: 40px; } .shop_shield_special_goldenknight { background-image: url(spritesmith-main-5.png); - background-position: -1689px -609px; + background-position: -1629px -1527px; width: 40px; height: 40px; } .shop_shield_special_moonpearlShield { background-image: url(spritesmith-main-5.png); - background-position: -1689px -650px; + background-position: -294px -1631px; width: 40px; height: 40px; } .shop_shield_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -732px; + background-position: -376px -1631px; width: 40px; height: 40px; } .shop_shield_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -773px; + background-position: -540px -1631px; width: 40px; height: 40px; } .shop_shield_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -937px; + background-position: -581px -1631px; width: 40px; height: 40px; } .shop_shield_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -978px; + background-position: -663px -1631px; width: 40px; height: 40px; } .shop_shield_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1060px; + background-position: -827px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_0 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1224px; + background-position: -991px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1347px; + background-position: -1073px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1470px; + background-position: -1114px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1511px; + background-position: -1155px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1552px; + background-position: -1196px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1593px; + background-position: -1237px -1631px; width: 40px; height: 40px; } .shop_weapon_healer_6 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1634px; + background-position: -1278px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1526px; + background-position: -1319px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -1639px -1526px; + background-position: -1360px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -74px -1345px; + background-position: -1401px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -115px -1345px; + background-position: -1442px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -156px -1345px; + background-position: -1483px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_5 { background-image: url(spritesmith-main-5.png); - background-position: -197px -1345px; + background-position: -1524px -1631px; width: 40px; height: 40px; } .shop_weapon_rogue_6 { background-image: url(spritesmith-main-5.png); - background-position: -238px -1345px; + background-position: -1565px -1631px; width: 40px; height: 40px; } .shop_weapon_special_0 { background-image: url(spritesmith-main-5.png); - background-position: -279px -1345px; + background-position: -1606px -1631px; width: 40px; height: 40px; } .shop_weapon_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -320px -1345px; + background-position: -1647px -1631px; width: 40px; height: 40px; } .shop_weapon_special_2 { background-image: url(spritesmith-main-5.png); - background-position: -361px -1345px; + background-position: -1689px 0px; width: 40px; height: 40px; } .shop_weapon_special_3 { background-image: url(spritesmith-main-5.png); - background-position: -402px -1345px; + background-position: -1689px -41px; width: 40px; height: 40px; } .shop_weapon_special_critical { background-image: url(spritesmith-main-5.png); - background-position: -443px -1345px; + background-position: -1689px -82px; width: 40px; height: 40px; } .shop_weapon_special_tridentOfCrashingTides { background-image: url(spritesmith-main-5.png); - background-position: -484px -1345px; + background-position: -1689px -123px; width: 40px; height: 40px; } .shop_weapon_warrior_0 { background-image: url(spritesmith-main-5.png); - background-position: -525px -1345px; + background-position: -1689px -164px; width: 40px; height: 40px; } .shop_weapon_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -566px -1345px; + background-position: -1689px -205px; width: 40px; height: 40px; } .shop_weapon_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -607px -1345px; + background-position: -1689px -246px; width: 40px; height: 40px; } .shop_weapon_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -404px; + background-position: -1424px -1527px; width: 40px; height: 40px; } .shop_weapon_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -689px -1345px; + background-position: -1689px -328px; width: 40px; height: 40px; } .shop_weapon_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -730px -1345px; + background-position: -1689px -369px; width: 40px; height: 40px; } .shop_weapon_warrior_6 { background-image: url(spritesmith-main-5.png); - background-position: -771px -1345px; + background-position: -1689px -410px; width: 40px; height: 40px; } .shop_weapon_wizard_0 { background-image: url(spritesmith-main-5.png); - background-position: -812px -1345px; + background-position: -1689px -451px; width: 40px; height: 40px; } .shop_weapon_wizard_1 { background-image: url(spritesmith-main-5.png); - background-position: -1181px -1345px; + background-position: -1689px -820px; width: 40px; height: 40px; } .shop_weapon_wizard_2 { background-image: url(spritesmith-main-5.png); - background-position: -1222px -1345px; + background-position: -1689px -861px; width: 40px; height: 40px; } .shop_weapon_wizard_3 { background-image: url(spritesmith-main-5.png); - background-position: -1386px -1345px; + background-position: -1689px -1025px; width: 40px; height: 40px; } .shop_weapon_wizard_4 { background-image: url(spritesmith-main-5.png); - background-position: -1588px -1571px; + background-position: -1689px -1271px; width: 40px; height: 40px; } .shop_weapon_wizard_5 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1183px; + background-position: -786px -1631px; width: 40px; height: 40px; } .shop_weapon_wizard_6 { background-image: url(spritesmith-main-5.png); - background-position: -697px -1675px; + background-position: -369px -1683px; width: 40px; height: 40px; } @@ -834,199 +834,199 @@ } .weapon_healer_6 { background-image: url(spritesmith-main-5.png); - background-position: -1456px -1480px; + background-position: -1456px -1436px; width: 90px; height: 90px; } .weapon_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -1365px -1480px; + background-position: -1365px -1436px; width: 90px; height: 90px; } .weapon_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -1274px -1480px; + background-position: -1274px -1436px; width: 90px; height: 90px; } .weapon_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -1183px -1480px; + background-position: -1183px -1436px; width: 90px; height: 90px; } .weapon_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -1092px -1480px; + background-position: -1092px -1436px; width: 90px; height: 90px; } .weapon_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -1001px -1480px; + background-position: -1001px -1436px; width: 90px; height: 90px; } .weapon_rogue_5 { background-image: url(spritesmith-main-5.png); - background-position: -910px -1480px; + background-position: -910px -1436px; width: 90px; height: 90px; } .weapon_rogue_6 { background-image: url(spritesmith-main-5.png); - background-position: -819px -1480px; + background-position: -819px -1436px; width: 90px; height: 90px; } .weapon_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -282px -1254px; + background-position: -208px -1254px; width: 102px; height: 90px; } .weapon_special_2 { background-image: url(spritesmith-main-5.png); - background-position: -637px -1480px; + background-position: -637px -1436px; width: 90px; height: 90px; } .weapon_special_3 { background-image: url(spritesmith-main-5.png); - background-position: -546px -1480px; + background-position: -546px -1436px; width: 90px; height: 90px; } .weapon_special_tridentOfCrashingTides { background-image: url(spritesmith-main-5.png); - background-position: -455px -1480px; + background-position: -455px -1436px; width: 90px; height: 90px; } .weapon_warrior_0 { background-image: url(spritesmith-main-5.png); - background-position: -364px -1480px; + background-position: -364px -1436px; width: 90px; height: 90px; } .weapon_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -273px -1480px; + background-position: -273px -1436px; width: 90px; height: 90px; } .weapon_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -182px -1480px; + background-position: -182px -1436px; width: 90px; height: 90px; } .weapon_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -91px -1480px; + background-position: -91px -1436px; width: 90px; height: 90px; } .weapon_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: 0px -1480px; + background-position: 0px -1436px; width: 90px; height: 90px; } .weapon_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -1365px; + background-position: -1507px -1274px; width: 90px; height: 90px; } .weapon_warrior_6 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -1274px; + background-position: -1507px -1183px; width: 90px; height: 90px; } .weapon_wizard_0 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -1183px; + background-position: -1507px -1092px; width: 90px; height: 90px; } .weapon_wizard_1 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -1092px; + background-position: -1507px -1001px; width: 90px; height: 90px; } .weapon_wizard_2 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -1001px; + background-position: -1507px -910px; width: 90px; height: 90px; } .weapon_wizard_3 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -910px; + background-position: -1507px -819px; width: 90px; height: 90px; } .weapon_wizard_4 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -819px; + background-position: -1507px -728px; width: 90px; height: 90px; } .weapon_wizard_5 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -728px; + background-position: -1507px -637px; width: 90px; height: 90px; } .weapon_wizard_6 { background-image: url(spritesmith-main-5.png); - background-position: -1507px -637px; + background-position: -1507px -546px; width: 90px; height: 90px; } .GrimReaper { background-image: url(spritesmith-main-5.png); - background-position: -1598px -640px; + background-position: -1598px -619px; width: 57px; height: 66px; } .Pet_Currency_Gem { background-image: url(spritesmith-main-5.png); - background-position: -1689px -364px; + background-position: -1079px -1209px; width: 45px; height: 39px; } .Pet_Currency_Gem1x { background-image: url(spritesmith-main-5.png); - background-position: -1662px -546px; + background-position: -1659px -546px; width: 15px; height: 13px; } .Pet_Currency_Gem2x { background-image: url(spritesmith-main-5.png); - background-position: -1656px -671px; + background-position: -1656px -650px; width: 30px; height: 26px; } .PixelPaw-Gold { background-image: url(spritesmith-main-5.png); - background-position: -1453px -710px; + background-position: -1507px -1365px; width: 51px; height: 51px; } .PixelPaw { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1422px; + background-position: -1598px -1401px; width: 51px; height: 51px; } .PixelPaw002 { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1474px; + background-position: -1598px -1453px; width: 51px; height: 51px; } @@ -1038,13 +1038,13 @@ } .avatar_floral_rogue { background-image: url(spritesmith-main-5.png); - background-position: -1087px -1070px; + background-position: -1187px -892px; width: 99px; height: 99px; } .avatar_floral_warrior { background-image: url(spritesmith-main-5.png); - background-position: -1187px -892px; + background-position: -1087px -1070px; width: 99px; height: 99px; } @@ -1056,169 +1056,169 @@ } .empty_bottles { background-image: url(spritesmith-main-5.png); - background-position: -1598px -707px; + background-position: -1598px -686px; width: 64px; height: 54px; } .inventory_present { background-image: url(spritesmith-main-5.png); - background-position: -1127px -1571px; + background-position: -1127px -1527px; width: 48px; height: 51px; } .inventory_present_01 { background-image: url(spritesmith-main-5.png); - background-position: -539px -1571px; + background-position: -539px -1527px; width: 48px; height: 51px; } .inventory_present_02 { background-image: url(spritesmith-main-5.png); - background-position: -588px -1571px; + background-position: -588px -1527px; width: 48px; height: 51px; } .inventory_present_03 { background-image: url(spritesmith-main-5.png); - background-position: -637px -1571px; + background-position: -637px -1527px; width: 48px; height: 51px; } .inventory_present_04 { background-image: url(spritesmith-main-5.png); - background-position: -686px -1571px; + background-position: -686px -1527px; width: 48px; height: 51px; } .inventory_present_05 { background-image: url(spritesmith-main-5.png); - background-position: -735px -1571px; + background-position: -735px -1527px; width: 48px; height: 51px; } .inventory_present_06 { background-image: url(spritesmith-main-5.png); - background-position: -784px -1571px; + background-position: -784px -1527px; width: 48px; height: 51px; } .inventory_present_07 { background-image: url(spritesmith-main-5.png); - background-position: -833px -1571px; + background-position: -833px -1527px; width: 48px; height: 51px; } .inventory_present_08 { background-image: url(spritesmith-main-5.png); - background-position: -882px -1571px; + background-position: -882px -1527px; width: 48px; height: 51px; } .inventory_present_09 { background-image: url(spritesmith-main-5.png); - background-position: -931px -1571px; + background-position: -931px -1527px; width: 48px; height: 51px; } .inventory_present_10 { background-image: url(spritesmith-main-5.png); - background-position: -980px -1571px; + background-position: -980px -1527px; width: 48px; height: 51px; } .inventory_present_11 { background-image: url(spritesmith-main-5.png); - background-position: -1029px -1571px; + background-position: -1029px -1527px; width: 48px; height: 51px; } .inventory_present_12 { background-image: url(spritesmith-main-5.png); - background-position: -1078px -1571px; + background-position: -1078px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll { background-image: url(spritesmith-main-5.png); - background-position: -1225px -1571px; + background-position: -1225px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_locked { background-image: url(spritesmith-main-5.png); - background-position: -1176px -1571px; + background-position: -1176px -1527px; width: 48px; height: 51px; } .inventory_special_birthday { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1202px; + background-position: -1598px -1181px; width: 57px; height: 54px; } .inventory_special_fortify { background-image: url(spritesmith-main-5.png); - background-position: -1598px -762px; + background-position: -1598px -741px; width: 57px; height: 54px; } .inventory_special_greeting { background-image: url(spritesmith-main-5.png); - background-position: -1598px -817px; + background-position: -1598px -796px; width: 57px; height: 54px; } .inventory_special_nye { background-image: url(spritesmith-main-5.png); - background-position: -1598px -872px; + background-position: -1598px -851px; width: 57px; height: 54px; } .inventory_special_opaquePotion { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1265px; + background-position: -868px -1631px; width: 40px; height: 40px; } .inventory_special_seafoam { background-image: url(spritesmith-main-5.png); - background-position: -1598px -927px; + background-position: -1598px -1016px; width: 57px; height: 54px; } .inventory_special_shinySeed { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1037px; + background-position: -1598px -906px; width: 57px; height: 54px; } .inventory_special_snowball { background-image: url(spritesmith-main-5.png); - background-position: -1598px -982px; + background-position: -1598px -961px; width: 57px; height: 54px; } .inventory_special_spookDust { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1367px; + background-position: -1598px -1346px; width: 57px; height: 54px; } .inventory_special_thankyou { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1092px; + background-position: -1598px -1071px; width: 57px; height: 54px; } .inventory_special_trinket { background-image: url(spritesmith-main-5.png); - background-position: -343px -1623px; + background-position: -343px -1579px; width: 48px; height: 51px; } .inventory_special_valentine { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1147px; + background-position: -1598px -1126px; width: 57px; height: 54px; } @@ -1230,49 +1230,49 @@ } .pet_key { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1257px; + background-position: -1598px -1236px; width: 57px; height: 54px; } .rebirth_orb { background-image: url(spritesmith-main-5.png); - background-position: -1598px -1312px; + background-position: -1598px -1291px; width: 57px; height: 54px; } .seafoam_star { background-image: url(spritesmith-main-5.png); - background-position: -1507px -364px; + background-position: -1507px -273px; width: 90px; height: 90px; } .shop_armoire { background-image: url(spritesmith-main-5.png); - background-position: -1689px -1019px; + background-position: -622px -1631px; width: 40px; height: 40px; } .snowman { background-image: url(spritesmith-main-5.png); - background-position: -1507px -273px; + background-position: -1507px -182px; width: 90px; height: 90px; } .spookman { background-image: url(spritesmith-main-5.png); - background-position: -1507px -182px; + background-position: -1507px -91px; width: 90px; height: 90px; } .zzz { background-image: url(spritesmith-main-5.png); - background-position: -1689px -855px; + background-position: -458px -1631px; width: 40px; height: 40px; } .zzz_light { background-image: url(spritesmith-main-5.png); - background-position: -1689px -896px; + background-position: -499px -1631px; width: 40px; height: 40px; } @@ -1285,8 +1285,8 @@ .npc_bailey { background-image: url(spritesmith-main-5.png); background-position: -1598px -546px; - width: 63px; - height: 93px; + width: 60px; + height: 72px; } .npc_daniel { background-image: url(spritesmith-main-5.png); @@ -1294,12 +1294,6 @@ width: 135px; height: 123px; } -.npc_ian { - background-image: url(spritesmith-main-5.png); - background-position: 0px -1254px; - width: 73px; - height: 134px; -} .npc_justin { background-image: url(spritesmith-main-5.png); background-position: -1100px -763px; @@ -1308,7 +1302,7 @@ } .npc_justin_head { background-image: url(spritesmith-main-5.png); - background-position: -1650px -1422px; + background-position: -1650px -1401px; width: 36px; height: 39px; } @@ -1332,7 +1326,7 @@ } .npc_tyler { background-image: url(spritesmith-main-5.png); - background-position: -1001px -1389px; + background-position: -1001px -1345px; width: 90px; height: 90px; } @@ -1350,349 +1344,349 @@ } .inventory_quest_scroll_atom1 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -156px; + background-position: -98px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_atom1_locked { background-image: url(spritesmith-main-5.png); - background-position: -1689px -104px; + background-position: -49px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_atom2 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -260px; + background-position: -196px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_atom2_locked { background-image: url(spritesmith-main-5.png); - background-position: -1689px -208px; + background-position: -147px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_atom3 { background-image: url(spritesmith-main-5.png); - background-position: -1689px -312px; + background-position: -245px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_atom3_locked { background-image: url(spritesmith-main-5.png); - background-position: -441px -1571px; + background-position: -441px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_basilist { background-image: url(spritesmith-main-5.png); - background-position: -1689px -52px; + background-position: 0px -1631px; width: 48px; height: 51px; } .inventory_quest_scroll_bunny { background-image: url(spritesmith-main-5.png); - background-position: -1689px 0px; + background-position: -1617px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_cheetah { background-image: url(spritesmith-main-5.png); - background-position: -1617px -1623px; + background-position: -1568px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress1 { background-image: url(spritesmith-main-5.png); - background-position: -1519px -1623px; + background-position: -1470px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress2 { background-image: url(spritesmith-main-5.png); - background-position: -1421px -1623px; + background-position: -1372px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress2_locked { background-image: url(spritesmith-main-5.png); - background-position: -1470px -1623px; + background-position: -1421px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress3 { background-image: url(spritesmith-main-5.png); - background-position: -1323px -1623px; + background-position: -1274px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress3_locked { background-image: url(spritesmith-main-5.png); - background-position: -1372px -1623px; + background-position: -1323px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatory_derby { background-image: url(spritesmith-main-5.png); - background-position: -1568px -1623px; + background-position: -1519px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_egg { background-image: url(spritesmith-main-5.png); - background-position: -1274px -1623px; + background-position: -1176px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_evilsanta { background-image: url(spritesmith-main-5.png); - background-position: -1176px -1623px; + background-position: -1127px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_evilsanta2 { background-image: url(spritesmith-main-5.png); - background-position: -1127px -1623px; + background-position: -1078px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_frog { background-image: url(spritesmith-main-5.png); - background-position: -1078px -1623px; + background-position: -1029px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_ghost_stag { background-image: url(spritesmith-main-5.png); - background-position: -1029px -1623px; + background-position: -980px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight1 { background-image: url(spritesmith-main-5.png); - background-position: -931px -1623px; + background-position: -882px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight1_locked { background-image: url(spritesmith-main-5.png); - background-position: -980px -1623px; + background-position: -931px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight2 { background-image: url(spritesmith-main-5.png); - background-position: -588px -1623px; + background-position: -539px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight2_locked { background-image: url(spritesmith-main-5.png); - background-position: -882px -1623px; + background-position: -588px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight3 { background-image: url(spritesmith-main-5.png); - background-position: -490px -1623px; + background-position: -98px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight3_locked { background-image: url(spritesmith-main-5.png); - background-position: -539px -1623px; + background-position: -490px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_gryphon { background-image: url(spritesmith-main-5.png); - background-position: -147px -1623px; + background-position: -49px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_harpy { background-image: url(spritesmith-main-5.png); - background-position: -49px -1623px; + background-position: -392px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_hedgehog { background-image: url(spritesmith-main-5.png); - background-position: -392px -1571px; + background-position: -343px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_horse { background-image: url(spritesmith-main-5.png); - background-position: -343px -1571px; + background-position: -294px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_kraken { background-image: url(spritesmith-main-5.png); - background-position: -294px -1571px; + background-position: -245px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone1 { background-image: url(spritesmith-main-5.png); - background-position: -196px -1571px; + background-position: -147px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone1_locked { background-image: url(spritesmith-main-5.png); - background-position: -245px -1571px; + background-position: -196px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone2 { background-image: url(spritesmith-main-5.png); - background-position: -98px -1571px; + background-position: -49px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone2_locked { background-image: url(spritesmith-main-5.png); - background-position: -147px -1571px; + background-position: -98px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone3 { background-image: url(spritesmith-main-5.png); - background-position: 0px -1571px; + background-position: -1547px -1436px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone3_locked { background-image: url(spritesmith-main-5.png); - background-position: -49px -1571px; + background-position: 0px -1527px; width: 48px; height: 51px; } .inventory_quest_scroll_octopus { background-image: url(spritesmith-main-5.png); - background-position: -1547px -1480px; + background-position: -1456px -1345px; width: 48px; height: 51px; } .inventory_quest_scroll_owl { background-image: url(spritesmith-main-5.png); - background-position: -1456px -1389px; + background-position: -1432px -1148px; width: 48px; height: 51px; } .inventory_quest_scroll_penguin { background-image: url(spritesmith-main-5.png); - background-position: -1432px -1148px; + background-position: -1432px -1057px; width: 48px; height: 51px; } .inventory_quest_scroll_rat { background-image: url(spritesmith-main-5.png); - background-position: -1432px -1057px; + background-position: -1432px -966px; width: 48px; height: 51px; } .inventory_quest_scroll_rock { background-image: url(spritesmith-main-5.png); - background-position: -1432px -966px; + background-position: -1436px -886px; width: 48px; height: 51px; } .inventory_quest_scroll_rooster { background-image: url(spritesmith-main-5.png); - background-position: -1436px -886px; + background-position: -1436px -834px; width: 48px; height: 51px; } .inventory_quest_scroll_sabretooth { background-image: url(spritesmith-main-5.png); - background-position: -1436px -834px; + background-position: -1453px -762px; width: 48px; height: 51px; } .inventory_quest_scroll_sheep { background-image: url(spritesmith-main-5.png); - background-position: -1453px -762px; + background-position: -1453px -710px; width: 48px; height: 51px; } .inventory_quest_scroll_slime { background-image: url(spritesmith-main-5.png); - background-position: -1225px -1623px; + background-position: -1225px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_snake { background-image: url(spritesmith-main-5.png); - background-position: -833px -1623px; + background-position: -833px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_spider { background-image: url(spritesmith-main-5.png); - background-position: -784px -1623px; + background-position: -784px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_trex { background-image: url(spritesmith-main-5.png); - background-position: -686px -1623px; + background-position: -686px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_trex_undead { background-image: url(spritesmith-main-5.png); - background-position: -735px -1623px; + background-position: -735px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_unicorn { background-image: url(spritesmith-main-5.png); - background-position: -637px -1623px; + background-position: -637px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice1 { background-image: url(spritesmith-main-5.png); - background-position: -392px -1623px; + background-position: -392px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice1_locked { background-image: url(spritesmith-main-5.png); - background-position: -441px -1623px; + background-position: -441px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice2 { background-image: url(spritesmith-main-5.png); - background-position: -245px -1623px; + background-position: -245px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice2_locked { background-image: url(spritesmith-main-5.png); - background-position: -294px -1623px; + background-position: -294px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice3 { background-image: url(spritesmith-main-5.png); - background-position: -98px -1623px; + background-position: -147px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_vice3_locked { background-image: url(spritesmith-main-5.png); - background-position: -196px -1623px; + background-position: -196px -1579px; width: 48px; height: 51px; } .inventory_quest_scroll_whale { background-image: url(spritesmith-main-5.png); - background-position: 0px -1623px; + background-position: 0px -1579px; width: 48px; height: 51px; } @@ -1746,13 +1740,13 @@ } .quest_dilatoryDistress1_blueFins { background-image: url(spritesmith-main-5.png); - background-position: -1372px -1571px; + background-position: -1372px -1527px; width: 51px; height: 48px; } .quest_dilatoryDistress1_fireCoral { background-image: url(spritesmith-main-5.png); - background-position: -1323px -1571px; + background-position: -1323px -1527px; width: 48px; height: 51px; } @@ -1782,7 +1776,7 @@ } .quest_egg_plainEgg { background-image: url(spritesmith-main-5.png); - background-position: -1274px -1571px; + background-position: -1274px -1527px; width: 48px; height: 51px; } @@ -1818,7 +1812,7 @@ } .quest_goldenknight1_testimony { background-image: url(spritesmith-main-5.png); - background-position: -490px -1571px; + background-position: -490px -1527px; width: 48px; height: 51px; } @@ -1872,7 +1866,7 @@ } .quest_moonstone1_moonstone { background-image: url(spritesmith-main-5.png); - background-position: -1656px -640px; + background-position: -1656px -619px; width: 30px; height: 30px; } diff --git a/common/dist/sprites/spritesmith-main-5.png b/common/dist/sprites/spritesmith-main-5.png index 0f39c1bc35..d662649095 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/npcs/npc_alex.png b/common/img/sprites/spritesmith/npcs/npc_alex.png index 9d322bdeec..e904970937 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 77347e3749..f6e58617a8 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 ce2a49189e..b12dd9e254 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 deleted file mode 100644 index 73eea25a23..0000000000 Binary files a/common/img/sprites/spritesmith/npcs/npc_ian.png and /dev/null differ diff --git a/common/img/sprites/spritesmith/npcs/npc_justin.png b/common/img/sprites/spritesmith/npcs/npc_justin.png index 08ad42e374..08cb56f206 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 056b638cdc..b643153c46 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/locales/en/limited.json b/common/locales/en/limited.json index 019156c98b..449d2ff26d 100644 --- a/common/locales/en/limited.json +++ b/common/locales/en/limited.json @@ -25,7 +25,7 @@ "polarBearPup": "Polar Bear Cub", "jackolantern": "Jack-O-Lantern", "seasonalShop": "Seasonal Shop", - "seasonalShopClosedTitle": "<%= linkStart %>Siena Leslie<%= linkEnd %>", + "seasonalShopClosedTitle": "<%= linkStart %>Leslie<%= linkEnd %>", "seasonalShopTitle": "<%= linkStart %>Seasonal Sorceress<%= linkEnd %>", "seasonalShopClosedText": "The Seasonal Shop is currently closed!! I don't know where the Seasonal Sorceress is now, but I bet she'll be back during the next Grand Gala!", "seasonalShopText": "Welcome to the Seasonal Shop!! We're stocking springtime Seasonal Edition goodies at the moment. Everything here will be available to purchase during the Spring Fling event each year, but we're only open until April 30th, so be sure to stock up now, or you'll have to wait a year to buy these items again!", diff --git a/common/script/content/gear/sets/special/index.js b/common/script/content/gear/sets/special/index.js index b468b75f01..53aa0dad5c 100644 --- a/common/script/content/gear/sets/special/index.js +++ b/common/script/content/gear/sets/special/index.js @@ -25,9 +25,6 @@ let armor = { notes: t('armorSpecialYetiNotes', { con: 9 }), con: 9, value: 90, - canBuy: () => { - return true; - }, }, ski: { event: EVENTS.winter, @@ -36,9 +33,6 @@ let armor = { notes: t('armorSpecialSkiNotes', { per: 15 }), per: 15, value: 90, - canBuy: () => { - return true; - }, }, candycane: { event: EVENTS.winter, @@ -47,9 +41,6 @@ let armor = { notes: t('armorSpecialCandycaneNotes', { int: 9 }), int: 9, value: 90, - canBuy: () => { - return true; - }, }, snowflake: { event: EVENTS.winter, @@ -58,9 +49,6 @@ let armor = { notes: t('armorSpecialSnowflakeNotes', { con: 15 }), con: 15, value: 90, - canBuy: () => { - return true; - }, }, birthday: { event: EVENTS.birthday, @@ -138,9 +126,6 @@ let armor = { notes: t('armorSpecialFallRogueNotes', { per: 15 }), value: 90, per: 15, - canBuy: () => { - return true; - }, }, fallWarrior: { event: EVENTS.fall, @@ -149,9 +134,6 @@ let armor = { notes: t('armorSpecialFallWarriorNotes', { con: 9 }), value: 90, con: 9, - canBuy: () => { - return true; - }, }, fallMage: { event: EVENTS.fall, @@ -160,9 +142,6 @@ let armor = { notes: t('armorSpecialFallMageNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, fallHealer: { event: EVENTS.fall, @@ -171,9 +150,6 @@ let armor = { notes: t('armorSpecialFallHealerNotes', { con: 15 }), value: 90, con: 15, - canBuy: () => { - return true; - }, }, winter2015Rogue: { event: EVENTS.winter2015, @@ -182,9 +158,6 @@ let armor = { notes: t('armorSpecialWinter2015RogueNotes', { per: 15 }), value: 90, per: 15, - canBuy: () => { - return true; - }, }, winter2015Warrior: { event: EVENTS.winter2015, @@ -193,9 +166,6 @@ let armor = { notes: t('armorSpecialWinter2015WarriorNotes', { con: 9 }), value: 90, con: 9, - canBuy: () => { - return true; - }, }, winter2015Mage: { event: EVENTS.winter2015, @@ -204,9 +174,6 @@ let armor = { notes: t('armorSpecialWinter2015MageNotes', { int: 9 }), value: 90, int: 9, - canBuy: () => { - return true; - }, }, winter2015Healer: { event: EVENTS.winter2015, @@ -215,9 +182,6 @@ let armor = { notes: t('armorSpecialWinter2015HealerNotes', { con: 15 }), value: 90, con: 15, - canBuy: () => { - return true; - }, }, birthday2015: { text: t('armorSpecialBirthday2015Text'), diff --git a/common/script/content/index.js b/common/script/content/index.js index ccef7dcae1..8afaaef91e 100644 --- a/common/script/content/index.js +++ b/common/script/content/index.js @@ -1180,52 +1180,92 @@ api.food = { Meat: { text: t('foodMeat'), target: 'Base', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, Milk: { text: t('foodMilk'), target: 'White', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, Potatoe: { text: t('foodPotatoe'), target: 'Desert', - article: 'a ' + article: 'a ', + canBuy: (function() { + return true; + }), + canDrop: true, }, Strawberry: { text: t('foodStrawberry'), target: 'Red', - article: 'a ' + article: 'a ', + canBuy: (function() { + return true; + }), + canDrop: true, }, Chocolate: { text: t('foodChocolate'), target: 'Shade', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, Fish: { text: t('foodFish'), target: 'Skeleton', - article: 'a ' + article: 'a ', + canBuy: (function() { + return true; + }), + canDrop: true, }, RottenMeat: { text: t('foodRottenMeat'), target: 'Zombie', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, CottonCandyPink: { text: t('foodCottonCandyPink'), target: 'CottonCandyPink', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, CottonCandyBlue: { text: t('foodCottonCandyBlue'), target: 'CottonCandyBlue', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, Honey: { text: t('foodHoney'), target: 'Golden', - article: '' + article: '', + canBuy: (function() { + return true; + }), + canDrop: true, }, Saddle: { canBuy: (function() { @@ -1238,91 +1278,51 @@ api.food = { Cake_Skeleton: { text: t('foodCakeSkeleton'), target: 'Skeleton', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Base: { text: t('foodCakeBase'), target: 'Base', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_CottonCandyBlue: { text: t('foodCakeCottonCandyBlue'), target: 'CottonCandyBlue', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_CottonCandyPink: { text: t('foodCakeCottonCandyPink'), target: 'CottonCandyPink', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Shade: { text: t('foodCakeShade'), target: 'Shade', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_White: { text: t('foodCakeWhite'), target: 'White', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Golden: { text: t('foodCakeGolden'), target: 'Golden', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Zombie: { text: t('foodCakeZombie'), target: 'Zombie', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Desert: { text: t('foodCakeDesert'), target: 'Desert', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Cake_Red: { text: t('foodCakeRed'), target: 'Red', - canBuy: (function() { - return true; - }), - canDrop: true, article: '' }, Candy_Skeleton: { diff --git a/website/views/options/inventory/seasonal-shop.jade b/website/views/options/inventory/seasonal-shop.jade index 0a886ae02c..a3ca8d6c77 100644 --- a/website/views/options/inventory/seasonal-shop.jade +++ b/website/views/options/inventory/seasonal-shop.jade @@ -1,16 +1,16 @@ .container-fluid .stable.row: .col-xs-12 - div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_open'}").pull-left-sm.col-centered + div(class="#{env.worldDmg.seasonalShop ? 'seasonalshop_broken' : 'seasonalshop_closed'}").pull-left-sm.col-centered .popover.static-popover.fade.right.in.pull-left-sm.col-centered .arrow.hidden-xs - h3.popover-title!=env.t('seasonalShopTitle', {linkStart:"", linkEnd: ""}) + h3.popover-title!=env.t('seasonalShopClosedTitle', {linkStart:"", linkEnd: ""}) .popover-content - p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopWinterText') - p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopFallTextBroken') + p(ng-if='!env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText') + p(ng-if='env.worldDmg.seasonalShop')!=env.t('seasonalShopClosedText') - .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') + // .well(ng-if='User.user.achievements.rebirths > 0')=env.t('seasonalShopRebirth') - li.customize-menu.inventory-gear + // li.customize-menu.inventory-gear menu.pets-menu(label='{{::label}}', ng-repeat='(set,label) in ::{yeti:env.t("yetiSet"), candycane:env.t("candycaneSet"), snowflake:env.t("snowflakeSet"), ski:env.t("skiSet"), winter2015Warrior:env.t("gingerbreadSet"), winter2015Mage:env.t("northMageSet"), winter2015Healer:env.t("soothingSkaterSet"), winter2015Rogue:env.t("icicleDrakeSet")}') div(ng-repeat='item in ::getSeasonalShopArray(set)', ng-class="{transparent: user.items.gear.owned[item.key] !== undefined}") @@ -42,7 +42,7 @@ ng-click='purchase("special", Content.spells.special.snowball)') p {{::Content.spells.special.snowball.value}} span(class='shop_gold') - // div + div button.customize-option(class='Pet_HatchingPotion_Peppermint', popover='{{::Content.hatchingPotions.Peppermint.notes()}}', popover-title!=env.t("potion", {potionType: "{{::Content.hatchingPotions.Peppermint.text()}}"}), @@ -51,7 +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') diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index ceccce5729..68b78c5a12 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -85,7 +85,7 @@ mixin customizeProfile(mobile) +buyPref('hair.color', ['rainbow','yellow','green','purple','blue','TRUred'], 'rainbowColors') +buyPref('hair.color', ['pblue2','pgreen2','porange2','ppink2','ppurple2','pyellow2'], 'shimmerColors', 'disabled') +buyPref('hair.color', ['candycorn','ghostwhite','halloween','midnight','pumpkin','zombie'], 'hauntedColors', 'disabled') - +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors') + +buyPref('hair.color', ['aurora','festive','hollygreen','peppermint','snowy','winterstar'], 'winteryColors', 'disabled') li.customize-menu menu(label=env.t('bodyHair')) diff --git a/website/views/shared/new-stuff.jade b/website/views/shared/new-stuff.jade index 35f8882da5..56b8c874c6 100644 --- a/website/views/shared/new-stuff.jade +++ b/website/views/shared/new-stuff.jade @@ -1,47 +1,64 @@ -h2 1/29/2016 - HABITICA BIRTHDAY BASH: CAKE, ACHIEVEMENTS, BIRTHDAY CARDS, AND PARTY ROBES! PLUS, LAST CHANCE FOR JANUARY AND WINTER WONDERLAND ITEMS +h2 2/1/2016 - FEBRUARY MYSTERY BOX, VIDEO CHALLENGE WINNER, AND OFFICIAL MOBILE APP CHALLENGE hr tr td - .npc_matt.pull-right - h3 Habitica Birthday Bash - p January 31st is Habitica's Birthday, and this year we have something extra-special to enjoy: Habitica has hit over one million users! Thank you so much for being here with us - it means a lot. + .inventory_present_02.pull-right + h3 February Mystery Box + p Ooh... What could it be? All Habiticans who are subscribed during the month of February will receive the February Mystery Item Set! It will be revealed on the 24th, so keep your eyes peeled. Thanks for supporting the site <3 + p.small.muted by Lemoness + tr + td + h3 Video Challenge Winner + p The winner of the Official Challenge for sharing the video has been randomly selected, and the lucky Habitican is... Baggs98! Thanks so much to everyone who helped us spread the word. You guys are the best. + tr + td + h3 Official Mobile App Challenge + p We’ve launched another Official Challenge: the Mobile App Download Challenge! In case you missed it, Habitica now has both an iOS app and an Android app so that you can easily use Habitica on the go, and we hope that everyone who has one of those devices will give them a try! br - p Now come join us and the NPCs as we celebrate! - tr - td - .Pet_Food_Cake_Base.pull-left.slight-right-margin - h3 Cake for Everybody! - p In honor of the festivities, everyone has been awarded an assortment of cake to feed to your pets! Yum, yum. Plus, for the next two days Alexander the Merchant is now selling cake in his shop, and cake will sometimes drop when you complete your tasks. Cake works just like normal pet food, but if you want to know what type of pet likes each slice, the wiki has spoilers. - tr - td - .shop_armor_special_birthday2016.pull-left.slight-right-margin - h3 Party Robes - p Until February 1st only, there are Party Robes available for free in the Rewards column! Don them with pride. - tr - td - .achievement-habitBirthday2x.pull-right - h3 Birthday Bash Achievement - p In honor of Habitica's birthday, everyone has been awarded the Habitica Birthday Bash achievement! This achievement stacks for each Birthday Bash you celebrate with us. - tr - td - .inventory_special_birthday.pull-right - h3 Birthday Cards - p You can now send Birthday Cards to your party mates! If you do so, you'll both get the Birthday Bonanza badge. These birthday cards will be available year-round for 10 Gold each. - tr - td - .promo_mystery_201601.pull-right - h3 Last Chance for January Item Set - p Reminder: this is the final day to subscribe and receive the Champion of Resolution Item Set! If you want the Resolution Slayer or the Helm of True Resolve, now's the time! Thanks so much for your support <3 - tr - td - h3 Last Chance for Winter Wonderland Outfits & Hair Colors - p On February 1st, everything will be back to normal in Habitica, so if you still have any remaining Winter Wonderland Items that you want to buy, you'd better do it now! The Seasonal Edition items and Hair Colors won't be back until next December, and if the Limited Edition items return they will have increased prices or changed art, so strike while the iron is hot! + p All you have to do to be eligible for the prize is have downloaded our iOS or Android app. The contest ends on February 29th, and the 10 randomly-selected winners will each get 10 Gems! For the full rules, check out the challenge here. if menuItem !== 'oldNews' hr a(href='/static/old-news', target='_blank') Read older news mixin oldNews + h2 1/29/2016 - HABITICA BIRTHDAY BASH: CAKE, ACHIEVEMENTS, BIRTHDAY CARDS, AND PARTY ROBES! PLUS, LAST CHANCE FOR JANUARY AND WINTER WONDERLAND ITEMS + tr + td + .npc_matt.pull-right + h3 Habitica Birthday Bash + p January 31st is Habitica's Birthday, and this year we have something extra-special to enjoy: Habitica has hit over one million users! Thank you so much for being here with us - it means a lot. + br + p Now come join us and the NPCs as we celebrate! + tr + td + .Pet_Food_Cake_Base.pull-left.slight-right-margin + h3 Cake for Everybody! + p In honor of the festivities, everyone has been awarded an assortment of cake to feed to your pets! Yum, yum. Plus, for the next two days Alexander the Merchant is now selling cake in his shop, and cake will sometimes drop when you complete your tasks. Cake works just like normal pet food, but if you want to know what type of pet likes each slice, the wiki has spoilers. + tr + td + .shop_armor_special_birthday2016.pull-left.slight-right-margin + h3 Party Robes + p Until February 1st only, there are Party Robes available for free in the Rewards column! Don them with pride. + tr + td + .achievement-habitBirthday2x.pull-right + h3 Birthday Bash Achievement + p In honor of Habitica's birthday, everyone has been awarded the Habitica Birthday Bash achievement! This achievement stacks for each Birthday Bash you celebrate with us. + tr + td + .inventory_special_birthday.pull-right + h3 Birthday Cards + p You can now send Birthday Cards to your party mates! If you do so, you'll both get the Birthday Bonanza badge. These birthday cards will be available year-round for 10 Gold each. + tr + td + .promo_mystery_201601.pull-right + h3 Last Chance for January Item Set + p Reminder: this is the final day to subscribe and receive the Champion of Resolution Item Set! If you want the Resolution Slayer or the Helm of True Resolve, now's the time! Thanks so much for your support <3 + tr + td + h3 Last Chance for Winter Wonderland Outfits & Hair Colors + p On February 1st, everything will be back to normal in Habitica, so if you still have any remaining Winter Wonderland Items that you want to buy, you'd better do it now! The Seasonal Edition items and Hair Colors won't be back until next December, and if the Limited Edition items return they will have increased prices or changed art, so strike while the iron is hot! h2 1/26/2016 - JANUARY SUBSCRIBER ITEM AND AVATAR CUSTOMIZATION IN THE ANDROID APP tr td