Keep only initiative in cyberpunk combat

This commit is contained in:
Dandaedre 2026-09-19 01:03:11 +02:00
parent 81e7f319b2
commit 4bd054f789
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
6 changed files with 35 additions and 16 deletions

View File

@ -37,6 +37,9 @@ 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**.
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.
Le choix principal est stocké dans `d10_tab`, celui des sous-onglets base dans
`d10_skill_tab` et celui des catégories cyberpunk dans `d10_category_tab`.
Les personnages qui avaient enregistré `core` ou, pour la variante base,

View File

@ -22,6 +22,7 @@
- [x] Link the published body images in generated cyberpunk HTML by default, with a local preview override.
- [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.
## Live Roll20 checks after local verification

View File

@ -50,11 +50,7 @@ variants:
- {id: Endurance_Points, name: Points de fatigue}
combat:
- {id: Initiative, name: Initiative}
- {id: base_damage_dices, name: Dégâts de base}
- {id: exal_damage_dices, name: Bonus de dégâts}
- {id: general_attack_threshold, name: Seuil d'attaque}
health_locations: [head, body, left_arm, right_arm, left_leg, right_leg]
weapons: 3
repeating:
- {id: skills, name: Compétences libres, fields: [skillname, skilllevel, skillcost]}
- {id: contacts-skills, name: Contacts, fields: [skillname, skilllevel]}

View File

@ -87,6 +87,8 @@
.sheet-d10 .sheet-map-legend { margin: 0; color: var(--d10-accent); font: italic 11px Georgia,serif; text-align: center; }
.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-field-initiative { grid-template-columns: 90px 34px; align-items: end; justify-content: start; gap: 9px; }
.sheet-d10 .sheet-combat-field-initiative label { display: grid; gap: 4px; margin: 0 !important; color: var(--d10-accent); }
.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; }

View File

@ -82,9 +82,15 @@ class BuildTests(unittest.TestCase):
self.assertEqual(len(declared), len(set(declared)))
self.assertIn('base-Force', declared)
self.assertIn('Life_Points', declared)
self.assertIn('general_attack_threshold', declared)
self.assertIn('general_item_weapon1', declared)
if variant == 'cyberpunk':
self.assertIn('Initiative', declared)
self.assertNotIn('general_attack_threshold', declared)
self.assertNotIn('base_damage_dices', declared)
self.assertNotIn('exal_damage_dices', declared)
self.assertNotIn('general_item_weapon1', declared)
self.assertNotIn('Jets de combat', markup)
self.assertNotIn('Armes équipées', markup)
self.assertIn('class="sheet-combat-field sheet-combat-field-initiative"', markup)
self.assertIn('Life_Points_head', declared)
self.assertIn('repeating_distance', markup)
self.assertIn('class="sheet-body-maps"', markup)
@ -100,6 +106,10 @@ class BuildTests(unittest.TestCase):
self.assertEqual(markup.count(f'name="attr_{prefix}_{location}"'), 1)
self.assertEqual(markup.count(f'name="attr_Armor_Integrity_Points_{location}_maximum"'), 1)
else:
self.assertIn('general_attack_threshold', declared)
self.assertIn('general_item_weapon1', declared)
self.assertIn('Jets de combat', markup)
self.assertIn('Armes équipées', markup)
self.assertNotIn('class="sheet-body-maps"', markup)
self.assertNotIn('robotman_health_r.png', markup)

View File

@ -321,17 +321,24 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
'</nav><div class="sheet-page sheet-page-combat"><section class="sheet-panel"><div class="sheet-section-title"><span>03</span><h2>Combat</h2></div><div class="sheet-combat-grid">',
])
for item in model.get('combat', []):
parts.append(f'<label class="sheet-combat-field">{esc(item["name"])}'
if switchable:
field = (f'<label>{esc(item["name"])}'
f'<input type="number" name="attr_{esc(item["id"])}" value="0"></label>')
parts.append('</div><div class="sheet-combat-actions"><span>Jets de combat</span>')
parts.append(roll('Initiative', '@{base-Agilite}+@{exal-Agilite}+@{Initiative}'))
parts.append(roll('Attaque', '@{general_attack_threshold}'))
parts.append('</div><h3 class="sheet-subheading">Armes équipées</h3><div class="sheet-weapon-grid">')
for number in range(1, model.get('weapons', 0) + 1):
parts.append(f'<div class="sheet-weapon"><span>Arme {number}</span>'
f'<input type="text" name="attr_general_item_weapon{number}_name" title="Nom">'
f'<input type="number" name="attr_general_item_weapon{number}" value="0" title="Dégâts">'
f'<input type="checkbox" name="attr_item_weapon{number}_activation" value="1" title="Équipée"></div>')
parts.append('<div class="sheet-combat-field sheet-combat-field-initiative">' + field +
roll('Initiative', '@{base-Agilite}+@{exal-Agilite}+@{Initiative}') + '</div>')
else:
parts.append(f'<label class="sheet-combat-field">{esc(item["name"])}'
f'<input type="number" name="attr_{esc(item["id"])}" value="0"></label>')
if not switchable:
parts.append('</div><div class="sheet-combat-actions"><span>Jets de combat</span>')
parts.append(roll('Initiative', '@{base-Agilite}+@{exal-Agilite}+@{Initiative}'))
parts.append(roll('Attaque', '@{general_attack_threshold}'))
parts.append('</div><h3 class="sheet-subheading">Armes équipées</h3><div class="sheet-weapon-grid">')
for number in range(1, model.get('weapons', 0) + 1):
parts.append(f'<div class="sheet-weapon"><span>Arme {number}</span>'
f'<input type="text" name="attr_general_item_weapon{number}_name" title="Nom">'
f'<input type="number" name="attr_general_item_weapon{number}" value="0" title="Dégâts">'
f'<input type="checkbox" name="attr_item_weapon{number}_activation" value="1" title="Équipée"></div>')
parts.append('</div></section></div><div class="sheet-page sheet-page-skills"><section class="sheet-panel"><div class="sheet-section-title"><span>04</span><h2>Compétences</h2></div>')
if model.get('skill_tabs'):
skill_tabs = model['skill_tabs']