Show cyberpunk contacts without characteristic rolls

This commit is contained in:
Dandaedre 2026-09-19 01:04:41 +02:00
parent 4bd054f789
commit 78bc804d16
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
5 changed files with 28 additions and 7 deletions

View File

@ -37,6 +37,8 @@ gardent leurs noms d'attributs et de section. La variante cyberpunk conserve
les onglets **Compétences**, **Combat** et **Autres**. Ses sous-onglets issus du
catalogue YAML sont **Physique**, **Intellectuelles**, **Social** et **Arsenal**.
Les compétences libres et les contacts répétables restent dans **Autres**.
Les contacts ont un nom et un niveau, sans caractéristique associée. Leur
bouton **Show** affiche ces informations dans le chat sans lancer de dé.
L'onglet **Combat** cyberpunk contient seulement l'initiative et son jet;
les attaques et dégâts des armes sont gérés dans **Arsenal**. La variante base
conserve ses champs de combat génériques et ses armes équipées.

View File

@ -23,6 +23,7 @@
- [x] Improve roll result contrast and spacing in the chat template across light and dark themes.
- [x] Restore cyberpunk Arsenal subtabs and add functional ranged and melee weapon attacks, damage, ammunition checks, and reloads.
- [x] Reduce cyberpunk Combat to initiative and its roll; keep generic combat fields and equipped weapons in base only.
- [x] Remove the characteristic selector from cyberpunk contacts and replace their dice roll with a Show chat card.
## Live Roll20 checks after local verification

View File

@ -105,6 +105,7 @@
.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-show { width: 52px; min-width: 52px; }
.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); }
@ -117,6 +118,7 @@
.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-d10 .sheet-repeater .sheet-show { flex-basis: 52px; }
.sheet-d10 .sheet-weapon-repeater { display: grid; grid-template-columns: repeat(6,minmax(0,1fr)); gap: 9px; padding: 10px; background: var(--d10-background); border: 1px solid var(--d10-border); }
.sheet-d10 .sheet-weapon-field { display: grid; gap: 3px; min-width: 0; margin: 0 !important; color: var(--d10-accent); font: bold 10px Arial,sans-serif; text-transform: uppercase; }
.sheet-d10 .sheet-weapon-field input, .sheet-d10 .sheet-weapon-field select { min-width: 0; }
@ -125,14 +127,14 @@
.sheet-d10 .sheet-weapon-actions { display: flex; flex-wrap: wrap; gap: 6px; grid-column: 1/-1; }
.sheet-d10 .sheet-weapon-actions button[type=action] { min-height: 30px; margin: 0 !important; padding: 3px 9px; color: var(--d10-panel); background: var(--d10-accent); border: 1px solid var(--d10-accent); border-radius: 2px; box-shadow: none; font: bold 11px Arial,sans-serif; text-shadow: none; }
.sheet-d10 .sheet-weapon-status { grid-column: 1/-1; min-height: 16px; color: var(--d10-accent); font: 11px Arial,sans-serif; }
.sheet-rolltemplate-d10skillcheck, .sheet-rolltemplate-d10weapon { overflow: hidden; 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; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title, .sheet-rolltemplate-d10weapon .sheet-roll-title { display: flex; flex-wrap: wrap; align-items: baseline; gap: 3px 7px; padding: 7px 9px; border-bottom: 1px solid var(--d10-border); }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title strong, .sheet-rolltemplate-d10weapon .sheet-roll-title strong { font-size: 14px; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title span, .sheet-rolltemplate-d10weapon .sheet-roll-title span { opacity: .85; }
.sheet-rolltemplate-d10skillcheck, .sheet-rolltemplate-d10weapon, .sheet-rolltemplate-d10contact { overflow: hidden; 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; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title, .sheet-rolltemplate-d10weapon .sheet-roll-title, .sheet-rolltemplate-d10contact .sheet-roll-title { display: flex; flex-wrap: wrap; align-items: baseline; gap: 3px 7px; padding: 7px 9px; border-bottom: 1px solid var(--d10-border); }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title strong, .sheet-rolltemplate-d10weapon .sheet-roll-title strong, .sheet-rolltemplate-d10contact .sheet-roll-title strong { font-size: 14px; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-title span, .sheet-rolltemplate-d10weapon .sheet-roll-title span, .sheet-rolltemplate-d10contact .sheet-roll-title span { opacity: .85; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-values, .sheet-rolltemplate-d10weapon .sheet-roll-values { display: grid; grid-template-columns: auto minmax(36px,auto) auto minmax(36px,auto); gap: 6px; align-items: center; justify-content: start; padding: 8px 9px; }
.sheet-rolltemplate-d10skillcheck .sheet-roll-value, .sheet-rolltemplate-d10weapon .sheet-roll-value { min-width: 30px; text-align: center; }
.sheet-rolltemplate-d10skillcheck .inlinerollresult, .sheet-rolltemplate-d10weapon .inlinerollresult { display: inline-block; min-width: 28px; padding: 2px 5px; color: #20242b !important; background: #ffffff !important; border: 1px solid #68717d !important; border-radius: 3px; font-weight: bold; text-align: center; text-shadow: none !important; }
.sheet-rolltemplate-d10weapon .sheet-roll-detail { padding: 4px 9px; border-top: 1px solid var(--d10-border); }
.sheet-rolltemplate-d10weapon .sheet-roll-detail, .sheet-rolltemplate-d10contact .sheet-roll-detail { padding: 4px 9px; border-top: 1px solid var(--d10-border); }
@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; }

View File

@ -59,6 +59,14 @@ class BuildTests(unittest.TestCase):
self.assertIn(f'name="act_{action}"', files['sheet.html'])
self.assertIn('name="attr_ammo_current"', files['sheet.html'])
self.assertIn('name="attr_damage_per_success"', files['sheet.html'])
contacts = re.search(r'<fieldset class="repeating_contacts-skills">(.*?)</fieldset>',
files['sheet.html'], re.DOTALL)
self.assertIsNotNone(contacts)
self.assertNotIn('attr_attribute_select', contacts.group(1))
self.assertNotIn('Caractéristique', contacts.group(1))
self.assertIn('>Show</button>', contacts.group(1))
self.assertIn('&amp;{template:d10contact}', contacts.group(1))
self.assertIn('sheet-rolltemplate-d10contact', 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'])

View File

@ -225,7 +225,10 @@ def render_repeating_block(block, attributes, expanded=False):
for field in block['fields']:
kind = 'number' if field in ('skilllevel', 'skillcost', 'quantity', 'damage') else 'text'
parts.append(f'<label class="sheet-repeater-{field}">{esc(FIELD_LABELS.get(field, field))}<input type="{kind}" name="attr_{esc(field)}"></label>')
if 'skilllevel' in block['fields']:
if block['id'] == 'contacts-skills':
command = '&{template:d10contact} {{name=@{skillname}}} {{level=@{skilllevel}}}'
parts.append(f'<button type="roll" class="sheet-roll sheet-show" value="{esc(command)}" title="Afficher le contact">Show</button>')
elif 'skilllevel' in block['fields']:
options = ''.join(
f'<option value="@{{base-{item["id"]}}}+@{{exal-{item["id"]}}}">{esc(item["name"])}</option>'
for item in attributes)
@ -400,7 +403,7 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
if switchable:
parts.append('</div>')
html_text = '\n'.join(parts) + '\n'
css = ('.sheet-d10, .sheet-rolltemplate-d10skillcheck, .sheet-rolltemplate-d10weapon {\n' + '\n'.join(
css = ('.sheet-d10, .sheet-rolltemplate-d10skillcheck, .sheet-rolltemplate-d10weapon, .sheet-rolltemplate-d10contact {\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')
@ -432,6 +435,11 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
</rolltemplate>
'''
if variant == 'cyberpunk':
html_text += '''<rolltemplate class="sheet-rolltemplate-d10contact">
<div class="sheet-roll-title"><strong>Contact</strong><span>{{name}}</span></div>
<div class="sheet-roll-detail">Niveau : {{level}}</div>
</rolltemplate>
'''
html_text += '''<rolltemplate class="sheet-rolltemplate-d10weapon">
<div class="sheet-roll-title"><strong>{{name}}</strong><span>{{mode}}</span></div>
{{#type}}<div class="sheet-roll-detail">{{type}}</div>{{/type}}