cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 15:39:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix' into fix/717-compendium-browser-improvements

Browse source
This commit is contained in:
Dapoolp 2025-08-11 00:09:22 +02:00
commit 4aef8e5ab9
7 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

7
module/dice/dualityRoll.mjs
View file

@ -19,7 +19,7 @@ export default class DualityRoll extends D20Roll {
get title() { get title() {
return game.i18n.localize( 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() { createBaseDice() {
if ( if (this.dice[0] instanceof foundry.dice.terms.Die && this.dice[1] instanceof foundry.dice.terms.Die) {
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]]; this.terms = [this.terms[0], this.terms[1], this.terms[2]];
return; return;
} }

7
src/packs/adversaries/folders_Tier_1_sxvlEwi25uAoB2C5.json
View file

@ -1,5 +1,5 @@
{ {
"type": "Item", "type": "Actor",
"folder": null, "folder": null,
"name": "Tier 1", "name": "Tier 1",
"color": null, "color": null,
@ -14,10 +14,7 @@
"exportSource": null, "exportSource": null,
"coreVersion": "13.346", "coreVersion": "13.346",
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "0.0.1", "systemVersion": "0.0.1"
"createdTime": 1752684226915,
"modifiedTime": 1752684226915,
"lastModifiedBy": "k0gmQFlvrPvlTtbh"
}, },
"_key": "!folders!sxvlEwi25uAoB2C5" "_key": "!folders!sxvlEwi25uAoB2C5"
} }

7
src/packs/adversaries/folders_Tier_2_OgzrmfH1ZbpljX7k.json
View file

@ -1,5 +1,5 @@
{ {
"type": "Item", "type": "Actor",
"folder": null, "folder": null,
"name": "Tier 2", "name": "Tier 2",
"color": null, "color": null,
@ -14,10 +14,7 @@
"exportSource": null, "exportSource": null,
"coreVersion": "13.346", "coreVersion": "13.346",
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "0.0.1", "systemVersion": "0.0.1"
"createdTime": 1752684230275,
"modifiedTime": 1752684230275,
"lastModifiedBy": "k0gmQFlvrPvlTtbh"
}, },
"_key": "!folders!OgzrmfH1ZbpljX7k" "_key": "!folders!OgzrmfH1ZbpljX7k"
} }

7
src/packs/adversaries/folders_Tier_3_wTI7nZkPhKxl7Wwq.json
View file

@ -1,5 +1,5 @@
{ {
"type": "Item", "type": "Actor",
"folder": null, "folder": null,
"name": "Tier 3", "name": "Tier 3",
"color": null, "color": null,
@ -14,10 +14,7 @@
"exportSource": null, "exportSource": null,
"coreVersion": "13.346", "coreVersion": "13.346",
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "0.0.1", "systemVersion": "0.0.1"
"createdTime": 1752684233122,
"modifiedTime": 1752684233122,
"lastModifiedBy": "k0gmQFlvrPvlTtbh"
}, },
"_key": "!folders!wTI7nZkPhKxl7Wwq" "_key": "!folders!wTI7nZkPhKxl7Wwq"
} }

7
src/packs/adversaries/folders_Tier_4_7XHlANCPz18yvl5L.json
View file

@ -1,5 +1,5 @@
{ {
"type": "Item", "type": "Actor",
"folder": null, "folder": null,
"name": "Tier 4", "name": "Tier 4",
"color": null, "color": null,
@ -14,10 +14,7 @@
"exportSource": null, "exportSource": null,
"coreVersion": "13.346", "coreVersion": "13.346",
"systemId": "daggerheart", "systemId": "daggerheart",
"systemVersion": "0.0.1", "systemVersion": "0.0.1"
"createdTime": 1752684235596,
"modifiedTime": 1752684235596,
"lastModifiedBy": "k0gmQFlvrPvlTtbh"
}, },
"_key": "!folders!7XHlANCPz18yvl5L" "_key": "!folders!7XHlANCPz18yvl5L"
} }

6
templates/sheets/actors/character/header.hbs
View file

@ -105,9 +105,9 @@
</div> </div>
<div class="character-traits"> <div class="character-traits">
{{#each this.attributes as |attribute key|}} {{#each this.attributes as |attribute key|}}
<div class="trait" data-tooltip="{{#each attribute.verbs}}{{this}}<br>{{/each}}" data-action="rollAttribute" data-attribute="{{key}}" data-value="{{attribute.value}}"> <div class="trait" data-tooltip="<b>{{localize (concat 'DAGGERHEART.CONFIG.Traits.' key '.name') }}:</b><br>{{#each attribute.verbs}}{{this}}<br>{{/each}}" data-action="rollAttribute" data-attribute="{{key}}" data-value="{{attribute.value}}">
<div class="trait-name"> <div class="trait-name">
<span>{{localize (concat 'DAGGERHEART.CONFIG.Traits.' key '.short')}}</span> <span>{{localize (concat 'DAGGERHEART.CONFIG.Traits.' key '.short')}}</span>
{{#if attribute.tierMarked}} {{#if attribute.tierMarked}}
<i class='fa-solid fa-circle'></i> <i class='fa-solid fa-circle'></i>

12
templates/ui/combatTracker/combatTrackerHeader.hbs
View file

@ -51,6 +51,18 @@
{{/if}} {{/if}}
<div class="encounter-controls {{#if hasCombat}}combat{{/if}}"> <div class="encounter-controls {{#if hasCombat}}combat{{/if}}">
{{#if hasCombat}}
<div class="encounter-fear-controls">
<div class="encounter-fear-dice-container">
<div class="encounter-control-fear-container">
<div class="dice d12"></div>
<i class="fas fa-skull encounter-control-fear"></i>
</div>
<div>{{fear}}</div>
</div>
<a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
</div>
{{/if}}
{{!-- Combat Status --}} {{!-- Combat Status --}}
<strong class="encounter-title"> <strong class="encounter-title">
{{#if combats.length}} {{#if combats.length}}