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

Don't include seasonal class gear in classless category (#10047)

Browse Source 
* fix(market): don't include seasonal class gear in classless category

* refactor(shops): use standard indexOf check
This commit is contained in:
Sabe Jones
2018-03-06 11:03:49 -06:00
committed by GitHub
parent 27ef187e66
commit b827b17481
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
website/common/script/libs/shops.js
View File

@@ -187,16 +187,14 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
text: i18n.t('none', language), text: i18n.t('none', language),
}; };
let falseGear = filter(content.gear.flat, (gear) => { let specialNonClassGear = filter(content.gear.flat, (gear) => {
let prevOwnedFalseGear = user.items.gear.owned[gear.key] === false && gear.klass !== user.stats.class; return !user.items.gear.owned[gear.key] &&
let specialNonClassGear = !user.items.gear.owned[gear.key] && content.classes.indexOf(gear.klass) === -1 &&
content.classes.indexOf(gear.klass) < 0 && content.classes.indexOf(gear.specialClass) === -1 &&
content.classes.indexOf(gear.specialClass) < 0 &&
(gear.canOwn && gear.canOwn(user)); (gear.canOwn && gear.canOwn(user));
return prevOwnedFalseGear || specialNonClassGear;
}); });
nonClassCategory.items = map(falseGear, (e) => { nonClassCategory.items = map(specialNonClassGear, (e) => {
return getItemInfo(user, 'marketGear', e); return getItemInfo(user, 'marketGear', e);
}); });