diff --git a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css index ca8f8a455b..0620e313c2 100644 --- a/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css +++ b/website/client/src/assets/css/sprites/spritesmith-largeSprites-0.css @@ -1,36 +1,30 @@ .promo_armoire_backgrounds_202005 { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -391px 0px; - width: 423px; - height: 147px; -} -.promo_fairy_sunshine_potions { - background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -391px -148px; - width: 423px; - height: 147px; -} -.promo_jungle_buddies_bundle { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px -434px; width: 423px; height: 147px; } -.promo_mystery_202005 { +.promo_fairy_sunshine_potions { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -424px -434px; - width: 282px; + background-position: -650px 0px; + width: 423px; + height: 147px; +} +.promo_jungle_buddies_bundle { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -650px -148px; + width: 423px; height: 147px; } .promo_mystery_202006 { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -241px -582px; + background-position: 0px -582px; width: 282px; height: 147px; } .promo_take_this { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -815px -179px; + background-position: -650px -492px; width: 96px; height: 69px; } @@ -40,6 +34,12 @@ width: 312px; height: 222px; } +.scene_hiking { + background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); + background-position: -391px 0px; + width: 258px; + height: 258px; +} .scene_pets_resting { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); background-position: 0px 0px; @@ -48,13 +48,13 @@ } .scene_todos { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: 0px -582px; + background-position: -650px -296px; width: 240px; height: 195px; } .scene_vikte { background-image: url('~@/assets/images/sprites/spritesmith-largeSprites-0.png'); - background-position: -815px 0px; + background-position: -891px -296px; width: 157px; height: 178px; } diff --git a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png index c8b1565320..25839228f5 100644 Binary files a/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png and b/website/client/src/assets/images/sprites/spritesmith-largeSprites-0.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_mystery_202005.png b/website/raw_sprites/spritesmith_large/promo_mystery_202005.png deleted file mode 100644 index 79a0c40eb3..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_mystery_202005.png and /dev/null 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 4683776c15..7ae1838c20 100644 --- a/website/server/controllers/api-v3/news.js +++ b/website/server/controllers/api-v3/news.js @@ -4,7 +4,7 @@ const api = {}; // @TODO export this const, cannot export it from here because only routes are exported from // controllers -const LAST_ANNOUNCEMENT_TITLE = 'LAST CHANCE FOR MAY ITEMS'; +const LAST_ANNOUNCEMENT_TITLE = 'JUNE SUBSCRIBER ITEMS, RESOLUTION SUCCESS CHALLENGE, AND TAKE THIS CHALLENGE'; const worldDmg = { // @TODO bailey: false, }; @@ -31,41 +31,65 @@ api.getNews = {

${res.t('newStuff')}

-

5/28/2020 - ${LAST_ANNOUNCEMENT_TITLE}

+

6/1/2020 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Last Chance for Wondrous Wyvern Set

+
+

June Subscriber Items Revealed!

- Reminder: you only have until May 31 to receive the Wondrous Wyvern Set when you sign up for a new Habitica subscription! - Subscribing also gives you lots of great perks, like the ability to buy Gems with Gold. - The longer your subscription, the more Gems you can get! + The June Subscriber Item Set is here: the Multichrome Merfolk Item Set! Subscribe to Habitica by June 30 to receive this + exciting set! If you're already an active subscriber, reload the site and then head to + Inventory > Items to claim your gear! +

+

+ Subscribers also receive the ability to buy Gems with Gold -- the longer you subscribe, + the more Gems you can buy per month! There are other perks as well, such as longer access + to uncompressed data and a cute Jackalope pet. Best of all, subscriptions let us keep + Habitica running. Thank you very much for your support -- it means a lot to us.

-

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

by Beffymaroo
-
-

Last Chance for Fairy and Sunshine Glow Hatching Potions

+
+

June 2020 Resolution Success Challenge and Take This Challenge

- Reminder: Fairy and Sunshine Glow Hatching Potions leave the - Market on May 31. If they come back, it won't be until next year at the earliest, so - don't delay! + 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 1st.

-
by OuttaMyMind, Lt.Cabel, Eslyn, Edge, and SabreCat
-
-

Last Chance for Jungle Buddies Pet Quest Bundle

- Don't forget to check out the discounted Jungle Buddies Pet Quest Bundle, featuring the - Monkey, Sloth, and Treeling quests all for seven Gems! Be sure to snag it before it makes - like a tree and leaves the Quest Shop on May 31! + Congratulations to the winners of May's Challenge, @kelps, @JHylander, @theFishhimself, + @akverbatim, and @SunshineDay29! +

+

+ The next Take This Challenge has also launched, "Keep Calm and Carry On!", + with a focus on practicing breathing techniques to relieve intense 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. +

+

+ Congratulations to the winners of the last Take This Challenge, "Don't Be a + Completionist!": grand prize winner @Felicius, and runners-up @zhanghaoran, Zashi, + @marie56, @KelaLilBear, and @LiamTown! Plus, all participants in that Challenge have + received a piece of the Take This item set if they hadn't completed it already. It is located + in your Rewards column. Enjoy!

-
by SabreCat
-
Writing by PixelHunter, Emily Austin, Flutter Bee, and Felipe NA
- Art by JaizakAripaik, Drevian, McCoyly, awakebyjava, PainterProphet, Kiwibot, - greenpencil, fuzzytrees, PainterProphet, aurakami, yamato, leephon, Misceo, and - Oneironaut + by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
`,