diff --git a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css index c9ada0eca0..4153ac7394 100644 --- a/website/client/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/assets/css/sprites/spritesmith-largeSprites-0.css @@ -12,7 +12,7 @@ } .promo_earrings_headbands { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -565px -223px; + background-position: -142px -534px; width: 297px; height: 147px; } @@ -36,9 +36,9 @@ } .promo_take_this { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -716px -371px; - width: 114px; - height: 87px; + background-position: -326px -348px; + width: 96px; + height: 69px; } .scene_casting_spells { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); @@ -46,9 +46,15 @@ width: 312px; height: 222px; } +.scene_hiking { + background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -565px -223px; + width: 258px; + height: 258px; +} .scene_meditation { background-image: url('~assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -565px -371px; + background-position: -326px -197px; 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 f149851eda..85fa4ad566 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/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index 7d6017a9b3..af821516b5 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -33,10 +33,6 @@ const featuredItems = { type: 'quests', path: 'quests.butterfly', }, - { - type: 'bundles', - path: 'bundles.cuddleBuddies', - }, ], seasonal: '', timeTravelers: [ diff --git a/website/raw_sprites/spritesmith_large/promo_take_this.png b/website/raw_sprites/spritesmith_large/promo_take_this.png index 39ab9af2f9..e86968cadc 100644 Binary files a/website/raw_sprites/spritesmith_large/promo_take_this.png and b/website/raw_sprites/spritesmith_large/promo_take_this.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_hiking.png b/website/raw_sprites/spritesmith_large/scene_hiking.png new file mode 100644 index 0000000000..884f9be27d Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_hiking.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index bbe08bedf7..1991cb5c56 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 = 'LAST CHANCE FOR FAIRY POTIONS AND PEACOCK SET'; +const LAST_ANNOUNCEMENT_TITLE = 'JUNE 2018 RESOLUTION SUCCESS CHALLENGE AND TAKE THIS CHALLENGE'; const worldDmg = { // @TODO bailey: false, }; @@ -32,21 +32,24 @@ api.getNews = {

${res.t('newStuff')}

-

5/31/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

6/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-
+
-

Last Chance for Phenomenal Peacock Set

-

Reminder: this is the final day to subscribe and receive the Phenomenal Peacock Set! Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems you get!

+

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, Mark Your Journey, we're reflecting on your achievements since January and looking ahead to the rest of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on July 2nd.

+

Congratulations to the winners of the May Challenge, RubberSoul, Carolee, MyNameIsNotRyn, Rapunculus IV, and notunremarkable!

-
+
-

Thanks so much for your support! You help keep Habitica running.

-
by Beffymaroo
-

Last Chance for Fairy Hatching Potions

-

Reminder: this is the final day to buy Fairy Hatching Potions! If they come back, it won't be until next year at the earliest, so don't delay!

-
by Edge
-
+

The next Take This Challenge has also launched, Hero's Triumph!, with a focus on volunteer efforts. 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.

+
+
+

Congratulations to the winners of the last Take This Challenge, "Keep Calm and Carry On!": grand prize winner Betsy, and runners-up Caiwan (Sári Péter), tebrilas, Christopher, eeyoregirl, and Serenity. Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't collected all the pieces already. It is located in your Rewards column. Enjoy!

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