mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-03-07 14:36:13 +01:00
Merged with development
This commit is contained in:
commit
ac998adaa6
7 changed files with 14 additions and 5 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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() {
|
||||
|
|
|
|||
|
|
@ -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 = {
|
||||
|
|
|
|||
|
|
@ -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(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue