Merge pull request #5394 from hairlessbear/ultimateGear_orb_logic_fix

Removed user.achievements.ultimateGear checks from orb of rebirth logic
This commit is contained in:
Blade Barringer
2015-06-13 18:01:15 -05:00
+2 -2
View File
@@ -558,7 +558,7 @@ api.wrap = (user, main=true) ->
user.preferences.costume = false
# Remove unlocked features
flags = user.flags
if not (user.achievements.ultimateGear or user.achievements.beastMaster)
if not user.achievements.beastMaster
flags.rebirthEnabled = false
flags.itemsEnabled = false
flags.dropsEnabled = false
@@ -1513,7 +1513,7 @@ api.wrap = (user, main=true) ->
user._tmp.drop = _.defaults content.quests[k],
type: 'Quest'
dialog: i18n.t('messageFoundQuest', {questText: content.quests[k].text(req.language)}, req.language)
if !user.flags.rebirthEnabled and (user.stats.lvl >= 50 or user.achievements.ultimateGear or user.achievements.beastMaster)
if !user.flags.rebirthEnabled and (user.stats.lvl >= 50 or user.achievements.beastMaster)
user.flags.rebirthEnabled = true
if user.stats.lvl >= api.maxLevel and !user.flags.freeRebirth
user.flags.freeRebirth = true