feat(equipment): remove base gear from equipment tabs. now clicking the

same gear you have equipped will un-equip it
This commit is contained in:
Tyler Renelle
2014-03-21 15:06:26 -06:00
parent 6c2b45ff01
commit 50132f1a35
11 changed files with 604 additions and 665 deletions
+295 -330
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+7 -2
View File
@@ -12425,8 +12425,13 @@ var process=require("__browserify_process");(function() {
case 'costume':
case 'equipped':
item = content.gear.flat[key];
user.items.gear[type][item.type] = item.key;
message = user.fns.handleTwoHanded(item, type);
if (user.items.gear[type][item.type] === key) {
user.items.gear[type][item.type] = "" + item.type + "_base_0";
message = "" + item.text + " un-equipped.";
} else {
user.items.gear[type][item.type] = item.key;
message = user.fns.handleTwoHanded(item, type);
}
}
return typeof cb === "function" ? cb((message ? {
code: 200,
+295 -330
View File
File diff suppressed because it is too large Load Diff
BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 KiB

After

Width:  |  Height:  |  Size: 519 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 966 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

+6 -2
View File
@@ -648,8 +648,12 @@ api.wrap = (user, main=true) ->
user.items.currentPet = if user.items.currentPet is key then '' else key
when 'costume','equipped'
item = content.gear.flat[key]
user.items.gear[type][item.type] = item.key
message = user.fns.handleTwoHanded(item,type)
if user.items.gear[type][item.type] is key
user.items.gear[type][item.type] = "#{item.type}_base_0"
message = "#{item.text} un-equipped."
else
user.items.gear[type][item.type] = item.key
message = user.fns.handleTwoHanded(item,type)
cb? (if message then {code:200,message} else null), user.items
hatch: (req, cb) ->