Merged with v14-Dev

This commit is contained in:
WBHarry 2026-02-21 13:53:01 +01:00
commit 26503187a2
126 changed files with 2540 additions and 1260 deletions

View file

@ -14,6 +14,7 @@
{{formGroup settingFields.schema.fields.summaryMessages.fields.effects value=settingFields._source.summaryMessages.effects localize=true}}
</div>
{{formGroup settingFields.schema.fields.autoExpireActiveEffects value=settingFields._source.autoExpireActiveEffects localize=true}}
{{formGroup settingFields.schema.fields.countdownAutomation value=settingFields._source.countdownAutomation localize=true}}
{{formGroup settingFields.schema.fields.actionPoints value=settingFields._source.actionPoints localize=true}}
{{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}}

View file

@ -7,47 +7,31 @@
{{formGroup systemFields.rangeDependence.fields.target value=source.system.rangeDependence.target localize=true }}
{{formGroup systemFields.rangeDependence.fields.range value=source.system.rangeDependence.range localize=true }}
</fieldset>
{{!--
{{#if start}}
<fieldset class="start-data">
<legend>{{localize "EFFECT.START.Header"}}</legend>
<div class="form-group">
<span class="label">{{localize "EFFECT.FIELDS.start.time.label"}}</span>
<div class="form-fields">{{start.time}}</div>
</div>
{{#if start.combat}}
<div class="form-group">
<span class="label">{{localize "DOCUMENT.Combat"}}</span>
<div class="form-fields">
{{localize "EFFECT.START.Combat" round=start.round turn=start.turn}}
</div>
</div>
{{#if start.combatant}}
<div class="form-group">
<span class="label">{{localize "DOCUMENT.Combatant"}}</span>
<div class="form-fields">
{{localize "EFFECT.START.Combatant" combatant=start.combatantName initiative=start.combatantInitiative}}
</div>
</div>
{{/if}}
{{/if}}
</fieldset>
{{/if}} --}}
<fieldset class="one-column">
<legend>{{localize "EFFECT.DURATION.Label"}}</legend>
{{!-- <fieldset>
<legend>{{localize "EFFECT.DURATION.Header"}}</legend>
<div class="form-group slim duration" data-duration>
<label class="flexrow" for="{{rootId}}-duration.value">
<span>{{localize "EFFECT.DURATION.Label"}}</span>
<span class="warning" hidden><i class="fa-duotone fa-triangle-exclamation"></i></span>
</label>
<div class="form-fields">
{{formInput fields.duration.fields.value value=source.duration.value id=(concat rootId "-duration.value")
aria=(object label=(localize "EFFECT.FIELDS.duration.value.label"))}}
{{formInput fields.duration.fields.units value=source.duration.units id=(concat rootId "-duration.units")
options=durationUnits aria=(object label=(localize "EFFECT.FIELDS.duration.units.label"))}}
{{formGroup systemFields.duration.fields.type value=source.system.duration.type localize=true }}
<div class="form-group slim duration-description">
<div class="form-fields">
{{formInput systemFields.duration.fields.description value=source.system.duration.description localize=true }}
</div>
</div>
<div class="custom-duration-section">
{{formGroup fields.start.fields.time value=source.start.time localize=true }}
<div class="form-group slim duration" data-duration>
<label class="flexrow" for="{{rootId}}-duration.value">
<span>{{localize "EFFECT.DURATION.Label"}}</span>
<span class="warning" hidden><i class="fa-duotone fa-triangle-exclamation"></i></span>
</label>
<div class="form-fields">
{{formInput fields.duration.fields.value value=source.duration.value id=(concat rootId "-duration.value")
aria=(object label=(localize "EFFECT.FIELDS.duration.value.label"))}}
{{formInput fields.duration.fields.units value=source.duration.units id=(concat rootId "-duration.units")
options=durationUnits aria=(object label=(localize "EFFECT.FIELDS.duration.units.label")) localize=true }}
</div>
</div>
</div>
{{formGroup fields.duration.fields.expiry choices=expiryEvents value=source.duration.expiry rootId=rootId}}
</fieldset> --}}
</fieldset>
</section>

View file

@ -16,6 +16,16 @@
</div>
{{/if}}
{{#if effect.system.duration.type}}
<div class="duration-container">
<div class="duration-inner-container">
<span>{{localize "EFFECT.DURATION.Label"}}:</span>
<span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." effect.system.duration.type )}}</span>
</div>
</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")}}

View file

@ -4,4 +4,12 @@
{{#if description}}
<div class="tooltip-description">{{{description}}}</div>
{{/if}}
{{#if item.system.duration.type}}
<div class="tooltip-duration">
<div class="duration-inner-container">
<span>{{localize "EFFECT.DURATION.Label"}}:</span>
<span>{{localize (concat "DAGGERHEART.CONFIG.ActiveEffectDuration." item.system.duration.type )}}</span>
</div>
</div>
{{/if}}
</div>