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

Refactor inventory ctrl variables

Browse Source
This commit is contained in:
Blade Barringer
2015-07-20 12:51:10 -05:00
parent 3d40da4004
commit 65c14b1e3f
5 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
website/src/models/user.js
View File

@@ -495,15 +495,15 @@ UserSchema.pre('save', function(next) {
}
// Determines if Beast Master should be awarded
var petCount = shared.countBeastMasterProgress(this.items.pets);
if (petCount >= 90 || this.achievements.beastMasterCount > 0) {
var beastMasterProgress = shared.countBeastMasterProgress(this.items.pets);
if (beastMasterProgress >= 90 || this.achievements.beastMasterCount > 0) {
this.achievements.beastMaster = true;
}
// Determines if Mount Master should be awarded
var mountCount = shared.countMountMasterProgress(this.items.mounts);
var mountMasterProgress = shared.countMountMasterProgress(this.items.mounts);
if (mountCount >= 90 || this.achievements.mountMasterCount > 0) {
if (mountMasterProgress >= 90 || this.achievements.mountMasterCount > 0) {
this.achievements.mountMaster = true
}
@@ -511,7 +511,7 @@ UserSchema.pre('save', function(next) {
var triadCount = shared.countTriad(this.items.pets);
if ((mountCount >= 90 && triadCount >= 90) || this.achievements.triadBingoCount > 0) {
if ((mountMasterProgress >= 90 && triadCount >= 90) || this.achievements.triadBingoCount > 0) {
this.achievements.triadBingo = true;
}