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

refactor: Move user argument to options in randomVal function

Browse Source
This commit is contained in:
Blade Barringer
2016-09-24 19:50:12 -05:00
parent 4df1601718
commit 966a50431f
7 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/common/script/ops/buyArmoire.js
View File

@@ -8,6 +8,9 @@ import {
} from '../libs/errors';
import randomVal from '../fns/randomVal';
// TODO this is only used on the server
// move out of common?
const YIELD_EQUIPMENT_THRESHOLD = 0.6;
const YIELD_FOOD_THRESHOLD = 0.8;
@@ -34,7 +37,7 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
if (armoireHasEquipment && (armoireResult < YIELD_EQUIPMENT_THRESHOLD || !user.flags.armoireOpened)) {
eligibleEquipment.sort();
drop = randomVal(user, eligibleEquipment);
drop = randomVal(eligibleEquipment);
if (user.items.gear.owned[drop.key]) {
throw new NotAuthorized(i18n.t('equipmentAlradyOwned', req.language));
@@ -57,7 +60,7 @@ module.exports = function buyArmoire (user, req = {}, analytics) {
dropText: drop.text(req.language),
};
} else if ((armoireHasEquipment && armoireResult < YIELD_FOOD_THRESHOLD) || armoireResult < 0.5) { // eslint-disable-line no-extra-parens
drop = randomVal(user, _.where(content.food, {
drop = randomVal(_.where(content.food, {
canDrop: true,
}));