krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 06:37:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' into develop

Browse Source
This commit is contained in:
SabreCat
2022-02-01 15:29:35 -06:00
parent 9a9449e001 f43a12acb2
commit ca4df96902
17 changed files with 248 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
website/common/script/content/achievements.js
View File

@@ -267,6 +267,11 @@ const basicAchievs = {
titleKey: 'achievementShadeOfItAll',
textKey: 'achievementShadeOfItAllText',
},
zodiacZookeeper: {
icon: 'achievement-zodiac',
titleKey: 'achievementZodiacZookeeper',
textKey: 'achievementZodiacZookeeperText',
},
};
Object.assign(achievementsData, basicAchievs);

19
website/common/script/content/constants/animalSetAchievements.js
View File

@@ -26,6 +26,25 @@ const ANIMAL_SET_ACHIEVEMENTS = {
achievementKey: 'domesticated',
notificationType: 'ACHIEVEMENT_DOMESTICATED',
},
zodiacZookeeper: {
type: 'pet',
species: [
'Rat',
'Cow',
'Bunny',
'Snake',
'Horse',
'Sheep',
'Monkey',
'Rooster',
'Wolf',
'TigerCub',
'FlyingPig',
'Dragon',
],
achievementKey: 'zodiacZookeeper',
notificationType: 'ACHIEVEMENT_ZODIAC_ZOOKEEPER',
},
};
export default ANIMAL_SET_ACHIEVEMENTS;

2
website/common/script/content/gear/sets/mystery.js
View File

@@ -111,6 +111,7 @@ const eyewear = {
201907: { },
202108: { },
202201: { },
202202: { },
301404: { },
301405: { },
301703: { },
@@ -181,6 +182,7 @@ const head = {
202110: { },
202111: { },
202112: { },
202202: { },
301404: { },
301405: { },
301703: { },

2
website/common/script/content/index.js
View File

@@ -187,7 +187,7 @@ api.specialMounts = stable.specialMounts;
api.mountInfo = stable.mountInfo;
// For seasonal events, change this constant:
const FOOD_SEASON = moment().isBefore('2021-02-01T20:00-05:00') ? 'Cake' : 'Normal';
const FOOD_SEASON = moment().isBefore('2022-02-02T20:00-05:00') ? 'Cake' : 'Normal';
api.food = {
Meat: {

1
website/common/script/libs/achievements.js
View File

@@ -215,6 +215,7 @@ function _getBasicAchievements (user, language) {
_addSimple(result, user, { path: 'domesticated', language });
_addSimple(result, user, { path: 'shadyCustomer', language });
_addSimple(result, user, { path: 'shadeOfItAll', language });
_addSimple(result, user, { path: 'zodiacZookeeper', language });
_addSimpleWithMasterCount(result, user, { path: 'beastMaster', language });
_addSimpleWithMasterCount(result, user, { path: 'mountMaster', language });