Merge branch 'main' into feature/actor-sizes

This commit is contained in:
WBHarry 2025-12-20 19:39:44 +01:00
commit 8de9ae6020
165 changed files with 798 additions and 444 deletions

View file

@ -7,7 +7,6 @@
<legend>{{localize "DAGGERHEART.GENERAL.identify"}}</legend>
{{formField fields.name value=source.name label="Name" name="name"}}
{{formField fields.img value=source.img label="Icon" name="img"}}
{{formField fields.actionType value=source.actionType label="Type" name="actionType" localize=true}}
{{formField fields.chatDisplay value=source.chatDisplay name="chatDisplay" classes="checkbox" localize=true}}
</fieldset>
<fieldset class="action-category">

View file

@ -1,10 +1,7 @@
<header class='adversary-header-sheet'>
<line-div></line-div>
<div class="name-row">
<h1 class='actor-name'>
<input type='text' name='name' value='{{source.name}}' placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}"
/>
</h1>
<h1 class='input actor-name' contenteditable="plaintext-only" data-property="name" placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}">{{source.name}}</h1>
</div>
<div class="tags">
<div class="tag">

View file

@ -1,15 +1,7 @@
<header class="character-header-sheet">
<line-div></line-div>
<div class="name-row">
<h1 class='actor-name'>
<input
type='text'
name='name'
value='{{document.name}}'
placeholder='{{localize "DAGGERHEART.GENERAL.actorName"}}'
/>
</h1>
<h1 class="actor-name input" contenteditable="plaintext-only" data-property="name" placeholder="{{localize "DAGGERHEART.GENERAL.actorName"}}">{{source.name}}</h1>
<div class='level-div'>
<h3 class='label'>
{{#if (or document.system.needsCharacterSetup document.system.levelData.canLevelUp)}}

View file

@ -49,6 +49,19 @@ Parameters:
{{tag}}
</div>
{{/each}}
{{!-- Feature Form Tag Start --}}
{{#if (eq ../type 'feature')}}
{{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
{{#if system.featureForm}}
<div class="tag feature-form">
<span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." system.featureForm)}}</span>
</div>
{{/if}}
{{/if}}
{{/if}}
{{!-- Feature Form Tag End --}}
</div>
{{/if}}
{{/with}}
@ -145,10 +158,12 @@ Parameters:
<div class="item-button">
{{#if (and (eq action.type 'beastform') @root.beastformActive)}}
<button type="button" data-action="cancelBeastform" data-item-uuid="{{action.uuid}}">
<i class="fa-solid {{action.typeIcon}} action-icon"></i>
{{localize "DAGGERHEART.ACTORS.Character.cancelBeastform"}}
</button>
{{else}}
<button type="button" data-action="useItem" data-item-uuid="{{action.uuid}}">
<i class="fa-solid {{action.typeIcon}} action-icon"></i>
{{action.name}}
</button>
{{/if}}

View file

@ -67,6 +67,21 @@
</div>
{{/if}}
{{/if}}
<!-- Feature Form Tags for adversary/environment actors -->
{{#if (eq type 'feature')}}
{{#if (or (eq @root.document.type 'adversary') (eq @root.document.type 'environment'))}}
{{#if item.system.featureForm}}
<div class="item-tags">
<div class="tag">
<span class="recall-label">{{localize "DAGGERHEART.CONFIG.FeatureForm.label"}}: </span>
<span class="recall-value">{{localize (concat "DAGGERHEART.CONFIG.FeatureForm." item.system.featureForm)}}</span>
</div>
</div>
{{/if}}
{{/if}}
{{/if}}
{{#if (eq type 'domainCard')}}
{{#if isSidebar}}
<div class="item-labels">

View file

@ -4,7 +4,7 @@
<line-div></line-div>
<h1 class='item-name'><input type='text' name='name' value='{{source.name}}' /></h1>
<div class='item-description'>
<h3>{{localize 'TYPES.Item.feature'}}</h3>
<h3>{{localize (concat 'DAGGERHEART.CONFIG.FeatureForm.' source.system.featureForm)}} {{localize 'TYPES.Item.feature'}}</h3>
</div>
</div>
</header>

View file

@ -3,5 +3,12 @@
data-tab='{{tabs.settings.id}}'
data-group='{{tabs.settings.group}}'
>
{{#if (or (eq document.parent.type "adversary") (eq document.parent.type "environment"))}}
<fieldset class="two-columns">
<legend>{{localize "DAGGERHEART.GENERAL.general"}}</legend>
<span>{{localize "DAGGERHEART.CONFIG.FeatureForm.label"}}</span>
{{formInput document.system.schema.fields.featureForm value=document.system.featureForm choices=featureFormChoices localize=true}}
</fieldset>
{{/if}}
{{> "systems/daggerheart/templates/sheets/global/partials/resource-section/resource-section.hbs" }}
</section>