Merge pull request #6217 from HabitRPG/sabrecat/pet-201511

November pet quest: Snakes

common/locales/en/content.json

@@ -139,6 +139,10 @@
   "questEggFrogMountText": "Frog",
   "questEggFrogAdjective": "a princely",
 
+  "questEggSnakeText": "Snake",
+  "questEggSnakeMountText": "Snake",
+  "questEggSnakeAdjective": "a slithering",
+
   "eggNotes": "Find a hatching potion to pour on this egg, and it will hatch into <%= eggAdjective(locale) %> <%= eggText(locale) %>.",
 
   "hatchingPotionBase": "Base",

common/locales/en/questsContent.json

@@ -311,6 +311,12 @@
   "questFrogCompletion": "The frog cowers back into the muck, defeated. As it slinks away, the blue slime fades, leaving the way ahead clear.<br><br>Sitting in the middle of the path are three pristine eggs. \"You can even see the tiny tadpoles and through the clear casing!\" @Breadstrings says. \"Here, you should take them.\"",
   "questFrogBoss": "Clutter Frog",
   "questFrogDropFrogEgg": "Frog (Egg)",
-  "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market"
+  "questFrogUnlockText": "Unlocks purchasable Frog eggs in the Market",
 
+  "questSnakeText": "The Serpent of Distraction",
+  "questSnakeNotes": "It takes a hardy soul to live in the Sand Dunes of Distraction. The arid desert is hardly a productive place, and the shimmering dunes have led many a traveler astray. However, something has even the locals spooked. The sands have been shifting and upturning entire villages. Residents claim a monster with an enormous serpentine body lies in wait under the sands, and they have all pooled together a reward for whomever will help them find and stop it. The much-lauded snake charmers @EmeraldOx and @PainterProphet have agreed to help you summon the beast. Can you stop the Serpent of Distraction?",
+  "questSnakeCompletion": "With assistance from the charmers, you banish the Serpent of Distraction. Though you were happy to help the inhabitants of the Dunes, you can't help but feel a little sad for your fallen foe. While you contemplate the sights, @LordDarkly approaches you. \"Thank you! It's not much, but I hope this can express our gratitude properly.\" He hands you some Gold and... some Snake eggs! You will see that majestic animal again after all.",
+  "questSnakeBoss": "Serpent of Distraction",
+  "questSnakeDropSnakeEgg": "Snake (Egg)",
+  "questSnakeUnlockText": "Unlocks purchasable Snake eggs in the Market"
 }

common/script/content/index.coffee

@@ -1131,6 +1131,7 @@ api.questEggs =
   Cheetah:          text: t('questEggCheetahText'), adjective: t('questEggCheetahAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.cheetah? > 0)
   Horse:            text: t('questEggHorseText'), adjective: t('questEggHorseAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.horse? > 0)
   Frog:             text: t('questEggFrogText'), adjective: t('questEggFrogAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.frog? > 0)
+  Snake:            text: t('questEggSnakeText'), adjective: t('questEggSnakeAdjective'), canBuy: ((u)-> u.achievements.quests && u.achievements.quests.snake? > 0)
 
 _.each api.questEggs, (egg,key) ->
   _.defaults egg,
@@ -2209,6 +2210,26 @@ api.quests =
       exp: 125
       unlock: t('questFrogUnlockText')
 
+  snake:
+    text: t('questSnakeText')
+    notes: t('questSnakeNotes')
+    completion: t('questSnakeCompletion')
+    value: 4
+    category: 'pet'
+    boss:
+      name: t('questSnakeBoss')
+      hp: 1100
+      str: 2.5
+    drop:
+      items: [
+        {type: 'eggs', key: 'Snake', text: t('questSnakeDropSnakeEgg')}
+        {type: 'eggs', key: 'Snake', text: t('questSnakeDropSnakeEgg')}
+        {type: 'eggs', key: 'Snake', text: t('questSnakeDropSnakeEgg')}
+      ]
+      gp: 73
+      exp: 725
+      unlock: t('questSnakeUnlockText')
+
 _.each api.quests, (v,key) ->
   _.defaults v, {key,canBuy:(()->true)}
   b = v.boss

website/views/shared/new-stuff.jade

@@ -1,42 +1,63 @@
-h2 11/5/2015 - HUGE IOS UPDATE AND ANDROID MAILING LIST
+h2 11/11/2015 - NOVEMBER PET QUEST, SHARE SUCCESS, AND HABITICA T-SHIRTS
   hr
   tr
     td
-      .promo_habitica.pull-right(style='border-radius:25px')
-      h3 iOS App Update!
-      p There's a huge new update to the <a href='https://itunes.apple.com/us/app/habitica/id994882113?mt=8' target='_blank'>iOS app</a>!
-      br
-      p The iOS app is now out of beta with this update, which includes a complete redesign, an improved iPad version, and a host of new features such as:
-      br
-      ul
-        li Easy-to-read Streaks for your Dailies, helping you keep track of how many times in a row you have done a task
-        li The ability to manage and invite friends to your Party via the app
-        li Task Filtering - an easy way to filter between tasks to see whether they are due, what category you've tagged them with, and more
-        li A completely overhauled tutorial, including customized sample tasks for new users
-        li New colors that match the new Habitica logo and look
-        li Class icons and more information in the header
-        li 3D touch for iOS 9
-        li Multitasking on the new iPads
-        li Spotlight Search on iOS 9
-        li Localization - the app is now translated into Spanish, German, Danish, Czech, and Mandarin
-        li And more!
-      br
-      p As always, this update would not have been possible without our amazing open-source contributors. Thank you all so much! There are still many features that we plan to add in the future (including Challenges, Guilds, and task sorting), so stay tuned.
-      br
-      p If you like the app and the work that we've put into it, the best thank-you is to leave us a review. It really helps us out! That being said, we can't respond to reviews, so if you have a question or you're having trouble, the best thing to do is to email us at <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a>, or go to Menu > Settings > Report a bug. Thanks so much for helping us improve!
-      p.small.muted by viirus, Sara Olson, Lemoness, Redbone, geistiona, SyntaxTerror, Caleyra, Kiwie, Mindmaster, Nightingowl, dallas.helton, veeveeraccoon, liskadvacetdva, DizqueDiego, azaroa, and theweirdgirlwithcatears
+      .Pet-Snake-Base.pull-right
+      h3 November Pet Quest
+      p There's a new pet quest in the <a href='/#/options/inventory/quests'>Quest Shop</a>! A slithering foe awaits you among the shimmering sand dunes. Can you defeat the Serpent of Distraction? If so, you'll get some slithering snake pets.
+      p.small.muted Art by EmeraldOx, Painter Prophet, and Lord Darkly
+      p.small.muted Writing by Daniel the Bard and felipena
   tr
     td
-      h3 Android Mailing List
-      p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. <a href='/static/apps' target='_blank'>You can sign up here!</a> 
+      .achievement-triadbingo2x.pull-right
+      h3 Share Success
+      p Now you can share your success on social media when you hatch a pet, complete a quest, or more! (As always, your task details remain private.) Show off your victories to your friends and bask in some well-deserved praise.
+      p.small.muted by SabreCat and Lemoness
+  tr
+    td
+      .promo_habitica.pull-right(style='border-radius:25px;margin-left:1em')
+      h3 Habitica T-Shirts
+      p Exciting news - for the next three weeks, we are offering <a href='https://teespring.com/habitica-gryphon-t-shirt' target='_blank'>Habitica T-shirts via Teespring</a>! Show your Habitica pride in purple or black. We are also offering an <a href='https://teespring.com/habitica-gryphon-t-shirt_eu' target='_blank'>EU run for cheaper shipping to Europe</a>!
       br
-      p Our staff has been working very hard on it and testing out a new build each week, so progress is definitely advancing. When the beta is ready we will announce it on social media and on the site, but the mailing list is the easiest way to make sure you don't miss it! Thanks very much for your patience.
+      p Whether you're getting them for yourself or as a holiday gift, we hope you enjoy these limited-run T-shirts! As always, thanks for supporting Habitica.
       
 if menuItem !== 'oldNews'
   hr
   a(href='/static/old-news', target='_blank') Read older news
 
 mixin oldNews
+  h2 11/5/2015 - HUGE IOS UPDATE AND ANDROID MAILING LIST
+    tr
+      td
+        .promo_habitica.pull-right(style='border-radius:25px')
+        h3 iOS App Update!
+        p There's a huge new update to the <a href='https://itunes.apple.com/us/app/habitica/id994882113?mt=8' target='_blank'>iOS app</a>!
+        br
+        p The iOS app is now out of beta with this update, which includes a complete redesign, an improved iPad version, and a host of new features such as:
+        br
+        ul
+          li Easy-to-read Streaks for your Dailies, helping you keep track of how many times in a row you have done a task
+          li The ability to manage and invite friends to your Party via the app
+          li Task Filtering - an easy way to filter between tasks to see whether they are due, what category you've tagged them with, and more
+          li A completely overhauled tutorial, including customized sample tasks for new users
+          li New colors that match the new Habitica logo and look
+          li Class icons and more information in the header
+          li 3D touch for iOS 9
+          li Multitasking on the new iPads
+          li Spotlight Search on iOS 9
+          li Localization - the app is now translated into Spanish, German, Danish, Czech, and Mandarin
+          li And more!
+        br
+        p As always, this update would not have been possible without our amazing open-source contributors. Thank you all so much! There are still many features that we plan to add in the future (including Challenges, Guilds, and task sorting), so stay tuned.
+        br
+        p If you like the app and the work that we've put into it, the best thank-you is to leave us a review. It really helps us out! That being said, we can't respond to reviews, so if you have a question or you're having trouble, the best thing to do is to email us at <a href='mailto:mobile@habitica.com' target='_blank'>mobile@habitica.com</a>, or go to Menu > Settings > Report a bug. Thanks so much for helping us improve!
+        p.small.muted by viirus, Sara Olson, Lemoness, Redbone, geistiona, SyntaxTerror, Caleyra, Kiwie, Mindmaster, Nightingowl, dallas.helton, veeveeraccoon, liskadvacetdva, DizqueDiego, azaroa, and theweirdgirlwithcatears
+    tr
+      td
+        h3 Android Mailing List
+        p For those of you anxious for news about the new native Android app, we've created a mailing list so that you can be notified about important updates for the Android app. <a href='/static/apps' target='_blank'>You can sign up here!</a> 
+        br
+        p Our staff has been working very hard on it and testing out a new build each week, so progress is definitely advancing. When the beta is ready we will announce it on social media and on the site, but the mailing list is the easiest way to make sure you don't miss it! Thanks very much for your patience.
   h2 11/3/2015 - NOVEMBER BACKGROUNDS AND ARMOIRE ITEMS, AND AUTO-EQUIP NEW GEAR
     tr
       td