mirror of
https://github.com/Foundryborne/daggerheart.git
synced 2026-01-15 13:11:08 +01:00
fix conflicts
This commit is contained in:
commit
7178148c80
63 changed files with 1969 additions and 3301 deletions
|
|
@ -15,22 +15,6 @@
|
|||
<button class="disadvantage flex1 {{#if this.advantage}}selected{{/if}}" data-action="setAdvantage">Advantage</button>
|
||||
<button class="disadvantage flex1 {{#if this.disadvantage}}selected{{/if}}" data-action="setDisadvantage">Disadvantage</button>
|
||||
</div>
|
||||
{{!-- <div class="form-group">
|
||||
<label>Advantage</label>
|
||||
<div class="form-fields">
|
||||
<select name="advantage" {{#if this.disadvantage}}disabled{{/if}}>
|
||||
{{selectOptions this.diceOptions selected=this.advantage valueAttr="value" labelAttr="name" localize=true blank=""}}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Disadvantage</label>
|
||||
<div class="form-fields">
|
||||
<select name="disadvantage" {{#if this.advantage}}disabled{{/if}}>
|
||||
{{selectOptions this.diceOptions selected=this.disadvantage valueAttr="value" labelAttr="name" localize=true blank=""}}
|
||||
</select>
|
||||
</div>
|
||||
</div> --}}
|
||||
{{#if (not this.isNpc)}}
|
||||
<div class="form-group">
|
||||
<label>Hope</label>
|
||||
|
|
@ -49,24 +33,6 @@
|
|||
</div>
|
||||
</div>
|
||||
{{/if}}
|
||||
{{#each this.bonusDamage as |damage index|}}
|
||||
<div class="form-group">
|
||||
<label><strong>{{damage.description}}</strong></label>
|
||||
<div class="form-fields">
|
||||
<label>Enabled</label>
|
||||
<input style="align-self: baseline;" type="checkbox" name="bonusDamage.{{index}}.initiallySelected" {{checked damage.initiallySelected}} />
|
||||
{{#if (and damage.initiallySelected damage.hopeIncrease)}}
|
||||
|
||||
<label>Hope</label>
|
||||
<div class="hope-container">
|
||||
<i data-action="decreaseHopeUse" data-index="{{index}}" class="fa-solid fa-caret-left icon-button {{#if (eq damage.hopeUses 0)}}disabled{{/if}}"></i>
|
||||
<div>{{damage.hopeUses}}</div>
|
||||
<i data-action="increaseHopeUse" data-index="{{index}}" class="fa-solid fa-caret-right icon-button {{#if (eq ../hopeUsed ../hopeResource)}}disabled{{/if}}"></i>
|
||||
</div>
|
||||
{{/if}}
|
||||
</div>
|
||||
</div>
|
||||
{{/each}}
|
||||
</div>
|
||||
<footer>
|
||||
<button data-action="finish">Roll</button>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue