From b001f8c450929a41babeb010cfd0d545c465212c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Fri, 21 Aug 2026 21:11:41 +0200 Subject: [PATCH] False 4a heavy weapon in analysis --- setup/analysis/weapon_report.typ | 55 +++++++++++++++++++++++++++++--- 1 file changed, 50 insertions(+), 5 deletions(-) diff --git a/setup/analysis/weapon_report.typ b/setup/analysis/weapon_report.typ index 60a430f..a3aa6da 100644 --- a/setup/analysis/weapon_report.typ +++ b/setup/analysis/weapon_report.typ @@ -44,12 +44,12 @@ [#rounded(result.best, digits: 2) #text(size: 6pt, fill: luma(90))[#result.strategy dés]] } -#let commitment-stacked-groups = weapon-natures.map(nature => { +#let standard-commitment-stacked-groups = weapon-natures.map(nature => { let values = weapon-shapes.map(shape => all-weapon-metrics.find(item => ( item.shape == shape and item.nature-key == nature ))) ( - name: weapon-nature-labels.at(nature), + name: weapon-nature-labels.at(nature) + " (2 actions)", segments: ( (name: str(low-scenario.dice) + " dés", values: values.map(item => item.commitments.low.best)), (name: "Gain " + str(low-scenario.dice) + "→" + str(mid-scenario.dice), values: values.map(item => ( @@ -62,6 +62,42 @@ ) }) +// Local comparison only: give the 2A Super-lourd a four-action window, hence +// exactly two attacks, and optimally split each configured die pool between them. +#let super-heavy-four-action-damage(item, scenario) = commitment-analysis( + item.base-damage, + item.p-damage, + item.rmax, + 1, + scenario.dice, + item.success-probability, +).split.damage + +#let super-heavy-four-action-values = weapon-shapes.map(shape => ( + all-weapon-metrics.find(item => item.shape == shape and item.nature-key == "SuperHeavy") +)) +#let super-heavy-four-action-low = super-heavy-four-action-values.map(item => ( + super-heavy-four-action-damage(item, low-scenario) +)) +#let super-heavy-four-action-mid = super-heavy-four-action-values.map(item => ( + super-heavy-four-action-damage(item, mid-scenario) +)) +#let super-heavy-four-action-full = super-heavy-four-action-values.map(item => ( + super-heavy-four-action-damage(item, full-scenario) +)) +#let commitment-stacked-groups = standard-commitment-stacked-groups + (( + name: "Super-lourd (4 actions)", + segments: ( + (name: str(low-scenario.dice) + " dés", values: super-heavy-four-action-low), + (name: "Gain " + str(low-scenario.dice) + "→" + str(mid-scenario.dice), values: ( + range(weapon-shapes.len()).map(index => super-heavy-four-action-mid.at(index) - super-heavy-four-action-low.at(index)) + )), + (name: "Gain " + str(mid-scenario.dice) + "→" + str(full-scenario.dice), values: ( + range(weapon-shapes.len()).map(index => super-heavy-four-action-full.at(index) - super-heavy-four-action-mid.at(index)) + )), + ), +),) + #let weapon-analysis-report() = { pagebreak() heading(level: 2)[Artisanat — Équilibre des armes] @@ -131,16 +167,25 @@ weapon-value-matrix("damage-per-action", digits: 1) heading(level: 3)[Dégâts attendus à #low-scenario.dice, #mid-scenario.dice et #full-scenario.dice dés] - [Pour chaque forme, les quatre barres suivent l’ordre léger, moyen, lourd, - super-lourd. L’empilement est cumulatif: le premier segment donne les dégâts + [Pour chaque forme, les quatre premières barres (léger, moyen, lourd et + super-lourd) utilisent le budget normal de deux actions. La cinquième, + *Super-lourd (4 actions)*, est une comparaison hypothétique limitée à ce + graphique: elle effectue exactement deux attaques de 2A et répartit le pool de + dés entre elles de la manière la plus favorable. L’empilement est cumulatif: + le premier segment donne les dégâts à #low-scenario.dice dés, puis les gains supplémentaires jusqu’à #mid-scenario.dice et #full-scenario.dice dés. Le sommet est donc l’espérance réelle à #full-scenario.dice dés.] + align(center)[ + #text(size: 7pt, weight: "bold")[Ordre des barres :] + #text(size: 7pt)[ Léger (2 actions) · Moyen (2 actions) · Lourd (2 actions) · + Super-lourd (2 actions) · Super-lourd (4 actions, 2 attaques)] + ] grouped-stacked-bar-chart( (labels: weapon-shapes, groups: commitment-stacked-groups), width: 100%, height: 230pt, - y-label: [Dégâts attendus sur 2A], + y-label: [Dégâts attendus], theme: chart-theme, )