cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feature/443-adversary-action-roll-type

Browse source
This commit is contained in:
Dapoolp 2025-07-29 18:39:15 +02:00
commit 28df395e89
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
module/canvas/placeables/token.mjs
View file

@ -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) x => x.statuses.size === 1 && x.name === game.i18n.localize(statusMap.get(x.statuses.first()).name)
); );
for (var status of effect.statuses) { 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); const statusData = statusMap.get(status);
acc.push({ acc.push({
name: game.i18n.localize(statusData.name), name: game.i18n.localize(statusData.name),

2
module/data/actor/character.mjs
View file

@ -532,7 +532,7 @@ export default class DhCharacter extends BaseDataActor {
this.evasion += selection.value; this.evasion += selection.value;
break; break;
case 'proficiency': case 'proficiency':
this.proficiency = selection.value; this.proficiency += selection.value;
break; break;
case 'experience': case 'experience':
Object.keys(this.experiences).forEach(key => { Object.keys(this.experiences).forEach(key => {

11
module/dice/dhRoll.mjs
View file

@ -193,11 +193,12 @@ export const registerRollDiceHooks = () => {
if (config.roll.isCritical) updates.push({ key: 'stress', value: -1 }); if (config.roll.isCritical) updates.push({ key: 'stress', value: -1 });
if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1 }); if (config.roll.result.duality === -1) updates.push({ key: 'fear', value: 1 });
if (config.rerolledRoll.isCritical || config.rerolledRoll.result.duality === 1) if (config.rerolledRoll) {
updates.push({ key: 'hope', 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.isCritical) updates.push({ key: 'stress', value: 1 });
if (config.rerolledRoll.result.duality === -1) updates.push({ key: 'fear', value: -1 }); if (config.rerolledRoll.result.duality === -1) updates.push({ key: 'fear', value: -1 });
}
if (updates.length) { if (updates.length) {
const target = actor.system.partner ?? actor; const target = actor.system.partner ?? actor;
if (!['dead', 'unconcious'].some(x => actor.statuses.has(x))) { if (!['dead', 'unconcious'].some(x => actor.statuses.has(x))) {