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

Merge branch 'develop' into refactor_member_modal_and_stats_page

Browse Source
This commit is contained in:
Blade Barringer
2015-07-22 17:39:39 -05:00
parent 7b9102c88c 0f1c92184c
commit c41271e558
107 changed files with 563 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/script/index.coffee
View File

@@ -1516,9 +1516,7 @@ api.wrap = (user, main=true) ->
(user.flags.levelDrops ?= {})[k] = true
user.markModified? 'flags.levelDrops'
mixpanel?.track("Acquire Item",{'itemName':k,'acquireMethod':'Drop'})
user._tmp.drop = _.defaults content.quests[k],
type: 'Quest'
dialog: i18n.t('messageFoundQuest', {questText: content.quests[k].text(req.language)}, req.language)
user._tmp.drop = {type: 'Quest', key: k}
if !user.flags.rebirthEnabled and (user.stats.lvl >= 50 or user.achievements.beastMaster)
user.flags.rebirthEnabled = true