cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-13 12:11:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into feature/140-Subclasses-Actions-Effects

Browse source
This commit is contained in:
WBHarry 2025-06-15 13:19:37 +02:00
commit b969b8c84b
23 changed files with 870 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

3
module/data/action/action.mjs
View file

@ -133,7 +133,8 @@ export class DHBaseAction extends foundry.abstract.DataModel {
async use(event) {
if (this.roll.type && this.roll.trait) {
const modifierValue = this.actor.system.traits[this.roll.trait].value;
const modifierValue =
this.actor.system.traits[this.roll.trait].value + (this.actor.system.bonuses.attack ?? 0);
const config = {
event: event,
title: this.chatTitle,

2
module/data/action/actionDice.mjs
View file

@ -23,7 +23,7 @@ export class DHActionDiceData extends foundry.abstract.DataModel {
getFormula(actor) {
return this.custom.enabled
? this.custom.formula
: `${actor.system[this.multiplier] ?? 1}${this.dice}${this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : ''}`;
: `${actor.system[this.multiplier]?.total ?? 1}${this.dice}${this.bonus ? (this.bonus < 0 ? ` - ${Math.abs(this.bonus)}` : ` + ${this.bonus}`) : ''}`;
}
}