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

Include seasonal gear in Market class lists (#9739)

Browse Source 
* fix(shops): include seasonal gear in Market class lists

* fix(market): display non-seasonal broken special items
Also fixes a bug where if a current seasonal item was broken, it would show up twice.
This commit is contained in:
Sabe Jones
2017-12-22 15:29:51 -06:00
committed by GitHub
parent 545b052c10
commit a20c1ba751
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,7 +155,16 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
text: getClassName(classType, language), text: getClassName(classType, language),
}; };
let result = filter(content.gear.flat, ['klass', classType]); let result = filter(content.gear.flat, function findClassGear (gearItem) {
if (gearItem.klass === classType) return true;
let classShift = {
items: user.items,
stats: {
class: classType,
},
};
if (gearItem.specialClass === classType && user.items.gear.owned[gearItem.key] !== false) return gearItem.canOwn(classShift);
});
category.items = map(result, (e) => { category.items = map(result, (e) => {
let newItem = getItemInfo(user, 'marketGear', e, officialPinnedItems); let newItem = getItemInfo(user, 'marketGear', e, officialPinnedItems);
@@ -184,9 +193,7 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
}; };
let falseGear = filter(content.gear.flat, (gear) => { let falseGear = filter(content.gear.flat, (gear) => {
return user.items.gear.owned[gear.key] === false && return user.items.gear.owned[gear.key] === false && (gear.klass === 'special' && !gear.specialClass || gear.key.indexOf('mystery') !== -1);
gear.klass !== user.stats.class &&
gear.klass !== 'special';
}); });
nonClassCategory.items = map(falseGear, (e) => { nonClassCategory.items = map(falseGear, (e) => {