Add Rmax and firing mode damage rules
This commit is contained in:
parent
7ce392e034
commit
d2e036d660
12
README.md
12
README.md
|
|
@ -75,15 +75,19 @@ couleurs et la visibilité de la silhouette, sans modifier les champs ni les jet
|
|||
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
|
||||
égaux à `seuil de base + compétence + précision`. Pour un tir simple ou une
|
||||
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
|
||||
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
|
||||
l'ancien chargeur sont perdues. Les personnages existants dont la réserve
|
||||
comptait des balles doivent corriger cette valeur. Le bouton
|
||||
**Dégâts** permet de saisir manuellement les réussites sans dépenser de
|
||||
**Dégâts** applique la formule du tir simple avec Rmax aux réussites saisies
|
||||
manuellement, sans dépenser de
|
||||
munitions. Les champs historiques `name`, `damage` et `notes` de ces deux
|
||||
sections sont conservés; les nouvelles valeurs doivent être renseignées sur
|
||||
les personnages existants. Les anciennes sections historiques
|
||||
|
|
|
|||
1
TASKS.md
1
TASKS.md
|
|
@ -30,6 +30,7 @@
|
|||
- [x] Add a Show chat card for cyberpunk consumables without changing their quantity.
|
||||
- [x] Add a root build script for all publishable variants with an optional clean rebuild.
|
||||
- [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.
|
||||
|
||||
## Live Roll20 checks after local verification
|
||||
|
||||
|
|
|
|||
|
|
@ -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, 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: 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, rmax, weapon_status]}
|
||||
- {id: melee, name: Armes de mêlée, fields: [name, damage, notes, weapon_type, accuracy, base_threshold, skill_id, damage_per_success, rmax, weapon_status]}
|
||||
- {id: consommable, name: Consommables, fields: [name, quantity, notes]}
|
||||
|
|
|
|||
|
|
@ -2,12 +2,16 @@ 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) => successes > 0
|
||||
? Math.max(0, d10Number(base) + (successes - 1) * d10Number(bonus)) : 0;
|
||||
const d10Damage = (successes, base, bonus, rmax, mode) => {
|
||||
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));
|
||||
};
|
||||
|
||||
function d10WeaponFields(prefix, callback) {
|
||||
const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id',
|
||||
'damage', 'damage_per_success', 'notes', 'ammo_current',
|
||||
'damage', 'damage_per_success', 'rmax', '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'];
|
||||
|
|
@ -39,10 +43,11 @@ function d10WeaponAttack(event, mode, ranged) {
|
|||
`{{mode=${modeName}}} {{type=${d10Text(get('weapon_type'))}}} ` +
|
||||
`{{attack_roll=[[${dice}d${die}<${threshold}]]}} {{threshold=[[${threshold}]]}} ` +
|
||||
`{{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'))});
|
||||
finishRoll(result.rollId, {damage: d10Damage(successes, get('damage'), get('damage_per_success'), get('rmax'), mode)});
|
||||
if (ranged) setAttrs({[prefix + 'ammo_current']: remaining, [prefix + 'weapon_status']: ''});
|
||||
else setAttrs({[prefix + 'weapon_status']: ''});
|
||||
});
|
||||
|
|
@ -75,13 +80,14 @@ on('clicked:repeating_distance:reload', event => {
|
|||
for (const section of ['distance', 'melee']) {
|
||||
on('clicked:repeating_' + section + ':damage_only', event => {
|
||||
const prefix = event.sourceAttribute.replace(/damage_only$/, '');
|
||||
getAttrs([prefix + 'name', prefix + 'damage', prefix + 'damage_per_success'], values => {
|
||||
getAttrs([prefix + 'name', prefix + 'damage', prefix + 'damage_per_success', prefix + 'rmax'], values => {
|
||||
const command = `&{template:d10weapon} {{name=${d10Text(values[prefix + 'name'] || 'Arme')}}} ` +
|
||||
'{{mode=Dégâts}} {{damage_roll=[[?{Réussites|1}]]}} {{damage=[[0]]}}';
|
||||
`{{mode=Dégâts}} {{damage_roll=[[?{Réussites|1}]]}} {{damage=[[0]]}} ` +
|
||||
`{{rmax=${d10Whole(values[prefix + 'rmax']) || 'sans limite'}}}`;
|
||||
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 + 'damage_per_success'], values[prefix + 'rmax'], 'single')});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -65,6 +65,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.assertEqual(files['sheet.html'].count('name="attr_rmax"'), 2)
|
||||
self.assertNotIn('name="attr_attack_dice"', files['sheet.html'])
|
||||
contacts = re.search(r'<fieldset class="repeating_contacts-skills">(.*?)</fieldset>',
|
||||
files['sheet.html'], re.DOTALL)
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
const attributes = { d10_tab: 'core' };
|
||||
const rolls = [];
|
||||
const finished = [];
|
||||
let attackResult = 2;
|
||||
let damageResult = 3;
|
||||
vm.runInNewContext(script, {
|
||||
on: (event, handler) => {
|
||||
assert.ok(!handlers.has(event), `duplicate handler: ${event}`);
|
||||
|
|
@ -26,7 +28,7 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
startRoll: (command, callback) => {
|
||||
rolls.push(command);
|
||||
callback({ rollId: String(rolls.length), results: {
|
||||
attack_roll: { result: 2 }, damage_roll: { result: 3 },
|
||||
attack_roll: { result: attackResult }, damage_roll: { result: damageResult },
|
||||
} });
|
||||
},
|
||||
finishRoll: (id, computed) => finished.push({ id, computed }),
|
||||
|
|
@ -75,7 +77,7 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
[ranged + 'name']: 'Torpille', [ranged + 'skill_id']: 'armesfeu',
|
||||
[ranged + 'base_threshold']: '4', [ranged + 'accuracy']: '1',
|
||||
[ranged + 'damage']: '5',
|
||||
[ranged + 'damage_per_success']: '1', [ranged + 'ammo_current']: '5',
|
||||
[ranged + 'damage_per_success']: '1', [ranged + 'rmax']: '1', [ranged + 'ammo_current']: '5',
|
||||
[ranged + 'magazine_size']: '10', [ranged + 'ammo_reserve']: '3',
|
||||
[ranged + 'single_cost']: '1', [ranged + 'burst_cost']: '3',
|
||||
});
|
||||
|
|
@ -83,16 +85,19 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8/);
|
||||
assert.match(rolls.at(-1), /chargeurs de réserve 3/);
|
||||
assert.equal(attributes[ranged + 'ammo_current'], 4);
|
||||
assert.equal(finished.at(-1).computed.damage, 6);
|
||||
assert.equal(finished.at(-1).computed.damage, 5);
|
||||
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.equal(attributes[ranged + 'ammo_current'], 2);
|
||||
assert.equal(finished.at(-1).computed.damage, 10);
|
||||
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);
|
||||
attributes[ranged + 'ammo_current'] = '1';
|
||||
const count = rolls.length;
|
||||
handlers.get('clicked:repeating_distance:fire_burst')({ sourceAttribute: ranged + 'fire_burst' });
|
||||
|
|
@ -118,12 +123,22 @@ for (const variant of ['base', 'cyberpunk']) {
|
|||
const melee = 'repeating_melee_-test_';
|
||||
Object.assign(attributes, {
|
||||
[melee + 'name']: 'Kataba', [melee + 'damage']: '4',
|
||||
[melee + 'damage_per_success']: '2', [melee + 'base_threshold']: '4',
|
||||
[melee + 'damage_per_success']: '2', [melee + 'rmax']: '2',
|
||||
[melee + 'base_threshold']: '4',
|
||||
});
|
||||
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, 6);
|
||||
attributes[melee + 'rmax'] = '0';
|
||||
handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' });
|
||||
assert.equal(finished.at(-1).computed.damage, 8);
|
||||
damageResult = 0;
|
||||
handlers.get('clicked:repeating_melee:damage_only')({ sourceAttribute: melee + 'damage_only' });
|
||||
assert.equal(finished.at(-1).computed.damage, 0);
|
||||
attackResult = 0;
|
||||
handlers.get('clicked:repeating_melee:attack')({ sourceAttribute: melee + 'attack' });
|
||||
assert.equal(finished.at(-1).computed.damage, 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ FIELD_LABELS = {
|
|||
WEAPON_FIELDS = {
|
||||
'distance': {'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',
|
||||
'ammo_current', 'magazine_size', 'ammo_reserve', 'damage_per_success', 'rmax',
|
||||
'weapon_status'},
|
||||
'melee': {'name', 'damage', 'notes', 'weapon_type', 'accuracy', 'base_threshold',
|
||||
'skill_id', 'damage_per_success', 'weapon_status'},
|
||||
'skill_id', 'damage_per_success', 'rmax', 'weapon_status'},
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -256,6 +256,7 @@ def render_weapon_block(block, combat_skills):
|
|||
f'<select name="attr_skill_id">{options}</select></label>',
|
||||
field('damage', 'Dégâts de base', value='0'),
|
||||
field('damage_per_success', 'Dégâts / réussite', value='0'),
|
||||
field('rmax', 'Rmax (0 = sans limite)', value='0', extra='min="0"'),
|
||||
field('notes', 'Spécial / notes', 'text', '')]
|
||||
if ranged:
|
||||
parts.extend([field('single_cost', 'Coup par coup', value='1', extra='min="1"'),
|
||||
|
|
@ -456,6 +457,7 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='')
|
|||
{{#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>
|
||||
{{#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}}
|
||||
{{#special}}<div class="sheet-roll-detail">{{special}}</div>{{/special}}
|
||||
</rolltemplate>
|
||||
|
|
|
|||
Loading…
Reference in New Issue