Merge branch 'develop' into quests-fix-merge-coflicts

2015-07-13 08:20:52 -05:00
parent cb992e1083 148e418c8a
commit 87f5449267
132 changed files with 5652 additions and 5506 deletions
@@ -774,7 +774,7 @@ api.wrap = (user, main=true) ->
          if userPets[pet] >= 50 and !user.items.mounts[pet]
            evolve()
        user.items.food[food.key]--
-        cb? {code:200, message}, userPets[pet]
+        cb? {code:200, message}, {value: userPets[pet]}

      buySpecialSpell: (req,cb) ->
        {key} = req.params