OP2 (df9c7a35) was double-REJECTed: an unconditional Type-8/Type-5 factory
mapping silently re-classed 15 elements across 7 shipped panels (vendor
backdrop lost its fill, character/spellbook roots stopped passing clicks
through, combat gained a phantom import-time tab takeover, ten ListBoxes
gained a spurious hit-testable viewport) because the stale 27 pre-existing
fixtures never exercised the new fields — and the mechanism itself cited a
nonexistent "UIElement_TabControl" class, inverted UiCheckboxBitfield64's
checked-state predicate, and synthesized fake per-row geometry instead of
using the widget's own authored template.
Shape change: UiTabPanel (renamed from UiTabControl) and UiTemplateListBox
now derive from UiDatElement (unsealed) and stay DORMANT by default — an
imported Type-8/Type-5 element gets authored-media drawing, ClickThrough
generic-decoration default, and IUiDatStateful propagation identical to the
pre-OP2 UiDatElement fallback, with zero import-time side effects. The
factory's Type-8/Type-5 arms are unconditional again (no more guard whose
premise the blast-radius sweep proved false), because dormancy makes an
unactivated instance behaviorally indistinguishable from the old fallback.
UiTabPanel.ActivateTabBehavior() and UiTemplateListBox's lazy viewport
creation are the explicit, controller-driven opt-ins Campaign OP slice OP3+
will call; today nothing does, so the four pre-existing shipped Type-8
hosts (character/spellbook/vendor/combat) and ten pre-existing Type-5
ListBoxes keep their pre-OP2 behavior exactly. Filed AD-73 for this
dormant-vs-retail's-unconditional-activation adaptation.
Mechanism fixes (docs/research/2026-08-11-op2-review-mechanism.md):
- UiTabPanel cites UIElement_Panel (Type 8 is UIElement_Panel; no
UIElement_TabControl exists in the PDB), resolves buttons/pages via a
GetChildRecursive-equivalent descendant search (not direct-children-only),
performs no switch when no entry authors 0x32 (deleted the _tabs[0]
fallback), and surfaces unresolved tab-table entries via UnresolvedEntries
+ a diagnostic line instead of a silent no-op.
- ElementReader.ReadTabTable skips entries missing 0x30/0x31, matching
retail's SetupTabPageHash @0x0046C2E0 entry filter.
- UiCheckboxBitfield64 now builds every row from its OWN authored template
(property 0x64 -> {0x2100002B, 0x10000521}) via AddItemFromTemplateList,
deleting the synthesized ElementInfo + invented RowHeight=14 — matching
retail's CreateChildren @0x00485DF0, which is itself a UIElement_ListBox
call. IsSet is now retail's ANY-bit-set predicate (Refresh @0x004859C0),
not all-bits-set. TS-72 retired: the click-toggle bit math is now fully
decomp-confirmed (SetBitsOnOrOff via ListenToElementMessage @0x00485AE0).
Regenerated all 32 UI fixtures against real DAT (ACDREAM_REGENERATE_UI_FIXTURES=1)
and committed them — 27 pre-existing fixtures now carry Outline/OutlineColor/
TabTable/TemplateList/ScrollbarElementId; the 5 Options fixtures were already
current. Updated EffectsUiControllerTests' now-correct UiTemplateListBox
class-identity assertion. Added: 6 built-widget behavior pins for all five
pre-existing Type-8 elements + a representative Type-5 element the dormancy
model protects (OP2ReworkBlastRadiusConformanceTests.cs); 5 reader-level
tests driving ReadTabTable/ReadTemplateList/the 0x72 reader from raw
property bags (ElementReaderTests.cs); a multi-bit-mask UiCheckboxBitfield64
test proving the any-bit predicate (the prior single-bit test couldn't
distinguish it from all-bits); an activation-idempotency test and a
before-activation click-is-inert test for UiTabPanel.
Full Release suite: 12,868 passed / 4 skipped / 0 failed (baseline 12,853/4/0
post-OP1-fixes; +15 net new tests, zero regressions).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
317 lines
14 KiB
C#
317 lines
14 KiB
C#
using AcDream.App.UI;
|
|
using AcDream.App.UI.Layout;
|
|
using AcDream.Core.Spells;
|
|
|
|
namespace AcDream.App.Tests.UI.Layout;
|
|
|
|
public sealed class EffectsUiControllerTests
|
|
{
|
|
private static (uint, int, int) NoTex(uint _) => (0u, 0, 0);
|
|
private static EffectRowTemplateFactory Templates()
|
|
=> new(FixtureLoader.LoadEffectRowTemplateInfos(), NoTex, defaultFont: null);
|
|
|
|
[Fact]
|
|
public void AuthoredEffectRowTemplate_HasRetailIconNameDurationAndSelectionStates()
|
|
{
|
|
ElementInfo row = FixtureLoader.LoadEffectRowTemplateInfos();
|
|
|
|
Assert.Equal(EffectsUiController.RowTemplateId, row.Id);
|
|
Assert.Equal((300f, 32f), (row.Width, row.Height));
|
|
Assert.Contains(UiButtonStateMachine.Normal, row.States.Keys);
|
|
Assert.Contains(UiButtonStateMachine.Highlight, row.States.Keys);
|
|
Assert.Equal((0f, 32f),
|
|
(FindInfo(row, EffectsUiController.RowIconId)!.X,
|
|
FindInfo(row, EffectsUiController.RowIconId)!.Width));
|
|
Assert.Equal((37f, 188f),
|
|
(FindInfo(row, EffectsUiController.RowLabelId)!.X,
|
|
FindInfo(row, EffectsUiController.RowLabelId)!.Width));
|
|
Assert.Equal((225f, 50f),
|
|
(FindInfo(row, EffectsUiController.RowDurationId)!.X,
|
|
FindInfo(row, EffectsUiController.RowDurationId)!.Width));
|
|
}
|
|
|
|
[Fact]
|
|
public void Rebuild_DoesNotAutoSelectFirstEffect_AndClearsRemovedSelection()
|
|
{
|
|
var table = SpellTable.LoadFromReader(new StringReader(
|
|
"Spell ID,Name,Flags [Hex]\n42,Boon,0x4\n"));
|
|
var spellbook = new Spellbook(table);
|
|
var root = new UiPanel { Width = 160f, Height = 100f };
|
|
var list = new UiItemList(NoTex) { Width = 160f, Height = 64f };
|
|
var info = new UiText { Width = 160f, Height = 32f };
|
|
root.AddChild(list);
|
|
root.AddChild(info);
|
|
var layout = new ImportedLayout(root, new Dictionary<uint, UiElement>
|
|
{
|
|
[EffectsUiController.ListId] = list,
|
|
[EffectsUiController.InfoTextId] = info,
|
|
});
|
|
using EffectsUiController controller = EffectsUiController.Bind(
|
|
layout, spellbook, positive: true, () => 0d, NoTex, id => id,
|
|
Templates(), "SELECT A SPELL")!;
|
|
|
|
Assert.False(info.PreserveEndOnLayout);
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 1u, 60f, 1u, Bucket: 1u, SpellCategory: 42u));
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 2u, 60f, 1u, Bucket: 4u, SpellCategory: 42u));
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 3u, 60f, 1u, Bucket: 8u, SpellCategory: 42u));
|
|
Assert.Null(controller.SelectedSpellId);
|
|
Assert.Equal("SELECT A SPELL", Assert.Single(info.LinesProvider()).Text);
|
|
Assert.Equal(1, list.GetNumUIItems());
|
|
UiTemplateListSlot row = Assert.IsType<UiTemplateListSlot>(list.GetItem(0));
|
|
UiText duration = Assert.IsType<UiText>(
|
|
row.Content.FindElement(EffectsUiController.RowDurationId));
|
|
Assert.Equal("1:00", Assert.Single(duration.LinesProvider()).Text);
|
|
row.OnEvent(new UiEvent(0, row, UiEventType.Click));
|
|
Assert.Equal(42u, controller.SelectedSpellId);
|
|
Assert.Equal(["Boon", "", ""], info.LinesProvider().Select(line => line.Text));
|
|
|
|
spellbook.OnEnchantmentRemoved(1u, 42u);
|
|
Assert.Null(controller.SelectedSpellId);
|
|
}
|
|
|
|
[Fact]
|
|
public void DuplicateLayersOfSameSpell_ShareRetailSelection()
|
|
{
|
|
var table = SpellTable.LoadFromReader(new StringReader(
|
|
"Spell ID,Name,Flags [Hex]\n42,Boon,0x4\n"));
|
|
var spellbook = new Spellbook(table);
|
|
var root = new UiPanel { Width = 160f, Height = 100f };
|
|
var list = new UiItemList(NoTex) { Width = 160f, Height = 64f };
|
|
root.AddChild(list);
|
|
var layout = new ImportedLayout(root, new Dictionary<uint, UiElement>
|
|
{
|
|
[EffectsUiController.ListId] = list,
|
|
});
|
|
using EffectsUiController controller = EffectsUiController.Bind(
|
|
layout, spellbook, positive: true, () => 0d, NoTex, id => id,
|
|
Templates(), "SELECT A SPELL")!;
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 1u, 60f, 1u, Bucket: 1u, SpellCategory: 100u));
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 2u, 60f, 2u, Bucket: 2u, SpellCategory: 101u));
|
|
|
|
UiTemplateListSlot first = Assert.IsType<UiTemplateListSlot>(list.GetItem(0));
|
|
UiTemplateListSlot second = Assert.IsType<UiTemplateListSlot>(list.GetItem(1));
|
|
first.OnEvent(new UiEvent(0, first, UiEventType.Click));
|
|
|
|
Assert.Equal(42u, controller.SelectedSpellId);
|
|
Assert.True(first.Selected);
|
|
Assert.True(second.Selected);
|
|
|
|
second.OnEvent(new UiEvent(0, second, UiEventType.Click));
|
|
Assert.Null(controller.SelectedSpellId);
|
|
Assert.False(first.Selected);
|
|
Assert.False(second.Selected);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true)]
|
|
[InlineData(false)]
|
|
public void SelectedEffect_WrapsDescription_AndBindsAuthoredInfoScrollbar(
|
|
bool positive)
|
|
{
|
|
string flags = positive ? "0x4" : "0x0";
|
|
var table = SpellTable.LoadFromReader(new StringReader(
|
|
"Spell ID,Name,Description,Flags [Hex]\n"
|
|
+ $"42,Boon,This description contains enough words to wrap across several lines.,{flags}\n"));
|
|
var spellbook = new Spellbook(table);
|
|
ImportedLayout layout = LayoutImporter.Build(
|
|
positive
|
|
? FixtureLoader.LoadPositiveEffectsInfos()
|
|
: FixtureLoader.LoadNegativeEffectsInfos(),
|
|
NoTex,
|
|
datFont: null);
|
|
UiText info = Assert.IsType<UiText>(
|
|
layout.FindElement(EffectsUiController.InfoTextId));
|
|
info.Width = 96f;
|
|
|
|
using EffectsUiController controller = EffectsUiController.Bind(
|
|
layout, spellbook, positive, () => 0d, NoTex, id => id,
|
|
Templates(), "SELECT A SPELL")!;
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 1u, 60f, 1u, Bucket: 1u, SpellCategory: 42u));
|
|
// OP2 rework (docs/research/2026-08-11-op2-review-blast.md MUST-FIX 2): the
|
|
// effects list host authors a row-template array (dat property 0x64), so
|
|
// against real DAT data it now builds as UiTemplateListBox — the dormant
|
|
// UiDatElement subclass — not the bare UiDatElement fallback this assertion
|
|
// used to pin. Behavior is unchanged (media/ClickThrough/state propagation
|
|
// all still come from the shared UiDatElement base); only the concrete class
|
|
// changed to one that ALSO knows how to build authored-template rows, which
|
|
// this controller never calls (it manages the child UiItemList itself).
|
|
UiElement listHost = Assert.IsType<UiTemplateListBox>(
|
|
layout.FindElement(EffectsUiController.ListId));
|
|
UiItemList list = Assert.IsType<UiItemList>(Assert.Single(listHost.Children));
|
|
UiTemplateListSlot row = Assert.IsType<UiTemplateListSlot>(list.GetItem(0));
|
|
row.OnEvent(new UiEvent(0, row, UiEventType.Click));
|
|
|
|
IReadOnlyList<UiText.Line> lines = info.LinesProvider();
|
|
Assert.Equal("Boon", lines[0].Text);
|
|
Assert.Equal(string.Empty, lines[1].Text);
|
|
Assert.True(lines.Count > 3);
|
|
Assert.All(lines, line => Assert.True(line.Text.Length <= 12));
|
|
Assert.True(info.WheelScrollEnabled);
|
|
Assert.False(info.ClickThrough);
|
|
UiScrollbar listScrollbar = Assert.IsType<UiScrollbar>(
|
|
layout.FindElement(EffectsUiController.ListScrollbarId));
|
|
UiScrollbar infoScrollbar = Assert.IsType<UiScrollbar>(
|
|
layout.FindElement(EffectsUiController.InfoScrollbarId));
|
|
Assert.Same(list.Scroll, listScrollbar.Model);
|
|
Assert.Same(info.Scroll, infoScrollbar.Model);
|
|
|
|
info.Scroll.SetExtents(contentHeight: 100, viewHeight: 20);
|
|
Assert.True(info.OnEvent(new UiEvent(
|
|
0, info, UiEventType.Scroll, Data0: -1)));
|
|
Assert.Equal(info.Scroll.LineHeight, info.Scroll.ScrollY);
|
|
}
|
|
|
|
[Fact]
|
|
public void PermanentEffect_LeavesRetailDurationColumnEmpty()
|
|
{
|
|
var table = SpellTable.LoadFromReader(new StringReader(
|
|
"Spell ID,Name,Flags [Hex]\n42,Boon,0x4\n"));
|
|
var spellbook = new Spellbook(table);
|
|
var root = new UiPanel { Width = 160f, Height = 100f };
|
|
var list = new UiItemList(NoTex) { Width = 160f, Height = 64f };
|
|
root.AddChild(list);
|
|
var layout = new ImportedLayout(root, new Dictionary<uint, UiElement>
|
|
{
|
|
[EffectsUiController.ListId] = list,
|
|
});
|
|
using EffectsUiController controller = EffectsUiController.Bind(
|
|
layout, spellbook, positive: true, () => 0d, NoTex, id => id,
|
|
Templates(), "SELECT A SPELL")!;
|
|
|
|
spellbook.OnEnchantmentAdded(new ActiveEnchantmentRecord(
|
|
42u, 1u, -1f, 1u, Bucket: 1u, SpellCategory: 42u));
|
|
|
|
UiTemplateListSlot row = Assert.IsType<UiTemplateListSlot>(list.GetItem(0));
|
|
UiText duration = Assert.IsType<UiText>(
|
|
row.Content.FindElement(EffectsUiController.RowDurationId));
|
|
Assert.Equal(string.Empty, Assert.Single(duration.LinesProvider()).Text);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true)]
|
|
[InlineData(false)]
|
|
public void AuthoredEffectsFixture_InheritsListAndInfo_AndBinds(bool positive)
|
|
{
|
|
ElementInfo info = positive
|
|
? FixtureLoader.LoadPositiveEffectsInfos()
|
|
: FixtureLoader.LoadNegativeEffectsInfos();
|
|
uint expectedRoot = positive
|
|
? EffectsUiController.PositiveRootId
|
|
: EffectsUiController.NegativeRootId;
|
|
Assert.Equal(expectedRoot, info.Id);
|
|
Assert.Equal(0x1000001Bu, info.Type);
|
|
Assert.Equal(300f, info.Width);
|
|
Assert.Equal(362f, info.Height);
|
|
Assert.True(info.TryGetEffectiveProperty(0x1000000Cu, out UiPropertyValue effectType));
|
|
Assert.Equal(UiPropertyKind.Enum, effectType.Kind);
|
|
Assert.Equal(positive ? 1u : 2u, effectType.UnsignedValue);
|
|
Assert.Equal(
|
|
positive,
|
|
info.TryGetEffectiveBool(0x10000049u, out bool restorePrevious)
|
|
&& restorePrevious);
|
|
|
|
ElementInfo[] children = info.Children.OrderBy(child => child.ReadOrder).ToArray();
|
|
Assert.Equal(
|
|
[0x100000FCu, 0x10000120u, 0x10000123u, 0x10000124u, 0x10000125u],
|
|
children.Select(child => child.Id));
|
|
Assert.Equal([1u, 2u, 3u, 4u, 5u], children.Select(child => child.ReadOrder));
|
|
Assert.Equal(children.Length, children.Select(child => child.Id).Distinct().Count());
|
|
ElementInfo listInfo = Assert.Single(children, child => child.Id == EffectsUiController.ListId);
|
|
Assert.Equal(5u, listInfo.Type);
|
|
Assert.Equal(300f, listInfo.Width);
|
|
Assert.Equal(249f, listInfo.Height);
|
|
Assert.Equal(12u, FindInfo(info, EffectsUiController.InfoTextId)?.Type);
|
|
|
|
ImportedLayout layout = LayoutImporter.Build(info, NoTex, datFont: null);
|
|
var spellbook = new Spellbook();
|
|
int closes = 0;
|
|
|
|
using EffectsUiController? controller = EffectsUiController.Bind(
|
|
layout, spellbook, positive, () => 0d, NoTex, id => id,
|
|
Templates(), "SELECT A SPELL", () => closes++);
|
|
|
|
Assert.NotNull(controller);
|
|
Assert.NotNull(layout.FindElement(EffectsUiController.ListId));
|
|
Assert.IsType<UiText>(layout.FindElement(EffectsUiController.InfoTextId));
|
|
Assert.IsType<UiScrollbar>(layout.FindElement(EffectsUiController.ListScrollbarId));
|
|
Assert.IsType<UiScrollbar>(layout.FindElement(EffectsUiController.InfoScrollbarId));
|
|
Assert.Equal(expectedRoot, layout.Root.DatElementId);
|
|
UiButton close = Assert.IsType<UiButton>(layout.FindElement(EffectsUiController.CloseId));
|
|
close.OnEvent(new UiEvent(0, close, UiEventType.Click));
|
|
Assert.Equal(1, closes);
|
|
|
|
uint panelId = positive
|
|
? RetailPanelCatalog.PositiveEffects
|
|
: RetailPanelCatalog.NegativeEffects;
|
|
Assert.True(RetailPanelCatalog.TryGetWindowName(panelId, out string windowName));
|
|
Assert.Equal(
|
|
positive ? WindowNames.PositiveEffects : WindowNames.NegativeEffects,
|
|
windowName);
|
|
Assert.DoesNotContain(
|
|
RetailPanelCatalog.ToolbarPanels,
|
|
entry => entry.PanelId == panelId);
|
|
}
|
|
|
|
[Theory]
|
|
[InlineData(true)]
|
|
[InlineData(false)]
|
|
public void AuthoredRestorePreviousProperty_DrivesRetailPanelLifecycle(bool positive)
|
|
{
|
|
ElementInfo info = positive
|
|
? FixtureLoader.LoadPositiveEffectsInfos()
|
|
: FixtureLoader.LoadNegativeEffectsInfos();
|
|
var visible = new Dictionary<string, bool>(StringComparer.Ordinal)
|
|
{
|
|
[WindowNames.Inventory] = false,
|
|
[positive ? WindowNames.PositiveEffects : WindowNames.NegativeEffects] = false,
|
|
};
|
|
var panelUi = new RetailPanelUiController(
|
|
name => visible[name],
|
|
name =>
|
|
{
|
|
visible[name] = true;
|
|
return true;
|
|
},
|
|
name =>
|
|
{
|
|
visible[name] = false;
|
|
return true;
|
|
});
|
|
uint effectsPanel = positive
|
|
? RetailPanelCatalog.PositiveEffects
|
|
: RetailPanelCatalog.NegativeEffects;
|
|
string effectsWindow = positive
|
|
? WindowNames.PositiveEffects
|
|
: WindowNames.NegativeEffects;
|
|
panelUi.Register(RetailPanelCatalog.Inventory, WindowNames.Inventory);
|
|
panelUi.Register(
|
|
effectsPanel,
|
|
effectsWindow,
|
|
info);
|
|
|
|
panelUi.SetPanelVisibility(RetailPanelCatalog.Inventory, visible: true);
|
|
panelUi.SetPanelVisibility(effectsPanel, visible: true);
|
|
panelUi.SetPanelVisibility(effectsPanel, visible: false);
|
|
|
|
Assert.Equal(positive, visible[WindowNames.Inventory]);
|
|
Assert.False(visible[effectsWindow]);
|
|
Assert.Equal(
|
|
positive ? RetailPanelCatalog.Inventory : null,
|
|
panelUi.ActivePanelId);
|
|
}
|
|
|
|
private static ElementInfo? FindInfo(ElementInfo root, uint id)
|
|
{
|
|
if (root.Id == id) return root;
|
|
foreach (ElementInfo child in root.Children)
|
|
if (FindInfo(child, id) is { } found)
|
|
return found;
|
|
return null;
|
|
}
|
|
}
|