diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index e8709f5c45..9498f21515 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -529,5 +529,13 @@ "backgroundInAnAncientTombText": "Ancient Tomb", "backgroundInAnAncientTombNotes": "Brave the mysteries of an Ancient Tomb.", "backgroundInAClassroomText": "Classroom", - "backgroundInAClassroomNotes": "Absorb knowledge from your mentors in a Classroom." + "backgroundInAClassroomNotes": "Absorb knowledge from your mentors in a Classroom.", + + "backgrounds102019": "SET 65: Released October 2019", + "backgroundFoggyMoorText": "Foggy Moor", + "backgroundFoggyMoorNotes": "Watch your step traversing a Foggy Moor.", + "backgroundPumpkinCarriageText": "Pumpkin Carriage", + "backgroundPumpkinCarriageNotes": "Ride in an enchanted Pumpkin Carriage before the clock strikes midnight.", + "backgroundMonsterMakersWorkshopText": "Monster Maker's Workshop", + "backgroundMonsterMakersWorkshopNotes": "Experiment with discredited sciences in a Monster Maker's Workshop." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index f1487ae0a5..8b7c5397ab 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -454,6 +454,8 @@ "weaponArmoireFloridFanNotes": "This lovely silk fan folds when not in use. Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", "weaponArmoireResplendentRapierText": "Resplendent Rapier", "weaponArmoireResplendentRapierNotes": "Demonstrate your swordsmanship with this sharply pointed weapon. Increases Perception by <%= per %>. Enchanted Armoire: Independent Item.", + "weaponArmoireShadowMastersMaceText": "Shadow Master's Mace", + "weaponArmoireShadowMastersMaceNotes": "Creatures of darkness will obey your every command when you wave this glowing mace. Increases Perception by <%= per %>. Enchanted Armoire: Shadow Master Set (Item 3 of 4).", "armor": "armor", "armorCapitalized": "Armor", @@ -980,6 +982,8 @@ "armorArmoireAstronomersRobeNotes": "Turns out silk and starlight make a fabric that is not only magical, but very breathable. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Astronomer Mage Set (Item 1 of 3).", "armorArmoireInvernessCapeText": "Inverness Cape", "armorArmoireInvernessCapeNotes": "This sturdy garment will let you search for clues in any type of weather. Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Detective Set (Item 2 of 4).", + "armorArmoireShadowMastersRobeText": "Shadow Master's Robe", + "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).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1516,6 +1520,8 @@ "headArmoireAstronomersHatNotes": "A perfect hat for celestial observation or a fancy wizard brunch. Increases Constitution by <%= con %>. Enchanted Armoire: Astronomer Mage Set (Item 2 of 3).", "headArmoireDeerstalkerCapText": "Deerstalker Cap", "headArmoireDeerstalkerCapNotes": "This cap is perfect for rural excursions, but also is acceptable gear for mystery-solving! Increases Intelligence by <%= int %>. Enchanted Armoire: Detective Set (Item 1 of 4).", + "headArmoireShadowMastersHoodText": "Shadow Master's Hood", + "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).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -1809,6 +1815,8 @@ "shieldArmoireTrustyUmbrellaNotes": "Mysteries are often accompanied by inclement weather, so be prepared! Increases Intelligence by <%= int %>. Enchanted Armoire: Detective Set (Item 4 of 4).", "shieldArmoirePolishedPocketwatchText": "Polished Pocketwatch", "shieldArmoirePolishedPocketwatchNotes": "You've got the time. And it looks very nice on you. Increases Intelligence by <%= int %>. Enchanted Armoire: Independent Item.", + "shieldArmoireMasteredShadowText": "Mastered Shadow", + "shieldArmoireMasteredShadowNotes": "Your powers have brought these swirling shadows to your side to do your bidding. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Shadow Master Set (Item 4 of 4).", "back": "Back Accessory", "backCapitalized": "Back Accessory", diff --git a/website/common/script/content/appearance/backgrounds.js b/website/common/script/content/appearance/backgrounds.js index 5260978ef6..15a06aa79e 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -899,6 +899,20 @@ let backgrounds = { notes: t('backgroundInAClassroomNotes'), }, }, + backgrounds102019: { + foggy_moor: { + text: t('backgroundFoggyMoorText'), + notes: t('backgroundFoggyMoorNotes'), + }, + monster_makers_workshop: { + text: t('backgroundMonsterMakersWorkshopText'), + notes: t('backgroundMonsterMakersWorkshopNotes'), + }, + pumpkin_carriage: { + text: t('backgroundPumpkinCarriageText'), + notes: t('backgroundPumpkinCarriageNotes'), + }, + }, 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 fd7589418d..48bf788511 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -490,6 +490,14 @@ let armor = { set: 'detective', canOwn: ownsItem('armor_armoire_invernessCape'), }, + shadowMastersRobe: { + text: t('armorArmoireShadowMastersRobeText'), + notes: t('armorArmoireShadowMastersRobeNotes', { con: 12 }), + value: 100, + con: 12, + set: 'shadowMaster', + canOwn: ownsItem('armor_armoire_shadowMastersRobe'), + }, }; let body = { @@ -1003,6 +1011,15 @@ let head = { set: 'detective', canOwn: ownsItem('head_armoire_deerstalkerCap'), }, + shadowMastersHood: { + text: t('headArmoireShadowMastersHoodText'), + notes: t('headArmoireShadowMastersHoodNotes', { attrs: 5 }), + value: 100, + per: 5, + con: 5, + set: 'shadowMaster', + canOwn: ownsItem('head_armoire_shadowMastersHood'), + }, }; let shield = { @@ -1273,6 +1290,15 @@ let shield = { int: 9, canOwn: ownsItem('shield_armoire_polishedPocketwatch'), }, + masteredShadow: { + text: t('shieldArmoireMasteredShadowText'), + notes: t('shieldArmoireMasteredShadowNotes', { attrs: 5 }), + value: 100, + per: 5, + con: 5, + set: 'shadowMaster', + canOwn: ownsItem('shield_armoire_masteredShadow'), + }, }; let headAccessory = { @@ -1711,6 +1737,14 @@ let weapon = { per: 9, canOwn: ownsItem('weapon_armoire_resplendentRapier'), }, + shadowMastersMace: { + text: t('weaponArmoireShadowMastersMaceText'), + notes: t('weaponArmoireShadowMastersMaceNotes', { per: 12 }), + value: 100, + per: 12, + set: 'shadowMaster', + canOwn: ownsItem('weapon_armoire_shadowMastersMace'), + }, }; let armoireSet = { diff --git a/website/common/script/content/shop-featuredItems.js b/website/common/script/content/shop-featuredItems.js index ac08b6d7c6..e0f4fcc768 100644 --- a/website/common/script/content/shop-featuredItems.js +++ b/website/common/script/content/shop-featuredItems.js @@ -22,12 +22,12 @@ const featuredItems = { ], quests: [ { - type: 'bundles', - path: 'bundles.rockingReptiles', + type: 'quests', + path: 'quests.bronze', }, { type: 'quests', - path: 'quests.dilatoryDistress1', + path: 'quests.taskwoodsTerror1', }, { type: 'quests', diff --git a/website/raw_sprites/spritesmith/backgrounds/background_foggy_moor.png b/website/raw_sprites/spritesmith/backgrounds/background_foggy_moor.png new file mode 100644 index 0000000000..25756b9dbc Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_foggy_moor.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_monster_makers_workshop.png b/website/raw_sprites/spritesmith/backgrounds/background_monster_makers_workshop.png new file mode 100644 index 0000000000..b0477d482f Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_monster_makers_workshop.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_pumpkin_carriage.png b/website/raw_sprites/spritesmith/backgrounds/background_pumpkin_carriage.png new file mode 100644 index 0000000000..9aa8dd55be Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_pumpkin_carriage.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_foggy_moor.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_foggy_moor.png new file mode 100644 index 0000000000..3bcf471896 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_foggy_moor.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_monster_makers_workshop.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_monster_makers_workshop.png new file mode 100644 index 0000000000..483e3f2633 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_monster_makers_workshop.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_pumpkin_carriage.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_pumpkin_carriage.png new file mode 100644 index 0000000000..8346b66018 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_pumpkin_carriage.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_shadowMastersRobe.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_shadowMastersRobe.png new file mode 100644 index 0000000000..0f08abfe3d Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_shadowMastersRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_shadowMastersHood.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_shadowMastersHood.png new file mode 100644 index 0000000000..40d5cf51d2 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_shadowMastersHood.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_masteredShadow.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_masteredShadow.png new file mode 100644 index 0000000000..fab96aaaca Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_masteredShadow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_shadowMastersRobe.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_shadowMastersRobe.png new file mode 100644 index 0000000000..fba18053cb Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_shadowMastersRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_shadowMastersHood.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_shadowMastersHood.png new file mode 100644 index 0000000000..5f70838a72 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_shadowMastersHood.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_masteredShadow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_masteredShadow.png new file mode 100644 index 0000000000..a954838e6a Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_masteredShadow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_shadowMastersMace.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_shadowMastersMace.png new file mode 100644 index 0000000000..4d5b93fbe1 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_shadowMastersMace.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_shadowMasterRobe.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_shadowMasterRobe.png new file mode 100644 index 0000000000..833dbb4754 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_shadowMasterRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_shadowMastersMace.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_shadowMastersMace.png new file mode 100644 index 0000000000..5f47a46582 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_shadowMastersMace.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201909.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201909.png deleted file mode 100644 index b24bc3cbc8..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201909.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png new file mode 100644 index 0000000000..8b50c47ead Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201910.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_rocking_reptiles_bundle.png b/website/raw_sprites/spritesmith_large/promo_rocking_reptiles_bundle.png deleted file mode 100644 index 775772f151..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_rocking_reptiles_bundle.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_casting_spells.png b/website/raw_sprites/spritesmith_large/scene_casting_spells.png deleted file mode 100644 index d94cf31d51..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_casting_spells.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_medal.png b/website/raw_sprites/spritesmith_large/scene_medal.png deleted file mode 100644 index 603731c141..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_medal.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_strength.png b/website/raw_sprites/spritesmith_large/scene_strength.png new file mode 100644 index 0000000000..2ac7ef3828 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_strength.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_video_games.png b/website/raw_sprites/spritesmith_large/scene_video_games.png deleted file mode 100644 index e3157bc950..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_video_games.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 7f214dedda..599f36910d 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 SEPTEMBER ITEMS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS, ARMOIRE ITEMS, AND OFFICIAL HABITICA CHALLENGES!'; const worldDmg = { // @TODO bailey: false, }; @@ -30,20 +30,28 @@ api.getNews = {

${res.t('newStuff')}

-

9/30/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

10/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}


-
-

Last Chance for Affable Acorn Set

-

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

-

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

-
by Beffymaroo
-
-

Last Chance for Rocking Reptiles Quest Bundle

-

This is also the final day to buy the discounted Rocking Reptiles Pet Quest Bundle, featuring the Alligator, Snake, and Velociraptor quests all for seven gems! Be sure to get your claws on it before it slithers away from the Quest Shop!

-
Art by Gully, Willow The Witty, mfonda, UncommonCriminal, tabbytoes, EmeraldOx, LordDarkly, PainterProphet, Seraphina, Anna Glassman, Procyon, and Lilith of Alfheim
-
Writing by Mike.Antonacci, lilackbar, Daniel The Bard, and felipena
+
+

October Backgrounds and Armoire Items!

+

We’ve added three new backgrounds to the Background Shop! Now your avatar can experiment in a Monster Maker's Workshop, ride in a magical Pumpkin Carriage, and journey across a Foggy Moor. Check them out under User Icon > Backgrounds!

+

Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Shadow Master Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)

+
by GeraldThePixel, QuartzFox, Tigergurke, Vikte, Daikagaru, and SabreCat
+
+

October 2019 Resolution Success Challenge and New 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, Staying Strong, we're focusing on boosting your motivation heading into the final quarter of the year! It has a 15 Gem prize, which will be awarded to five lucky winners on November 1st.

+

Congratulations to the winners of the September Challenge: Inkblots, Betelgeuse_aOri, timohi, IceBlueMelody, and han-!

+

The next Take This Challenge has also launched, "Check Your HP!", with a focus on tracking your mood over time. 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, "It's Dangerous to Go Alone!": grand prize winner @Ukioye_Kana, and runners-up @TheReptilianCave, @Merilio, @DocBajillian, @Melodyheart, and @Melanchoii! 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 Doctor B, the Take This team, Lemoness, Beffymaroo, and SabreCat
+
+

Back-to-School Preparation Challenge Winners

+

The winners of the Habitica Back-to-School Preparation Challenge have been selected! Congratulations to: gils__, talklesssmilemore, Nadoko, pigmaniac1941, and French1Fry !

+

Thank you to everyone who participated! We're excited to help you pursue your goals through the new school year and beyond!

+
by Beffymaroo and SabreCat
`, });