Merge pull request #5866 from HabitRPG/sabrecat/content-201509

Content 201509

common/locales/en/backgrounds.json

@@ -119,5 +119,14 @@
   "backgroundSunsetSavannahText": "Sunset Savannah",
   "backgroundSunsetSavannahNotes": "Stalk across the Sunset Savannah.",
   "backgroundTwinklyPartyLightsText": "Twinkly Party Lights",
-  "backgroundTwinklyPartyLightsNotes": "Dance under Twinkly Party Lights!"
+  "backgroundTwinklyPartyLightsNotes": "Dance under Twinkly Party Lights!",
+
+  "backgrounds092015": "SET 16: Released September 2015",
+  "backgroundMarketText": "Habitica Market",
+  "backgroundMarketNotes": "Shop in the Habitica Market.",
+  "backgroundStableText": "Habitica Stable",
+  "backgroundStableNotes": "Tend mounts in the Habitica Stable.",
+  "backgroundTavernText": "Habitica Tavern",
+  "backgroundTavernNotes": "Visit the Habitica Tavern."
 }
+

common/locales/en/gear.json

@@ -159,6 +159,8 @@
   "weaponArmoireMythmakerSwordNotes": "Though it may seem humble, this sword has made many mythic heroes. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 3 of 3)",
   "weaponArmoireIronCrookText": "Iron Crook",
   "weaponArmoireIronCrookNotes": "Fiercely hammered from iron, this iron crook is good at herding sheep. Increases Perception and Strength by <%= attrs %> each. Enchanted Armoire: Horned Iron Set (Item 3 of 3)",
+  "weaponArmoireGoldWingStaffText": "Gold Wing Staff",
+  "weaponArmoireGoldWingStaffNotes": "The wings on this staff constantly flutter and twist. Increases all attributes by <%= attrs %> each. Enchanted Armoire: Independent Item.",
 
   "armor": "armor",
 
@@ -329,6 +331,8 @@
   "armorArmoireGoldenTogaNotes": "This glimmering toga is only worn by true heroes. Increases Strength and Constitution by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 1 of 3).",
   "armorArmoireHornedIronArmorText": "Horned Iron Armor",
   "armorArmoireHornedIronArmorNotes": "Fiercely hammered from iron, this horned armor is nearly impossible to break. Increases Constitution by <%= con %> and Perception by <%= per %>. Enchanted Armoire: Horned Iron Set (Item 2 of 3).",
+  "armorArmoirePlagueDoctorOvercoatText": "Plague Doctor Overcoat",
+  "armorArmoirePlagueDoctorOvercoatNotes": "An authentic overcoat worn by the doctors who battle the Plague of Procrastination! Increases Intelligence by <%= int %>, Strength by <%= str %>, and Constitution by <%= con %>. Enchanted Armoire: Plague Doctor Set (Item 3 of 3).",
 
   "headgear": "headgear",
 
@@ -501,6 +505,12 @@
   "headArmoireGoldenLaurelsNotes": "These golden laurels reward those who have conquered bad habits. Increases Perception and Constitution by <%= attrs %> each. Enchanted Armoire: Golden Toga Set (Item 2 of 3).",
   "headArmoireHornedIronHelmText": "Horned Iron Helm",
   "headArmoireHornedIronHelmNotes": "Fiercely hammered from iron, this horned helmet is nearly impossible to break. Increases Constitution by <%= con %> and Strength by <%= str %>. Enchanted Armoire: Horned Iron Set (Item 1 of 3).",
+  "headArmoireYellowHairbowText": "Yellow Hairbow",
+  "headArmoireYellowHairbowNotes": "Become perceptive, strong, and smart while wearing this beautiful Yellow Hairbow! Increases Perception, Strength, and Intelligence by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+  "headArmoireRedFloppyHatText": "Red Floppy Hat",
+  "headArmoireRedFloppyHatNotes": "Many spells have been sewn into this simple hat, giving it a radiant red color. Increases Constitution, Intelligence, and Perception by <%= attrs %> each. Enchanted Armoire: Independent Item.",
+  "headArmoirePlagueDoctorHatText": "Plague Doctor Hat",
+  "headArmoirePlagueDoctorHatNotes": "An authentic hat worn by the doctors who battle the Plague of Procrastination! Increases Strength by <%= str %>, Intelligence by <%= int %>, and Constitution by <%= con %>. Enchanted Armoire: Plague Doctor Set (Item 1 of 3).",
 
   "offhand": "shield-hand item",
 
@@ -713,5 +723,9 @@
   "eyewearMystery301404Text": "Eyewear Goggles",
   "eyewearMystery301404Notes": "No eyewear could be fancier than a pair of goggles - except, perhaps, for a monocle. Confers no benefit. April 3015 Subscriber Item.",
   "eyewearMystery301405Text": "Monocle",
-  "eyewearMystery301405Notes": "No eyewear could be fancier than a monocle - except, perhaps, for a pair of goggles. Confers no benefit. July 3015 Subscriber Item."
+  "eyewearMystery301405Notes": "No eyewear could be fancier than a monocle - except, perhaps, for a pair of goggles. Confers no benefit. July 3015 Subscriber Item.",
+
+  "eyewearArmoirePlagueDoctorMaskText": "Plague Doctor Mask",
+  "eyewearArmoirePlagueDoctorMaskNotes": "An authentic mask worn by the doctors who battle the Plague of Procrastination. Confers no benefit. Enchanted Armoire: Plague Doctor Set (Item 2 of 3)."
 }
+

common/script/content.coffee

@@ -164,6 +164,7 @@ gear =
       rancherLasso:   twoHanded:true, text: t('weaponArmoireRancherLassoText'), notes: t('weaponArmoireRancherLassoNotes', {str: 5, per: 5, int: 5}), value: 100, str: 5, per: 5, int: 5, set: 'rancher', canOwn: ((u)-> u.items.gear.owned.weapon_armoire_rancherLasso?)
       mythmakerSword:   text: t('weaponArmoireMythmakerSwordText'), notes: t('weaponArmoireMythmakerSwordNotes', {attrs: 6}), value: 100, str: 6, per: 6, set: 'goldenToga', canOwn: ((u)-> u.items.gear.owned.weapon_armoire_mythmakerSword?)
       ironCrook:   text: t('weaponArmoireIronCrookText'), notes: t('weaponArmoireIronCrookNotes', {attrs: 7}), value: 100, str: 7, per: 7, set: 'hornedIron', canOwn: ((u)-> u.items.gear.owned.weapon_armoire_ironCrook?)
+      goldWingStaff:  text: t('weaponArmoireGoldWingStaffText'), notes: t('weaponArmoireGoldWingStaffNotes', {attrs:4}), value: 100, con: 4, int: 4, per: 4, str: 4, canOwn: ((u)-> u.items.gear.owned.weapon_armoire_goldWingStaff?)
 
   armor:
     base:
@@ -259,6 +260,7 @@ gear =
       rancherRobes: text: t('armorArmoireRancherRobesText'), notes: t('armorArmoireRancherRobesNotes', {str: 5, per: 5, int: 5}), value: 100, str: 5, per: 5, int: 5, set: 'rancher', canOwn: ((u)-> u.items.gear.owned.armor_armoire_rancherRobes?)
       goldenToga: text: t('armorArmoireGoldenTogaText'), notes: t('armorArmoireGoldenTogaNotes', {attrs: 8}), value: 100, str: 8, con: 8, set: 'goldenToga', canOwn: ((u)-> u.items.gear.owned.armor_armoire_goldenToga?)
       hornedIronArmor: text: t('armorArmoireHornedIronArmorText'), notes: t('armorArmoireHornedIronArmorNotes', {con: 9, per: 7}), value: 100, con: 9, per: 7, set: 'hornedIron', canOwn: ((u)-> u.items.gear.owned.armor_armoire_hornedIronArmor?)
+      plagueDoctorOvercoat: text: t('armorArmoirePlagueDoctorOvercoatText'), notes: t('armorArmoirePlagueDoctorOvercoatNotes', {int: 6, str: 5, con: 6}), int: 6, str: 5, con: 6, set: 'plagueDoctor', canOwn: ((u)-> u.items.gear.owned.armor_armoire_plagueDoctorOvercoat?)
 
   head:
     base:
@@ -355,6 +357,9 @@ gear =
       blueHairbow: text: t('headArmoireBlueHairbowText'), notes: t('headArmoireBlueHairbowNotes', {per: 5, int: 5, con: 5}), value: 100, per: 5, int: 5, con: 5, canOwn: ((u)-> u.items.gear.owned.head_armoire_blueHairbow?)
       goldenLaurels: text: t('headArmoireGoldenLaurelsText'), notes: t('headArmoireGoldenLaurelsNotes', {attrs: 8}), value: 100, per: 8, con: 8, set: 'goldenToga', canOwn: ((u)-> u.items.gear.owned.head_armoire_goldenLaurels?)
       hornedIronHelm: text: t('headArmoireHornedIronHelmText'), notes: t('headArmoireHornedIronHelmNotes', {con: 9, str: 7}), value: 100, con: 9, str:7, set: 'hornedIron', canOwn: ((u)-> u.items.gear.owned.head_armoire_hornedIronHelm?)
+      yellowHairbow: text: t('headArmoireYellowHairbowText'), notes: t('headArmoireYellowHairbowNotes', {attrs: 5}), int: 5, per: 5, str: 5, canOwn: ((u)-> u.items.gear.owned.head_armoire_yellowHairbow?)
+      redFloppyHat: text: t('headArmoireRedFloppyHatText'), notes: t('headArmoireRedFloppyHatNotes', {attrs: 6}), con: 6, int: 6, per: 6, canOwn: ((u)-> u.items.gear.owned.head_armoire_redFloppyHat?)
+      plagueDoctorHat: text: t('headArmoirePlagueDoctorHatText'), notes: t('headArmoirePlagueDoctorHatNotes', {int: 5, str: 6, con: 5}), int: 5, str: 6, con: 5, set: 'plagueDoctor', canOwn: ((u)-> u.items.gear.owned.head_armoire_plagueDoctorHat?)
 
   shield:
     base:
@@ -497,6 +502,8 @@ gear =
       201507: text: t('eyewearMystery201507Text'), notes: t('eyewearMystery201507Notes'), mystery:'201507', value: 0
       301404: text: t('eyewearMystery301404Text'), notes: t('eyewearMystery301404Notes'), mystery:'301404', value: 0
       301405: text: t('eyewearMystery301405Text'), notes: t('eyewearMystery301405Notes'), mystery:'301405', value: 0
+    armoire:
+      plagueDoctorMask: text: t('eyewearArmoirePlagueDoctorMaskText'), notes: t('eyewearArmoirePlagueDoctorMaskNotes'), set: 'plagueDoctor', canOwn: ((u)-> u.items.gear.owned.eyewear_armoire_plagueDoctorMask?)
 
 ###
   The gear is exported as a tree (defined above), and a flat list (eg, {weapon_healer_1: .., shield_special_0: ...}) since
@@ -2217,6 +2224,16 @@ api.backgrounds =
     twinkly_party_lights:
       text: t('backgroundTwinklyPartyLightsText')
       notes: t('backgroundTwinklyPartyLightsNotes')
+  backgrounds092015:
+    market:
+      text: t('backgroundMarketText')
+      notes: t('backgroundMarketNotes')
+    stable:
+      text: t('backgroundStableText')
+      notes: t('backgroundStableNotes')
+    tavern:
+      text: t('backgroundTavernText')
+      notes: t('backgroundTavernNotes')
 
 api.subscriptionBlocks =
   basic_earned: months:1, price:5

website/views/shared/new-stuff.jade

@@ -1,23 +1,41 @@
-h5 LAST CHANCE FOR CHEETAH COSTUME! COSTUME CHALLENGE ANNOUNCED!
+h5 NEW ITEMS IN THE ENCHANTED ARMOIRE AND SEPTEMBER BACKGROUNDS!
   hr
   tr
     td
-      .promo_mystery_201508.pull-right
-      h5 Last Chance for Cheetah Costume Set
-      p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Cheetah Costume Item Set! If you want the Cheetah Hat or the Cheetah Costume, now's the time. Thanks so much for your support - it's your generosity that keeps Habitica alive.
+      .background_tavern.pull-right
+      h5 September Backgrounds Revealed
+      p There are three new avatar backgrounds in the <a href='/#/options/profile/backgrounds'>Background Shop</a>! Now your avatar can visit the Habitica Tavern, shop in the Habitica Market, or ride mounts in the Habitica Stable! 
   tr
     td
-      h5 Get Ready for the Community Costume Challenge!
-      p On October 1st, we will launch the second annual Community Costume Challenge! Dress up in real-life versions of your avatar's armor to receive a special badge. (No, just wearing a colored shirt doesn't count. Where's the fun in that?)
+      .promo_enchanted_armoire_201509.pull-right
+      h5 New Items in the Enchanted Armoire!
+      p There is new equipment in the Enchanted Armoire, a 100 GP Reward in the Rewards Column which unlocks after you've attained Ultimate Gear! 
       br
-      p We're announcing the Challenge early so that people will have time to prepare costumes. You can see some of the excellent costumes from last year <a href='http://blog.habitrpg.com/tagged/cosplay' target='_blank'>here</a>.
+      p Click on the Enchanted Armoire for a random chance at special Equipment, including the Yellow Hairbow, Red Floppy Hat, Gold Winged Staff, and the Plague Doctor Item Set! It may also give you random XP or food items. We'll be adding new equipment to it during the first week of each month, but even when you've exhausted the current supply, you can keep clicking for a chance at food and XP.
       br
-      p Instructions on how to take part in the CCC will be posted on October 1st. We can't wait to see your costumes!
+      p Now go spend all that accumulated gold! May the Random Number Generator smile upon you...
+      p.small.muted by Lemoness and SabreCat
+      p.small.muted Art by Starsystemic and Kiwibot
 
 hr
 a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h5 LAST CHANCE FOR CHEETAH COSTUME! COSTUME CHALLENGE ANNOUNCED!
+    tr
+      td
+        .promo_mystery_201508.pull-right
+        h5 Last Chance for Cheetah Costume Set
+        p Reminder: this is the final day to <a href='/#/options/settings/subscription'>subscribe</a> and receive the Cheetah Costume Item Set! If you want the Cheetah Hat or the Cheetah Costume, now's the time. Thanks so much for your support - it's your generosity that keeps Habitica alive.
+    tr
+      td
+        h5 Get Ready for the Community Costume Challenge!
+        p On October 1st, we will launch the second annual Community Costume Challenge! Dress up in real-life versions of your avatar's armor to receive a special badge. (No, just wearing a colored shirt doesn't count. Where's the fun in that?)
+        br
+        p We're announcing the Challenge early so that people will have time to prepare costumes. You can see some of the excellent costumes from last year <a href='http://blog.habitrpg.com/tagged/cosplay' target='_blank'>here</a>.
+        br
+        p Instructions on how to take part in the CCC will be posted on October 1st. We can't wait to see your costumes!
+
   h5 8/27/2015 - OFFICIAL BACK TO SCHOOL ADVICE CHALLENGE
     hr
     tr