Merge branch 'v1.5' into 'v1.5-tentatives'

# Conflicts:
#   template.json
#   templates/item-tache-sheet.html
This commit is contained in:
2021-10-30 07:17:35 +00:00
4 changed files with 14 additions and 5 deletions

View File

@ -50,10 +50,13 @@
<input class="attribute-value" type="text" name="data.points_de_tache_courant" value="{{data.points_de_tache_courant}}" data-dtype="Number"/>
</div>
<div class="form-group">
<label for="tentatives">Nombre de tentatives</label>
<input class="attribute-value" type="text" name="data.tentatives" value="{{data.tentatives}}" data-dtype="Number"/>
<label for="xp">Nombre de Succès</label>
<input class="attribute-value" type="text" name="data.nb_jet_succes" value="{{data.nb_jet_succes}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
</div>
<div class="form-group">
<label for="xp">Nombre d'Echecs</label>
<input class="attribute-value" type="text" name="data.nb_jet_echec" value="{{data.nb_jet_echec}}" data-dtype="Number" {{#if isGM}}{{else}}disabled{{/if}}/>
</div>
<hr>
{{>"systems/foundryvtt-reve-de-dragon/templates/partial-item-description.html"}}