From f8b1fbda512c4a03be7f8d9caf8b39fa4e412168 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Tue, 24 Dec 2013 16:04:28 -0600 Subject: [PATCH] Fix "bounce" of Rebirth unlock. Other flags weren't sticking either; attempt alternate method of turning them off --- dist/habitrpg-shared.js | 11 +++++++---- script/index.coffee | 7 +++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index ad4acde214..7fc1b4034c 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -11192,7 +11192,7 @@ var process=require("__browserify_process");(function() { _.each(user.tasks, function(task) { task.value = 0; if (task.type = 'daily') { - return task.streak = 0; + return task.streak = 0; } }); stats = user.stats; @@ -11217,9 +11217,12 @@ var process=require("__browserify_process");(function() { user.markModified('items.gear.owned'); } flags = user.flags; - _.each(['rebirthEnabled', 'classSelected', 'itemsEnabled', 'dropsEnabled'], function(type) { - return flags[type] = false; - }); + if (!(user.achievements.ultimateGear || user.achievements.beastMaster)) { + flags.rebirthEnabled = false; + } + flags.itemsEnabled = false; + flags.dropsEnabled = false; + flags.classSelected = false; return cb(null, req); }, clearCompleted: function(req, cb) { diff --git a/script/index.coffee b/script/index.coffee index 2550488218..3da04c624d 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -430,8 +430,11 @@ api.wrap = (user) -> user.markModified? 'items.gear.owned' # Remove unlocked features flags = user.flags - _.each ['rebirthEnabled','classSelected','itemsEnabled','dropsEnabled'], (type) -> - flags[type] = false + if not (user.achievements.ultimateGear or user.achievements.beastMaster) + flags.rebirthEnabled = false + flags.itemsEnabled = false + flags.dropsEnabled = false + flags.classSelected = false cb null, req # ------