diff --git a/website/client/assets/css/sprites.css b/website/client/assets/css/sprites.css index 906e3bc5a2..53fe4464fc 100755 --- a/website/client/assets/css/sprites.css +++ b/website/client/assets/css/sprites.css @@ -10,6 +10,12 @@ height: 219px; } +.Pet_HatchingPotion_Veggie { + background: url("~assets/images/Pet_HatchingPotion_Veggie.gif") no-repeat; + width: 68px; + height: 68px; +} + .Gems { display:inline-block; margin-right:5px; diff --git a/website/client/assets/css/sprites/spritesmith-main-11.css b/website/client/assets/css/sprites/spritesmith-main-11.css index e32d458640..5e96278d67 100644 --- a/website/client/assets/css/sprites/spritesmith-main-11.css +++ b/website/client/assets/css/sprites/spritesmith-main-11.css @@ -1,294 +1,294 @@ .shop_weapon_rogue_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1100px -875px; + background-position: -1286px -1621px; width: 68px; height: 68px; } .shop_weapon_rogue_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1656px -1657px; + background-position: -1749px -1587px; width: 68px; height: 68px; } .shop_weapon_rogue_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1100px -944px; + background-position: -1355px -1621px; width: 68px; height: 68px; } .shop_weapon_rogue_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1100px -1013px; + background-position: -1424px -1621px; width: 68px; height: 68px; } .shop_weapon_special_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1304px -1195px; + background-position: -1493px -1621px; width: 68px; height: 68px; } .shop_weapon_special_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1547px -1566px; + background-position: -1562px -1621px; width: 68px; height: 68px; } .shop_weapon_special_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1657px; + background-position: -1631px -1621px; width: 68px; height: 68px; } .shop_weapon_special_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -69px -1657px; + background-position: -1749px 0px; width: 68px; height: 68px; } .shop_weapon_special_aetherCrystals { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -138px -1657px; + background-position: -1749px -69px; width: 68px; height: 68px; } .shop_weapon_special_bardInstrument { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -207px -1657px; + background-position: -1749px -138px; width: 68px; height: 68px; } .shop_weapon_special_critical { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -276px -1657px; + background-position: -1749px -207px; width: 68px; height: 68px; } .shop_weapon_special_fencingFoil { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -345px -1657px; + background-position: -1749px -276px; width: 68px; height: 68px; } .shop_weapon_special_lunarScythe { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -414px -1657px; + background-position: -1749px -345px; width: 68px; height: 68px; } .shop_weapon_special_mammothRiderSpear { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -483px -1657px; + background-position: -1749px -414px; width: 68px; height: 68px; } .shop_weapon_special_nomadsScimitar { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -552px -1657px; + background-position: -1749px -483px; width: 68px; height: 68px; } .shop_weapon_special_pageBanner { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -621px -1657px; + background-position: -1749px -552px; width: 68px; height: 68px; } .shop_weapon_special_roguishRainbowMessage { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -945px; + background-position: -880px -724px; width: 68px; height: 68px; } .shop_weapon_special_skeletonKey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1083px; + background-position: -1100px -875px; width: 68px; height: 68px; } .shop_weapon_special_tachi { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1152px; + background-position: -1100px -944px; width: 68px; height: 68px; } .shop_weapon_special_taskwoodsLantern { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1290px; + background-position: -1304px -1195px; width: 68px; height: 68px; } .shop_weapon_special_tridentOfCrashingTides { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1359px; + background-position: -1583px -1466px; width: 68px; height: 68px; } .shop_weapon_warrior_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1428px; + background-position: -182px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1566px; + background-position: -320px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1582px -371px; + background-position: -458px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1582px -440px; + background-position: -527px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1573px -637px; + background-position: -596px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -203px; + background-position: -665px -1621px; width: 68px; height: 68px; } .shop_weapon_warrior_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -272px; + background-position: -734px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -341px; + background-position: -803px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -660px -435px; + background-position: -872px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -660px -504px; + background-position: -941px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -660px -573px; + background-position: -1010px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -880px -655px; + background-position: -1079px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -880px -724px; + background-position: -1148px -1621px; width: 68px; height: 68px; } .shop_weapon_wizard_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -880px -793px; + background-position: -1217px -1621px; width: 68px; height: 68px; } .weapon_healer_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -819px -1566px; + background-position: -1658px -91px; width: 90px; height: 90px; } .weapon_healer_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -910px -1566px; + background-position: -1658px -182px; width: 90px; height: 90px; } .weapon_healer_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1092px -1566px; + background-position: -91px -1621px; width: 90px; height: 90px; } .weapon_healer_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1001px -1566px; + background-position: 0px -1621px; width: 90px; height: 90px; } .weapon_healer_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -637px -1566px; + background-position: -1658px -1456px; width: 90px; height: 90px; } .weapon_healer_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -273px -1566px; + background-position: -1658px -1274px; width: 90px; height: 90px; } .weapon_healer_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1566px; + background-position: -1658px -1183px; width: 90px; height: 90px; } .weapon_rogue_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1474px -1466px; + background-position: -1658px -1092px; width: 90px; height: 90px; } .weapon_rogue_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1201px -1466px; + background-position: -1658px -910px; width: 90px; height: 90px; } .weapon_rogue_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1110px -1466px; + background-position: -1658px -819px; width: 90px; height: 90px; } .weapon_rogue_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -837px -1466px; + background-position: -1658px -728px; width: 90px; height: 90px; } .weapon_rogue_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -746px -1466px; + background-position: -1658px -637px; width: 90px; height: 90px; } .weapon_rogue_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -655px -1466px; + background-position: -1658px -546px; width: 90px; height: 90px; } .weapon_rogue_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -473px -1466px; + background-position: -1658px -455px; width: 90px; height: 90px; } @@ -300,13 +300,13 @@ } .weapon_special_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -200px -1466px; + background-position: -1492px -1466px; width: 90px; height: 90px; } .weapon_special_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1428px -1315px; + background-position: -1310px -1466px; width: 90px; height: 90px; } @@ -318,19 +318,19 @@ } .weapon_special_bardInstrument { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1155px -1315px; + background-position: -946px -1466px; width: 90px; height: 90px; } .weapon_special_fencingFoil { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1064px -1315px; + background-position: -855px -1466px; width: 90px; height: 90px; } .weapon_special_lunarScythe { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -973px -1315px; + background-position: -764px -1466px; width: 90px; height: 90px; } @@ -342,181 +342,181 @@ } .weapon_special_nomadsScimitar { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1365px -1566px; + background-position: -582px -1466px; width: 90px; height: 90px; } .weapon_special_pageBanner { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1274px -1566px; + background-position: -491px -1466px; width: 90px; height: 90px; } .weapon_special_roguishRainbowMessage { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -728px -1566px; + background-position: -400px -1466px; width: 90px; height: 90px; } .weapon_special_skeletonKey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -182px -1566px; + background-position: -309px -1466px; width: 90px; height: 90px; } .weapon_special_tachi { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1337px -1315px; + background-position: -1519px -1315px; width: 90px; height: 90px; } .weapon_special_taskwoodsLantern { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -364px -1566px; + background-position: -1428px -1315px; width: 90px; height: 90px; } .weapon_special_tridentOfCrashingTides { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -455px -1566px; + background-position: -1337px -1315px; width: 90px; height: 90px; } .weapon_warrior_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -546px -1566px; + background-position: -1246px -1315px; width: 90px; height: 90px; } .weapon_warrior_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1183px -1566px; + background-position: -1155px -1315px; width: 90px; height: 90px; } .weapon_warrior_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -700px -1315px; + background-position: -1064px -1315px; width: 90px; height: 90px; } .weapon_warrior_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1246px -1315px; + background-position: -973px -1315px; width: 90px; height: 90px; } .weapon_warrior_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1519px -1315px; + background-position: -700px -1315px; width: 90px; height: 90px; } .weapon_warrior_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -291px -1466px; + background-position: -1658px -1365px; width: 90px; height: 90px; } .weapon_warrior_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -382px -1466px; + background-position: -1658px -1001px; width: 90px; height: 90px; } .weapon_wizard_0 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -564px -1466px; + background-position: -1658px -364px; width: 90px; height: 90px; } .weapon_wizard_1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -928px -1466px; + background-position: -1401px -1466px; width: 90px; height: 90px; } .weapon_wizard_2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1019px -1466px; + background-position: -1658px -273px; width: 90px; height: 90px; } .weapon_wizard_3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1292px -1466px; + background-position: -673px -1466px; width: 90px; height: 90px; } .weapon_wizard_4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1383px -1466px; + background-position: -1037px -1466px; width: 90px; height: 90px; } .weapon_wizard_5 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1565px -1466px; + background-position: -1128px -1466px; width: 90px; height: 90px; } .weapon_wizard_6 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -91px -1566px; + background-position: -1219px -1466px; width: 90px; height: 90px; } .Pet_Currency_Gem { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1014px; + background-position: -880px -793px; width: 68px; height: 68px; } .Pet_Currency_Gem1x { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1831px -197px; + background-position: -1727px -1599px; width: 15px; height: 13px; } .Pet_Currency_Gem2x { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -609px; + background-position: -1615px -984px; width: 30px; height: 26px; } .PixelPaw-Gold { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -197px; + background-position: -1597px -1012px; width: 51px; height: 51px; } .PixelPaw { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -249px; + background-position: -1597px -1064px; width: 51px; height: 51px; } .PixelPaw002 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -301px; + background-position: -138px -1712px; width: 51px; height: 51px; } .avatar_floral_healer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1558px -1144px; + background-position: -1558px -1154px; width: 99px; height: 99px; } .avatar_floral_rogue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -100px -1466px; + background-position: -209px -1466px; width: 99px; height: 99px; } .avatar_floral_warrior { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1466px; + background-position: -109px -1466px; width: 99px; height: 99px; } @@ -528,199 +528,199 @@ } .empty_bottles { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -142px; + background-position: -1749px -1656px; width: 64px; height: 54px; } .ghost { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1456px -1566px; + background-position: -1658px 0px; width: 90px; height: 90px; } .inventory_present { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1518px -1657px; + background-position: -1749px -1449px; width: 68px; height: 68px; } .inventory_present_01 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -690px -1657px; + background-position: -1749px -621px; width: 68px; height: 68px; } .inventory_present_02 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -759px -1657px; + background-position: -1749px -690px; width: 68px; height: 68px; } .inventory_present_03 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -828px -1657px; + background-position: -1749px -759px; width: 68px; height: 68px; } .inventory_present_04 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -897px -1657px; + background-position: -1749px -828px; width: 68px; height: 68px; } .inventory_present_05 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -966px -1657px; + background-position: -1749px -897px; width: 68px; height: 68px; } .inventory_present_06 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1035px -1657px; + background-position: -1749px -966px; width: 68px; height: 68px; } .inventory_present_07 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1104px -1657px; + background-position: -1749px -1035px; width: 68px; height: 68px; } .inventory_present_08 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1173px -1657px; + background-position: -1749px -1104px; width: 68px; height: 68px; } .inventory_present_09 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1242px -1657px; + background-position: -1749px -1173px; width: 68px; height: 68px; } .inventory_present_10 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1311px -1657px; + background-position: -1749px -1242px; width: 68px; height: 68px; } .inventory_present_11 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1380px -1657px; + background-position: -1749px -1311px; width: 68px; height: 68px; } .inventory_present_12 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1449px -1657px; + background-position: -1749px -1380px; width: 68px; height: 68px; } .inventory_special_birthday { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1587px -1657px; + background-position: -1749px -1518px; width: 68px; height: 68px; } .inventory_special_congrats { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px 0px; + background-position: -69px -1712px; width: 68px; height: 68px; } .inventory_special_fortify { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -48px; + background-position: 0px -1712px; width: 68px; height: 68px; } .inventory_special_getwell { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -117px; + background-position: -1658px -1547px; width: 68px; height: 68px; } .inventory_special_goodluck { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -186px; + background-position: -1582px -411px; width: 68px; height: 68px; } .inventory_special_greeting { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -255px; + background-position: -1573px -516px; width: 68px; height: 68px; } .inventory_special_nye { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -324px; + background-position: -1573px -585px; width: 68px; height: 68px; } .inventory_special_opaquePotion { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -393px; + background-position: -1573px -654px; width: 68px; height: 68px; } .inventory_special_seafoam { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -462px; + background-position: -220px -203px; width: 68px; height: 68px; } .inventory_special_shinySeed { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -531px; + background-position: -220px -272px; width: 68px; height: 68px; } .inventory_special_snowball { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -600px; + background-position: -220px -341px; width: 68px; height: 68px; } .inventory_special_spookySparkles { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -669px; + background-position: -660px -435px; width: 68px; height: 68px; } .inventory_special_thankyou { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -738px; + background-position: -660px -504px; width: 68px; height: 68px; } .inventory_special_trinket { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -807px; + background-position: -660px -573px; width: 68px; height: 68px; } .inventory_special_valentine { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -876px; + background-position: -880px -655px; width: 68px; height: 68px; } .knockout { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px 0px; + background-position: -109px -1566px; width: 120px; height: 47px; } .pet_key { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1221px; + background-position: -1100px -1013px; width: 68px; height: 68px; } .rebirth_orb { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1497px; + background-position: -251px -1621px; width: 68px; height: 68px; } @@ -732,7 +732,7 @@ } .shop_armoire { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1582px -302px; + background-position: -389px -1621px; width: 68px; height: 68px; } @@ -744,133 +744,133 @@ } .zzz { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -394px; + background-position: -1615px -914px; width: 40px; height: 40px; } .zzz_light { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -353px; + background-position: -1615px -873px; width: 40px; height: 40px; } .notif_inventory_present_01 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -522px; + background-position: -1626px -1116px; width: 28px; height: 28px; } .notif_inventory_present_02 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -435px; + background-position: -1620px -724px; width: 28px; height: 28px; } .notif_inventory_present_03 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -580px; + background-position: -1616px -1254px; width: 28px; height: 28px; } .notif_inventory_present_04 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -551px; + background-position: -1587px -1254px; width: 28px; height: 28px; } .notif_inventory_present_05 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -551px; + background-position: -1558px -1254px; width: 28px; height: 28px; } .notif_inventory_present_06 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -522px; + background-position: -1620px -753px; width: 28px; height: 28px; } .notif_inventory_present_07 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -435px; + background-position: -1597px -1116px; width: 28px; height: 28px; } .notif_inventory_present_08 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -493px; + background-position: -1615px -955px; width: 28px; height: 28px; } .notif_inventory_present_09 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -493px; + background-position: -1620px -840px; width: 28px; height: 28px; } .notif_inventory_present_10 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -464px; + background-position: -1620px -811px; width: 28px; height: 28px; } .notif_inventory_present_11 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -464px; + background-position: -1620px -782px; width: 28px; height: 28px; } .notif_inventory_present_12 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1808px -580px; + background-position: -1373px -1195px; width: 28px; height: 28px; } .notif_inventory_special_birthday { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1800px -636px; + background-position: -573px -407px; width: 20px; height: 24px; } .notif_inventory_special_congrats { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1821px -636px; + background-position: -594px -407px; width: 20px; height: 22px; } .notif_inventory_special_getwell { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -661px; + background-position: -615px -407px; width: 20px; height: 22px; } .notif_inventory_special_goodluck { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1820px -394px; + background-position: -1727px -1547px; width: 20px; height: 26px; } .notif_inventory_special_greeting { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1800px -661px; + background-position: -636px -407px; width: 20px; height: 22px; } .notif_inventory_special_nye { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1820px -353px; + background-position: -527px -407px; width: 24px; height: 26px; } .notif_inventory_special_thankyou { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1810px -609px; + background-position: -552px -407px; width: 20px; height: 24px; } .notif_inventory_special_valentine { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -636px; + background-position: -1727px -1574px; width: 20px; height: 24px; } @@ -882,21 +882,21 @@ } .npc_bailey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1779px -69px; - width: 60px; - height: 72px; + background-position: -1582px -302px; + width: 55px; + height: 108px; } .npc_justin { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1573px -516px; - width: 84px; - height: 120px; + background-position: 0px -1466px; + width: 108px; + height: 154px; } .npc_matt { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px -863px; - width: 195px; - height: 138px; + background-position: -1407px -724px; + width: 212px; + height: 148px; } .background_dysheartener { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); @@ -906,7 +906,7 @@ } .banner_flair_dysheartener { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1658px -1635px; + background-position: -1582px -480px; width: 69px; height: 18px; } @@ -924,19 +924,19 @@ } .quest_armadillo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -435px; + background-position: 0px -655px; width: 219px; height: 219px; } .quest_atom1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px -151px; + background-position: -1407px 0px; width: 250px; height: 150px; } .quest_atom2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px -724px; + background-position: -1407px -873px; width: 207px; height: 138px; } @@ -948,19 +948,19 @@ } .quest_axolotl { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -435px; + background-position: -440px -435px; width: 219px; height: 219px; } .quest_badger { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -527px 0px; + background-position: -220px -435px; width: 219px; height: 219px; } .quest_basilist { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px -1002px; + background-position: -1407px -1012px; width: 189px; height: 141px; } @@ -978,13 +978,13 @@ } .quest_butterfly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -875px; + background-position: -1187px -660px; width: 219px; height: 219px; } .quest_cheetah { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -440px -435px; + background-position: -660px -875px; width: 219px; height: 219px; } @@ -996,7 +996,7 @@ } .quest_dilatory { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -747px -220px; + background-position: -967px -220px; width: 219px; height: 219px; } @@ -1014,19 +1014,19 @@ } .quest_dilatoryDistress3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -655px; + background-position: 0px -875px; width: 219px; height: 219px; } .quest_dilatory_derby { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -747px 0px; + background-position: -660px -655px; width: 219px; height: 219px; } .quest_dustbunnies { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -655px; + background-position: -220px -875px; width: 219px; height: 219px; } @@ -1044,19 +1044,19 @@ } .quest_evilsanta2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -440px -655px; + background-position: -440px -875px; width: 219px; height: 219px; } .quest_falcon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -660px -655px; + background-position: -307px 0px; width: 219px; height: 219px; } .quest_ferret { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -967px 0px; + background-position: -880px -875px; width: 219px; height: 219px; } @@ -1068,19 +1068,19 @@ } .quest_ghost_stag { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -967px -220px; + background-position: -1187px -220px; width: 219px; height: 219px; } .quest_goldenknight1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -967px -440px; + background-position: -1187px -440px; width: 219px; height: 219px; } .quest_goldenknight2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px 0px; + background-position: -1407px -151px; width: 250px; height: 150px; } @@ -1098,13 +1098,13 @@ } .quest_guineapig { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -220px -875px; + background-position: -1187px 0px; width: 219px; height: 219px; } .quest_harpy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -440px -875px; + background-position: -967px -440px; width: 219px; height: 219px; } @@ -1116,19 +1116,19 @@ } .quest_hippo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -660px -875px; + background-position: -440px -655px; width: 219px; height: 219px; } .quest_horse { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -880px -875px; + background-position: -220px -655px; width: 219px; height: 219px; } .quest_kangaroo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1187px 0px; + background-position: -747px -220px; width: 219px; height: 219px; } @@ -1140,25 +1140,25 @@ } .quest_lostMasterclasser1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1187px -220px; + background-position: -747px 0px; width: 219px; height: 219px; } .quest_lostMasterclasser2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1187px -440px; + background-position: 0px -435px; width: 219px; height: 219px; } .quest_lostMasterclasser3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1187px -660px; + background-position: -527px 0px; width: 219px; height: 219px; } .quest_mayhemMistiflying1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1407px -1144px; + background-position: -1407px -1154px; width: 150px; height: 150px; } @@ -1170,7 +1170,7 @@ } .quest_mayhemMistiflying3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -307px 0px; + background-position: -967px 0px; width: 219px; height: 219px; } diff --git a/website/client/assets/images/sprites/spritesmith-main-11.png b/website/client/assets/images/sprites/spritesmith-main-11.png index 65ffd51fa6..f83dc2c11f 100644 Binary files a/website/client/assets/images/sprites/spritesmith-main-11.png and b/website/client/assets/images/sprites/spritesmith-main-11.png differ diff --git a/website/client/components/inventory/stable/index.vue b/website/client/components/inventory/stable/index.vue index 8e28554320..0fde846804 100644 --- a/website/client/components/inventory/stable/index.vue +++ b/website/client/components/inventory/stable/index.vue @@ -98,7 +98,7 @@ @click="selectPet(context.item)" ) - .btn.btn-flat.btn-show-more(@click="setShowMore(petGroup.key)", v-if='petGroup.key !== "specialPets"') + .btn.btn-flat.btn-show-more(@click="setShowMore(petGroup.key)", v-if='petGroup.key !== "specialPets" && petGroup.key !== "wackyPets"') | {{ $_openedItemRows_isToggled(petGroup.key) ? $t('showLess') : $t('showMore') }} h2 @@ -462,6 +462,14 @@ potions: this.content.dropHatchingPotions, }, }, + { + label: this.$t('filterByWacky'), + key: 'wackyPets', + petSource: { + eggs: this.content.dropEggs, + potions: this.content.wackyHatchingPotions, + }, + }, { label: this.$t('special'), key: 'specialPets', diff --git a/website/client/libs/createAnimal.js b/website/client/libs/createAnimal.js index d2f273b3b6..4c0dd8772d 100644 --- a/website/client/libs/createAnimal.js +++ b/website/client/libs/createAnimal.js @@ -2,6 +2,7 @@ import content from 'common/script/content'; const specialPets = Object.keys(content.specialPets); +const wackyPets = Object.keys(content.wackyPets); function getText (textOrFunction) { if (textOrFunction instanceof Function) { @@ -23,6 +24,7 @@ export function isHatchable (animal, userItems) { export function isAllowedToFeed (animal, userItems) { return !specialPets.includes(animal.key) && + !wackyPets.includes(animal.key) && isOwned('pet', animal, userItems) && !isOwned('mount', animal, userItems); } @@ -59,4 +61,3 @@ export function createAnimal (egg, potion, type, _content, userItems) { }, }; } - diff --git a/website/common/locales/en/content.json b/website/common/locales/en/content.json index b30e6eb8e4..8ad0e536ac 100644 --- a/website/common/locales/en/content.json +++ b/website/common/locales/en/content.json @@ -281,6 +281,7 @@ "hatchingPotionIcySnow": "Icy Snow", "hatchingPotionRoseQuartz": "Rose Quartz", "hatchingPotionCelestial": "Celestial", + "hatchingPotionVeggie": "Veggie", "hatchingPotionNotes": "Pour this on an egg, and it will hatch as a <%= potText(locale) %> pet.", "premiumPotionAddlNotes": "Not usable on quest pet eggs.", diff --git a/website/common/locales/en/pets.json b/website/common/locales/en/pets.json index 03096ba705..c629c7bd53 100644 --- a/website/common/locales/en/pets.json +++ b/website/common/locales/en/pets.json @@ -7,6 +7,7 @@ "magicPets": "Magic Potion Pets", "rarePets": "Rare Pets", "questPets": "Quest Pets", + "wackyPets": "Wacky Pets", "mounts": "Mounts", "activeMount": "Active Mount", "noActiveMount": "No Active Mount", @@ -129,6 +130,7 @@ "filterByStandard": "Standard", "filterByMagicPotion": "Magic Potion", "filterByQuest": "Quest", + "filterByWacky": "Wacky", "standard": "Standard", "sortByColor": "Color", "sortByHatchable": "Hatchable", diff --git a/website/common/script/content/hatching-potions.js b/website/common/script/content/hatching-potions.js index d4395c8fcb..523edaf08b 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -170,6 +170,14 @@ let premium = { }, }; +const wacky = { + Veggie: { + text: t('hatchingPotionVeggie'), + limited: true, + _season: 'March', + }, +}; + each(drops, (pot, key) => { defaults(pot, { key, @@ -203,10 +211,29 @@ each(premium, (pot, key) => { }); }); -let all = assign({}, drops, premium); +each(wacky, (pot, key) => { + defaults(pot, { + key, + value: 2, + notes: t('hatchingPotionNotes', { + potText: pot.text, + }), + _addlNotes: t('eventAvailability', { + date: t(`dateEnd${pot._season}`), + }), + premium: false, + limited: true, + canBuy () { + return pot._season === CURRENT_SEASON; + }, + }); +}); + +let all = assign({}, drops, premium, wacky); module.exports = { drops, premium, + wacky, all, }; diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index 09c8e9fda5..e452f1b4bb 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -356,12 +356,14 @@ api.timeTravelStable = { api.dropHatchingPotions = hatchingPotions.drops; api.premiumHatchingPotions = hatchingPotions.premium; +api.wackyHatchingPotions = hatchingPotions.wacky; api.hatchingPotions = hatchingPotions.all; api.pets = stable.dropPets; api.premiumPets = stable.premiumPets; api.questPets = stable.questPets; api.specialPets = stable.specialPets; +api.wackyPets = stable.wackyPets; api.petInfo = stable.petInfo; api.mounts = stable.dropMounts; diff --git a/website/common/script/content/stable.js b/website/common/script/content/stable.js index 1c758b2714..bee75eea94 100644 --- a/website/common/script/content/stable.js +++ b/website/common/script/content/stable.js @@ -6,6 +6,7 @@ import { import { drops as dropPotions, premium as premiumPotions, + wacky as wackyPotions, } from './hatching-potions'; import t from './translation'; @@ -47,9 +48,38 @@ function constructSet (type, eggs, potions) { return [pets, mounts]; } +function constructPetOnlySet (type, eggs, potions) { + let pets = {}; + + each(eggs, (egg) => { + each(potions, (potion) => { + let key = `${egg.key}-${potion.key}`; + + function getAnimalData (text) { + return { + key, + type, + potion: potion.key, + egg: egg.key, + text, + }; + } + + petInfo[key] = getAnimalData(t('petName', { + potion: potion.text, + egg: egg.text, + })); + pets[key] = true; + }); + }); + + return pets; +} + let [dropPets, dropMounts] = constructSet('drop', dropEggs, dropPotions); let [premiumPets, premiumMounts] = constructSet('premium', dropEggs, premiumPotions); let [questPets, questMounts] = constructSet('quest', questEggs, dropPotions); +let wackyPets = constructPetOnlySet('wacky', dropEggs, wackyPotions); let specialPets = { 'Wolf-Veteran': 'veteranWolf', @@ -113,6 +143,7 @@ module.exports = { dropPets, premiumPets, questPets, + wackyPets, dropMounts, questMounts, premiumMounts, diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index 42871628c8..47504c1e64 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -316,7 +316,8 @@ let schema = new Schema({ // Then add additional pets (quest, backer, contributor, premium) _.transform(shared.content.questPets, (m, v, k) => m[k] = Number), _.transform(shared.content.specialPets, (m, v, k) => m[k] = Number), - _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Number) + _.transform(shared.content.premiumPets, (m, v, k) => m[k] = Number), + _.transform(shared.content.wackyPets, (m, v, k) => m[k] = Number) ), currentPet: String, // Cactus-Desert