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

2014-12-31 13:17:21 -06:00
parent 0b57d42e2a 3c3d73e15a
commit a5a7d22ce4
3 changed files with 21 additions and 4 deletions
@@ -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: ''