diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index 99c4c366d8..d413a4a5fe 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -4,6 +4,12 @@ width: 141px; height: 441px; } +.promo_bundle_cuddleBuddies { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -426px -587px; + width: 141px; + height: 441px; +} .promo_ios { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: -532px 0px; @@ -12,7 +18,7 @@ } .promo_mystery_201804 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -340px -383px; + background-position: -1099px -296px; width: 114px; height: 90px; } @@ -24,19 +30,19 @@ } .promo_seasonalshop_spring { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -340px -244px; + background-position: -858px -492px; width: 162px; height: 138px; } .promo_shimmer_pastel { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -426px -735px; + background-position: -858px -148px; width: 354px; height: 147px; } .promo_shiny_seeds { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -426px -587px; + background-position: -858px 0px; width: 360px; height: 147px; } @@ -48,10 +54,16 @@ } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -340px -474px; + background-position: -1099px -387px; width: 114px; height: 87px; } +.scene_casting_spells { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -532px -337px; + width: 312px; + height: 222px; +} .scene_positivity { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px 0px; @@ -60,7 +72,7 @@ } .scene_todos { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -532px -337px; + background-position: -858px -296px; width: 240px; height: 195px; } diff --git a/website/client/assets/css/sprites/spritesmith-main-11.css b/website/client/assets/css/sprites/spritesmith-main-11.css index 583746a421..1ab208529f 100644 --- a/website/client/assets/css/sprites/spritesmith-main-11.css +++ b/website/client/assets/css/sprites/spritesmith-main-11.css @@ -144,7 +144,7 @@ } .quest_egg_plainEgg { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -946px -1607px; + background-position: -1015px -1607px; width: 48px; height: 51px; } @@ -216,7 +216,7 @@ } .quest_stoikalmCalamity2_icicleCoin { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -897px -1607px; + background-position: -966px -1607px; width: 48px; height: 51px; } @@ -240,307 +240,307 @@ } .quest_vice2_lightCrystal { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -995px -1607px; + background-position: -1064px -1607px; width: 40px; height: 40px; } .inventory_quest_scroll_armadillo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -483px -1400px; + background-position: -621px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -690px -1400px; + background-position: -759px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom1_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -621px -1400px; + background-position: -690px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -828px -1400px; + background-position: -897px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom2_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -759px -1400px; + background-position: -828px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -966px -1400px; + background-position: -1035px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_atom3_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -897px -1400px; + background-position: -966px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_axolotl { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1035px -1400px; + background-position: -1104px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_badger { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1104px -1400px; + background-position: -1173px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_basilist { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1173px -1400px; + background-position: -1242px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_beetle { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1242px -1400px; + background-position: -1311px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_bunny { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1311px -1400px; + background-position: -1380px -1400px; width: 68px; height: 68px; } .inventory_quest_scroll_butterfly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1380px -1400px; + background-position: -1515px 0px; width: 68px; height: 68px; } .inventory_quest_scroll_cheetah { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px 0px; + background-position: -1515px -69px; width: 68px; height: 68px; } .inventory_quest_scroll_cow { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -828px -1607px; + background-position: -897px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatoryDistress1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -690px -1607px; + background-position: -759px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatoryDistress2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -552px -1607px; + background-position: -621px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatoryDistress2_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -621px -1607px; + background-position: -690px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatoryDistress3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -414px -1607px; + background-position: -483px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatoryDistress3_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -483px -1607px; + background-position: -552px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dilatory_derby { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -759px -1607px; + background-position: -828px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_dustbunnies { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -345px -1607px; + background-position: -414px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_egg { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -276px -1607px; + background-position: -345px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_evilsanta { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -207px -1607px; + background-position: -276px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_evilsanta2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -138px -1607px; + background-position: -207px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_falcon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -69px -1607px; + background-position: -138px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_ferret { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1607px; + background-position: -69px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_frog { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1518px; + background-position: 0px -1607px; width: 68px; height: 68px; } .inventory_quest_scroll_ghost_stag { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1449px; + background-position: -1653px -1518px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1311px; + background-position: -1653px -1380px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight1_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1380px; + background-position: -1653px -1449px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1173px; + background-position: -1653px -1242px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight2_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1242px; + background-position: -1653px -1311px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1035px; + background-position: -1653px -1104px; width: 68px; height: 68px; } .inventory_quest_scroll_goldenknight3_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -1104px; + background-position: -1653px -1173px; width: 68px; height: 68px; } .inventory_quest_scroll_gryphon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -966px; + background-position: -1653px -1035px; width: 68px; height: 68px; } .inventory_quest_scroll_guineapig { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -897px; + background-position: -1653px -966px; width: 68px; height: 68px; } .inventory_quest_scroll_harpy { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -828px; + background-position: -1653px -897px; width: 68px; height: 68px; } .inventory_quest_scroll_hedgehog { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -759px; + background-position: -1653px -828px; width: 68px; height: 68px; } .inventory_quest_scroll_hippo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -690px; + background-position: -1653px -759px; width: 68px; height: 68px; } .inventory_quest_scroll_horse { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -621px; + background-position: -1653px -690px; width: 68px; height: 68px; } .inventory_quest_scroll_kraken { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -552px; + background-position: -1653px -621px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser1 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -414px; + background-position: -1653px -483px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser1_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -483px; + background-position: -1653px -552px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser2 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -276px; + background-position: -1653px -345px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser2_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -345px; + background-position: -1653px -414px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser3 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -138px; + background-position: -1653px -207px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser3_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -207px; + background-position: -1653px -276px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser4 { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px 0px; + background-position: -1653px -69px; width: 68px; height: 68px; } .inventory_quest_scroll_lostMasterclasser4_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1653px -69px; + background-position: -1653px -138px; width: 68px; height: 68px; } @@ -558,7 +558,7 @@ } .inventory_quest_scroll_mayhemMistiflying2_locked { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -414px -1400px; + background-position: -483px -1400px; width: 68px; height: 68px; } @@ -898,132 +898,138 @@ width: 68px; height: 68px; } -.quest_bundle_farmFriends { +.quest_bundle_cuddleBuddies { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -345px; width: 68px; height: 68px; } -.quest_bundle_featheredFriends { +.quest_bundle_farmFriends { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -414px; width: 68px; height: 68px; } -.quest_bundle_hugabug { +.quest_bundle_featheredFriends { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -483px; width: 68px; height: 68px; } -.quest_bundle_splashyPals { +.quest_bundle_hugabug { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -552px; width: 68px; height: 68px; } -.quest_bundle_winterQuests { +.quest_bundle_splashyPals { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -621px; width: 68px; height: 68px; } -.quest_bundle_witchyFamiliars { +.quest_bundle_winterQuests { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -690px; width: 68px; height: 68px; } -.shop_gem { +.quest_bundle_witchyFamiliars { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -759px; width: 68px; height: 68px; } -.shop_opaquePotion { +.shop_gem { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -828px; width: 68px; height: 68px; } -.shop_potion { +.shop_opaquePotion { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -897px; width: 68px; height: 68px; } -.shop_seafoam { +.shop_potion { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -966px; width: 68px; height: 68px; } -.shop_shinySeed { +.shop_seafoam { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -1035px; width: 68px; height: 68px; } -.shop_snowball { +.shop_shinySeed { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -1104px; width: 68px; height: 68px; } -.shop_spookySparkles { +.shop_snowball { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -1173px; width: 68px; height: 68px; } -.shop_mounts_MagicalBee-Base { +.shop_spookySparkles { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -1242px; width: 68px; height: 68px; } -.shop_mounts_Mammoth-Base { +.shop_mounts_MagicalBee-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -1446px -1311px; width: 68px; height: 68px; } -.shop_mounts_MantisShrimp-Base { +.shop_mounts_Mammoth-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: 0px -1400px; width: 68px; height: 68px; } -.shop_mounts_Phoenix-Base { +.shop_mounts_MantisShrimp-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -69px -1400px; width: 68px; height: 68px; } -.shop_pets_MagicalBee-Base { +.shop_mounts_Phoenix-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -138px -1400px; width: 68px; height: 68px; } -.shop_pets_Mammoth-Base { +.shop_pets_MagicalBee-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -207px -1400px; width: 68px; height: 68px; } -.shop_pets_MantisShrimp-Base { +.shop_pets_Mammoth-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -276px -1400px; width: 68px; height: 68px; } -.shop_pets_Phoenix-Base { +.shop_pets_MantisShrimp-Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -345px -1400px; width: 68px; height: 68px; } +.shop_pets_Phoenix-Base { + background-image: url('~assets/images/sprites/spritesmith-main-11.png'); + background-position: -414px -1400px; + width: 68px; + height: 68px; +} .shop_backStab { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); background-position: -918px -792px; @@ -1032,13 +1038,13 @@ } .shop_brightness { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1060px -899px; + background-position: -1105px -1607px; width: 40px; height: 40px; } .shop_defensiveStance { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1036px -1607px; + background-position: -1060px -899px; width: 40px; height: 40px; } @@ -1122,523 +1128,523 @@ } .Pet_Egg_Armadillo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -69px; + background-position: -1515px -138px; width: 68px; height: 68px; } .Pet_Egg_Axolotl { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -138px; + background-position: -1515px -207px; width: 68px; height: 68px; } .Pet_Egg_Badger { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -207px; + background-position: -1515px -276px; width: 68px; height: 68px; } .Pet_Egg_BearCub { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -276px; + background-position: -1515px -345px; width: 68px; height: 68px; } .Pet_Egg_Beetle { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -345px; + background-position: -1515px -414px; width: 68px; height: 68px; } .Pet_Egg_Bunny { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -414px; + background-position: -1515px -483px; width: 68px; height: 68px; } .Pet_Egg_Butterfly { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -483px; + background-position: -1515px -552px; width: 68px; height: 68px; } .Pet_Egg_Cactus { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -552px; + background-position: -1515px -621px; width: 68px; height: 68px; } .Pet_Egg_Cheetah { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -621px; + background-position: -1515px -690px; width: 68px; height: 68px; } .Pet_Egg_Cow { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -690px; + background-position: -1515px -759px; width: 68px; height: 68px; } .Pet_Egg_Cuttlefish { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -759px; + background-position: -1515px -828px; width: 68px; height: 68px; } .Pet_Egg_Deer { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -828px; + background-position: -1515px -897px; width: 68px; height: 68px; } .Pet_Egg_Dragon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -897px; + background-position: -1515px -966px; width: 68px; height: 68px; } .Pet_Egg_Egg { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -966px; + background-position: -1515px -1035px; width: 68px; height: 68px; } .Pet_Egg_Falcon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1035px; + background-position: -1515px -1104px; width: 68px; height: 68px; } .Pet_Egg_Ferret { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1104px; + background-position: -1515px -1173px; width: 68px; height: 68px; } .Pet_Egg_FlyingPig { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1173px; + background-position: -1515px -1242px; width: 68px; height: 68px; } .Pet_Egg_Fox { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1242px; + background-position: -1515px -1311px; width: 68px; height: 68px; } .Pet_Egg_Frog { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1311px; + background-position: -1515px -1380px; width: 68px; height: 68px; } .Pet_Egg_Gryphon { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1515px -1380px; + background-position: 0px -1469px; width: 68px; height: 68px; } .Pet_Egg_GuineaPig { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1469px; + background-position: -69px -1469px; width: 68px; height: 68px; } .Pet_Egg_Hedgehog { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -69px -1469px; + background-position: -138px -1469px; width: 68px; height: 68px; } .Pet_Egg_Hippo { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -138px -1469px; + background-position: -207px -1469px; width: 68px; height: 68px; } .Pet_Egg_Horse { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -207px -1469px; + background-position: -276px -1469px; width: 68px; height: 68px; } .Pet_Egg_LionCub { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -276px -1469px; + background-position: -345px -1469px; width: 68px; height: 68px; } .Pet_Egg_Monkey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -345px -1469px; + background-position: -414px -1469px; width: 68px; height: 68px; } .Pet_Egg_Nudibranch { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -414px -1469px; + background-position: -483px -1469px; width: 68px; height: 68px; } .Pet_Egg_Octopus { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -483px -1469px; + background-position: -552px -1469px; width: 68px; height: 68px; } .Pet_Egg_Owl { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -552px -1469px; + background-position: -621px -1469px; width: 68px; height: 68px; } .Pet_Egg_PandaCub { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -621px -1469px; + background-position: -690px -1469px; width: 68px; height: 68px; } .Pet_Egg_Parrot { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -690px -1469px; + background-position: -759px -1469px; width: 68px; height: 68px; } .Pet_Egg_Peacock { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -759px -1469px; + background-position: -1340px -848px; width: 68px; height: 68px; } .Pet_Egg_Penguin { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1340px -848px; + background-position: -897px -1469px; width: 68px; height: 68px; } .Pet_Egg_PolarBear { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -897px -1469px; + background-position: -966px -1469px; width: 68px; height: 68px; } .Pet_Egg_Pterodactyl { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -966px -1469px; + background-position: -1035px -1469px; width: 68px; height: 68px; } .Pet_Egg_Rat { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1035px -1469px; + background-position: -1104px -1469px; width: 68px; height: 68px; } .Pet_Egg_Rock { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1104px -1469px; + background-position: -1173px -1469px; width: 68px; height: 68px; } .Pet_Egg_Rooster { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1173px -1469px; + background-position: -1242px -1469px; width: 68px; height: 68px; } .Pet_Egg_Sabretooth { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1242px -1469px; + background-position: -1311px -1469px; width: 68px; height: 68px; } .Pet_Egg_Seahorse { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1311px -1469px; + background-position: -1380px -1469px; width: 68px; height: 68px; } .Pet_Egg_Sheep { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1380px -1469px; + background-position: -1449px -1469px; width: 68px; height: 68px; } .Pet_Egg_Slime { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1449px -1469px; + background-position: -1584px 0px; width: 68px; height: 68px; } .Pet_Egg_Sloth { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px 0px; + background-position: -1584px -69px; width: 68px; height: 68px; } .Pet_Egg_Snail { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -69px; + background-position: -1584px -138px; width: 68px; height: 68px; } .Pet_Egg_Snake { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -138px; + background-position: -1584px -207px; width: 68px; height: 68px; } .Pet_Egg_Spider { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -207px; + background-position: -1584px -276px; width: 68px; height: 68px; } .Pet_Egg_Squirrel { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -276px; + background-position: -1584px -345px; width: 68px; height: 68px; } .Pet_Egg_TRex { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -483px; + background-position: -1584px -552px; width: 68px; height: 68px; } .Pet_Egg_TigerCub { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -345px; + background-position: -1584px -414px; width: 68px; height: 68px; } .Pet_Egg_Treeling { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -414px; + background-position: -1584px -483px; width: 68px; height: 68px; } .Pet_Egg_Triceratops { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -552px; + background-position: -1584px -621px; width: 68px; height: 68px; } .Pet_Egg_Turtle { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -621px; + background-position: -1584px -690px; width: 68px; height: 68px; } .Pet_Egg_Unicorn { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -690px; + background-position: -1584px -759px; width: 68px; height: 68px; } .Pet_Egg_Whale { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -759px; + background-position: -1584px -828px; width: 68px; height: 68px; } .Pet_Egg_Wolf { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -828px; + background-position: -1584px -897px; width: 68px; height: 68px; } .Pet_Egg_Yarn { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -897px; + background-position: -1584px -966px; width: 68px; height: 68px; } .Pet_Food_Cake_Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -966px; + background-position: -1584px -1035px; width: 68px; height: 68px; } .Pet_Food_Cake_CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1035px; + background-position: -1584px -1104px; width: 68px; height: 68px; } .Pet_Food_Cake_CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1104px; + background-position: -1584px -1173px; width: 68px; height: 68px; } .Pet_Food_Cake_Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1173px; + background-position: -1584px -1242px; width: 68px; height: 68px; } .Pet_Food_Cake_Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1242px; + background-position: -1584px -1311px; width: 68px; height: 68px; } .Pet_Food_Cake_Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1311px; + background-position: -1584px -1380px; width: 68px; height: 68px; } .Pet_Food_Cake_Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1380px; + background-position: -1584px -1449px; width: 68px; height: 68px; } .Pet_Food_Cake_Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1584px -1449px; + background-position: 0px -1538px; width: 68px; height: 68px; } .Pet_Food_Cake_White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: 0px -1538px; + background-position: -69px -1538px; width: 68px; height: 68px; } .Pet_Food_Cake_Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -69px -1538px; + background-position: -138px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Base { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -138px -1538px; + background-position: -207px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -207px -1538px; + background-position: -276px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -276px -1538px; + background-position: -345px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Desert { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -345px -1538px; + background-position: -414px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Golden { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -414px -1538px; + background-position: -483px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Red { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -483px -1538px; + background-position: -552px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Shade { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -552px -1538px; + background-position: -621px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Skeleton { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -621px -1538px; + background-position: -690px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_White { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -690px -1538px; + background-position: -759px -1538px; width: 68px; height: 68px; } .Pet_Food_Candy_Zombie { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -759px -1538px; + background-position: -828px -1538px; width: 68px; height: 68px; } .Pet_Food_Chocolate { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -828px -1538px; + background-position: -897px -1538px; width: 68px; height: 68px; } .Pet_Food_CottonCandyBlue { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -897px -1538px; + background-position: -966px -1538px; width: 68px; height: 68px; } .Pet_Food_CottonCandyPink { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -966px -1538px; + background-position: -1035px -1538px; width: 68px; height: 68px; } .Pet_Food_Fish { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1035px -1538px; + background-position: -1104px -1538px; width: 68px; height: 68px; } .Pet_Food_Honey { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1104px -1538px; + background-position: -1173px -1538px; width: 68px; height: 68px; } .Pet_Food_Meat { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1173px -1538px; + background-position: -1242px -1538px; width: 68px; height: 68px; } .Pet_Food_Milk { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1242px -1538px; + background-position: -1311px -1538px; width: 68px; height: 68px; } .Pet_Food_Potatoe { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1311px -1538px; + background-position: -1380px -1538px; width: 68px; height: 68px; } .Pet_Food_RottenMeat { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1380px -1538px; + background-position: -1449px -1538px; width: 68px; height: 68px; } .Pet_Food_Saddle { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1449px -1538px; + background-position: -1518px -1538px; width: 68px; height: 68px; } .Pet_Food_Strawberry { background-image: url('~assets/images/sprites/spritesmith-main-11.png'); - background-position: -1518px -1538px; + background-position: -1653px 0px; width: 68px; height: 68px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index 6a3b32d7f0..06e76a9dd2 100644 Binary files a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/client/assets/images/sprites/spritesmith-main-11.png b/website/client/assets/images/sprites/spritesmith-main-11.png index ad7a7f4d00..80a2cfe5fe 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/common/locales/en/questsContent.json b/website/common/locales/en/questsContent.json index 1f80de4127..92485ac2e8 100644 --- a/website/common/locales/en/questsContent.json +++ b/website/common/locales/en/questsContent.json @@ -694,5 +694,8 @@ "questSquirrelCompletion": "With a gentle approach, offers of trade, and a few soothing spells, you’re able to coax the squirrel away from its hoard and back to the stables, which @Shtut has just finished de-acorning. They’ve set aside a few of the acorns on a worktable. “These ones are squirrel eggs! Maybe you can raise some that don’t play with their food quite so much.”", "questSquirrelBoss": "Sneaky Squirrel", "questSquirrelDropSquirrelEgg": "Squirrel (Egg)", - "questSquirrelUnlockText": "Unlocks purchasable Squirrel eggs in the Market" + "questSquirrelUnlockText": "Unlocks purchasable Squirrel eggs in the Market", + + "cuddleBuddiesText": "Cuddle Buddies Quest Bundle", + "cuddleBuddiesNotes": "Contains 'The Killer Bunny', 'The Nefarious Ferret', and 'The Guinea Pig Gang'. Available until May 31." } diff --git a/website/common/script/content/index.js b/website/common/script/content/index.js index caea8c8914..505b4996d4 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -152,6 +152,21 @@ api.bundles = { type: 'quests', value: 7, }, + cuddleBuddies: { + key: 'cuddleBuddies', + text: t('cuddleBuddiesText'), + notes: t('cuddleBuddiesNotes'), + bundleKeys: [ + 'bunny', + 'ferret', + 'guineapig', + ], + canBuy () { + return moment().isBetween('2018-05-08', '2018-06-02'); + }, + type: 'quests', + value: 7, + }, }; /* diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 2cab7818a1..f47cb397ff 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -31,7 +31,11 @@ const featuredItems = { }, { type: 'quests', - path: 'quests.bunny', + path: 'quests.butterfly', + }, + { + type: 'bundles', + path: 'bundles.cuddleBuddies', }, ], seasonal: '', diff --git a/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_cuddleBuddies.png b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_cuddleBuddies.png new file mode 100644 index 0000000000..6deac3fe46 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/scrolls/quest_bundle_cuddleBuddies.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png b/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png new file mode 100644 index 0000000000..022d29a12c Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_bundle_cuddleBuddies.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_casting_spells.png b/website/raw_sprites/spritesmith_large/scene_casting_spells.png new file mode 100644 index 0000000000..d94cf31d51 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_casting_spells.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index ede8ad7ace..2b98b69c11 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -3,7 +3,7 @@ import { authWithHeaders } from '../../middlewares/auth'; let api = {}; // @TODO export this const, cannot export it from here because only routes are exported from controllers -const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS, ARMOIRE ITEMS, AND OFFICIAL HABITICA CHALLENGES FOR MAY'; +const LAST_ANNOUNCEMENT_TITLE = 'CUDDLE BUDDIES QUEST BUNDLE AND TIPS FOR PARTY MOTIVATION'; const worldDmg = { // @TODO bailey: false, }; @@ -26,40 +26,32 @@ api.getNews = { res.status(200).send({ html: `
-
-
+
-

${res.t('newStuff')}

-
-
-

5/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-
-
-
-

New Backgrounds and Armoire Items

-

We’ve added three new backgrounds to the Background Shop! Now your avatar can tiptoe through a Terraced Rice Field, bask in the glory of the Champions' Colosseum, and look for fun new footwear in the Fantastical Shoe Store. Check them out under User Icon > Backgrounds!

-

Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Cobbler Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)

-
by Katy133, confusus, TheMushroomKing, khdarkwolf, RandomGryffindor, ChimeraLiani, and Mewrose
-
-
+
+
-

May 2018 Resolution Success Challenge and Take This Challenge

-

The Habitica team has launched a special official Challenge series hosted in the Official New Year's Resolution Guild. These Challenges are designed to help you build and maintain goals that are destined for success and then stick with them as the year progresses. For this month's Challenge, Review your Combat Tactics, we're focusing on refining your strategy to help you stay motivated and keep moving forward as we're almost halfway through the year! It has a 15 gem prize, which will be awarded to five lucky winners on June 1st.

+

${res.t('newStuff')}

+

5/8/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+
+

New Discounted Pet Quest Bundle: Cuddle Buddies!

+

If you are looking to add some pets to your Habitica stable, you're in luck! From now until 31-May, you can purchase the Cuddle Buddies Pet Quest Bundle and receive the Bunny, Ferret, and Guinea Pig quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the Quest Shop today!

+
by Beffymaroo and SabreCat
+
Art by Willow the Witty, mewrose, Stefalupagus, Pandah, UncommonCriminal, Gully, Draayder, Teto Forever, PainterProphet, Beffymaroo, Faye, RBrinks, Pocketmole, and James Danger
+
Writing by Lilith of Alfheim, Teto Forever, and Bartelmy
-
+
-

Congratulations to the winners of the April Challenge: V-Starr, Carlos Víquez, lilliburlero, NowyChris, and PizzaMyHeart!

-
+
+
-

The next Take This Challenge has also launched, "Keep Calm and Carry On!", with a focus on deep breathing to settle stressful emotions. Be sure to check it out to earn additional pieces of the Take This armor set!

-

Take This is a nonprofit that seeks to inform the gamer community about mental health issues, to provide education about mental disorders and mental illness prevention, and to reduce the stigma of mental illness.

+

Blog Post: Keeping Parties Motivated

+

Did you catch our latest featured Wiki article? It's about Keeping Parties Motivated! We hope that it will help you as you battle Habitica's bosses and your tasks with your friends. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

+
by shanaqui and the Wiki Wizards
-
-

Congratulations to the winners of the last Take This Challenge, "Test Thy Courage!": grand prize winner Nietos, and runners-up Teslectrik, Mflute, Kolthar, lilyandrosemary, and thewandererrae! Plus, all participants in that Challenge have received a piece of the Take This item set if they didn't have all the pieces already. It is located in your Rewards column. Enjoy!

-
by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
`, });