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

fix(common): Corrects bug where stat points could be awarded after level 100

Browse Source 
Closes #6434
This commit is contained in:
Blade Barringer
2016-01-04 07:58:24 -06:00
parent 837c27ff4c
commit 2bbdf66d76
2 changed files with 39 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/script/index.js
View File

@@ -2287,15 +2287,15 @@ api.wrap = function(user, main) {
user.stats.lvl++; user.stats.lvl++;
experienceToNextLevel = api.tnl(user.stats.lvl); experienceToNextLevel = api.tnl(user.stats.lvl);
user.stats.hp = 50; user.stats.hp = 50;
var userTotalStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per; var allocatedStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per
if (userTotalStatPoints >= MAX_STAT_POINTS) { if (allocatedStatPoints >= MAX_STAT_POINTS) {
continue; continue;
} }
if (user.preferences.automaticAllocation) { if (user.preferences.automaticAllocation) {
user.fns.autoAllocate(); user.fns.autoAllocate();
} else { } else {
user.stats.points = user.stats.lvl - userTotalStatPoints; user.stats.points = MAX_STAT_POINTS - allocatedStatPoints;
if (user.stats.points < 0) { if (user.stats.points < 0) {
user.stats.points = 0; user.stats.points = 0;
} }

38
test/common/user.fns.updateStats.test.js
View File

@@ -38,7 +38,7 @@ describe('user.fns.updateStats', () => {
}); });
context('Stat Allocation', () => { context('Stat Allocation', () => {
it('Adds an attibute point when user\'s stat points are less than max level', () => { it('adds an attibute point when user\'s stat points are less than max level', () => {
let stats = { let stats = {
exp: 3581, exp: 3581,
}; };
@@ -54,7 +54,7 @@ describe('user.fns.updateStats', () => {
expect(user.stats.points).to.eql(1); expect(user.stats.points).to.eql(1);
}); });
it('Does not add an attibute point when user\'s stat points are equal to max level', () => { it('does not add an attibute point when user\'s stat points are equal to max level', () => {
let stats = { let stats = {
exp: 3581, exp: 3581,
}; };
@@ -69,5 +69,39 @@ describe('user.fns.updateStats', () => {
expect(user.stats.points).to.eql(0); expect(user.stats.points).to.eql(0);
}); });
it('does not add an attibute point when user\'s stat points + unallocated points are equal to max level', () => {
let stats = {
exp: 3581,
};
user.stats.lvl = 99;
user.stats.str = 25;
user.stats.int = 25;
user.stats.con = 25;
user.stats.per = 15;
user.stats.points = 10;
user.fns.updateStats(stats);
expect(user.stats.points).to.eql(10);
});
it('if user is missing unallocated stat points and is over level 100, only awards stat points up to level 100', () => {
let stats = {
exp: 5581,
};
user.stats.lvl = 104;
user.stats.str = 25;
user.stats.int = 25;
user.stats.con = 25;
user.stats.per = 15;
user.stats.points = 0;
user.fns.updateStats(stats);
expect(user.stats.points).to.eql(10);
});
}); });
}); });