mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-03-07 14:36:13 +01:00
Merge branch 'main' into release
This commit is contained in:
commit
1d114633f5
3 changed files with 8 additions and 4 deletions
|
|
@ -152,8 +152,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() {
|
||||||
|
|
|
||||||
|
|
@ -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 = {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@
|
||||||
"id": "daggerheart",
|
"id": "daggerheart",
|
||||||
"title": "Daggerheart",
|
"title": "Daggerheart",
|
||||||
"description": "An unofficial implementation of the Daggerheart system",
|
"description": "An unofficial implementation of the Daggerheart system",
|
||||||
"version": "1.6.2",
|
"version": "1.6.3",
|
||||||
"compatibility": {
|
"compatibility": {
|
||||||
"minimum": "13.346",
|
"minimum": "13.346",
|
||||||
"verified": "13.351",
|
"verified": "13.351",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue