sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-20 04:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #75 from HabitRPG/sabe/tweak2

Browse source 
Rebirth fixes: deequip pets and mounts, allow stacking at max level
This commit is contained in:
Sabe Jones 2014-01-05 15:33:02 -08:00
commit cd38cc9fb8
2 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dist/habitrpg-shared.js vendored
View file

@ -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) <http://lodash.com/>
* 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;
}

4
script/index.coffee
View file

@ -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 is 100)
user.achievements.rebirths++
user.achievements.rebirthLevel = lvl
cb? null, user