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

start fixing commong

Browse Source
This commit is contained in:
Matteo Pagliazzi
2019-10-09 16:51:17 +02:00
parent 9cd43db401
commit 0c27fb24a5
76 changed files with 442 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
website/common/script/ops/releaseBoth.js
View File

@@ -8,13 +8,14 @@ import {
import splitWhitespace from '../libs/splitWhitespace';
export default function releaseBoth (user, req = {}) {
let animal;
if (!user.achievements.triadBingo) {
throw new NotAuthorized(i18n.t('notEnoughPetsMounts', req.language));
}
if (beastMasterProgress(user.items.pets) !== 90 || mountMasterProgress(user.items.mounts) !== 90) {
if (
beastMasterProgress(user.items.pets) !== 90
|| mountMasterProgress(user.items.mounts) !== 90
) {
throw new NotAuthorized(i18n.t('notEnoughPetsMounts', req.language));
}
@@ -49,7 +50,7 @@ export default function releaseBoth (user, req = {}) {
user.items.currentPet = '';
}
for (animal in content.pets) {
Object.keys(content.pets).forEach(animal => {
if (user.items.pets[animal] === -1) {
giveTriadBingo = false;
} else if (!user.items.pets[animal]) {
@@ -61,7 +62,8 @@ export default function releaseBoth (user, req = {}) {
user.items.pets[animal] = 0;
user.items.mounts[animal] = null;
}
});
if (user.markModified) {
user.markModified('items.pets');
user.markModified('items.mounts');
@@ -71,21 +73,21 @@ export default function releaseBoth (user, req = {}) {
if (!user.achievements.beastMasterCount) {
user.achievements.beastMasterCount = 0;
}
user.achievements.beastMasterCount++;
user.achievements.beastMasterCount += 1;
}
if (giveMountMasterAchievement) {
if (!user.achievements.mountMasterCount) {
user.achievements.mountMasterCount = 0;
}
user.achievements.mountMasterCount++;
user.achievements.mountMasterCount += 1;
}
if (giveTriadBingo) {
if (!user.achievements.triadBingoCount) {
user.achievements.triadBingoCount = 0;
}
user.achievements.triadBingoCount++;
user.achievements.triadBingoCount += 1;
}
return [