diff --git a/website/common/locales/en/backgrounds.json b/website/common/locales/en/backgrounds.json index 2ec47772f8..628b740a22 100644 --- a/website/common/locales/en/backgrounds.json +++ b/website/common/locales/en/backgrounds.json @@ -611,6 +611,14 @@ "backgroundUnderwaterRuinsText": "Underwater Ruins", "backgroundUnderwaterRuinsNotes": "Explore Underwater Ruins sunk long ago.", + "backgrounds082020": "SET 75: Released August 2020", + "backgroundCampingOutText": "Camping Out", + "backgroundCampingOutNotes": "Enjoy the outdoors by Camping Out.", + "backgroundJungleCanopyText": "Jungle Canopy", + "backgroundJungleCanopyNotes": "Bask in the sweltering splendor of a Jungle Canopy.", + "backgroundProductivityPlazaText": "Productivity Plaza", + "backgroundProductivityPlazaNotes": "Take an inspirational stroll through Habit City's Productivity Plaza.", + "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 9dd812b6bd..a5de6bf74c 100644 --- a/website/common/locales/en/gear.json +++ b/website/common/locales/en/gear.json @@ -1082,6 +1082,8 @@ "armorArmoireFiddlersCoatNotes": "A practical outfit to give you plenty of room to move! Increases Constitution by <%= con %>. Enchanted Armoire: Fiddler Set (Item 2 of 4).", "armorArmoirePirateOutfitText": "Pirate Outfit", "armorArmoirePirateOutfitNotes": "Avast, ye landlubbers! The perfect outfit for swabbing the deck and counting your spoils. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Pirate Set (Item 2 of 3).", + "armorArmoireHeroicHerbalistRobeText": "Heroic Herbalist Robe", + "armorArmoireHeroicHerbalistRobeNotes": "Always smells pleasantly of all kinds of herbs. Increases Constitution and Intelligence by <%= attrs %> each. Enchanted Armoire: Heroic Herbalist Set (Item 1 of 3).", "headgear": "helm", "headgearCapitalized": "Headgear", @@ -1677,6 +1679,8 @@ "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).", + "headArmoireHeroicHerbalistCrispinetteText": "Heroic Herbalist Crispinette", + "headArmoireHeroicHerbalistCrispinetteNotes": "This handy headdress will help you keep your hair out of the way... It doesn't hurt that it also adds to the mystique. Increases Intelligence by <%= int %>. Enchanted Armoire: Heroic Herbalist Set (Item 3 of 3).", "offhand": "off-hand item", "offhandCapitalized": "Off-Hand Item", @@ -1971,6 +1975,8 @@ "shieldArmoireLifeBuoyNotes": "Oh buoy! This will come in handy if you spot someone struggling in a sea of tasks and responsibilities. Increases Constitution by <%= con %>. Enchanted Armoire: Lifeguard Set (Item 2 of 3).", "shieldArmoirePiratesCompanionText": "Pirate's Companion", "shieldArmoirePiratesCompanionNotes": "Perfect if you want to talk your enemies to death, this parrot never shuts up. Maybe it'll remind you about your tasks too! Increases Perception by <%= per %>. Enchanted Armoire: Pirate Set (Item 3 of 3).", + "shieldArmoireMortarAndPestleText": "Mortar and Pestle", + "shieldArmoireMortarAndPestleNotes": "The most important equipment in the herbalist's arsenal! Grind up your ingredients for your herbal concoctions, and put your back into it! Increases Constitution by <%= con %>. Enchanted Armoire: Heroic Herbalist Set (Item 2 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 a0bac69c8c..c63ceeb4e7 100644 --- a/website/common/script/content/appearance/backgrounds.js +++ b/website/common/script/content/appearance/backgrounds.js @@ -390,6 +390,11 @@ const backgrounds = { swimming_among_jellyfish: { }, underwater_ruins: { }, }, + backgrounds082020: { + camping_out: { }, + jungle_canopy: { }, + productivity_plaza: { }, + }, timeTravelBackgrounds: { airship: { price: 1, diff --git a/website/common/script/content/gear/sets/armoire.js b/website/common/script/content/gear/sets/armoire.js index 15754cd556..f9f4f17c6c 100644 --- a/website/common/script/content/gear/sets/armoire.js +++ b/website/common/script/content/gear/sets/armoire.js @@ -317,6 +317,11 @@ const armor = { int: 4, set: 'pirate', }, + heroicHerbalistRobe: { + con: 7, + int: 7, + set: 'herbalist', + }, }; const body = { @@ -635,6 +640,10 @@ const head = { per: 6, set: 'fiddler', }, + heroicHerbalistCrispinette: { + int: 9, + set: 'herbalist', + }, }; const shield = { @@ -816,6 +825,10 @@ const shield = { per: 8, set: 'pirate', }, + mortarAndPestle: { + con: 9, + set: 'herbalist', + }, }; const headAccessory = { diff --git a/website/raw_sprites/spritesmith/backgrounds/background_camping_out.png b/website/raw_sprites/spritesmith/backgrounds/background_camping_out.png new file mode 100644 index 0000000000..0aacea1aa6 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_camping_out.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_jungle_canopy.png b/website/raw_sprites/spritesmith/backgrounds/background_jungle_canopy.png new file mode 100644 index 0000000000..e0ab8eea22 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_jungle_canopy.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/background_productivity_plaza.png b/website/raw_sprites/spritesmith/backgrounds/background_productivity_plaza.png new file mode 100644 index 0000000000..29f86bfa87 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/background_productivity_plaza.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_camping_out.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_camping_out.png new file mode 100644 index 0000000000..be6676e8d0 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_camping_out.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_jungle_canopy.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_jungle_canopy.png new file mode 100644 index 0000000000..3e7718ab48 Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_jungle_canopy.png differ diff --git a/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_productivity_plaza.png b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_productivity_plaza.png new file mode 100644 index 0000000000..b4efb82bee Binary files /dev/null and b/website/raw_sprites/spritesmith/backgrounds/icons/icon_background_productivity_plaza.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_heroicHerbalistRobe.png b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_heroicHerbalistRobe.png new file mode 100644 index 0000000000..2be0f590ec Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/broad_armor_armoire_heroicHerbalistRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/head_armoire_heroicHerbalistCrispinette.png b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_heroicHerbalistCrispinette.png new file mode 100644 index 0000000000..f58e5306a6 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/head_armoire_heroicHerbalistCrispinette.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_mortarAndPestle.png b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_mortarAndPestle.png new file mode 100644 index 0000000000..4da9dd7732 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shield_armoire_mortarAndPestle.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_heroicHerbalistRobe.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_heroicHerbalistRobe.png new file mode 100644 index 0000000000..0d348f24f5 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_armor_armoire_heroicHerbalistRobe.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_heroicHerbalistCrispinette.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_heroicHerbalistCrispinette.png new file mode 100644 index 0000000000..59265c19b7 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_head_armoire_heroicHerbalistCrispinette.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_mortarAndPestle.png b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_mortarAndPestle.png new file mode 100644 index 0000000000..6c12c43630 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/shop/shop_shield_armoire_mortarAndPestle.png differ diff --git a/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_heroicHerbalistRobe.png b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_heroicHerbalistRobe.png new file mode 100644 index 0000000000..15a667df48 Binary files /dev/null and b/website/raw_sprites/spritesmith/gear/armoire/slim_armor_armoire_heroicHerbalistRobe.png differ diff --git a/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202008.png b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202008.png new file mode 100644 index 0000000000..6f7aec4493 Binary files /dev/null and b/website/raw_sprites/spritesmith_large/promo_armoire_backgrounds_202008.png differ diff --git a/website/raw_sprites/spritesmith_large/scene_reading.png b/website/raw_sprites/spritesmith_large/scene_reading.png new file mode 100644 index 0000000000..5b708b2c8b Binary files /dev/null and b/website/raw_sprites/spritesmith_large/scene_reading.png differ diff --git a/website/server/controllers/api-v3/news.js b/website/server/controllers/api-v3/news.js index 8f37859fc5..17f1438813 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 = 'AUGUST 2020 SUBSCRIBER ITEMS AND OFFICIAL CHALLENGES!'; +const LAST_ANNOUNCEMENT_TITLE = 'BACK TO SCHOOL CHALLENGE, NEW BACKGROUNDS, AND NEW ENCHANTED ARMOIRE ITEMS!'; const worldDmg = { // @TODO bailey: false, }; @@ -31,65 +31,37 @@ api.getNews = {
- The August Subscriber Items been revealed: the Owlish Oracle Item Set! Subscribe to Habitica by August 30 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! -
-- 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. + The school year is looming large for many scholarly Habiticans, so we've prepared a + special Back-to-School + Challenge to help with the transition between summer and semester. Check it out now + for a chance to win: five lucky winners will get a badge for their profile and their + choice of a gift subscription or Gems!
- 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, Count - Your Treasure, we're focusing on the importance of rewards! It has a 15 Gem prize, - which will be awarded to five lucky winners on September 1st. + We’ve added three new backgrounds to the Background Shop! Now your avatar can stroll + through Habit City's Productivity Plaza, enjoy the outdoors by Camping Out, or bask in + the splendor of the Jungle Canopy. Check them out under User Icon > Backgrounds on web + and Menu > Inventory > Customize Avatar on mobile!
- Congratulations to the winners of July's Challenge, @Jefferwocky, @Hyumi-chan, @stinawp, - @JumpingJill, and @GreaneWolf! -
-- The next Take This Challenge has also launched, "Achievement Unlocked: - Self-Care!", with a focus on being kind to ourselves. 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, "+2 Intelligence Bonus!": - grand prize winner @Tetrakatus, and runners-up @spinelissad, @DKimmortal, - @ewaeaweaeaweaeaeae, @CaptainBobcat, and @Antrolana! 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! + Plus, there’s new Gold-purchasable equipment in the Enchanted Armoire, including the + Heroic Herbalist Set. Better work hard on your real-life tasks to earn all the pieces! + Enjoy :)