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

WIP(shop): add timings to categories

Browse Source
This commit is contained in:
Sabe Jones
2024-04-23 10:50:45 -05:00
parent 7baec4e48e
commit 8df326bf92
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/common/script/content/constants/schedule.js
View File

@@ -24,7 +24,7 @@ function inListMatcher (list) {
};
}
const ALWAYS_AVAILABLE_CUSTOMIZATIONS = [
export const ALWAYS_AVAILABLE_CUSTOMIZATIONS = [
'animalSkins',
'rainbowSkins',
'rainbowHairColors',
@@ -851,11 +851,11 @@ export function getScheduleMatchingGroup (type, date) {
if (!cachedScheduleMatchers[matcher.type]) {
cachedScheduleMatchers[matcher.type] = makeMatcherClass();
}
const end = moment(checkedDate);
let end = moment(checkedDate);
end.date(TYPE_SCHEDULE[type]);
if (end.date() <= moment(checkedDate).date()) {
moment(end).add(1, 'months');
}
end = moment(end).add(1, 'months');
}
cachedScheduleMatchers[matcher.type].end = end.toDate();
if (matcher.matcher instanceof Function) {
cachedScheduleMatchers[matcher.type].matchers.push(matcher.matcher);

4
website/common/script/libs/getItemInfo.js
View File

@@ -8,6 +8,8 @@ import isPinned from './isPinned';
import isFreeRebirth from './isFreeRebirth';
import getOfficialPinnedItems from './getOfficialPinnedItems';
import { ALWAYS_AVAILABLE_CUSTOMIZATIONS } from '../content/constants/schedule';
function lockQuest (quest, user) {
// checks series quests, including Masterclasser
if (quest.prereqQuests) {
@@ -490,7 +492,7 @@ export default function getItemInfo (user, type, item, officialPinnedItems, lang
throw new BadRequest(i18n.t('wrongItemType', { type }, language));
}
if (matcher) {
if (matcher && (!itemInfo.set || ALWAYS_AVAILABLE_CUSTOMIZATIONS.indexOf(itemInfo.set.key) === -1)) {
itemInfo.end = matcher.end;
}

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

@@ -618,6 +618,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
hairStyle,
officialPinnedItems,
language,
hairType === 'color' ? customizationMatcher : null,
);
category.items.push(item);
}
@@ -643,6 +644,7 @@ shops.getCustomizationsShopCategories = function getCustomizationsShopCategories
appearance,
officialPinnedItems,
language,
type === 'skin' ? customizationMatcher : null,
);
category.items.push(item);
}