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

fix statsComputed getter

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-03-13 22:39:14 +01:00
parent 8e3284a4e3
commit 70df1137a0
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/script/index.js
View File

@@ -222,14 +222,13 @@ api.wrap = function wrapUser (user, main = true) {
get () { get () {
let computed = _.reduce(['per', 'con', 'str', 'int'], (m, stat) => { let computed = _.reduce(['per', 'con', 'str', 'int'], (m, stat) => {
m[stat] = _.reduce($w('stats stats.buffs items.gear.equipped.weapon items.gear.equipped.armor items.gear.equipped.head items.gear.equipped.shield'), (m2, path) => { m[stat] = _.reduce($w('stats stats.buffs items.gear.equipped.weapon items.gear.equipped.armor items.gear.equipped.head items.gear.equipped.shield'), (m2, path) => {
let val = user.fns.dotGet(path);
let item; let item;
return m2 + (path.indexOf('items.gear') !== -1 ? (item = content.gear.flat[val], (Number(!item ? item[stat] : undefined) || 0) * ((!item ? item.klass : undefined) === user.stats.class || (!item ? item.specialClass : undefined) === user.stats.class ? 1.5 : 1)) : Number(val[stat]) || 0); let val = user.fns.dotGet(path);
return m2 + (path.indexOf('items.gear') !== -1 ? (item = content.gear.flat[val], (Number(item ? item[stat] : undefined) || 0) * ((item ? item.klass : undefined) === user.stats.class || (item ? item.specialClass : undefined) === user.stats.class ? 1.5 : 1)) : Number(val[stat]) || 0);
}, 0); }, 0);
m[stat] += Math.floor(api.capByLevel(user.stats.lvl) / 2); m[stat] += Math.floor(api.capByLevel(user.stats.lvl) / 2);
return m; return m;
}); }, {});
computed.maxMP = computed.int * 2 + 30; computed.maxMP = computed.int * 2 + 30;
return computed; return computed;
}, },

2
test/api/v3/integration/challenges/DELETE-challenges_challengeId.test.js
View File

@@ -9,7 +9,7 @@ import {
import { v4 as generateUUID } from 'uuid'; import { v4 as generateUUID } from 'uuid';
describe('DELETE /challenges/:challengeId', () => { describe('DELETE /challenges/:challengeId', () => {
it.only('returns error when challengeId is not a valid UUID', async () => { it('returns error when challengeId is not a valid UUID', async () => {
let user = await generateUser(); let user = await generateUser();
await expect(user.del(`/challenges/test`)).to.eventually.be.rejected.and.eql({ await expect(user.del(`/challenges/test`)).to.eventually.be.rejected.and.eql({
code: 400, code: 400,