Merged with development

This commit is contained in:
WBHarry 2026-02-04 00:25:58 +01:00
commit ac998adaa6
7 changed files with 14 additions and 5 deletions

View file

@ -111,6 +111,7 @@ export default class DhSceneConfigSettings extends foundry.applications.sheets.S
/** @override */ /** @override */
async _processSubmitData(event, form, submitData, options) { async _processSubmitData(event, form, submitData, options) {
if (!submitData.flags) submitData.flags = {};
submitData.flags.daggerheart = this.daggerheartFlag.toObject(); submitData.flags.daggerheart = this.daggerheartFlag.toObject();
submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x => submitData.flags.daggerheart.sceneEnvironments = submitData.flags.daggerheart.sceneEnvironments.filter(x =>
foundry.utils.fromUuidSync(x) foundry.utils.fromUuidSync(x)

View file

@ -314,7 +314,7 @@ export default class DHActionBaseConfig extends DaggerheartSheet(ApplicationV2)
const index = Number.parseInt(button.dataset.index); const index = Number.parseInt(button.dataset.index);
const toggle = (element, codeMirror) => { const toggle = (element, codeMirror) => {
codeMirror.classList.toggle('revealed'); 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-up');
button.classList.toggle('fa-angle-down'); button.classList.toggle('fa-angle-down');
}; };

View file

@ -41,7 +41,8 @@ export default class DhCharacter extends BaseDataActor {
min: 0, min: 0,
integer: true, integer: true,
label: 'DAGGERHEART.GENERAL.hope' label: 'DAGGERHEART.GENERAL.hope'
}) }),
isReversed: new fields.BooleanField({ initial: false })
}) })
}), }),
traits: new fields.SchemaField({ traits: new fields.SchemaField({

View file

@ -159,8 +159,9 @@ export function ActionMixin(Base) {
} }
get uuid() { get uuid() {
if (!(this.item instanceof game.system.api.documents.DHItem)) return null; const isItem = this.item instanceof game.system.api.documents.DHItem;
return `${this.item.uuid}.${this.documentName}.${this.id}`; const isActor = this.item instanceof game.system.api.documents.DhpActor;
return isItem || isActor ? `${this.item.uuid}.${this.documentName}.${this.id}` : null;
} }
get sheet() { get sheet() {

View file

@ -185,7 +185,10 @@ export default class DHItem extends foundry.documents.Item {
tags: this._getTags() tags: this._getTags()
}, },
actions: item.system.actionsList, 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 = { const msg = {

View file

@ -4,6 +4,7 @@ export default function DhTemplateEnricher(match, _options) {
const params = parseInlineParams(match[1]); const params = parseInlineParams(match[1]);
const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params; const { type, angle = CONFIG.MeasuredTemplate.defaults.angle, inline = false } = params;
const direction = Number(params.direction) || 0; const direction = Number(params.direction) || 0;
params.range = params.range?.toLowerCase();
const range = const range =
params.range && Number.isNaN(Number(params.range)) params.range && Number.isNaN(Number(params.range))
? Object.values(CONFIG.DH.GENERAL.templateRanges).find( ? Object.values(CONFIG.DH.GENERAL.templateRanges).find(

View file

@ -58,6 +58,7 @@
flex: 1; flex: 1;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
gap: 8px;
select { select {
flex: 1; flex: 1;
@ -96,6 +97,7 @@
height: 0; height: 0;
min-height: 0; min-height: 0;
transition: height 0.1s ease-in-out; transition: height 0.1s ease-in-out;
overflow: hidden;
&.revealed { &.revealed {
height: 300px; height: 300px;