diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 99c3cfe0c4..5c2385952f 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -587,6 +587,14 @@ "backgroundRainyBarnyardText": "Rainy Barnyard", "backgroundRainyBarnyardNotes": "Take a soggy splashy stroll through a Rainy Barnyard.", + "backgrounds052020": "SET 72: Released May 2020", + "backgroundHabitCityRooftopsText": "Habit City Rooftops", + "backgroundHabitCityRooftopsNotes": "Leap adventurously between the Rooftops of Habit City.", + "backgroundHotAirBalloonText": "Hot Air Balloon", + "backgroundHotAirBalloonNotes": "Soar above the landscape in a Hot Air Balloon.", + "backgroundStrawberryPatchText": "Strawberry Patch", + "backgroundStrawberryPatchNotes": "Pick fresh treats from a Strawberry Patch.", + "timeTravelBackgrounds": "Steampunk Backgrounds", "backgroundAirshipText": "Airship", "backgroundAirshipNotes": "Become a sky sailor on board your very own Airship.", diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index d286ea7eba..b0e3e81912 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -488,6 +488,8 @@ "weaponArmoireBaseballBatNotes": "Get a home run on those good habits! Increases Constitution by <%= con %>. Enchanted Armoire: Baseball Set (Item 3 of 4).", "weaponArmoirePaperCutterText": "Paper Cutter", "weaponArmoirePaperCutterNotes": "This may not look fearsome, but have you never had a papercut? Increases Strength by <%= str %>. Enchanted Armoire: Paper Knight Set (Item 1 of 3).", + "weaponArmoireFiddlersBowText": "Fiddler's Bow", + "weaponArmoireFiddlersBowNotes": "You can coax music out of anything with this! ...A violin might work best, though. Increases Strength by <%= str %>. Enchanted Armoire: Fiddler Set (Item 3 of 4).", "armor": "armor", "armorCapitalized": "Armor", @@ -1049,7 +1051,9 @@ "armorArmoireBaseballUniformText": "Baseball Uniform", "armorArmoireBaseballUniformNotes": "Pinstripes never go out of style. Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Baseball Set (Item 2 of 4).", "armorArmoireBoxArmorText": "Box Armor", - "armorArmoireBoxArmorNotes": "Box Armor: It fits, therefore you sits... uh, therefore you wear it into battle, like the bold knight you are! Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Paper Knight Set (Item 3 of 3). ", + "armorArmoireBoxArmorNotes": "Box Armor: It fits, therefore you sits... uh, therefore you wear it into battle, like the bold knight you are! Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Paper Knight Set (Item 3 of 3).", + "armorArmoireFiddlersCoatText": "Fiddler's Coat", + "armorArmoireFiddlersCoatNotes": "A practical outfit to give you plenty of room to move! Increases Constitution by <%= con %>. Enchanted Armoire: Fiddler Set (Item 2 of 4).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1628,6 +1632,8 @@ "headArmoireMatchMakersBeretNotes": "You'll look striking wearing this lovely hat! Increases Constitution by <%= con %>. Enchanted Armoire: Match Maker Set (Item 2 of 4).", "headArmoireBaseballCapText": "Baseball Cap", "headArmoireBaseballCapNotes": "Let everyone know that you're on Team Habitica! Increases Constitution and Strength by <%= attrs %> each. Enchanted Armoire: Baseball Set (Item 1 of 4).", + "headArmoireFiddlersCapText": "Fiddler's Cap", + "headArmoireFiddlersCapNotes": "Put on this jaunty cap to let everyone know who's dancing to whose tune! Increases Perception by <%= per %>. Enchanted Armoire: Fiddler Set (Item 1 of 4).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -1943,6 +1949,8 @@ "shieldArmoireBaseballGloveNotes": "Perfect for the big tournament, or a friendly game of catch between tasks. Increases Strength by <%= str %>. Enchanted Armoire: Baseball Set (Item 4 of 4).", "shieldArmoireHobbyHorseText": "Hobby Horse", "shieldArmoireHobbyHorseNotes": "Ride your handsome hobby-horse steed toward your just Rewards! Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Paper Knight Set (Item 2 of 3).", + "shieldArmoireFiddleText": "Fiddler's Violin", + "shieldArmoireFiddleNotes": "A perfect instrument that always strikes the right note in company. Increases Intelligence by <%= int %>. Enchanted Armoire: Fiddler 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 6e6317f95a..70c51a46fd 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -997,6 +997,20 @@ const backgrounds = { notes: t('backgroundRainyBarnyardNotes'), }, }, + backgrounds052020: { + habit_city_rooftops: { + text: t('backgroundHabitCityRooftopsText'), + notes: t('backgroundHabitCityRooftopsNotes'), + }, + hot_air_balloon: { + text: t('backgroundHotAirBalloonText'), + notes: t('backgroundHotAirBalloonNotes'), + }, + strawberry_patch: { + text: t('backgroundStrawberryPatchText'), + notes: t('backgroundStrawberryPatchNotes'), + }, + }, timeTravelBackgrounds: { airship: { text: t('backgroundAirshipText'), diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 3ec1e7289f..611a079f46 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -552,6 +552,14 @@ const armor = { set: 'paperKnight', canOwn: ownsItem('armor_armoire_boxArmor'), }, + fiddlersCoat: { + text: t('armorArmoireFiddlersCoatText'), + notes: t('armorArmoireFiddlersCoatNotes', { con: 6 }), + value: 100, + con: 6, + set: 'fiddler', + canOwn: ownsItem('armor_armoire_fiddlersCoat'), + }, }; const body = { @@ -1116,6 +1124,14 @@ const head = { set: 'baseball', canOwn: ownsItem('head_armoire_baseballCap'), }, + fiddlersCap: { + text: t('headArmoireFiddlersCapText'), + notes: t('headArmoireFiddlersCapNotes', { per: 6 }), + value: 100, + per: 6, + set: 'fiddler', + canOwn: ownsItem('head_armoire_fiddlersCap'), + }, }; const shield = { @@ -1436,6 +1452,14 @@ const shield = { set: 'paperKnight', canOwn: ownsItem('shield_armoire_hobbyHorse'), }, + fiddle: { + text: t('shieldArmoireFiddleText'), + notes: t('shieldArmoireFiddleNotes', { int: 6 }), + value: 100, + int: 6, + set: 'fiddler', + canOwn: ownsItem('shield_armoire_fiddle'), + }, }; const headAccessory = { @@ -1923,6 +1947,14 @@ const weapon = { set: 'paperKnight', canOwn: ownsItem('weapon_armoire_paperCutter'), }, + fiddlersBow: { + text: t('weaponArmoireFiddlersBowText'), + notes: t('weaponArmoireFiddlersBowNotes', { str: 6 }), + value: 100, + str: 6, + set: 'fiddler', + canOwn: ownsItem('weapon_armoire_fiddlersBow'), + }, }; export { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_habit_city_rooftops.png b/website/raw_sprites/spritesmith/backgrounds/background_habit_city_rooftops.png new file mode 100644 index 0000000000..1f4384b449 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_habit_city_rooftops.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_hot_air_balloon.png b/website/raw_sprites/spritesmith/backgrounds/background_hot_air_balloon.png new file mode 100644 index 0000000000..fdeb8ae9fe Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_hot_air_balloon.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_strawberry_patch.png b/website/raw_sprites/spritesmith/backgrounds/background_strawberry_patch.png new file mode 100644 index 0000000000..d16aed800e Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_strawberry_patch.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_habit_city_rooftops.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_habit_city_rooftops.png new file mode 100644 index 0000000000..940343341b Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_habit_city_rooftops.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_hot_air_balloon.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_hot_air_balloon.png new file mode 100644 index 0000000000..97289a8a28 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_hot_air_balloon.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_strawberry_patch.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_strawberry_patch.png new file mode 100644 index 0000000000..6c3e0e9d20 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_strawberry_patch.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_fiddlersCoat.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_fiddlersCoat.png new file mode 100644 index 0000000000..7a69d2b22c Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_fiddlersCoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_fiddlersCap.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_fiddlersCap.png new file mode 100644 index 0000000000..8714d92f42 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_fiddlersCap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fiddle.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fiddle.png new file mode 100644 index 0000000000..f5f2d200fc Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_fiddle.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_fiddlersCoat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_fiddlersCoat.png new file mode 100644 index 0000000000..a648dd9fdf Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_fiddlersCoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_fiddlersCap.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_fiddlersCap.png new file mode 100644 index 0000000000..ccbc531f43 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_fiddlersCap.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fiddle.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fiddle.png new file mode 100644 index 0000000000..1bc02f9a2a Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_fiddle.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_fiddlersBow.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_fiddlersBow.png new file mode 100644 index 0000000000..1ad1169f75 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_fiddlersBow.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_fiddlersCoat.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_fiddlersCoat.png new file mode 100644 index 0000000000..d87df94f8d Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_fiddlersCoat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_fiddlersBow.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_fiddlersBow.png new file mode 100644 index 0000000000..0e41b3f458 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_fiddlersBow.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202004.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202004.png deleted file mode 100644 index 873a9313a0..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202004.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202005.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202005.png new file mode 100644 index 0000000000..076a0be815 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202005.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index c810446075..cc804c3b5d 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 = 'MAY SUBSCRIBER ITEMS AND OFFICIAL HABITICA CHALLENGES!'; +const LAST_ANNOUNCEMENT_TITLE = 'MAY BACKGROUNDS AND ARMOIRE ITEMS!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,65 +31,22 @@ api.getNews = {

${res.t('newStuff')}

-

5/4/2020 - ${LAST_ANNOUNCEMENT_TITLE}

+

5/5/2020 - ${LAST_ANNOUNCEMENT_TITLE}

-
-

May Subscriber Items Revealed!

+

- The May Subscriber Item Set has been revealed: the Wondrous Wyvern Item Set! Subscribe to Habitica by May 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 soar in a + Hot Air Balloon, pick fresh treats in a Strawberry Patch, and caper on Habit City + Rooftops. Check them out under User Icon > Backgrounds on web and Menu > Inventory > + Customize Avatar on mobile!

- Subscribers also receive the ability to buy Gems with 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. + Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the + Fiddler Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)

-
by Beffymaroo
-
-

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

-

- Congratulations to the winners of April's Challenge: @Auralov, @organized_aspie, - @yasaminnb, @noblegeas and @Nodel! -

-

- The next Take This Challenge has also launched, "Don't Be a Completionist!", - with a focus on prioritization. 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, "This One Goes to 11!": - grand prize winner @Daphne36, and runners-up @aggripa, @Lily_of_the_valley, - @Mockingjayabi, @Cirth, and @KatieIrene! 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 -
+
by FolleMente, QuartzFox, Katy133, weeWitch, and Ricardo
`, });