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

Cleaned up variable test/initialization (#8904)

Browse Source
This commit is contained in:
Andrew Levenson
2017-08-02 15:22:36 -04:00
committed by Sabe Jones
parent add2743772
commit 1ad3292f18
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,9 +46,9 @@ module.exports = function randomDrop (user, options, req = {}) {
chance = diminishingReturns(chance, 0.75);
if (predictableRandom() < chance) {
if (!user.party.quest.progress.collectedItems) user.party.quest.progress.collectedItems = 0;
user.party.quest.progress.collectedItems = user.party.quest.progress.collectedItems || 0;
user.party.quest.progress.collectedItems++;
if (!user._tmp.quest) user._tmp.quest = {};
user._tmp.quest = user._tmp.quest || {};
user._tmp.quest.collection = 1;
user.markModified('party.quest.progress');
}
@@ -72,9 +72,7 @@ module.exports = function randomDrop (user, options, req = {}) {
canDrop: true,
})));
if (!user.items.food[drop.key]) {
user.items.food[drop.key] = 0;
}
user.items.food[drop.key] = user.items.food[drop.key] || 0;
user.items.food[drop.key] += 1;
drop.type = 'Food';
drop.dialog = i18n.t('messageDropFood', {
@@ -84,9 +82,7 @@ module.exports = function randomDrop (user, options, req = {}) {
}, req.language);
} else if (rarity > 0.3) { // eggs 30% chance
drop = cloneDropItem(randomVal(content.dropEggs));
if (!user.items.eggs[drop.key]) {
user.items.eggs[drop.key] = 0;
}
user.items.eggs[drop.key] = user.items.eggs[drop.key] || 0;
user.items.eggs[drop.key]++;
drop.type = 'Egg';
drop.dialog = i18n.t('messageDropEgg', {
@@ -106,9 +102,7 @@ module.exports = function randomDrop (user, options, req = {}) {
drop = cloneDropItem(randomVal(pickBy(content.hatchingPotions, (v, k) => {
return acceptableDrops.indexOf(k) >= 0;
})));
if (!user.items.hatchingPotions[drop.key]) {
user.items.hatchingPotions[drop.key] = 0;
}
user.items.hatchingPotions[drop.key] = user.items.hatchingPotions[drop.key] || 0;
user.items.hatchingPotions[drop.key]++;
drop.type = 'HatchingPotion';
drop.dialog = i18n.t('messageDropPotion', {