feat(content): Farm Friends bundle

Also tweaks some gear text to avoid multiple items being referred to as "battle-axes".

website/common/locales/en/gear.json

@@ -16,7 +16,7 @@
   "weaponWarrior1Text": "Sword",
   "weaponWarrior1Notes": "Common soldier's blade. Increases Strength by <%= str %>.",
   "weaponWarrior2Text": "Axe",
-  "weaponWarrior2Notes": "Double-bitted battle-axe. Increases Strength by <%= str %>",
+  "weaponWarrior2Notes": "Double-bitted chopping weapon. Increases Strength by <%= str %>",
   "weaponWarrior3Text": "Morning Star",
   "weaponWarrior3Notes": "Heavy club with brutal spikes. Increases Strength by <%= str %>.",
   "weaponWarrior4Text": "Sapphire Blade",
@@ -304,7 +304,7 @@
   "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",
+  "weaponArmoireBattleAxeText": "Ancient Axe",
   "weaponArmoireBattleAxeNotes": "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.",
   "weaponArmoireHoofClippersText": "Hoof Clippers",
   "weaponArmoireHoofClippersNotes": "Trim the hooves of your hard-working mounts to help them stay healthy as they carry you to adventure! Increases Strength, Intelligence, and Constitution by <%= attrs %> each. Enchanted Armoire: Farrier Set (Item 1 of 3).",

website/common/locales/en/questsContent.json

@@ -582,5 +582,8 @@
   "questHippoCompletion": "The hippo bows in surrender. “I underestimated you. It seems you weren’t being lazy. My apologies. Truth be told, I may have been projecting a bit. Perhaps I should get some work done myself. Here, take these eggs as a sign of my gratitude.” Grabbing them, you settle down by the water, ready to relax at last.",
   "questHippoBoss": "The Hippo-Crite",
   "questHippoDropHippoEgg": "Hippo (Egg)",
-  "questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market"
+  "questHippoUnlockText": "Unlocks purchasable Hippo eggs in the Market",
+
+  "farmFriendsText": "Farm Friends Quest Bundle",
+  "farmFriendsNotes": "Contains 'The Mootant Cow', 'Ride the Night-Mare', and 'The Thunder Ram'. Available until September 30."
 }

website/common/script/content/index.js

@@ -85,6 +85,21 @@ api.bundles = {
     type: 'quests',
     value: 7,
   },
+  farmFriends: {
+    key: 'farmFriends',
+    text: t('farmFriendsText'),
+    notes: t('farmFriendsNotes'),
+    bundleKeys: [
+      'cow',
+      'horse',
+      'sheep',
+    ],
+    canBuy () {
+      return moment().isBetween('2017-09-12', '2017-10-02');
+    },
+    type: 'quests',
+    value: 7,
+  },
 };
 
 /*

website/views/shared/new-stuff.jade

@@ -1,23 +1,36 @@
-h2 9/11/2017 - NEW TEESPRING CAMPAIGN!
+h2 9/12/2017 - NEW QUEST BUNDLE AND NEW MODERATOR!
+  .promo_bundle_farm.pull-right
   hr
   tr
     td
-      .promo_teespring.pull-right
-      h3 Habitica T-Shirts Are Back!
-      p We're running another Teespring campaign!
-      br
-      p For a limited time, you can grab <a href='https://teespring.com/stores/habitica' target='_blank'>Habitica T-shirts</a>! This U.S.-only Teespring campaign will only run until September 14, so hurry if you want to snap one up!
-      br
-      p Our Teespring campaigns are driven by demand, so if you'd like mugs, onesies, or other items for E.U. Habiticans, be sure to go to our <a href='https://teespring.com/stores/habitica' target='_blank'>Teespring store</a> and reserve the item you want. Once enough items are reserved, the item will automatically be printed.
-      br
-      p Thanks for supporting Habitica!
-      p.small.muted by Redphoenix and Sara Olson
+      h3 New Discounted Pet Quest Bundle: Farm Friends
+      p If you are looking to add critters from the barnyard to your Habitica stable, you're in luck! From now until September 30, you can purchase the Farm Friends Pet Quest Bundle and receive the Sheep, Cow, and Horse quests, all for only 7 Gems! That's a discount of 5 Gems from the price of purchasing them separately. Check it out in the <a href='/#/options/inventory/quests'>Quest Shop</a> today!
+      p.small.muted by Lemoness and SabreCat
+      p.small.muted Art by UncommonCriminal, Soloana, fuzzytrees, Feralem Tau, Eevachu, Beffymaroo, JessicaChase, starsystemic, nonight, Misceo and Tocath
+      p.small.muted Writing by schizelle, VikingRunner, Salambander, Leephon, and Lemoness
+  tr
+    td
+      h3 Welcome to Our Newest Moderator: Fox_town!
+      p We're very excited to announce that we've added a new moderator to the team: a long-time Socialite, staple of the community, and friend to many of you... Fox_town! Head to the Tavern to congratulate them.
 
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 9/11/2017 - NEW TEESPRING CAMPAIGN!
+    tr
+      td
+        .promo_teespring.pull-right
+        h3 Habitica T-Shirts Are Back!
+        p We're running another Teespring campaign!
+        br
+        p For a limited time, you can grab <a href='https://teespring.com/stores/habitica' target='_blank'>Habitica T-shirts</a>! This U.S.-only Teespring campaign will only run until September 14, so hurry if you want to snap one up!
+        br
+        p Our Teespring campaigns are driven by demand, so if you'd like mugs, onesies, or other items for E.U. Habiticans, be sure to go to our <a href='https://teespring.com/stores/habitica' target='_blank'>Teespring store</a> and reserve the item you want. Once enough items are reserved, the item will automatically be printed.
+        br
+        p Thanks for supporting Habitica!
+        p.small.muted by Redphoenix and Sara Olson
   h2 9/8/2017 - USE CASE SPOTLIGHT: LEARNING LANGUAGES
     .scene_languages.pull-right
     tr