From d5182fb521dbb77be3109bf544e06ad80f15915e Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 18 Sep 2026 23:39:41 +0200 Subject: [PATCH] Redesign generated characteristics and skills layout --- README.md | 10 ++++++ TASKS.md | 1 + data/themes.yaml | 8 ++--- templates/sheet.css | 76 +++++++++++++++++++++++++++++++++++++++ tests/test_build.py | 5 +++ tools/build.py | 87 ++++++++++++++++++++++----------------------- 6 files changed, 139 insertions(+), 48 deletions(-) create mode 100644 templates/sheet.css diff --git a/README.md b/README.md index b76439d..cd75fa6 100644 --- a/README.md +++ b/README.md @@ -92,3 +92,13 @@ sauvegarde de Roll20. Dans le Custom Sheet Sandbox, charger chaque variante, ajouter une ligne répétable, lancer les jets, sauvegarder et rouvrir deux personnages. La [documentation officielle Roll20](https://help.roll20.net/hc/en-us/categories/360003756473-Sheet-Development) décrit l'éditeur et les limitations des feuilles personnalisées. + +### Présentation des caractéristiques et compétences + +La mise en page générée utilise un en-tête de personnage, des cartes de +caractéristiques sur deux colonnes et des lignes de compétences alignées +(nom, caractéristique, niveau, coût et jet). Les sous-compétences sont en retrait. +Le style commun se trouve dans `templates/sheet.css`; les couleurs restent dans +`data/themes.yaml`. Les noms d'attributs et les formules de jet n'ont pas changé +avec cette refonte visuelle. Les fichiers dans `build/` doivent être régénérés +avant de remplacer le HTML et le CSS dans Roll20. diff --git a/TASKS.md b/TASKS.md index 17b08c2..67d971b 100644 --- a/TASKS.md +++ b/TASKS.md @@ -6,6 +6,7 @@ - [x] Add parchment and night themes without altering rolls or stored fields. - [x] Test validation, generated fields, references, and both variant builds. - [x] Document build, use, variant differences, migration limits, and Roll20 sandbox checks. +- [x] Replace stacked characteristic and skill controls with compact themed grids; verify both variants and themes. ## Live Roll20 checks after local verification diff --git a/data/themes.yaml b/data/themes.yaml index ca41c1f..0b1190f 100644 --- a/data/themes.yaml +++ b/data/themes.yaml @@ -1,10 +1,10 @@ themes: parchment: - background: '#f5eedc' + background: '#f3ebda' panel: '#fffaf0' - ink: '#30291f' - accent: '#78522e' - border: '#c2a778' + ink: '#30251f' + accent: '#7a2830' + border: '#c9ad76' night: background: '#17212b' panel: '#233342' diff --git a/templates/sheet.css b/templates/sheet.css new file mode 100644 index 0000000..3c4f785 --- /dev/null +++ b/templates/sheet.css @@ -0,0 +1,76 @@ +.sheet-d10 { + box-sizing: border-box; + max-width: 1080px; + min-width: 0; + margin: 0 auto; + padding: 20px; + color: var(--d10-ink); + background: var(--d10-background); + font: 13px/1.4 Georgia, serif; + border: 1px solid var(--d10-border); +} +.sheet-d10 *, .sheet-d10 *::before, .sheet-d10 *::after { box-sizing: border-box; } +.sheet-d10 .sheet-hero { display: grid; grid-template-columns: 60px minmax(0,1fr) 112px; gap: 16px; align-items: center; padding: 16px; background: var(--d10-panel); border: 1px solid var(--d10-border); border-left: 5px solid var(--d10-accent); } +.sheet-d10 .sheet-hero-mark { display: grid; place-items: center; width: 54px; height: 54px; color: var(--d10-panel); background: var(--d10-accent); font: bold 18px Georgia,serif; letter-spacing: -.08em; } +.sheet-d10 .sheet-eyebrow { display: block; color: var(--d10-accent); font: bold 10px Arial,sans-serif; letter-spacing: .14em; text-transform: uppercase; } +.sheet-d10 h1 { margin: 2px 0 11px; color: var(--d10-ink); font: bold 26px Georgia,serif; } +.sheet-d10 .sheet-identity { display: grid; grid-template-columns: 1fr 1fr; gap: 10px; } +.sheet-d10 .sheet-identity label, .sheet-d10 .sheet-die-choice { display: grid; gap: 3px; margin: 0 !important; color: var(--d10-accent); font: bold 10px Arial,sans-serif; letter-spacing: .07em; text-transform: uppercase; } +.sheet-d10 .sheet-die-choice { align-self: end; } +.sheet-d10 input, .sheet-d10 select { box-sizing: border-box; width: 100%; min-width: 0; height: 30px; margin: 0 !important; padding: 3px 6px; color: var(--d10-ink); background: var(--d10-panel); border: 1px solid var(--d10-border); border-radius: 2px; box-shadow: none; font: 13px Arial,sans-serif; } +.sheet-d10 input:focus, .sheet-d10 select:focus { outline: 2px solid var(--d10-accent); outline-offset: 1px; } +.sheet-d10 input[type=checkbox] { width: 18px; height: 18px; padding: 0; accent-color: var(--d10-accent); } +.sheet-d10 input[type=number] { text-align: center; } +.sheet-d10 .sheet-panel { margin: 14px 0 0; padding: 13px 15px 16px; background: var(--d10-panel); border: 1px solid var(--d10-border); } +.sheet-d10 .sheet-section-title { display: flex; gap: 9px; align-items: baseline; padding-bottom: 6px; margin-bottom: 11px; border-bottom: 1px solid var(--d10-border); } +.sheet-d10 .sheet-section-title span { color: var(--d10-accent); font: bold 11px Arial,sans-serif; } +.sheet-d10 .sheet-section-title h2 { margin: 0; color: var(--d10-accent); font: bold 19px Georgia,serif; } +.sheet-d10 .sheet-subheading { margin: 14px 0 6px; color: var(--d10-accent); font: bold 14px Georgia,serif; } +.sheet-d10 .sheet-stat { display: grid; grid-template-columns: minmax(0,1fr) 66px 66px 42px; gap: 7px; align-items: center; } +.sheet-d10 .sheet-stat-grid { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 7px 10px; } +.sheet-d10 .sheet-stat { min-height: 43px; padding: 6px 9px; border: 1px solid var(--d10-border); border-left: 3px solid var(--d10-accent); background: var(--d10-background); } +.sheet-d10 .sheet-stat strong { overflow: hidden; color: var(--d10-ink); font: bold 12px Georgia,serif; text-overflow: ellipsis; white-space: nowrap; } +.sheet-d10 .sheet-stat label { display: grid; gap: 2px; margin: 0 !important; color: var(--d10-accent); font: bold 9px Arial,sans-serif; text-align: center; text-transform: uppercase; } +.sheet-d10 .sheet-resource-grid { display: grid; grid-template-columns: repeat(2,minmax(0,1fr)); gap: 10px; } +.sheet-d10 .sheet-resource { display: grid; grid-template-columns: minmax(110px,1fr) 75px 12px 75px; gap: 6px; align-items: end; padding: 9px 11px; background: var(--d10-background); border-left: 3px solid var(--d10-accent); } +.sheet-d10 .sheet-resource strong { align-self: center; font-size: 12px; } +.sheet-d10 .sheet-resource label { display: grid; gap: 3px; margin: 0 !important; color: var(--d10-accent); font: bold 9px Arial,sans-serif; text-transform: uppercase; } +.sheet-d10 .sheet-resource > span { align-self: end; text-align: center; font-size: 18px; } +.sheet-d10 .sheet-location-head, .sheet-d10 .sheet-location { display: grid; grid-template-columns: minmax(120px,1fr) repeat(3,95px); gap: 8px; align-items: center; padding: 5px 9px; } +.sheet-d10 .sheet-location-head { color: var(--d10-accent); font: bold 9px Arial,sans-serif; text-transform: uppercase; text-align: center; } +.sheet-d10 .sheet-location-head span:first-child { text-align: left; } +.sheet-d10 .sheet-location:nth-child(odd) { background: var(--d10-background); } +.sheet-d10 .sheet-combat-grid { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 9px; } +.sheet-d10 .sheet-combat-field { display: grid; gap: 4px; margin: 0 !important; padding: 8px; color: var(--d10-accent); background: var(--d10-background); font: bold 10px Arial,sans-serif; text-transform: uppercase; } +.sheet-d10 .sheet-combat-actions { display: flex; align-items: center; gap: 8px; margin-top: 10px; padding: 8px; background: var(--d10-background); } +.sheet-d10 .sheet-combat-actions span { margin-right: auto; color: var(--d10-accent); font-weight: bold; } +.sheet-d10 .sheet-weapon-grid { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 9px; } +.sheet-d10 .sheet-weapon { display: grid; grid-template-columns: minmax(0,1fr) 65px 18px; gap: 5px; align-items: center; padding: 8px; background: var(--d10-background); border: 1px solid var(--d10-border); } +.sheet-d10 .sheet-weapon span { grid-column: 1/-1; color: var(--d10-accent); font: bold 10px Arial,sans-serif; text-transform: uppercase; } +.sheet-d10 .sheet-skill-group { margin: 9px 0 16px; border: 1px solid var(--d10-border); } +.sheet-d10 .sheet-skill-group h4 { margin: 0; padding: 7px 10px; color: var(--d10-panel); background: var(--d10-accent); font: bold 13px Georgia,serif; } +.sheet-d10 .sheet-skill-head, .sheet-d10 .sheet-skill-row { display: grid; grid-template-columns: minmax(170px,1fr) 110px 60px 60px 42px; gap: 8px; align-items: center; padding: 5px 10px; } +.sheet-d10 .sheet-skill-head { color: var(--d10-accent); font: bold 9px Arial,sans-serif; letter-spacing: .05em; text-transform: uppercase; text-align: center; border-bottom: 1px solid var(--d10-border); } +.sheet-d10 .sheet-skill-head span:first-child { text-align: left; } +.sheet-d10 .sheet-skill-row { min-height: 38px; } +.sheet-d10 .sheet-skill-row:nth-child(even) { background: var(--d10-background); } +.sheet-d10 .sheet-skill-name { overflow: hidden; font-weight: bold; text-overflow: ellipsis; } +.sheet-d10 .sheet-subskill .sheet-skill-name { padding-left: 16px; font-weight: normal; } +.sheet-d10 .sheet-subskill .sheet-skill-name::before { content: '↳ '; color: var(--d10-accent); } +.sheet-d10 button[type=roll].sheet-roll { display: inline-grid; place-items: center; width: 34px; min-width: 34px; height: 30px; margin: 0 !important; padding: 0 !important; color: var(--d10-panel); background: var(--d10-accent); border: 1px solid var(--d10-accent); border-radius: 2px; box-shadow: none; font: bold 10px Arial,sans-serif; line-height: 1; text-shadow: none; } +.sheet-d10 button[type=roll].sheet-roll::before { content: none !important; display: none !important; } +.sheet-d10 button[type=roll].sheet-roll:hover, .sheet-d10 button[type=roll].sheet-roll:focus { filter: brightness(1.15); outline: 2px solid var(--d10-border); } +.sheet-d10 details { margin: 8px 0; border: 1px solid var(--d10-border); } +.sheet-d10 summary { padding: 7px 10px; color: var(--d10-accent); background: var(--d10-background); font-weight: bold; cursor: pointer; } +.sheet-d10 fieldset { display: flex; flex-wrap: wrap; gap: 7px; padding: 10px; border: 0; } +.sheet-d10 fieldset label { display: grid; gap: 3px; margin: 0 !important; color: var(--d10-accent); font: bold 9px Arial,sans-serif; text-transform: uppercase; } +.sheet-rolltemplate-d10skillcheck { padding: 7px 9px; color: var(--d10-ink); background: var(--d10-panel); border: 1px solid var(--d10-border); border-left: 4px solid var(--d10-accent); font: 12px Georgia,serif; } +@media (max-width: 760px) { + .sheet-d10 { padding: 9px; } + .sheet-d10 .sheet-stat-grid, .sheet-d10 .sheet-resource-grid, .sheet-d10 .sheet-weapon-grid { grid-template-columns: 1fr; } + .sheet-d10 .sheet-hero { grid-template-columns: 45px minmax(0,1fr); gap: 9px; } + .sheet-d10 .sheet-hero-mark { width: 42px; height: 42px; font-size: 14px; } + .sheet-d10 .sheet-die-choice { grid-column: 2; } + .sheet-d10 .sheet-skill-head, .sheet-d10 .sheet-skill-row { grid-template-columns: minmax(110px,1fr) 72px 48px 48px 36px; gap: 4px; padding: 4px; } + .sheet-d10 .sheet-location-head, .sheet-d10 .sheet-location { grid-template-columns: minmax(75px,1fr) repeat(3,60px); gap: 4px; } +} diff --git a/tests/test_build.py b/tests/test_build.py index 867f566..5febbc2 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -21,6 +21,11 @@ class BuildTests(unittest.TestCase): self.assertGreater(info['skills'], 10) self.assertIn('repeating_', files['sheet.html']) self.assertIn('sheet-rolltemplate-d10skillcheck', files['sheet.html']) + self.assertIn('class="sheet-stat-grid"', files['sheet.html']) + self.assertIn('class="sheet-skill-head"', files['sheet.html']) + self.assertEqual(files['sheet.html'].count('class="sheet-skill-row'), info['skills']) + self.assertIn('.sheet-d10 .sheet-stat-grid { display: grid;', files['sheet.css']) + self.assertIn('.sheet-d10 .sheet-skill-head, .sheet-d10 .sheet-skill-row { display: grid;', files['sheet.css']) self.assertNotIn('Ravenous', files['sheet.html']) self.assertIn('--d10-accent:', files['sheet.css']) self.assertEqual(files, build.build(variant, theme, Path(tmp))) diff --git a/tools/build.py b/tools/build.py index 893265b..09218fa 100644 --- a/tools/build.py +++ b/tools/build.py @@ -88,7 +88,7 @@ def roll(label, threshold): '{{dice_name=@{dice}}} ' f'{{{{threshold=[[{threshold}]]}}}} ' f'{{{{result=[[{expression}]]}}}}') - return f'' + return f'' def render_skill(group, skill, variant): @@ -109,61 +109,70 @@ def render_skill(group, skill, variant): ('Chance', 'Chn')] selector = f'skill_{prefix}_attribute_select_{skill["id"]}' choices = ''.join(f'' for key, short in options) - return (f'
' - f'' + depth = ' sheet-subskill' if skill.get('parent') else '' + return (f'
{esc(name_field)}' + f'' + f'' f'' - f'' - f'{roll(esc(name_field), threshold)}
') + f'{roll(name_field, threshold)}
') def render(model, skills, variant, theme_name, theme): parts = [f'
', - f'

{esc(model["title"])}

', - '', - '', - '', + '
', + '', - '

Caractéristiques

'] + for n in (4, 6, 8, 10, 12, 20)) + '', + '
01

Caractéristiques

', + '
'] for item in model['attributes']: key = item['id'] threshold = f'(@{{base-{key}}}+@{{exal-{key}}})*2' - parts.append(f'
' - f'' - f'' - f'{roll(esc(item["name"]), threshold)}
') - parts.append('

Ressources

') + parts.append(f'
{esc(item["name"])}' + f'' + f'' + f'{roll(item["name"], threshold)}
') + parts.append('
02

Ressources

') for item in model['resources']: key = item['id'] - parts.append(f'
' - f'' - f'
') + parts.append(f'
{esc(item["name"])}' + f'' + f'/
') if model.get('health_locations'): - parts.append('

Localisations

') + parts.append('

Localisations

ZonePVProtectionIntégrité
') for location in model['health_locations']: - parts.append(f'
' + parts.append(f'
{esc(location.replace("_", " "))}' f'' f'' f'
') - parts.append('

Combat

') + parts.append('') + else: + parts.append('') + parts.append('
03

Combat

') for item in model.get('combat', []): - parts.append(f'
' - f'
') + parts.append(f'') + parts.append('
Jets de combat') parts.append(roll('Initiative', '@{base-Agilite}+@{exal-Agilite}+@{Initiative}')) parts.append(roll('Attaque', '@{general_attack_threshold}')) + parts.append('

Armes équipées

') for number in range(1, model.get('weapons', 0) + 1): - parts.append(f'
' - f'' + parts.append(f'
Arme {number}' + f'' f'' f'
') - parts.append('

Compétences

') + parts.append('
04

Compétences

') for section in skills['sections']: - parts.append(f'

{esc(section["name"])}

') + parts.append(f'

{esc(section["name"])}

') for group in section['groups']: - parts.append(f'
{esc(group["name"])}') + parts.append(f'

{esc(group["name"])}

' + '
CompétenceCarac.NiveauCoûtJet
') parts.extend(render_skill(group, skill, variant) for skill in group.get('skills', [])) - parts.append('
') - parts.append('

Autres

') + parts.append('') + parts.append('
05

Autres

') for block in model['repeating']: parts.append(f'
{esc(block["name"])}' f'
') @@ -179,19 +188,9 @@ def render(model, skills, variant, theme_name, theme): parts.append('
') parts.append('
') html_text = '\n'.join(parts) + '\n' - css = '.sheet-d10 {\n' + '\n'.join( - f' --d10-{key}: {value};' for key, value in theme.items()) + ''' - background: var(--d10-background); color: var(--d10-ink); - padding: 1rem; font-family: sans-serif; -} -.sheet-d10 section, .sheet-d10 details { background: var(--d10-panel); border: 1px solid var(--d10-border); padding: .6rem; margin: .5rem 0; } -.sheet-d10 h1, .sheet-d10 h2, .sheet-d10 h3 { color: var(--d10-accent); } -.sheet-d10 .sheet-stat, .sheet-d10 .sheet-skill { display: flex; flex-wrap: wrap; align-items: center; gap: .4rem; margin: .3rem 0; } -.sheet-d10 .sheet-stat label, .sheet-d10 .sheet-skill label { min-width: 9rem; } -.sheet-d10 input[type=number] { width: 4rem; } -.sheet-d10 button { background: var(--d10-accent); color: var(--d10-panel); border: 0; padding: .3rem .7rem; } -.sheet-rolltemplate-d10skillcheck { background: var(--d10-panel); color: var(--d10-ink); border: 1px solid var(--d10-border); padding: .5rem; } -''' + css = '.sheet-d10, .sheet-rolltemplate-d10skillcheck {\n' + '\n'.join( + f' --d10-{key}: {value};' for key, value in theme.items()) + '\n}\n' + css += (ROOT / 'templates' / 'sheet.css').read_text(encoding='utf-8') html_text += '''
{{name}} — {{roll_name}}
Seuil: {{threshold}} · Résultat: {{result}}