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 'develop' into client-monorepo

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-18 20:26:12 +02:00
parent 94b34f1f80 17b1365853
commit 3e12774e40
17 changed files with 292 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/server/models/user/hooks.js
View File

@@ -190,23 +190,35 @@ schema.pre('save', true, function preSaveUser (next, done) {
// Determines if Beast Master should be awarded
const beastMasterProgress = common.count.beastMasterProgress(this.items.pets);
if (beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0) {
if (
(beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0)
&& this.achievements.beastMaster !== true
) {
this.achievements.beastMaster = true;
this.addNotification('ACHIEVEMENT_BEAST_MASTER');
}
// Determines if Mount Master should be awarded
const mountMasterProgress = common.count.mountMasterProgress(this.items.mounts);
if (mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0) {
if (
(mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0)
&& this.achievements.mountMaster !== true
) {
this.achievements.mountMaster = true;
this.addNotification('ACHIEVEMENT_MOUNT_MASTER');
}
// Determines if Triad Bingo should be awarded
const dropPetCount = common.count.dropPetsCurrentlyOwned(this.items.pets);
const qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90;
if (qualifiesForTriad || this.achievements.triadBingoCount > 0) {
if (
(qualifiesForTriad || this.achievements.triadBingoCount > 0)
&& this.achievements.triadBingo !== true
) {
this.achievements.triadBingo = true;
this.addNotification('ACHIEVEMENT_TRIAD_BINGO');
}
// EXAMPLE CODE for allowing all existing and new players to be