diff --git a/README.md b/README.md index 391c625..7648c0e 100644 --- a/README.md +++ b/README.md @@ -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, diff --git a/TASKS.md b/TASKS.md index cdd3305..10245b1 100644 --- a/TASKS.md +++ b/TASKS.md @@ -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 diff --git a/data/sheet_model.yaml b/data/sheet_model.yaml index 79ef1e7..bd1658b 100644 --- a/data/sheet_model.yaml +++ b/data/sheet_model.yaml @@ -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]} diff --git a/templates/sheet.css b/templates/sheet.css index 28e85bb..a24b27e 100644 --- a/templates/sheet.css +++ b/templates/sheet.css @@ -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; } diff --git a/tests/test_build.py b/tests/test_build.py index 4135f03..4bdf364 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -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) diff --git a/tools/build.py b/tools/build.py index 6ec8816..75d6b57 100644 --- a/tools/build.py +++ b/tools/build.py @@ -321,17 +321,24 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='') '