diff --git a/habitica-images b/habitica-images index dac6a71d1f..3cda1c1a27 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit dac6a71d1fa2500bf8f3ec18bf917cbe91d82d64 +Subproject commit 3cda1c1a27ef51e735ea0f6edd848f001321ec0f diff --git a/website/client/src/assets/css/sprites/spritesmith-main.css b/website/client/src/assets/css/sprites/spritesmith-main.css index b3c0c74c78..271abcba15 100644 --- a/website/client/src/assets/css/sprites/spritesmith-main.css +++ b/website/client/src/assets/css/sprites/spritesmith-main.css @@ -138,6 +138,11 @@ width: 48px; height: 52px; } +.achievement-dinosaurDynasty2x { + background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-dinosaurDynasty2x.png'); + width: 68px; + height: 68px; +} .achievement-domesticated2x { background-image: url('https://habitica-assets.s3.amazonaws.com/mobileApp/images/achievement-domesticated2x.png'); width: 60px; diff --git a/website/common/locales/en/achievements.json b/website/common/locales/en/achievements.json index 7650882af5..fe477dcf00 100644 --- a/website/common/locales/en/achievements.json +++ b/website/common/locales/en/achievements.json @@ -147,5 +147,8 @@ "achievementPolarProModalText": "You collected all the Polar Pets!", "achievementPlantParent": "Plant Parent", "achievementPlantParentText": "Has hatched all standard colors of Plant pets: Cactus and Treeling!", - "achievementPlantParentModalText": "You collected all the Plant Pets!" + "achievementPlantParentModalText": "You collected all the Plant Pets!", + "achievementDinosaurDynasty": "Dinosaur Dynasty", + "achievementDinosaurDynastyText": "Has hatched all standard colors of bird and dinosaur pets: Falcon, Owl, Parrot, Peacock, Penguin, Rooster, Pterodactyl, T-Rex, Triceratops, and Velociraptor!", + "achievementDinosaurDynastyModalText": "You colleted all the bird and dinosar pets!" } diff --git a/website/common/script/content/achievements.js b/website/common/script/content/achievements.js index dfc0e46df4..a7e843d23d 100644 --- a/website/common/script/content/achievements.js +++ b/website/common/script/content/achievements.js @@ -178,6 +178,11 @@ const animalSetAchievs = { titleKey: 'achievementBirdsOfAFeather', textKey: 'achievementBirdsOfAFeatherText', }, + dinosaurDynasty: { + icon: 'achievement-dinosaurDynasty', + titleKey: 'achievementDinosaurDynasty', + textKey: 'achievementDinosaurDynastyText', + }, domesticated: { icon: 'achievement-domesticated', titleKey: 'achievementDomesticated', diff --git a/website/common/script/content/constants/animalSetAchievements.js b/website/common/script/content/constants/animalSetAchievements.js index 6f6569ff5b..dc49609d12 100644 --- a/website/common/script/content/constants/animalSetAchievements.js +++ b/website/common/script/content/constants/animalSetAchievements.js @@ -26,6 +26,23 @@ const ANIMAL_SET_ACHIEVEMENTS = { achievementKey: 'birdsOfAFeather', notificationType: 'ACHIEVEMENT_ANIMAL_SET', }, + dinosaurDynasty: { + type: 'pet', + species: [ + 'Falcon', + 'Owl', + 'Parrot', + 'Peacock', + 'Penguin', + 'Rooster', + 'Pterodactyl', + 'TRex', + 'Triceratops', + 'Velociraptor', + ], + achievementKey: 'dinosaurDynasty', + notificationType: 'ACHIEVEMENT_ANIMAL_SET', + }, domesticated: { type: 'pet', species: [ diff --git a/website/common/script/libs/achievements.js b/website/common/script/libs/achievements.js index d02f8b2c2a..d28155e6e5 100644 --- a/website/common/script/libs/achievements.js +++ b/website/common/script/libs/achievements.js @@ -222,6 +222,7 @@ function _getBasicAchievements (user, language) { _addSimple(result, user, { path: 'boneToPick', language }); _addSimple(result, user, { path: 'polarPro', language }); _addSimple(result, user, { path: 'plantParent', language }); + _addSimple(result, user, { path: 'dinosaurDynasty', language }); _addSimpleWithMasterCount(result, user, { path: 'beastMaster', language }); _addSimpleWithMasterCount(result, user, { path: 'mountMaster', language }); diff --git a/website/server/models/user/schema.js b/website/server/models/user/schema.js index a0148bc7dc..8a98ee17ce 100644 --- a/website/server/models/user/schema.js +++ b/website/server/models/user/schema.js @@ -154,6 +154,7 @@ export default new Schema({ boneToPick: Boolean, polarPro: Boolean, plantParent: Boolean, + dinosaurDynasty: Boolean, // Onboarding Guide createdTask: Boolean, completedTask: Boolean,