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

attempt to fix achievements awarding

Browse Source
This commit is contained in:
Matteo Pagliazzi
2017-03-11 10:28:51 +01:00
parent 283403d6c8
commit f67e065de2
1 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,31 +153,42 @@ schema.pre('validate', function preValidateUser (next) {
schema.pre('save', true, function preSaveUser (next, done) { schema.pre('save', true, function preSaveUser (next, done) {
next(); next();
if (_.isNaN(this.preferences.dayStart) || this.preferences.dayStart < 0 || this.preferences.dayStart > 23) { // VERY IMPORTANT NOTE: when only some fields from an user document are selected
this.preferences.dayStart = 0; // using `.select('field1 field2')` when the user is saved we must make sure that
} // these hooks do not run using default data. For example if user.items is missing
// we do not want to run any hook that relies on user.items because it will
// use the default values defined in the user schema and not the real ones.
// To check if a field was selected Document.isSelected('field') can be used.
// more info on its usage can be found at http://mongoosejs.com/docs/api.html#document_Document-isSelected
// Determines if Beast Master should be awarded // do not calculate achievements if items or achievements are not selected
let beastMasterProgress = shared.count.beastMasterProgress(this.items.pets); if (!this.isSelected('items') || !this.isSelected('achievements')) {
// Determines if Beast Master should be awarded
let beastMasterProgress = shared.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;
} }
// Determines if Mount Master should be awarded // Determines if Mount Master should be awarded
let mountMasterProgress = shared.count.mountMasterProgress(this.items.mounts); let mountMasterProgress = shared.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;
} }
// Determines if Triad Bingo should be awarded // Determines if Triad Bingo should be awarded
let dropPetCount = shared.count.dropPetsCurrentlyOwned(this.items.pets);
let qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90;
let dropPetCount = shared.count.dropPetsCurrentlyOwned(this.items.pets); if (qualifiesForTriad || this.achievements.triadBingoCount > 0) {
let qualifiesForTriad = dropPetCount >= 90 && mountMasterProgress >= 90; this.achievements.triadBingo = true;
}
if (qualifiesForTriad || this.achievements.triadBingoCount > 0) { // EXAMPLE CODE for allowing all existing and new players to be
this.achievements.triadBingo = true; // automatically granted an item during a certain time period:
// if (!this.items.pets['JackOLantern-Base'] && moment().isBefore('2014-11-01'))
// this.items.pets['JackOLantern-Base'] = 5;
} }
// Enable weekly recap emails for old users who sign in // Enable weekly recap emails for old users who sign in
@@ -188,10 +199,9 @@ schema.pre('save', true, function preSaveUser (next, done) {
this.flags.lastWeeklyRecapDiscriminator = undefined; this.flags.lastWeeklyRecapDiscriminator = undefined;
} }
// EXAMPLE CODE for allowing all existing and new players to be if (_.isNaN(this.preferences.dayStart) || this.preferences.dayStart < 0 || this.preferences.dayStart > 23) {
// automatically granted an item during a certain time period: this.preferences.dayStart = 0;
// if (!this.items.pets['JackOLantern-Base'] && moment().isBefore('2014-11-01')) }
// this.items.pets['JackOLantern-Base'] = 5;
// our own version incrementer // our own version incrementer
if (_.isNaN(this._v) || !_.isNumber(this._v)) this._v = 0; if (_.isNaN(this._v) || !_.isNumber(this._v)) this._v = 0;