diff --git a/README.md b/README.md index 24d3c41..9080a0b 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,9 @@ 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 +fenêtre Roll20, avec 1 par défaut. Les jets de combat utilisent des d10 avec +`cs1cf10`; les autres jets utilisent le dé sélectionné avec `cs1cfX`, où X +est le nombre de faces. L'attaque compte les dés inférieurs ou é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 diff --git a/TASKS.md b/TASKS.md index cc753d0..eddf595 100644 --- a/TASKS.md +++ b/TASKS.md @@ -33,6 +33,7 @@ - [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. +- [x] Mark combat rolls with cs1cf10 and all other dice rolls with cs1cfX for the selected die. ## Live Roll20 checks after local verification diff --git a/templates/cyberpunk-weapons.js b/templates/cyberpunk-weapons.js index 284ea51..e50f89b 100644 --- a/templates/cyberpunk-weapons.js +++ b/templates/cyberpunk-weapons.js @@ -19,7 +19,7 @@ function d10WeaponFields(prefix, callback) { const fields = ['name', 'weapon_type', 'accuracy', 'base_threshold', 'skill_id', '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 => { + getAttrs(fields.map(field => prefix + field), values => { const skillId = values[prefix + 'skill_id']; const skillField = D10_COMBAT_SKILLS.includes(skillId) ? 'combat_skilllevel_' + skillId : ''; if (skillField) { @@ -40,7 +40,6 @@ function d10WeaponAttack(event, mode, ranged) { setAttrs({[prefix + 'weapon_status']: 'Chargeur insuffisant : ' + current + '/' + cost}); return; } - 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]; @@ -48,7 +47,7 @@ function d10WeaponAttack(event, mode, ranged) { 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}]]}} ` + + `{{attack_roll=[[${dice}d10<${threshold}cs1cf10]]}} {{threshold=[[${threshold}]]}} ` + `${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'))}}}` : ''); diff --git a/tests/test_build.py b/tests/test_build.py index d2f4d29..9d81d27 100644 --- a/tests/test_build.py +++ b/tests/test_build.py @@ -26,6 +26,8 @@ class BuildTests(unittest.TestCase): self.assertIn('.sheet-rolltemplate-d10skillcheck .inlinerollresult', files['sheet.css']) self.assertIn('color: #20242b !important; background: #ffffff !important', files['sheet.css']) self.assertIn('class="sheet-stat-grid"', files['sheet.html']) + self.assertIn('1d@{dice}cs1cf@{dice}', files['sheet.html']) + self.assertIn('1d10cs1cf10', files['sheet.html']) self.assertIn('class="sheet-skill-head"', files['sheet.html']) self.assertEqual(files['sheet.html'].count('class="sheet-page sheet-page-'), 2 if variant == 'base' else 3) self.assertIn('name="attr_d10_tab" value="skills"', files['sheet.html']) @@ -71,6 +73,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.assertIn('d10<${threshold}cs1cf10', 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'
', diff --git a/tests/test_tabs.mjs b/tests/test_tabs.mjs index e116b9b..608f554 100644 --- a/tests/test_tabs.mjs +++ b/tests/test_tabs.mjs @@ -86,21 +86,21 @@ for (const variant of ['base', 'cyberpunk']) { [ranged + 'single_cost']: '1', [ranged + 'burst_cost']: '3', }); handlers.get('clicked:repeating_distance:fire_single')({ sourceAttribute: ranged + 'fire_single' }); - assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8/); + assert.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8cs1cf10/); assert.match(rolls.at(-1), /chargeurs de réserve 3/); assert.equal(attributes[ranged + 'ammo_current'], 4); 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.match(rolls.at(-1), /\(\?\{Nombre de dés\|1\}\+1\)d10<8cs1cf10/); assert.equal(attributes[ranged + 'ammo_current'], 2); 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.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<8cs1cf10/); assert.equal(attributes[ranged + 'ammo_current'], 0); assert.equal(finished.at(-1).computed.damage_list, '6, 5'); attackDice = []; @@ -136,7 +136,7 @@ for (const variant of ['base', 'cyberpunk']) { [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.match(rolls.at(-1), /\?\{Nombre de dés\|1\}d10<4cs1cf10/); 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); diff --git a/tools/build.py b/tools/build.py index 357618d..f9e0399 100644 --- a/tools/build.py +++ b/tools/build.py @@ -142,12 +142,13 @@ def validate(model, skills, theme): raise ValueError('skill tabs must place each skill group and repeating section exactly once') -def roll(label, threshold): - expression = f'{threshold}-1d@{{dice}}cs1cf@{{dice}}' +def roll(label, threshold, combat=False): + die = '10' if combat else '@{dice}' + expression = f'{threshold}-1d{die}cs1cf{die}' value = ('&{template:d10skillcheck} ' '{{name=@{character_name}}} ' f'{{{{roll_name={label}}}}} ' - '{{dice_name=@{dice}}} ' + f'{{{{dice_name={die}}}}} ' f'{{{{threshold=[[{threshold}]]}}}} ' f'{{{{result=[[{expression}]]}}}}') return f'' @@ -330,14 +331,14 @@ def render(model, skills, variant, theme_name, theme, themes, asset_base_url='') field = (f'') parts.append('