mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-18 07:59:03 +01:00
Merge branch 'development' into feature/1031-Action-Names-In-Chat
This commit is contained in:
commit
907ae5cf34
133 changed files with 1713 additions and 1177 deletions
|
|
@ -172,7 +172,7 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel
|
|||
dialog: {
|
||||
configure: hasRoll
|
||||
},
|
||||
type: this.type,
|
||||
type: this.roll?.type ?? this.type,
|
||||
hasRoll: hasRoll,
|
||||
hasDamage: this.damage?.parts?.length && this.type !== 'healing',
|
||||
hasHealing: this.damage?.parts?.length && this.type === 'healing',
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue