Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster

Conflicts:
	script/content.coffee

script/content.coffee

@@ -767,6 +767,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: ''

script/index.coffee

@@ -332,11 +332,13 @@ api.countPets = (originalCount, pets) ->
     count-- if pets[pet]
   count
 
-api.countMounts= (originalCount, mounts) ->
-  count = if originalCount? then originalCount else _.size(mounts)
+api.countMounts = (originalCount, mounts) ->
+  count2 = if originalCount? then originalCount else _.size(mounts)
+  for mount of content.questPets
+    count2-- if mounts[mount]
   for mount of content.specialMounts
-    count-- if mounts[mount]
-  count
+    count2-- if mounts[mount]
+  count2
 
 ###
 ------------------------------------------------------