feat(content): Armoire and BGs

website/common/locales/en/backgrounds.json

@@ -305,5 +305,13 @@
   "backgroundHabitCityStreetsText": "Habit City Streets",
   "backgroundHabitCityStreetsNotes": "Explore the Streets of Habit City.",
   "backgroundOnATreeBranchText": "On a Tree Branch",
-  "backgroundOnATreeBranchNotes": "Perch On a Tree Branch."
+  "backgroundOnATreeBranchNotes": "Perch On a Tree Branch.",
+
+  "backgrounds062017": "SET 37: Released June 2017",
+  "backgroundBuriedTreasureText": "Buried Treasure",
+  "backgroundBuriedTreasureNotes": "Unearth Buried Treasure.",
+  "backgroundOceanSunriseText": "Ocean Sunrise",
+  "backgroundOceanSunriseNotes": "Admire an Ocean Sunrise.",
+  "backgroundSandcastleText": "Sandcastle",
+  "backgroundSandcastleNotes": "Rule over a Sandcastle."
 }

website/common/locales/en/gear.json

@@ -293,6 +293,8 @@
   "weaponArmoireFestivalFirecrackerNotes": "Enjoy this delightful sparkler responsibly. Increases Perception by <%= per %>. Enchanted Armoire: Festival Attire Set (Item 3 of 3).",
   "weaponArmoireMerchantsDisplayTrayText": "Merchant's Display Tray",
   "weaponArmoireMerchantsDisplayTrayNotes": "Use this lacquered tray to show the fine goods you're offering for sale. Increases Intelligence by <%= int %>. Enchanted Armoire: Merchant Set (Item 3 of 3).",
+  "weaponArmoireBattleAxeText": "Battle Axe",
+  "weaponArmoireBattleAxeNotes": "Battle Axe: This fine iron axe is well-suited to battling your fiercest foes or your most difficult tasks. Increases Intelligence by <%= int %> and Constitution by <%= con %>. Enchanted Armoire: Independent Item.",
 
   "armor": "armor",
   "armorCapitalized": "Armor",
@@ -631,6 +633,8 @@
   "armorArmoireGreenFestivalYukataNotes": "This fine lightweight yukata will keep you cool while you enjoy any festive occasion. Increases Constitution and Perception by <%= attrs %> each. Enchanted Armoire: Festival Attire Set (Item 1 of 3).",
   "armorArmoireMerchantTunicText": "Merchant Tunic",
   "armorArmoireMerchantTunicNotes": "The wide sleeves of this tunic are perfect for stashing the coins you've earned! Increases Perception by <%= per %>. Enchanted Armoire: Merchant Set (Item 2 of 3).",
+  "armorArmoireVikingTunicText": "Viking Tunic",
+  "armorArmoireVikingTunicNotes": "Viking Tunic: This warm woolen tunic includes a cloak for extra coziness even in ocean gales. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Viking Set (Item 1 of 3).",
 
   "headgear": "headgear",
   "headgearCapitalized": "Headgear",
@@ -985,6 +989,8 @@
   "headArmoireMushroomDruidCapNotes": "Harvested deep in a misty forest, this cap grants the wearer knowledge of medicinal plants. Increases Intelligence by <%= int %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 1 of 3).",
   "headArmoireMerchantChaperonText": "Merchant Chaperon",
   "headArmoireMerchantChaperonNotes": "This versatile wrapped wool hat will surely make you the most stylish seller in the market! Increases Perception and Intelligence by <%= attrs %> each. Enchanted Armoire: Merchant Set (Item 1 of 3).",
+  "headArmoireVikingHelmText": "Viking Helm",
+  "headArmoireVikingHelmNotes": "No horns or wings are found on this helm: those are too easy for enemies to grab! Increases Strength by <%= str %> and Perception by <%= per %>. Enchanted Armoire: Viking Set (Item 2 of 3).",
 
   "offhand": "shield-hand item",
   "offhandCapitalized": "Shield-Hand Item",
@@ -1166,6 +1172,8 @@
   "shieldArmoireMushroomDruidShieldNotes": "Though made from a mushroom, there's nothing mushy about this tough shield! Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Mushroom Druid Set (Item 3 of 3).",
   "shieldArmoireFestivalParasolText": "Festival Parasol",
   "shieldArmoireFestivalParasolNotes": "This lightweight parasol will shield you from the glare--whether it's from the sun or from dark red Dailies! Increases Constitution by <%= con %>. Enchanted Armoire: Festival Attire Set (Item 2 of 3).",
+  "shieldArmoireVikingShieldText": "Viking Shield",
+  "shieldArmoireVikingShieldNotes": "This sturdy shield of wood and hide can stand up to the most daunting of foes. Increases Perception by <%= per %> and Intelligence by <%= int %>. Enchanted Armoire: Viking Set (Item 3 of 3).",
 
   "back": "Back Accessory",
   "backBase0Text": "No Back Accessory",

website/common/script/content/appearance/backgrounds.js

@@ -507,6 +507,20 @@ let backgrounds = {
       notes: t('backgroundOnATreeBranchNotes'),
     },
   },
+  backgrounds062017: {
+    buried_treasure: {
+      text: t('backgroundBuriedTreasureText'),
+      notes: t('backgroundBuriedTreasureNotes'),
+    },
+    ocean_sunrise: {
+      text: t('backgroundOceanSunriseText'),
+      notes: t('backgroundOceanSunriseNotes'),
+    },
+    sandcastle: {
+      text: t('backgroundSandcastleText'),
+      notes: t('backgroundSandcastleNotes'),
+    },
+  },
   incentiveBackgrounds: {
     violet: {
       text: t('backgroundVioletText'),

website/common/script/content/gear/sets/armoire.js

@@ -243,6 +243,15 @@ let armor = {
     set: 'merchant',
     canOwn: ownsItem('armor_armoire_merchantTunic'),
   },
+  vikingTunic: {
+    text: t('armorArmoireVikingTunicText'),
+    notes: t('armorArmoireVikingTunicNotes', { con: 6, str: 8 }),
+    value: 100,
+    con: 6,
+    str: 8,
+    set: 'viking',
+    canOwn: ownsItem('armor_armoire_vikingTunic'),
+  },
 };
 
 let eyewear = {
@@ -550,6 +559,15 @@ let head = {
     set: 'merchant',
     canOwn: ownsItem('head_armoire_merchantChaperon'),
   },
+  vikingHelm: {
+    text: t('headArmoireVikingHelmText'),
+    notes: t('headArmoireVikingHelmNotes', { str: 6, per: 8 }),
+    value: 100,
+    str: 6,
+    per: 8,
+    set: 'viking',
+    canOwn: ownsItem('head_armoire_vikingHelm'),
+  },
 };
 
 let shield = {
@@ -651,6 +669,15 @@ let shield = {
     set: 'festivalAttire',
     canOwn: ownsItem('shield_armoire_festivalParasol'),
   },
+  vikingShield: {
+    text: t('shieldArmoireVikingShieldText'),
+    notes: t('shieldArmoireVikingShieldNotes', { per: 6, int: 8 }),
+    value: 100,
+    per: 6,
+    int: 8,
+    set: 'viking',
+    canOwn: ownsItem('shield_armoire_vikingShield'),
+  },
 };
 
 let headAccessory = {
@@ -879,6 +906,14 @@ let weapon = {
     set: 'merchant',
     canOwn: ownsItem('weapon_armoire_merchantsDisplayTray'),
   },
+  battleAxe: {
+    text: t('weaponArmoireBattleAxeText'),
+    notes: t('weaponArmoireBattleAxeNotes', { int: 6, con: 8 }),
+    value: 100,
+    int: 6,
+    con: 8,
+    canOwn: ownsItem('weapon_armoire_battleAxe'),
+  },
 };
 
 let armoireSet = {

website/views/options/inventory/quests.jade

@@ -19,7 +19,7 @@ include ../../shared/mixins
       li.customize-menu
         h3.equipment-title=env.t('questsForSale')
         div(ng-repeat='category in questShopCategories')
-          menu.pets-menu(label='{{category.text}}')
+          menu.pets-menu(label='{{category.text}}', ng-if='category.items.length > 0')
             div(ng-repeat='quest in category.items')
               button.customize-option(ng-class='quest.class',
                 data-popover-html="{{quest.locked ? env.t('scrollsPre') : questPopover(quest) | markdown}}",

website/views/shared/new-stuff.jade

@@ -1,33 +1,58 @@
-h2 5/30/2017 - HIRING MOBILE DEVELOPER; LAST CHANCE FOR FEATHERY GOODIES AND PARTY SURVEY
+h2 6/1/2017 - JUNE BACKGROUNDS AND ARMOIRE ITEMS, NEW TAKE THIS CHALLENGE, AND GUILD SPOTLIGHT
   hr
   tr
     td
-      h3 Hiring Mobile Developer!
-      p Want to join the Habitica team? We’re looking to hire a new mobile contractor!
+      .promo_backgrounds_armoire_201706.pull-right
+      h3 June Backgrounds and Armoire Items!
+      p We’ve added three new backgrounds to the <a href='/#/options/profile/backgrounds'>Background Shop</a>! Now your avatar can rule over a Sandcastle, admire an Ocean Sunrise, and unearth Buried Treasure.
       br
-      p We’re particularly interested in people who have a good understanding of either Android development or iOS development, including knowledge of ObjC and Swift. Bonus points if you also have experience with: Core Data, Reactive Programming (ReactiveCocoa/RxJava), Realm, and Kotlin, as well as familiarity with iOS and/or Android UI design principles, patterns, and best practices. Our ideal dev would be eager to push the limits of what our apps can currently do, with an eye for details, a drive to make their work both technically and visually sound, and an interest in expanding their knowledge of current advancements in the field. Diverse candidates are encouraged to apply!
-      br
-      p To apply, send an <a href='mailto:vicky@habitica.com' target='_blank'>email to vicky@habitica.com</a> with a CV that includes your experience with the items listed above, your Habitica username, and your favorite nerdy pursuit. We can’t wait to hear from you!
-      p.small.muted by the Habitica Team
+      p Plus, there’s new gold-purchasable equipment in the Enchanted Armoire, including the Viking Set. Better work hard on your real-life tasks to earn all the pieces! Enjoy :)
+      p.small.muted by PattyTheWitch, CitrineSun, Reesachan, and Katy133
   tr
     td
-      h3 Last Chance for Feathered Fighter Set and Feathered Friends Pet Quest Bundle
-      p Reminder: tomorrow is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Feathered FIghter Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! You'll also receive the exclusive Jackalope Subscriber pet! Thanks so much for your support! You help keep Habitica running.
+      .promo_takeThis_gear.pull-left.slight-right-margin
+      h3 New Take This Challenge
+      p The next Take This Challenge has launched, "<a href='/#/options/groups/challenges/4db6bd82-b829-4bf2-bad2-535c14424a3d'>I Am the Night!</a>", with a focus on sleep hygiene. Be sure to check it out to earn additional pieces of the Take This armor set!
       br
-      p It's also the last day to purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 gems! That's a discount of 5 gems from the price of purchasing them separately. Check out this deal in the <a href='/#/options/inventory/quests'>Quest Shop</a> before it flies away!
-      p.small.muted by Lemoness
+      p <a href='http://www.takethis.org/' target='_blank'>Take This</a> 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.
+      br
+      .scene_arts_crafts.pull-left.slight-right-margin
+      p Congratulations to the winners of the last Take This Challenge, "Cast of Characters!": grand prize winner ShoTaka, and runners-up Steve the Dragon Slayer, Christina Melfi Passavia, Kingphisher, Servalan, and Júnior Rodrigues Knd! Plus, all participants in that Challenge who had not already completed the <a href='http://habitica.wikia.com/wiki/Event_Item_Sequences#Take_This_Armor_Set' target='_blank'>Take This item set</a> have received the next piece. It is located in your Rewards column. Enjoy!
+      p.small.muted by Doctor B, the Take This team, Lemoness, and SabreCat
   tr
     td
-      .achievement-guild2x.pull-left.slight-right-margin
-      h3 Last Chance for Party Usage Survey
-      p Tomorrow is the last day to tell us more about how your Party uses the text features on your Party page and earn the Helped Habitica Grow badge! <a href='https://docs.google.com/forms/d/e/1FAIpQLSd_0mm_cJxvWaGVJVqnjWfwaP_6p1WjPW0fiqL8deCO6lNO-w/viewform?usp=sf_link' target='_blank'>Click here to take the brief survey</a>!
-      p.small.muted by Sara Olson
+      h3 Guild Spotlight: Arts and Crafts
+      p There's a new <a href='https://habitica.wordpress.com/2017/05/25/spaces-for-the-creative-guilds-for-arts-and-crafts/' target='_blank'>Guild Spotlight on the blog</a> that highlights the Guilds that can help you as you work on creative projects! Check it out now to find Habitica's best Arts and Crafts-focused communities.
+      p.small.muted by beffymaroo
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 5/30/2017 - HIRING MOBILE DEVELOPER; LAST CHANCE FOR FEATHERY GOODIES AND PARTY SURVEY
+    tr
+      td
+        h3 Hiring Mobile Developer!
+        p Want to join the Habitica team? We’re looking to hire a new mobile contractor!
+        br
+        p We’re particularly interested in people who have a good understanding of either Android development or iOS development, including knowledge of ObjC and Swift. Bonus points if you also have experience with: Core Data, Reactive Programming (ReactiveCocoa/RxJava), Realm, and Kotlin, as well as familiarity with iOS and/or Android UI design principles, patterns, and best practices. Our ideal dev would be eager to push the limits of what our apps can currently do, with an eye for details, a drive to make their work both technically and visually sound, and an interest in expanding their knowledge of current advancements in the field. Diverse candidates are encouraged to apply!
+        br
+        p To apply, send an <a href='mailto:vicky@habitica.com' target='_blank'>email to vicky@habitica.com</a> with a CV that includes your experience with the items listed above, your Habitica username, and your favorite nerdy pursuit. We can’t wait to hear from you!
+        p.small.muted by the Habitica Team
+    tr
+      td
+        h3 Last Chance for Feathered Fighter Set and Feathered Friends Pet Quest Bundle
+        p Reminder: tomorrow is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Feathered FIghter Set! Subscribing also lets you buy gems for gold. The longer your subscription, the more gems you get! You'll also receive the exclusive Jackalope Subscriber pet! Thanks so much for your support! You help keep Habitica running.
+        br
+        p It's also the last day to purchase the Feathered Friends Pet Quest Bundle and receive the Parrot, Owl, and Falcon quests, all for only 7 gems! That's a discount of 5 gems from the price of purchasing them separately. Check out this deal in the <a href='/#/options/inventory/quests'>Quest Shop</a> before it flies away!
+        p.small.muted by Lemoness
+    tr
+      td
+        .achievement-guild2x.pull-left.slight-right-margin
+        h3 Last Chance for Party Usage Survey
+        p Tomorrow is the last day to tell us more about how your Party uses the text features on your Party page and earn the Helped Habitica Grow badge! <a href='https://docs.google.com/forms/d/e/1FAIpQLSd_0mm_cJxvWaGVJVqnjWfwaP_6p1WjPW0fiqL8deCO6lNO-w/viewform?usp=sf_link' target='_blank'>Click here to take the brief survey</a>!
+        p.small.muted by Sara Olson
   h2 5/25/2017 - MONTHLIES AND YEARLIES, CHALLENGES ON IOS, AND FLORAL HATCHING POTIONS
     tr
       td