From 11ebc6c3978690a03c99acccc187fd726361c8cc Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Mon, 2 Dec 2019 17:15:41 -0600 Subject: [PATCH] chore(event): end Turkeys, Bailey --- .../script/content/shop-featuredItems.js | 4 +- website/server/controllers/api-v3/news.js | 87 ++++++++++--------- website/server/models/user/hooks.js | 2 - 3 files changed, 46 insertions(+), 47 deletions(-) diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index ef7db8417f..6c69741ca0 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -46,8 +46,8 @@ const featuredItems = { }, quests: [ { - type: 'bundles', - path: 'bundles.delightfulDinos', + type: 'quests', + path: 'quests.badger', }, { type: 'quests', diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index c9d6119380..cdb4c6a873 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 = 'HABITICA HARVEST FEAST! AND LAST CHANCE FOR NOVEMBER LIMITED TIME ITEMS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW SUBSCRIBER SET AND OFFICIAL HABITICA CHALLENGES!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,61 +31,62 @@ api.getNews = {

${res.t('newStuff')}

-

11/27/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

12/2/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

Happy Harvest!

+
+

December Subscriber Items Revealed!

- It's time for Habitica's Harvest Feast! On this day Habiticans celebrate by spending - time with loved ones, giving thanks, enjoying their favorite foods, and riding their - glorious turkeys into the magnificent sunset. Some of the NPCs are celebrating the - occasion! + The December Subscriber Item Set has been revealed: the Polar Pixie Item Set! Subscribe to Habitica by December 31 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.

-

Turkey Pet, Mount, Costumes... and Pie!

- Those of you who weren't around for all of our previous Harvest Feasts have received an - adorable Turkey! What kind of Turkey? It all depends on how many harvests you've - celebrated with us. If you've completed your Turkey collection, you'll receive a feast - of delicious pie for your pets! + Subscribers also receive the ability to buy Gems for 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.

-

Thank you for using Habitica - we really love you all <3

-
by Lemoness and Beffymaroo
-
-

Last Chance for Crystal Charmer Subscriber Set

-

- Reminder: the end of November is the last chance to receive the Crystal Charmer Set when - you sign up for a Habitica subscription! - Subscribing also lets you buy Gems for Gold. The longer your subscription, the more Gems - you can get! -

-

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

by Beffymaroo
-
-

Last Chance for Ember and Thunderstorm Potions

+
+

December 2019 Resolution Success Challenge and Take This Challenge

- Reminder: time is running out to buy Thunderstorm and Ember - Hatching Potions! 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, "Journey's End and New + Beginnings", we're focusing on sharing our successes and reviewing the year! + It has a 15 Gem prize, which will be awarded to five lucky winners on January 1st.

-
by Balduranne and SabreCat
-
-

Last Chance for Delightful Dinos Pet Quest Bundle

- There's also only a few days left to buy the discounted Delightful Dinos Pet Quest - Bundle, featuring the Pterodactyl, Triceratops, and T-Rex quests all for seven Gems! Be - sure to get yours from the Quest Shop before this deal goes - extinct! + Congratulations to the winners of November's Challenge, @LuxInWonderland, @noblegeas, + @thebadhobbit, @Slardibarfast, and @yasaminnb! +

+

+ The next Take This Challenge has also launched, "Test Thy Courage!", with a + focus on positive social interactions. 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, "Cast of Characters!": + grand prize winner Geomiceman, and runners-up Christen, no_robot, 🔥 KidSlazy 🔥, + marek13, and Nova Rose! 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 and Beffymaroo
-
- Art by Baconsaur, Eevachu, UncommonCriminal, Kiwibot, McCoyly, plumilla, Seraphina, - PainterProphet, Stefalupagus, Katy133, Edge, Willow The Witty, Lilith of Alfheim, - Procyon, GeraldThePixel, and Archeia -
- Writing by Lemoness, Daniel the Bard, Lilith of Alfheim, and Ali Stewart + by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
`, diff --git a/website/server/models/user/hooks.js b/website/server/models/user/hooks.js index b3b76e9c36..2d3e9cf554 100644 --- a/website/server/models/user/hooks.js +++ b/website/server/models/user/hooks.js @@ -129,8 +129,6 @@ function _setUpNewUser (user) { user.items.quests.dustbunnies = 1; user.purchased.background.violet = true; user.preferences.background = 'violet'; - user.items.pets['Turkey-Base'] = 5; - user.items.currentPet = 'Turkey-Base'; user.markModified('items');