cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-18 07:59:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflict

Browse source
This commit is contained in:
Dapoolp 2025-08-05 21:16:13 +02:00
commit 3d1be5fa22
487 changed files with 16301 additions and 1974 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -89,8 +89,7 @@
<div class="domains-section">
{{#each document.system.class.value.system.domains as |domain|}}
<div class="domain">
<span class="label">{{localize (concat 'DAGGERHEART.GENERAL.Domain.' domain '.label')}}</span>
<img src="{{concat 'systems/daggerheart/assets/icons/domains/' domain '.svg'}}" alt="">
<img src="{{concat 'systems/daggerheart/assets/icons/domains/' domain '.svg'}}" alt="" data-tooltip="{{localize (concat 'DAGGERHEART.GENERAL.Domain.' domain '.label')}}" />
</div>
{{/each}}
</div>

8
templates/sheets/actors/character/sidebar.hbs
View file

@ -55,10 +55,10 @@
<div class="status-section">
<div class="status-number">
<div class='status-value'>
<p>{{document.system.proficiency}}</p>
<p>{{document.system.evasion}}</p>
</div>
<div class="status-label">
<h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
<h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
</div>
</div>
@ -91,10 +91,10 @@
<div class="status-number">
<div class='status-value'>
<p>{{document.system.evasion}}</p>
<p>{{document.system.proficiency}}</p>
</div>
<div class="status-label">
<h4>{{localize "DAGGERHEART.GENERAL.evasion"}}</h4>
<h4>{{localize "DAGGERHEART.GENERAL.proficiency"}}</h4>
</div>
</div>
</div>

2
templates/sheets/global/partials/inventory-item-V2.hbs
View file

@ -55,7 +55,7 @@ Parameters:
{{/each}}
</div>
{{else if (not ../hideLabels)}}
<div class="item-lables">
<div class="item-labels">
<div class="label">
{{#each this._getLabels as |label|}}
{{ifThen label.value label.value label}}

6
templates/sheets/global/partials/resource-section.hbs
View file

@ -9,9 +9,13 @@
</legend>
{{#if source.system.resource}}
<div class="two-columns even">
<div class="{{#if (eq source.system.resource.type 'simple')}}nest-inputs{{else}}two-columns{{/if}} even">
{{formGroup systemFields.resource.fields.type value=source.system.resource.type localize=true blank=false}}
{{formGroup systemFields.resource.fields.recovery value=source.system.resource.recovery localize=true}}
{{#if (eq source.system.resource.type 'simple')}}
{{formGroup systemFields.resource.fields.progression value=source.system.resource.progression localize=true}}
{{/if}}
</div>
<div class="two-columns even">