diff --git a/module/applications/dialogs/damageReductionDialog.mjs b/module/applications/dialogs/damageReductionDialog.mjs
index 930ca1a1..b916a5de 100644
--- a/module/applications/dialogs/damageReductionDialog.mjs
+++ b/module/applications/dialogs/damageReductionDialog.mjs
@@ -22,9 +22,10 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
);
const orderedArmorSources = getArmorSources(actor).filter(s => !s.disabled);
- const armor = orderedArmorSources.reduce((acc, { document }) => {
+ const armor = orderedArmorSources.reduce((acc, { name, document }) => {
const { current, max } = document.type === 'armor' ? document.system.armor : document.system.armorData;
acc.push({
+ name,
effect: document,
marks: [...Array(max).keys()].reduce((acc, _, index) => {
const spent = index < current;
@@ -152,14 +153,8 @@ export default class DamageReductionDialog extends HandlebarsApplicationMixin(Ap
const armorSources = [];
for (const source of this.marks.armor) {
- const parent = source.effect.origin
- ? await foundry.utils.fromUuid(source.effect.origin)
- : source.effect.parent;
-
- const useEffectName = parent.type === 'armor' || parent instanceof Actor;
- const label = useEffectName ? source.effect.name : parent.name;
armorSources.push({
- label: label,
+ label: source.name,
uuid: source.effect.uuid,
marks: source.marks
});
diff --git a/module/dice/dhRoll.mjs b/module/dice/dhRoll.mjs
index 209631f6..83dbbaf2 100644
--- a/module/dice/dhRoll.mjs
+++ b/module/dice/dhRoll.mjs
@@ -257,7 +257,7 @@ export default class DHRoll extends Roll {
if (!roll.terms[i].isDeterministic) continue;
const termTotal = roll.terms[i].total;
if (typeof termTotal === 'number') {
- const multiplier = roll.terms[i - 1]?.operator === ' - ' ? -1 : 1;
+ const multiplier = roll.terms[i - 1]?.operator === '-' ? -1 : 1;
modifierTotal += multiplier * termTotal;
}
}
diff --git a/module/documents/activeEffect.mjs b/module/documents/activeEffect.mjs
index 08463818..f9239a90 100644
--- a/module/documents/activeEffect.mjs
+++ b/module/documents/activeEffect.mjs
@@ -171,6 +171,7 @@ export default class DhActiveEffect extends foundry.documents.ActiveEffect {
/** Recursively finds the first parent document of the given object */
static #resolveParentDocument(model, documentClass) {
+ if (!model) return null;
return model instanceof documentClass
? model
: model.parent
diff --git a/module/helpers/utils.mjs b/module/helpers/utils.mjs
index 1650b505..faa046ff 100644
--- a/module/helpers/utils.mjs
+++ b/module/helpers/utils.mjs
@@ -757,9 +757,12 @@ export function getArmorSources(actor) {
// Get the origin item. Since the actor is already loaded, it should already be cached
// Consider the relative function versions if this causes an issue
const origin = doc.origin ? foundry.utils.fromUuidSync(doc.origin) : doc;
+ const useParentName = doc.parent && !(doc.parent instanceof Actor);
+ const name = doc.origin || !useParentName ? doc.name : doc.parent.name;
+
return {
origin,
- name: origin.name,
+ name,
document: doc,
data: doc.system.armor ?? doc.system.armorData,
disabled: !!doc.disabled || !!doc.isSuppressed
diff --git a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
index c2064395..a1107f7c 100644
--- a/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
+++ b/src/packs/adversaries/adversary_Dire_Bat_tBWHW00epmMnkawe.json
@@ -40,7 +40,8 @@
"experiences": {
"ti3Z1mq2M92KK4GJ": {
"name": "Bloodthirsty",
- "description": ""
+ "description": "",
+ "value": 3
}
},
"bonuses": {
@@ -242,27 +243,24 @@
"type": "withinRange",
"target": "hostile",
"range": "melee"
- }
+ },
+ "changes": [
+ {
+ "key": "system.difficulty",
+ "value": 3,
+ "priority": null,
+ "type": "add"
+ }
+ ]
},
"_id": "qZfNiqw1iAIxeuYg",
"img": "icons/commodities/biological/wing-lizard-brown.webp",
- "changes": [
- {
- "key": "system.difficulty",
- "mode": 2,
- "value": "3",
- "priority": null
- }
- ],
"disabled": false,
"duration": {
- "startTime": null,
- "combat": null,
- "seconds": null,
- "rounds": null,
- "turns": null,
- "startRound": null,
- "startTurn": null
+ "value": null,
+ "units": "seconds",
+ "expiry": null,
+ "expired": false
},
"description": "While flying, the Bat gains a +3 bonus to their Difficulty.
",
"origin": null,
@@ -274,6 +272,9 @@
"_stats": {
"compendiumSource": null
},
+ "start": null,
+ "showIcon": 1,
+ "folder": null,
"_key": "!actors.items.effects!tBWHW00epmMnkawe.gx22MpD8fWoi8klZ.qZfNiqw1iAIxeuYg"
}
],
diff --git a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
index e59d2683..72ad8ae2 100644
--- a/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
+++ b/src/packs/adversaries/adversary_Greater_Earth_Elemental_dsfB3YhoL5SudvS2.json
@@ -249,7 +249,7 @@
"name": "Crushing Blows",
"type": "feature",
"system": {
- "description": "When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.
",
+ "description": "When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.
",
"resource": null,
"actions": {
"0sXciTiPc30v8czv": {
diff --git a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
index 1615dec8..183719f2 100644
--- a/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
+++ b/src/packs/adversaries/adversary_Huge_Green_Ooze_6hbqmxDXFOzZJDk4.json
@@ -138,12 +138,9 @@
"src": "systems/daggerheart/assets/icons/documents/actors/dragon-head.svg",
"anchorX": 0.5,
"anchorY": 0.5,
- "offsetX": 0,
- "offsetY": 0,
"fit": "contain",
"scaleX": 1,
"scaleY": 1,
- "rotation": 0,
"tint": "#ffffff",
"alphaThreshold": 0.75
},
@@ -194,7 +191,7 @@
"saturation": 0,
"contrast": 0
},
- "detectionModes": [],
+ "detectionModes": {},
"occludable": {
"radius": 0
},
@@ -220,7 +217,8 @@
"flags": {},
"randomImg": false,
"appendNumber": false,
- "prependAdjective": false
+ "prependAdjective": false,
+ "depth": 1
},
"items": [
{
@@ -257,7 +255,7 @@
"name": "Acidic Form",
"type": "feature",
"system": {
- "description": "When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefi ts (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.
",
+ "description": "When the @Lookup[@name] makes a successful attack, the target must mark an Armor Slot without receiving its benefits (they can still use armor to reduce the damage). If they can’t mark an Armor Slot, they must mark an additional HP.
",
"resource": null,
"actions": {
"gtT2oHSyZg9OHHJD": {
diff --git a/system.json b/system.json
index 9b8a8403..deb30b53 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
"id": "daggerheart",
"title": "Daggerheart",
"description": "An unofficial implementation of the Daggerheart system",
- "version": "2.2.1",
+ "version": "2.2.2",
"compatibility": {
"minimum": "14.359",
"verified": "14.360",
@@ -10,7 +10,7 @@
},
"url": "https://github.com/Foundryborne/daggerheart",
"manifest": "https://raw.githubusercontent.com/Foundryborne/daggerheart/v14/system.json",
- "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.2.1/system.zip",
+ "download": "https://github.com/Foundryborne/daggerheart/releases/download/2.2.2/system.zip",
"authors": [
{
"name": "WBHarry"