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

wip score tests

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-12-13 23:51:06 +01:00
parent 9394fb0d94
commit 409102ae19
3 changed files with 224 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/script/index.js
View File

@@ -2063,7 +2063,7 @@ api.wrap = function(user, main) {
return content.gear.flat[type + "_base_0"];
}
return item;
},
},
handleTwoHanded: function(item, type, req) {
var message, currentWeapon, currentShield;
if (type == null) {
@@ -2071,17 +2071,17 @@ api.wrap = function(user, main) {
}
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('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";
} 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);
}, req.language);
}
return message;
},
@@ -2691,11 +2691,11 @@ api.wrap = function(user, main) {
return computed;
}
});
return Object.defineProperty(user, 'tasks', {
/*return Object.defineProperty(user, 'tasks', {
get: function() {
var tasks;
tasks = user.habits.concat(user.dailys).concat(user.todos).concat(user.rewards);
return _.object(_.pluck(tasks, "id"), tasks);
}
});
});*/
};