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

35
templates/dialogs/damageReduction.hbs
View file

@ -1,4 +1,9 @@
<div class="damage-reduction-container">
{{#if rulesToggleable}}
<button type="button" class="rules-button {{#unless rulesOn}}inactive{{/unless}}" data-action="toggleRules" data-tooltip-text="{{#if rulesOn}}{{localize "DAGGERHEART.UI.Tooltip.rulesOn"}}{{else}}{{localize "DAGGERHEART.UI.Tooltip.rulesOff"}}{{/if}}">
<i class="fa-solid fa-book"></i>
</button>
{{/if}}
<div class="section-container padded">
<div class="resources-container">
<div class="resource-container">
@ -25,8 +30,6 @@
<i class="fa-solid fa-shield"></i>
</div>
{{/each}}
</div>
<div class="mark-selection-inner">
{{#each marks.stress}}
<div
class="mark-container {{#if this.selected}}selected{{/if}} {{#if (not @root.basicMarksUsed)}}inactive{{/if}}"
@ -40,19 +43,25 @@
<div class="markers-subtitle bold">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.usedMarks"}}</div>
</div>
{{#if availableStressReductions}}
<div class="resources-container">
<div class="resource-container">
<h4 class="armor-title">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.stressReduction"}}</h4>
</div>
</div>
{{/if}}
{{#each availableStressReductions}}
<div class="section-container">
<h4 class="stress-reduction-container divider">
<div class="stress-reduction {{#if (eq this.from @root.currentDamage)}}active{{/if}} {{#if this.selected}}selected{{/if}}" data-action="useStressReduction" data-reduction="{{@key}}">
{{this.from}}
<i class="fa-solid fa-arrow-right-long"></i>
{{this.to}}
<h4 class="chip-container divider">
<div class="chip-inner-container selectable {{#if (or this.any (eq this.from @root.currentDamage))}}active{{/if}} {{#if this.selected}}selected{{/if}}" data-action="useStressReduction" data-reduction="{{@key}}">
{{#if this.any}}
{{localize "DAGGERHEART.GENERAL.any"}}
{{else}}
{{this.from}}
<i class="fa-solid fa-arrow-right-long"></i>
{{this.to}}
{{/if}}
<div class="stress-reduction-cost">
{{this.cost}}
<i class="fa-solid fa-bolt"></i>
@ -62,6 +71,18 @@
</div>
{{/each}}
{{#if thresholdImmunities}}
<div class="resources-container">
<div class="resource-container">
<h4 class="armor-title">{{localize "DAGGERHEART.APPLICATIONS.DamageReduction.thresholdImmunities"}}</h4>
</div>
</div>
{{/if}}
{{#each thresholdImmunities as | immunity key |}}
<div class="threshold-label {{#if (gte key @root.currentDamageNr)}}active{{/if}}">{{immunity}}</div>
{{/each}}
<footer class="padded">
<button type="button" data-action="takeDamage">
{{localize "Take"}}

7
templates/dialogs/dice-roll/costSelection.hbs
View file

@ -3,19 +3,18 @@
<ul>
{{#if uses}}
<li class="scalable-input">
<div class="form-group">
<div class="form-group span-2">
<div class="form-fields nest-inputs">
<input name="uses.enabled" type="checkbox"{{#if uses.enabled}} checked{{/if}}>
<label for="uses.enabled">Uses{{#if uses.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}{{/if}}</span></label>
</div>
</div>
<div></div>
<label class="modifier-label">{{uses.value}}/{{formulaValue uses.max @root.rollConfig.data}}</label>
</li>
{{/if}}
{{#each costs as | cost index |}}
<li class="scalable-input">
<div class="form-group">
<div class="form-group{{#unless (and scalable (gt maxStep 1))}} span-2{{/unless}}">
<div class="form-fields nest-inputs">
<input name="costs.{{index}}.enabled" type="checkbox"{{#if enabled}} checked{{/if}}>
<label>{{label}}{{#if cost.consumeOnSuccess}}<span class="hint">{{localize "DAGGERHEART.ACTIONS.Settings.consumeOnSuccess.short"}}</span>{{/if}}</label>
@ -23,8 +22,6 @@
</div>
{{#if (and scalable (gt maxStep 1))}}
<input type="range" value="{{scale}}" min="0" max="{{maxStep}}" step="1" name="costs.{{index}}.scale" data-tooltip="{{localize "DAGGERHEART.ACTIONS.Settings.cost.stepTooltip" step=step}}" data-tooltip-direction="UP">
{{else}}
<div></div>
{{/if}}
<label class="modifier-label">{{total}}/{{max}}</label>
</li>

20
templates/dialogs/downtime/downtime.hbs
View file

@ -7,6 +7,26 @@
{{#if shortRestMoves.moves}}{{> "systems/daggerheart/templates/dialogs/downtime/activities.hbs" moves=shortRestMoves.moves category='shortRest' nrChoices=nrChoices.shortRest}}{{/if}}
{{#if longRestMoves.moves}}{{> "systems/daggerheart/templates/dialogs/downtime/activities.hbs" moves=longRestMoves.moves category='longRest' nrChoices=nrChoices.longRest}}{{/if}}
</div>
<fieldset>
<legend>{{localize "DAGGERHEART.APPLICATIONS.Downtime.refreshable.title"}}</legend>
<div class="refreshables-container {{#if (and shortRestMoves longRestMoves)}}wide{{/if}}">
{{#each this.refreshables.actionItems as | item |}}
<div class="refreshable-container">
<div class="refreshable-title">{{item.title}}</div>
<div class="refreshable-name">{{item.name}}</div>
</div>
{{/each}}
{{#each this.refreshables.resourceItems as | item |}}
<div class="refreshable-container">
<div class="refreshable-title">{{item.title}}</div>
<div class="refreshable-name">{{item.name}}</div>
</div>
{{/each}}
</div>
</fieldset>
<footer>
<button type="button" data-action="close">{{localize "Cancel"}}</button>
<button type="button" data-action="takeDowntime" {{#if disabledDowntime}}disabled{{/if}}>{{localize "DAGGERHEART.APPLICATIONS.Downtime.takeDowntime"}}</button>

2
templates/settings/appearance-settings.hbs
View file

@ -5,8 +5,6 @@
{{formGroup settingFields.schema.fields.displayFear value=settingFields._source.displayFear localize=true}}
{{formGroup settingFields.schema.fields.showGenericStatusEffects value=settingFields._source.showGenericStatusEffects localize=true}}
{{formGroup settingFields.schema.fields.dualityColorScheme value=settingFields._source.dualityColorScheme localize=true}}
{{#if showDiceSoNice}}
<fieldset>
<legend>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.title"}}</legend>

2
templates/settings/automation-settings.hbs
View file

@ -12,6 +12,8 @@
{{formGroup settingFields.schema.fields.hordeDamage value=settingFields._source.hordeDamage localize=true}}
{{formGroup settingFields.schema.fields.effects.fields.rangeDependent value=settingFields._source.effects.rangeDependent localize=true}}
{{formGroup settingFields.schema.fields.levelupAuto value=settingFields._source.levelupAuto localize=true}}
{{formGroup settingFields.schema.fields.damageReductionRulesDefault value=settingFields._source.damageReductionRulesDefault localize=true}}
{{formGroup settingFields.schema.fields.resourceScrollTexts value=settingFields._source.resourceScrollTexts localize=true}}
<footer class="form-footer">
<button data-action="reset">

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">