From 7267cd4096c7edb59fb18d126b51555aafe2fd33 Mon Sep 17 00:00:00 2001 From: Vincent Vandemeulebrouck Date: Fri, 8 Dec 2023 18:56:59 +0100 Subject: [PATCH 1/7] =?UTF-8?q?Am=C3=A9lioration=20de=20tooltips?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - style en phase avec le système - icones attaque/d6/soins pour le HUD - tooltip plus détaillé pour le HUD - icône et bouton pour déterminer les chiffres astraux (astrologie) - tooltips pour les boutons archétype - suppression de log sur chaque point de coeur --- module/actor.js | 5 +++- module/rdd-token-hud.js | 1 - styles/simple.css | 38 ++++++++++++++++-------------- templates/actor-sheet.html | 8 +++++-- templates/actor/archetype.hbs | 3 ++- templates/actor/astrologie.html | 7 +++++- templates/coeur/afficher-coeur.hbs | 1 - templates/hud-actor-attaque.html | 4 ++-- templates/hud-actor-init.html | 4 ++-- templates/hud-actor-soins.hbs | 10 ++++++-- templates/item-potion-sheet.html | 23 ++++++++++-------- 11 files changed, 63 insertions(+), 41 deletions(-) diff --git a/module/actor.js b/module/actor.js index 2c4cfd7c..7f72ad01 100644 --- a/module/actor.js +++ b/module/actor.js @@ -1804,7 +1804,10 @@ export class RdDActor extends RdDBaseActorSang { } blessuresASoigner() { - return this.filterItems(it => it.system.gravite > 0 && it.system.gravite <= 6 && !(it.system.premierssoins.done && it.system.soinscomplets.done), 'blessure') + return (this.itemTypes[TYPES.blessure]) + .filter(it => it.system.gravite > 0 && it.system.gravite <= 6) + .filter(it => !(it.system.premierssoins.done && it.system.soinscomplets.done)) + .sort(Misc.descending(b => (b.system.premierssoins.done ? "A" : "B") + b.system.gravite)) } async getTacheBlessure(blesse, blessure) { diff --git a/module/rdd-token-hud.js b/module/rdd-token-hud.js index cbefeab8..0cdf7adf 100644 --- a/module/rdd-token-hud.js +++ b/module/rdd-token-hud.js @@ -90,7 +90,6 @@ export class RdDTokenHud { if (target?.actor) { const hudSoins = { blessures: target.actor.blessuresASoigner() ?? [] }; if (hudSoins.blessures.length > 0) { - // soins const controlIconTarget = html.find('.control-icon[data-action=combat]'); await RdDTokenHud._configureSubMenu(controlIconTarget, 'systems/foundryvtt-reve-de-dragon/templates/hud-actor-soins.hbs', diff --git a/styles/simple.css b/styles/simple.css index 5752c9b0..a526734f 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1363,43 +1363,37 @@ table.table-nombres-astraux tr:hover { justify-content: flex-start; flex-direction: column; position: absolute; - top: 2.75rem; - right: 4rem; + top: 4.6rem; + right: 3.5rem; } .token-hud-ext.soins { - justify-content: flex-start; flex-direction: column; position: absolute; - top: 13.2rem; - left: -5rem; - max-width: 8.5rem + top: 14.7rem; + left: -6rem; + max-width: 8rem; + line-height: 1rem; } .token-hud-ext.right { - justify-content: flex-start; flex-direction: column; position: absolute; - top: 2.75rem; - left: 4rem; + top: 4.6rem; + left: 3.5rem; } -.control-icon.token-hud-icon { - width: fit-content; +div.control-icon.token-hud-icon { + width: 9rem; height: fit-content; + border-radius: 0.3rem; min-width: 6rem; flex-basis: auto; padding: 0; - line-height: 1rem; + line-height: 0.95rem; margin: 0.2rem; } -.control-icon.token-hud-icon.right { - margin-left: 8px; -} .rdd-hud-menu label { font-size: 0.8rem; } -#token-hud .status-effects.active{ - z-index: 2; -} /* ======================================== */ .item-checkbox { height: 25px; @@ -1941,6 +1935,14 @@ div.calendar-timestamp-edit select.calendar-signe-heure { padding: 3px; } +aside#tooltip{ + background: var(--background-tooltip); + color: var(--color-text-dark-primary); + font-size: 1rem; + border-radius: 0.2rem; + padding: 0.4rem; +} + .tooltip :is(.ttt-xp,.ttt-levelup) { width: 250px; background: var(--background-tooltip) !important; diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 7c35256e..4f849b8b 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -70,9 +70,13 @@ {{#if options.vueDetaillee}}    {{#if @root.options.vueArchetype}} - Incarnation + + Incarnation + {{else}} - Archétype + + Archétype + {{/if}} {{/if}} diff --git a/templates/actor/archetype.hbs b/templates/actor/archetype.hbs index 08858640..2e57478b 100644 --- a/templates/actor/archetype.hbs +++ b/templates/actor/archetype.hbs @@ -2,7 +2,8 @@