Show automatic damage per successful shot
This commit is contained in:
parent
62ec90fa91
commit
0368684b2f
|
|
@ -80,8 +80,11 @@ fenêtre Roll20, avec 1 par défaut. L'attaque compte les dés inférieurs ou
|
|||
attaque de mêlée, les dégâts valent `dégâts de base + (réussites retenues − 1)
|
||||
× dégâts / réussite`, ou zéro sans réussite. **Rmax** limite les réussites
|
||||
retenues; `0` signifie sans limite et préserve les anciennes fiches. Pour une
|
||||
rafale ou un tir automatique, chaque réussite inflige les dégâts de base,
|
||||
sans bonus par réussite ni limite Rmax. Une rafale ajoute un dé. Les tirs vérifient le coût en munitions du mode choisi et retirent
|
||||
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
|
||||
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
|
||||
rechange**, et non les balles. Recharger consomme un chargeur de réserve et
|
||||
remplit le chargeur actuel à sa capacité; les balles qui restaient dans
|
||||
|
|
|
|||
1
TASKS.md
1
TASKS.md
|
|
@ -32,6 +32,7 @@
|
|||
- [x] Move cyberpunk Arsenal from Skills into Combat while preserving its subtabs and repeating sections.
|
||||
- [x] Add Rmax to ranged and melee weapons; cap single strikes and apply base damage per success for burst and automatic fire.
|
||||
- [x] Publish one build per variant and add a base-only Parchemin/Nuit selector.
|
||||
- [x] Show burst and automatic damage per successful shot, with the per-success bonus on natural 1s.
|
||||
|
||||
## Live Roll20 checks after local verification
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,18 @@ const D10_COMBAT_SKILLS = __COMBAT_SKILLS__;
|
|||
const d10Number = value => Number.isFinite(Number(value)) ? Number(value) : 0;
|
||||
const d10Whole = value => Math.max(0, Math.floor(d10Number(value)));
|
||||
const d10Text = value => String(value || '').replace(/[{}]/g, '');
|
||||
const d10Damage = (successes, base, bonus, rmax, mode) => {
|
||||
const d10Damage = (successes, base, bonus, rmax) => {
|
||||
if (!successes) return 0;
|
||||
if (mode === 'burst' || mode === 'auto') return Math.max(0, successes * d10Number(base));
|
||||
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 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);
|
||||
return shots.map(value => Math.max(0, d10Number(base) + (value === 1 ? d10Number(bonus) : 0))).join(', ');
|
||||
};
|
||||
|
||||
function d10WeaponFields(prefix, callback) {
|
||||
const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id',
|
||||
|
|
@ -38,16 +44,21 @@ function d10WeaponAttack(event, mode, ranged) {
|
|||
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 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}d${die}<${threshold}]]}} {{threshold=[[${threshold}]]}} ` +
|
||||
`{{damage=[[0]]}} {{special=${d10Text(get('notes'))}}}` +
|
||||
`${multipleShots ? '{{damage_list=[[0]]}}' : '{{damage=[[0]]}}'} {{special=${d10Text(get('notes'))}}}` +
|
||||
(mode === 'single' || mode === 'melee' ? ` {{rmax=${d10Whole(get('rmax')) || 'sans limite'}}}` : '') +
|
||||
(ranged ? ` {{ammo=${remaining}/${d10Whole(get('magazine_size'))} · chargeurs de réserve ${d10Whole(get('ammo_reserve'))}}}` : '');
|
||||
startRoll(command, result => {
|
||||
const successes = d10Whole(result.results.attack_roll.result);
|
||||
finishRoll(result.rollId, {damage: d10Damage(successes, get('damage'), get('damage_per_success'), get('rmax'), mode)});
|
||||
const computed = multipleShots
|
||||
? {damage_list: d10ShotDamage(result.results.attack_roll, successes, threshold,
|
||||
get('damage'), get('damage_per_success')) || '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, [prefix + 'weapon_status']: ''});
|
||||
else setAttrs({[prefix + 'weapon_status']: ''});
|
||||
});
|
||||
|
|
@ -87,7 +98,7 @@ for (const section of ['distance', 'melee']) {
|
|||
startRoll(command, result => {
|
||||
const successes = d10Whole(result.results.damage_roll.result);
|
||||
finishRoll(result.rollId, {damage: d10Damage(successes, values[prefix + 'damage'],
|
||||
values[prefix + 'damage_per_success'], values[prefix + 'rmax'], 'single')});
|
||||
values[prefix + 'damage_per_success'], values[prefix + 'rmax'])});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -132,6 +132,7 @@
|
|||
.sheet-rolltemplate-d10skillcheck .sheet-roll-title span, .sheet-rolltemplate-d10weapon .sheet-roll-title span, .sheet-rolltemplate-d10contact .sheet-roll-title span, .sheet-rolltemplate-d10consumable .sheet-roll-title span { opacity: .85; }
|
||||
.sheet-rolltemplate-d10skillcheck .sheet-roll-values, .sheet-rolltemplate-d10weapon .sheet-roll-values { display: grid; grid-template-columns: auto minmax(36px,auto) auto minmax(36px,auto); gap: 6px; align-items: center; justify-content: start; padding: 8px 9px; }
|
||||
.sheet-rolltemplate-d10skillcheck .sheet-roll-value, .sheet-rolltemplate-d10weapon .sheet-roll-value { min-width: 30px; text-align: center; }
|
||||
.sheet-rolltemplate-d10weapon .sheet-roll-damage-list { text-align: left; white-space: normal; }
|
||||
.sheet-rolltemplate-d10skillcheck .inlinerollresult, .sheet-rolltemplate-d10weapon .inlinerollresult { display: inline-block; min-width: 28px; padding: 2px 5px; color: #20242b !important; background: #ffffff !important; border: 1px solid #68717d !important; border-radius: 3px; font-weight: bold; text-align: center; text-shadow: none !important; }
|
||||
.sheet-rolltemplate-d10weapon .sheet-roll-detail, .sheet-rolltemplate-d10contact .sheet-roll-detail, .sheet-rolltemplate-d10consumable .sheet-roll-detail { padding: 4px 9px; border-top: 1px solid var(--d10-border); }
|
||||
@media (max-width: 760px) {
|
||||
|
|
|
|||
|
|
@ -17,6 +17,7 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
const rolls = [];
|
||||
const finished = [];
|
||||
let attackResult = 2;
|
||||
let attackDice = [{ v: 1 }, { v: 4 }, { v: 9 }];
|
||||
let damageResult = 3;
|
||||
vm.runInNewContext(script, {
|
||||
on: (event, handler) => {
|
||||
|
|
@ -28,7 +29,7 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
startRoll: (command, callback) => {
|
||||
rolls.push(command);
|
||||
callback({ rollId: String(rolls.length), results: {
|
||||
attack_roll: { result: attackResult }, damage_roll: { result: damageResult },
|
||||
attack_roll: { result: attackResult, dice: attackDice }, damage_roll: { result: damageResult },
|
||||
} });
|
||||
},
|
||||
finishRoll: (id, computed) => finished.push({ id, computed }),
|
||||
|
|
@ -92,15 +93,20 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
assert.match(rolls.at(-1), /rmax=1/);
|
||||
attributes[ranged + 'ammo_current'] = '5';
|
||||
handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' });
|
||||
assert.match(rolls.at(-1), /\[\[\?\{Nombre de dés\|1\}\+1\]\]d10<8/);
|
||||
assert.match(rolls.at(-1), /\(\?\{Nombre de dés\|1\}\+1\)d10<8/);
|
||||
assert.equal(attributes[ranged + 'ammo_current'], 2);
|
||||
assert.equal(finished.at(-1).computed.damage, 10);
|
||||
assert.equal(finished.at(-1).computed.damage_list, '6, 5');
|
||||
assert.ok(!('damage' in finished.at(-1).computed));
|
||||
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);
|
||||
assert.equal(finished.at(-1).computed.damage, 10);
|
||||
assert.equal(finished.at(-1).computed.damage_list, '6, 5');
|
||||
attackDice = [];
|
||||
attributes[ranged + 'ammo_current'] = '5';
|
||||
handlers.get('clicked:repeating_distance:fire_auto')({ sourceAttribute: ranged + 'fire_auto' });
|
||||
assert.equal(finished.at(-1).computed.damage_list, '5, 5');
|
||||
attributes[ranged + 'ammo_current'] = '1';
|
||||
const count = rolls.length;
|
||||
handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' });
|
||||
|
|
|
|||
|
|
@ -452,7 +452,7 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
|
|||
html_text += '''<rolltemplate class="sheet-rolltemplate-d10weapon">
|
||||
<div class="sheet-roll-title"><strong>{{name}}</strong><span>{{mode}}</span></div>
|
||||
{{#type}}<div class="sheet-roll-detail">{{type}}</div>{{/type}}
|
||||
<div class="sheet-roll-values"><span>Réussites</span><span class="sheet-roll-value">{{#attack_roll}}{{attack_roll}}{{/attack_roll}}{{#damage_roll}}{{damage_roll}}{{/damage_roll}}</span><span>Dégâts</span><span class="sheet-roll-value">{{computed::damage}}</span></div>
|
||||
<div class="sheet-roll-values"><span>Réussites</span><span class="sheet-roll-value">{{#attack_roll}}{{attack_roll}}{{/attack_roll}}{{#damage_roll}}{{damage_roll}}{{/damage_roll}}</span>{{#damage}}<span>Dégâts</span><span class="sheet-roll-value">{{computed::damage}}</span>{{/damage}}{{#damage_list}}<span>Dégâts par tir</span><span class="sheet-roll-value sheet-roll-damage-list">{{computed::damage_list}}</span>{{/damage_list}}</div>
|
||||
{{#threshold}}<div class="sheet-roll-detail">Seuil : {{threshold}}</div>{{/threshold}}
|
||||
{{#rmax}}<div class="sheet-roll-detail">Rmax : {{rmax}}</div>{{/rmax}}
|
||||
{{#ammo}}<div class="sheet-roll-detail">Chargeur : {{ammo}}</div>{{/ammo}}
|
||||
|
|
|
|||
Loading…
Reference in New Issue