krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages.

Browse Source
This commit is contained in:
Oliver Eyton-Williams
2015-12-02 13:13:45 +01:00
parent da35eb6067
commit dcd7cae312
4 changed files with 23 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
common/script/index.js
View File

@@ -2065,31 +2065,23 @@ api.wrap = function(user, main) {
return item;
},
handleTwoHanded: function(item, type, req) {
var message, ref, weapon, shield;
var message, currentWeapon, currentShield;
if (type == null) {
type = 'equipped';
}
if (item.type === "shield" && ((ref = (weapon = content.gear.flat[user.items.gear[type].weapon])) != null ? ref.twoHanded : void 0)) {
currentShield = content.gear.flat[user.items.gear[type].shield];
currentWeapon = content.gear.flat[user.items.gear[type].weapon];
if (item.type === "shield" && (currentWeapon ? currentWeapon.twoHanded : false)) {
user.items.gear[type].weapon = 'weapon_base_0';
message = [i18n.t('messageTwoHandled', {
gearText: weapon.text(req.language)
}, req.language)];
message.push(i18n.t('messageUnEquipped', {
itemText: weapon.text(req.language)
}, req.language));
}
if (item.twoHanded) {
shield = content.gear.flat[user.items.gear.equipped.shield];
if(shield && user.items.gear.equipped.shield != "shield_base_0"){
user.items.gear[type].shield = "shield_base_0";
message = [i18n.t('messageTwoHandled', {
gearText: item.text(req.language)
}, req.language)];
message.push(i18n.t('messageUnEquipped', {
itemText: shield.text(req.language)
}, req.language));
}
message = i18n.t('messageTwoHandedUnequip', {
twoHandedText: currentWeapon.text(req.language), offHandedText: item.text(req.language),
}, req.language);
} else if (item.twoHanded && (currentShield && user.items.gear[type].shield != "shield_base_0")) {
user.items.gear[type].shield = "shield_base_0";
message = i18n.t('messageTwoHandedEquip', {
twoHandedText: item.text(req.language), offHandedText: currentShield.text(req.language),
}, req.language);
}
return message;
},