From 8db492099cf1e6350afe271d1bf7ac1a6d23addb Mon Sep 17 00:00:00 2001 From: Alys Date: Tue, 5 Jan 2016 07:05:40 +1000 Subject: [PATCH] Revert "fix(common): Corrects bug where stat points could be awarded after level 100" This reverts commit 2bbdf66d76c2f008c55ae2a1ad8e786194378274. --- common/script/index.js | 6 ++-- test/common/user.fns.updateStats.test.js | 38 ++---------------------- 2 files changed, 5 insertions(+), 39 deletions(-) diff --git a/common/script/index.js b/common/script/index.js index 6e74393255..2246bc259a 100644 --- a/common/script/index.js +++ b/common/script/index.js @@ -2287,15 +2287,15 @@ api.wrap = function(user, main) { user.stats.lvl++; experienceToNextLevel = api.tnl(user.stats.lvl); user.stats.hp = 50; - var allocatedStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per + var userTotalStatPoints = user.stats.str + user.stats.int + user.stats.con + user.stats.per; - if (allocatedStatPoints >= MAX_STAT_POINTS) { + if (userTotalStatPoints >= MAX_STAT_POINTS) { continue; } if (user.preferences.automaticAllocation) { user.fns.autoAllocate(); } else { - user.stats.points = MAX_STAT_POINTS - allocatedStatPoints; + user.stats.points = user.stats.lvl - userTotalStatPoints; if (user.stats.points < 0) { user.stats.points = 0; } diff --git a/test/common/user.fns.updateStats.test.js b/test/common/user.fns.updateStats.test.js index 05b1a13432..0e41812cb3 100644 --- a/test/common/user.fns.updateStats.test.js +++ b/test/common/user.fns.updateStats.test.js @@ -38,7 +38,7 @@ describe('user.fns.updateStats', () => { }); 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 = { exp: 3581, }; @@ -54,7 +54,7 @@ describe('user.fns.updateStats', () => { 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 = { exp: 3581, }; @@ -69,39 +69,5 @@ describe('user.fns.updateStats', () => { 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); - }); }); });