sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-14 07:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #222 from Alys/equip-fix2

Browse source 
show "unequipped" message instead of "equipped" when taking off gear
This commit is contained in:
Tyler Renelle 2014-06-06 13:58:06 -06:00
commit 5d2399015e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dist/habitrpg-shared.js vendored
View file

@ -12985,7 +12985,7 @@ api.wrap = function(user, main) {
item = content.gear.flat[key];
if (user.items.gear[type][item.type] === key) {
user.items.gear[type][item.type] = "" + item.type + "_base_0";
message = i18n.t('messageEquipped', {
message = i18n.t('messageUnEquipped', {
itemText: item.text(req.language)
}, req.language);
} else {
@ -13855,4 +13855,4 @@ api.wrap = function(user, main) {
}).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])

2
script/index.coffee
View file

@ -649,7 +649,7 @@ api.wrap = (user, main=true) ->
item = content.gear.flat[key]
if user.items.gear[type][item.type] is key
user.items.gear[type][item.type] = "#{item.type}_base_0"
message = i18n.t('messageEquipped', {itemText: item.text(req.language)}, req.language)
message = i18n.t('messageUnEquipped', {itemText: item.text(req.language)}, req.language)
else
user.items.gear[type][item.type] = item.key
message = user.fns.handleTwoHanded(item,type,req)