diff --git a/setup/analysis/class_cost_report.typ b/setup/analysis/class_cost_report.typ index 6fd0501..4aec8fd 100644 --- a/setup/analysis/class_cost_report.typ +++ b/setup/analysis/class_cost_report.typ @@ -3,6 +3,7 @@ #import "class_costs.typ": * #import "report_style.typ": chart-theme, metric-card, report-theme, rounded #import "../theme/tables.typ" as tables +#import "../build_config.typ": school-tiers #let class-chart-labels = ( artilleur: "Art.", @@ -74,7 +75,7 @@ } #let tier-matrix(classes, metric) = { - let headers = range(1, 8).map(tier => [T#tier]) + let headers = school-tiers.map(tier => [T#tier]) let rows = () for (name, class-data) in classes { rows.push(class-data.display) @@ -85,8 +86,8 @@ tables.set-table-style( table( - columns: (1.5fr,) + (0.62fr,) * 7, - align: (left,) + (right,) * 7, + columns: (1.5fr,) + (0.62fr,) * school-tiers.len(), + align: (left,) + (right,) * school-tiers.len(), table.header([Classe], ..headers), ..rows, ), @@ -144,7 +145,7 @@ heading(level: 3)[Matrice des coûts en Jauge] tier-matrix(classes, "gauge-total") - for tier in range(1, 8) { + for tier in school-tiers { pagebreak(weak: true) tier-comparison(classes, tier) } diff --git a/setup/analysis/class_costs.typ b/setup/analysis/class_costs.typ index 0ab698f..6f6d805 100644 --- a/setup/analysis/class_costs.typ +++ b/setup/analysis/class_costs.typ @@ -1,5 +1,6 @@ // Pure data analysis for school technique costs. #import "../generation/radar_graphs.typ": school-sources +#import "../build_config.typ": school-tiers, tier-is-enabled #let class-display-names = ( artilleur: "Artilleur", @@ -62,7 +63,7 @@ // the extra metadata column in heavy_weapon_specialist.tsv is harmless. #let analyze-class-costs(name, source) = { let rows = csv(source, delimiter: "\t") - let tiers = range(1, 8).map(empty-tier) + let tiers = school-tiers.map(empty-tier) let current-tier = none let blood-column = none let gauge-column = none @@ -87,9 +88,7 @@ } if first == "" or current-tier == none { continue } - if current-tier < 1 or current-tier > tiers.len() { - panic("Unsupported tier " + str(current-tier) + " in `" + str(source) + "`") - } + if current-tier < 1 or not tier-is-enabled(current-tier) { continue } let blood = if blood-column < row.len() { numeric-cost(row.at(blood-column)) @@ -119,7 +118,7 @@ } #let portfolio-tiers(classes: all-class-costs) = { - range(7).map(index => { + range(school-tiers.len()).map(index => { let aggregate = empty-tier(index + 1) for (_, class-data) in classes { let tier = class-data.tiers.at(index) @@ -138,4 +137,3 @@ ) #let average(total, count) = if count == 0 { none } else { total / count } - diff --git a/setup/analysis/craft_metrics.typ b/setup/analysis/craft_metrics.typ index b336eab..da7cdc2 100644 --- a/setup/analysis/craft_metrics.typ +++ b/setup/analysis/craft_metrics.typ @@ -1,4 +1,5 @@ // Heuristic elemental metrics extracted from the craft CSV portfolio. +#import "../build_config.typ": craft-tiers, tier-is-enabled #let craft-sources = ( (craft: "Alchimie", label: "Réagents", source: "/data/src/craft/alchemy_reagents.csv", name: "Réagents", tier: "@ar_tier", effects: ("Effet (Principal)",)), (craft: "Alchimie", label: "Solvants", source: "/data/src/craft/alchemy_solvants.csv", name: "Solvants", tier: "@ar_tier", effects: ("Effet",)), @@ -38,6 +39,17 @@ else { "Autre" } } +#let configured-craft-rows(definition) = csv( + definition.source, + row-type: dictionary, +).filter(row => { + if definition.tier == none { true } else { + let raw = row.at(definition.tier, default: "") + let found = raw.match(regex("-?\d+")) + found == none or tier-is-enabled(int(found.text)) + } +}) + #let clause-elements(clause) = { let lowered = lower(clause) let found = element-definitions.filter(element => "@el_" + element.key in lowered) @@ -51,7 +63,7 @@ } #let analyze-craft-source(definition) = { - let rows = csv(definition.source, row-type: dictionary) + let rows = configured-craft-rows(definition) let mentions = () for row in rows { for effect-key in definition.effects { @@ -85,7 +97,7 @@ #let element-counts(role: none) = element-definitions.map(element => ( label: element.label, count: selected-mentions(role: role, element: element.label).len(), )).filter(item => item.count > 0) -#let tier-counts(role: none) = range(0, 6).map(tier => (tier: tier, count: selected-mentions(role: role, tier: tier).len())) +#let tier-counts(role: none) = craft-tiers.map(tier => (tier: tier, count: selected-mentions(role: role, tier: tier).len())) #let ranked-elements(role) = element-counts(role: role).sorted(key: item => -item.count) #let coverage-gap(from-role, against-role) = element-counts(role: from-role).filter(item => ( selected-mentions(role: against-role, element: item.label).len() == 0 @@ -124,6 +136,7 @@ "Actions", "Fatigue", "Caractéristiques", "PV", "Altérations", "Marques", "Réserve active", ) +#let mark-types = ("poison", "saignement", "regeneration", "corrosif") #let field-number(row, keys) = { for key in keys { @@ -155,20 +168,19 @@ if stat-gain != none { categories.push((category: "Caractéristiques", subtype: none)) } - if is-marks { - for alteration in alterations { - categories.push((category: "Marques", subtype: alteration.captures.first())) - } - } else { - for alteration in alterations { - categories.push((category: "Altérations", subtype: alteration.captures.first())) + for alteration in alterations { + let subtype = alteration.captures.first() + if is-marks and subtype in mark-types { + categories.push((category: "Marques", subtype: subtype)) + } else { + categories.push((category: "Altérations", subtype: subtype)) } } categories } #let analyze-craft-mechanics(definition) = { - let rows = csv(definition.source, row-type: dictionary) + let rows = configured-craft-rows(definition) let records = () for row in rows { let constraints = ( @@ -210,19 +222,23 @@ #let mechanic-counts = mechanic-order.map(category => ( label: category, count: selected-mechanics(category: category).len(), )).sorted(key: item => -item.count) -#let mechanic-tier-counts(category) = range(0, 6).map(tier => ( +#let mechanic-tier-counts(category) = craft-tiers.map(tier => ( tier: tier, count: selected-mechanics(category: category, tier: tier).len(), )) #let average-present(records, key) = { let values = records.map(record => record.at(key)).filter(value => value != none) if values.len() == 0 { none } else { calc.round(values.sum() / values.len(), digits: 1) } } +#let range-present(records, key) = { + let values = records.map(record => record.at(key)).filter(value => value != none).sorted() + if values.len() == 0 { none } else { (min: values.first(), max: values.last(), count: values.len()) } +} #let mechanic-profile(category) = { let records = selected-mechanics(category: category) let tiers = mechanic-tier-counts(category) let present = tiers.filter(item => item.count > 0) let peak = present.sorted(key: item => -item.count).first() - let changes = range(1, 6).map(tier => ( + let changes = craft-tiers.slice(1).map(tier => ( tier: tier, increase: tiers.at(tier).count - tiers.at(tier - 1).count, )).sorted(key: item => -item.increase) @@ -250,3 +266,17 @@ } counts.pairs().map(pair => (label: pair.first(), count: pair.last())).sorted(key: item => -item.count) } + +#let subtype-profile(category, subtype) = { + let records = selected-mechanics(category: category, subtype: subtype) + let tiers = craft-tiers.map(tier => ( + tier: tier, count: records.filter(item => item.tier == tier).len(), + )) + let present = tiers.filter(item => item.count > 0) + let peak = present.sorted(key: item => -item.count).first() + ( + subtype: subtype, count: records.len(), first-tier: present.first().tier, + peak-tier: peak.tier, cost: average-present(records, "cost"), + level: average-present(records, "level"), toxicity: average-present(records, "toxicity"), + ) +} diff --git a/setup/analysis/craft_report.typ b/setup/analysis/craft_report.typ index fc2d689..b864818 100644 --- a/setup/analysis/craft_report.typ +++ b/setup/analysis/craft_report.typ @@ -3,6 +3,7 @@ #import "craft_metrics.typ": * #import "report_style.typ": chart-theme, metric-card, report-theme, rounded #import "../theme/tables.typ" as tables +#import "../build_config.typ": craft-tiers #let insight-card(label, value, note) = block( width: 100%, @@ -28,6 +29,10 @@ 0, calc.min(limit, items.len()), ).map(item => item.label + " (" + str(item.at(count-key)) + ")").join(", ") +#let range-label(value) = if value == none { [—] } else { + [#value.min–#value.max (#value.count)] +} + #let craft-summary() = { heading(level: 2)[Artisanat — couverture élémentaire] grid(columns: (1fr,) * 4, column-gutter: 8pt, @@ -39,7 +44,7 @@ name: role, values: craft-order.map(craft => selected-mentions(craft: craft, role: role).len()), ))), width: 100%, height: 205pt, theme: chart-theme) heading(level: 3)[Progression par tier] - grouped-bar-chart((labels: range(0, 6).map(tier => "T" + str(tier)), series: ("Dégâts", "Résistance", "Accès").map(role => ( + grouped-bar-chart((labels: craft-tiers.map(tier => "T" + str(tier)), series: ("Dégâts", "Résistance", "Accès").map(role => ( name: role, values: tier-counts(role: role).map(item => item.count), ))), width: 100%, height: 180pt, theme: chart-theme) } @@ -116,6 +121,71 @@ insight-card("`_end` max. moyen", constrained.at(3).leader.category + " · " + str(constrained.at(3).leader.endurance), [maximum calculé entre familles]), ) + pagebreak(weak: true) + heading(level: 3)[Répartition par métier] + let craft-rows = () + for category in mechanic-order { + craft-rows.push(category) + for craft in craft-order { + craft-rows.push(str(all-craft-mechanics.filter(item => ( + item.category == category and item.craft == craft + )).len())) + } + } + tables.set-table-style( + table( + columns: (1.4fr,) + (0.78fr,) * craft-order.len(), + align: (left,) + (right,) * craft-order.len(), + table.header([Famille], ..craft-order), + ..craft-rows, + ), + table-theme: "steingrund", + text-size: 7.5pt, + ) + + heading(level: 3)[Étendue des contraintes] + let range-rows = mechanic-order.map(category => { + let records = selected-mechanics(category: category) + ( + category, + range-label(range-present(records, "cost")), + range-label(range-present(records, "level")), + range-label(range-present(records, "toxicity")), + range-label(range-present(records, "endurance")), + ) + }) + tables.set-table-style( + table( + columns: (1.3fr, 1fr, 1fr, 1fr, 1fr), + align: (left, right, right, right, right), + table.header([Famille], [Coût min–max], [Niv. min–max], [Tox. min–max], [`_end` min–max]), + ..range-rows.flatten(), + ), + table-theme: "steingrund", + text-size: 7.2pt, + ) + + heading(level: 3)[Contraintes moyennes par tier] + let tier-rows = craft-tiers.map(tier => { + let records = all-craft-mechanics.filter(item => item.tier == tier) + ( + "T" + str(tier), str(records.len()), rounded(average-present(records, "cost"), digits: 1), + rounded(average-present(records, "level"), digits: 1), + rounded(average-present(records, "toxicity"), digits: 1), + rounded(average-present(records, "endurance"), digits: 1), + ) + }) + tables.set-table-style( + table( + columns: (0.6fr, 0.6fr, 1fr, 1fr, 1fr, 1fr), + align: (left, right, right, right, right, right), + table.header([Tier], [N], [Coût moy.], [Niv. moy.], [Tox. moy.], [`_end` moy.]), + ..tier-rows.flatten(), + ), + table-theme: "steingrund", + text-size: 7.5pt, + ) + pagebreak(weak: true) heading(level: 3)[Altérations et marques] let alterations = subtype-counts("Altérations") @@ -133,6 +203,46 @@ ), ) + heading(level: 3)[Contraintes des altérations les plus fréquentes] + let subtype-rows = alterations.slice(0, calc.min(12, alterations.len())).map(item => { + let profile = subtype-profile("Altérations", item.label) + ( + item.label.replace("_", " "), str(profile.count), "T" + str(profile.first-tier), + "T" + str(profile.peak-tier), rounded(profile.cost, digits: 1), + rounded(profile.level, digits: 1), rounded(profile.toxicity, digits: 1), + ) + }) + tables.set-table-style( + table( + columns: (1.4fr, 0.45fr, 0.55fr, 0.55fr, 0.7fr, 0.7fr, 0.7fr), + align: (left,) + (right,) * 6, + table.header([Altération], [N], [Début], [Pic], [Coût], [Niv.], [Tox.]), + ..subtype-rows.flatten(), + ), + table-theme: "steingrund", + text-size: 7pt, + ) + + heading(level: 3)[Contraintes des marques] + let mark-rows = marks.map(item => { + let profile = subtype-profile("Marques", item.label) + ( + item.label.replace("_", " "), str(profile.count), "T" + str(profile.first-tier), + "T" + str(profile.peak-tier), rounded(profile.cost, digits: 1), + rounded(profile.level, digits: 1), rounded(profile.toxicity, digits: 1), + ) + }) + tables.set-table-style( + table( + columns: (1.4fr, 0.45fr, 0.55fr, 0.55fr, 0.7fr, 0.7fr, 0.7fr), + align: (left,) + (right,) * 6, + table.header([Marque], [N], [Début], [Pic], [Coût], [Niv.], [Tox.]), + ..mark-rows.flatten(), + ), + table-theme: "steingrund", + text-size: 7pt, + ) + heading(level: 3)[Progression automatique par tier] let progression-rows = () for profile in mechanic-profiles { @@ -141,9 +251,9 @@ } tables.set-table-style( table( - columns: (1.45fr,) + (0.6fr,) * 6, - align: (left,) + (right,) * 6, - table.header([Famille], [T0], [T1], [T2], [T3], [T4], [T5]), + columns: (1.45fr,) + (0.6fr,) * craft-tiers.len(), + align: (left,) + (right,) * craft-tiers.len(), + table.header([Famille], ..craft-tiers.map(tier => [T#tier])), ..progression-rows, ), table-theme: "steingrund", diff --git a/setup/build_config.typ b/setup/build_config.typ new file mode 100644 index 0000000..4a3968e --- /dev/null +++ b/setup/build_config.typ @@ -0,0 +1,10 @@ +// Shared build-time data limits. +// Tiers are included when `tier < max-tier-exclusive`. +#let build-config = ( + max-tier-exclusive: 5, +) + +#let max-tier-exclusive = build-config.max-tier-exclusive +#let tier-is-enabled(tier) = tier == none or tier < max-tier-exclusive +#let craft-tiers = range(0, max-tier-exclusive) +#let school-tiers = range(1, max-tier-exclusive) diff --git a/setup/generation/radar_graphs.typ b/setup/generation/radar_graphs.typ index e65c6d1..f6b0b01 100644 --- a/setup/generation/radar_graphs.typ +++ b/setup/generation/radar_graphs.typ @@ -2,6 +2,7 @@ // radar charts. Axis totals are normalized against the highest class total for // that axis across the complete `school-sources` collection. #import "../theme/variables.typ": theme +#import "../build_config.typ": tier-is-enabled #import "@preview/primaviz:0.6.0": radar-chart // Selected TSV fields and their reader-facing labels. Add, remove, reorder, or @@ -76,7 +77,14 @@ let indices = fields.map(field => field-index(header, field)) let totals = fields.map(_ => 0.0) + let current-tier = none for row in rows.slice(header-index + 1) { + if row.len() > 0 and row.first().trim().starts-with("Tier") { + let digits = row.first().replace(regex("\D"), "") + if digits != "" { current-tier = int(digits) } + continue + } + if not tier-is-enabled(current-tier) { continue } for (axis, column) in indices.enumerate() { if column < row.len() { let value = numeric-cell(row.at(column)) diff --git a/setup/models/school.typ b/setup/models/school.typ index 12cf2f8..41ea16b 100644 --- a/setup/models/school.typ +++ b/setup/models/school.typ @@ -3,6 +3,7 @@ #import "../theme/decorations.typ" as spacers #import "../theme/tables.typ" as st #import "../core/macros.typ" as macros +#import "../build_config.typ": tier-is-enabled //----- Technique TSV importer ----- @@ -261,13 +262,12 @@ delimiter: "\t", ) - let tiers = parse-techniques(data) + let tiers = parse-techniques(data).filter(tier => { + let number = tier.at(0).match(regex("\d+")) + number != none and tier-is-enabled(int(number.text)) + }) for (index, tier) in tiers.enumerate() { - //----- Limit the number of rendered tiers ----- - // TODO: Remove this magic value - if (index >= 4) { break } - let name = tier.at(0) let rows = tier.at(1) diff --git a/setup/setup.typ b/setup/setup.typ index f8464e1..9758f42 100644 --- a/setup/setup.typ +++ b/setup/setup.typ @@ -2,6 +2,7 @@ #import "theme/variables.typ": ravenous, theme, theme-var #import "core/limits.typ": hunbal #import "/data/gen/build_info.typ": build_info +#import "build_config.typ" as build_config //----- Imports ----- #import "models/document.typ" as model #import "core/macros.typ" as macros @@ -15,6 +16,8 @@ #let theme = theme #let theme-var = theme-var #let build_info = build_info +#let build-config = build_config.build-config +#let max-tier-exclusive = build_config.max-tier-exclusive #let gls = model.gls #let gls-description = model.gls-description #let macros = macros