From 3ff59d1f07dbf7e53b2f8f78df75a9a8742bcdd7 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 16:23:22 +0200 Subject: [PATCH 1/7] =?UTF-8?q?Am=C3=A9lioration=20rendu=20=C3=A9quipement?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/rdd-utility.js | 8 +- styles/simple.css | 57 ++++++++++---- templates/actor-creature-sheet.html | 30 +------- ....html => actor-sheet-inventaire-item.html} | 34 ++++---- templates/actor-sheet-inventaire-monnaie.html | 24 ++++-- templates/actor-sheet-inventaire.html | 26 +++++++ templates/actor-sheet-liens-animaux.html | 12 +++ templates/actor-sheet-liens-suivants.html | 12 +++ templates/actor-sheet-liens-vehicules.html | 15 ++++ templates/actor-sheet.html | 77 +------------------ templates/actor-vehicule-sheet.html | 42 +--------- templates/item-conteneur-sheet.html | 9 +-- 12 files changed, 155 insertions(+), 191 deletions(-) rename templates/{actor-sheet-inventaire-conteneur.html => actor-sheet-inventaire-item.html} (65%) create mode 100644 templates/actor-sheet-inventaire.html create mode 100644 templates/actor-sheet-liens-animaux.html create mode 100644 templates/actor-sheet-liens-suivants.html create mode 100644 templates/actor-sheet-liens-vehicules.html diff --git a/module/rdd-utility.js b/module/rdd-utility.js index dd49d522..3b927d64 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -122,8 +122,12 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html', 'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html', // Conteneur/item in Actor sheet - 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html', "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html", + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html', 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-editor-notes-mj.html', //Items 'systems/foundryvtt-reve-de-dragon/templates/item-competence-sheet.html', @@ -471,7 +475,7 @@ export class RdDUtility { const isConteneur = objet.type == 'conteneur'; const isOuvert = isConteneur && this.getAfficheContenu(objet._id); const isVide = isConteneur && Misc.templateData(objet).contenu.length == 0; - const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-conteneur.html']({ + const conteneur = Handlebars.partials['systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-item.html']({ item: objet, vide: isVide, ouvert: isOuvert diff --git a/styles/simple.css b/styles/simple.css index 6d158832..75742656 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -225,6 +225,26 @@ table {border: 1px solid #7a7971;} flex-grow : 3; } /* Styles limited to foundryvtt-reve-de-dragon sheets */ +.equipement-nom { + flex-grow : 4; + margin: 0; + justify-content: center; + text-align: left; +} +.equipement-detail { + margin: 0; + flex: 'flex-shrink' ; + align-items: center; + justify-content: center; + text-align: center; +} +.equipement-actions { + margin: 0; + flex-grow: 2; + align-items: center; + justify-content: center; + text-align: left; +} .foundryvtt-reve-de-dragon .sheet-header { -webkit-box-flex: 0; @@ -713,8 +733,8 @@ ul, li { } .sheet li { - margin: 0.125rem; - padding: 0.25rem; + margin: 0.1rem; + padding: 0.2rem; } .header-fields li { margin: 0; @@ -747,7 +767,9 @@ ul, li { .fa-arrow-alt-circle-up.allouer-stress-level-up { color: rgba(191, 149, 63, 0.8); } - +i.fas, i.far { + font-size: smaller; +} .blessures-list ul { display: flex; } @@ -766,18 +788,18 @@ ul, li { font-weight: bold; } .list-item { - margin: 0.125rem; + margin: 0.1rem; box-shadow: inset 0px 0px 1px #00000096; border-radius: 0.25rem; - padding: 0.125rem; + padding: 0.1rem; flex: 1 1 5rem; display: flex !important; - align-items: baseline !important; + align-items: center !important; } .table-row { - margin: 0.125rem; - padding: 0.125rem; + margin: 0.1rem; + padding: 0.1rem; flex: 1 1 5rem; } @@ -801,8 +823,11 @@ ul, li { background: rgb(200, 10, 100, 0.25); } -.item-quantite { - margin-left: 0.5rem; +.item-column { + margin-left: 0.2rem; + margin-right: 0.2rem; + justify-content: center; + text-align: center; } .list-item-margin1 { @@ -872,20 +897,20 @@ ul, li { .competence-value { flex-grow: 0; flex-basis: 2rem; - margin-right: 0.25rem; - margin-left: 0.25rem; + margin-right: 0.2rem; + margin-left: 0.2rem; } .description-value { flex-grow: 0; flex-basis: 4rem; - margin-right: 0.25rem; - margin-left: 0.25rem; + margin-right: 0.2rem; + margin-left: 0.2rem; } .competence-xp { flex-grow: 0; flex-basis: 2rem; - margin-right: 0.25rem; - margin-left: 0.25rem; + margin-right: 0.2rem; + margin-left: 0.2rem; } .blessures-title { font-weight: bold; diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html index b9d3e4d0..99782371 100644 --- a/templates/actor-creature-sheet.html +++ b/templates/actor-creature-sheet.html @@ -126,35 +126,7 @@ {{!-- Equipment Tab --}}
- - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}} - -

Equipement porté

 - Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} {{calc.surEncombrementMessage}} - - Créer un objet - {{#if options.isGM}} - - Vider tout les conteneurs - {{/if}} - - + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}}
{{!-- Biography Tab --}} diff --git a/templates/actor-sheet-inventaire-conteneur.html b/templates/actor-sheet-inventaire-item.html similarity index 65% rename from templates/actor-sheet-inventaire-conteneur.html rename to templates/actor-sheet-inventaire-item.html index a1c624d2..e46f8745 100644 --- a/templates/actor-sheet-inventaire-conteneur.html +++ b/templates/actor-sheet-inventaire-item.html @@ -1,37 +1,33 @@
  • - {{#if (eq item.type 'conteneur')}} - + + {{#if (eq item.type 'conteneur')}} {{#if vide}} - + {{else}} {{#if ouvert}} - {{else}} - {{/if}} {{/if}} - - - {{item.name}} + {{item.name}} - - {{else}} - - {{item.name}} - {{/if}} - {{item.data.quantite}} + {{else}} + + {{item.name}} + {{/if}} + + {{item.data.quantite}} {{#if (gt item.data.quantite 1)}} {{/if}} - {{numberFormat item.data.encTotal decimals=2}} -
    + {{numberFormat item.data.encTotal decimals=2}} + {{#unless item.estContenu}} {{#if (ne item.type 'conteneur')}} {{#if item.data.equipe}}{{else}}{{/if}} @@ -39,14 +35,14 @@ {{/unless}} - {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}}   + {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}} {{/if}} {{#if item.data.actionPrincipale}} - {{item.data.actionPrincipale}} + {{item.data.actionPrincipale}} {{/if}} -
    +
    • diff --git a/templates/actor-sheet-inventaire-monnaie.html b/templates/actor-sheet-inventaire-monnaie.html index d73224b2..0921720c 100644 --- a/templates/actor-sheet-inventaire-monnaie.html +++ b/templates/actor-sheet-inventaire-monnaie.html @@ -3,16 +3,26 @@ {{#each monnaie as |piece id|}}
  • - {{piece.name}} - {{piece.data.quantite}} - - + - - + {{piece.name}} + + -
    + + {{piece.data.quantite}} + + + + + + + -
    +
    • {{/each}} diff --git a/templates/actor-sheet-inventaire.html b/templates/actor-sheet-inventaire.html new file mode 100644 index 00000000..c14600ae --- /dev/null +++ b/templates/actor-sheet-inventaire.html @@ -0,0 +1,26 @@ +{{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}} + +

    Equipement

     +Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} {{calc.surEncombrementMessage}} - +Créer un objet +{{#if options.isGM}} + - Vider tout les conteneurs +{{/if}} + diff --git a/templates/actor-sheet-liens-animaux.html b/templates/actor-sheet-liens-animaux.html new file mode 100644 index 00000000..c9b6aa92 --- /dev/null +++ b/templates/actor-sheet-liens-animaux.html @@ -0,0 +1,12 @@ +

    Compagnons animaux

     + diff --git a/templates/actor-sheet-liens-suivants.html b/templates/actor-sheet-liens-suivants.html new file mode 100644 index 00000000..4ee37e0a --- /dev/null +++ b/templates/actor-sheet-liens-suivants.html @@ -0,0 +1,12 @@ +

    Suivants

     + diff --git a/templates/actor-sheet-liens-vehicules.html b/templates/actor-sheet-liens-vehicules.html new file mode 100644 index 00000000..6951d70f --- /dev/null +++ b/templates/actor-sheet-liens-vehicules.html @@ -0,0 +1,15 @@ +

    Véhicules

     + + diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index f65df255..62c01be6 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -666,79 +666,10 @@ {{!-- Equipment Tab --}}
    - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}} - -

    Equipement porté

     -
    - Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.attributs.encombrement.value}} {{calc.surEncombrementMessage}} - - Estimation de l'équipement : {{numberFormat calc.prixTotalEquipement decimals=2}} Sols -
    -
    - Créer un objet - {{#if options.isGM}} - - Vider tout les conteneurs - {{/if}} -
    - - -

    Compagnons animaux

     - - -

    Véhicules

     - - -

    Suivants

     - + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-animaux.html"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-suivants.html"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-liens-vehicules.html"}}
    diff --git a/templates/actor-vehicule-sheet.html b/templates/actor-vehicule-sheet.html index 1e645e71..7b27166e 100644 --- a/templates/actor-vehicule-sheet.html +++ b/templates/actor-vehicule-sheet.html @@ -69,47 +69,9 @@ {{!-- Equipment Tab --}}
    - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire-monnaie.html" monnaie=monnaie}} - -

    Equipement chargé

     - - Encombrement total/max : {{numberFormat calc.encTotal decimals=2}} / {{data.capacite_encombrement}} {{calc.surEncombrementMessage}} - - Créer un objet - {{#if options.isGM}} - - Vider tout les conteneurs - {{/if}} - -
    - + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html"}} + {{!-- Biography Tab --}}
    diff --git a/templates/item-conteneur-sheet.html b/templates/item-conteneur-sheet.html index 06bce9e1..3cf93108 100644 --- a/templates/item-conteneur-sheet.html +++ b/templates/item-conteneur-sheet.html @@ -29,11 +29,10 @@
    • - - Nom - Q. - Enc. - Equiper/Editer/Suppr. + Nom + Q. + Enc. + Actions
      • {{buildContenu this}}
    -- 2.35.3 From 049b23c666011c905f69765b951ff6546991d14b Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 16:23:48 +0200 Subject: [PATCH 2/7] Boutons +/- de fontawsome --- templates/actor-sheet.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 62c01be6..37b97ee8 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -12,38 +12,38 @@
    • -- 2.35.3 From 6e361a5531f722b6459e827f20a2a11d9039d7a5 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 22:45:26 +0200 Subject: [PATCH 3/7] =?UTF-8?q?Ne=20pas=20raffra=C3=AEchir=20si=20le=20tex?= =?UTF-8?q?t=20ne=20change=20pas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/actor-sheet.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index 09f497c9..d8bd89d6 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -432,14 +432,17 @@ export class RdDActorSheet extends ActorSheet { } }) .keyup(async event => { - this.options.recherche = this._optionRecherche(event.currentTarget) - if (this.timerRecherche) { - clearTimeout(this.timerRecherche); + const nouvelleRecherche = this._optionRecherche(event.currentTarget); + if (this.options.recherche?.text != nouvelleRecherche?.text){ + this.options.recherche = nouvelleRecherche; + if (this.timerRecherche) { + clearTimeout(this.timerRecherche); + } + this.timerRecherche = setTimeout(() => { + this.timerRecherche = undefined; + this.render(true); + }, 500); } - this.timerRecherche = setTimeout(() => { - this.timerRecherche = undefined; - this.render(true); - }, 500); }) .change(async event => this.options.recherche = this._optionRecherche(event.currentTarget) -- 2.35.3 From e4da1245799f72e0d919b74e4a445296d9972b24 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 22:48:08 +0200 Subject: [PATCH 4/7] =?UTF-8?q?Filtrer=20les=20cat=C3=A9gories=20sans=20co?= =?UTF-8?q?mp=C3=A9tences?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- module/rdd-utility.js | 60 ++++++++++--------- ...r-sheet-categorie-competences-partial.html | 56 +++++++++-------- 2 files changed, 61 insertions(+), 55 deletions(-) diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 3b927d64..e16f28db 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -239,36 +239,38 @@ export class RdDUtility { Handlebars.registerHelper('typeTmr-name', coord => TMRUtility.typeTmrName(coord)); Handlebars.registerHelper('min', (...args) => Math.min(...args.slice(0, -1))); - Handlebars.registerHelper('sortCompetence', competences => competences.sort((a, b) => { - if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) { - if (a.name.includes("Cité")) return -1; - if (b.name.includes("Cité")) return 1; - if (a.name.includes("Extérieur")) return -1; - if (b.name.includes("Extérieur")) return 1; + Handlebars.registerHelper('filtreTriCompetences', competences => competences.filter(it => it.visible) + .sort((a, b) => { + if (a.name.startsWith("Survie") && b.name.startsWith("Survie")) { + if (a.name.includes("Cité")) return -1; + if (b.name.includes("Cité")) return 1; + if (a.name.includes("Extérieur")) return -1; + if (b.name.includes("Extérieur")) return 1; + return a.name.localeCompare(b.name); + } + if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) { + if (a.name.includes("Corps")) return -1; + if (b.name.includes("Corps")) return 1; + if (a.name.includes("Dague")) return -1; + if (b.name.includes("Dague")) return 1; + if (a.name.includes("Esquive")) return -1; + if (b.name.includes("Esquive")) return 1; + return a.name.localeCompare(b.name); + } + if (a.name.startsWith("Voie") && b.name.startsWith("Voie")) { + if (a.name.includes("Oniros")) return -1; + if (b.name.includes("Oniros")) return 1; + if (a.name.includes("Hypnos")) return -1; + if (b.name.includes("Hypnos")) return 1; + if (a.name.includes("Narcos")) return -1; + if (b.name.includes("Narcos")) return 1; + if (a.name.includes("Thanatos")) return -1; + if (b.name.includes("Thanatos")) return 1; + return a.name.localeCompare(b.name); + } return a.name.localeCompare(b.name); - } - if (a.data.categorie.startsWith("melee") && b.data.categorie.startsWith("melee")) { - if (a.name.includes("Corps")) return -1; - if (b.name.includes("Corps")) return 1; - if (a.name.includes("Dague")) return -1; - if (b.name.includes("Dague")) return 1; - if (a.name.includes("Esquive")) return -1; - if (b.name.includes("Esquive")) return 1; - return a.name.localeCompare(b.name); - } - if (a.name.startsWith("Voie") && b.name.startsWith("Voie")) { - if (a.name.includes("Oniros")) return -1; - if (b.name.includes("Oniros")) return 1; - if (a.name.includes("Hypnos")) return -1; - if (b.name.includes("Hypnos")) return 1; - if (a.name.includes("Narcos")) return -1; - if (b.name.includes("Narcos")) return 1; - if (a.name.includes("Thanatos")) return -1; - if (b.name.includes("Thanatos")) return 1; - return a.name.localeCompare(b.name); - } - return a.name.localeCompare(b.name); - })); + }) + ); return loadTemplates(templatePaths); } diff --git a/templates/actor-sheet-categorie-competences-partial.html b/templates/actor-sheet-categorie-competences-partial.html index 75ea7bd4..26d7a1db 100644 --- a/templates/actor-sheet-categorie-competences-partial.html +++ b/templates/actor-sheet-categorie-competences-partial.html @@ -1,27 +1,31 @@ -
    - {{categorie}} -
    -
      - {{#if @root.options.vueDetaillee}} -
    • - - - Niv. - xp - {{#if (eq categorie 'Draconic')}} - sort - {{/if}} -
      - - Arch - - {{#if @root.options.isGM}} - +{{#if competences}} +
      +
      + {{categorie}} +
      +
        + {{#if @root.options.vueDetaillee}} +
      • + + + Niv. + xp + {{#if (eq categorie 'Draconic')}} + sort {{/if}} -
      -
      • - {{/if}} - {{#each competences as |comp key|}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}} - {{/each}} -
    +
    + + Arch + + {{#if @root.options.isGM}} + + {{/if}} +
    + + {{/if}} + {{#each competences as |comp key|}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-competence-partial.html" comp}} + {{/each}} + +
    +{{/if}} -- 2.35.3 From dbf9f5e9085e9c40f5feb0d20e1c19aae9ad5ed8 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 22:58:26 +0200 Subject: [PATCH 5/7] =?UTF-8?q?Am=C3=A9liorations=20des=20boutons=20fontaw?= =?UTF-8?q?esome&css?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/simple.css | 90 ++++++++----------- templates/actor-blessure-partial.html | 2 +- templates/actor-creature-sheet.html | 4 +- templates/actor-entite-sheet.html | 8 +- templates/actor-sheet-competence-partial.html | 10 +-- templates/actor-sheet-inventaire-item.html | 14 +-- templates/actor-sheet-inventaire-monnaie.html | 10 +-- templates/actor-sheet-liens-animaux.html | 2 +- templates/actor-sheet-liens-suivants.html | 2 +- templates/actor-sheet-liens-vehicules.html | 2 +- templates/actor-sheet-oeuvre-partial.html | 4 +- templates/actor-sheet.html | 84 +++++++++-------- 12 files changed, 109 insertions(+), 123 deletions(-) diff --git a/styles/simple.css b/styles/simple.css index 75742656..e279bf05 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -65,7 +65,11 @@ --debug-box-shadow-blue: inset 0 0 2px blue; --debug-box-shadow-green: inset 0 0 2px green; -/* =================== 3. some constants ============ */ +/* =================== 3. some constants ============ */ + --color-controls:rgba(0, 0, 0, 0.9); + --color-controls-hover:rgba(255, 255, 128, 0.7); + --color-control-border-hover:rgba(255, 128, 0, 0.8); + --color-gold: rgba(191, 149, 63, 0.8); --gradient-gold: linear-gradient(30deg, rgba(191, 149, 63, 0.3), rgba(252, 246, 186, 0.3), rgba(179, 135, 40, 0.3), rgba(251, 245, 183, 0.3), rgba(170, 119, 28, 0.3)); --gradient-silver: linear-gradient(30deg, rgba(61, 55, 93, 0.3), rgba(178, 179, 196, 0.3), rgba(59, 62, 63, 0.6), rgba(206, 204, 199, 0.3), rgba(61, 46, 49, 0.3)); --gradient-green: linear-gradient(30deg, rgba(7, 76, 0, 0.3), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.1), rgba(66, 163, 65, 0.2), rgba(184, 226, 163, 0.3)); @@ -104,6 +108,9 @@ .strong-text{ font-weight: bold; } +i:is(.fas, .far) { + font-size: smaller; +} .tabs .item.active, .blessures-list li ul li:first-child:hover, a:hover { text-shadow: 1px 0px 0px #ff6600; @@ -286,14 +293,8 @@ table {border: 1px solid #7a7971;} height: 8%; max-height: 48px; border-width: 0; - border: 1px solid rgba(0, 0, 0, 0); + border: 1px solid rgba(0, 0, 0, 0); } -.button-img:hover { - color: rgba(255, 255, 128, 0.7); - border: 1px solid rgba(255, 128, 0, 0.8); - cursor: pointer; -} - .button-effect-img { vertical-align: baseline; width: 16px; @@ -301,9 +302,16 @@ table {border: 1px solid #7a7971;} height: 16; border-width: 0; } -.button-effect-img:hover { - color: rgba(255, 255, 128, 0.7); - border: 1px solid rgba(255, 128, 0, 0.8); +.small-button-direction { + height: 32px; + width: 32px; + border: 0; + vertical-align: bottom; +} +:is(.button-img,.button-effect-img:hover,.small-button-direction):hover { + color: var(--color-controls-hover); + border: 1px solid var(--color-control-border-hover); + text-shadow: 1px 0px 0px #ff6600; cursor: pointer; } @@ -314,18 +322,6 @@ table {border: 1px solid #7a7971;} vertical-align: bottom; } -.small-button-direction { - height: 32px; - width: 32px; - border: 0; - vertical-align: bottom; -} -.small-button-direction:hover { - color: rgba(255, 255, 128, 0.7); - border: 1px solid rgba(255, 128, 0, 0.8); - cursor: pointer; -} - .foundryvtt-reve-de-dragon .sheet-header .header-fields { -webkit-box-flex: 1; -ms-flex: 1; @@ -489,13 +485,18 @@ table {border: 1px solid #7a7971;} flex: 0 0 86px; text-align: right; } - .competence-list .item-controls { display: contents !important; } .competence-list .item-controls.hidden-controls { display: none !important; } +.item-controls i:is(.fas,.far) { + color: var(--color-controls); +} +.item-controls i:is(.fas,.far):hover { + opacity: 0.7 ; +} .rdddialog .dialog-roll-sort s{ width: 600px; @@ -647,11 +648,15 @@ section.sheet-body:after { .sheet header.sheet-header .flex-compteurs {text-align: right;} .sheet header.sheet-header .resource-content {width: 2rem;} -.ctn-vie span, .ctn-endu span, .ctn-fatigue span, .ctn-reve span { +.compteur span { display: inline-block; text-align: left; width: 2rem; } +.compteur a i:is(.fas,.far):hover { + opacity: 0.7 ; +} + .select-diff { display: inline-block; text-align: left; @@ -664,17 +669,6 @@ section.sheet-body:after { max-width: 90%; } -.plus-moins { - display: inline-block; - width: 1.25rem; - background: rgba(30, 25, 20, 1); - text-align: center; - border: 1px solid rgba(72, 46, 28, 1); - border-radius: 0.25rem; - line-height: 1.25rem; - color: rgba(255, 255, 255, 0.5); -} - .alchimie-tache { font-weight: bold; background: rgb(182, 180, 179); @@ -761,14 +755,8 @@ ul, li { .niveau-archetype { background: var(--gradient-silver-light) !important; } -.fa-arrow-alt-circle-up.allouer-stress { - color: rgba(83, 60, 14, 0.8); -} -.fa-arrow-alt-circle-up.allouer-stress-level-up { - color: rgba(191, 149, 63, 0.8); -} -i.fas, i.far { - font-size: smaller; +.item-controls i.fas.allouer-stress.level-up { + color: var(--color-gold); } .blessures-list ul { display: flex; @@ -1006,7 +994,7 @@ i.fas, i.far { border-left: none; font-weight: 500; font-size: 1rem; - color: black; + color: var(--color-controls); padding-top: 5px; margin-right: 0px; width: 45px; @@ -1184,11 +1172,11 @@ i.fas, i.far { border-image-width: 4px; border-image-outset: 0px; } - #controls .control-tools { - max-height: calc(100vh - 156px); - height: auto; +#controls .control-tools { + max-height: calc(100vh - 156px); + height: auto; } -#controls .scene-control.active, #controls .control-tool.active, #controls .scene-control:hover, #controls .control-tool:hover { +#controls :is(.scene-control.active,.control-tool.active, .scene-control:hover, .control-tool:hover) { background: rgba(72, 46, 28, 1); background-origin: padding-box; border-image: url(img/ui/footer-button.webp) 10 repeat; @@ -1374,8 +1362,8 @@ i.fas, i.far { color: rgba(255, 255, 255, 0.5); } .calendar-btn:hover { - color: rgba(255, 255, 128, 0.7); - border: 1px solid rgba(255, 128, 0, 0.8); + color: var(--color-controls-hover); + border: 1px solid var(--color-control-border-hover); cursor: pointer; } diff --git a/templates/actor-blessure-partial.html b/templates/actor-blessure-partial.html index 57ee004f..d475751b 100644 --- a/templates/actor-blessure-partial.html +++ b/templates/actor-blessure-partial.html @@ -1,5 +1,5 @@ - + {{#if bless.active}} {{else}} diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html index 99782371..571b2086 100644 --- a/templates/actor-creature-sheet.html +++ b/templates/actor-creature-sheet.html @@ -108,8 +108,8 @@
    - - + +
    {{/each}} diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html index 455d795e..67b27dee 100644 --- a/templates/actor-entite-sheet.html +++ b/templates/actor-entite-sheet.html @@ -104,8 +104,8 @@
    - - + +
    {{/each}} @@ -118,8 +118,8 @@ {{possession.name}}
    - - + +
    {{/each}} diff --git a/templates/actor-sheet-competence-partial.html b/templates/actor-sheet-competence-partial.html index ff294648..614e8b13 100644 --- a/templates/actor-sheet-competence-partial.html +++ b/templates/actor-sheet-competence-partial.html @@ -7,7 +7,7 @@ {{#if data.isLevelUp}} Vous pouvez dépenser {{data.xpNext}} points d'Experience pour augmenter de 1 votre compétence {{name}} - + {{/if}} @@ -31,9 +31,9 @@ {{#if @root.options.vueDetaillee}}
    {{#if data.stressXpMax}} - - + {{else}} @@ -41,9 +41,9 @@ - + {{#if @root.options.isGM}} - + {{/if}}
    {{/if}} diff --git a/templates/actor-sheet-inventaire-item.html b/templates/actor-sheet-inventaire-item.html index e46f8745..fe9a9d89 100644 --- a/templates/actor-sheet-inventaire-item.html +++ b/templates/actor-sheet-inventaire-item.html @@ -23,23 +23,23 @@ {{item.data.quantite}} {{#if (gt item.data.quantite 1)}} - + {{/if}} {{numberFormat item.data.encTotal decimals=2}} - + {{#unless item.estContenu}} {{#if (ne item.type 'conteneur')}} - {{#if item.data.equipe}}{{else}}{{/if}} + {{#if item.data.equipe}}{{else}}{{/if}} {{/if}} {{/unless}} - - + +   {{#if (or (eq item.type 'arme') (eq item.type 'conteneur') item.data.quantite)}} - + {{/if}} - + {{#if item.data.actionPrincipale}} {{item.data.actionPrincipale}} {{/if}} diff --git a/templates/actor-sheet-inventaire-monnaie.html b/templates/actor-sheet-inventaire-monnaie.html index 0921720c..3e203359 100644 --- a/templates/actor-sheet-inventaire-monnaie.html +++ b/templates/actor-sheet-inventaire-monnaie.html @@ -4,13 +4,13 @@
  • {{piece.name}} - + {{piece.data.quantite}} - + @@ -19,9 +19,9 @@ {{piece.data.quantite}} --> - - - + + +
    • {{/each}} diff --git a/templates/actor-sheet-liens-animaux.html b/templates/actor-sheet-liens-animaux.html index c9b6aa92..284d0a7d 100644 --- a/templates/actor-sheet-liens-animaux.html +++ b/templates/actor-sheet-liens-animaux.html @@ -5,7 +5,7 @@ {{monture.name}}
    - +
    {{/each}} diff --git a/templates/actor-sheet-liens-suivants.html b/templates/actor-sheet-liens-suivants.html index 4ee37e0a..91d28e58 100644 --- a/templates/actor-sheet-liens-suivants.html +++ b/templates/actor-sheet-liens-suivants.html @@ -5,7 +5,7 @@ {{suivant.name}}
    - +
    {{/each}} diff --git a/templates/actor-sheet-liens-vehicules.html b/templates/actor-sheet-liens-vehicules.html index 6951d70f..a95d61bf 100644 --- a/templates/actor-sheet-liens-vehicules.html +++ b/templates/actor-sheet-liens-vehicules.html @@ -7,7 +7,7 @@ {{vehicule.categorie}} {{vehicule.structure}}
    - +
    {{/each}} diff --git a/templates/actor-sheet-oeuvre-partial.html b/templates/actor-sheet-oeuvre-partial.html index 4492568d..474ce5f8 100644 --- a/templates/actor-sheet-oeuvre-partial.html +++ b/templates/actor-sheet-oeuvre-partial.html @@ -4,8 +4,8 @@ {{oeuvre.name}} (niveau {{oeuvre.data.niveau}})
    - - + +
    diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 37b97ee8..b9ced891 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -10,7 +10,7 @@
    - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.generale) categorie="Compétences générales"}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.particuliere) categorie="Compétences Particulières"}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.specialisee) categorie="Compétences Spécialisées"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.generale) categorie="Compétences générales"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.particuliere) categorie="Compétences Particulières"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.specialisee) categorie="Compétences Spécialisées"}}
    - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.melee) categorie="Compétences de Mêlée"}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.tir) categorie="Compétences de Tir"}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.lancer) categorie="Compétences de Lancer"}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.connaissance) categorie="Connaissances"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.melee) categorie="Compétences de Mêlée"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.tir) categorie="Compétences de Tir"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.lancer) categorie="Compétences de Lancer"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.connaissance) categorie="Connaissances"}} {{#if (or data.attributs.hautrevant.value options.vueDetaillee)}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(sortCompetence competenceByCategory.draconic) categorie="Draconic"}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html" competences=(filtreTriCompetences competenceByCategory.draconic) categorie="Draconic"}} {{/if}}
    @@ -349,8 +347,8 @@ {{/if}}
    - - + +
    {{/each}} @@ -372,8 +370,8 @@ {{possession.data.type}}
    - - + +
    {{/each}} @@ -391,8 +389,8 @@ (or @root.options.isGM (not tache.data.cacher_points_de_tache)) }}/{{tache.data.points_de_tache}}{{/if}})
    - - + +
    {{/each}} @@ -421,8 +419,8 @@ {{#each jeux as |jeu id|}}
  • {{jeu.name}} (base {{jeu.data.base}})
    - - + +
    • {{/each}} @@ -432,8 +430,8 @@ {{#each recettesAlchimiques as |recette id|}}
  • {{recette.name}}
    - - + +
    • {{/each}} @@ -519,7 +517,7 @@
  • {{queue.name}}
    - +
    • {{/each}} @@ -532,7 +530,7 @@
  • {{ombre.name}}
    - +
    • {{/each}} @@ -545,7 +543,7 @@
  • {{souffle.name}}
    - +
    • {{/each}} @@ -558,7 +556,7 @@
  • {{tete.name}}
    - +
    • {{/each}} @@ -573,7 +571,7 @@ {{signe.name}} {{signe.data.difficulte}}
    - +
    {{/each}} @@ -591,7 +589,7 @@ {{upperFirst rencontre.heure}}, le {{rencontre.date}} {{/if}}
    - +
    {{/each}} @@ -606,7 +604,7 @@ {{reserve.sort.name}} r{{reserve.sort.data.ptreve_reel}} {{reserve.coord}} - {{caseTmr-label reserve.coord}}
    - +
    {{/each}} @@ -626,7 +624,7 @@ {{sort.data.draconic}} / {{sort.data.difficulte}}
    - +
    {{/each}} @@ -638,8 +636,8 @@
  • {{meditation.name}} - {{meditation.data.competence}}
    - - + +
    • {{/each}} @@ -653,7 +651,7 @@ {{casetmr.name}} {{casetmr.data.coord}} - {{caseTmr-label casetmr.data.coord}}
    - +
    {{/each}} -- 2.35.3 From f348f3dc3fe2bcb6dd24617ebb3603549795f77e Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 23:14:16 +0200 Subject: [PATCH 6/7] =?UTF-8?q?Condenser=20les=20listes=20(sauf=20caract?= =?UTF-8?q?=C3=A9ristiques?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- styles/simple.css | 33 ++++++++++++++++------------- templates/actor-entite-sheet.html | 10 ++++----- templates/actor-sheet.html | 17 ++++++++------- templates/actor-vehicule-sheet.html | 16 +++++++------- 4 files changed, 40 insertions(+), 36 deletions(-) diff --git a/styles/simple.css b/styles/simple.css index e279bf05..275c3375 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -362,25 +362,25 @@ table {border: 1px solid #7a7971;} flex-grow: 0; } -.rdd.sheet .window-content .sheet-body .carac-list .competence { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique { flex-wrap: nowrap; justify-content: stretch; } -.rdd.sheet .window-content .sheet-body .carac-list .competence > .carac-label { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .carac-label { flex-basis: 50%; } -.rdd.sheet .window-content .sheet-body .carac-list .competence > .attribut-label { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .attribut-label { flex-basis: 50%; } -.rdd.sheet .window-content .sheet-body .carac-list .competence > .competence-value.total { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .competence-value.total { flex-grow: 1; text-align: right; } -.rdd.sheet .window-content .sheet-body .carac-list .competence > .utiliser-attribut { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > .utiliser-attribut { flex-basis: available; flex-grow: 1; } -.rdd.sheet .window-content .sheet-body .carac-list .competence > * { +.rdd.sheet .window-content .sheet-body .carac-list .caracteristique > * { flex-basis: 13%; flex-grow: 0; } @@ -588,7 +588,7 @@ table {border: 1px solid #7a7971;} color: rgba(255, 255, 255, 0.75); background: rgba(255, 255, 255, 0.05); border: 0 none; - margin-bottom: 0.25rem; + margin-bottom: 0.2rem; } .window-app .window-content, .window-app.sheet .window-content .sheet-body{ @@ -622,7 +622,7 @@ section.sheet-body{padding: 0.25rem 0.5rem;} nav.sheet-tabs .item { position: relative; - padding: 0 0.25rem; + padding: 0 0.2rem; } nav.sheet-tabs .item:after { @@ -725,11 +725,14 @@ ul, ol { ul, li { list-style-type: none; } - -.sheet li { +.sheet .caracteristique li { margin: 0.1rem; padding: 0.2rem; } +.sheet li { + margin: 0.1rem; + padding: 0.1rem; +} .header-fields li { margin: 0; padding: 0; @@ -745,10 +748,10 @@ ul, li { background: rgb(160, 130, 100, 0.05); } .xp-level-up { - margin: 0.125rem; + margin: 0.1rem; box-shadow: inset 0px 0px 1px #00000096; border-radius: 0.25rem; - padding: 0.125rem; + padding: 0.1rem; flex: 1 1 5rem; background: var(--gradient-gold) !important; } @@ -841,7 +844,7 @@ ul, li { width: 24px; height: 24px; flex-grow: 0; - margin-right: 0.25rem; + margin-right: 0.2rem; vertical-align: bottom; } .competence-column { @@ -976,7 +979,7 @@ ul, li { flex-basis: auto; padding: 0; line-height: 1rem; - margin: 0.25rem; + margin: 0.2rem; } .control-icon.tokenhudicon.right { margin-left: 8px; @@ -1094,7 +1097,7 @@ ul, li { .sidebar-tab .directory-list .entity { border-top: 1px dashed rgba(0,0,0,0.25); border-bottom: 0 none; - padding: 0.25rem 0; + padding: 0.2rem 0; } .sidebar-tab .directory-list .entity:hover { diff --git a/templates/actor-entite-sheet.html b/templates/actor-entite-sheet.html index 67b27dee..3725c03f 100644 --- a/templates/actor-entite-sheet.html +++ b/templates/actor-entite-sheet.html @@ -33,7 +33,7 @@
      {{#each data.carac as |carac key|}} -
    1. +
    2. {{#if (eq key 'taille')}} {{carac.label}} {{else}} @@ -50,7 +50,7 @@
        -
      1. +
      2. Catégorie :
        3. -
      3. +
      4. Type d'entité :
        5. {{#each data.attributs as |attr key|}} -
      5. +
      6. {{attr.label}} :
        7. {{/each}} -
      7. +
      8. Endurance : / diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index b9ced891..4e20af8c 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -102,9 +102,9 @@
          {{#each data.carac as |carac key|}} {{#if carac.isLevelUp}} -
        • +
        • {{else}} -
        • +
        • {{/if}} {{#if (eq key 'taille')}} {{carac.label}} @@ -139,22 +139,23 @@ {{/if}}
          • {{/each}} -
        • +
        • Total Caractéristiques {{calc.caracTotal}}
          • -
        +
        -
      • +
      • Beauté :
        • {{#each data.attributs as |attr key|}} + {{log 'key hautrevant' key}} {{#unless (eq key 'hautrevant')}} -
      • +
      • {{attr.label}} : {{#if (eq key 'protection')}} @@ -167,7 +168,7 @@ {{/each}}
        -
      • +
      • Chance actuelle Utiliser @@ -176,7 +177,7 @@ {{#if (eq compteur.label 'Chance')}} {{else if (eq compteur.label 'Experience')}} {{else if compteur.isInput}} -
      • +
      • {{compteur.label}} {{#if (eq compteur.label 'Ethylisme')}} {{#select data.categorie}} @@ -33,31 +33,31 @@ {{/select}}
        • -
      • +
      • Résistance
        • -
      • +
      • Structure
        • -
      • +
      • Vitesse
        • -
      • +
      • Bonus
        • -
      • +
      • Manoeuvrabilité
        • -
      • +
      • Equipage
        • -
      • +
      • Capacité d'Encombrement
        • -- 2.35.3 From bb3bc0ea77af22aeff4a3088a4a6a7a63fba2d44 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Sat, 27 Aug 2022 23:17:05 +0200 Subject: [PATCH 7/7] Suppression logs hbs --- templates/actor-sheet.html | 1 - templates/hud-actor-init.html | 1 - 2 files changed, 2 deletions(-) diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 4e20af8c..0e7f103a 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -153,7 +153,6 @@