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

market fixes 28th nov (#9593)

Browse Source 
* list special gear by the `specialClass` - fixes #9485

* only disable the currencly label + value not the amount input - fixes #9492

* disable transformations on equipment previews - fixes #9497

* show boss strength - fixes #9522

* pin time travelers animals - closes #9382

* clean up + package-lock ?

* fix quest info
This commit is contained in:
negue
2017-12-05 21:09:34 +01:00
committed by Sabe Jones
parent 4b610ba3f1
commit c56c69d464
12 changed files with 136 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/common/script/libs/inAppRewards.js
View File

@@ -1,9 +1,8 @@
import content from '../content/index';
import get from 'lodash/get';
import getItemInfo from './getItemInfo';
import shops from './shops';
import getOfficialPinnedItems from './getOfficialPinnedItems';
import getItemByPathAndType from './getItemByPathAndType';
module.exports = function getPinnedItems (user) {
let officialPinnedItems = getOfficialPinnedItems(user);
@@ -16,7 +15,9 @@ module.exports = function getPinnedItems (user) {
const pinnedItems = officialPinnedItemsNotUnpinned.concat(user.pinnedItems);
let items = pinnedItems.map(({type, path}) => {
return getItemInfo(user, type, get(content, path), officialPinnedItems);
let item = getItemByPathAndType(type, path);
return getItemInfo(user, type, item, officialPinnedItems);
});
shops.checkMarketGearLocked(user, items);