Merge branch 'v1.4' into 'dev_0.8'

# Conflicts:
#   module/actor-sheet.js
#   system.json
#   templates/actor-sheet.html
This commit is contained in:
2021-03-02 22:44:57 +00:00
36 changed files with 933 additions and 590 deletions

View File

@@ -155,7 +155,12 @@
</div>
<div class="flex-group-left flexcol" >
<ul class="carac-list">
{{#each data.data.attributs as |attr key|}}
<li class="competence flexrow list-item">
<span class="competence-label flexrow" name="beaute">Beauté :
<input class="description-value" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String" {{#unless @root.data.editCaracComp}}disabled{{/unless}}/>
</span>
</li>
{{#each data.attributs as |attr key|}}
<li class="competence flexrow list-item" data-attribute="{{key}}">
<span class="competence-label flexrow" name="data.attributs.{{key}}.label">{{attr.label}} :
{{#if (eq key 'protection')}}
@@ -511,6 +516,13 @@
<span class="generic-label">Total XP compétences</span>
<span class="competence-value">{{data.competenceXPTotal}}</span>
</li>
{{#if data.montrerArchetype}}
{{#each data.comptageArchetype as |archetype key|}}
<li class="item flexrow">
<label class="generic-label">Archetype {{archetype.niveau}} : {{archetype.nombre}} / {{archetype.nombreMax}}</label>
</li>
{{/each}}
{{/if}}
</ul>
</div>
</div>
@@ -1038,7 +1050,8 @@
</li>
<li class="item flexrow list-item">
<label class="description-label competence-label">Beauté :
<input class="description-value flexrow" type="text" name="data.beaute" value="{{data.beaute}}" data-dtype="String"/>
<label class="description-label competence-label">{{data.beaute}}
</label>
</label>
</li>
<li class="item flexrow list-item">