diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index c100c3510a..be1d5d9cf0 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,42 +1,48 @@ .promo_armoire_backgrounds_201805 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -337px; + background-position: -878px 0px; width: 141px; height: 441px; } .promo_bundle_cuddleBuddies { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -142px -337px; + background-position: 0px -534px; width: 141px; height: 441px; } -.promo_ios { +.promo_fairy_potions { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px 0px; + width: 564px; + height: 196px; +} +.promo_ios { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: 0px -197px; width: 325px; height: 336px; } .promo_mystery_201804 { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -326px -223px; + background-position: -878px -442px; width: 114px; height: 90px; } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -441px -223px; + background-position: -716px -223px; width: 114px; height: 87px; } .scene_casting_spells { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -326px 0px; + background-position: -565px 0px; width: 312px; height: 222px; } .scene_meditation { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -284px -337px; + background-position: -565px -223px; width: 150px; height: 150px; } diff --git a/website/client/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/assets/images/sprites/spritesmith-largeSprites-0.png index c304e6c664..53784c88af 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/hatching-potions.js b/website/common/script/content/hatching-potions.js index b88eb8916c..6403ccdfce 100644 --- a/website/common/script/content/hatching-potions.js +++ b/website/common/script/content/hatching-potions.js @@ -3,7 +3,7 @@ import defaults from 'lodash/defaults'; import each from 'lodash/each'; import t from './translation'; -const CURRENT_SEASON = '_NONE_'; +const CURRENT_SEASON = 'May'; let drops = { Base: { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index f47cb397ff..7d6017a9b3 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -12,8 +12,8 @@ const featuredItems = { path: 'hatchingPotions.Red', }, { - type: 'hatchingPotions', - path: 'hatchingPotions.Golden', + type: 'premiumHatchingPotion', + path: 'premiumHatchingPotions.Fairy', }, { type: 'card', diff --git a/website/raw_sprites/spritesmith_large/promo_fairy_potions.png b/website/raw_sprites/spritesmith_large/promo_fairy_potions.png new file mode 100644 index 0000000000..233c65b781 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_fairy_potions.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index de02f7a7a3..dfe71e4aa7 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 = 'USE CASE SPOTLIGHT AND GUILD SPOTLIGHT ON MENTAL HEALTH AND WELLNESS'; +const LAST_ANNOUNCEMENT_TITLE = 'FAIRY HATCHING POTIONS RETURN!'; const worldDmg = { // @TODO bailey: false, }; @@ -32,15 +32,12 @@ api.getNews = {

${res.t('newStuff')}

-

5/10/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

5/15/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-
-
-

In honor of Mental Health Awareness Month, we've got new posts on the blog all about ways to explore better mental health and wellness through Habitica! First, there's a Guild Spotlight that highlights the Guilds that can help you as you explore the path to better mental health. We've also posted a Use Case Spotlight featuring a number of great suggestions for using Habitica's task system to manage mental health and wellness! These suggestions were submitted by Habiticans in the Use Case Spotlights Guild.

-
-
-
-

Plus, we're collecting user submissions for the next Use Case Spotlight! How do you use Habitica to manage parenting and/or family life? We’ll be featuring player-submitted examples in Use Case Spotlights on the Habitica Blog next month, so post your suggestions in the Use Case Spotlight Guild now. We look forward to learning more about how you use Habitica to improve your life and get things done!

+

They're back! Between now and May 31, you can buy Fairy Hatching Potions from the Market and use them to hatch any standard pet egg. (Magic Hatching Potions do not work on Quest Pet eggs.) Fairy Potion Pets aren't picky, so they'll happily eat any kind of food that you feed them!

+

After they're gone, it will be at least a year before the Fairy Hatching Potions are available again, so be sure to get them now!

+
by Edge, Willow the Witty, and SabreCat
+
`, });