From 02ccb1f287cf915f14bf28ea004441bad0a25155 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Mon, 26 Sep 2022 02:23:07 +0200 Subject: [PATCH] Nouvelle visualisation des blessures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Extractions des parties de la feuille pour préparer la possibilité de proposer une autre fiche --- module/actor-sheet.js | 2 +- module/rdd-utility.js | 5 +- styles/simple.css | 74 +++++++------ templates/actor-blessure-partial.html | 27 ----- templates/actor-creature-sheet.html | 2 +- templates/actor-liste-blessures-partial.html | 28 ----- templates/actor-sheet-blessure.html | 27 +++++ templates/actor-sheet-blessures.html | 19 ++++ templates/actor-sheet-combat.html | 41 +++++++ templates/actor-sheet.html | 107 +------------------ 10 files changed, 139 insertions(+), 193 deletions(-) delete mode 100644 templates/actor-blessure-partial.html delete mode 100644 templates/actor-liste-blessures-partial.html create mode 100644 templates/actor-sheet-blessure.html create mode 100644 templates/actor-sheet-blessures.html create mode 100644 templates/actor-sheet-combat.html diff --git a/module/actor-sheet.js b/module/actor-sheet.js index f0b50731..fb21e9e6 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -244,7 +244,7 @@ export class RdDActorSheet extends ActorSheet { }); // Blessure data - html.find('.blessures-soins').change(async event => { + html.find('.blessure-soins').change(async event => { const tr = $(event.currentTarget).parents(".item"); let btype = tr.data('blessure-type'); let index = tr.data('blessure-index'); diff --git a/module/rdd-utility.js b/module/rdd-utility.js index 11a766a3..905694ff 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -119,8 +119,9 @@ export class RdDUtility { 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-categorie-competences-partial.html', 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-effects-partial.html', 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-oeuvre-partial.html', - 'systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html', - 'systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-combat.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html', + 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessure.html', 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-queues.html', // Conteneur/item in Actor sheet 'systems/foundryvtt-reve-de-dragon/templates/actor-sheet-inventaire.html', diff --git a/styles/simple.css b/styles/simple.css index c9924ad1..70c7a19c 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -252,6 +252,49 @@ table {border: 1px solid #7a7971;} justify-content: center; text-align: left; } +.blessure-control { + flex-grow: 1; + flex-direction: row; +} +.blessure-soins { + flex-direction: row; + align-content: flex-start; + justify-content: flex-start; + margin-right: 2px; + margin-left: 2px; + padding: 2px; +} +input:is(.blessure-psdone, .blessure-scdone) { + width: 20px; +} +input:is(.blessure-premiers_soins, .blessure-soins_complets) { + width: calc(100% - 25px); +} +.blessure-jours { + flex-direction: row; + align-content: flex-start; + justify-content: flex-start; +} +.blessure-localisation { + flex-direction: row; + align-content: flex-start; + justify-content: flex-start; +} +.blessure-inactive { + color:rgba(150, 150, 150, 0.4); +} +.blessure-active-legere { + color:rgba(60, 60, 60, 0.9); + text-shadow: 1px 1px 4px rgba(60, 60, 60, 1); +} +.blessure-active-grave { + color: rgba(218, 126, 21, 0.9); + text-shadow: 1px 1px 4px rgba(60, 60, 60, 1); +} +.blessure-active-critique { + color: rgba(173, 36, 26, 0.9); + text-shadow: 1px 1px 4px rgba(60, 60, 60, 1); +} .foundryvtt-reve-de-dragon .sheet-header { -webkit-box-flex: 0; @@ -450,20 +493,6 @@ table {border: 1px solid #7a7971;} border-bottom: 1px solid #BBB; } -.blessure-inactive { - color:rgba(150, 150, 150, 0.4) -} -.blessure-active-legere { - color:rgba(60, 60, 60, 0.9); - text-shadow: rgba(60, 60, 60, 0.7); -} -.blessure-active-grave { - color:rgba(218, 126, 21, 0.9); -} -.blessure-active-critique { - color:rgba(173, 36, 26, 0.9); - -} .foundryvtt-reve-de-dragon .items-list .item .item-image { -webkit-box-flex: 0; -ms-flex: 0 0 24px; @@ -926,23 +955,6 @@ ul, li { .alchimie-title { font-weight: bold; } -.blessure-data { - flex-direction: row; - align-content: flex-start; - justify-content: flex-start; -} -.blessures-soins { - flex-grow: 0; - flex-basis: 32px; - margin-right: 4px; - margin-left: 4px; -} -.blessures-loc { - flex-grow: 0; - flex-basis: 96px; - margin-right: 4px; - margin-left: 4px; -} .pointsreve-value { flex-grow: 0; flex-basis: 64px; diff --git a/templates/actor-blessure-partial.html b/templates/actor-blessure-partial.html deleted file mode 100644 index d475751b..00000000 --- a/templates/actor-blessure-partial.html +++ /dev/null @@ -1,27 +0,0 @@ - - - {{#if bless.active}} - - {{else}} - - {{/if}} - - - - - - - - - - - - - - - - - - - - diff --git a/templates/actor-creature-sheet.html b/templates/actor-creature-sheet.html index 94975010..1dcdab80 100644 --- a/templates/actor-creature-sheet.html +++ b/templates/actor-creature-sheet.html @@ -121,7 +121,7 @@ {{!-- blessures Tab --}}
{{!-- Liste de blessures --}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}} + {{> "systems/foundryvtt-reve-de-dragon/templates/actor-sheet-blessures.html" this}}
{{!-- Equipment Tab --}} diff --git a/templates/actor-liste-blessures-partial.html b/templates/actor-liste-blessures-partial.html deleted file mode 100644 index 2d106fed..00000000 --- a/templates/actor-liste-blessures-partial.html +++ /dev/null @@ -1,28 +0,0 @@ -

Blessures:

- - - - - - - - - - - - - - - {{#each system.blessures.legeres.liste as |bless key|}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="legere" title="Légère"}} - {{/each}} - - {{#each system.blessures.graves.liste as |bless key|}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="grave" title="Grave"}} - {{/each}} - - {{#each system.blessures.critiques.liste as |bless key|}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-blessure-partial.html" bless=bless key=key gravite="critique" title="Critique"}} - {{/each}} - -
Loc.Premiers soinsP.S. OK?Soins completsS.C. OK?Age (jours)
Légères
Graves
Critiques
\ No newline at end of file diff --git a/templates/actor-sheet-blessure.html b/templates/actor-sheet-blessure.html new file mode 100644 index 00000000..fb5b863d --- /dev/null +++ b/templates/actor-sheet-blessure.html @@ -0,0 +1,27 @@ +
  • + + + {{title}} + + {{#if blessure.active}} + + + + + + + + + + + {{else}} + + + + + {{/if}} +
    • diff --git a/templates/actor-sheet-blessures.html b/templates/actor-sheet-blessures.html new file mode 100644 index 00000000..ec809d1f --- /dev/null +++ b/templates/actor-sheet-blessures.html @@ -0,0 +1,19 @@ +

    Blessures:

    + diff --git a/templates/actor-sheet-combat.html b/templates/actor-sheet-combat.html new file mode 100644 index 00000000..3b33cba9 --- /dev/null +++ b/templates/actor-sheet-combat.html @@ -0,0 +1,41 @@ +

    Armes et Défenses:

    + \ No newline at end of file diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index e9c5a389..67c49c11 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -273,110 +273,11 @@ {{!-- Combat Tab --}}
    -

    Armes et Défenses:

    - -
    - {{!-- Liste de blessures --}} - {{> "systems/foundryvtt-reve-de-dragon/templates/actor-liste-blessures-partial.html" this}} - - {{#if maladiesPoisons.length}} - {{!-- Maladies & Poison --}} -

    Maladies & Poisons:

    - - {{/if}} - - {{#if possessions.length}} - {{!-- Possession --}} -

    Possession:

    - - {{/if}}
    {{!-- Connaissances Tab --}}