diff --git a/website/common/script/content/constants/animalSetAchievements.js b/website/common/script/content/constants/animalSetAchievements.js index f9591aceea..55e89301c4 100644 --- a/website/common/script/content/constants/animalSetAchievements.js +++ b/website/common/script/content/constants/animalSetAchievements.js @@ -41,21 +41,6 @@ const ANIMAL_SET_ACHIEVEMENTS = { achievementKey: 'domesticated', notificationType: 'ACHIEVEMENT_DOMESTICATED', }, - birdsOfAFeather: { - type: 'pet', - species: [ - 'FlyingPig', - 'Owl', - 'Parrot', - 'Pterodactyl', - 'Gryphon', - 'Falcon', - 'Rooster', - 'Peacock', - ], - achievementKey: 'birdsOfAFeather', - notificationType: 'ACHIEVEMENT_BIRDS_OF_A_FEATHER', - }, zodiacZookeeper: { type: 'pet', species: [ diff --git a/website/common/script/content/constants/questSeasonal.js b/website/common/script/content/constants/questSeasonal.js index 166b2896e4..ed792d7c5c 100644 --- a/website/common/script/content/constants/questSeasonal.js +++ b/website/common/script/content/constants/questSeasonal.js @@ -1,6 +1,6 @@ import find from 'lodash/find'; import moment from 'moment'; -import EVENTS from 'events'; +import { EVENTS } from './events'; import t from '../translation'; const CURRENT_EVENT = find( @@ -33,6 +33,9 @@ const QUEST_SEASONAL = { gp: 20, exp: 100, }, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, }, evilsanta2: { event: CURRENT_EVENT && CURRENT_EVENT.season === 'winter' ? CURRENT_EVENT : null, @@ -63,6 +66,9 @@ const QUEST_SEASONAL = { gp: 20, exp: 100, }, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, }, // spring egg: { @@ -125,6 +131,9 @@ const QUEST_SEASONAL = { gp: 0, exp: 0, }, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, }, waffle: { text: t('questWaffleText'), @@ -165,6 +174,9 @@ const QUEST_SEASONAL = { exp: 500, unlock: t('questWaffleUnlockText'), }, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, }, };