diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index bceb1cfd99..1be602e71c 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -505,5 +505,13 @@ "backgroundSeasideCliffsText": "Seaside Cliffs", "backgroundSeasideCliffsNotes": "Stand on a beach with the beauty of Seaside Cliffs above.", "backgroundUnderwaterVentsText": "Underwater Vents", - "backgroundUnderwaterVentsNotes": "Take a deep dive down, down to the Underwater Vents." + "backgroundUnderwaterVentsNotes": "Take a deep dive down, down to the Underwater Vents.", + + "backgrounds072019": "SET 62: Released July 2019", + "backgroundLakeWithFloatingLanternsText": "Lake with Floating Lanterns", + "backgroundLakeWithFloatingLanternsNotes": "Stargaze from the festival atmosphere of a Lake with Floating Lanterns.", + "backgroundFlyingOverTropicalIslandsText": "Flying over Tropical Islands", + "backgroundFlyingOverTropicalIslandsNotes": "Let the view take your breath away as you Fly over Tropical Islands.", + "backgroundAmongGiantAnemonesText": "Among Giant Anemones", + "backgroundAmongGiantAnemonesNotes": "Explore reef life, protected from predators Among Giant Anemones." } diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json index 40d3a983bb..81125868fb 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -435,6 +435,8 @@ "weaponArmoireNephriteBowNotes": "This bow shoots special jade-tipped arrows that will take down even your most stubborn bad habits! Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Nephrite Archer Set (Item 1 of 3).", "weaponArmoireBambooCaneText": "Bamboo Cane", "weaponArmoireBambooCaneNotes": "Perfect for assisting you in a stroll, or for dancing the Charleston. Increases Intelligence, Perception, and Constitution by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 3 of 3).", + "weaponArmoireAstronomersTelescopeText": "Astronomer's Telescope", + "weaponArmoireAstronomersTelescopeNotes": "An instrument that will allow you to observe the stars' ancient dance. Increases Perception by <%= per %>. Enchanted Armoire: Astronomer Mage Set (Item 3 of 3).", "armor": "armor", "armorCapitalized": "Armor", @@ -940,6 +942,8 @@ "armorArmoireNephriteArmorNotes": "Made from strong steel rings and decorated with jade, this armor will protect you from procrastination! Increases Strength by <%= str %> and Perception by <%= per %>. Enchanted Armoire: Nephrite Archer Set (Item 3 of 3).", "armorArmoireBoatingJacketText": "Boating Jacket", "armorArmoireBoatingJacketNotes": "Whether you're on a swanky yacht or in a jalopy, you'll be the cat's meow in this jacket and tie. Increases Strength, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 1 of 3).", + "armorArmoireAstronomersRobeText": "Astronomer's Robe", + "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).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1457,6 +1461,8 @@ "headArmoireNephriteHelmNotes": "The carved jade plume atop this helm is enchanted to enhance your aim. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Nephrite Archer Set (Item 2 of 3).", "headArmoireBoaterHatText": "Boater Hat", "headArmoireBoaterHatNotes": "This straw chapeau is the bee's knees! Increases Strength, Constitution, and Perception by <%= attrs %> each. Enchanted Armoire: Boating Set (Item 2 of 3).", + "headArmoireAstronomersHatText": "Astronomer's Hat", + "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).", "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 9a318ad78f..ebea656ffb 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -857,6 +857,20 @@ let backgrounds = { notes: t('backgroundUnderwaterVentsNotes'), }, }, + backgrounds072019: { + lake_with_floating_lanterns: { + text: t('backgroundLakeWithFloatingLanternsText'), + notes: t('backgroundLakeWithFloatingLanternsNotes'), + }, + flying_over_tropical_islands: { + text: t('backgroundFlyingOverTropicalIslandsText'), + notes: t('backgroundFlyingOverTropicalIslandsNotes'), + }, + among_giant_anemones: { + text: t('backgroundAmongGiantAnemonesText'), + notes: t('backgroundAmongGiantAnemonesNotes'), + }, + }, incentiveBackgrounds: { violet: { text: t('backgroundVioletText'), diff --git a/website/common/script/content/appearance/sets.js b/website/common/script/content/appearance/sets.js index b8fd74b1a4..44768bd000 100644 --- a/website/common/script/content/appearance/sets.js +++ b/website/common/script/content/appearance/sets.js @@ -18,6 +18,6 @@ module.exports = prefill({ pastelSkins: {setPrice: 5, availableFrom: '2019-04-09', availableUntil: '2019-05-02', text: t('pastelSkins')}, spookySkins: {setPrice: 5, availableUntil: '2016-01-01', text: t('spookySkins')}, supernaturalSkins: {setPrice: 5, availableFrom: '2018-10-11', availableUntil: '2018-11-02', text: t('supernaturalSkins')}, - splashySkins: {setPrice: 5, availableFrom: '2018-07-10', availableUntil: '2018-08-02', text: t('splashySkins')}, + splashySkins: {setPrice: 5, availableFrom: '2019-07-02', availableUntil: '2019-08-02', text: t('splashySkins')}, winterySkins: {setPrice: 5, availableFrom: '2019-01-08', availableUntil: '2019-02-02', text: t('winterySkins')}, }); diff --git a/website/common/script/content/constants.js b/website/common/script/content/constants.js index 3f12ba2960..66d55142d8 100644 --- a/website/common/script/content/constants.js +++ b/website/common/script/content/constants.js @@ -36,7 +36,7 @@ export const EVENTS = { fall2018: { start: '2018-09-20', end: '2018-11-02' }, winter2019: { start: '2018-12-19', end: '2019-02-02' }, spring2019: { start: '2019-03-19', end: '2019-05-02' }, - summer2019: { start: '2019-06-18', end: '2019-07-02' }, + summer2019: { start: '2019-06-18', end: '2019-08-02' }, }; export const SEASONAL_SETS = { diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 1fdba83547..ec89980da0 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -472,6 +472,15 @@ let armor = { set: 'boating', canOwn: ownsItem('armor_armoire_boatingJacket'), }, + astronomersRobe: { + text: t('armorArmoireAstronomersRobeText'), + notes: t('armorArmoireAstronomersRobeNotes', { attrs: 8 }), + value: 100, + per: 8, + con: 8, + set: 'astronomer', + canOwn: ownsItem('armor_armoire_astronomersRobe'), + }, }; let body = { @@ -969,6 +978,14 @@ let head = { set: 'boating', canOwn: ownsItem('head_armoire_boaterHat'), }, + astronomersHat: { + text: t('headArmoireAstronomersHatText'), + notes: t('headArmoireAstronomersHatNotes', { con: 10 }), + value: 100, + con: 10, + set: 'astronomer', + canOwn: ownsItem('head_armoire_astronomersHat'), + }, }; let shield = { @@ -1632,6 +1649,14 @@ let weapon = { set: 'boating', canOwn: ownsItem('weapon_armoire_bambooCane'), }, + astronomersTelescope: { + text: t('weaponArmoireAstronomersTelescopeText'), + notes: t('weaponArmoireAstronomersTelescopeNotes', { per: 10 }), + value: 100, + per: 10, + set: 'astronomer', + canOwn: ownsItem('weapon_armoire_astronomersTelescope'), + }, }; let armoireSet = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_among_giant_anemones.png b/website/raw_sprites/spritesmith/backgrounds/background_among_giant_anemones.png new file mode 100644 index 0000000000..c1df36ada7 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_among_giant_anemones.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_flying_over_tropical_islands.png b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_tropical_islands.png new file mode 100644 index 0000000000..fdbda37ceb Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_flying_over_tropical_islands.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_lake_with_floating_lanterns.png b/website/raw_sprites/spritesmith/backgrounds/background_lake_with_floating_lanterns.png new file mode 100644 index 0000000000..cd1f6a94f1 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_lake_with_floating_lanterns.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_anemones.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_anemones.png new file mode 100644 index 0000000000..1bd2b8a765 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_among_giant_anemones.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_the_ocean.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_the_ocean.png new file mode 100644 index 0000000000..d146d87d6e Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_flying_over_the_ocean.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_lake_with_floating_lanterns.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_lake_with_floating_lanterns.png new file mode 100644 index 0000000000..f5aea69205 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_lake_with_floating_lanterns.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_astronomersRobe.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_astronomersRobe.png new file mode 100644 index 0000000000..55216cadee Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_astronomersRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_astronomersHat.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_astronomersHat.png new file mode 100644 index 0000000000..b03a1c5ac4 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_astronomersHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_astronomersRobe.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_astronomersRobe.png new file mode 100644 index 0000000000..ff0baa4338 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_astronomersRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_astronomersHat.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_astronomersHat.png new file mode 100644 index 0000000000..fb93ea2b00 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_astronomersHat.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_astronomersTelescope.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_astronomersTelescope.png new file mode 100644 index 0000000000..5932b7f692 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_weapon_armoire_astronomersTelescope.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_astronomersRobe.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_astronomersRobe.png new file mode 100644 index 0000000000..084d16f12f Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_astronomersRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_astronomersTelescope.png b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_astronomersTelescope.png new file mode 100644 index 0000000000..a793a522bc Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/weapon_armoire_astronomersTelescope.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png deleted file mode 100644 index 45b75e38a9..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201906.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201907.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201907.png new file mode 100644 index 0000000000..16cd9c0eeb Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_201907.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_bronze_quest.png b/website/raw_sprites/spritesmith_large/promo_bronze_quest.png deleted file mode 100644 index 6e8ab73fc4..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_bronze_quest.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_dolphin_quest.png b/website/raw_sprites/spritesmith_large/promo_dolphin_quest.png deleted file mode 100644 index 269b7ea156..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_dolphin_quest.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_halfmoon_glasses.png b/website/raw_sprites/spritesmith_large/promo_halfmoon_glasses.png deleted file mode 100644 index 5276f2458d..0000000000 Binary files a/website/raw_sprites/spritesmith_large/promo_halfmoon_glasses.png and /dev/null differ diff --git a/website/raw_sprites/spritesmith_large/promo_splashy_skins.png b/website/raw_sprites/spritesmith_large/promo_splashy_skins.png new file mode 100644 index 0000000000..44ed12f1c9 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_splashy_skins.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_positivity.png b/website/raw_sprites/spritesmith_large/scene_positivity.png deleted file mode 100644 index e5268b8fb3..0000000000 Binary files a/website/raw_sprites/spritesmith_large/scene_positivity.png and /dev/null differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 2e6eca7f6e..bb3fcab5eb 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 JUNE ITEMS; NEW OFFICIAL CHALLENGES'; +const LAST_ANNOUNCEMENT_TITLE = 'SPLASHY SKINS, BACKGROUNDS, ARMOIRE ITEMS, AND BLOG POST'; const worldDmg = { // @TODO bailey: false, }; @@ -30,29 +30,24 @@ api.getNews = {

${res.t('newStuff')}

-

7/1/2019 - ${LAST_ANNOUNCEMENT_TITLE}

+

7/2/2019 - ${LAST_ANNOUNCEMENT_TITLE}


-
-

Last Chance for Kindly Koi Set

-

Reminder: tomorrow is the last day you can subscribe and receive the Kindly Koi Set! Subscribing also lets you buy Gems with 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 Oddballs Pet Quest Bundle

-

Tomorrow is also the last day to buy the discounted Oddballs Pet Quest Bundle, featuring the Rock, Yarn, and Marshmallow Slime quests all for seven gems! Be sure to snag it before it rolls away from the Quest Shop!

-
Art by PainterProphet, Pfeffernusse, Zorelya, intune, starsystemic, Leephon, Arcosine, stefalupagus, Hachiseiko, TheMushroomKing, khdarkwolf, Vampitch, JinjooHat, UncommonCriminal, Oranges, Darkly, overomega, celticdragon, and Shaner
-
Writing by Bartelmy, Faelwyn the Rising Phoenix, Theothermeme, Bethany Woll, itokro, and Lemoness
-
-

July 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, Convene Your Companions, we're focusing on building accountability with your friends in Habitica's social spaces! It has a 15 Gem prize, which will be awarded to five lucky winners on August 1.

-

Congratulations to the winners of June's Challenge, whisperingwraith, katie9, Mavro_Asteri, Chasquared, and Taichi1!

-

The next Take This Challenge has also launched, "Rolling a Natural 1!", with a focus on coping with adversity. 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, "You've Got a Friend in Me!": grand prize winner 13_phoenix, and runners-up rpelepei, Khaamo, kikithegecko, calankh, and augustgreatsword! 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
-
+
+

Splashy Skins

+

The Seasonal Edition Splashy Skins are back! You can complete your summer avatar look with Clownfish, Deep Ocean, Tropical Water, Mergold, Mergreen, Merblue, Merruby, and Shark Skins.

+

This Seasonal Edition customization set will only be available to purchase until July 31st, after which they'll be gone until next year, so be sure to swoop them up now! You can find them in User>Edit Avatar!

+
by Lemoness and UncommonCriminal
+
+

July Backgrounds and Armoire Items

+

We’ve added three new backgrounds to the Background Shop! Now your avatar can enjoy the view while Flying Over Tropical Islands, explore reef life Among Giant Anemones, and stargaze on a Lake with Floating Lanterns. Check them out under User Icon > Backgrounds!

+

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

+
by Tashus, Tigergurke, Vikte, QuartzFox, Gully, Swazzy, and SabreCat
+
+

Blog Post: Warrior

+

This month's featured Wiki article is about the Warrior class! We hope that it will help you as you explore the advantages of each class. Be sure to check it out, and let us know what you think by reaching out on Twitter, Tumblr, and Facebook.

+
by shanaqui and the Wiki Wizards
`, });