Merge branch 'main' into feature/death-moves

This commit is contained in:
Chris Ryan 2025-12-03 20:31:44 +10:00
commit fda1581c51
31 changed files with 426 additions and 48 deletions

View file

@ -46,17 +46,21 @@
</button>
<div class="palette status-effects" data-palette="effects">
{{#each systemStatusEffects as |status|}}
<div class="effect-control-container" {{#if status.disabled}}data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.immune"}}"{{/if}}>
<img class="effect-control {{status.cssClass}} {{#if status.disabled}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
<div class="effect-control-container" {{#if status.disabled}}data-tooltip="{{localize "DAGGERHEART.UI.Tooltip.immune"}}"{{else if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
<img class="effect-control {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}">
{{#if status.disabled}}
<span class="effect-control-disabled-marker">/</span>
{{/if}}
{{#if status.locked}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
</div>
{{/each}}
{{#if genericStatusEffects}}
<label class="palette-category-title">{{localize "DAGGERHEART.APPLICATIONS.HUD.tokenHUD.genericEffects"}}</label>
{{#each genericStatusEffects as |status|}}
<img class="effect-control {{status.cssClass}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
<div class="effect-control-container" {{#if status.title}}data-tooltip-text="{{status.title}}"{{/if}}>
<img class="effect-control {{status.cssClass}} {{#if (or status.disabled status.locked)}}disabled{{/if}}" src="{{status.src}}" data-action="effect" data-status-id="{{status.id}}" >
{{#if status.locked}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
</div>
{{/each}}
{{/if}}
</div>

View file

@ -3,7 +3,6 @@
data-tab='{{tabs.biography.id}}'
data-group='{{tabs.biography.group}}'
>
<div class="items-section">
<fieldset class="flex">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.characteristics'}}</legend>
@ -22,13 +21,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>
<fieldset>
<fieldset class="biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.backgroundTitle'}}</legend>
{{formInput background.field value=background.value enriched=background.enriched toggled=true}}
</fieldset>
<fieldset>
<fieldset class="biography-section">
<legend>{{localize 'DAGGERHEART.ACTORS.Character.story.connectionsTitle'}}</legend>
{{formInput connections.field value=connections.value enriched=connections.enriched toggled=true}}
</fieldset>

View file

@ -0,0 +1,14 @@
<div>
<div class="effects-display-container">
{{#each effects as | effect |}}
<span class="effect-container {{#if effect.condition}}disabled{{/if}}" data-tooltip="#effect-display#" id="{{effect.id}}"
data-applied-by="{{effect.appliedBy}}" {{#if effect.condition}}data-condition="{{effect.condition}}"{{else}}data-uuid="{{effect.uuid}}"{{/if}}
>
<a {{#if effect.condition}}disabled{{/if}}>
<img src="{{effect.img}}" />
</a>
{{#if effect.condition}}<i class="effect-locked fa-solid fa-lock"></i>{{/if}}
</span>
{{/each}}
</div>
</div>

View file

@ -0,0 +1,24 @@
<div class="daggerheart dh-style tooltip">
<div class="tooltip-header">
<h2>{{effect.name}}</h2>
{{#if effect.appliedBy}}
<p class="subtitle">{{localize "DAGGERHEART.UI.EffectsDisplay.appliedBy" by=effect.appliedBy}}</p>
{{/if}}
</div>
{{#if effect.description}}
<div class="description">
{{{effect.description}}}
</div>
{{else if effect.parent.system.description}}
<div class="description">
{{{effect.parent.system.description}}}
</div>
{{/if}}
{{#unless effect.isLockedCondition}}
<p class="close-hint">
<i class="fa-solid fa-computer-mouse"></i> {{localize "DAGGERHEART.UI.EffectsDisplay.removeThing" thing=(localize "DAGGERHEART.GENERAL.Effect.single")}}
</p>
{{/unless}}
</div>