diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index e7b7f8b300..233a287a6b 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -6,13 +6,13 @@ } .promo_costume_achievement { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -698px -426px; + background-position: -373px -208px; width: 144px; height: 156px; } .promo_desert_pet_achievements { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -891px -296px; + background-position: -891px -444px; width: 204px; height: 102px; } @@ -42,37 +42,43 @@ } .promo_mystery_201909 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -698px -148px; + background-position: -698px -296px; width: 282px; height: 147px; } .promo_seasonal_shop_fall { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -843px -426px; + background-position: -518px -208px; width: 162px; height: 138px; } .promo_shadow_spooky_potions { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -698px 0px; + background-position: -698px -148px; width: 423px; height: 147px; } .promo_spooky_sparkles { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -537px; + background-position: -698px 0px; width: 423px; height: 147px; } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -981px -148px; + background-position: -981px -296px; width: 96px; height: 69px; } +.promo_witchy_familiars { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -537px; + width: 423px; + height: 147px; +} .scene_strength { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -698px -296px; + background-position: -698px -444px; width: 192px; height: 129px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index cc19a43485..a9c5b5eb75 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/common/script/content/index.js b/website/common/script/content/index.js index 177fe2536b..f1b30c27bf 100644 --- a/website/common/script/content/index.js +++ b/website/common/script/content/index.js @@ -122,7 +122,7 @@ api.bundles = { 'frog', ], canBuy () { - return moment().isBetween('2017-10-10', '2017-11-02'); + return moment().isBetween('2019-10-15', '2019-11-02'); }, type: 'quests', value: 7, diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index e0f4fcc768..b5c965a4a8 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -22,8 +22,8 @@ const featuredItems = { ], quests: [ { - type: 'quests', - path: 'quests.bronze', + type: 'bundles', + path: 'bundles.witchyFamiliars', }, { type: 'quests', diff --git a/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png b/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png new file mode 100644 index 0000000000..c31d486f72 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_witchy_familiars.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index bc250b649a..a5accd5d6b 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 = 'SUPERNATURAL SKINS AND HAUNTED HAIR COLORS'; +const LAST_ANNOUNCEMENT_TITLE = 'DISCOUNTED PET QUEST BUNDLE: WITCHY FAMILIARS'; const worldDmg = { // @TODO bailey: false, }; @@ -30,15 +30,16 @@ api.getNews = {
The Seasonal Edition Haunted Hair Colors are now available for purchase! Now you can dye your avatar's hair Pumpkin, Midnight, Candy Corn, Ghost White, Zombie, or Halloween. Get them before October 31st!
-The Supernatural Skin Set is also available until October 31st! Now your avatar can become an Ogre, Skeleton, Pumpkin, Candy Corn, Reptile, or Dread Shade.
-Seasonal Edition items recur unchanged every year, but they are only available to purchase during a short period of time. Find these exciting skins and hair colors in User>Edit Avatar. Get them now, or you'll have to wait until next year!
-If you're looking to add some pets to your Habitica stable to match your Fall Festival gear, you're in luck! From now until October 31, you can purchase the Witchy Familiars Pet Quest Bundle and receive the Rat, Spider, and Frog 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!
+If rats and/or spiders are something you'd prefer not to see in Habitica due to a phobia, check out the Phobia Protection Extension which will hide any pets, mounts, backgrounds, quest bosses, or equipment featuring spiders and/or rats (as well as snakes, bees, zombies, skeletons, or any combination thereof). We hope that it helps make everyone's Habitica experience fun!
`, });