diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index b34e37d56f..6c0d936247 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -377,5 +377,13 @@ "backgroundMagicalMuseumText": "Magical Museum", "backgroundMagicalMuseumNotes": "Tour a Magical Museum.", "backgroundRoseGardenText": "Rose Garden", - "backgroundRoseGardenNotes": "Dally in a fragrant Rose Garden." + "backgroundRoseGardenNotes": "Dally in a fragrant Rose Garden.", + + "backgrounds032018": "SET 46: Released March 2018", + "backgroundGorgeousGreenhouseText": "Gorgeous Greenhouse", + "backgroundGorgeousGreenhouseNotes": "Walk among the flora kept in a Gorgeous Greenhouse.", + "backgroundElegantBalconyText": "Elegant Balcony", + "backgroundElegantBalconyNotes": "Look out over the landscape from an Elegant Balcony.", + "backgroundDrivingACoachText": "Driving a Coach", + "backgroundDrivingACoachNotes": "Enjoy Driving a Coach past fields of flowers." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 05d20914c3..4485dda287 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -351,6 +351,8 @@ "weaponArmoireCoachDriversWhipNotes": "Your steeds know what they're doing, so this whip is just for show (and the neat snapping sound!). Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Coach Driver Set (Item 3 of 3).", "weaponArmoireScepterOfDiamondsText": "Scepter of Diamonds", "weaponArmoireScepterOfDiamondsNotes": "This scepter shines with a warm red glow as it grants you increased willpower. Increases Strength by <%= str %>. Enchanted Armoire: King of Diamonds Set (Item 3 of 3).", + "weaponArmoireFlutteryArmyText": "Fluttery Army", + "weaponArmoireFlutteryArmyNotes": "This group of scrappy lepidopterans is ready to flap fiercely and cool down your reddest tasks! Increases Constitution, Intelligence, and Strength by <%= attrs %> each. Enchanted Armoire: Fluttery Frock Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -750,6 +752,8 @@ "armorArmoireCoachDriverLiveryNotes": "This heavy overcoat will protect you from the weather as you drive. Plus it looks pretty snazzy, too! Increases Strength by <%= str %>. Enchanted Armoire: Coach Driver Set (Item 1 of 3).", "armorArmoireRobeOfDiamondsText": "Robe of Diamonds", "armorArmoireRobeOfDiamondsNotes": "These royal robes not only make you appear noble, they allow you to see the nobility within others. Increases Perception by <%= per %>. Enchanted Armoire: King of Diamonds Set (Item 1 of 3).", + "armorArmoireFlutteryFrockText": "Fluttery Frock", + "armorArmoireFlutteryFrockNotes": "A light and airy gown with a wide skirt the butterflies might mistake for a giant blossom! Increases Constitution, Perception, and Strength by <%= attrs %> each. Enchanted Armoire: Fluttery Frock Set (Item 1 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1159,6 +1163,8 @@ "headArmoireCoachDriversHatNotes": "This hat is dressy, but not quite so dressy as a top hat. Make sure you don't lose it as you drive speedily across the land! Increases Intelligence by <%= int %>. Enchanted Armoire: Coach Driver Set (Item 2 of 3).", "headArmoireCrownOfDiamondsText": "Crown of Diamonds", "headArmoireCrownOfDiamondsNotes": "This shining crown isn't just a great hat; it will also sharpen your mind! Increases Intelligence by <%= int %>. Enchanted Armoire: King of Diamonds Set (Item 2 of 3).", + "headArmoireFlutteryWigText": "Fluttery Wig", + "headArmoireFlutteryWigNotes": "This fine powdered wig has plenty of room for your butterflies to rest if they get tired while doing your bidding. Increases Intelligence, Perception, and Strength by <%= attrs %> each. Enchanted Armoire: Fluttery Frock Set (Item 2 of 3).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -1383,6 +1389,8 @@ "shieldArmoireWeaversShuttleNotes": "This tool passes your weft thread through the warp to make cloth! Increases Intelligence by <%= int %> and Perception by <%= per %>. Enchanted Armoire: Weaver Set (Item 3 of 3).", "shieldArmoireShieldOfDiamondsText": "Crimson Jewel Shield", "shieldArmoireShieldOfDiamondsNotes": "This radiant shield not only provides protection, it empowers you with endurance! Increases Constitution by <%= con %>. Enchanted Armoire: Independent Item.", + "shieldArmoireFlutteryFanText": "Flowery Fan", + "shieldArmoireFlutteryFanNotes": "On a hot day, there's nothing quite like a fancy fan to help you look and feel cool. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.", "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 b8a532214d..7c52efb9b6 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -633,6 +633,20 @@ let backgrounds = { notes: t('backgroundRoseGardenNotes'), }, }, + backgrounds032018: { + driving_a_coach: { + text: t('backgroundDrivingACoachText'), + notes: t('backgroundDrivingACoachNotes'), + }, + elegant_balcony: { + text: t('backgroundElegantBalconyText'), + notes: t('backgroundElegantBalconyNotes'), + }, + gorgeous_greenhouse: { + text: t('backgroundGorgeousGreenhouseText'), + notes: t('backgroundGorgeousGreenhouseNotes'), + }, + }, 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 4df6b4d936..1343b564cf 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -330,6 +330,16 @@ let armor = { set: 'kingOfDiamonds', canOwn: ownsItem('armor_armoire_robeOfDiamonds'), }, + flutteryFrock: { + text: t('armorArmoireFlutteryFrockText'), + notes: t('armorArmoireFlutteryFrockNotes', { attrs: 5 }), + value: 100, + con: 5, + per: 5, + str: 5, + set: 'fluttery', + canOwn: ownsItem('armor_armoire_flutteryFrock'), + }, }; let body = { @@ -706,6 +716,16 @@ let head = { set: 'kingOfDiamonds', canOwn: ownsItem('head_armoire_crownOfDiamonds'), }, + flutteryWig: { + text: t('headArmoireFlutteryWigText'), + notes: t('headArmoireFlutteryWigNotes', { attrs: 5 }), + value: 100, + int: 5, + per: 5, + str: 5, + set: 'fluttery', + canOwn: ownsItem('head_armoire_flutteryWig'), + }, }; let shield = { @@ -875,6 +895,16 @@ let shield = { // set: 'kingOfDiamonds', canOwn: ownsItem('shield_armoire_shieldOfDiamonds'), }, + flutteryFan: { + text: t('shieldArmoireFlutteryFanText'), + notes: t('shieldArmoireFlutteryFanNotes', { attrs: 5 }), + value: 100, + con: 5, + int: 5, + per: 5, + // set: 'fluttery', + canOwn: ownsItem('shield_armoire_flutteryFan'), + }, }; let headAccessory = { @@ -1156,6 +1186,16 @@ let weapon = { set: 'kingOfDiamonds', canOwn: ownsItem('weapon_armoire_scepterOfDiamonds'), }, + flutteryArmy: { + text: t('weaponArmoireFlutteryArmyText'), + notes: t('weaponArmoireFlutteryArmyNotes', { attrs: 5 }), + value: 100, + con: 5, + int: 5, + str: 5, + set: 'fluttery', + canOwn: ownsItem('weapon_armoire_flutteryArmy'), + }, }; let armoireSet = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_driving_a_coach.png b/website/raw_sprites/spritesmith/backgrounds/background_driving_a_coach.png new file mode 100644 index 0000000000..fa61024f4c Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_driving_a_coach.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_elegant_balcony.png b/website/raw_sprites/spritesmith/backgrounds/background_elegant_balcony.png new file mode 100644 index 0000000000..c66790ccff Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_elegant_balcony.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_gorgeous_greenhouse.png b/website/raw_sprites/spritesmith/backgrounds/background_gorgeous_greenhouse.png new file mode 100644 index 0000000000..5e1f5a2de3 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_gorgeous_greenhouse.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_driving_a_coach.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_driving_a_coach.png new file mode 100644 index 0000000000..671264b7ec Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_driving_a_coach.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_elegant_balcony.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_elegant_balcony.png new file mode 100644 index 0000000000..99720989e7 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_elegant_balcony.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gorgeous_greenhouse.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gorgeous_greenhouse.png new file mode 100644 index 0000000000..0c40400d13 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_gorgeous_greenhouse.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_flutteryFrock.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_flutteryFrock.png new file mode 100644 index 0000000000..774d7eec65 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_flutteryFrock.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_flutteryWig.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_flutteryWig.png new file mode 100644 index 0000000000..4d31a23000 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_flutteryWig.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_flutteryFan.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_flutteryFan.png new file mode 100644 index 0000000000..3a0a5c7964 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_flutteryFan.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_flutteryFrock.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_flutteryFrock.png new file mode 100644 index 0000000000..164ab4f9fa Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_flutteryFrock.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_flutteryWig.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_flutteryWig.png new file mode 100644 index 0000000000..eccd805a85 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_flutteryWig.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_flutteryFan.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_flutteryFan.png new file mode 100644 index 0000000000..0998cd018a Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_flutteryFan.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_flutteryArmy.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_flutteryArmy.png new file mode 100644 index 0000000000..7bea9e15cc Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_flutteryArmy.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_flutteryFrock.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_flutteryFrock.png new file mode 100644 index 0000000000..8e4bbbe154 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_flutteryFrock.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_flutteryArmy.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_flutteryArmy.png new file mode 100644 index 0000000000..2bd20188d0 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_flutteryArmy.png differ diff --git a/website/raw_sprites/spritesmith/quests/bosses/banner_flair_dysheartener.png b/website/raw_sprites/spritesmith/quests/bosses/banner_flair_dysheartener.png new file mode 100644 index 0000000000..114974af24 Binary files /dev/null and b/website/raw_sprites/spritesmith/quests/bosses/banner_flair_dysheartener.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_background_201803.png b/website/raw_sprites/spritesmith_large/promo_armoire_background_201803.png new file mode 100644 index 0000000000..85d4e4524e Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_background_201803.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201802.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201802.png deleted file mode 100644 index c1e3ded4cf..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201802.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/scene_achievement.png b/website/raw_sprites/spritesmith_large/scene_achievement.png new file mode 100644 index 0000000000..0c900350ca Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_achievement.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 22b4df73b3..abb4ab2e67 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 = 'SECOND DYSHEARTENER RAGE STRIKE! LAST CHANCE FOR LOVE BUG SET AND CUPID POTIONS'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS, ARMOIRE ITEMS, RESOLUTION SUCCESS CHALLENGE, AND TAKE THIS CHALLENGE'; const worldDmg = { // @TODO bailey: false, }; @@ -32,25 +32,30 @@ api.getNews = {

${res.t('newStuff')}

-

2/28/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

3/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-

World Boss: Dysheartener Attacks the Market!

-

Help! After feasting on our incomplete Dailies, the Dysheartener lets out another Shattering Heartbreak attack, smashing the walls and floor of the Market! As stone rains down, Alex the Merchant weeps at his crushed merchandise, stricken by the destruction.

-

We can't let this happen again! Be sure to do all our your Dailies to prevent the Dysheartener from using its final strike.

-
by Lemoness, Beffymaroo, SabreCat, viirus, piyorii, and Apollo
-
+
-

Last Chance for Love Bug Set

-

Reminder: this is the final day to subscribe and receive the Love Bug 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 Cupid Hatching Potions

-

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

-
by Willow the Witty and SabreCat
+

March Backgrounds and Armoire Items!

+

We’ve added three new backgrounds to the Background Shop! Now your avatar can enjoy Driving a Coach, relax on an Elegant Balcony, and explore a Gorgeous Greenhouse. Check them out under User Icon > Backgrounds!

+

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

+
by AnnDeLune, Nummycakes, Reesachan, DialFforFunky, Vampitch, and RandomGryffindor
+
+
+
+

March 2018 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, Reach for Your First Achievement, we're focusing on celebrating your progress so far and looking ahead! It has a 15 gem prize, which will be awarded to five lucky winners on April 2nd.

+

Congratulations to the winners of February's Challenge: angelaBelacqua, Birgitte, letsleepingmonsterslie, FlyingRhino, and Dani!

+

The next Take This Challenge has also launched, "I Am the Night!", with a focus on sleep hygiene. 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 lovinglyquietcat, and runners-up Hannah, Chrys, CTBG_R0X, lucas br, and Tarashiko! Plus, all participants in that Challenge have received a piece of the Take This item set if they hadn't completed the set already. It is located in your Rewards column. Enjoy!

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