From 2d69285080d8a230fc1f6400f42679e69cd3d412 Mon Sep 17 00:00:00 2001 From: Victor Piousbox Date: Mon, 11 Apr 2016 00:28:33 +0000 Subject: [PATCH] shared-code-crit --- common/script/fns/crit.js | 12 +++--------- tasks/gulp-eslint.js | 1 - test/common/fns/crit.test.js | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 test/common/fns/crit.test.js diff --git a/common/script/fns/crit.js b/common/script/fns/crit.js index 69ac9e5b93..07b144a805 100644 --- a/common/script/fns/crit.js +++ b/common/script/fns/crit.js @@ -1,12 +1,6 @@ -module.exports = function(user, stat, chance) { - var s; - if (stat == null) { - stat = 'str'; - } - if (chance == null) { - chance = .03; - } - s = user._statsComputed[stat]; + +module.exports = function crit (user, stat = 'str', chance = 0.03) { + let s = user._statsComputed[stat]; if (user.fns.predictableRandom() <= chance * (1 + s / 100)) { return 1.5 + 4 * s / (s + 200); } else { diff --git a/tasks/gulp-eslint.js b/tasks/gulp-eslint.js index 0461636744..00fa57423d 100644 --- a/tasks/gulp-eslint.js +++ b/tasks/gulp-eslint.js @@ -11,7 +11,6 @@ const COMMON_FILES = [ // @TODO remove these negations as the files are converted over. '!./common/script/content/index.js', '!./common/script/ops/reset.js', - '!./common/script/fns/crit.js', '!./common/script/fns/randomDrop.js', '!./common/script/libs/appliedTags.js', '!./common/script/libs/countExists.js', diff --git a/test/common/fns/crit.test.js b/test/common/fns/crit.test.js new file mode 100644 index 0000000000..4f43c55fa1 --- /dev/null +++ b/test/common/fns/crit.test.js @@ -0,0 +1,17 @@ +import crit from '../../../common/script/fns/crit'; +import { + generateUser, +} from '../../helpers/common.helper'; + +describe('crit', () => { + let user; + + beforeEach(() => { + user = generateUser(); + }); + + it('computes', () => { + let result = crit(user); + expect(result).to.eql(1); + }); +});