diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 4e4c8a865b..716af13570 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -545,5 +545,13 @@ "backgroundFlyingInAThunderstormText": "Tumultuous Thunderstorm", "backgroundFlyingInAThunderstormNotes": "Chase a Tumultuous Thunderstorm as closely as you dare.", "backgroundPotionShopText": "Potion Shop", - "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop." + "backgroundPotionShopNotes": "Find an elixir for any ailment at a Potion Shop.", + + "backgrounds122019": "SET 67: Released December 2019", + "backgroundHolidayMarketText": "Holiday Market", + "backgroundHolidayMarketNotes": "Find the perfect gifts and decorations at a Holiday Market.", + "backgroundHolidayWreathText": "Holiday Wreath", + "backgroundHolidayWreathNotes": "Festoon your avatar with a fragrant Holiday Wreath.", + "backgroundWinterNocturneText": "Winter Nocturne", + "backgroundWinterNocturneNotes": "Bask in the starlight of a Winter Nocturne." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index a49c25b505..c35f25c49e 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -992,6 +992,8 @@ "armorArmoireShadowMastersRobeNotes": "The fabric of this flowy robe is woven from the darkest shadows in the deepest caves of Habitica. Increases Constitution by <%= con %>. Enchanted Armoire: Shadow Master Set (Item 1 of 4).", "armorArmoireAlchemistsRobeText": "Alchemist's Robe", "armorArmoireAlchemistsRobeNotes": "Any number of dangerous elixirs are involved in creating arcane metals and gems, and these heavy robes will protect you from harm and unintended side effects! Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 1 of 4).", + "armorArmoireDuffleCoatText": "Duffle Coat", + "armorArmoireDuffleCoatNotes": "Travel frosty realms in style with this cozy wool coat. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 1 of 2).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1538,6 +1540,8 @@ "headArmoireShadowMastersHoodNotes": "This hood grants you the power to see through even the deepest darkness. It may occasionally require eyedrops, though. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 2 of 4).", "headArmoireAlchemistsHatText": "Alchemist's Hat", "headArmoireAlchemistsHatNotes": "While hats are not strictly necessary for alchemical practice, looking cool certainly doesn't hurt anything! Increases Perception by <%= per %>. Enchanted Armoire: Alchemist Set (Item 2 of 4).", + "headArmoireEarflapHatText": "Earflap Hat", + "headArmoireEarflapHatNotes": "If you're looking to keep your head toasty warm, this hat has you covered! Increases Intelligence and Strength by <%= attrs %> each. Enchanted Armoire: Duffle Coat Set (Item 2 of 2).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 2aa8799d54..5afd305265 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -927,6 +927,20 @@ const backgrounds = { notes: t('backgroundPotionShopNotes'), }, }, + backgrounds122019: { + holiday_market: { + text: t('backgroundHolidayMarketText'), + notes: t('backgroundHolidayMarketNotes'), + }, + holiday_wreath: { + text: t('backgroundHolidayWreathText'), + notes: t('backgroundHolidayWreathNotes'), + }, + winter_nocturne: { + text: t('backgroundWinterNocturneText'), + notes: t('backgroundWinterNocturneNotes'), + }, + }, incentiveBackgrounds: { violet: { text: t('backgroundVioletText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index d19c2f4ebe..7c66dd8d9c 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -507,6 +507,15 @@ const armor = { set: 'alchemist', canOwn: ownsItem('armor_armoire_alchemistsRobe'), }, + duffleCoat: { + text: t('armorArmoireDuffleCoatText'), + notes: t('armorArmoireDuffleCoatNotes', { attrs: 7 }), + value: 100, + con: 7, + per: 7, + set: 'duffle', + canOwn: ownsItem('armor_armoire_duffleCoat'), + }, }; const body = { @@ -1037,6 +1046,15 @@ const head = { set: 'alchemist', canOwn: ownsItem('head_armoire_alchemistsHat'), }, + earflapHat: { + text: t('headArmoireEarflapHatText'), + notes: t('headArmoireEarflapHatNotes', { attrs: 7 }), + value: 100, + int: 7, + str: 7, + set: 'duffle', + canOwn: ownsItem('head_armoire_earflapHat'), + }, }; const shield = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_holiday_market.png b/website/raw_sprites/spritesmith/backgrounds/background_holiday_market.png new file mode 100644 index 0000000000..580e60a81f Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_holiday_market.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_holiday_wreath.png b/website/raw_sprites/spritesmith/backgrounds/background_holiday_wreath.png new file mode 100644 index 0000000000..822414e929 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_holiday_wreath.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_winter_nocturne.png b/website/raw_sprites/spritesmith/backgrounds/background_winter_nocturne.png new file mode 100644 index 0000000000..25147e6082 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_winter_nocturne.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_market.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_market.png new file mode 100644 index 0000000000..5914952fea Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_market.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_wreath.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_wreath.png new file mode 100644 index 0000000000..67f7ddf394 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_holiday_wreath.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_winter_nocturne.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_winter_nocturne.png new file mode 100644 index 0000000000..eeb1a373ca Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_winter_nocturne.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_duffleCoat.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_duffleCoat.png new file mode 100644 index 0000000000..cb5298ad9f Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_duffleCoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_earflapHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_earflapHat.png new file mode 100644 index 0000000000..f8ed4b4ea7 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_earflapHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_duffleCoat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_duffleCoat.png new file mode 100644 index 0000000000..cbbb8c402a Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_duffleCoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_earflapHat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_earflapHat.png new file mode 100644 index 0000000000..73f47b5e11 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_earflapHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_duffleCoat.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_duffleCoat.png new file mode 100644 index 0000000000..06b6326d21 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_duffleCoat.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png deleted file mode 100644 index cc15edf187..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201911.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201912.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201912.png new file mode 100644 index 0000000000..f7871f3260 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201912.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_mystery_201911.png b/website/raw_sprites/spritesmith_large/promo_mystery_201911.png deleted file mode 100644 index 3c8f9b3599..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_mystery_201911.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index cdb4c6a873..c37307cdaa 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 = 'NEW SUBSCRIBER SET AND OFFICIAL HABITICA CHALLENGES!'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS AND ARMOIRE ITEMS!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,62 +31,23 @@ api.getNews = {

${res.t('newStuff')}

-

12/2/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

12/3/2019 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

December Subscriber Items Revealed!

+

- 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. + We’ve added three new backgrounds to the Background Shop! Now your avatar can shop a + cheerful Holiday Market, enjoy the scent of a Holiday Wreath and bask in the starlight + of a Winter Nocturne. Check them out under User Icon > Backgrounds!

- 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. -

-
by Beffymaroo
-
-

December 2019 Resolution Success Challenge and Take This Challenge

-

- 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. -

-

- 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! + Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the + Duffle Coat and Ear-Flap Hat. Better work hard on your real-life tasks to earn all + the pieces! Enjoy :)

- by Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat + by Katy133, gawrone, Vikte, Maans, GeraldThePixel, QuartzFox, KatieSlug, and SabreCat
`,