M6.5: StepSkills + ability-bonus breakdown + Aside redesign

The skills step lands as the last data-driven character creation step
(only Sign — name + confirm — remains for M6.6). Brought a few cross-
cutting refactors with it.

Scenes/Steps/StepSkills.cs:
  Direct port of StepSkills in src/steps.jsx — all 18 skills laid out
  in 6 ability-grouped panels (STR/DEX/CON/INT/WIS/CHA), 2-column
  grid. Background-granted skills appear pre-checked and locked;
  user picks `class.SkillsChoose` more from `class.SkillOptions`.
  Hover the skill name → popover with the codex flavor description
  (limited to the title only — hovering checkboxes / source tags
  doesn't trigger the popover, avoids interference with adjacent
  rows' click targets). Fixed-width [✓] / [ ] / [—] checkbox slot
  so toggling doesn't shift the row layout.

UI/SkillsCatalog.cs (new):
  Static skill table — JSON id, display label, governing ability,
  and the codex SKILL_DESC text ported verbatim from src/data.jsx.
  Mirrors Theriapolis.Core.Rules.Stats.SkillId; descriptions live
  here because backgrounds.json and classes.json don't carry them.

UI/AbilityCalc.cs (new):
  Final-score math — base assignment + clade and species mods, with
  per-source breakdown for the bonus popover ("+1 from Canidae · +2
  from Wolf"). Hybrid mode tags each clade source with its lineage
  ("(sire)" / "(dam)"). Used by both StepStats and the Aside so the
  two views can never disagree on what a +N badge means.

UI/BackgroundAvailability.cs (new):
  Extracted from StepBackground — shared rules table for hybrid-only
  and clade-restricted backgrounds. Now also consulted by StepClade
  when the player changes lineage: the currently-selected background
  is auto-cleared if the new lineage no longer satisfies its rule
  (e.g., Pack-Raised clears when switching from Canidae to Felidae,
  Passer clears when toggling Hybrid off). Implemented via
  Resource.Duplicate + Patch on the duplicate to evaluate the
  hypothetical post-patch state without committing prematurely.

StepStats.cs:
  Per-row layout extended: ability label | slot | bonus chip | final
  | d20 mod. Bonus chip is a TraitChip with the per-source breakdown
  in its hover description. Auto-assign now sorts empty abilities by
  AbilityCalc.TotalBonus DESCENDING (with class.PrimaryAbility as
  tiebreaker) — biggest pool value lands on the ability already
  receiving the biggest lineage bonus, maximising final scores.

Aside.cs (significant redesign):
  - Name centered at top.
  - Lineage details: 2-column grid, full-width.
    - Purebred:  Clade | Species, then Calling | Background, then
                 Subclass | (empty).
    - Hybrid:    SIRE ★ | DAM (centered + underlined column heads),
                 Clade | Clade, Species | Species, then the same
                 calling/background/subclass rows.
  - Attributes: STR/DEX/CON/INT/WIS/CHA each with bonus chip (omitted
    when +0), final score, d20 modifier. Self-contained min-width
    table so it can't widen the panel beyond its alloc.
  - Pills: traits, detriments, level-1 features, background feature,
    skill chips (BG-locked + user-chosen). All hoverable for descriptions.
  - Whole panel wraps in a ScrollContainer so an over-tall summary
    scrolls in place instead of pushing the wizard layout off-screen.
  - Width nudged 320 → 360px. Smaller font on label tags, autowrap
    on value labels so long names ("Hybrid Underground") wrap rather
    than push the panel wider.

Card grids: changed all five card-grid steps (Clade, Species, Class,
Subclass, Background) from SizeFlagsHorizontal.ExpandFill →
ShrinkCenter. Cards stay at their CustomMinimumSize 200 wide and
the grid horizontally centers in PageMain. The right-side gap
between content and Aside is now uniform regardless of how many
cards or whether the last row is partial — fixes the "Clade tab
feels too padded, Background tab too tight" perception.

Closes M6.5. Per guide §12, what's left in M6: M6.6 (StepReview —
name + summary + Confirm handoff per guide §11) and M6.7 (parchment
Theme pass).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Christopher Wiebe
2026-05-03 18:10:05 -07:00
parent ce87eb11ad
commit 0e5d4b7425
13 changed files with 793 additions and 67 deletions
+69
View File
@@ -0,0 +1,69 @@
using System.Collections.Generic;
using System.Linq;
using Theriapolis.Core.Data;
namespace Theriapolis.GodotHost.UI;
/// <summary>
/// Final ability score math — base assignment + clade and species mods.
/// Used by StepStats and Aside to render the score breakdown with a
/// "+N from Canidae · +2 from Wolf" hover popover.
///
/// For hybrids the lineage contribution comes from BOTH parent clades
/// (each tagged with its lineage in the source label) and the dominant
/// species. Core's CharacterBuilder.TryBuildHybrid is the authority on
/// the final mechanical rules at character-finalize time; this is a
/// preview-display helper.
/// </summary>
public static class AbilityCalc
{
public readonly record struct ModSource(string Label, int Value);
public static List<ModSource> Sources(string ability, CharacterDraft draft)
{
var list = new List<ModSource>();
if (draft.IsHybrid)
{
AddCladeSource(list, ability, CodexContent.Clade(draft.SireCladeId), " (sire)");
AddCladeSource(list, ability, CodexContent.Clade(draft.DamCladeId), " (dam)");
}
else
{
AddCladeSource(list, ability, CodexContent.Clade(draft.CladeId), "");
}
var sp = CodexContent.SpeciesById(draft.EffectiveSpeciesId);
if (sp is not null) AddDictSource(list, ability, sp.Name, sp.AbilityMods);
return list;
}
public static int TotalBonus(string ability, CharacterDraft draft)
=> Sources(ability, draft).Sum(s => s.Value);
public static int BaseScore(string ability, CharacterDraft draft)
=> draft.StatAssign.ContainsKey(ability) ? (int)draft.StatAssign[ability] : 0;
public static int FinalScore(string ability, CharacterDraft draft)
=> BaseScore(ability, draft) + TotalBonus(ability, draft);
public static int D20Modifier(int score) => (int)System.Math.Floor((score - 10) / 2.0);
public static string FormatSigned(int n) => n >= 0 ? $"+{n}" : n.ToString();
/// <summary>"+1 from Canidae · +2 from Wolf" — empty when no sources.</summary>
public static string FormatBreakdown(IEnumerable<ModSource> sources) =>
string.Join(" · ", sources.Select(s => $"{FormatSigned(s.Value)} from {s.Label}"));
private static void AddCladeSource(List<ModSource> list, string ability, CladeDef? clade, string suffix)
{
if (clade is null) return;
AddDictSource(list, ability, clade.Name + suffix, clade.AbilityMods);
}
private static void AddDictSource(List<ModSource> list, string ability, string sourceName, Dictionary<string, int> mods)
{
if (mods.TryGetValue(ability, out int v) && v != 0)
list.Add(new ModSource(sourceName, v));
}
}