krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert armoire counting code back to old system

Browse Source 
@TODO: work out why it's hpapening and unpend test for new system
This commit is contained in:
Blade Barringer
2015-07-23 08:42:27 -05:00
parent c3e2b92546
commit bfd56b35e1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/script/count.js
View File

@@ -41,7 +41,7 @@ function mountMasterProgress(mounts) {
function remainingGearInSet(userGear, set) { function remainingGearInSet(userGear, set) {
var gear = _.filter(content.gear.flat, function(item) { var gear = _.filter(content.gear.flat, function(item) {
var setMatches = item.klass === set; var setMatches = item.klass === set;
var hasItem = _.has(userGear, item.key); var hasItem = userGear[item.key];
return setMatches && !hasItem; return setMatches && !hasItem;
}); });

2
test/common/count.js
View File

@@ -100,7 +100,7 @@ describe('count', function() {
expect(armoireCount).to.eql(20); expect(armoireCount).to.eql(20);
}); });
it('includes previously owned items in count', function() { it.skip('includes previously owned items in count (https://github.com/HabitRPG/habitrpg/issues/5624#issuecomment-124018717)', function() {
var gear = { var gear = {
'weapon_warrior_0':false, 'weapon_warrior_0':false,
'weapon_warrior_1':false, 'weapon_warrior_1':false,