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

Merge branch 'quest-unlocks' of https://github.com/CuriousMagpie/habitica into quest-unlocks

Browse Source
This commit is contained in:
CuriousMagpie
2022-01-07 17:34:49 -05:00
parent 7bd190930f d0e9339d3b
commit 73a29f94a6
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/common/script/libs/getItemInfo.js
View File

@@ -61,11 +61,14 @@ function lockQuest (quest, user) {
if (intersection(quest.prereqQuests, achievedQuestKeys) !== quest.prereqQuests) return true; if (intersection(quest.prereqQuests, achievedQuestKeys) !== quest.prereqQuests) return true;
} }
<<<<<<< HEAD
// OR THIS // OR THIS
// if (intersection(quest.prereqQuests, keys(user.quest.achievements)) !== quest.prereqQuests) { // if (intersection(quest.prereqQuests, keys(user.quest.achievements)) !== quest.prereqQuests) {
// return true; // return true;
// } // }
=======
>>>>>>> d0e9339d3b19d8c1f323b052d7146979193dddfd
// then if we've passed all the checks, at the end // then if we've passed all the checks, at the end
return false; return false;