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

locales/en/pets.json

@@ -26,10 +26,16 @@
     "inventoryText": "Click an egg to see usable potions highlighted in green and then click one of the highlighted potions to hatch your pet. If no potions are highlighted, click that egg again to deselect it, and instead click a potion first to have the usable eggs highlighted. You can also sell unwanted drops to Alexander the Merchant.",
     "food": "Food and Saddles",
     "noFood": "You don't have any food or saddles.",
+    "beastProgress": "Beast Master Progress",
     "beastAchievement": "You have earned the \"Beast Master\" Achievement for collecting all the pets!",
     "beastMastName": "Beast Master",
     "beastMastText": "Has found all 90 pets (insanely difficult, congratulate this user!)",
     "beastMastText2": " and has released their pets a total of <%= count %> times",
+    "mountProgress": "Mount Master Progress",
+    "mountAchievement": "You have earned the \"Mount Master\" achievement for taming all the mounts!",
+    "mountMastName": "Mount Master",
+    "mountMastText": "Has tamed all 90 mounts (even more difficult, congratulate this user!)",
+    "mountMastText2": " and has released their mounts a total of <%= count %> times",
     "dropsEnabled": "Drops Enabled!",
     "itemDrop": "An item has dropped!",
     "firstDrop": "You've unlocked the Drop System! Now when you complete tasks, you have a small chance of finding an item. You just found a <strong><%= eggText %> Egg</strong>! <%= eggNotes %>",

script/content.coffee

@@ -809,6 +809,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

@@ -333,11 +333,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
 
 ###
 ------------------------------------------------------