From 319689afead3a937eec5c7fe4dd4c57818e9bcc8 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 5 Jan 2014 10:17:18 -0600 Subject: [PATCH 1/2] Rebirth fixes: deequip pets and mounts, allow stacking at max level --- dist/habitrpg-shared.js | 20 ++++++++++++++++++-- script/index.coffee | 4 +++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 637722c028..2c903904c4 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -63,7 +63,7 @@ process.chdir = function (dir) { }; },{}],3:[function(require,module,exports){ -var global=self;/** +var global=typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {};/** * @license * Lo-Dash 2.4.1 (Custom Build) * Build: `lodash modern -o ./dist/lodash.js` @@ -11321,6 +11321,22 @@ var process=require("__browserify_process");(function() { gear[type].head = 'head_base_0'; return gear[type].shield = 'shield_base_0'; }); + if (user.items.currentPet) { + user.ops.equip({ + params: { + type: 'pet', + key: user.items.currentPet + } + }); + } + if (user.items.currentMount) { + user.ops.equip({ + params: { + type: 'mount', + key: user.items.currentMount + } + }); + } gear.owned = { weapon_warrior_0: true }; @@ -11337,7 +11353,7 @@ var process=require("__browserify_process");(function() { if (!user.achievements.rebirths) { user.achievements.rebirths = 1; user.achievements.rebirthLevel = lvl; - } else if (lvl > user.achievements.rebirthLevel) { + } else if (lvl > user.achievements.rebirthLevel || (lvl = 100)) { user.achievements.rebirths++; user.achievements.rebirthLevel = lvl; } diff --git a/script/index.coffee b/script/index.coffee index dba7777b9e..6eb0c1214f 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -435,6 +435,8 @@ api.wrap = (user) -> gear[type].weapon = 'weapon_warrior_0' gear[type].head = 'head_base_0' gear[type].shield = 'shield_base_0' + if user.items.currentPet then user.ops.equip({params:{type: 'pet', key: user.items.currentPet}}) + if user.items.currentMount then user.ops.equip({params:{type: 'mount', key: user.items.currentMount}}) # Strip owned gear down to the training sword gear.owned = {weapon_warrior_0:true} user.markModified? 'items.gear.owned' @@ -449,7 +451,7 @@ api.wrap = (user) -> if not (user.achievements.rebirths) user.achievements.rebirths = 1 user.achievements.rebirthLevel = lvl - else if (lvl > user.achievements.rebirthLevel) + else if (lvl > user.achievements.rebirthLevel or lvl = 100) user.achievements.rebirths++ user.achievements.rebirthLevel = lvl cb? null, user From d7fd82039f2730d91d35f6c0cb498b3c74129da9 Mon Sep 17 00:00:00 2001 From: Sabe Jones Date: Sun, 5 Jan 2014 17:31:08 -0600 Subject: [PATCH 2/2] Fix assignment operator bug --- dist/habitrpg-shared.js | 2 +- script/index.coffee | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/habitrpg-shared.js b/dist/habitrpg-shared.js index 2c903904c4..7c6a3b3a28 100644 --- a/dist/habitrpg-shared.js +++ b/dist/habitrpg-shared.js @@ -11353,7 +11353,7 @@ var process=require("__browserify_process");(function() { if (!user.achievements.rebirths) { user.achievements.rebirths = 1; user.achievements.rebirthLevel = lvl; - } else if (lvl > user.achievements.rebirthLevel || (lvl = 100)) { + } else if (lvl > user.achievements.rebirthLevel || lvl === 100) { user.achievements.rebirths++; user.achievements.rebirthLevel = lvl; } diff --git a/script/index.coffee b/script/index.coffee index 6eb0c1214f..d3e0aab5bc 100644 --- a/script/index.coffee +++ b/script/index.coffee @@ -451,7 +451,7 @@ api.wrap = (user) -> if not (user.achievements.rebirths) user.achievements.rebirths = 1 user.achievements.rebirthLevel = lvl - else if (lvl > user.achievements.rebirthLevel or lvl = 100) + else if (lvl > user.achievements.rebirthLevel or lvl is 100) user.achievements.rebirths++ user.achievements.rebirthLevel = lvl cb? null, user