sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-18 01:42:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(quests): hide offseason quests, again

Browse source 
Also tidy up some Reptacular Rumble issues
This commit is contained in:
SabreCat 2022-05-23 15:38:16 -05:00
parent 74b59d2324
commit 8358da227d
5 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
habitica-images

@ -1 +1 @@
Subproject commit d7d7eeb46ecae4f428d61f8ef9854a3c1d8c0f86
Subproject commit 22d251cecb9d8d8c43d8c9bdacc0d1ae7f11be32

4
website/client/src/assets/css/sprites/spritesmith-main.css
View file

@ -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');

5
website/common/locales/en/achievements.json
View file

@ -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!"
}

2
website/common/script/content/achievements.js
View file

@ -186,7 +186,7 @@ const animalSetAchievs = {
reptacularRumble: {
icon: 'achievement-reptacularRumble',
titleKey: 'achievementReptacularRumble',
textKey: 'achievementReptacularRumble',
textKey: 'achievementReptacularRumbleText',
},
zodiacZookeeper: {
icon: 'achievement-zodiac',

24
website/common/script/content/quests/seasonal.js
View file

@ -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,