diff --git a/habitica-images b/habitica-images index d7d7eeb46e..22d251cecb 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit d7d7eeb46ecae4f428d61f8ef9854a3c1d8c0f86 +Subproject commit 22d251cecb9d8d8c43d8c9bdacc0d1ae7f11be32 diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index 29daefffe8..e5911fbc5f 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -305,8 +305,8 @@ } .achievement-reptacularRumble2x { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-reptacularRumble2x.png'); - width: 68px; - height: 68px; + width: 60px; + height: 64px; } .achievement-rosyOutlook2x { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-rosyOutlook2x.png'); diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json index 1f44833c8b..7e8bb8f59a 100644 --- a/website/common/locales/en/achievements.json +++ b/website/common/locales/en/achievements.json @@ -128,10 +128,9 @@ "achievementZodiacZookeeperText": "Has hatched all standard colors of zodiac pets: Rat, Cow, Bunny, Snake, Horse, Sheep, Monkey, Rooster, Wolf, Tiger, Flying Pig, and Dragon!", "achievementZodiacZookeeperModalText": "You collected all the zodiac pets!", "achievementBirdsOfAFeather": "Birds of a Feather", - "achievementBirdsOfAFeatherText": "Has hatched all standard colors of flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, Falcon, Peacock, and Rooster.", + "achievementBirdsOfAFeatherText": "Has hatched all standard colors of flying pets: Flying Pig, Owl, Parrot, Pterodactyl, Gryphon, Falcon, Peacock, and Rooster!", "achievementBirdsOfAFeatherModalText": "You collected all the flying pets!", "achievementReptacularRumble": "Reptacular Rumble", - "achievementReptacularRumbleText": "Has hatched all the standard colors of reptile pets: Alligator, Pterodactyl, Snake, Triceratops, Turtle, Tyrannosaurus Rex, and Velociraptor.", + "achievementReptacularRumbleText": "Has hatched all the standard colors of reptile pets: Alligator, Pterodactyl, Snake, Triceratops, Turtle, Tyrannosaurus Rex, and Velociraptor!", "achievementReptacularRumbleModalText": "You collected all the reptile pets!" - } diff --git a/website/common/script/content/achievements.js b/website/common/script/content/achievements.js index a7ec3df837..705dec9f8a 100644 --- a/website/common/script/content/achievements.js +++ b/website/common/script/content/achievements.js @@ -186,7 +186,7 @@ const animalSetAchievs = { reptacularRumble: { icon: 'achievement-reptacularRumble', titleKey: 'achievementReptacularRumble', - textKey: 'achievementReptacularRumble', + textKey: 'achievementReptacularRumbleText', }, zodiacZookeeper: { icon: 'achievement-zodiac', diff --git a/website/common/script/content/quests/seasonal.js b/website/common/script/content/quests/seasonal.js index 8182fbd63a..14116db688 100644 --- a/website/common/script/content/quests/seasonal.js +++ b/website/common/script/content/quests/seasonal.js @@ -11,6 +11,9 @@ const QUEST_SEASONAL = { // winter evilsanta: { event: CURRENT_EVENT && CURRENT_EVENT.season === 'winter' ? CURRENT_EVENT : null, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, text: t('questEvilSantaText'), notes: t('questEvilSantaNotes'), addlNotes: t('evilSantaAddlNotes'), @@ -36,6 +39,9 @@ const QUEST_SEASONAL = { }, evilsanta2: { event: CURRENT_EVENT && CURRENT_EVENT.season === 'winter' ? CURRENT_EVENT : null, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, text: t('questEvilSanta2Text'), notes: t('questEvilSanta2Notes'), addlNotes: t('evilSantaAddlNotes'), @@ -66,12 +72,15 @@ const QUEST_SEASONAL = { }, // spring egg: { + event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, text: t('questEggHuntText'), notes: t('questEggHuntNotes'), completion: t('questEggHuntCompletion'), value: 1, category: 'pet', - event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, collect: { plainEgg: { text: t('questEggHuntCollectPlainEgg'), @@ -127,12 +136,15 @@ const QUEST_SEASONAL = { }, }, waffle: { + event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, text: t('questWaffleText'), notes: t('questWaffleNotes'), completion: t('questWaffleCompletion'), value: 4, category: 'hatchingPotion', - event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, boss: { name: t('questWaffleBoss'), hp: 500, @@ -167,15 +179,15 @@ const QUEST_SEASONAL = { }, }, virtualpet: { + event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, + canBuy () { + return this.event && moment().isBetween(this.event.start, this.event.end); + }, text: t('questVirtualPetText'), notes: t('questVirtualPetNotes'), completion: t('questVirtualPetCompletion'), value: 4, category: 'hatchingPotion', - canBuy () { - return CURRENT_EVENT && CURRENT_EVENT.season === 'spring'; - }, - event: CURRENT_EVENT && CURRENT_EVENT.season === 'spring' ? CURRENT_EVENT : null, boss: { name: t('questVirtualPetBoss'), hp: 500,