diff --git a/module/dice/dualityRoll.mjs b/module/dice/dualityRoll.mjs index 35bae725..ac1047ab 100644 --- a/module/dice/dualityRoll.mjs +++ b/module/dice/dualityRoll.mjs @@ -19,7 +19,7 @@ export default class DualityRoll extends D20Roll { get title() { return game.i18n.localize( - "DAGGERHEART.GENERAL.dualityRoll" + `DAGGERHEART.GENERAL.${this.options?.roll?.type === CONFIG.DH.ITEM.actionTypes.reaction.id ? 'reactionRoll' : 'dualityRoll'}` ); } @@ -125,10 +125,7 @@ export default class DualityRoll extends D20Roll { } createBaseDice() { - if ( - this.dice[0] instanceof foundry.dice.terms.Die && - this.dice[1] instanceof foundry.dice.terms.Die - ) { + if (this.dice[0] instanceof foundry.dice.terms.Die && this.dice[1] instanceof foundry.dice.terms.Die) { this.terms = [this.terms[0], this.terms[1], this.terms[2]]; return; } diff --git a/src/packs/adversaries/folders_Tier_1_sxvlEwi25uAoB2C5.json b/src/packs/adversaries/folders_Tier_1_sxvlEwi25uAoB2C5.json index 1fe3770c..8988fbbd 100644 --- a/src/packs/adversaries/folders_Tier_1_sxvlEwi25uAoB2C5.json +++ b/src/packs/adversaries/folders_Tier_1_sxvlEwi25uAoB2C5.json @@ -1,5 +1,5 @@ { - "type": "Item", + "type": "Actor", "folder": null, "name": "Tier 1", "color": null, @@ -14,10 +14,7 @@ "exportSource": null, "coreVersion": "13.346", "systemId": "daggerheart", - "systemVersion": "0.0.1", - "createdTime": 1752684226915, - "modifiedTime": 1752684226915, - "lastModifiedBy": "k0gmQFlvrPvlTtbh" + "systemVersion": "0.0.1" }, "_key": "!folders!sxvlEwi25uAoB2C5" } diff --git a/src/packs/adversaries/folders_Tier_2_OgzrmfH1ZbpljX7k.json b/src/packs/adversaries/folders_Tier_2_OgzrmfH1ZbpljX7k.json index add2018d..caa42284 100644 --- a/src/packs/adversaries/folders_Tier_2_OgzrmfH1ZbpljX7k.json +++ b/src/packs/adversaries/folders_Tier_2_OgzrmfH1ZbpljX7k.json @@ -1,5 +1,5 @@ { - "type": "Item", + "type": "Actor", "folder": null, "name": "Tier 2", "color": null, @@ -14,10 +14,7 @@ "exportSource": null, "coreVersion": "13.346", "systemId": "daggerheart", - "systemVersion": "0.0.1", - "createdTime": 1752684230275, - "modifiedTime": 1752684230275, - "lastModifiedBy": "k0gmQFlvrPvlTtbh" + "systemVersion": "0.0.1" }, "_key": "!folders!OgzrmfH1ZbpljX7k" } diff --git a/src/packs/adversaries/folders_Tier_3_wTI7nZkPhKxl7Wwq.json b/src/packs/adversaries/folders_Tier_3_wTI7nZkPhKxl7Wwq.json index 4a22ae4c..78e05903 100644 --- a/src/packs/adversaries/folders_Tier_3_wTI7nZkPhKxl7Wwq.json +++ b/src/packs/adversaries/folders_Tier_3_wTI7nZkPhKxl7Wwq.json @@ -1,5 +1,5 @@ { - "type": "Item", + "type": "Actor", "folder": null, "name": "Tier 3", "color": null, @@ -14,10 +14,7 @@ "exportSource": null, "coreVersion": "13.346", "systemId": "daggerheart", - "systemVersion": "0.0.1", - "createdTime": 1752684233122, - "modifiedTime": 1752684233122, - "lastModifiedBy": "k0gmQFlvrPvlTtbh" + "systemVersion": "0.0.1" }, "_key": "!folders!wTI7nZkPhKxl7Wwq" } diff --git a/src/packs/adversaries/folders_Tier_4_7XHlANCPz18yvl5L.json b/src/packs/adversaries/folders_Tier_4_7XHlANCPz18yvl5L.json index cf068e44..8baefd2a 100644 --- a/src/packs/adversaries/folders_Tier_4_7XHlANCPz18yvl5L.json +++ b/src/packs/adversaries/folders_Tier_4_7XHlANCPz18yvl5L.json @@ -1,5 +1,5 @@ { - "type": "Item", + "type": "Actor", "folder": null, "name": "Tier 4", "color": null, @@ -14,10 +14,7 @@ "exportSource": null, "coreVersion": "13.346", "systemId": "daggerheart", - "systemVersion": "0.0.1", - "createdTime": 1752684235596, - "modifiedTime": 1752684235596, - "lastModifiedBy": "k0gmQFlvrPvlTtbh" + "systemVersion": "0.0.1" }, "_key": "!folders!7XHlANCPz18yvl5L" } diff --git a/templates/sheets/actors/character/header.hbs b/templates/sheets/actors/character/header.hbs index 9f2d56a1..88a72fb8 100644 --- a/templates/sheets/actors/character/header.hbs +++ b/templates/sheets/actors/character/header.hbs @@ -105,9 +105,9 @@
- {{#each this.attributes as |attribute key|}} -
-
+ {{#each this.attributes as |attribute key|}} +
+
{{localize (concat 'DAGGERHEART.CONFIG.Traits.' key '.short')}} {{#if attribute.tierMarked}} diff --git a/templates/ui/combatTracker/combatTrackerHeader.hbs b/templates/ui/combatTracker/combatTrackerHeader.hbs index 9ecff9e6..a34e4743 100644 --- a/templates/ui/combatTracker/combatTrackerHeader.hbs +++ b/templates/ui/combatTracker/combatTrackerHeader.hbs @@ -51,6 +51,18 @@ {{/if}}
+ {{#if hasCombat}} +
+
+
+
+ +
+
{{fear}}
+
+ +
+ {{/if}} {{!-- Combat Status --}} {{#if combats.length}}