Merge remote-tracking branch 'origin/develop' into negue/ui/setting
This commit is contained in:
@@ -183,6 +183,11 @@ const animalSetAchievs = {
|
||||
titleKey: 'achievementDomesticated',
|
||||
textKey: 'achievementDomesticatedText',
|
||||
},
|
||||
polarPro: {
|
||||
icon: 'achievement-polarPro',
|
||||
titleKey: 'achievementPolarPro',
|
||||
textKey: 'achievementPolarProText',
|
||||
},
|
||||
reptacularRumble: {
|
||||
icon: 'achievement-reptacularRumble',
|
||||
titleKey: 'achievementReptacularRumble',
|
||||
|
||||
@@ -18,7 +18,7 @@ export default prefill({
|
||||
setPrice: 5, availableFrom: '2022-10-04T08:00-04:00', availableUntil: EVENTS.fall2022.end, text: t('hauntedColors'),
|
||||
},
|
||||
winteryHairColors: {
|
||||
setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winteryColors'),
|
||||
setPrice: 5, availableFrom: '2023-01-17T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winteryColors'),
|
||||
},
|
||||
rainbowSkins: { setPrice: 5, text: t('rainbowSkins') },
|
||||
animalSkins: { setPrice: 5, text: t('animalSkins') },
|
||||
@@ -33,6 +33,6 @@ export default prefill({
|
||||
setPrice: 5, availableFrom: '2022-07-05T08:00-05:00', availableUntil: EVENTS.summer2022.end, text: t('splashySkins'),
|
||||
},
|
||||
winterySkins: {
|
||||
setPrice: 5, availableFrom: '2021-12-23T08:00-05:00', availableUntil: '2022-01-31T20:00-05:00', text: t('winterySkins'),
|
||||
setPrice: 5, availableFrom: '2023-01-17T08:00-05:00', availableUntil: EVENTS.winter2023.end, text: t('winterySkins'),
|
||||
},
|
||||
});
|
||||
|
||||
@@ -85,8 +85,9 @@ const bundles = {
|
||||
'evilsanta2',
|
||||
'penguin',
|
||||
],
|
||||
event: EVENTS.winter2023,
|
||||
canBuy () {
|
||||
return moment().isBetween('2022-01-11T08:00-05:00', '2022-01-31T20:00-05:00');
|
||||
return moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end);
|
||||
},
|
||||
type: 'quests',
|
||||
value: 7,
|
||||
|
||||
@@ -41,6 +41,18 @@ const ANIMAL_SET_ACHIEVEMENTS = {
|
||||
achievementKey: 'domesticated',
|
||||
notificationType: 'ACHIEVEMENT_ANIMAL_SET',
|
||||
},
|
||||
polarPro: {
|
||||
type: 'pet',
|
||||
species: [
|
||||
'BearCub',
|
||||
'Fox',
|
||||
'Penguin',
|
||||
'Whale',
|
||||
'Wolf',
|
||||
],
|
||||
achievementKey: 'polarPro',
|
||||
notificationType: 'ACHIEVEMENT_ANIMAL_SET',
|
||||
},
|
||||
reptacularRumble: {
|
||||
type: 'pet',
|
||||
species: [
|
||||
|
||||
@@ -10,11 +10,23 @@ const gemsPromo = {
|
||||
|
||||
export const EVENTS = {
|
||||
noEvent: {
|
||||
start: '2022-11-27T20:00-05:00',
|
||||
end: '2022-12-20T08:00-05:00',
|
||||
start: '2023-01-31T20:00-05:00',
|
||||
end: '2023-02-14T08:00-05:00',
|
||||
season: 'normal',
|
||||
npcImageSuffix: '',
|
||||
},
|
||||
winter2023: {
|
||||
start: '2022-12-20T08:00-05:00',
|
||||
end: '2023-01-31T23:59-05:00',
|
||||
npcImageSuffix: '_winter',
|
||||
season: 'winter',
|
||||
gear: true,
|
||||
},
|
||||
g1g12022: {
|
||||
start: '2022-12-15T08:00-05:00',
|
||||
end: '2023-01-08T23:59-05:00',
|
||||
promo: 'g1g1',
|
||||
},
|
||||
harvestFeast2022: {
|
||||
start: '2022-11-22T08:00-05:00',
|
||||
end: '2022-11-27T20:00-05:00',
|
||||
|
||||
@@ -47,6 +47,11 @@ const SEASONAL_SETS = {
|
||||
'winter2022StockingWarriorSet',
|
||||
'winter2022PomegranateMageSet',
|
||||
'winter2022IceCrystalHealerSet',
|
||||
|
||||
'winter2023RibbonRogueSet',
|
||||
'winter2023WalrusWarriorSet',
|
||||
'winter2023FairyLightsMageSet',
|
||||
'winter2023CardinalHealerSet',
|
||||
],
|
||||
spring: [
|
||||
// spring 2014
|
||||
|
||||
@@ -1,6 +1,60 @@
|
||||
import t from './translation';
|
||||
|
||||
const NUMBER_OF_QUESTIONS = 12;
|
||||
const questionList = [
|
||||
{
|
||||
heading: 'overview',
|
||||
translationIndex: 0,
|
||||
},
|
||||
{
|
||||
heading: 'set-up-tasks',
|
||||
translationIndex: 1,
|
||||
},
|
||||
{
|
||||
heading: 'sample-tasks',
|
||||
translationIndex: 2,
|
||||
},
|
||||
{
|
||||
heading: 'task-color',
|
||||
translationIndex: 3,
|
||||
},
|
||||
{
|
||||
heading: 'health',
|
||||
translationIndex: 4,
|
||||
},
|
||||
{
|
||||
heading: 'party-with-friends',
|
||||
translationIndex: 5,
|
||||
},
|
||||
{
|
||||
heading: 'pets-mounts',
|
||||
translationIndex: 6,
|
||||
},
|
||||
{
|
||||
heading: 'character-classes',
|
||||
translationIndex: 7,
|
||||
},
|
||||
{
|
||||
heading: 'blue-mana-bar',
|
||||
translationIndex: 8,
|
||||
},
|
||||
{
|
||||
heading: 'monsters-quests',
|
||||
translationIndex: 9,
|
||||
},
|
||||
{
|
||||
heading: 'gems',
|
||||
translationIndex: 10,
|
||||
},
|
||||
{
|
||||
heading: 'bugs-features',
|
||||
translationIndex: 11,
|
||||
},
|
||||
{
|
||||
heading: 'group-plans',
|
||||
translationIndex: 13,
|
||||
excludedPlatforms: ['android', 'ios'],
|
||||
},
|
||||
];
|
||||
|
||||
const faq = {
|
||||
questions: [],
|
||||
@@ -10,12 +64,14 @@ const faq = {
|
||||
},
|
||||
};
|
||||
|
||||
for (let i = 0; i <= NUMBER_OF_QUESTIONS; i += 1) {
|
||||
questionList.forEach(listEntry => {
|
||||
const question = {
|
||||
question: t(`faqQuestion${i}`),
|
||||
ios: t(`iosFaqAnswer${i}`),
|
||||
android: t(`androidFaqAnswer${i}`),
|
||||
web: t(`webFaqAnswer${i}`, {
|
||||
exclusions: listEntry.excludedPlatforms || [],
|
||||
heading: listEntry.heading,
|
||||
question: t(`faqQuestion${listEntry.translationIndex}`),
|
||||
android: t(`androidFaqAnswer${listEntry.translationIndex}`),
|
||||
ios: t(`iosFaqAnswer${listEntry.translationIndex}`),
|
||||
web: t(`webFaqAnswer${listEntry.translationIndex}`, {
|
||||
// TODO: Need to pull these values from nconf
|
||||
techAssistanceEmail: 'admin@habitica.com',
|
||||
wikiTechAssistanceEmail: 'mailto:admin@habitica.com',
|
||||
@@ -23,6 +79,6 @@ for (let i = 0; i <= NUMBER_OF_QUESTIONS; i += 1) {
|
||||
};
|
||||
|
||||
faq.questions.push(question);
|
||||
}
|
||||
});
|
||||
|
||||
export default faq;
|
||||
|
||||
@@ -96,6 +96,7 @@ const back = {
|
||||
202203: { },
|
||||
202205: { },
|
||||
202206: { },
|
||||
202301: { },
|
||||
};
|
||||
|
||||
const body = {
|
||||
@@ -198,6 +199,7 @@ const head = {
|
||||
202208: { },
|
||||
202210: { },
|
||||
202211: { },
|
||||
202301: { },
|
||||
301404: { },
|
||||
301405: { },
|
||||
301703: { },
|
||||
|
||||
@@ -718,27 +718,35 @@ const armor = {
|
||||
},
|
||||
winter2022Rogue: {
|
||||
set: 'winter2022FireworksRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Warrior: {
|
||||
set: 'winter2022StockingWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Mage: {
|
||||
set: 'winter2022PomegranateMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Healer: {
|
||||
set: 'winter2022IceCrystalHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
spring2022Rogue: {
|
||||
set: 'spring2022MagpieRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Warrior: {
|
||||
set: 'spring2022RainstormWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Mage: {
|
||||
set: 'spring2022ForsythiaMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Healer: {
|
||||
set: 'spring2022PeridotHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
birthday2022: {
|
||||
text: t('armorSpecialBirthday2022Text'),
|
||||
@@ -748,27 +756,47 @@ const armor = {
|
||||
},
|
||||
summer2022Rogue: {
|
||||
set: 'summer2022CrabRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Warrior: {
|
||||
set: 'summer2022WaterspoutWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Mage: {
|
||||
set: 'summer2022MantaRayMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Healer: {
|
||||
set: 'summer2022AngelfishHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
fall2022Rogue: {
|
||||
set: 'fall2022KappaRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Warrior: {
|
||||
set: 'fall2022OrcWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Mage: {
|
||||
set: 'fall2022HarpyMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Healer: {
|
||||
set: 'fall2022WatcherHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
winter2023Rogue: {
|
||||
set: 'winter2023RibbonRogueSet',
|
||||
},
|
||||
winter2023Warrior: {
|
||||
set: 'winter2023WalrusWarriorSet',
|
||||
},
|
||||
winter2023Mage: {
|
||||
set: 'winter2023FairyLightsMageSet',
|
||||
},
|
||||
winter2023Healer: {
|
||||
set: 'winter2023CardinalHealerSet',
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1824,15 +1852,19 @@ const head = {
|
||||
},
|
||||
winter2022Rogue: {
|
||||
set: 'winter2022FireworksRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Warrior: {
|
||||
set: 'winter2022StockingWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Mage: {
|
||||
set: 'winter2022PomegranateMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Healer: {
|
||||
set: 'winter2022IceCrystalHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
nye2021: {
|
||||
text: t('headSpecialNye2021Text'),
|
||||
@@ -1842,39 +1874,69 @@ const head = {
|
||||
},
|
||||
spring2022Rogue: {
|
||||
set: 'spring2022MagpieRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Warrior: {
|
||||
set: 'spring2022RainstormWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Mage: {
|
||||
set: 'spring2022ForsythiaMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Healer: {
|
||||
set: 'spring2022PeridotHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
summer2022Rogue: {
|
||||
set: 'summer2022CrabRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Warrior: {
|
||||
set: 'summer2022WaterspoutWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Mage: {
|
||||
set: 'summer2022MantaRayMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Healer: {
|
||||
set: 'summer2022AngelfishHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
fall2022Rogue: {
|
||||
set: 'fall2022KappaRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Warrior: {
|
||||
set: 'fall2022OrcWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Mage: {
|
||||
set: 'fall2022HarpyMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Healer: {
|
||||
set: 'fall2022WatcherHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
winter2023Rogue: {
|
||||
set: 'winter2023RibbonRogueSet',
|
||||
},
|
||||
winter2023Warrior: {
|
||||
set: 'winter2023WalrusWarriorSet',
|
||||
},
|
||||
winter2023Mage: {
|
||||
set: 'winter2023FairyLightsMageSet',
|
||||
},
|
||||
winter2023Healer: {
|
||||
set: 'winter2023CardinalHealerSet',
|
||||
},
|
||||
nye2022: {
|
||||
text: t('headSpecialNye2022Text'),
|
||||
notes: t('headSpecialNye2022Notes'),
|
||||
value: 0,
|
||||
canOwn: ownsItem('head_special_nye2022'),
|
||||
},
|
||||
};
|
||||
|
||||
@@ -2285,7 +2347,6 @@ const shield = {
|
||||
},
|
||||
spring2015Rogue: {
|
||||
set: 'sneakySqueakerSet',
|
||||
event: EVENTS.spring2021,
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2015Warrior: {
|
||||
@@ -2636,39 +2697,60 @@ const shield = {
|
||||
},
|
||||
winter2022Rogue: {
|
||||
set: 'winter2022FireworksRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Warrior: {
|
||||
set: 'winter2022StockingWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Healer: {
|
||||
set: 'winter2022IceCrystalHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
spring2022Rogue: {
|
||||
set: 'spring2022MagpieRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Warrior: {
|
||||
set: 'spring2022RainstormWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Healer: {
|
||||
set: 'spring2022PeridotHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Rogue: {
|
||||
set: 'summer2022CrabRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Warrior: {
|
||||
set: 'summer2022WaterspoutWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Healer: {
|
||||
set: 'summer2022AngelfishHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
fall2022Rogue: {
|
||||
set: 'fall2022KappaRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Warrior: {
|
||||
set: 'fall2022OrcWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Healer: {
|
||||
set: 'fall2022WatcherHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
winter2023Rogue: {
|
||||
set: 'winter2023RibbonRogueSet',
|
||||
},
|
||||
winter2023Warrior: {
|
||||
set: 'winter2023WalrusWarriorSet',
|
||||
},
|
||||
winter2023Healer: {
|
||||
set: 'winter2023CardinalHealerSet',
|
||||
},
|
||||
};
|
||||
|
||||
@@ -3348,51 +3430,79 @@ const weapon = {
|
||||
},
|
||||
winter2022Rogue: {
|
||||
set: 'winter2022FireworksRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Warrior: {
|
||||
set: 'winter2022StockingWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Mage: {
|
||||
set: 'winter2022PomegranateMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
winter2022Healer: {
|
||||
set: 'winter2022IceCrystalHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'winter',
|
||||
},
|
||||
spring2022Rogue: {
|
||||
set: 'spring2022MagpieRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Warrior: {
|
||||
set: 'spring2022RainstormWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Mage: {
|
||||
set: 'spring2022ForsythiaMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
spring2022Healer: {
|
||||
set: 'spring2022PeridotHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'spring',
|
||||
},
|
||||
summer2022Rogue: {
|
||||
set: 'summer2022CrabRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Warrior: {
|
||||
set: 'summer2022WaterspoutWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Mage: {
|
||||
set: 'summer2022MantaRayMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
summer2022Healer: {
|
||||
set: 'summer2022AngelfishHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'summer',
|
||||
},
|
||||
fall2022Rogue: {
|
||||
set: 'fall2022KappaRogueSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Warrior: {
|
||||
set: 'fall2022OrcWarriorSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Mage: {
|
||||
set: 'fall2022HarpyMageSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
fall2022Healer: {
|
||||
set: 'fall2022WatcherHealerSet',
|
||||
canBuy: () => CURRENT_EVENT && CURRENT_EVENT.season === 'fall',
|
||||
},
|
||||
winter2023Rogue: {
|
||||
set: 'winter2023RibbonRogueSet',
|
||||
},
|
||||
winter2023Warrior: {
|
||||
set: 'winter2023WalrusWarriorSet',
|
||||
},
|
||||
winter2023Mage: {
|
||||
set: 'winter2023FairyLightsMageSet',
|
||||
},
|
||||
winter2023Healer: {
|
||||
set: 'winter2023CardinalHealerSet',
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
@@ -176,11 +176,11 @@ const premium = {
|
||||
limited: true,
|
||||
_addlNotes: t('eventAvailabilityReturning', {
|
||||
availableDate: t('dateEndJanuary'),
|
||||
previousDate: t('januaryYYYY', { year: 2020 }),
|
||||
previousDate: t('januaryYYYY', { year: 2022 }),
|
||||
}),
|
||||
event: EVENTS.winter2022,
|
||||
event: EVENTS.winter2023,
|
||||
canBuy () {
|
||||
return moment().isBetween(EVENTS.winter2022.start, EVENTS.winter2022.end);
|
||||
return moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end);
|
||||
},
|
||||
},
|
||||
Peppermint: {
|
||||
@@ -200,12 +200,13 @@ const premium = {
|
||||
value: 2,
|
||||
text: t('hatchingPotionStarryNight'),
|
||||
limited: true,
|
||||
event: EVENTS.winter2023,
|
||||
canBuy () {
|
||||
return moment().isBetween('2019-12-19', '2020-02-02');
|
||||
return moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end);
|
||||
},
|
||||
_addlNotes: t('eventAvailabilityReturning', {
|
||||
availableDate: t('dateEndJanuary'),
|
||||
previousDate: t('decemberYYYY', { year: 2017 }),
|
||||
previousDate: t('decemberYYYY', { year: 2019 }),
|
||||
}),
|
||||
},
|
||||
Rainbow: {
|
||||
@@ -360,11 +361,11 @@ const premium = {
|
||||
limited: true,
|
||||
_addlNotes: t('eventAvailabilityReturning', {
|
||||
availableDate: t('dateEndJanuary'),
|
||||
previousDate: t('decemberYYYY', { year: 2019 }),
|
||||
previousDate: t('decemberYYYY', { year: 2020 }),
|
||||
}),
|
||||
event: EVENTS.winter2021,
|
||||
event: EVENTS.winter2023,
|
||||
canBuy () {
|
||||
return moment().isBetween('2020-12-22T08:00-04:00', '2021-01-31T20:00-04:00');
|
||||
return moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end);
|
||||
},
|
||||
},
|
||||
Ruby: {
|
||||
|
||||
@@ -5,7 +5,7 @@ import { EVENTS } from './constants';
|
||||
// path: 'premiumHatchingPotions.Rainbow',
|
||||
const featuredItems = {
|
||||
market () {
|
||||
if (moment().isBetween(EVENTS.bundle202211.start, EVENTS.bundle202211.end)) {
|
||||
if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
|
||||
return [
|
||||
{
|
||||
type: 'armoire',
|
||||
@@ -13,15 +13,15 @@ const featuredItems = {
|
||||
},
|
||||
{
|
||||
type: 'premiumHatchingPotion',
|
||||
path: 'premiumHatchingPotions.Frost',
|
||||
path: 'premiumHatchingPotions.StarryNight',
|
||||
},
|
||||
{
|
||||
type: 'premiumHatchingPotion',
|
||||
path: 'premiumHatchingPotions.Ember',
|
||||
path: 'premiumHatchingPotions.Holly',
|
||||
},
|
||||
{
|
||||
type: 'premiumHatchingPotion',
|
||||
path: 'premiumHatchingPotions.Thunderstorm',
|
||||
path: 'premiumHatchingPotions.Aurora',
|
||||
},
|
||||
];
|
||||
}
|
||||
@@ -32,51 +32,51 @@ const featuredItems = {
|
||||
},
|
||||
{
|
||||
type: 'food',
|
||||
path: 'food.Milk',
|
||||
path: 'food.RottenMeat',
|
||||
},
|
||||
{
|
||||
type: 'hatchingPotions',
|
||||
path: 'hatchingPotions.White',
|
||||
path: 'hatchingPotions.CottonCandyBlue',
|
||||
},
|
||||
{
|
||||
type: 'eggs',
|
||||
path: 'eggs.Fox',
|
||||
path: 'eggs.FlyingPig',
|
||||
},
|
||||
];
|
||||
},
|
||||
quests () {
|
||||
if (moment().isBetween(EVENTS.bundle202211.start, EVENTS.bundle202211.end)) {
|
||||
if (moment().isBetween(EVENTS.winter2023.start, EVENTS.winter2023.end)) {
|
||||
return [
|
||||
{
|
||||
type: 'bundles',
|
||||
path: 'bundles.rockingReptiles',
|
||||
path: 'bundles.winterQuests',
|
||||
},
|
||||
{
|
||||
type: 'quests',
|
||||
path: 'quests.peacock',
|
||||
path: 'quests.whale',
|
||||
},
|
||||
{
|
||||
type: 'quests',
|
||||
path: 'quests.harpy',
|
||||
path: 'quests.turtle',
|
||||
},
|
||||
];
|
||||
}
|
||||
return [
|
||||
{
|
||||
type: 'quests',
|
||||
path: 'quests.axolotl',
|
||||
path: 'quests.slime',
|
||||
},
|
||||
{
|
||||
type: 'quests',
|
||||
path: 'quests.stone',
|
||||
path: 'quests.seaserpent',
|
||||
},
|
||||
{
|
||||
type: 'quests',
|
||||
path: 'quests.whale',
|
||||
path: 'quests.unicorn',
|
||||
},
|
||||
];
|
||||
},
|
||||
seasonal: 'spring2021Healer',
|
||||
seasonal: 'winter2022Healer',
|
||||
timeTravelers: [
|
||||
// TODO
|
||||
],
|
||||
|
||||
@@ -289,7 +289,7 @@ spells.special = {
|
||||
target: 'user',
|
||||
notes: t('spellSpecialSnowballAuraNotes'),
|
||||
canOwn () {
|
||||
return moment().isBetween('2021-12-30T08:00-04:00', EVENTS.winter2022.end);
|
||||
return moment().isBetween('2022-12-27T08:00-05:00', EVENTS.winter2023.end);
|
||||
},
|
||||
cast (user, target, req) {
|
||||
if (!user.items.special.snowball) throw new NotAuthorized(t('spellNotOwned')(req.language));
|
||||
@@ -435,7 +435,7 @@ spells.special = {
|
||||
target: 'user',
|
||||
notes: t('nyeCardNotes'),
|
||||
canOwn () {
|
||||
return moment().isBetween('2021-12-30T08:00-04:00', '2022-01-02T20:00-04:00');
|
||||
return moment().isBetween('2022-12-28T08:00-05:00', '2023-01-02T20:00-05:00');
|
||||
},
|
||||
cast (user, target) {
|
||||
if (user === target) {
|
||||
|
||||
@@ -220,6 +220,7 @@ function _getBasicAchievements (user, language) {
|
||||
_addSimple(result, user, { path: 'reptacularRumble', language });
|
||||
_addSimple(result, user, { path: 'woodlandWizard', language });
|
||||
_addSimple(result, user, { path: 'boneToPick', language });
|
||||
_addSimple(result, user, { path: 'polarPro', language });
|
||||
|
||||
_addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
|
||||
_addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });
|
||||
|
||||
@@ -30,23 +30,24 @@ export default {
|
||||
|
||||
pinnedSets: SHOP_OPEN
|
||||
? {
|
||||
healer: 'fall2022WatcherHealerSet',
|
||||
rogue: 'fall2022KappaRogueSet',
|
||||
warrior: 'fall2022OrcWarriorSet',
|
||||
wizard: 'fall2022HarpyMageSet',
|
||||
rogue: 'winter2023RibbonRogueSet',
|
||||
warrior: 'winter2023WalrusWarriorSet',
|
||||
wizard: 'winter2023FairyLightsMageSet',
|
||||
healer: 'winter2023CardinalHealerSet',
|
||||
}
|
||||
: {},
|
||||
availableSpells: SHOP_OPEN && moment().isBetween('2022-10-04T08:00-05:00', CURRENT_EVENT.end)
|
||||
availableSpells: SHOP_OPEN && moment().isBetween('2022-12-27T08:00-05:00', CURRENT_EVENT.end)
|
||||
? [
|
||||
'spookySparkles',
|
||||
'snowball',
|
||||
]
|
||||
: [],
|
||||
|
||||
availableQuests: SHOP_OPEN && CURRENT_EVENT.season === 'spring'
|
||||
availableQuests: SHOP_OPEN && CURRENT_EVENT.season === 'winter'
|
||||
? [
|
||||
'egg',
|
||||
'evilsanta',
|
||||
'evilsanta2',
|
||||
]
|
||||
: [],
|
||||
|
||||
featuredSet: 'fall2021BrainEaterMageSet',
|
||||
featuredSet: 'winter2022PomegranateMageSet',
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user