diff --git a/website/common/script/content/constants/schedule.js b/website/common/script/content/constants/schedule.js index edcbd86cb7..b094e32987 100644 --- a/website/common/script/content/constants/schedule.js +++ b/website/common/script/content/constants/schedule.js @@ -672,6 +672,13 @@ export const GALA_SCHEDULE = { 'shinySeed', ], }, + { + type: 'seasonalQuests', + items: [ + 'egg', + 'waffle', + ], + }, { type: 'customizations', matcher: customizationMatcher([ @@ -695,6 +702,11 @@ export const GALA_SCHEDULE = { 'seafoam', ], }, + { + type: 'seasonalQuests', + items: [ + ], + }, { type: 'customizations', matcher: customizationMatcher([ @@ -717,6 +729,11 @@ export const GALA_SCHEDULE = { 'spookySparkles', ], }, + { + type: 'seasonalQuests', + items: [ + ], + }, { type: 'customizations', matcher: customizationMatcher([ @@ -799,10 +816,17 @@ export function getScheduleMatchingGroup (type, date) { matchers: [], items: [], match (key) { - if (this.items.length > 0 && !inListMatcher(this.items)(key)) { - return false; + if (this.matchers.length === 0) { + if (this.items.length > 0) { + return inListMatcher(this.items)(key); + } + } else { + if (this.items.length > 0 && !inListMatcher(this.items)(key)) { + return false; + } + return this.matchers.every(m => m(key)); } - return this.matchers.every(m => m(key)); + return false; }, }; } diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index 944ebf489d..9326ba5c73 100644 --- a/website/common/script/libs/shops.js +++ b/website/common/script/libs/shops.js @@ -495,6 +495,7 @@ shops.getSeasonalShopCategories = function getSeasonalShopCategories (user, lang categories.push(category); } + console.log(questMatcher); const quests = pickBy(content.quests, (quest, key) => questMatcher.match(key)); if (keys(quests).length > 0) {