Prompt for weapon dice count on each attack

This commit is contained in:
Dandaedre 2026-09-19 01:08:07 +02:00
parent eb62cfeb79
commit dec6cbf5ea
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
7 changed files with 16 additions and 13 deletions

View File

@ -56,8 +56,9 @@ sous les noms **Parchemin** et **Nuit** dans le sélecteur.
`--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
Chaque arme cyberpunk a un seuil de base, une précision et une spécialité de
combat facultative. Le nombre de dés est demandé à chaque attaque dans une
fenêtre Roll20, avec 1 par défaut. 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

View File

@ -25,6 +25,7 @@
- [x] Reduce cyberpunk Combat to initiative and its roll; keep generic combat fields and equipped weapons in base only.
- [x] Remove the characteristic selector from cyberpunk contacts and replace their dice roll with a Show chat card.
- [x] Rename the parchment and night theme labels in the cyberpunk selector without changing saved theme IDs.
- [x] Prompt for the cyberpunk weapon dice count on each attack instead of storing a fixed value on the weapon.
## Live Roll20 checks after local verification

View File

@ -54,6 +54,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, 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: distance, name: Armes à distance, fields: [name, damage, notes, weapon_type, accuracy, base_threshold, skill_id, 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, damage_per_success, weapon_status]}
- {id: consommable, name: Consommables, fields: [name, quantity, notes]}

View File

@ -7,7 +7,7 @@ const d10Damage = (successes, base, bonus) => successes > 0
function d10WeaponFields(prefix, callback) {
const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id',
'attack_dice', 'damage', 'damage_per_success', 'notes', 'ammo_current',
'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'];
@ -30,11 +30,11 @@ function d10WeaponAttack(event, mode, ranged) {
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 dice = mode === 'burst' ? '[[?{Nombre de dés|1}+1]]' : '?{Nombre de dés|1}';
const command = `&{template:d10weapon} {{name=${d10Text(get('name') || 'Arme')}}} ` +
`{{mode=${modeName}}} {{type=${d10Text(get('weapon_type'))}}} ` +
`{{attack_roll=[[${dice}d${die}<${threshold}]]}} {{threshold=[[${threshold}]]}} ` +

View File

@ -59,6 +59,7 @@ class BuildTests(unittest.TestCase):
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.assertNotIn('name="attr_attack_dice"', files['sheet.html'])
contacts = re.search(r'<fieldset class="repeating_contacts-skills">(.*?)</fieldset>',
files['sheet.html'], re.DOTALL)
self.assertIsNotNone(contacts)

View File

@ -70,22 +70,23 @@ for (const variant of ['base', 'cyberpunk']) {
dice: '10', combat_skilllevel_armesfeu: '3',
[ranged + 'name']: 'Torpille', [ranged + 'skill_id']: 'armesfeu',
[ranged + 'base_threshold']: '4', [ranged + 'accuracy']: '1',
[ranged + 'attack_dice']: '2', [ranged + 'damage']: '5',
[ranged + 'damage']: '5',
[ranged + 'damage_per_success']: '1', [ranged + 'ammo_current']: '5',
[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' });
assert.match(rolls.at(-1), /2d10<8/);
assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8/);
assert.equal(attributes[ranged + 'ammo_current'], 4);
assert.equal(finished.at(-1).computed.damage, 6);
attributes[ranged + 'ammo_current'] = '5';
handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' });
assert.match(rolls.at(-1), /3d10<8/);
assert.match(rolls.at(-1), /\[\[\?\{Nombre de dés\|1\}\+1\]\]d10<8/);
assert.equal(attributes[ranged + 'ammo_current'], 2);
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<8/);
assert.equal(attributes[ranged + 'ammo_current'], 0);
attributes[ranged + 'ammo_current'] = '1';
const count = rolls.length;
@ -100,9 +101,9 @@ for (const variant of ['base', 'cyberpunk']) {
Object.assign(attributes, {
[melee + 'name']: 'Kataba', [melee + 'damage']: '4',
[melee + 'damage_per_success']: '2', [melee + 'base_threshold']: '4',
[melee + 'attack_dice']: '1',
});
handlers.get('clicked:repeating_melee:attack')({ sourceAttribute: melee + 'attack' });
assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<4/);
assert.equal(finished.at(-1).computed.damage, 6);
handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' });
assert.equal(finished.at(-1).computed.damage, 8);

View File

@ -27,11 +27,11 @@ FIELD_LABELS = {
}
WEAPON_FIELDS = {
'distance': {'name', 'damage', 'notes', 'weapon_type', 'accuracy', 'base_threshold',
'skill_id', 'attack_dice', 'single_cost', 'burst_cost', 'auto_cost',
'skill_id', 'single_cost', 'burst_cost', 'auto_cost',
'ammo_current', 'magazine_size', 'ammo_reserve', 'damage_per_success',
'weapon_status'},
'melee': {'name', 'damage', 'notes', 'weapon_type', 'accuracy', 'base_threshold',
'skill_id', 'attack_dice', 'damage_per_success', 'weapon_status'},
'skill_id', 'damage_per_success', 'weapon_status'},
}
@ -251,7 +251,6 @@ def render_weapon_block(block, combat_skills):
field('base_threshold', 'Seuil de base', value='4'),
'<label class="sheet-weapon-field sheet-weapon-skill_id">Compétence'
f'<select name="attr_skill_id">{options}</select></label>',
field('attack_dice', 'Dés', value='1', extra='min="1"'),
field('damage', 'Dégâts de base', value='0'),
field('damage_per_success', 'Dégâts / réussite', value='0'),
field('notes', 'Spécial / notes', 'text', '')]