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

refactor(common): Update beastmaster functions to use newer each syntax

Browse Source
This commit is contained in:
Blade Barringer
2015-12-29 08:03:19 -06:00
parent 773bb23b88
commit f3ae42e49a
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
common/script/count.js
View File

@@ -1,15 +1,20 @@
import _ from 'lodash'; import {
each,
filter,
keys,
size,
} from 'lodash';
import content from './content/index'; import content from './content/index';
const DROP_ANIMALS = _.keys(content.pets); const DROP_ANIMALS = keys(content.pets);
function beastMasterProgress (pets) { function beastMasterProgress (pets) {
let count = 0; let count = 0;
_(DROP_ANIMALS).each((animal) => { each(DROP_ANIMALS, (animal) => {
if (pets[animal] > 0 || pets[animal] === -1) if (pets[animal] > 0 || pets[animal] === -1)
count++; count++;
}).value(); });
return count; return count;
} }
@@ -17,10 +22,10 @@ function beastMasterProgress (pets) {
function dropPetsCurrentlyOwned (pets) { function dropPetsCurrentlyOwned (pets) {
let count = 0; let count = 0;
_(DROP_ANIMALS).each((animal) => { each(DROP_ANIMALS, (animal) => {
if (pets[animal] > 0) if (pets[animal] > 0)
count++; count++;
}).value(); });
return count; return count;
} }
@@ -28,36 +33,36 @@ function dropPetsCurrentlyOwned (pets) {
function mountMasterProgress (mounts) { function mountMasterProgress (mounts) {
let count = 0; let count = 0;
_(DROP_ANIMALS).each((animal) => { each(DROP_ANIMALS, (animal) => {
if (mounts[animal]) if (mounts[animal])
count++; count++;
}).value(); });
return count; return count;
} }
function remainingGearInSet (userGear, set) { function remainingGearInSet (userGear, set) {
let gear = _.filter(content.gear.flat, (item) => { let gear = filter(content.gear.flat, (item) => {
let setMatches = item.klass === set; let setMatches = item.klass === set;
let hasItem = userGear[item.key]; let hasItem = userGear[item.key];
return setMatches && !hasItem; return setMatches && !hasItem;
}); });
let count = _.size(gear); let count = size(gear);
return count; return count;
} }
function questsOfCategory (userQuests, category) { function questsOfCategory (userQuests, category) {
let quests = _.filter(content.quests, (quest) => { let quests = filter(content.quests, (quest) => {
let categoryMatches = quest.category === category; let categoryMatches = quest.category === category;
let hasQuest = userQuests[quest.key]; let hasQuest = userQuests[quest.key];
return categoryMatches && hasQuest; return categoryMatches && hasQuest;
}); });
let count = _.size(quests); let count = size(quests);
return count; return count;
} }