cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-17 23:49:02 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix conflicts

Browse source
This commit is contained in:
Dapoolp 2025-08-25 13:42:23 +02:00
commit 92a0883806
121 changed files with 1526 additions and 1107 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/ui/chat/parts/target-part.hbs
View file

@ -31,7 +31,7 @@
<div class="target-data">
<div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div>
{{#if (and ../hasRoll (hasProperty this "hit"))}}
<div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}">
<div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}" data-perm-id="{{actorId}}" data-perm-hidden="true">
{{#if hit}}
{{localize "DAGGERHEART.GENERAL.hit.single"}}
{{else}}

6
templates/ui/chat/resource-roll.hbs
View file

@ -1,3 +1,3 @@
<div class="daggerheart chat resource-roll">
<h5 class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</h5>
</div>
<ul class="daggerheart chat resource-roll">
<li class="reroll-message">{{localize "DAGGERHEART.UI.Chat.resourceRoll.playerMessage" user=user name=name }}</li>
</ul>

2
templates/ui/tooltip/adversary.hbs
View file

@ -12,7 +12,7 @@
</div>
<div class="tooltip-information">
<label>{{localize "Type"}}</label>
{{#with (lookup config.ACTOR.adversaryTypes item.system.type) as | type |}}
{{#with (lookup adversaryTypes item.system.type) as | type |}}
<div>{{localize type.label}}</div>
{{/with}}
</div>