From e6d684ed7a5456cb2a84fc0b06d14685ca42e44b Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 16 Dec 2013 00:34:44 -0700 Subject: [PATCH] show message when buying items --- dist/habitrpg-shared.js | 8 +++++++- script/index.coffee | 3 ++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index cfaab18a9c..d77f420a04 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -11307,12 +11307,18 @@ var process=require("__browserify_process");(function() { user.items.gear.equipped[item.type] = item.key; user.items.gear.owned[item.key] = true; message = user.fns.handleTwoHanded(item); + if (message == null) { + message = "Bought " + item.text + "."; + } if (((_ref = item.klass) === 'warrior' || _ref === 'wizard' || _ref === 'healer' || _ref === 'rogue') && user.fns.getItem('weapon').last && user.fns.getItem('armor').last && user.fns.getItem('head').last && user.fns.getItem('shield').last) { user.achievements.ultimateGear = true; } } user.stats.gp -= item.value; - return typeof cb === "function" ? cb(message, req) : void 0; + return typeof cb === "function" ? cb({ + code: 200, + message: message + }, req) : void 0; }, sell: function(req, cb) { var key, type, _ref; diff --git a/script/index.coffee b/script/index.coffee index 036dc6dc0a..44b839270c 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -523,10 +523,11 @@ api.wrap = (user) -> user.items.gear.equipped[item.type] = item.key user.items.gear.owned[item.key] = true message = user.fns.handleTwoHanded(item) + message ?= "Bought #{item.text}." if item.klass in ['warrior','wizard','healer','rogue'] and user.fns.getItem('weapon').last and user.fns.getItem('armor').last and user.fns.getItem('head').last and user.fns.getItem('shield').last user.achievements.ultimateGear = true user.stats.gp -= item.value - cb? message, req + cb? {code:200, message}, req sell: (req, cb) -> {key, type} = req.params