cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-06-09 06:08:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-07-06 22:57:37 +02:00
commit f038b7ccfd
152 changed files with 2150 additions and 2520 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/ui/combatTracker/combatTrackerHeader.hbs
View file

@ -60,7 +60,7 @@
</div>
<div>{{fear}}</div>
</div>
<a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.Countdown.Title" type=(localize "DAGGERHEART.Countdown.Types.combat")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
<a class="encounter-countdowns" data-tooltip="{{localize "DAGGERHEART.APPLICATIONS.Countdown.Title" type=(localize "DAGGERHEART.APPLICATIONS.Countdown.types.encounter")}}" data-action="openCountdowns"><i class="fa-solid fa-stopwatch"></i></a>
</div>
{{/if}}
@ -68,7 +68,7 @@
<strong class="encounter-title">
{{#if combats.length}}
{{#if combat.round}}
{{ localize "DAGGERHEART.Combat.combatStarted" }}
{{ localize "DAGGERHEART.APPLICATIONS.CombatTracker.combatStarted" }}
{{else}}
{{ localize "COMBAT.NotStarted" }}
{{/if}}

4
templates/ui/combatTracker/combatTrackerSection.hbs
View file

@ -50,12 +50,12 @@
{{#if @root.user.isGM}}
<button
type="button" class="inline-control spotlight-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
data-action="toggleSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{localize "DAGGERHEART.Combat.giveSpotlight"}}"
data-action="toggleSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.giveSpotlight"}}"
></button>
{{else}}
<button
type="button" class="inline-control spotlight-control discrete icon fa-solid {{#if system.spotlight.requesting}}fa-hand-sparkles requesting{{else}}fa-hand{{/if}}"
data-action="requestSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{#if system.spotlight.requesting}}{{localize "DAGGERHEART.Combat.requestingSpotlight"}}{{else}}{{localize "DAGGERHEART.Combat.requestSpotlight"}}{{/if}}"
data-action="requestSpotlight" data-combatant-id="{{id}}" data-tooltip aria-label="{{#if system.spotlight.requesting}}{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.requestingSpotlight"}}{{else}}{{localize "DAGGERHEART.APPLICATIONS.CombatTracker.requestSpotlight"}}{{/if}}"
></button>
{{/if}}
</li>