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

fix (#1143)

Browse source
This commit is contained in:
Dapoulp 2025-09-03 13:42:18 +02:00 • committed by GitHub
parent 3f08741a34
commit 0bd423ef52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
module/data/chat-message/actorRoll.mjs
View file

@ -55,9 +55,14 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
} }
get action() { get action() {
const actionItem = this.actionItem; const actionActor = this.actionActor,
if (!actionItem || !this.source.action) return null; actionItem = this.actionItem;
return actionItem.system.actionsList?.find(a => a.id === this.source.action); if (!this.source.action) return null;
if(actionItem)
return actionItem.system.actionsList?.find(a => a.id === this.source.action);
else if(actionActor?.system.attack?._id === this.source.action)
return actionActor.system.attack
return null;
} }
get targetMode() { get targetMode() {

4
module/data/fields/action/damageField.mjs
View file

@ -57,8 +57,8 @@ export default class DamageField extends fields.SchemaField {
damageConfig.source.message = config.message?._id ?? messageId; damageConfig.source.message = config.message?._id ?? messageId;
damageConfig.directDamage = !!damageConfig.source?.message; damageConfig.directDamage = !!damageConfig.source?.message;
if(damageConfig.source?.message && game.modules.get('dice-so-nice')?.active) // if(damageConfig.source?.message && game.modules.get('dice-so-nice')?.active)
await game.dice3d.waitFor3DAnimationByMessageID(damageConfig.source.message); // await game.dice3d.waitFor3DAnimationByMessageID(damageConfig.source.message);
const damageResult = await CONFIG.Dice.daggerheart.DamageRoll.build(damageConfig); const damageResult = await CONFIG.Dice.daggerheart.DamageRoll.build(damageConfig);
if(!damageResult) return false; if(!damageResult) return false;