krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f

Browse Source
This commit is contained in:
Tyler Renelle
2013-12-06 11:46:07 -07:00
parent 8216828514
commit b852d9a9f2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/js/controllers/inventoryCtrl.js
View File

@@ -182,11 +182,13 @@ habitrpg.controller("InventoryCtrl", ['$rootScope', '$scope', 'User', 'API_URL',
$scope.equip = function(user, item, costume) { $scope.equip = function(user, item, costume) {
var equipTo = costume ? 'costume' : 'equipped'; var equipTo = costume ? 'costume' : 'equipped';
if (~user.items.gear[equipTo].weapon.indexOf('wizard') && item.type == 'shield') if (item.type == 'shield') {
return Notification.text('Staves are two-handed'); var weapon = Items.items.gear.flat[user.items.gear[equipTo].weapon];
if (weapon && weapon.twoHanded) return Notification.text(weapon.text + ' is two-handed');
}
var setVars = {}; var setVars = {};
setVars['items.gear.' + equipTo + '.' + item.type] = item.key; setVars['items.gear.' + equipTo + '.' + item.type] = item.key;
if (item.klass == 'wizard') if (item.twoHanded)
setVars['items.gear.' + equipTo + '.shield'] = 'warrior_shield_0'; setVars['items.gear.' + equipTo + '.shield'] = 'warrior_shield_0';
User.setMultiple(setVars); User.setMultiple(setVars);
} }