Merge branch 'mountmaster' into triad-bingo

2015-01-16 16:53:35 -06:00
parent 5b2c4d5a09 d9fed69147
commit 8b1ba48bfe
2 changed files with 4 additions and 2 deletions
@@ -15640,8 +15640,9 @@ api.wrap = function(user, main) {
            message: i18n.t('notEnoughGems', req.language)
          }) : void 0;
        } else {
-          user.balance -= 1;
+          user.balance -= 1.5;
          user.items.currentMount = "";
+          user.items.currentPet = "";
          for (animal in content.pets) {
            user.items.pets[animal] = 0;
            user.items.mounts[animal] = null;
@@ -762,8 +762,9 @@ api.wrap = (user, main=true) ->
        if user.balance < 1.5
          return cb? {code:401,message: i18n.t('notEnoughGems', req.language)}
        else
-          user.balance -= 1
+          user.balance -= 1.5
          user.items.currentMount = ""
+          user.items.currentPet = ""
          for animal of content.pets
            user.items.pets[animal] = 0
            user.items.mounts[animal] = null