Merge branch 'main' into feature/granular-action-outcomes

This commit is contained in:
WBHarry 2026-05-14 18:51:33 +02:00
commit 482b932cd6
11 changed files with 188 additions and 143 deletions

View file

@ -4,9 +4,7 @@
data-group='{{tabs.biography.group}}'
>
<div class="items-section">
<fieldset class="flex">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.characteristics'}}</legend>
<div class="characteristics-section flexrow">
<div class="input">
<span>{{localize 'DAGGERHEART.ACTORS.Character.pronouns'}}</span>
{{formInput systemFields.biography.fields.characteristics.fields.pronouns value=source.system.biography.characteristics.pronouns enriched=source.system.biography.characteristics.pronouns localize=true toggled=true}}
@ -21,14 +19,14 @@
<span>{{localize 'DAGGERHEART.ACTORS.Character.faith'}}</span>
{{formInput systemFields.biography.fields.characteristics.fields.faith value=source.system.biography.characteristics.faith enriched=source.system.biography.characteristics.faith localize=true toggled=true}}
</div>
</fieldset>
</div>
<fieldset class="biography-section">
<fieldset class="glassy biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
{{formInput background.field value=background.value enriched=background.enriched toggled=true}}
</fieldset>
<fieldset class="biography-section">
<fieldset class="glassy biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
{{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
</fieldset>

View file

@ -2,26 +2,25 @@
data-group='{{tabs.features.group}}'>
<div class="features-sections">
{{#each document.system.sheetLists as |category|}}
{{#if (eq category.type 'feature' )}}
{{> 'daggerheart.inventory-items'
title=category.title
type='feature'
actorType='character'
collection=category.values
canCreate=@root.editable
showActions=@root.editable
}}
{{else if category.values}}
{{> 'daggerheart.inventory-items'
title=category.title
type='feature'
actorType='character'
collection=category.values
canCreate=false
showActions=@root.editable
}}
{{/if}}
{{#if (eq category.type 'feature' )}}
{{> 'daggerheart.inventory-items'
title=category.title
type='feature'
actorType='character'
collection=category.values
canCreate=@root.editable
showActions=@root.editable
}}
{{else if category.values}}
{{> 'daggerheart.inventory-items'
title=category.title
type='feature'
actorType='character'
collection=category.values
canCreate=false
showActions=@root.editable
}}
{{/if}}
{{/each}}
</div>
</section>

View file

@ -5,7 +5,10 @@
{{#if (gt this.characters.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Character.plural") turns=this.characters}}
{{/if}}
{{#if (gt this.friendlies.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.friendly") turns=this.friendlies}}
{{/if}}
{{#if (gt this.adversaries.length 0)}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.GENERAL.Adversary.plural") turns=this.adversaries}}
{{> 'systems/daggerheart/templates/ui/combatTracker/combatTrackerSection.hbs' this title=(localize "DAGGERHEART.APPLICATIONS.CombatTracker.adversaryCategories.adversaries") turns=this.adversaries}}
{{/if}}
</div>

View file

@ -1,4 +1,14 @@
<div>
<header class="countdowns-header">
<i class="fa-solid fa-clock-rotate-left" inert></i>
<span class="window-title">{{localize "DAGGERHEART.UI.Countdowns.title"}}</span>
<a class="header-control" data-tooltip aria-label="DAGGERHEART.APPLICATIONS.CountdownEdit.editTitle" data-action="editCountdowns">
<i class="fa-solid fa-wrench" inert></i>
</a>
<a class="header-control" data-tooltip aria-label="DAGGERHEART.UI.Countdowns.toggleIconMode" data-action="toggleViewMode">
<i class="fa-solid fa-down-left-and-up-right-to-center" inert></i>
</a>
</header>
<div class="countdowns-container">
{{#each countdowns as | countdown id |}}
<div class="countdown-container {{#if ../iconOnly}}icon-only{{/if}}">