From a0ea8dbca2ab80d44aae8f2e0429bec1383dd4b7 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 4 Dec 2013 22:50:43 -0700 Subject: [PATCH] costumes: add costume support (supporting habitrpg#5fea978) --- dist/habitrpg-shared.js | 6 +++--- script/algos.coffee | 2 +- script/items.coffee | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 3e54586cc1..7d4a3e2087 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -8759,7 +8759,7 @@ var global=self;/** get: function() { var _this = this; return _.reduce(['per', 'con', 'str', 'int'], function(m, stat) { - m[stat] = _.reduce('stats stats.buffs items.gear.current.weapon items.gear.current.armor items.gear.current.head items.gear.current.shield'.split(' '), function(m2, path) { + m[stat] = _.reduce('stats stats.buffs items.gear.equipped.weapon items.gear.equipped.armor items.gear.equipped.head items.gear.equipped.shield'.split(' '), function(m2, path) { var val, _ref1; val = helpers.dotGet(path, _this); return m2 + (~path.indexOf('items.gear') ? (+((_ref1 = items.items.gear.flat[val]) != null ? _ref1[stat] : void 0) || 0) * (~(val != null ? val.indexOf(_this.stats["class"]) : void 0) ? 1.2 : 1) : +val[stat] || 0); @@ -11170,7 +11170,7 @@ try { user.stats.hp = 50; } } else { - user.items.gear.current[type] = nextItem.key; + user.items.gear.equipped[type] = nextItem.key; user.items.gear.owned[nextItem.key] = true; if (getItem(user, 'weapon').last && getItem(user, 'armor').last && getItem(user, 'head').last && getItem(user, 'shield').last) { user.achievements.ultimateGear = true; @@ -11207,7 +11207,7 @@ try { module.exports.getItem = getItem = function(user, type) { var item; - item = items.gear.flat[user.items.gear.current[type]]; + item = items.gear.flat[user.items.gear.equipped[type]]; if (!item) { return items.gear.flat["" + type + "_" + (_class(user)) + "_0"]; } diff --git a/script/algos.coffee b/script/algos.coffee index 73349aa799..4d5b7d1684 100644 --- a/script/algos.coffee +++ b/script/algos.coffee @@ -17,7 +17,7 @@ obj.defineComputed = (user) -> Object.defineProperty user, '_statsComputed', get: -> _.reduce(['per','con','str','int'], (m,stat) => - m[stat] = _.reduce('stats stats.buffs items.gear.current.weapon items.gear.current.armor items.gear.current.head items.gear.current.shield'.split(' '), (m2,path) => + m[stat] = _.reduce('stats stats.buffs items.gear.equipped.weapon items.gear.equipped.armor items.gear.equipped.head items.gear.equipped.shield'.split(' '), (m2,path) => val = helpers.dotGet(path, @) m2 + if ~path.indexOf('items.gear') diff --git a/script/items.coffee b/script/items.coffee index 7197441020..1c0c015b1e 100644 --- a/script/items.coffee +++ b/script/items.coffee @@ -423,7 +423,7 @@ module.exports.buyItem = (user, type) -> user.stats.hp += 15; user.stats.hp = 50 if user.stats.hp > 50 else - user.items.gear.current[type] = nextItem.key + user.items.gear.equipped[type] = nextItem.key user.items.gear.owned[nextItem.key] = true; if getItem(user,'weapon').last && getItem(user,'armor').last && getItem(user,'head').last && getItem(user,'shield').last user.achievements.ultimateGear = true; @@ -446,6 +446,6 @@ module.exports.updateStore = (user) -> Gets an item, and caps max to the last item in its array ### module.exports.getItem = getItem = (user, type) -> - item = items.gear.flat[user.items.gear.current[type]] + item = items.gear.flat[user.items.gear.equipped[type]] return items.gear.flat["#{type}_#{_class(user)}_0"] unless item item