diff --git a/common/dist/sprites/spritesmith-main-5.css b/common/dist/sprites/spritesmith-main-5.css index 3e87b2380f..b6c6c243c5 100644 --- a/common/dist/sprites/spritesmith-main-5.css +++ b/common/dist/sprites/spritesmith-main-5.css @@ -12,43 +12,43 @@ } .shop_back_special_wondercon_black { background-image: url(spritesmith-main-5.png); - background-position: -396px -1179px; + background-position: -355px -1179px; width: 40px; height: 40px; } .shop_back_special_wondercon_red { background-image: url(spritesmith-main-5.png); - background-position: -437px -1179px; + background-position: -396px -1179px; width: 40px; height: 40px; } .shop_body_special_wondercon_black { background-image: url(spritesmith-main-5.png); - background-position: -1052px -1179px; + background-position: -1011px -1179px; width: 40px; height: 40px; } .shop_body_special_wondercon_gold { background-image: url(spritesmith-main-5.png); - background-position: -1287px -1494px; + background-position: -1246px -1494px; width: 40px; height: 40px; } .shop_body_special_wondercon_red { background-image: url(spritesmith-main-5.png); - background-position: -1492px -1494px; + background-position: -1451px -1494px; width: 40px; height: 40px; } .shop_eyewear_special_wondercon_black { background-image: url(spritesmith-main-5.png); - background-position: -1451px -1494px; + background-position: -1410px -1494px; width: 40px; height: 40px; } .shop_eyewear_special_wondercon_red { background-image: url(spritesmith-main-5.png); - background-position: -1410px -1494px; + background-position: -1369px -1494px; width: 40px; height: 40px; } @@ -198,145 +198,145 @@ } .shop_head_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -1369px -1494px; + background-position: -1328px -1494px; width: 40px; height: 40px; } .shop_head_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -1328px -1494px; + background-position: -1287px -1494px; width: 40px; height: 40px; } .shop_head_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -1246px -1494px; + background-position: -1205px -1494px; width: 40px; height: 40px; } .shop_head_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -1205px -1494px; + background-position: -1164px -1494px; width: 40px; height: 40px; } .shop_head_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -1164px -1494px; + background-position: -1123px -1494px; width: 40px; height: 40px; } .shop_head_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -1123px -1494px; + background-position: -1082px -1494px; width: 40px; height: 40px; } .shop_head_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -1082px -1494px; + background-position: -1041px -1494px; width: 40px; height: 40px; } .shop_head_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -1041px -1494px; + background-position: -1000px -1494px; width: 40px; height: 40px; } .shop_head_rogue_4 { background-image: url(spritesmith-main-5.png); - background-position: -1000px -1494px; + background-position: -959px -1494px; width: 40px; height: 40px; } .shop_head_rogue_5 { background-image: url(spritesmith-main-5.png); - background-position: -959px -1494px; + background-position: -918px -1494px; width: 40px; height: 40px; } .shop_head_special_0 { background-image: url(spritesmith-main-5.png); - background-position: -918px -1494px; + background-position: -877px -1494px; width: 40px; height: 40px; } .shop_head_special_1 { background-image: url(spritesmith-main-5.png); - background-position: -836px -1494px; + background-position: -795px -1494px; width: 40px; height: 40px; } .shop_head_special_2 { background-image: url(spritesmith-main-5.png); - background-position: -795px -1494px; + background-position: -754px -1494px; width: 40px; height: 40px; } .shop_head_special_fireCoralCirclet { background-image: url(spritesmith-main-5.png); - background-position: -754px -1494px; + background-position: -713px -1494px; width: 40px; height: 40px; } .shop_head_warrior_1 { background-image: url(spritesmith-main-5.png); - background-position: -713px -1494px; + background-position: -672px -1494px; width: 40px; height: 40px; } .shop_head_warrior_2 { background-image: url(spritesmith-main-5.png); - background-position: -672px -1494px; + background-position: -631px -1494px; width: 40px; height: 40px; } .shop_head_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -590px -1494px; + background-position: -549px -1494px; width: 40px; height: 40px; } .shop_head_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -549px -1494px; + background-position: -508px -1494px; width: 40px; height: 40px; } .shop_head_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -508px -1494px; + background-position: -467px -1494px; width: 40px; height: 40px; } .shop_head_wizard_1 { background-image: url(spritesmith-main-5.png); - background-position: -385px -1494px; + background-position: -344px -1494px; width: 40px; height: 40px; } .shop_head_wizard_2 { background-image: url(spritesmith-main-5.png); - background-position: -344px -1494px; + background-position: -303px -1494px; width: 40px; height: 40px; } .shop_head_wizard_3 { background-image: url(spritesmith-main-5.png); - background-position: -303px -1494px; + background-position: -1257px -1179px; width: 40px; height: 40px; } .shop_head_wizard_4 { background-image: url(spritesmith-main-5.png); - background-position: -1257px -1179px; + background-position: -1216px -1179px; width: 40px; height: 40px; } .shop_head_wizard_5 { background-image: url(spritesmith-main-5.png); - background-position: -1216px -1179px; + background-position: -1175px -1179px; width: 40px; height: 40px; } @@ -438,19 +438,19 @@ } .shop_headAccessory_special_bearEars { background-image: url(spritesmith-main-5.png); - background-position: -1175px -1179px; + background-position: -1134px -1179px; width: 40px; height: 40px; } .shop_headAccessory_special_cactusEars { background-image: url(spritesmith-main-5.png); - background-position: -1134px -1179px; + background-position: -1093px -1179px; width: 40px; height: 40px; } .shop_headAccessory_special_foxEars { background-image: url(spritesmith-main-5.png); - background-position: -1093px -1179px; + background-position: -1052px -1179px; width: 40px; height: 40px; } @@ -462,7 +462,7 @@ } .shop_headAccessory_special_pandaEars { background-image: url(spritesmith-main-5.png); - background-position: -1533px -1494px; + background-position: -1492px -1494px; width: 40px; height: 40px; } @@ -474,13 +474,13 @@ } .shop_headAccessory_special_tigerEars { background-image: url(spritesmith-main-5.png); - background-position: -877px -1494px; + background-position: -836px -1494px; width: 40px; height: 40px; } .shop_headAccessory_special_wolfEars { background-image: url(spritesmith-main-5.png); - background-position: -631px -1494px; + background-position: -590px -1494px; width: 40px; height: 40px; } @@ -606,43 +606,43 @@ } .shop_shield_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -467px -1494px; + background-position: -426px -1494px; width: 40px; height: 40px; } .shop_shield_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -426px -1494px; + background-position: -385px -1494px; width: 40px; height: 40px; } .shop_shield_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -1011px -1179px; + background-position: -970px -1179px; width: 40px; height: 40px; } .shop_shield_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -929px -1179px; + background-position: -888px -1179px; width: 40px; height: 40px; } .shop_shield_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -806px -1179px; + background-position: -765px -1179px; width: 40px; height: 40px; } .shop_shield_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -765px -1179px; + background-position: -724px -1179px; width: 40px; height: 40px; } .shop_shield_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -683px -1179px; + background-position: -642px -1179px; width: 40px; height: 40px; } @@ -714,85 +714,85 @@ } .shop_shield_warrior_3 { background-image: url(spritesmith-main-5.png); - background-position: -970px -1179px; + background-position: -929px -1179px; width: 40px; height: 40px; } .shop_shield_warrior_4 { background-image: url(spritesmith-main-5.png); - background-position: -642px -1179px; + background-position: -601px -1179px; width: 40px; height: 40px; } .shop_shield_warrior_5 { background-image: url(spritesmith-main-5.png); - background-position: -601px -1179px; + background-position: -560px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_0 { background-image: url(spritesmith-main-5.png); - background-position: -560px -1179px; + background-position: -519px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_1 { background-image: url(spritesmith-main-5.png); - background-position: -519px -1179px; + background-position: -478px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_2 { background-image: url(spritesmith-main-5.png); - background-position: -478px -1179px; + background-position: -437px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_3 { background-image: url(spritesmith-main-5.png); - background-position: -355px -1179px; + background-position: -314px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_4 { background-image: url(spritesmith-main-5.png); - background-position: -314px -1179px; + background-position: -273px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_5 { background-image: url(spritesmith-main-5.png); - background-position: -273px -1179px; + background-position: -232px -1179px; width: 40px; height: 40px; } .shop_weapon_healer_6 { background-image: url(spritesmith-main-5.png); - background-position: -232px -1179px; + background-position: -191px -1179px; width: 40px; height: 40px; } .shop_weapon_rogue_0 { background-image: url(spritesmith-main-5.png); - background-position: -191px -1179px; + background-position: -1417px -1144px; width: 40px; height: 40px; } .shop_weapon_rogue_1 { background-image: url(spritesmith-main-5.png); - background-position: -1417px -1144px; + background-position: -1417px -1044px; width: 40px; height: 40px; } .shop_weapon_rogue_2 { background-image: url(spritesmith-main-5.png); - background-position: -1417px -1044px; + background-position: -1417px -944px; width: 40px; height: 40px; } .shop_weapon_rogue_3 { background-image: url(spritesmith-main-5.png); - background-position: -1417px -944px; + background-position: -1402px -753px; width: 40px; height: 40px; } @@ -1200,13 +1200,13 @@ } .inventory_present { background-image: url(spritesmith-main-5.png); - background-position: -1402px -747px; + background-position: -1417px -892px; width: 48px; height: 51px; } .inventory_present_01 { background-image: url(spritesmith-main-5.png); - background-position: -702px -1585px; + background-position: -751px -1585px; width: 48px; height: 51px; } @@ -1278,13 +1278,13 @@ } .inventory_quest_scroll { background-image: url(spritesmith-main-5.png); - background-position: -1417px -992px; + background-position: -1417px -1092px; width: 48px; height: 51px; } .inventory_quest_scroll_locked { background-image: url(spritesmith-main-5.png); - background-position: -1417px -892px; + background-position: -1417px -992px; width: 48px; height: 51px; } @@ -1386,7 +1386,7 @@ } .shop_armoire { background-image: url(spritesmith-main-5.png); - background-position: -724px -1179px; + background-position: -683px -1179px; width: 40px; height: 40px; } @@ -1404,13 +1404,13 @@ } .zzz { background-image: url(spritesmith-main-5.png); - background-position: -888px -1179px; + background-position: -847px -1179px; width: 40px; height: 40px; } .zzz_light { background-image: url(spritesmith-main-5.png); - background-position: -847px -1179px; + background-position: -806px -1179px; width: 40px; height: 40px; } @@ -1423,8 +1423,8 @@ .npc_bailey { background-image: url(spritesmith-main-5.png); background-position: -1402px -680px; - width: 63px; - height: 66px; + width: 60px; + height: 72px; } .npc_daniel { background-image: url(spritesmith-main-5.png); @@ -1482,79 +1482,79 @@ } .inventory_quest_scroll_atom1 { background-image: url(spritesmith-main-5.png); - background-position: -114px -1585px; + background-position: -163px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_atom1_locked { background-image: url(spritesmith-main-5.png); - background-position: -65px -1585px; + background-position: -114px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_atom2 { background-image: url(spritesmith-main-5.png); - background-position: -212px -1585px; + background-position: -261px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_atom2_locked { background-image: url(spritesmith-main-5.png); - background-position: -163px -1585px; + background-position: -212px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_atom3 { background-image: url(spritesmith-main-5.png); - background-position: -310px -1585px; + background-position: -359px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_atom3_locked { background-image: url(spritesmith-main-5.png); - background-position: -261px -1585px; + background-position: -310px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_basilist { background-image: url(spritesmith-main-5.png); - background-position: -359px -1585px; + background-position: -408px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_bunny { background-image: url(spritesmith-main-5.png); - background-position: -408px -1585px; + background-position: -457px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_cheetah { background-image: url(spritesmith-main-5.png); - background-position: -457px -1585px; + background-position: -506px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress1 { background-image: url(spritesmith-main-5.png); - background-position: -555px -1585px; + background-position: -604px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress2 { background-image: url(spritesmith-main-5.png); - background-position: -653px -1585px; + background-position: -702px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress2_locked { background-image: url(spritesmith-main-5.png); - background-position: -604px -1585px; + background-position: -653px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_dilatoryDistress3 { background-image: url(spritesmith-main-5.png); - background-position: -751px -1585px; + background-position: -800px -1585px; width: 48px; height: 51px; } @@ -1566,271 +1566,271 @@ } .inventory_quest_scroll_dilatory_derby { background-image: url(spritesmith-main-5.png); - background-position: -506px -1585px; + background-position: -555px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_egg { background-image: url(spritesmith-main-5.png); - background-position: -800px -1585px; + background-position: -849px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_evilsanta { background-image: url(spritesmith-main-5.png); - background-position: -849px -1585px; + background-position: -898px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_evilsanta2 { background-image: url(spritesmith-main-5.png); - background-position: -898px -1585px; + background-position: -947px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_frog { background-image: url(spritesmith-main-5.png); - background-position: -947px -1585px; + background-position: -996px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_ghost_stag { background-image: url(spritesmith-main-5.png); - background-position: -996px -1585px; + background-position: -1045px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight1 { background-image: url(spritesmith-main-5.png); - background-position: -1094px -1585px; + background-position: -1143px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight1_locked { background-image: url(spritesmith-main-5.png); - background-position: -1045px -1585px; + background-position: -1094px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight2 { background-image: url(spritesmith-main-5.png); - background-position: -1192px -1585px; + background-position: -1241px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight2_locked { background-image: url(spritesmith-main-5.png); - background-position: -1143px -1585px; + background-position: -1192px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight3 { background-image: url(spritesmith-main-5.png); - background-position: -1290px -1585px; + background-position: -1339px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_goldenknight3_locked { background-image: url(spritesmith-main-5.png); - background-position: -1241px -1585px; + background-position: -1290px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_gryphon { background-image: url(spritesmith-main-5.png); - background-position: -1339px -1585px; + background-position: -1388px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_harpy { background-image: url(spritesmith-main-5.png); - background-position: -1388px -1585px; + background-position: -1437px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_hedgehog { background-image: url(spritesmith-main-5.png); - background-position: -1437px -1585px; + background-position: -1486px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_horse { background-image: url(spritesmith-main-5.png); - background-position: -1486px -1585px; + background-position: -1535px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_kraken { background-image: url(spritesmith-main-5.png); - background-position: -1535px -1585px; + background-position: -1584px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_monkey { background-image: url(spritesmith-main-5.png); - background-position: -1584px -1585px; + background-position: -1633px -1585px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone1 { background-image: url(spritesmith-main-5.png); - background-position: 0px -1640px; + background-position: -49px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone1_locked { background-image: url(spritesmith-main-5.png); - background-position: -1633px -1585px; + background-position: 0px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone2 { background-image: url(spritesmith-main-5.png); - background-position: -98px -1640px; + background-position: -147px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone2_locked { background-image: url(spritesmith-main-5.png); - background-position: -49px -1640px; + background-position: -98px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone3 { background-image: url(spritesmith-main-5.png); - background-position: -196px -1640px; + background-position: -245px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_moonstone3_locked { background-image: url(spritesmith-main-5.png); - background-position: -147px -1640px; + background-position: -196px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_octopus { background-image: url(spritesmith-main-5.png); - background-position: -245px -1640px; + background-position: -294px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_owl { background-image: url(spritesmith-main-5.png); - background-position: -294px -1640px; + background-position: -343px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_penguin { background-image: url(spritesmith-main-5.png); - background-position: -343px -1640px; + background-position: -392px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_rat { background-image: url(spritesmith-main-5.png); - background-position: -392px -1640px; + background-position: -441px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_rock { background-image: url(spritesmith-main-5.png); - background-position: -441px -1640px; + background-position: -490px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_rooster { background-image: url(spritesmith-main-5.png); - background-position: -490px -1640px; + background-position: -539px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_sabretooth { background-image: url(spritesmith-main-5.png); - background-position: -539px -1640px; + background-position: -588px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_sheep { background-image: url(spritesmith-main-5.png); - background-position: -588px -1640px; + background-position: -637px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_slime { background-image: url(spritesmith-main-5.png); - background-position: -637px -1640px; + background-position: -686px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_snake { background-image: url(spritesmith-main-5.png); - background-position: -686px -1640px; + background-position: -735px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_spider { background-image: url(spritesmith-main-5.png); - background-position: -735px -1640px; + background-position: -784px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_trex { background-image: url(spritesmith-main-5.png); - background-position: -833px -1640px; + background-position: -882px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_trex_undead { background-image: url(spritesmith-main-5.png); - background-position: -784px -1640px; + background-position: -833px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_unicorn { background-image: url(spritesmith-main-5.png); - background-position: -882px -1640px; + background-position: -931px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice1 { background-image: url(spritesmith-main-5.png); - background-position: -980px -1640px; + background-position: -1029px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice1_locked { background-image: url(spritesmith-main-5.png); - background-position: -931px -1640px; + background-position: -980px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice2 { background-image: url(spritesmith-main-5.png); - background-position: -1078px -1640px; + background-position: -1127px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice2_locked { background-image: url(spritesmith-main-5.png); - background-position: -1029px -1640px; + background-position: -1078px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice3 { background-image: url(spritesmith-main-5.png); - background-position: -1176px -1640px; + background-position: -1225px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_vice3_locked { background-image: url(spritesmith-main-5.png); - background-position: -1127px -1640px; + background-position: -1176px -1640px; width: 48px; height: 51px; } .inventory_quest_scroll_whale { background-image: url(spritesmith-main-5.png); - background-position: -1225px -1640px; + background-position: -1274px -1640px; width: 48px; height: 51px; } @@ -1884,7 +1884,7 @@ } .quest_dilatoryDistress1_blueFins { background-image: url(spritesmith-main-5.png); - background-position: -1274px -1640px; + background-position: -1323px -1640px; width: 51px; height: 48px; } @@ -1956,7 +1956,7 @@ } .quest_goldenknight1_testimony { background-image: url(spritesmith-main-5.png); - background-position: -1417px -1092px; + background-position: -65px -1585px; width: 48px; height: 51px; } diff --git a/common/dist/sprites/spritesmith-main-5.png b/common/dist/sprites/spritesmith-main-5.png index 3f4be2f186..97c09ace08 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_bailey.png b/common/img/sprites/spritesmith/npcs/npc_bailey.png index 385d1548f6..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/website/views/options/inventory/drops.jade b/website/views/options/inventory/drops.jade index 811ce6f42d..0062c5ac02 100644 --- a/website/views/options/inventory/drops.jade +++ b/website/views/options/inventory/drops.jade @@ -205,7 +205,7 @@ p | 20  span.shop_gold - div(ng-repeat='type in Content.cardTypes', ng-show='type.yearRound || type.key === "valentine"') + div(ng-repeat='type in Content.cardTypes', ng-show='type.yearRound') button.customize-option(class='inventory_special_{{::type.key}}', popover='{{::Content.spells.special[type.key].notes()}}', popover-title='{{::Content.spells.special[type.key].text()}}',