Reduce weapon diagnostics to chat messages

This commit is contained in:
Dandaedre 2026-09-19 05:23:00 +02:00
parent 73981e4d37
commit b747be4377
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
4 changed files with 18 additions and 27 deletions

View File

@ -100,9 +100,10 @@ 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
Chaque attaque et bouton **Dégâts** envoie uniquement une carte Roll20 par
défaut nommée `Test: X` avec le message `Bouton reçu par le worker`. Cette voie
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.
Dans la variante cyberpunk, 02 affiche aussi deux cartes côte à côte :

View File

@ -38,6 +38,7 @@
- [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] Reduce weapon diagnostics to fixed chat messages without attribute access or game calculations.
- [x] Raise the Torse control on both cyberpunk body maps for better silhouette alignment.
## Live Roll20 checks after local verification

View File

@ -16,20 +16,10 @@ 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 d10WeaponTest(label) {
const command = `&{template:default} {{name=Test: ${label}}} ` +
`{{Message=Bouton reçu par le worker}} {{Diagnostic=[[0]]}}`;
startRoll(command, result => finishRoll(result.rollId));
}
function d10WeaponFields(prefix, callback) {
@ -86,10 +76,10 @@ 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(event, label, 'Distance') : d10WeaponAttack(event, mode, true));
? d10WeaponTest(label) : d10WeaponAttack(event, mode, true));
}
on('clicked:repeating_melee:attack', event => D10_WEAPON_DIAGNOSTIC
? d10WeaponTest(event, 'Attaque de mêlée', 'Mêlée') : d10WeaponAttack(event, 'melee', false));
? d10WeaponTest('Attaque de mêlée') : d10WeaponAttack(event, 'melee', false));
on('clicked:repeating_distance:reload', event => {
const prefix = event.sourceAttribute.replace(/reload$/, '');
@ -112,7 +102,7 @@ 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');
d10WeaponTest('Dégâts ' + (section === 'distance' ? 'distance' : 'mêlée'));
return;
}
const prefix = event.sourceAttribute.replace(/damage_only$/, '');

View File

@ -88,11 +88,11 @@ for (const variant of ['base', 'cyberpunk']) {
handlers.get('clicked:repeating_distance:fire_single')({ sourceAttribute: ranged + 'fire_single' });
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.match(rolls.at(-1), /Message=Bouton reçu par le worker/);
assert.match(rolls.at(-1), /Diagnostic=\[\[0\]\]/);
assert.doesNotMatch(rolls.at(-1), /Section=|Arme=|Jet=|Chargeur=/);
assert.equal(attributes[ranged + 'ammo_current'], '5');
assert.equal(attributes[ranged + 'weapon_status'], 'Test envoyé : Tir simple');
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' });
assert.match(rolls.at(-1), /name=Test: Rafale/);
@ -101,7 +101,7 @@ for (const variant of ['base', 'cyberpunk']) {
handlers.get('clicked:repeating_distance:fire_auto')({ sourceAttribute: ranged + 'fire_auto' });
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.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' });
@ -128,8 +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/);
assert.match(rolls.at(-1), /Section=Mêlée/);
handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' });
assert.match(rolls.at(-1), /name=Test: Dégâts/);
assert.match(rolls.at(-1), /name=Test: Dégâts mêlée/);
}
}