krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 13:47:33 +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

6
website/common/script/fns/randomDrop.js
View File

@@ -58,7 +58,7 @@ module.exports = function randomDrop (user, options, req = {}) {
rarity = predictableRandom(user, user.stats.gp);
if (rarity > 0.6) { // food 40% chance
drop = cloneDropItem(randomVal(user, _.where(content.food, {
drop = cloneDropItem(randomVal(_.where(content.food, {
canDrop: true,
})));
@@ -73,7 +73,7 @@ module.exports = function randomDrop (user, options, req = {}) {
dropNotes: drop.notes(req.language),
}, req.language);
} else if (rarity > 0.3) { // eggs 30% chance
drop = cloneDropItem(randomVal(user, content.dropEggs));
drop = cloneDropItem(randomVal(content.dropEggs));
if (!user.items.eggs[drop.key]) {
user.items.eggs[drop.key] = 0;
}
@@ -93,7 +93,7 @@ module.exports = function randomDrop (user, options, req = {}) {
} else { // common, 40% of 30%
acceptableDrops = ['Base', 'White', 'Desert'];
}
drop = cloneDropItem(randomVal(user, _.pick(content.hatchingPotions, (v, k) => {
drop = cloneDropItem(randomVal(_.pick(content.hatchingPotions, (v, k) => {
return acceptableDrops.indexOf(k) >= 0;
})));
if (!user.items.hatchingPotions[drop.key]) {