Skip to content

Commit ce8a855

Browse files
committed
a
1 parent 016d7d2 commit ce8a855

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

module.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
]
9898
},
9999
"compatibility": {
100-
"minimum": "11",
101-
"verified": "11"
100+
"minimum": "12",
101+
"verified": "12"
102102
}
103103
}

scripts/config.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export function initConfig() {
6060
if (!item || !item.system) return;
6161

6262
title = item.name;
63-
description = item.system.identified ? item.system.description.value : (item.system.description.unidentified ?? item.system.description.value);
63+
description = item.system.identified ? item.system.description.value : item.system.description.unidentified ?? item.system.description.value;
6464
itemType = item.type;
6565
target = item.labels?.target || "-";
6666
range = item.labels?.range || "-";
@@ -99,7 +99,7 @@ export function initConfig() {
9999
}
100100
}
101101

102-
if (description) description = await TextEditor.enrichHTML(description, {async: true});
102+
if (description) description = await TextEditor.enrichHTML(description, { async: true });
103103
let details = [];
104104
if (target || range) {
105105
details = [
@@ -1059,7 +1059,7 @@ export function initConfig() {
10591059
async _getSets() {
10601060
const isTransformed = this.actor.flags?.dnd5e?.isPolymorphed;
10611061

1062-
const sets = isTransformed ? await this.getDefaultSets() : mergeObject(await this.getDefaultSets(), deepClone(this.actor.getFlag("enhancedcombathud", "weaponSets") || {}));
1062+
const sets = isTransformed ? await this.getDefaultSets() : foundry.utils.mergeObject(await this.getDefaultSets(), foundry.utils.deepClone(this.actor.getFlag("enhancedcombathud", "weaponSets") || {}));
10631063

10641064
for (const [set, slots] of Object.entries(sets)) {
10651065
slots.primary = slots.primary ? await fromUuid(slots.primary) : null;

0 commit comments

Comments
 (0)