diff --git a/module/applications/scene/sceneConfigSettings.mjs b/module/applications/scene/sceneConfigSettings.mjs index ceb403cf..efdf983d 100644 --- a/module/applications/scene/sceneConfigSettings.mjs +++ b/module/applications/scene/sceneConfigSettings.mjs @@ -111,6 +111,7 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S /** @override */ async _processSubmitData(event, form, submitData, options) { + if (!submitData.flags) submitData.flags = {}; submitData.flags.daggerheart = this.daggerheartFlag.toObject(); submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x => foundry.utils.fromUuidSync(x) diff --git a/module/applications/sheets-configs/action-base-config.mjs b/module/applications/sheets-configs/action-base-config.mjs index 42252362..34543086 100644 --- a/module/applications/sheets-configs/action-base-config.mjs +++ b/module/applications/sheets-configs/action-base-config.mjs @@ -314,7 +314,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2) const index = Number.parseInt(button.dataset.index); const toggle = (element, codeMirror) => { codeMirror.classList.toggle('revealed'); - const button = element.querySelector('a > i'); + const button = element.querySelector('.expand-trigger > i'); button.classList.toggle('fa-angle-up'); button.classList.toggle('fa-angle-down'); }; diff --git a/module/data/actor/character.mjs b/module/data/actor/character.mjs index bf6e83c0..8af4c74c 100644 --- a/module/data/actor/character.mjs +++ b/module/data/actor/character.mjs @@ -41,7 +41,8 @@ export default class DhCharacter extends BaseDataActor { min: 0, integer: true, label: 'DAGGERHEART.GENERAL.hope' - }) + }), + isReversed: new fields.BooleanField({ initial: false }) }) }), traits: new fields.SchemaField({ diff --git a/module/data/fields/actionField.mjs b/module/data/fields/actionField.mjs index 21dafd60..de2bd394 100644 --- a/module/data/fields/actionField.mjs +++ b/module/data/fields/actionField.mjs @@ -159,8 +159,9 @@ export function ActionMixin(Base) { } get uuid() { - if (!(this.item instanceof game.system.api.documents.DHItem)) return null; - return `${this.item.uuid}.${this.documentName}.${this.id}`; + const isItem = this.item instanceof game.system.api.documents.DHItem; + const isActor = this.item instanceof game.system.api.documents.DhpActor; + return isItem || isActor ? `${this.item.uuid}.${this.documentName}.${this.id}` : null; } get sheet() { diff --git a/module/documents/item.mjs b/module/documents/item.mjs index fe62c5bd..67f7d253 100644 --- a/module/documents/item.mjs +++ b/module/documents/item.mjs @@ -185,7 +185,10 @@ export default class DHItem extends foundry.documents.Item { tags: this._getTags() }, actions: item.system.actionsList, - description: this.system.description + description: await foundry.applications.ux.TextEditor.implementation.enrichHTML(this.system.description, { + relativeTo: this.parent, + rollData: this.parent?.getRollData() ?? {} + }) }; const msg = { diff --git a/module/enrichers/TemplateEnricher.mjs b/module/enrichers/TemplateEnricher.mjs index 0683a4bb..ab3d406f 100644 --- a/module/enrichers/TemplateEnricher.mjs +++ b/module/enrichers/TemplateEnricher.mjs @@ -4,6 +4,7 @@ export default function DhTemplateEnricher(match, _options) { const params = parseInlineParams(match[1]); const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params; const direction = Number(params.direction) || 0; + params.range = params.range?.toLowerCase(); const range = params.range && Number.isNaN(Number(params.range)) ? Object.values(CONFIG.DH.GENERAL.templateRanges).find( diff --git a/styles/less/sheets/actions/actions.less b/styles/less/sheets/actions/actions.less index 07c99491..9be56c8e 100644 --- a/styles/less/sheets/actions/actions.less +++ b/styles/less/sheets/actions/actions.less @@ -58,6 +58,7 @@ flex: 1; display: flex; flex-direction: column; + gap: 8px; select { flex: 1; @@ -96,6 +97,7 @@ height: 0; min-height: 0; transition: height 0.1s ease-in-out; + overflow: hidden; &.revealed { height: 300px;