diff --git a/module/canvas/placeables/token.mjs b/module/canvas/placeables/token.mjs index dd6f089e..4c2ae4ed 100644 --- a/module/canvas/placeables/token.mjs +++ b/module/canvas/placeables/token.mjs @@ -18,7 +18,7 @@ export default class DhTokenPlaceable extends foundry.canvas.placeables.Token { x => x.statuses.size === 1 && x.name === game.i18n.localize(statusMap.get(x.statuses.first()).name) ); for (var status of effect.statuses) { - if (!currentStatusActiveEffects.find(x => x.statuses.includes(status))) { + if (!currentStatusActiveEffects.find(x => x.statuses.has(status))) { const statusData = statusMap.get(status); acc.push({ name: game.i18n.localize(statusData.name), diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index 989e4519..ec6e5c7c 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -532,7 +532,7 @@ export default class DhCharacter extends BaseDataActor { this.evasion += selection.value; break; case 'proficiency': - this.proficiency = selection.value; + this.proficiency += selection.value; break; case 'experience': Object.keys(this.experiences).forEach(key => { diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs index 4bc1a5bd..aa1ebb68 100644 --- a/module/dice/dhRoll.mjs +++ b/module/dice/dhRoll.mjs @@ -193,11 +193,12 @@ export const registerRollDiceHooks = () => { if (config.roll.isCritical) updates.push({ key: 'stress', value: -1 }); if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1 }); - if (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1) - updates.push({ key: 'hope', value: -1 }); - if (config.rerolledRoll.isCritical) updates.push({ key: 'stress', value: 1 }); - if (config.rerolledRoll.result.duality === -1) updates.push({ key: 'fear', value: -1 }); - + if (config.rerolledRoll) { + if (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1) updates.push({ key: 'hope', value: -1 }); + if (config.rerolledRoll.isCritical) updates.push({ key: 'stress', value: 1 }); + if (config.rerolledRoll.result.duality === -1) updates.push({ key: 'fear', value: -1 }); + } + if (updates.length) { const target = actor.system.partner ?? actor; if (!['dead', 'unconcious'].some(x => actor.statuses.has(x))) {