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

Fix conflict

Browse source
This commit is contained in:
Carlos Fernandez 2026-03-18 18:47:16 -04:00
commit f949e859ee
6 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/dialogs/tagTeamDialog/tagTeamRoll.hbs
View file

@ -27,7 +27,7 @@
</select>
</div>
</div>
{{else if (eq member.rollType 'abilityDamage')}}
{{else if (eq member.rollType 'damageAbility')}}
<div class="form-group">
<div class="form-fields">
<label>{{localize "DAGGERHEART.CONFIG.TagTeamRollTypes.damageAbility"}}</label>
@ -79,7 +79,7 @@
<span class="dice-label">{{this.fear.value}}</span>
<img src="{{concat "systems/daggerheart/assets/icons/dice/fear/" this.fear.dice ".svg"}}" />
</a>
{{#if this.advantage}}
{{#if this.advantage.type}}
<span class="roll-operator">{{#if (eq this.advantage.type 1)}}+{{else}}-{{/if}}</span>
<span class="roll-dice">
<span class="dice-label">{{this.advantage.value}}</span>