Publish one sheet per variant with base theme selector

This commit is contained in:
Dandaedre 2026-09-19 01:29:24 +02:00
parent d2e036d660
commit 62ec90fa91
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
9 changed files with 85 additions and 72 deletions

4
Jenkinsfile vendored
View File

@ -49,10 +49,10 @@ pipeline {
sh '''
set -eu
mkdir -p "$DEPLOY_DIR"
rsync -a RPG/d10_character_sheet/ "$DEPLOY_DIR/"
rsync -a --delete RPG/d10_character_sheet/ "$DEPLOY_DIR/"
test -f "$DEPLOY_DIR/assets/robotman_health_r.png"
test -f "$DEPLOY_DIR/assets/robotman_armor_r.png"
test -f "$DEPLOY_DIR/cyberpunk/parchment/sheet.html"
test -f "$DEPLOY_DIR/cyberpunk/sheet.html"
'''
}
}

View File

@ -20,7 +20,7 @@ python -m venv .venv
./build.sh --clean
```
`build.sh` génère toutes les variantes et tous les thèmes sous
`build.sh` génère les deux variantes avec leurs sélecteurs de thème sous
`RPG/d10_character_sheet/`. Avec `--clean`, il supprime d'abord ce dossier
ainsi que `build/`, puis reconstruit les fichiers publiables. Il utilise
`.venv/bin/python` si disponible, sinon `python3` avec les dépendances déjà
@ -63,12 +63,13 @@ Le choix principal est stocké dans `d10_tab`, celui des sous-onglets base dans
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.
**Arsenal** contient **Distance**, **Mêlée** et **Consommable**. Les armes restent
dans les sections répétables `distance` et `melee`. Le sélecteur de thème dans l'en-tête conserve
dans les sections répétables `distance` et `melee`. Le sélecteur de thème dans l'en-tête des deux variantes conserve
le choix dans `d10_theme_choice` et applique immédiatement la palette via
`d10_theme`. Les 18 palettes du dossier local `styles/themes/` ont été
`d10_theme`. La variante base propose **Parchemin** et **Nuit** uniquement.
Les 18 palettes du dossier local `styles/themes/` ont été
adaptées aux cinq couleurs de la feuille et copiées dans `data/themes.yaml`;
le build ne dépend pas de ce dossier. `parchment` et `night` restent disponibles
sous les noms **Parchemin** et **Nuit** dans le sélecteur.
sous les noms **Parchemin** et **Nuit** dans le sélecteur cyberpunk.
`--theme` choisit le thème initial; tous les thèmes modifient seulement les
couleurs et la visibilité de la silhouette, sans modifier les champs ni les jets.
@ -119,13 +120,12 @@ Charger le HTML généré dans l'éditeur Roll20 avec le CSS et la traduction.
L'agent Jenkins doit disposer de Python 3 avec `venv`. Le test JavaScript des
onglets s'exécute si Node.js est présent; son absence ne bloque pas la
publication. Le `Jenkinsfile` exécute les tests Python, construit les deux
variantes dans les 20
thèmes et archive tous les résultats sous `RPG/d10_character_sheet/`. Le
publication. Le `Jenkinsfile` exécute les tests Python, construit une feuille
par variante et archive les résultats sous `RPG/d10_character_sheet/`. Le
dossier `RPG/d10_character_sheet/assets/` contient les deux PNG originaux. Les
fichiers HTML, CSS et JSON de chaque build sont dans
`RPG/d10_character_sheet/<variante>/<thème>/`. La commande locale équivalente
est :
`RPG/d10_character_sheet/<variante>/`. Les anciens dossiers par thème sont
supprimés lors de la publication. La commande locale équivalente est :
```sh
.venv/bin/python tools/publish_builds.py
@ -142,13 +142,14 @@ Les builds Jenkins utilisent désormais directement l'URL publique du dossier
```sh
.venv/bin/python -m unittest discover -s tests -v
.venv/bin/python tools/build.py --variant base --theme parchment --check
.venv/bin/python tools/build.py --variant cyberpunk --theme night --check
node tests/test_tabs.mjs
./build.sh
.venv/bin/python tools/build.py --variant base --theme parchment --output-dir RPG/d10_character_sheet/base --check
.venv/bin/python tools/build.py --variant cyberpunk --theme parchment --output-dir RPG/d10_character_sheet/cyberpunk --check
D10_BUILD_ROOT=RPG/d10_character_sheet node tests/test_tabs.mjs
```
Le test Node utilise les builds `base/parchment` et `cyberpunk/parchment`;
construire ces deux variantes avant de l'exécuter. `--check` compare les
Le test Node utilise les builds publiés `base` et `cyberpunk`;
exécuter `./build.sh` avant de le lancer. `--check` compare les
fichiers existants aux sources sans les réécrire. Les tests vérifient la
génération, les références d'attribut et les actions des onglets, mais ne
simulent pas l'affichage, le parseur de dés ou la sauvegarde de Roll20.

View File

@ -31,6 +31,7 @@
- [x] Add a root build script for all publishable variants with an optional clean rebuild.
- [x] Move cyberpunk Arsenal from Skills into Combat while preserving its subtabs and repeating sections.
- [x] Add Rmax to ranged and melee weapons; cap single strikes and apply base damage per success for burst and automatic fire.
- [x] Publish one build per variant and add a base-only Parchemin/Nuit selector.
## Live Roll20 checks after local verification

View File

@ -10,8 +10,7 @@
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-variant-cyberpunk .sheet-hero { grid-template-columns: 60px minmax(0,1fr) 112px 170px; }
.sheet-d10 .sheet-hero { display: grid; grid-template-columns: 60px minmax(0,1fr) 112px 170px; 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; }
@ -139,7 +138,6 @@
.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-variant-cyberpunk .sheet-hero { grid-template-columns: 45px minmax(0,1fr); }
.sheet-d10 .sheet-hero-mark { width: 42px; height: 42px; font-size: 14px; }
.sheet-d10 .sheet-die-choice { grid-column: 2; }
.sheet-d10 .sheet-theme-choice { grid-column: 2; }

View File

@ -29,6 +29,8 @@ class BuildTests(unittest.TestCase):
self.assertIn('class="sheet-skill-head"', files['sheet.html'])
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.assertIn('name="attr_d10_theme_choice"', files['sheet.html'])
self.assertIn(f'.sheet-theme-state[value="{theme}"] ~ .sheet-d10', files['sheet.css'])
self.assertNotIn('name="act_tab_core"', files['sheet.html'])
self.assertLess(files['sheet.html'].index('01</span>'), files['sheet.html'].index('class="sheet-tab-nav"'))
self.assertLess(files['sheet.html'].index('02</span>'), files['sheet.html'].index('class="sheet-tab-nav"'))
@ -37,6 +39,10 @@ class BuildTests(unittest.TestCase):
self.assertEqual(files['sheet.html'].count('class="sheet-skill-row'), info['skills'])
if variant == 'base':
markup = files['sheet.html']
self.assertIn('<option value="parchment"', markup)
self.assertIn('<option value="night"', markup)
self.assertNotIn('<option value="bluecore"', markup)
self.assertNotIn('.sheet-theme-state[value="bluecore"]', files['sheet.css'])
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"'))
@ -139,21 +145,25 @@ class BuildTests(unittest.TestCase):
self.assertNotIn('robotman_health_r.png', markup)
def test_theme_is_visual_only(self):
with tempfile.TemporaryDirectory() as tmp:
one = build.build('cyberpunk', 'parchment', Path(tmp))
two = build.build('cyberpunk', 'night', Path(tmp))
def normalize(markup, theme):
markup = markup.replace(f'theme-{theme}', 'theme-compiled').replace(' selected', '')
return re.sub(r'(class="sheet-theme-state" name="attr_d10_theme" value=")[^"]+',
r'\1compiled', markup)
self.assertEqual(normalize(one['sheet.html'], 'parchment'), normalize(two['sheet.html'], 'night'))
self.assertNotEqual(one['sheet.css'], two['sheet.css'])
for variant in ('base', 'cyberpunk'):
with self.subTest(variant=variant), tempfile.TemporaryDirectory() as tmp:
one = build.build(variant, 'parchment', Path(tmp))
two = build.build(variant, 'night', Path(tmp))
def normalize(markup, theme):
markup = markup.replace(f'theme-{theme}', 'theme-compiled').replace(' selected', '')
return re.sub(r'(class="sheet-theme-state" name="attr_d10_theme" value=")[^"]+',
r'\1compiled', markup)
self.assertEqual(normalize(one['sheet.html'], 'parchment'), normalize(two['sheet.html'], 'night'))
self.assertNotEqual(one['sheet.css'], two['sheet.css'])
def test_corporate_theme_selector(self):
themes = build.read_yaml(build.DATA / 'themes.yaml')['themes']
self.assertEqual(len(themes), 20)
self.assertEqual(themes['parchment']['name'], 'Parchemin')
self.assertEqual(themes['night']['name'], 'Nuit')
with tempfile.TemporaryDirectory() as tmp:
with self.assertRaisesRegex(ValueError, 'unknown theme for base'):
build.build('base', 'bluecore', Path(tmp))
def luminance(color):
channels = [int(color[index:index + 2], 16) / 255 for index in (1, 3, 5)]
linear = [value / 12.92 if value <= 0.04045 else ((value + 0.055) / 1.055) ** 2.4

View File

@ -10,7 +10,6 @@ import publish_builds
class PublishBuildsTests(unittest.TestCase):
def test_complete_artifact_tree(self):
themes = build.read_yaml(build.DATA / 'themes.yaml')['themes']
with tempfile.TemporaryDirectory() as tmp:
root = publish_builds.publish(Path(tmp) / 'RPG' / 'd10_character_sheet')
for kind in ('health', 'armor'):
@ -18,15 +17,17 @@ class PublishBuildsTests(unittest.TestCase):
self.assertEqual((root / 'assets' / filename).read_bytes(),
(build.ASSETS / filename).read_bytes())
for variant in ('base', 'cyberpunk'):
self.assertEqual({path.name for path in (root / variant).iterdir()}, set(themes))
for theme in themes:
target = root / variant / theme
self.assertTrue((target / 'sheet.html').is_file())
self.assertTrue((target / 'sheet.css').is_file())
if variant == 'cyberpunk':
self.assertIn(build.DEFAULT_ASSET_BASE_URL + 'robotman_health_r.png',
(target / 'sheet.html').read_text(encoding='utf-8'))
build.build(variant, theme, target, check=True)
target = root / variant
self.assertTrue((target / 'sheet.html').is_file())
self.assertTrue((target / 'sheet.css').is_file())
self.assertFalse((target / 'night').exists())
if variant == 'cyberpunk':
self.assertIn(build.DEFAULT_ASSET_BASE_URL + 'robotman_health_r.png',
(target / 'sheet.html').read_text(encoding='utf-8'))
build.build(variant, 'parchment', target, check=True)
(root / 'cyberpunk' / 'night').mkdir()
publish_builds.publish(root)
self.assertFalse((root / 'cyberpunk' / 'night').exists())
if __name__ == '__main__':

View File

@ -2,14 +2,14 @@ import assert from 'node:assert/strict';
import { readFileSync } from 'node:fs';
import vm from 'node:vm';
const buildRoot = process.env.D10_BUILD_ROOT ?? 'build';
const buildRoot = process.env.D10_BUILD_ROOT ?? 'RPG/d10_character_sheet';
for (const variant of ['base', 'cyberpunk']) {
const tabs = variant === 'base' ? ['skills', 'combat'] : ['skills', 'combat', 'other'];
const skillTabs = variant === 'base' ? ['fight', 'free', 'magic', 'equipment'] : [];
const categoryTabs = variant === 'cyberpunk' ? ['physique', 'intellectuelles', 'social'] : [];
const arsenalTabs = variant === 'cyberpunk' ? ['distance', 'melee', 'consommable'] : [];
const html = readFileSync(`${buildRoot}/${variant}/parchment/sheet.html`, 'utf8');
const html = readFileSync(`${buildRoot}/${variant}/sheet.html`, 'utf8');
const script = html.match(/<script type="text\/worker">\s*([\s\S]*?)<\/script>/)?.[1];
assert.ok(script, `${variant}: generated sheet worker`);
const handlers = new Map();
@ -33,7 +33,7 @@ for (const variant of ['base', 'cyberpunk']) {
},
finishRoll: (id, computed) => finished.push({ id, computed }),
});
assert.equal(handlers.size, tabs.length + skillTabs.length + categoryTabs.length + arsenalTabs.length + (variant === 'cyberpunk' ? 8 : 0));
assert.equal(handlers.size, tabs.length + skillTabs.length + categoryTabs.length + arsenalTabs.length + 1 + (variant === 'cyberpunk' ? 7 : 0));
assert.ok(!handlers.has('clicked:tab_core'));
for (const tab of tabs) {
assert.match(html, new RegExp(`name="act_tab_${tab}"`));
@ -66,11 +66,14 @@ for (const variant of ['base', 'cyberpunk']) {
assert.ok(!handlers.has('clicked:category_tab_arsenal'));
assert.match(html, /class="sheet-page sheet-page-combat"[\s\S]*name="attr_d10_arsenal_tab"[\s\S]*class="sheet-page sheet-page-skills"/);
}
assert.match(html, /name="attr_d10_theme_choice"/);
assert.match(html, /name="attr_d10_theme" value="parchment"/);
handlers.get('change:d10_theme_choice')({ newValue: variant === 'base' ? 'night' : 'bluecore' });
assert.equal(attributes.d10_theme, variant === 'base' ? 'night' : 'bluecore');
if (variant === 'base') {
assert.ok(!html.includes('<option value="bluecore"'));
}
if (variant === 'cyberpunk') {
assert.match(html, /name="attr_d10_theme_choice"/);
assert.match(html, /name="attr_d10_theme" value="parchment"/);
handlers.get('change:d10_theme_choice')({ newValue: 'bluecore' });
assert.equal(attributes.d10_theme, 'bluecore');
const ranged = 'repeating_distance_-test_';
Object.assign(attributes, {
dice: '10', combat_skilllevel_armesfeu: '3',

View File

@ -13,6 +13,7 @@ ROOT = Path(__file__).resolve().parents[1]
DATA = ROOT / 'data'
ASSETS = ROOT / 'assets'
DEFAULT_ASSET_BASE_URL = 'https://books.dandaedre.com/RPG/d10_character_sheet/assets/'
BASE_THEMES = ('parchment', 'night')
IDENT = re.compile(r'^[A-Za-z][A-Za-z0-9_-]*$')
COLOR = re.compile(r'^#[0-9a-fA-F]{6}$')
TABS = (('skills', 'Compétences'), ('combat', 'Combat'), ('other', 'Autres'))
@ -279,9 +280,8 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
tabs = TABS[:-1] if model.get('skill_tabs') else TABS
switchable = variant == 'cyberpunk'
parts = []
if switchable:
parts.extend(['<div class="sheet-theme-shell">',
f'<input type="hidden" class="sheet-theme-state" name="attr_d10_theme" value="{esc(theme_name)}">'])
parts.extend(['<div class="sheet-theme-shell">',
f'<input type="hidden" class="sheet-theme-state" name="attr_d10_theme" value="{esc(theme_name)}">'])
parts.extend([f'<div class="sheet-d10 sheet-variant-{variant} sheet-theme-{esc(theme_name)}">',
'<header class="sheet-hero"><div class="sheet-hero-mark">D10</div>',
f'<div class="sheet-hero-main"><span class="sheet-eyebrow">Feuille de personnage</span><h1>{esc(model["title"])}</h1>',
@ -291,10 +291,9 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
f'<option value="{n}"{" selected" if n == 10 else ""}>d{n}</option>'
for n in (4, 6, 8, 10, 12, 20)) + '</select></label>',
])
if switchable:
parts.append('<label class="sheet-theme-choice">Thème <select name="attr_d10_theme_choice">' + ''.join(
f'<option value="{esc(key)}"{" selected" if key == theme_name else ""}>{esc(palette.get("name", key))}</option>'
for key, palette in themes.items()) + '</select></label>')
parts.append('<label class="sheet-theme-choice">Thème <select name="attr_d10_theme_choice">' + ''.join(
f'<option value="{esc(key)}"{" selected" if key == theme_name else ""}>{esc(palette.get("name", key))}</option>'
for key, palette in themes.items()) + '</select></label>')
parts.extend(['</header>',
'<section class="sheet-panel"><div class="sheet-section-title"><span>01</span><h2>Caractéristiques</h2></div>',
'<div class="sheet-stat-grid">'])
@ -404,19 +403,17 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
parts.append(render_repeating_block(block, model['attributes']))
parts.append('</section></div>')
parts.append('</div>')
if switchable:
parts.append('</div>')
parts.append('</div>')
html_text = '\n'.join(parts) + '\n'
css = ('.sheet-d10, .sheet-rolltemplate-d10skillcheck, .sheet-rolltemplate-d10weapon, .sheet-rolltemplate-d10contact, .sheet-rolltemplate-d10consumable {\n' + '\n'.join(
f' --d10-{key}: {theme[key]};' for key in ('background', 'panel', 'ink', 'accent', 'border')) +
f'\n --d10-figure-filter: {figure_filter(theme["background"])};\n}}\n')
css += (ROOT / 'templates' / 'sheet.css').read_text(encoding='utf-8')
if switchable:
for key, palette in themes.items():
css += f'\n.sheet-theme-state[value="{key}"] ~ .sheet-d10 {{\n'
css += '\n'.join(f' --d10-{color}: {palette[color]};' for color in
('background', 'panel', 'ink', 'accent', 'border'))
css += f'\n --d10-figure-filter: {figure_filter(palette["background"])};\n}}\n'
for key, palette in themes.items():
css += f'\n.sheet-theme-state[value="{key}"] ~ .sheet-d10 {{\n'
css += '\n'.join(f' --d10-{color}: {palette[color]};' for color in
('background', 'panel', 'ink', 'accent', 'border'))
css += f'\n --d10-figure-filter: {figure_filter(palette["background"])};\n}}\n'
if model.get('skill_tabs'):
css += '\n'.join(
f'.sheet-d10 .sheet-skill-tab-state[value="{tab["id"]}"] ~ .sheet-skill-pane-{tab["id"]} {{ display: block; }}\n'
@ -476,8 +473,8 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
html_text += ''.join(
f'on("clicked:arsenal_tab_{key}", function () {{ setAttrs({{d10_arsenal_tab: "{key}"}}); }});\n'
for key in arsenal)
html_text += 'on("change:d10_theme_choice", function (event) { setAttrs({d10_theme: event.newValue}); });\n'
if switchable:
html_text += 'on("change:d10_theme_choice", function (event) { setAttrs({d10_theme: event.newValue}); });\n'
weapon_skills = combat_skills(skills)
worker = (ROOT / 'templates' / 'cyberpunk-weapons.js').read_text(encoding='utf-8')
html_text += worker.replace('__COMBAT_SKILLS__', json.dumps([skill['id'] for skill in weapon_skills]))
@ -490,17 +487,18 @@ def build(variant, theme_name, output, check=False, asset_base_url=None):
themes = read_yaml(DATA / 'themes.yaml')['themes']
if variant not in source['variants']:
raise ValueError(f'unknown variant: {variant}')
if theme_name not in themes:
raise ValueError(f'unknown theme: {theme_name}')
allowed_themes = ({key: themes[key] for key in BASE_THEMES} if variant == 'base' else themes)
if theme_name not in allowed_themes:
raise ValueError(f'unknown theme for {variant}: {theme_name}')
if asset_base_url is None:
asset_base_url = DEFAULT_ASSET_BASE_URL
if asset_base_url and not re.fullmatch(r'https://[^\s<>"\']+', asset_base_url):
raise ValueError('asset base URL must be HTTPS')
model = source['variants'][variant]
skills = read_yaml(DATA / model['skills'])
theme = themes[theme_name]
theme = allowed_themes[theme_name]
validate({**model, 'version': source['version']}, skills, theme)
html_text, css = render(model, skills, variant, theme_name, theme, themes, asset_base_url)
html_text, css = render(model, skills, variant, theme_name, theme, allowed_themes, asset_base_url)
manifest = {'html': 'sheet.html', 'css': 'sheet.css', 'authors': 'Dandaedre',
'roll20userid': '1067910', 'instructions': f'{model["title"]} generated from D10 YAML'}
translation = {}
@ -534,7 +532,7 @@ def build(variant, theme_name, output, check=False, asset_base_url=None):
def main():
parser = argparse.ArgumentParser()
parser.add_argument('--variant', choices=('base', 'cyberpunk'), default='base')
parser.add_argument('--theme', choices=tuple(read_yaml(DATA / 'themes.yaml')['themes']), default='parchment')
parser.add_argument('--theme', default='parchment')
parser.add_argument('--output-dir', type=Path)
parser.add_argument('--list-themes', action='store_true')
parser.add_argument('--check', action='store_true', help='verify existing output without writing')
@ -542,7 +540,8 @@ def main():
help='override the default public HTTPS image directory; pass an empty value for local preview')
args = parser.parse_args()
if args.list_themes:
print('\n'.join(read_yaml(DATA / 'themes.yaml')['themes']))
themes = read_yaml(DATA / 'themes.yaml')['themes']
print('\n'.join(BASE_THEMES if args.variant == 'base' else themes))
return
output = args.output_dir or ROOT / 'build' / args.variant / args.theme
try:

View File

@ -11,7 +11,6 @@ DEFAULT_OUTPUT = build.ROOT / 'RPG' / 'd10_character_sheet'
def publish(output=DEFAULT_OUTPUT):
themes = build.read_yaml(build.DATA / 'themes.yaml')['themes']
output.mkdir(parents=True, exist_ok=True)
assets = output / 'assets'
assets.mkdir(exist_ok=True)
@ -19,10 +18,11 @@ def publish(output=DEFAULT_OUTPUT):
filename = f'robotman_{kind}_r.png'
shutil.copyfile(build.ASSETS / filename, assets / filename)
for variant in ('base', 'cyberpunk'):
for theme in themes:
target = output / variant / theme
build.build(variant, theme, target)
build.build(variant, theme, target, check=True)
target = output / variant
if target.exists():
shutil.rmtree(target)
build.build(variant, 'parchment', target)
build.build(variant, 'parchment', target, check=True)
return output