krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 21:57:22 +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

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

@@ -156,12 +156,23 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
};
let result = filter(content.gear.flat, ['klass', classType]);
category.items = map(result, (e) => {
let newItem = getItemInfo(user, 'marketGear', e, officialPinnedItems);
return newItem;
});
let specialGear = filter(content.gear.flat, (gear) => {
return user.items.gear.owned[gear.key] === false &&
gear.specialClass === classType &&
gear.klass === 'special';
});
each(specialGear, (gear) => {
category.items.push(getItemInfo(user, 'marketGear', gear));
});
shops.checkMarketGearLocked(user, category.items);
categories.push(category);
@@ -173,7 +184,9 @@ shops.getMarketGearCategories = function getMarketGear (user, language) {
};
let falseGear = filter(content.gear.flat, (gear) => {
return user.items.gear.owned[gear.key] === false && gear.klass !== user.stats.class;
return user.items.gear.owned[gear.key] === false &&
gear.klass !== user.stats.class &&
gear.klass !== 'special';
});
nonClassCategory.items = map(falseGear, (e) => {
@@ -314,6 +327,8 @@ shops.getTimeTravelersShop = function getTimeTravelersShop (user, language) {
shops.getTimeTravelersCategories = function getTimeTravelersCategories (user, language) {
let categories = [];
let stable = {pets: 'Pet-', mounts: 'Mount_Icon_'};
let officialPinnedItems = getOfficialPinnedItems(user);
for (let type in stable) {
if (stable.hasOwnProperty(type)) {
let category = {
@@ -325,18 +340,10 @@ shops.getTimeTravelersCategories = function getTimeTravelersCategories (user, la
for (let key in content.timeTravelStable[type]) {
if (content.timeTravelStable[type].hasOwnProperty(key)) {
if (!user.items[type][key]) {
let item = {
let item = getItemInfo(user, 'timeTravelersStable', {
key,
text: content.timeTravelStable[type][key](language),
class: stable[type] + key,
type,
purchaseType: type,
value: 1,
notes: '',
locked: false,
currency: 'hourglasses',
pinType: 'IGNORE',
};
}, officialPinnedItems, language);
category.items.push(item);
}
}