Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #307 from Alys/rebirthFixes-Sep10

Browse Source 
fix rebirth issues: deequip all gear types, reset levelDrops, wipe buffs
This commit is contained in:
Alice Harris
2014-09-12 10:28:25 +10:00
parent 1d2902d5e8 99e4f9b458
commit e5ed8d0da1
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/habitrpg-shared.js
Vendored
+8 -2
View File
@@ -13213,6 +13213,7 @@ api.wrap = function(user, main) {
});
gear = user.items.gear;
_.each(['equipped', 'costume'], function(type) {
gear[type] = {};
gear[type].armor = 'armor_base_0';
gear[type].weapon = 'weapon_warrior_0';
gear[type].head = 'head_base_0';
@@ -13252,6 +13253,7 @@ api.wrap = function(user, main) {
flags.itemsEnabled = false;
flags.dropsEnabled = false;
flags.classSelected = false;
flags.levelDrops = {};
if (!user.achievements.rebirths) {
user.achievements.rebirths = 1;
user.achievements.rebirthLevel = lvl;
@@ -13259,6 +13261,10 @@ api.wrap = function(user, main) {
user.achievements.rebirths++;
user.achievements.rebirthLevel = lvl;
}
user.stats.buffs = {};
if (typeof user.markModified === "function") {
user.markModified('stats');
}
if (typeof cb === "function") {
cb(null, user);
}
@@ -14471,5 +14477,5 @@ api.wrap = function(user, main) {
};
}).call(this,require("/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
},{"./content.coffee":5,"./i18n.coffee":6,"/Users/lefnire/Dropbox/Sites/habitrpg/modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
}).call(this,require("/vagrant/node_modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js"))
},{"./content.coffee":5,"./i18n.coffee":6,"/vagrant/node_modules/habitrpg-shared/node_modules/browserify/node_modules/insert-module-globals/node_modules/process/browser.js":2,"lodash":3,"moment":4}]},{},[1])
script/index.coffee
+4
View File
@@ -467,6 +467,7 @@ api.wrap = (user, main=true) ->
# Deequip character, set back to base armor and training sword
gear = user.items.gear
_.each ['equipped', 'costume'], (type) ->
gear[type] = {}; # deequip weapon, eyewear, headAccessory, etc, plus future new types
gear[type].armor = 'armor_base_0'
gear[type].weapon = 'weapon_warrior_0'
gear[type].head = 'head_base_0'
@@ -485,6 +486,7 @@ api.wrap = (user, main=true) ->
flags.itemsEnabled = false
flags.dropsEnabled = false
flags.classSelected = false
flags.levelDrops = {}
# Award an achievement if this is their first Rebirth, or if they made it further than last time
if not (user.achievements.rebirths)
user.achievements.rebirths = 1
@@ -492,6 +494,8 @@ api.wrap = (user, main=true) ->
else if (lvl > user.achievements.rebirthLevel or lvl is 100)
user.achievements.rebirths++
user.achievements.rebirthLevel = lvl
user.stats.buffs = {}
user.markModified? 'stats'
cb? null, user
ga?.event('purchase', 'Rebirth').send()