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

fix(event): various content corrections

Browse Source
This commit is contained in:
Sabe Jones
2020-09-21 19:59:13 -05:00
parent 3aa58398b7
commit 0a15c0f1d8
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/common/locales/en/limited.json
View File

@@ -161,7 +161,7 @@
"fall2020WraithWarriorSet": "Wraith (Warrior)", "fall2020WraithWarriorSet": "Wraith (Warrior)",
"fall2020DeathsHeadMothHealerSet": "Death's Head Moth (Healer)", "fall2020DeathsHeadMothHealerSet": "Death's Head Moth (Healer)",
"fall2020ThirdEyeMageSet": "Third Eye (Mage)", "fall2020ThirdEyeMageSet": "Third Eye (Mage)",
"fall2020TwoHeadedRogueSet": "Crocodile (Rogue)", "fall2020TwoHeadedRogueSet": "Two-Headed (Rogue)",
"eventAvailability": "Available for purchase until <%= date(locale) %>.", "eventAvailability": "Available for purchase until <%= date(locale) %>.",
"eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.", "eventAvailabilityReturning": "Available for purchase until <%= availableDate(locale) %>. This potion was last available in <%= previousDate(locale) %>.",
"dateEndMarch": "April 30", "dateEndMarch": "April 30",

2
website/common/script/content/gear/sets/special/index.js
View File

@@ -972,6 +972,7 @@ const eyewear = {
text: t('eyewearSpecialFall2019RogueText'), text: t('eyewearSpecialFall2019RogueText'),
notes: t('eyewearSpecialFall2019RogueNotes'), notes: t('eyewearSpecialFall2019RogueNotes'),
value: 20, value: 20,
canBuy: () => CURRENT_SEASON === 'fall',
}, },
fall2019Healer: { fall2019Healer: {
event: EVENTS.fall2019, event: EVENTS.fall2019,
@@ -980,6 +981,7 @@ const eyewear = {
text: t('eyewearSpecialFall2019HealerText'), text: t('eyewearSpecialFall2019HealerText'),
notes: t('eyewearSpecialFall2019HealerNotes'), notes: t('eyewearSpecialFall2019HealerNotes'),
value: 20, value: 20,
canBuy: () => CURRENT_SEASON === 'fall',
}, },
ks2019: { ks2019: {
text: t('eyewearSpecialKS2019Text'), text: t('eyewearSpecialKS2019Text'),

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

@@ -22,6 +22,7 @@ const shops = {};
/* Market */ /* Market */
shops.getMarketShop = function getMarketShop (user, language) { shops.getMarketShop = function getMarketShop (user, language) {
const officialPinned = getOfficialPinnedItems(user);
return { return {
identifier: 'market', identifier: 'market',
text: i18n.t('market'), text: i18n.t('market'),
@@ -30,7 +31,9 @@ shops.getMarketShop = function getMarketShop (user, language) {
categories: shops.getMarketCategories(user, language), categories: shops.getMarketCategories(user, language),
featured: { featured: {
text: i18n.t('featuredItems'), 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))),
}, },
}; };
}; };