Cap automatic damage by bullets fired
Chado/d10_cs_generator/pipeline/head This commit looks good Details

This commit is contained in:
Dandaedre 2026-09-19 05:42:57 +02:00
parent 8cb2b63d3a
commit d8072c916c
Signed by: Dandaedre
GPG Key ID: 440C6592E8A26D99
4 changed files with 13 additions and 4 deletions

View File

@ -85,7 +85,8 @@ retenues; `0` signifie sans limite et préserve les anciennes fiches. Pour une
rafale ou un tir automatique, la carte affiche séparément les dégâts de chaque
tir réussi (`X, X, X`) sans les additionner. Chaque tir inflige les dégâts de
base; un dé naturel de 1 inflige `dégâts de base + dégâts / réussite` pour ce
tir (`X + bonus, X, X`). Rmax ne s'applique pas à ces modes. Une rafale ajoute
tir (`X + bonus, X, X`). Le nombre d'instances de dégâts ne peut jamais dépasser
le nombre de balles tirées, même lorsque Rmax vaut 0. Rmax ne s'applique pas à ces modes. 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. Une rafale ou un tir automatique peut
être déclenché avec moins de munitions que son coût normal; il vide alors le

View File

@ -44,6 +44,7 @@
- [x] Replace the ignored ranged section dispatcher with individual underscore-free events.
- [x] Remove temporary weapon diagnostics and restore attacks, damage, ammunition, reloads, and chat details.
- [x] Let burst and automatic fire consume a partially filled magazine instead of rejecting the attack.
- [x] Cap burst and automatic damage instances to the number of bullets actually fired.
- [x] Raise the Torse control on both cyberpunk body maps for better silhouette alignment.
## Live Roll20 checks after local verification

View File

@ -7,11 +7,12 @@ const d10Damage = (successes, base, bonus, rmax) => {
const capped = d10Whole(rmax) ? Math.min(successes, d10Whole(rmax)) : successes;
return Math.max(0, d10Number(base) + (capped - 1) * d10Number(bonus));
};
const d10ShotDamage = (roll, successes, threshold, base, bonus) => {
const d10ShotDamage = (roll, successes, threshold, base, bonus, maxShots) => {
const dice = Array.isArray(roll && roll.dice) ? roll.dice : [];
const successful = dice.map(die => d10Number(die && die.v !== undefined ? die.v : die))
.filter(value => value > 0 && value <= threshold);
const shots = successful.length ? successful : Array(d10Whole(successes)).fill(null);
const limit = d10Whole(maxShots);
const shots = (successful.length ? successful : Array(d10Whole(successes)).fill(null)).slice(0, limit);
return shots.map(value => Math.max(0, d10Number(base) + (value === 1 ? d10Number(bonus) : 0))).join(', ');
};
@ -59,7 +60,7 @@ function d10WeaponAttack(event, mode, ranged) {
const successes = d10Whole(result.results.attack_roll.result);
const computed = multipleShots
? {damage_list: d10ShotDamage(result.results.attack_roll, successes, threshold,
get('damage'), get('damage_per_success')) || 'Aucun dégât'}
get('damage'), get('damage_per_success'), spent) || 'Aucun dégât'}
: {damage: d10Damage(successes, get('damage'), get('damage_per_success'), get('rmax'))};
finishRoll(result.rollId, computed);
if (ranged) setAttrs({[prefix + 'ammo_current']: remaining,

View File

@ -105,6 +105,12 @@ for (const variant of ['base', 'cyberpunk']) {
assert.match(rolls.at(-1), /mode=Automatique/);
assert.equal(attributes[ranged + 'ammo_current'], 0);
assert.equal(finished.at(-1).computed.damage_list, '6, 5');
attackResult = 3;
attributes[ranged + 'ammo_current'] = 1;
handlers.get('clicked:repeating_distance:fireauto')({ sourceAttribute: ranged + 'fireauto' });
assert.equal(attributes[ranged + 'ammo_current'], 0);
assert.equal(finished.at(-1).computed.damage_list, '6');
attackResult = 2;
handlers.get('clicked:repeating_distance:damage')({ sourceAttribute: ranged + 'damage' });
assert.match(rolls.at(-1), /mode=Dégâts/);
assert.equal(finished.at(-1).computed.damage, 5);