diff --git a/module/config/actionConfig.mjs b/module/config/actionConfig.mjs index d64fd9e9..c9b70193 100644 --- a/module/config/actionConfig.mjs +++ b/module/config/actionConfig.mjs @@ -2,7 +2,7 @@ export const actionTypes = { attack: { id: 'attack', name: 'DAGGERHEART.ACTIONS.TYPES.attack.name', - icon: 'fa-khanda', + icon: 'fa-hand-fist', tooltip: 'DAGGERHEART.ACTIONS.TYPES.attack.tooltip' }, countdown: { diff --git a/module/data/action/baseAction.mjs b/module/data/action/baseAction.mjs index a9521b4a..6c7b8c59 100644 --- a/module/data/action/baseAction.mjs +++ b/module/data/action/baseAction.mjs @@ -164,14 +164,13 @@ export default class DHBaseAction extends ActionMixin(foundry.abstract.DataModel getRollData(data = {}) { const actorData = this.actor ? this.actor.getRollData(false) : {}; - return { - ...actorData, - result: data.roll?.total ?? 1, - scale: data.costs?.length // Right now only return the first scalable cost. - ? (data.costs.find(c => c.scalable)?.total ?? 1) - : 1, - roll: {} - }; + actorData.result = data.roll?.total ?? 1; + actorData.scale = data.costs?.length // Right now only return the first scalable cost. + ? (data.costs.find(c => c.scalable)?.total ?? 1) + : 1; + actorData.roll = {}; + + return actorData; } /** diff --git a/module/documents/actor.mjs b/module/documents/actor.mjs index 06b60447..9f4db5e2 100644 --- a/module/documents/actor.mjs +++ b/module/documents/actor.mjs @@ -539,7 +539,10 @@ export default class DhpActor extends Actor { /**@inheritdoc */ getRollData() { - const rollData = super.getRollData().clone(); + const rollData = foundry.utils.deepClone(super.getRollData()); + /* system gets repeated infinately which causes issues when trying to use the data for document creation */ + delete rollData.system; + rollData.name = this.name; rollData.system = this.system.getRollData(); rollData.prof = this.system.proficiency ?? 1; diff --git a/system.json b/system.json index 7b469a31..881bbff6 100644 --- a/system.json +++ b/system.json @@ -2,7 +2,7 @@ "id": "daggerheart", "title": "Daggerheart", "description": "An unofficial implementation of the Daggerheart system", - "version": "1.4.1", + "version": "1.4.2", "compatibility": { "minimum": "13.346", "verified": "13.351", @@ -54,6 +54,12 @@ { "name": "chrisryan10", "discord": "lazjen" + }, + { + "name": "nsalyzyn", + "url": "https://github.com/nsalyzyn", + "email": "nsalyzyn@gmail.com", + "discord": "nsalyzyn" } ], "esmodules": ["build/daggerheart.js"],