From 81e7f319b22df6fe721004e46c183d5ac24cde7e Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 19 Sep 2026 01:01:34 +0200 Subject: [PATCH] Expand cyberpunk arsenal weapons and actions --- README.md | 22 +++++-- TASKS.md | 1 + data/cyberpunk_skills.yaml | 3 +- data/sheet_model.yaml | 4 +- templates/cyberpunk-weapons.js | 83 +++++++++++++++++++++++++ templates/sheet.css | 28 ++++++--- tests/test_build.py | 15 ++++- tests/test_tabs.mjs | 62 ++++++++++++++++++- tools/build.py | 109 +++++++++++++++++++++++++++++++-- 9 files changed, 303 insertions(+), 24 deletions(-) create mode 100644 templates/cyberpunk-weapons.js diff --git a/README.md b/README.md index c709122..391c625 100644 --- a/README.md +++ b/README.md @@ -34,14 +34,15 @@ 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**. Ses compétences fixes ont -trois sous-onglets issus des sections du catalogue YAML : **Physique**, -**Intellectuelles** et **Social**. Les champs répétables restent dans **Autres**. +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**. 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, `other` affichent **Compétences** jusqu'au prochain clic. L'en-tête reste visible. -La variante cyberpunk propose un sélecteur de thème dans l'en-tête. Il conserve +**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 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é adaptées aux cinq couleurs de la feuille et copiées dans `data/themes.yaml`; @@ -49,6 +50,19 @@ le build ne dépend pas de ce dossier. `parchment` et `night` restent disponible `--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. +Chaque arme cyberpunk a un seuil de base, une précision, un nombre de dés et +une spécialité de combat facultative. L'attaque compte les dés inférieurs ou +égaux à `seuil de base + compétence + précision`. Les dégâts valent `dégâts de +base + (réussites − 1) × dégâts / réussite`, ou zéro sans réussite. Une rafale +ajoute un dé. Les tirs vérifient le coût en munitions du mode choisi et retirent +ces munitions du chargeur après le jet. Recharger transfère au plus les balles +disponibles de la réserve, sans dépasser la taille du chargeur. Le bouton +**Dégâts** permet de saisir manuellement les réussites sans dépenser de +munitions. Les champs historiques `name`, `damage` et `notes` de ces deux +sections sont conservés; les nouvelles valeurs doivent être renseignées sur +les personnages existants. Les anciennes sections historiques +`ranged-weapons` et `melee-weapons` ne migrent pas automatiquement. + Dans la variante cyberpunk, 02 affiche aussi deux cartes côte à côte : **Santé** (PV de la tête, du torse et des membres) et **Armure** (protection, intégrité et intégrité maximale aux mêmes localisations). Les cases sont diff --git a/TASKS.md b/TASKS.md index 45776f6..cdd3305 100644 --- a/TASKS.md +++ b/TASKS.md @@ -21,6 +21,7 @@ - [x] Mirror Ravenous Jenkins publication by deploying successful master artifacts to /mnt/books/RPG/d10_character_sheet/. - [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. ## Live Roll20 checks after local verification diff --git a/data/cyberpunk_skills.yaml b/data/cyberpunk_skills.yaml index ce224eb..4fff1d6 100644 --- a/data/cyberpunk_skills.yaml +++ b/data/cyberpunk_skills.yaml @@ -440,7 +440,8 @@ sections: - name: Contacts skills: [] custom: true -- name: Arsenal +- id: arsenal + name: Arsenal groups: - name: Distance skills: [] diff --git a/data/sheet_model.yaml b/data/sheet_model.yaml index 0906e09..79ef1e7 100644 --- a/data/sheet_model.yaml +++ b/data/sheet_model.yaml @@ -58,6 +58,6 @@ variants: repeating: - {id: skills, name: Compétences libres, fields: [skillname, skilllevel, skillcost]} - {id: contacts-skills, name: Contacts, fields: [skillname, skilllevel]} - - {id: distance, name: Armes à distance, fields: [name, damage, notes]} - - {id: melee, name: Armes de mêlée, fields: [name, damage, notes]} + - {id: distance, name: Armes à distance, fields: [name, damage, notes, weapon_type, accuracy, base_threshold, skill_id, attack_dice, single_cost, burst_cost, auto_cost, ammo_current, magazine_size, ammo_reserve, damage_per_success, weapon_status]} + - {id: melee, name: Armes de mêlée, fields: [name, damage, notes, weapon_type, accuracy, base_threshold, skill_id, attack_dice, damage_per_success, weapon_status]} - {id: consommable, name: Consommables, fields: [name, quantity, notes]} diff --git a/templates/cyberpunk-weapons.js b/templates/cyberpunk-weapons.js new file mode 100644 index 0000000..732a003 --- /dev/null +++ b/templates/cyberpunk-weapons.js @@ -0,0 +1,83 @@ +const D10_COMBAT_SKILLS = __COMBAT_SKILLS__; +const d10Number = value => Number.isFinite(Number(value)) ? Number(value) : 0; +const d10Whole = value => Math.max(0, Math.floor(d10Number(value))); +const d10Text = value => String(value || '').replace(/[{}]/g, ''); +const d10Damage = (successes, base, bonus) => successes > 0 + ? Math.max(0, d10Number(base) + (successes - 1) * d10Number(bonus)) : 0; + +function d10WeaponFields(prefix, callback) { + const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id', + 'attack_dice', 'damage', 'damage_per_success', 'notes', 'ammo_current', + 'magazine_size', 'ammo_reserve', 'single_cost', 'burst_cost', 'auto_cost']; + getAttrs(['dice', ...fields.map(field => prefix + field)], values => { + const skillId = values[prefix + 'skill_id']; + const skillField = D10_COMBAT_SKILLS.includes(skillId) ? 'combat_skilllevel_' + skillId : ''; + if (skillField) { + getAttrs([skillField], skillValues => callback(values, d10Number(skillValues[skillField]))); + } else { + callback(values, 0); + } + }); +} + +function d10WeaponAttack(event, mode, ranged) { + const prefix = event.sourceAttribute.replace(/(?:fire_single|fire_burst|fire_auto|attack)$/, ''); + d10WeaponFields(prefix, (values, skill) => { + const get = field => values[prefix + field]; + const cost = ranged ? Math.max(1, d10Whole(get(mode + '_cost'))) : 0; + const current = d10Whole(get('ammo_current')); + if (ranged && current < cost) { + setAttrs({[prefix + 'weapon_status']: 'Chargeur insuffisant : ' + current + '/' + cost}); + return; + } + const dice = Math.max(1, d10Whole(get('attack_dice'))) + (mode === 'burst' ? 1 : 0); + const die = Math.max(2, d10Whole(values.dice) || 10); + const threshold = Math.max(0, Math.floor(d10Number(get('base_threshold')) + skill + d10Number(get('accuracy')))); + const remaining = current - cost; + const modeName = {single: 'Tir simple', burst: 'Rafale', auto: 'Automatique', melee: 'Mêlée'}[mode]; + const command = `&{template:d10weapon} {{name=${d10Text(get('name') || 'Arme')}}} ` + + `{{mode=${modeName}}} {{type=${d10Text(get('weapon_type'))}}} ` + + `{{attack_roll=[[${dice}d${die}<${threshold}]]}} {{threshold=[[${threshold}]]}} ` + + `{{damage=[[0]]}} {{special=${d10Text(get('notes'))}}}` + + (ranged ? ` {{ammo=${remaining}/${d10Whole(get('magazine_size'))} · réserve ${d10Whole(get('ammo_reserve'))}}}` : ''); + startRoll(command, result => { + const successes = d10Whole(result.results.attack_roll.result); + finishRoll(result.rollId, {damage: d10Damage(successes, get('damage'), get('damage_per_success'))}); + if (ranged) setAttrs({[prefix + 'ammo_current']: remaining, [prefix + 'weapon_status']: ''}); + else setAttrs({[prefix + 'weapon_status']: ''}); + }); + }); +} + +for (const [action, mode] of [['fire_single', 'single'], ['fire_burst', 'burst'], ['fire_auto', 'auto']]) { + on('clicked:repeating_distance:' + action, event => d10WeaponAttack(event, mode, true)); +} +on('clicked:repeating_melee:attack', event => d10WeaponAttack(event, 'melee', false)); + +on('clicked:repeating_distance:reload', event => { + const prefix = event.sourceAttribute.replace(/reload$/, ''); + getAttrs([prefix + 'ammo_current', prefix + 'magazine_size', prefix + 'ammo_reserve'], values => { + const current = d10Whole(values[prefix + 'ammo_current']); + const size = d10Whole(values[prefix + 'magazine_size']); + const reserve = d10Whole(values[prefix + 'ammo_reserve']); + const loaded = Math.min(Math.max(0, size - current), reserve); + setAttrs({[prefix + 'ammo_current']: current + loaded, + [prefix + 'ammo_reserve']: reserve - loaded, + [prefix + 'weapon_status']: loaded ? 'Rechargé : +' + loaded : 'Aucune munition à charger'}); + }); +}); + +for (const section of ['distance', 'melee']) { + on('clicked:repeating_' + section + ':damage_only', event => { + const prefix = event.sourceAttribute.replace(/damage_only$/, ''); + getAttrs([prefix + 'name', prefix + 'damage', prefix + 'damage_per_success'], values => { + const command = `&{template:d10weapon} {{name=${d10Text(values[prefix + 'name'] || 'Arme')}}} ` + + '{{mode=Dégâts}} {{damage_roll=[[?{Réussites|1}]]}} {{damage=[[0]]}}'; + startRoll(command, result => { + const successes = d10Whole(result.results.damage_roll.result); + finishRoll(result.rollId, {damage: d10Damage(successes, values[prefix + 'damage'], + values[prefix + 'damage_per_success'])}); + }); + }); + }); +} diff --git a/templates/sheet.css b/templates/sheet.css index 1a8a551..28e85bb 100644 --- a/templates/sheet.css +++ b/templates/sheet.css @@ -35,7 +35,8 @@ .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-category-tab-nav { grid-template-columns: repeat(3,minmax(0,1fr)); } +.sheet-d10 .sheet-category-tab-nav { grid-template-columns: repeat(4,minmax(0,1fr)); } +.sheet-d10 .sheet-arsenal-tab-nav { grid-template-columns: repeat(3,minmax(0,1fr)); } .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; } @@ -114,13 +115,22 @@ .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 { 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 { 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 { font-size: 14px; } -.sheet-rolltemplate-d10skillcheck .sheet-roll-title span { opacity: .85; } -.sheet-rolltemplate-d10skillcheck .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 { min-width: 30px; text-align: center; } -.sheet-rolltemplate-d10skillcheck .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-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; } +.sheet-d10 .sheet-weapon-name, .sheet-d10 .sheet-weapon-notes { grid-column: span 3; } +.sheet-d10 .sheet-weapon-skill_id, .sheet-d10 .sheet-weapon-weapon_type { grid-column: span 2; } +.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-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); } @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; } @@ -131,6 +141,8 @@ .sheet-d10 .sheet-theme-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-weapon-repeater { grid-template-columns: repeat(2,minmax(0,1fr)); } + .sheet-d10 .sheet-weapon-name, .sheet-d10 .sheet-weapon-notes, .sheet-d10 .sheet-weapon-skill_id, .sheet-d10 .sheet-weapon-weapon_type { grid-column: span 2; } .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 65b2087..4135f03 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -48,10 +48,17 @@ class BuildTests(unittest.TestCase): markup.index(f'class="repeating_{section}"')) self.assertEqual(markup.count(f'class="repeating_{section}"'), 1) else: - self.assertEqual(files['sheet.html'].count('class="sheet-skill-pane sheet-category-pane-'), 3) + self.assertEqual(files['sheet.html'].count('class="sheet-skill-pane sheet-category-pane-'), 4) self.assertIn('name="attr_d10_category_tab" value="physique"', files['sheet.html']) - for tab in ('physique', 'intellectuelles', 'social'): + for tab in ('physique', 'intellectuelles', 'social', 'arsenal'): self.assertIn(f'.sheet-category-tab-state[value="{tab}"] ~ .sheet-category-pane-{tab}', files['sheet.css']) + for section in ('distance', 'melee', 'consommable'): + self.assertIn(f'name="act_arsenal_tab_{section}"', files['sheet.html']) + self.assertEqual(files['sheet.html'].count(f'class="repeating_{section}"'), 1) + for action in ('fire_single', 'fire_burst', 'fire_auto', 'reload', 'damage_only'): + 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']) 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']) @@ -157,6 +164,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) + broken_weapons = [{**block, 'fields': [field for field in block['fields'] if field != 'ammo_current']} + if block['id'] == 'distance' else block for block in model['repeating']] + with self.assertRaisesRegex(ValueError, 'invalid weapon fields'): + build.validate({**model, 'repeating': broken_weapons}, 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'): diff --git a/tests/test_tabs.mjs b/tests/test_tabs.mjs index 437c515..190c604 100644 --- a/tests/test_tabs.mjs +++ b/tests/test_tabs.mjs @@ -7,20 +7,31 @@ const buildRoot = process.env.D10_BUILD_ROOT ?? 'build'; 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 categoryTabs = variant === 'cyberpunk' ? ['physique', 'intellectuelles', 'social', 'arsenal'] : []; + const arsenalTabs = variant === 'cyberpunk' ? ['distance', 'melee', 'consommable'] : []; const html = readFileSync(`${buildRoot}/${variant}/parchment/sheet.html`, 'utf8'); const script = html.match(/\n' return html_text, css