diff --git a/css/foundryvtt-reve-de-dragon.css b/css/foundryvtt-reve-de-dragon.css index ea765751..f76066ed 100644 --- a/css/foundryvtt-reve-de-dragon.css +++ b/css/foundryvtt-reve-de-dragon.css @@ -5387,95 +5387,149 @@ body { vertical-align: baseline; padding: 0.1rem; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table { +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .competence-header { + padding: 0 3px; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .equipement-nom { + flex: 2; + padding-left: calc(24px + 0.2rem); + min-width: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .equipement-detail:nth-child(2) { + flex: 1.4; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .equipement-detail:nth-child(3) { + flex: 0.5; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .equipement-detail:nth-child(4) { + flex: 0.7; + gap: 0.125rem; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .equipement-detail:nth-child(5) { + flex: 1.6; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .item-controls { + flex: 0.8; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes .list-item .equipement-nom { + padding-left: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .competence-header { + padding: 0 3px; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .equipement-nom { + flex: 2.5; + padding-left: calc(24px + 0.2rem); + min-width: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .equipement-nom span { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .equipement-detail:nth-child(2) { + flex: 1.2; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .equipement-detail:nth-child(3) { + flex: 0.6; + gap: 0.125rem; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .equipement-detail:nth-child(4) { + flex: 1.4; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .item-controls { + flex: 0.8; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-potions .list-item .equipement-nom { + padding-left: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .competence-header { + padding: 0 3px; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .equipement-nom { + flex: 2; + padding-left: calc(24px + 0.2rem); + min-width: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .equipement-detail:nth-child(2) { + flex: 1.4; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .equipement-detail:nth-child(3) { + flex: 0.7; + gap: 0.125rem; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .equipement-detail:nth-child(4) { + flex: 1.6; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .item-controls { + flex: 0.8; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients .list-item .equipement-nom { + padding-left: 0; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-deniers .competence-header { + padding: 0 3px; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-deniers .equipement-nom { + padding-left: calc(24px + 0.2rem); +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-deniers .equipement-detail:nth-child(3) { + gap: 0.125rem; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-deniers .equipement-detail:nth-child(4) { + flex: 2; +} +.system-foundryvtt-reve-de-dragon .dialog-gerer-deniers .list-item .equipement-nom { + padding-left: 0; +} +.system-foundryvtt-reve-de-dragon .sust-buttons { + display: flex; + gap: 0.25rem; +} +.system-foundryvtt-reve-de-dragon .btn-voir-tables-encaissement { width: 100%; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th, -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td { - padding: 0.2rem 0.3rem !important; - vertical-align: middle !important; +.system-foundryvtt-reve-de-dragon .tab.hautreve { + height: 200px; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th { - color: var(--color-text-light-heading, #f0f0f0) !important; - font-weight: bold !important; +.system-foundryvtt-reve-de-dragon .oeuvre-buttons { + gap: 0.5rem; + flex-wrap: wrap; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:first-child, -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:first-child { - width: 36px !important; - text-align: center !important; +.system-foundryvtt-reve-de-dragon .status-pending { + color: #999; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:nth-child(2), -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:nth-child(2) { - width: auto !important; +.system-foundryvtt-reve-de-dragon .status-rolling { + color: #2196F3; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:nth-child(3), -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:nth-child(3) { - width: 3rem !important; - text-align: center !important; +.system-foundryvtt-reve-de-dragon .status-success { + color: #2a8a2a; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:nth-child(4), -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:nth-child(4) { - width: 6rem !important; - text-align: center !important; +.system-foundryvtt-reve-de-dragon .status-failure { + color: #c44; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:nth-child(5), -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:nth-child(5) { - width: 5rem !important; - text-align: center !important; +.system-foundryvtt-reve-de-dragon .moral-low { + font-size: 0.9rem; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table th:nth-child(7), -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table td:nth-child(7) { - width: 2.5rem !important; - text-align: center !important; +.system-foundryvtt-reve-de-dragon .export-sort { + flex-grow: 0.4; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table select { - max-width: 12rem !important; - min-width: 8rem !important; +.system-foundryvtt-reve-de-dragon .random-char-right { + text-align: right; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-herbes table img { - width: 30px !important; - height: 30px !important; - object-fit: cover !important; - border: none !important; +.system-foundryvtt-reve-de-dragon .encart-sheet-body { + margin-bottom: 3rem; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table { +.system-foundryvtt-reve-de-dragon #statBlock { + width: 100%; + height: 200px; +} +.system-foundryvtt-reve-de-dragon .qty-amount { width: 100%; } -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td { - padding: 0.2rem 0.3rem !important; - vertical-align: middle !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:first-child { - width: 36px !important; - text-align: center !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:nth-child(2) { - width: auto !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:nth-child(3) { - width: 3rem !important; - text-align: center !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:nth-child(4) { - width: 6rem !important; - text-align: center !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:nth-child(5) { - width: auto !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table td:nth-child(6) { - width: 2.5rem !important; - text-align: center !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table select { - max-width: 12rem !important; - min-width: 8rem !important; -} -.system-foundryvtt-reve-de-dragon .dialog-gerer-ingredients table img { - width: 30px !important; - height: 30px !important; - object-fit: cover !important; - border: none !important; +.system-foundryvtt-reve-de-dragon .resultat-created { + color: #2a8a2a; + font-weight: bold; } .system-foundryvtt-reve-de-dragon .dice-img { border-width: 0; diff --git a/less/foundryvtt-reve-de-dragon.less b/less/foundryvtt-reve-de-dragon.less index 40ee2afb..4c902fd0 100644 --- a/less/foundryvtt-reve-de-dragon.less +++ b/less/foundryvtt-reve-de-dragon.less @@ -600,98 +600,75 @@ padding: 0.1rem; } - .dialog-gerer-herbes table { - width: 100%; - } - .dialog-gerer-herbes table th, - .dialog-gerer-herbes table td { - padding: 0.2rem 0.3rem !important; - vertical-align: middle !important; - } - .dialog-gerer-herbes table th { - color: var(--color-text-light-heading, #f0f0f0) !important; - font-weight: bold !important; - } - .dialog-gerer-herbes table th:first-child, - .dialog-gerer-herbes table td:first-child { - width: 36px !important; - text-align: center !important; - } - .dialog-gerer-herbes table th:nth-child(2), - .dialog-gerer-herbes table td:nth-child(2) { - width: auto !important; - } - .dialog-gerer-herbes table th:nth-child(3), - .dialog-gerer-herbes table td:nth-child(3) { - width: 3rem !important; - text-align: center !important; - } - .dialog-gerer-herbes table th:nth-child(4), - .dialog-gerer-herbes table td:nth-child(4) { - width: 6rem !important; - text-align: center !important; - } - .dialog-gerer-herbes table th:nth-child(5), - .dialog-gerer-herbes table td:nth-child(5) { - width: 5rem !important; - text-align: center !important; - } - .dialog-gerer-herbes table th:nth-child(7), - .dialog-gerer-herbes table td:nth-child(7) { - width: 2.5rem !important; - text-align: center !important; - } - .dialog-gerer-herbes table select { - max-width: 12rem !important; - min-width: 8rem !important; - } - .dialog-gerer-herbes table img { - width: 30px !important; - height: 30px !important; - object-fit: cover !important; - border: none !important; + .dialog-gerer-herbes { + .competence-header { padding: 0 3px; } + .equipement-nom { flex: 2; padding-left: calc(24px + 0.2rem); min-width: 0; } + .equipement-detail { + &:nth-child(2) { flex: 1.4; } + &:nth-child(3) { flex: 0.5; } + &:nth-child(4) { flex: 0.7; gap: 0.125rem; } + &:nth-child(5) { flex: 1.6; } + } + .item-controls { flex: 0.8; } + .list-item .equipement-nom { padding-left: 0; } } - .dialog-gerer-ingredients table { - width: 100%; + .dialog-gerer-potions { + .competence-header { padding: 0 3px; } + .equipement-nom { flex: 2.5; padding-left: calc(24px + 0.2rem); min-width: 0; } + .equipement-nom span { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; } + .equipement-detail { + &:nth-child(2) { flex: 1.2; } + &:nth-child(3) { flex: 0.6; gap: 0.125rem; } + &:nth-child(4) { flex: 1.4; } + } + .item-controls { flex: 0.8; } + .list-item .equipement-nom { padding-left: 0; } } - .dialog-gerer-ingredients table td { - padding: 0.2rem 0.3rem !important; - vertical-align: middle !important; + + .dialog-gerer-ingredients { + .competence-header { padding: 0 3px; } + .equipement-nom { flex: 2; padding-left: calc(24px + 0.2rem); min-width: 0; } + .equipement-detail { + &:nth-child(2) { flex: 1.4; } + &:nth-child(3) { flex: 0.7; gap: 0.125rem; } + &:nth-child(4) { flex: 1.6; } + } + .item-controls { flex: 0.8; } + .list-item .equipement-nom { padding-left: 0; } } - .dialog-gerer-ingredients table td:first-child { - width: 36px !important; - text-align: center !important; - } - .dialog-gerer-ingredients table td:nth-child(2) { - width: auto !important; - } - .dialog-gerer-ingredients table td:nth-child(3) { - width: 3rem !important; - text-align: center !important; - } - .dialog-gerer-ingredients table td:nth-child(4) { - width: 6rem !important; - text-align: center !important; - } - .dialog-gerer-ingredients table td:nth-child(5) { - width: auto !important; - } - .dialog-gerer-ingredients table td:nth-child(6) { - width: 2.5rem !important; - text-align: center !important; - } - .dialog-gerer-ingredients table select { - max-width: 12rem !important; - min-width: 8rem !important; - } - .dialog-gerer-ingredients table img { - width: 30px !important; - height: 30px !important; - object-fit: cover !important; - border: none !important; + + .dialog-gerer-deniers { + .competence-header { padding: 0 3px; } + .equipement-nom { padding-left: calc(24px + 0.2rem); } + .equipement-detail:nth-child(3) { gap: 0.125rem; } + .equipement-detail:nth-child(4) { flex: 2; } + .list-item .equipement-nom { padding-left: 0; } } + .sust-buttons { display: flex; gap: 0.25rem; } + + .btn-voir-tables-encaissement { width: 100%; } + + .tab.hautreve { height: 200px; } + + .oeuvre-buttons { gap: 0.5rem; flex-wrap: wrap; } + + .status-pending { color: #999; } + .status-rolling { color: #2196F3; } + .status-success { color: #2a8a2a; } + .status-failure { color: #c44; } + + .moral-low { font-size: 0.9rem; } + + .export-sort { flex-grow: 0.4; } + + .random-char-right { text-align: right; } + .encart-sheet-body { margin-bottom: 3rem; } + #statBlock { width: 100%; height: 200px; } + .qty-amount { width: 100%; } + .resultat-created { color: #2a8a2a; font-weight: bold; } + .dice-img { border-width: 0; max-width: 1.5rem; diff --git a/module/actor/base-actor-sheet.js b/module/actor/base-actor-sheet.js index c7cf52cc..e332bd48 100644 --- a/module/actor/base-actor-sheet.js +++ b/module/actor/base-actor-sheet.js @@ -144,7 +144,7 @@ export class RdDBaseActorSheet extends foundry.appv1.sheets.ActorSheet { new Dialog({ title: `Quantité — ${item.name}`, content: `

Réduire la quantité de :

- diff --git a/module/apps/rdd-import-stats.js b/module/apps/rdd-import-stats.js index 61dc888a..919d65b7 100644 --- a/module/apps/rdd-import-stats.js +++ b/module/apps/rdd-import-stats.js @@ -59,7 +59,7 @@ export class RdDStatBlockParser { content: `

Coller le texte de la stat ici

- +
`, buttons: { diff --git a/module/dialog-lancer-recette.js b/module/dialog-lancer-recette.js index 9417613d..f3ea318a 100644 --- a/module/dialog-lancer-recette.js +++ b/module/dialog-lancer-recette.js @@ -199,10 +199,10 @@ export class DialogLancerRecette extends HandlebarsApplicationMixin(ApplicationV const cell = row.querySelector('.etape-status') if (!cell) return const icons = { - pending: '', - rolling: '', - success: '', - failure: '', + pending: '', + rolling: '', + success: '', + failure: '', } cell.innerHTML = icons[etape.status] || '' } diff --git a/module/rdd-utility.js b/module/rdd-utility.js index b2c6ee95..0267d009 100644 --- a/module/rdd-utility.js +++ b/module/rdd-utility.js @@ -870,7 +870,7 @@ export class RdDUtility { system: { quantite: resultat.quantite || 1 }, }]) const messageEl = $(btn).closest('.chat-message') - messageEl.find('.creer-resultat-chat').replaceWith('✓ Résultat créé') + messageEl.find('.creer-resultat-chat').replaceWith('✓ Résultat créé') ui.notifications.info(`${resultat.name || recipeName} a été créé avec succès !`) }); $(html).on("click", '.rdd-world-content-link', async event => { diff --git a/templates/actor-sheet.hbs b/templates/actor-sheet.hbs index 52a68ac6..247b89ac 100644 --- a/templates/actor-sheet.hbs +++ b/templates/actor-sheet.hbs @@ -123,7 +123,7 @@ {{> "systems/foundryvtt-reve-de-dragon/templates/actor/chirurgie.hbs"}} {{> "systems/foundryvtt-reve-de-dragon/templates/actor/oeuvres.hbs"}} {{> "systems/foundryvtt-reve-de-dragon/templates/actor/jeux.hbs"}} -
+
Créer une oeuvre
{{> "systems/foundryvtt-reve-de-dragon/templates/actor/alchimie.hbs"}} @@ -131,7 +131,7 @@
{{/if}} {{#if options.isObserver}}{{!-- hautreve Tab --}} -
+
{{#if system.attributs.hautrevant.value}}

Haut rêvant

diff --git a/templates/actor/carac-derivee.hbs b/templates/actor/carac-derivee.hbs index 0b968148..5286121d 100644 --- a/templates/actor/carac-derivee.hbs +++ b/templates/actor/carac-derivee.hbs @@ -78,7 +78,7 @@ - + Repas externe Rations diff --git a/templates/actor/dialog-gerer-deniers.hbs b/templates/actor/dialog-gerer-deniers.hbs index e2495ef1..c3141516 100644 --- a/templates/actor/dialog-gerer-deniers.hbs +++ b/templates/actor/dialog-gerer-deniers.hbs @@ -1,11 +1,11 @@

Fortune totale: {{fortune.sols}} sols {{fortune.deniers}} deniers
    -
  • - Nom +
  • + Nom Valeur Quantité - Conteneur + Conteneur Actions
    • {{#each monnaies as |piece|}} @@ -15,12 +15,12 @@ {{piece.name}} {{piece.cout}} Sols - + {{piece.quantite}} - + {{#select herbe.conteneurId}} {{#each ../conteneurs as |c|}} @@ -30,7 +30,7 @@ {{/select}} - + {{#if herbe.isHerbeAPotion}} {{/if}} diff --git a/templates/actor/dialog-gerer-ingredients.hbs b/templates/actor/dialog-gerer-ingredients.hbs index 59535c48..71bc8d91 100644 --- a/templates/actor/dialog-gerer-ingredients.hbs +++ b/templates/actor/dialog-gerer-ingredients.hbs @@ -1,25 +1,25 @@
      -
    • - Nom - Catégorie - Quantité - Conteneur - Actions +
    • + Nom + Catégorie + Quantité + Conteneur + Actions
      • {{#each ingredients as |ing|}}
    • - + {{ing.name}} - {{ing.categorie}} - + {{ing.categorie}} + {{ing.quantite}} - + - + diff --git a/templates/actor/dialog-gerer-potions.hbs b/templates/actor/dialog-gerer-potions.hbs index c14efc57..179ae5cf 100644 --- a/templates/actor/dialog-gerer-potions.hbs +++ b/templates/actor/dialog-gerer-potions.hbs @@ -1,25 +1,25 @@
        -
      • - Nom - Catégorie - Quantité - Conteneur - Actions +
      • + Nom + Catégorie + Quantité + Conteneur + Actions
        • {{#each potions as |p|}}
      • - + - {{p.name}}{{#if p.magique}} {{/if}} + {{p.name}}{{#if p.magique}} {{/if}} - {{p.categorie}} - + {{p.categorie}} + {{p.quantite}} - + - + diff --git a/templates/actor/export-scriptarium/actor-encart-sheet.hbs b/templates/actor/export-scriptarium/actor-encart-sheet.hbs index 7fa6487c..f5556a63 100644 --- a/templates/actor/export-scriptarium/actor-encart-sheet.hbs +++ b/templates/actor/export-scriptarium/actor-encart-sheet.hbs @@ -34,7 +34,7 @@
    -
    +
    {{export.name.value}}{{#if export.description.value}}, {{export.description.value}}{{/if}}
    diff --git a/templates/actor/export-scriptarium/sort.hbs b/templates/actor/export-scriptarium/sort.hbs index 543a6213..dffe34a7 100644 --- a/templates/actor/export-scriptarium/sort.hbs +++ b/templates/actor/export-scriptarium/sort.hbs @@ -1,6 +1,6 @@ {{#if voie}}
    -
    {{voie}}
    +
    {{voie}}
    {{upperFirst description}}
    {{#if bonus}}
    {{bonus}}
    diff --git a/templates/actor/random/app-personnage-aleatoire.hbs b/templates/actor/random/app-personnage-aleatoire.hbs index b933896d..4abdaac7 100644 --- a/templates/actor/random/app-personnage-aleatoire.hbs +++ b/templates/actor/random/app-personnage-aleatoire.hbs @@ -40,7 +40,7 @@ }}
    -
    +
    Générer les valeurs sélectionnés

    diff --git a/templates/item/dialog-lancer-recette.hbs b/templates/item/dialog-lancer-recette.hbs index f2a5c17a..102e7837 100644 --- a/templates/item/dialog-lancer-recette.hbs +++ b/templates/item/dialog-lancer-recette.hbs @@ -57,10 +57,10 @@ {{etape.difficulte}} {{etape.carac.label}} - {{#if (eq etape.status "pending")}} - {{else if (eq etape.status "rolling")}} - {{else if (eq etape.status "success")}} - {{else if (eq etape.status "failure")}} + {{#if (eq etape.status "pending")}} + {{else if (eq etape.status "rolling")}} + {{else if (eq etape.status "success")}} + {{else if (eq etape.status "failure")}} {{/if}} diff --git a/templates/roll/roll-part-appelmoral.hbs b/templates/roll/roll-part-appelmoral.hbs index 172b68ba..a3464160 100644 --- a/templates/roll/roll-part-appelmoral.hbs +++ b/templates/roll/roll-part-appelmoral.hbs @@ -1,4 +1,4 @@ -