diff --git a/README.md b/README.md index 9080a0b..e88c99f 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,12 @@ 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. +Le build actuel active temporairement le diagnostic des boutons d'armes. +Chaque attaque et bouton **Dégâts** envoie une carte Roll20 par défaut nommée +`Test: X`, avec la section, l'action, l'arme, le type, le chargeur et un d10. +Les calculs de combat et la dépense de munitions sont contournés pendant ce +diagnostic; **Recharger** conserve son comportement normal. + 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 89c4124..a8f5055 100644 --- a/TASKS.md +++ b/TASKS.md @@ -37,6 +37,7 @@ - [x] Simplify ranged attack ammunition roll data and expose worker progress in the weapon row. - [x] Remove ammunition fields from ranged chat commands while retaining worker-side checks and deductions. - [x] Reduce ranged startRoll commands to the minimum attack and damage fields accepted by Roll20. +- [x] Add a temporary default-template diagnostic path for every cyberpunk weapon roll action. - [x] Raise the Torse control on both cyberpunk body maps for better silhouette alignment. ## Live Roll20 checks after local verification diff --git a/templates/cyberpunk-weapons.js b/templates/cyberpunk-weapons.js index 9228adb..3fb5b90 100644 --- a/templates/cyberpunk-weapons.js +++ b/templates/cyberpunk-weapons.js @@ -1,4 +1,5 @@ const D10_COMBAT_SKILLS = __COMBAT_SKILLS__; +const D10_WEAPON_DIAGNOSTIC = true; 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, ''); @@ -15,6 +16,22 @@ const d10ShotDamage = (roll, successes, threshold, base, bonus) => { return shots.map(value => Math.max(0, d10Number(base) + (value === 1 ? d10Number(bonus) : 0))).join(', '); }; +function d10WeaponTest(event, label, section) { + const prefix = event.sourceAttribute.replace(/(?:fire_single|fire_burst|fire_auto|attack|damage_only)$/, ''); + getAttrs([prefix + 'name', prefix + 'weapon_type', prefix + 'ammo_current'], values => { + const command = `&{template:default} {{name=Test: ${label}}} ` + + `{{Arme=${d10Text(values[prefix + 'name'] || 'Sans nom')}}} ` + + `{{Section=${section}}} {{Action=${label}}} ` + + `{{Type=${d10Text(values[prefix + 'weapon_type'] || 'Non renseigné')}}} ` + + `{{Chargeur=${d10Whole(values[prefix + 'ammo_current'])}}} {{Jet=[[1d10cs1cf10]]}}`; + setAttrs({[prefix + 'weapon_status']: 'Test en cours : ' + label}); + startRoll(command, result => { + finishRoll(result.rollId); + setAttrs({[prefix + 'weapon_status']: 'Test envoyé : ' + label}); + }); + }); +} + function d10WeaponFields(prefix, callback) { const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id', 'damage', 'damage_per_success', 'rmax', 'notes', 'ammo_current', @@ -67,9 +84,12 @@ function d10WeaponAttack(event, mode, ranged) { } for (const [action, mode] of [['fire_single', 'single'], ['fire_burst', 'burst'], ['fire_auto', 'auto']]) { - on('clicked:repeating_distance:' + action, event => d10WeaponAttack(event, mode, true)); + const label = {single: 'Tir simple', burst: 'Rafale', auto: 'Automatique'}[mode]; + on('clicked:repeating_distance:' + action, event => D10_WEAPON_DIAGNOSTIC + ? d10WeaponTest(event, label, 'Distance') : d10WeaponAttack(event, mode, true)); } -on('clicked:repeating_melee:attack', event => d10WeaponAttack(event, 'melee', false)); +on('clicked:repeating_melee:attack', event => D10_WEAPON_DIAGNOSTIC + ? d10WeaponTest(event, 'Attaque de mêlée', 'Mêlée') : d10WeaponAttack(event, 'melee', false)); on('clicked:repeating_distance:reload', event => { const prefix = event.sourceAttribute.replace(/reload$/, ''); @@ -91,6 +111,10 @@ on('clicked:repeating_distance:reload', event => { for (const section of ['distance', 'melee']) { on('clicked:repeating_' + section + ':damage_only', event => { + if (D10_WEAPON_DIAGNOSTIC) { + d10WeaponTest(event, 'Dégâts', section === 'distance' ? 'Distance' : 'Mêlée'); + return; + } const prefix = event.sourceAttribute.replace(/damage_only$/, ''); getAttrs([prefix + 'name', prefix + 'damage', prefix + 'damage_per_success', prefix + 'rmax'], values => { const command = `&{template:d10weapon} {{name=${d10Text(values[prefix + 'name'] || 'Arme')}}} ` + diff --git a/tests/test_build.py b/tests/test_build.py index cd8fd66..20c9e2f 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -75,6 +75,8 @@ class BuildTests(unittest.TestCase): self.assertIn('', files['sheet.html']) self.assertIn('name="attr_damage_per_success"', files['sheet.html']) self.assertIn('d10<${threshold}cs1cf10', files['sheet.html']) + self.assertIn('const D10_WEAPON_DIAGNOSTIC = true;', files['sheet.html']) + self.assertIn('&{template:default} {{name=Test: ${label}}}', files['sheet.html']) self.assertEqual(files['sheet.html'].count('name="attr_rmax"'), 2) self.assertNotIn('name="attr_attack_dice"', files['sheet.html']) contacts = re.search(r'
(.*?)
', diff --git a/tests/test_tabs.mjs b/tests/test_tabs.mjs index af2e8ce..da2d947 100644 --- a/tests/test_tabs.mjs +++ b/tests/test_tabs.mjs @@ -86,33 +86,23 @@ for (const variant of ['base', 'cyberpunk']) { [ranged + 'single_cost']: '1', [ranged + 'burst_cost']: '3', }); handlers.get('clicked:repeating_distance:fire_single')({ sourceAttribute: ranged + 'fire_single' }); - assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8cs1cf10/); - assert.doesNotMatch(rolls.at(-1), /ammo|magazine|reserve/); - assert.doesNotMatch(rolls.at(-1), /mode=|type=|threshold=|special=|rmax=/); - assert.equal(attributes[ranged + 'ammo_current'], 4); - assert.equal(attributes[ranged + 'weapon_status'], 'Chargeur : 4/10'); - assert.equal(finished.at(-1).computed.damage, 5); - attributes[ranged + 'ammo_current'] = '5'; + assert.match(rolls.at(-1), /template:default/); + assert.match(rolls.at(-1), /name=Test: Tir simple/); + assert.match(rolls.at(-1), /Section=Distance/); + assert.match(rolls.at(-1), /Arme=Torpille/); + assert.match(rolls.at(-1), /Jet=\[\[1d10cs1cf10\]\]/); + assert.equal(attributes[ranged + 'ammo_current'], '5'); + assert.equal(attributes[ranged + 'weapon_status'], 'Test envoyé : Tir simple'); + assert.equal(finished.at(-1).computed, undefined); handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' }); - assert.match(rolls.at(-1), /\(\?\{Nombre de dés\|1\}\+1\)d10<8cs1cf10/); - assert.equal(attributes[ranged + 'ammo_current'], 2); - assert.equal(finished.at(-1).computed.damage_list, '6, 5'); - assert.ok(!('damage' in finished.at(-1).computed)); - attributes[ranged + 'ammo_current'] = '5'; + assert.match(rolls.at(-1), /name=Test: Rafale/); + assert.equal(attributes[ranged + 'ammo_current'], '5'); attributes[ranged + 'auto_cost'] = '5'; handlers.get('clicked:repeating_distance:fire_auto')({ sourceAttribute: ranged + 'fire_auto' }); - assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8cs1cf10/); - assert.equal(attributes[ranged + 'ammo_current'], 0); - assert.equal(finished.at(-1).computed.damage_list, '6, 5'); - attackDice = []; - attributes[ranged + 'ammo_current'] = '5'; - handlers.get('clicked:repeating_distance:fire_auto')({ sourceAttribute: ranged + 'fire_auto' }); - assert.equal(finished.at(-1).computed.damage_list, '5, 5'); - attributes[ranged + 'ammo_current'] = '1'; - const count = rolls.length; - handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' }); - assert.equal(rolls.length, count); - assert.match(attributes[ranged + 'weapon_status'], /Chargeur insuffisant/); + assert.match(rolls.at(-1), /name=Test: Automatique/); + handlers.get('clicked:repeating_distance:damage_only')({ sourceAttribute: ranged + 'damage_only' }); + assert.match(rolls.at(-1), /name=Test: Dégâts/); + assert.equal(attributes[ranged + 'ammo_current'], '5'); attributes[ranged + 'ammo_current'] = '4'; handlers.get('clicked:repeating_distance:reload')({ sourceAttribute: ranged + 'reload' }); assert.equal(attributes[ranged + 'ammo_current'], 10); @@ -137,19 +127,9 @@ for (const variant of ['base', 'cyberpunk']) { [melee + 'base_threshold']: '4', }); handlers.get('clicked:repeating_melee:attack')({ sourceAttribute: melee + 'attack' }); - assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<4cs1cf10/); - assert.match(rolls.at(-1), /mode=Mêlée/); - assert.equal(finished.at(-1).computed.damage, 6); + assert.match(rolls.at(-1), /name=Test: Attaque de mêlée/); + assert.match(rolls.at(-1), /Section=Mêlée/); handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' }); - assert.equal(finished.at(-1).computed.damage, 6); - attributes[melee + 'rmax'] = '0'; - handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' }); - assert.equal(finished.at(-1).computed.damage, 8); - damageResult = 0; - handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' }); - assert.equal(finished.at(-1).computed.damage, 0); - attackResult = 0; - handlers.get('clicked:repeating_melee:attack')({ sourceAttribute: melee + 'attack' }); - assert.equal(finished.at(-1).computed.damage, 0); + assert.match(rolls.at(-1), /name=Test: Dégâts/); } }