diff --git a/common/dist/scripts/habitrpg-shared.js b/common/dist/scripts/habitrpg-shared.js index 02b879577d..d750cbf422 100644 --- a/common/dist/scripts/habitrpg-shared.js +++ b/common/dist/scripts/habitrpg-shared.js @@ -2641,12 +2641,16 @@ api.spells = { target: 'task', notes: t('spellWizardFireballNotes'), cast: function(user, target) { - var bonus; + var bonus, req; bonus = user._statsComputed.int * user.fns.crit('per'); target.value += diminishingReturns(bonus * .02, 4); bonus *= Math.ceil((target.value < 0 ? 1 : target.value + 1) * .075); user.stats.exp += diminishingReturns(bonus, 75); - return user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30); + user.party.quest.progress.up += diminishingReturns(bonus * .1, 50, 30); + req = { + language: user.preferences.language + }; + return user.fns.updateStats(user.stats, req); } }, mpheal: { @@ -2772,12 +2776,16 @@ api.spells = { target: 'task', notes: t('spellRogueBackStabNotes'), cast: function(user, target) { - var bonus, _crit; + var bonus, req, _crit; _crit = user.fns.crit('str', .3); target.value += _crit * .03; bonus = (target.value < 0 ? 1 : target.value + 1) * _crit; user.stats.exp += bonus; - return user.stats.gp += bonus; + user.stats.gp += bonus; + req = { + language: user.preferences.language + }; + return user.fns.updateStats(user.stats, req); } }, toolsOfTrade: { diff --git a/test/e2e/e2e.js b/test/e2e/e2e.js index 0f471df3d9..8d963b83fa 100644 --- a/test/e2e/e2e.js +++ b/test/e2e/e2e.js @@ -25,7 +25,7 @@ describe('front page', function() { it('shows the front page', function(){ var button = element(by.className('btn')); - expect(button.getText()).toEqual('Play'); + expect(button.getText()).toEqual('Play HabitRPG'); }); it("don't login when using wrong credentials", function(){ @@ -51,7 +51,7 @@ describe('front page', function() { element(by.model('registerVals.email')).sendKeys('user@example.com'); element(by.model('registerVals.password')).sendKeys('pass'); element(by.model('registerVals.confirmPassword')).sendKeys('pass'); - var register = element(by.css("#register-tab input[value='Register']")); + var register = element(by.css("#registrationForm input[value='Register']")); register.click(); browser.sleep(1000); browser.getCurrentUrl().then(function(url){ diff --git a/test/run_tests.sh b/test/run_tests.sh index e05bd28dfb..c75bad0fd6 100755 --- a/test/run_tests.sh +++ b/test/run_tests.sh @@ -48,7 +48,7 @@ fi # If we're only running protractor, we need to let the server spin up. if [ "$1" == "protractor" ]; then - sleep 2 + sleep 10 fi if [ -z "$TRAVIS" ]; then