diff --git a/website/common/locales/en/limited.json b/website/common/locales/en/limited.json index 429927b219..0ded465129 100644 --- a/website/common/locales/en/limited.json +++ b/website/common/locales/en/limited.json @@ -161,7 +161,7 @@ "fall2020WraithWarriorSet": "Wraith (Warrior)", "fall2020DeathsHeadMothHealerSet": "Death's Head Moth (Healer)", "fall2020ThirdEyeMageSet": "Third Eye (Mage)", - "fall2020TwoHeadedRogueSet": "Crocodile (Rogue)", + "fall2020TwoHeadedRogueSet": "Two-Headed (Rogue)", "eventAvailability": "Available for purchase until <%= date(locale) %>.", "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.", "dateEndMarch": "April 30", diff --git a/website/common/script/content/gear/sets/special/index.js b/website/common/script/content/gear/sets/special/index.js index 1426c8e892..69d325f13f 100644 --- a/website/common/script/content/gear/sets/special/index.js +++ b/website/common/script/content/gear/sets/special/index.js @@ -972,6 +972,7 @@ const eyewear = { text: t('eyewearSpecialFall2019RogueText'), notes: t('eyewearSpecialFall2019RogueNotes'), value: 20, + canBuy: () => CURRENT_SEASON === 'fall', }, fall2019Healer: { event: EVENTS.fall2019, @@ -980,6 +981,7 @@ const eyewear = { text: t('eyewearSpecialFall2019HealerText'), notes: t('eyewearSpecialFall2019HealerNotes'), value: 20, + canBuy: () => CURRENT_SEASON === 'fall', }, ks2019: { text: t('eyewearSpecialKS2019Text'), diff --git a/website/common/script/libs/shops.js b/website/common/script/libs/shops.js index 676a885699..41d0cd466d 100644 --- a/website/common/script/libs/shops.js +++ b/website/common/script/libs/shops.js @@ -22,6 +22,7 @@ const shops = {}; /* Market */ shops.getMarketShop = function getMarketShop (user, language) { + const officialPinned = getOfficialPinnedItems(user); return { identifier: 'market', text: i18n.t('market'), @@ -30,7 +31,9 @@ shops.getMarketShop = function getMarketShop (user, language) { categories: shops.getMarketCategories(user, language), featured: { text: i18n.t('featuredItems'), - items: featuredItems.market().map(i => getItemInfo(user, i.type, get(content, i.path))), + items: officialPinned.length > 0 + ? officialPinned.map(i => getItemInfo(user, i.type, get(content, i.path))) + : featuredItems.market().map(i => getItemInfo(user, i.type, get(content, i.path))), }, }; };