From 1683cffc792d33817628593b1dcfd4cd6904fee9 Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 19 Sep 2026 00:21:30 +0200 Subject: [PATCH] Organize base skills into four subtabs --- README.md | 12 +++-- TASKS.md | 1 + data/sheet_model.yaml | 5 ++ templates/sheet.css | 15 ++++++ tests/test_build.py | 20 +++++++- tests/test_tabs.mjs | 13 ++++- tools/build.py | 107 ++++++++++++++++++++++++++++++++---------- 7 files changed, 142 insertions(+), 31 deletions(-) diff --git a/README.md b/README.md index 7b4067d..02769bc 100644 --- a/README.md +++ b/README.md @@ -29,10 +29,14 @@ personnalisée Roll20. `sheet.json` est un manifeste; `build-info.json` contient la variante, le thème, le nombre de compétences et une empreinte du résultat. Les sections **01 Caractéristiques** et **02 Ressources** restent visibles. -Trois onglets organisent le reste : **Compétences**, **Combat** et **Autres** -(sections répétables). Le choix de l'onglet est stocké dans l'attribut -`d10_tab`; les personnages qui avaient enregistré `core` affichent -**Compétences** jusqu'au prochain clic. L'en-tête reste visible. Les +La variante base a deux onglets principaux, **Compétences** et **Combat**. +Dans Compétences, quatre sous-onglets séparent **Combat et combat libre**, +**Compétences libres**, **Magie** et **Équipement**. Les lignes répétables +gardent leurs noms d'attributs et de section. La variante cyberpunk conserve +les onglets **Compétences**, **Combat** et **Autres**. Le choix principal est +stocké dans `d10_tab`, celui des sous-onglets base dans `d10_skill_tab`. +Les personnages qui avaient enregistré `core` ou, pour la variante base, +`other` affichent **Compétences** jusqu'au prochain clic. L'en-tête reste visible. Les thèmes `parchment` et `night` changent les couleurs sans modifier les champs ni les jets. diff --git a/TASKS.md b/TASKS.md index d832ece..d361bae 100644 --- a/TASKS.md +++ b/TASKS.md @@ -11,6 +11,7 @@ - [x] Remove unused legacy sheet sources and minitest, retain Mod scripts in scripts/, and keep the Ravenous model local. - [x] Keep 01 Caractéristiques and 02 Ressources visible above the three remaining tabs; preserve the old core tab value. - [x] Present cyberpunk health and armour locations on side-by-side body maps without changing field names. +- [x] Divide base skills into fight/free fight, free skills, magic, and equipment subtabs; keep cyberpunk navigation and stored fields. ## Live Roll20 checks after local verification diff --git a/data/sheet_model.yaml b/data/sheet_model.yaml index 8cf3587..277408c 100644 --- a/data/sheet_model.yaml +++ b/data/sheet_model.yaml @@ -27,6 +27,11 @@ variants: - {id: general-combat-skills, name: Combat libre, fields: [skillname, skilllevel]} - {id: magic-skills, name: Magie, fields: [skillname, skilllevel]} - {id: equipment, name: Équipement, fields: [name, notes]} + skill_tabs: + - {id: fight, name: Combat et combat libre, content: [fixed_skills, general-combat-skills]} + - {id: free, name: Compétences libres, content: [skills]} + - {id: magic, name: Magie, content: [magic-skills]} + - {id: equipment, name: Équipement, content: [equipment]} cyberpunk: title: Système D10 Cyberpunk skills: cyberpunk_skills.yaml diff --git a/templates/sheet.css b/templates/sheet.css index d319b38..49432a6 100644 --- a/templates/sheet.css +++ b/templates/sheet.css @@ -18,6 +18,7 @@ .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 .sheet-tab-nav { display: grid; grid-template-columns: repeat(3,minmax(0,1fr)); gap: 4px; margin: 14px 0 0; border-bottom: 2px solid var(--d10-accent); } +.sheet-d10.sheet-variant-base .sheet-tab-nav { grid-template-columns: repeat(2,minmax(0,1fr)); } .sheet-d10 .sheet-tab-nav button[type=action] { width: 100%; min-height: 38px; margin: 0 !important; padding: 7px 5px; color: var(--d10-accent); background: var(--d10-background); border: 1px solid var(--d10-border); border-bottom: 0; border-radius: 3px 3px 0 0; box-shadow: none; font: bold 12px Georgia,serif; text-shadow: none; } .sheet-d10 .sheet-tab-nav button[type=action]:hover, .sheet-d10 .sheet-tab-nav button[type=action]:focus { background: var(--d10-panel); outline: 2px solid var(--d10-border); outline-offset: -2px; } .sheet-d10 .sheet-page { display: none; } @@ -25,10 +26,17 @@ .sheet-d10 .sheet-tab-state[value="skills"] ~ .sheet-page-skills, .sheet-d10 .sheet-tab-state[value="combat"] ~ .sheet-page-combat, .sheet-d10 .sheet-tab-state[value="other"] ~ .sheet-page-other { display: block; } +.sheet-d10.sheet-variant-base .sheet-tab-state[value="other"] ~ .sheet-page-skills { display: block; } .sheet-d10 .sheet-tab-state[value="core"] ~ .sheet-tab-nav .sheet-tab-skills, .sheet-d10 .sheet-tab-state[value="skills"] ~ .sheet-tab-nav .sheet-tab-skills, .sheet-d10 .sheet-tab-state[value="combat"] ~ .sheet-tab-nav .sheet-tab-combat, .sheet-d10 .sheet-tab-state[value="other"] ~ .sheet-tab-nav .sheet-tab-other { color: var(--d10-panel); background: var(--d10-accent); border-color: var(--d10-accent); } +.sheet-d10.sheet-variant-base .sheet-tab-state[value="other"] ~ .sheet-tab-nav .sheet-tab-skills { color: var(--d10-panel); background: var(--d10-accent); border-color: var(--d10-accent); } +.sheet-d10 .sheet-skill-tab-nav { display: grid; grid-template-columns: repeat(4,minmax(0,1fr)); gap: 5px; margin: 2px 0 12px; } +.sheet-d10 .sheet-skill-tab-nav button[type=action] { min-height: 37px; margin: 0 !important; padding: 6px 4px; color: var(--d10-accent); background: var(--d10-background); border: 1px solid var(--d10-border); border-radius: 3px; box-shadow: none; font: bold 11px Georgia,serif; text-shadow: none; } +.sheet-d10 .sheet-skill-tab-nav button[type=action]:hover, .sheet-d10 .sheet-skill-tab-nav button[type=action]:focus { background: var(--d10-panel); outline: 2px solid var(--d10-border); outline-offset: -2px; } +.sheet-d10 .sheet-skill-pane { display: none; } +.sheet-d10 .sheet-skill-pane details { margin-top: 0; } .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); } @@ -104,6 +112,12 @@ .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-d10 .sheet-repeater { display: flex; flex-wrap: wrap; gap: 7px; align-items: end; width: 100%; } +.sheet-d10 .sheet-repeater label { flex: 1 1 110px; min-width: 0; } +.sheet-d10 .sheet-repeater .sheet-repeater-skillname, .sheet-d10 .sheet-repeater .sheet-repeater-name, .sheet-d10 .sheet-repeater .sheet-repeater-notes { flex-grow: 2; } +.sheet-d10 .sheet-repeater .sheet-repeater-skilllevel, .sheet-d10 .sheet-repeater .sheet-repeater-skillcost, .sheet-d10 .sheet-repeater .sheet-repeater-quantity, .sheet-d10 .sheet-repeater .sheet-repeater-damage { flex: 0 1 70px; } +.sheet-d10 .sheet-repeater .sheet-repeater-attribute { flex: 1 1 130px; } +.sheet-d10 .sheet-repeater .sheet-roll { flex: 0 0 34px; } .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; } @@ -112,6 +126,7 @@ .sheet-d10 .sheet-hero-mark { width: 42px; height: 42px; font-size: 14px; } .sheet-d10 .sheet-die-choice { grid-column: 2; } .sheet-d10 .sheet-tab-nav button[type=action] { min-height: 36px; padding: 5px 2px; font-size: 10px; } + .sheet-d10 .sheet-skill-tab-nav { grid-template-columns: repeat(2,minmax(0,1fr)); } .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-body-maps { grid-template-columns: 1fr; } } diff --git a/tests/test_build.py b/tests/test_build.py index 417b448..73a76c0 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -23,7 +23,7 @@ class BuildTests(unittest.TestCase): 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-page sheet-page-'), 3) + self.assertEqual(files['sheet.html'].count('class="sheet-page sheet-page-'), 2 if variant == 'base' else 3) self.assertIn('name="attr_d10_tab" value="skills"', files['sheet.html']) self.assertNotIn('name="act_tab_core"', files['sheet.html']) self.assertLess(files['sheet.html'].index('01'), files['sheet.html'].index('class="sheet-tab-nav"')) @@ -31,6 +31,20 @@ class BuildTests(unittest.TestCase): self.assertIn('.sheet-tab-state[value="skills"] ~ .sheet-page-skills', files['sheet.css']) self.assertIn('.sheet-tab-state[value="core"] ~ .sheet-page-skills', files['sheet.css']) self.assertEqual(files['sheet.html'].count('class="sheet-skill-row'), info['skills']) + if variant == 'base': + markup = files['sheet.html'] + self.assertNotIn('name="act_tab_other"', markup) + self.assertEqual(markup.count('class="sheet-skill-pane sheet-skill-pane-'), 4) + self.assertLess(markup.index('name="attr_general_skilllevel_Perfection"'), markup.index('class="sheet-skill-pane sheet-skill-pane-free"')) + for tab, section in (('fight', 'general-combat-skills'), ('free', 'skills'), + ('magic', 'magic-skills'), ('equipment', 'equipment')): + self.assertIn(f'name="act_skill_tab_{tab}"', markup) + self.assertIn(f'.sheet-skill-tab-state[value="{tab}"] ~ .sheet-skill-pane-{tab}', files['sheet.css']) + self.assertLess(markup.index(f'class="sheet-skill-pane sheet-skill-pane-{tab}"'), + markup.index(f'class="repeating_{section}"')) + self.assertEqual(markup.count(f'class="repeating_{section}"'), 1) + else: + self.assertNotIn('class="sheet-skill-pane sheet-skill-pane-', files['sheet.html']) 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.assertIn('.sheet-d10 .sheet-body-maps { display: grid; grid-template-columns: repeat(2,minmax(0,1fr));', files['sheet.css']) @@ -87,6 +101,10 @@ class BuildTests(unittest.TestCase): build.validate(model, skills, {**theme, 'accent': 'red'}) with self.assertRaisesRegex(ValueError, 'unsupported health location'): build.validate({**model, 'health_locations': ['tail']}, skills, theme) + base = {**source['variants']['base'], 'version': 1} + base_skills = build.read_yaml(build.DATA / 'base_skills.yaml') + with self.assertRaisesRegex(ValueError, 'each skill group and repeating section exactly once'): + build.validate({**base, 'skill_tabs': base['skill_tabs'][:-1]}, base_skills, theme) if __name__ == '__main__': diff --git a/tests/test_tabs.mjs b/tests/test_tabs.mjs index 719b179..2861556 100644 --- a/tests/test_tabs.mjs +++ b/tests/test_tabs.mjs @@ -2,8 +2,9 @@ import assert from 'node:assert/strict'; import { readFileSync } from 'node:fs'; import vm from 'node:vm'; -const tabs = ['skills', 'combat', 'other']; for (const variant of ['base', 'cyberpunk']) { + const tabs = variant === 'base' ? ['skills', 'combat'] : ['skills', 'combat', 'other']; + const skillTabs = variant === 'base' ? ['fight', 'free', 'magic', 'equipment'] : []; const html = readFileSync(`build/${variant}/parchment/sheet.html`, 'utf8'); const script = html.match(/\n' return html_text, css