Fix repeating weapon action dispatch

This commit is contained in:
Dandaedre 2026-09-19 05:27:29 +02:00
parent b747be4377
commit 6542c31a86
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
6 changed files with 51 additions and 33 deletions

View File

@ -105,6 +105,13 @@ défaut nommée `Test: X` avec le message `Bouton reçu par le worker`. Cette vo
ne lit aucun attribut, ne modifie aucun état et ne lance aucun dé; `[[0]]` sert
seulement de valeur technique à `startRoll`. Les calculs de combat et la dépense de munitions sont contournés pendant ce
diagnostic; **Recharger** conserve son comportement normal.
Les boutons de Distance passent par l'événement de section
`clicked:repeating_distance`, puis sont distribués selon le suffixe du bouton,
afin de contourner les événements d'action nommés que Roll20 ne déclenchait pas.
Les identifiants d'action répétables n'utilisent plus de tiret bas
(`firesingle`, `fireburst`, `fireauto` et `damage`); ce sont des identifiants de
boutons, pas des attributs sauvegardés, donc ce changement ne déplace aucune
donnée de personnage.
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,

View File

@ -39,6 +39,8 @@
- [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] Reduce weapon diagnostics to fixed chat messages without attribute access or game calculations.
- [x] Route every ranged action through Roll20's repeating-section click event.
- [x] Remove underscores from repeating weapon action names for Roll20 event compatibility.
- [x] Raise the Torse control on both cyberpunk body maps for better silhouette alignment.
## Live Roll20 checks after local verification

View File

@ -38,7 +38,7 @@ function d10WeaponFields(prefix, callback) {
}
function d10WeaponAttack(event, mode, ranged) {
const prefix = event.sourceAttribute.replace(/(?:fire_single|fire_burst|fire_auto|attack)$/, '');
const prefix = event.sourceAttribute.replace(/(?:firesingle|fireburst|fireauto|attack)$/, '');
d10WeaponFields(prefix, (values, skill) => {
const get = field => values[prefix + field];
const cost = ranged ? Math.max(1, d10Whole(get(mode + '_cost'))) : 0;
@ -73,15 +73,7 @@ function d10WeaponAttack(event, mode, ranged) {
});
}
for (const [action, mode] of [['fire_single', 'single'], ['fire_burst', 'burst'], ['fire_auto', 'auto']]) {
const label = {single: 'Tir simple', burst: 'Rafale', auto: 'Automatique'}[mode];
on('clicked:repeating_distance:' + action, event => D10_WEAPON_DIAGNOSTIC
? d10WeaponTest(label) : d10WeaponAttack(event, mode, true));
}
on('clicked:repeating_melee:attack', event => D10_WEAPON_DIAGNOSTIC
? d10WeaponTest('Attaque de mêlée') : d10WeaponAttack(event, 'melee', false));
on('clicked:repeating_distance:reload', event => {
function d10WeaponReload(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']);
@ -97,15 +89,10 @@ on('clicked:repeating_distance:reload', event => {
[prefix + 'ammo_reserve']: reserve - 1,
[prefix + 'weapon_status']: 'Rechargé : 1 chargeur utilisé'});
});
});
}
for (const section of ['distance', 'melee']) {
on('clicked:repeating_' + section + ':damage_only', event => {
if (D10_WEAPON_DIAGNOSTIC) {
d10WeaponTest('Dégâts ' + (section === 'distance' ? 'distance' : 'mêlée'));
return;
}
const prefix = event.sourceAttribute.replace(/damage_only$/, '');
function d10WeaponDamage(event) {
const prefix = event.sourceAttribute.replace(/damage$/, '');
getAttrs([prefix + 'name', prefix + 'damage', prefix + 'damage_per_success', prefix + 'rmax'], values => {
const command = `&{template:d10weapon} {{name=${d10Text(values[prefix + 'name'] || 'Arme')}}} ` +
`{{mode=Dégâts}} {{damage_roll=[[?{Réussites|1}]]}} {{damage=[[0]]}} ` +
@ -116,5 +103,27 @@ for (const section of ['distance', 'melee']) {
values[prefix + 'damage_per_success'], values[prefix + 'rmax'])});
});
});
});
}
on('clicked:repeating_distance', event => {
const action = ['firesingle', 'fireburst', 'fireauto', 'reload', 'damage']
.find(candidate => event.sourceAttribute.endsWith(candidate));
if (!action) return;
if (action === 'reload') {
d10WeaponReload(event);
return;
}
if (D10_WEAPON_DIAGNOSTIC) {
const label = {firesingle: 'Tir simple', fireburst: 'Rafale',
fireauto: 'Automatique', damage: 'Dégâts distance'}[action];
d10WeaponTest(label);
return;
}
if (action === 'damage') d10WeaponDamage(event);
else d10WeaponAttack(event, {firesingle: 'single', fireburst: 'burst', fireauto: 'auto'}[action], true);
});
on('clicked:repeating_melee:attack', event => D10_WEAPON_DIAGNOSTIC
? d10WeaponTest('Attaque de mêlée') : d10WeaponAttack(event, 'melee', false));
on('clicked:repeating_melee:damage', event => D10_WEAPON_DIAGNOSTIC
? d10WeaponTest('Dégâts mêlée') : d10WeaponDamage(event));

View File

@ -69,7 +69,7 @@ class BuildTests(unittest.TestCase):
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'):
for action in ('firesingle', 'fireburst', 'fireauto', 'reload', 'damage'):
self.assertIn(f'name="act_{action}"', files['sheet.html'])
self.assertIn('name="attr_ammo_current"', files['sheet.html'])
self.assertIn('<span class="sheet-weapon-status" name="attr_weapon_status"></span>', files['sheet.html'])

View File

@ -34,7 +34,7 @@ for (const variant of ['base', 'cyberpunk']) {
},
finishRoll: (id, computed) => finished.push({ id, computed }),
});
assert.equal(handlers.size, tabs.length + skillTabs.length + categoryTabs.length + arsenalTabs.length + 1 + (variant === 'cyberpunk' ? 7 : 0));
assert.equal(handlers.size, tabs.length + skillTabs.length + categoryTabs.length + arsenalTabs.length + 1 + (variant === 'cyberpunk' ? 3 : 0));
assert.ok(!handlers.has('clicked:tab_core'));
for (const tab of tabs) {
assert.match(html, new RegExp(`name="act_tab_${tab}"`));
@ -85,7 +85,7 @@ for (const variant of ['base', 'cyberpunk']) {
[ranged + 'magazine_size']: '10', [ranged + 'ammo_reserve']: '3',
[ranged + 'single_cost']: '1', [ranged + 'burst_cost']: '3',
});
handlers.get('clicked:repeating_distance:fire_single')({ sourceAttribute: ranged + 'fire_single' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'firesingle' });
assert.match(rolls.at(-1), /template:default/);
assert.match(rolls.at(-1), /name=Test: Tir simple/);
assert.match(rolls.at(-1), /Message=Bouton reçu par le worker/);
@ -94,30 +94,30 @@ for (const variant of ['base', 'cyberpunk']) {
assert.equal(attributes[ranged + 'ammo_current'], '5');
assert.equal(attributes[ranged + 'weapon_status'], undefined);
assert.equal(finished.at(-1).computed, undefined);
handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'fireburst' });
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' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'fireauto' });
assert.match(rolls.at(-1), /name=Test: Automatique/);
handlers.get('clicked:repeating_distance:damage_only')({ sourceAttribute: ranged + 'damage_only' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'damage' });
assert.match(rolls.at(-1), /name=Test: Dégâts distance/);
assert.equal(attributes[ranged + 'ammo_current'], '5');
attributes[ranged + 'ammo_current'] = '4';
handlers.get('clicked:repeating_distance:reload')({ sourceAttribute: ranged + 'reload' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'reload' });
assert.equal(attributes[ranged + 'ammo_current'], 10);
assert.equal(attributes[ranged + 'ammo_reserve'], 2);
handlers.get('clicked:repeating_distance:reload')({ sourceAttribute: ranged + 'reload' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'reload' });
assert.equal(attributes[ranged + 'ammo_reserve'], 2);
assert.match(attributes[ranged + 'weapon_status'], /déjà plein/);
attributes[ranged + 'ammo_current'] = 4;
attributes[ranged + 'ammo_reserve'] = 0;
handlers.get('clicked:repeating_distance:reload')({ sourceAttribute: ranged + 'reload' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'reload' });
assert.equal(attributes[ranged + 'ammo_current'], 4);
assert.match(attributes[ranged + 'weapon_status'], /Aucun chargeur/);
attributes[ranged + 'ammo_reserve'] = 2;
attributes[ranged + 'magazine_size'] = 0;
handlers.get('clicked:repeating_distance:reload')({ sourceAttribute: ranged + 'reload' });
handlers.get('clicked:repeating_distance')({ sourceAttribute: ranged + 'reload' });
assert.equal(attributes[ranged + 'ammo_reserve'], 2);
assert.match(attributes[ranged + 'weapon_status'], /Taille du chargeur/);
const melee = 'repeating_melee_-test_';
@ -128,7 +128,7 @@ for (const variant of ['base', 'cyberpunk']) {
});
handlers.get('clicked:repeating_melee:attack')({ sourceAttribute: melee + 'attack' });
assert.match(rolls.at(-1), /name=Test: Attaque de mêlée/);
handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' });
handlers.get('clicked:repeating_melee:damage')({ sourceAttribute: melee + 'damage' });
assert.match(rolls.at(-1), /name=Test: Dégâts mêlée/);
}
}

View File

@ -267,10 +267,10 @@ def render_weapon_block(block, combat_skills):
field('ammo_current', 'Chargeur actuel', value='0', extra='min="0"'),
field('magazine_size', 'Taille du chargeur', value='0', extra='min="0"'),
field('ammo_reserve', 'Chargeurs de réserve', value='0', extra='min="0"')])
actions = ([('fire_single', 'Tir simple'), ('fire_burst', 'Rafale'),
('fire_auto', 'Automatique'), ('reload', 'Recharger')]
actions = ([('firesingle', 'Tir simple'), ('fireburst', 'Rafale'),
('fireauto', 'Automatique'), ('reload', 'Recharger')]
if ranged else [('attack', 'Attaque')])
actions.append(('damage_only', 'Dégâts'))
actions.append(('damage', 'Dégâts'))
parts.append('<div class="sheet-weapon-actions">' + ''.join(
f'<button type="action" name="act_{key}">{label}</button>' for key, label in actions) + '</div>')
parts.append('<span class="sheet-weapon-status" name="attr_weapon_status"></span></div></fieldset>')