From 8cb2b63d3afa45f00ea642da9928bfcefcda0efe Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Sat, 19 Sep 2026 05:39:31 +0200 Subject: [PATCH] Allow burst fire to empty partial magazines --- README.md | 4 +++- TASKS.md | 1 + templates/cyberpunk-weapons.js | 7 ++++--- tests/test_tabs.mjs | 5 +++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 62f65fa..d4741a2 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,9 @@ 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 un dé. Les tirs vérifient le coût en munitions du mode choisi et retirent -ces munitions du chargeur après le jet. La réserve compte les **chargeurs de +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 +chargeur. Un chargeur vide bloque toujours le tir. La réserve compte les **chargeurs de rechange**, et non les balles. Recharger consomme un chargeur de réserve et remplit le chargeur actuel à sa capacité; les balles qui restaient dans l'ancien chargeur sont perdues. Les personnages existants dont la réserve diff --git a/TASKS.md b/TASKS.md index 2161f9c..0d76c31 100644 --- a/TASKS.md +++ b/TASKS.md @@ -43,6 +43,7 @@ - [x] Remove underscores from repeating weapon action names for Roll20 event compatibility. - [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] 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 af2c6f6..2e8b71a 100644 --- a/templates/cyberpunk-weapons.js +++ b/templates/cyberpunk-weapons.js @@ -34,17 +34,18 @@ function d10WeaponAttack(event, mode, ranged) { const prefix = event.sourceAttribute.replace(/(?:firesingle|fireburst|fireauto|attack)$/, ''); d10WeaponFields(prefix, (values, skill) => { const get = field => values[prefix + field]; + const multipleShots = mode === 'burst' || mode === 'auto'; const cost = ranged ? Math.max(1, d10Whole(get(mode + '_cost'))) : 0; const current = d10Whole(get('ammo_current')); - if (ranged && current < cost) { + if (ranged && (!current || (!multipleShots && current < cost))) { setAttrs({[prefix + 'weapon_status']: 'Chargeur insuffisant : ' + current + '/' + cost}); return; } const threshold = Math.max(0, Math.floor(d10Number(get('base_threshold')) + skill + d10Number(get('accuracy')))); - const remaining = current - cost; + const spent = multipleShots ? Math.min(current, cost) : cost; + const remaining = current - spent; 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 multipleShots = mode === 'burst' || mode === 'auto'; const command = `&{template:d10weapon} {{name=${d10Text(get('name') || 'Arme')}}} ` + `{{mode=${modeName}}} {{type=${d10Text(get('weapon_type'))}}} ` + `{{attack_roll=[[${dice}d10<${threshold}cs1cf10]]}} {{threshold=[[${threshold}]]}} ` + diff --git a/tests/test_tabs.mjs b/tests/test_tabs.mjs index 0900558..dbc075b 100644 --- a/tests/test_tabs.mjs +++ b/tests/test_tabs.mjs @@ -93,12 +93,13 @@ for (const variant of ['base', 'cyberpunk']) { assert.match(rolls.at(-1), /ammo=4/); assert.equal(attributes[ranged + 'ammo_current'], 4); assert.equal(finished.at(-1).computed.damage, 5); + attributes[ranged + 'ammo_current'] = 2; handlers.get('clicked:repeating_distance:fireburst')({ sourceAttribute: ranged + 'fireburst' }); assert.match(rolls.at(-1), /mode=Rafale/); assert.match(rolls.at(-1), /\(\?\{Nombre de dés\|1\}\+1\)d10<8cs1cf10/); - assert.equal(attributes[ranged + 'ammo_current'], 1); + assert.equal(attributes[ranged + 'ammo_current'], 0); assert.equal(finished.at(-1).computed.damage_list, '6, 5'); - attributes[ranged + 'ammo_current'] = 5; + attributes[ranged + 'ammo_current'] = 2; attributes[ranged + 'auto_cost'] = '5'; handlers.get('clicked:repeating_distance:fireauto')({ sourceAttribute: ranged + 'fireauto' }); assert.match(rolls.at(-1), /mode=Automatique/);