Merge branch 'filtre-comp' into 'dev_1.1'

organisation lock / filter

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!63
This commit is contained in:
Leratier Bretonnien 2020-12-10 19:13:37 +00:00
commit 41e678d7aa
2 changed files with 11 additions and 8 deletions

View File

@ -34,7 +34,7 @@ export class RdDActorSheet extends ActorSheet {
data.data.lockUnlockText = (this.options.editCaracComp) ? "Bloquer" : "Débloquer";
// Gestion de l'affichage total/partiel des compétences
data.data.cacherCompetencesNiveauBase = this.options.cacherCompetencesNiveauBase;
data.data.showHideCompetenceText = (this.options.cacherCompetencesNiveauBase) ? "Cacher Comp." : "Montrer Comp." ;
data.data.showHideCompetenceText = (this.options.cacherCompetencesNiveauBase) ? "Montrer tout" : "Filtrer" ;
let compCategorieNiveau = RdDUtility.getLevelCategory(); // recup catégorie
data.itemsByType = RdDUtility.buildItemsClassification(data.items);

View File

@ -52,10 +52,6 @@
<a id="ptreve-actuel-plus">+</a>
</label>
</li>
<li>
<label><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></label>
<label><a class="show-hide-competences">{{data.showHideCompetenceText}}</a></label>
</li>
</ul>
<div class="flex-group-center flex-actions-bar">
<div>
@ -66,16 +62,18 @@
<span id="monte-tmr"><a title="Montée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-normal.svg" alt="Montée dans les Terres M&eacute;dianes !"/></a></span>
<span id="monte-tmr-rapide"><a title="Montée accélérée dans les Terres M&eacute;dianes !"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-rapide.svg" alt="Montée accélérée dans les Terres M&eacute;dianes !"/></a></span>
<span id="visu-tmr"><a title="Regarder les Terres M&eacute;dianes"><img class="button-img" src="systems/foundryvtt-reve-de-dragon/styles/img/ui/icon-tmr-view.svg" alt="Regarder les Terres M&eacute;dianes"/></a></span>
</div>
</div>
<div class="flexrow">
<span class="tooltip">Malus de fatigue : {{data.fatigue.malus}}
<span class="tooltiptext">{{{data.fatigue.html}}}</span>
</span>
<span>{{data.blessures.resume}}</span>
<span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span>
</div>
<div class="flexrow">
<span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span>
<span>{{data.compteurs.etat.label}}: {{data.compteurs.etat.value}}</span><span></span>
</div>
<div class="flexrow">
<span>{{data.compteurs.surenc.label}}: {{data.compteurs.surenc.value}}</span><span></span>
</div>
</div>
</div>
@ -100,6 +98,7 @@
<div class="tab items" data-group="primary" data-tab="carac">
<div class="grid grid-2col">
<div class="flex-group-left flexcol">
<span><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></span>
<ul class="carac-list alterne-list">
{{#each data.carac as |carac key|}}
<li class="competence flexrow list-item" data-attribute="{{key}}">
@ -162,6 +161,10 @@
{{!-- Compétences Tab --}}
<div class="tab competences" data-group="primary" data-tab="competences">
<div class="flexrow">
<span><a class="lock-unlock-sheet">{{data.lockUnlockText}}</a></span>
<span><a class="show-hide-competences">{{data.showHideCompetenceText}}</a></span>
</div>
<div class="grid grid-2col">
<div class="flex-group-left flexcol competence-column">
<header class="competence-header flexrow">