Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12

script/content.coffee

@@ -827,6 +827,15 @@ api.questPets = _.transform api.questEggs, (m, egg) ->
   _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
     m2[egg.key + "-" + pot.key] = true
 
+## added for mountmaster -- yes, the transforms are correct, since the same strings are used for both pets and mounts
+api.mounts = _.transform api.dropEggs, (m, egg) ->
+  _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
+    m2[egg.key + "-" + pot.key] = true
+
+api.questMounts = _.transform api.questEggs, (m, egg) ->
+  _.defaults m, _.transform api.hatchingPotions, (m2, pot) ->
+    m2[egg.key + "-" + pot.key] = true
+
 api.food =
   # Base
   Meat:                 canBuy:true, canDrop:true, text: t('foodMeat'), target: 'Base', article: ''
@@ -932,6 +941,11 @@ api.quests =
         stables:t('questStressbeastBossRageStables')
         bailey:t('questStressbeastBossRageBailey')
         guide:t('questStressbeastBossRageGuide')
+      desperation:
+        threshold: 500000
+        str: 3.5
+        def: 2
+        text:t('questStressbeastDesperation')
     drop:
       items: [
         {type: 'pets', key: 'Mammoth-Base', text: t('questStressbeastDropMammothPet')}