diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 425c130a73..7fa1efcd44 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -393,5 +393,13 @@ "backgroundFlyingOverWildflowerFieldText": "Field of Wildflowers", "backgroundFlyingOverWildflowerFieldNotes": "Soar above a Field of Wildflowers.", "backgroundFlyingOverAncientForestText": "Ancient Forest", - "backgroundFlyingOverAncientForestNotes": "Fly over the canopy of an Ancient Forest." + "backgroundFlyingOverAncientForestNotes": "Fly over the canopy of an Ancient Forest.", + + "backgrounds052018": "SET 48: Released May 2018", + "backgroundTerracedRiceFieldText": "Terraced Rice Field", + "backgroundTerracedRiceFieldNotes": "Enjoy a Terraced Rice Field in the growing season.", + "backgroundFantasticalShoeStoreText": "Fantastical Shoe Store", + "backgroundFantasticalShoeStoreNotes": "Look for fun new footwear in the Fantastical Shoe Store.", + "backgroundChampionsColosseumText": "Champions' Colosseum", + "backgroundChampionsColosseumNotes": "Bask in the glory of the Champions' Colosseum." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 81091377d2..5923f3c78a 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -362,6 +362,8 @@ "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).", + "weaponArmoireCobblersHammerText": "Cobbler's Hammer", + "weaponArmoireCobblersHammerNotes": "This hammer is specially made for leatherwork. It can do a real number on a red Daily in a pinch, though. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Cobbler Set (Item 2 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -772,6 +774,8 @@ "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).", + "armorArmoireCobblersCoverallsText": "Cobbler's Coveralls", + "armorArmoireCobblersCoverallsNotes": "These sturdy coveralls have lots of pockets for tools, leather scraps, and other useful items! Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Cobbler Set (Item 1 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1431,6 +1435,8 @@ "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.", + "shieldArmoireFancyShoeText": "Fancy Shoe", + "shieldArmoireFancyShoeNotes": "A very special shoe you're working on. It's fit for royalty! Increases Intelligence and Perception by <%= attrs %> each. Enchanted Armoire: Cobbler Set (Item 3 of 3).", "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 18f511a848..bec6458349 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -661,6 +661,20 @@ let backgrounds = { notes: t('backgroundTulipGardenNotes'), }, }, + backgrounds052018: { + champions_colosseum: { + text: t('backgroundChampionsColosseumText'), + notes: t('backgroundChampionsColosseumNotes'), + }, + fantastical_shoe_store: { + text: t('backgroundFantasticalShoeStoreText'), + notes: t('backgroundFantasticalShoeStoreNotes'), + }, + terraced_rice_field: { + text: t('backgroundTerracedRiceFieldText'), + notes: t('backgroundTerracedRiceFieldNotes'), + }, + }, 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 b9d2d0d6f2..10cf3e4d62 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -340,6 +340,15 @@ let armor = { set: 'fluttery', canOwn: ownsItem('armor_armoire_flutteryFrock'), }, + cobblersCoveralls: { + text: t('armorArmoireCobblersCoverallsText'), + notes: t('armorArmoireCobblersCoverallsNotes', { attrs: 7 }), + value: 100, + per: 7, + str: 7, + set: 'cobbler', + canOwn: ownsItem('armor_armoire_cobblersCoveralls'), + }, }; let body = { @@ -937,6 +946,15 @@ let shield = { // set: 'fluttery', canOwn: ownsItem('shield_armoire_flutteryFan'), }, + fancyShoe: { + text: t('shieldArmoireFancyShoeText'), + notes: t('shieldArmoireFancyShoeNotes', { attrs: 7 }), + value: 100, + int: 7, + per: 7, + set: 'cobbler', + canOwn: ownsItem('shield_armoire_fancyShoe'), + }, }; let headAccessory = { @@ -1229,6 +1247,15 @@ let weapon = { set: 'fluttery', canOwn: ownsItem('weapon_armoire_flutteryArmy'), }, + cobblersHammer: { + text: t('weaponArmoireCobblersHammerText'), + notes: t('weaponArmoireCobblersHammerNotes', { attrs: 7 }), + value: 100, + con: 7, + str: 7, + set: 'cobbler', + canOwn: ownsItem('weapon_armoire_cobblersHammer'), + }, }; let armoireSet = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_champions_colosseum.png b/website/raw_sprites/spritesmith/backgrounds/background_champions_colosseum.png new file mode 100644 index 0000000000..142be09848 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_champions_colosseum.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_fantastical_shoe_store.png b/website/raw_sprites/spritesmith/backgrounds/background_fantastical_shoe_store.png new file mode 100644 index 0000000000..850a9dd368 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_fantastical_shoe_store.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_terraced_rice_field.png b/website/raw_sprites/spritesmith/backgrounds/background_terraced_rice_field.png new file mode 100644 index 0000000000..5e1ccd989f Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_terraced_rice_field.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_champions_colosseum.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_champions_colosseum.png new file mode 100644 index 0000000000..ec9a1b4a07 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_champions_colosseum.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_fantastical_shoe_store.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_fantastical_shoe_store.png new file mode 100644 index 0000000000..b93725c749 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_fantastical_shoe_store.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_terraced_rice_field.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_terraced_rice_field.png new file mode 100644 index 0000000000..34bff25c9e Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_terraced_rice_field.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_cobblersCoveralls.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_cobblersCoveralls.png new file mode 100644 index 0000000000..af3cb8bb55 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_cobblersCoveralls.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fancyShoe.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fancyShoe.png new file mode 100644 index 0000000000..8f0823f778 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fancyShoe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_cobblersCoveralls.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_cobblersCoveralls.png new file mode 100644 index 0000000000..8afdf66a32 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_cobblersCoveralls.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fancyShoe.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fancyShoe.png new file mode 100644 index 0000000000..4c8e9dddcf Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fancyShoe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_cobblersHammer.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_cobblersHammer.png new file mode 100644 index 0000000000..eca5bbcfe5 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_cobblersHammer.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_cobblersCoveralls.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_cobblersCoveralls.png new file mode 100644 index 0000000000..27d5bc12ed Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_cobblersCoveralls.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_cobblersHammer.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_cobblersHammer.png new file mode 100644 index 0000000000..e680b55ee1 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_cobblersHammer.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_background_201804.png b/website/raw_sprites/spritesmith_large/promo_armoire_background_201804.png deleted file mode 100644 index b840f4bc93..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_background_201804.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201805.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201805.png new file mode 100644 index 0000000000..082dc52f44 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201805.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_todos.png b/website/raw_sprites/spritesmith_large/scene_todos.png new file mode 100644 index 0000000000..b8c52d399d Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_todos.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 6a239e576c..5d746ce57f 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 APRIL GOODIES!'; +const LAST_ANNOUNCEMENT_TITLE = 'NEW BACKGROUNDS, ARMOIRE ITEMS, AND OFFICIAL HABITICA CHALLENGES FOR MAY'; const worldDmg = { // @TODO bailey: false, }; @@ -32,28 +32,34 @@ api.getNews = {

${res.t('newStuff')}

-

4/30/2018 - ${LAST_ANNOUNCEMENT_TITLE}

+

5/1/2018 - ${LAST_ANNOUNCEMENT_TITLE}

-
-
+
-
+

New Backgrounds and Armoire Items

+

We’ve added three new backgrounds to the Background Shop! Now your avatar can tiptoe through a Terraced Rice Field, bask in the glory of the Champions' Colosseum, and look for fun new footwear in the Fantastical Shoe Store. Check them out under User Icon > Backgrounds!

+

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

+
by Katy133, confusus, TheMushroomKing, khdarkwolf, RandomGryffindor, ChimeraLiani, and Mewrose
+
+
-

Last Chance for Spiffy Squirrel Set

-

Reminder: this is the final day to subscribe and receive the Spiffy Squirrel Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get!

+

May 2018 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, Review your Combat Tactics, we're focusing on refining your strategy to help you stay motivated and keep moving forward as we're almost halfway through the year! It has a 15 gem prize, which will be awarded to five lucky winners on June 1st.

-
-

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

-
by Beffymaroo
-

Last Chance for Spring Fling Hatching Potions, Equipment, Avatar Skins and Hair Colors, and Seasonal Shop Items

-

Spring Fling is coming to a close, so be sure to grab any exciting items you've had your eye on! This includes the Shimmer and Rainbow Hatching Potions in the Market. If they come back, it won't be until next year at the earliest, so don't delay!

-

Pastel Skins and Shimmer Hair colors will also disappear when the Gala ends. If you purchase them in User > Avatar, you can use them year-round!

-

Be sure to also get your limited edition Spring Fling equipment in your Rewards Column! When it returns next year, it will be in the Seasonal Shop and will be available for gems rather than gold.

-

And lastly, it's a great time to stock up on items from the Seasonal Shop before it closes. This includes past Spring Fling equipment, the Egg Hunt Quest, and Shiny Seeds!

-
by Scarvia, Awesome kitty, usnbfs, Lemoness, Balduranne, PainterProphet, Vikte, Lalaitha, DialFForFunky, Gerald the Pixel, Beffymaroo and SabreCat
+
+

Congratulations to the winners of the April Challenge: V-Starr, Carlos Víquez, lilliburlero, NowyChris, and PizzaMyHeart!

+
+
+

The next Take This Challenge has also launched, "Keep Calm and Carry On!", with a focus on deep breathing to settle stressful 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, "Test Thy Courage!": grand prize winner Nietos, and runners-up Teslectrik, Mflute, Kolthar, lilyandrosemary, and thewandererrae! Plus, all participants in that Challenge have received a piece of the Take This item set if they didn't have all the pieces already. It is located in your Rewards column. Enjoy!

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