erik/acdream
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions

fix(ui,net): Campaign LA gate round 2 — char-select exit confirmation, authored row justify, world name

Browse source 
Finding 1 (Exit button dead): retail's gmCharacterManagementUI Exit
button (element 0x100003A4, offset 7 from the listbox base in
ListenToElementMessage@0x004ed5a0) opens MakeConfirmExitDialog
(0x004ed250), whose exact ID_CharacterManagement_ConfirmExit text
(table 0x23000002) and m_confirmExitDialogContext re-entry guard are
now ported. On confirm (matching RecvNotice_CloseDialog@0x004ed760
case 1's ConfirmationResult check) the client exits through the
EXISTING graceful window-close seam (CharacterSelectionRuntimeBindings
.RequestExit -> d.Window.Close, the same delegate
GameplayInputCommandController's Escape fallback already uses) so
disconnected/exited status events still fire via GameWindow.OnClosing
-> CompleteShutdown. Retail's real post-confirm destination is
QueueUIMode(0x10000009) -> gmEpilogueUI, an epilogue screen this round
does not port — recorded as AD-99. Credits (element 0x100003A3,
QueueUIMode(0x10000005) -> gmCreditsUI) stays visibly ghosted like
Create, same treatment, out of scope this round.

Finding 2 (row names center-aligned, retail is left): the character
row template (LayoutDesc 0x21000004, element 0x100003A5, live-DAT
confirmed HJustify=Left with three stateful Type-3 highlight-art
children and no Type-12 caption child) authors its OWN justify
directly, with no separate text child to lift a label from.
DatWidgetFactory.BuildButton's Left-justify branch required
!ReferenceEquals(labelInfo, info) — true only when a label was LIFTED
from a distinct child — so a button's own direct HJustify=Left was
silently dropped to UiButton's Center default. Widened the branch to
also honor the direct case, preserving the existing lifted-child
LabelOffsetX behavior and leaving genuinely-centered buttons
(CREATE/ENTER/DELETE/RESTORE) untouched.

Finding 3 (World box empty): parsed ACE's GameMessageServerName
(opcode 0xF7E1, ACE.Server/Network/GameMessages/Messages/
GameMessageServerName.cs; retail CM_Login::DispatchUI_WorldInfo
@0x006ad860 -> ClientUISystem::Handle_Login__WorldInfo@0x005641a0 ->
ECM_Login::SendNotice_WorldName@0x00692b10, notice 0x186a2, consumed
by gmCharacterManagementUI::UpdateWorldName@0x004ec120 /
RecvNotice_WorldName@0x004ec360 onto element 0x1000039B) as
src/AcDream.Core.Net/Messages/ServerName.cs, cross-checked against
holtburger's ServerNameData. WorldSession.ServerNameReceived fires
alongside CharacterListReceived (ACE sends both in one
SendConnectResponse batch); RuntimeCharacterSelectionState.
ApplyWorldName is the new J-owner field (ungated by lifecycle, since
either message can arrive first); CharacterManagementUiController
binds it onto the WorldTextElementId UiText. Per the LA1 status
vocabulary, the characterList STATUS event's worldName field is
intentionally NOT added this round (kept bounded to the client-side
fix) — a follow-up if the launcher UI wants it.

Also corrects AD-44, discovered stale while filing AD-99: its opening
claim ("acdream has no retained character-management screen") was
false as of this session — LA7/LA8 shipped the screen in earlier
commits without updating this row.

Tests: exit-confirm open/cancel/confirm/re-entry-guard flow;
DatWidgetFactory own-HJustify-Left/Center regression tests plus the
live-DAT pinned row-justify assertion; ServerName parse round-trip
(byte-exact vs ACE's AceWireWriter fixture, truncation/wrong-opcode
cases); WorldSession dispatch test (roster+world in one wire batch);
RuntimeCharacterSelectionState.ApplyWorldName tests (order-independent
of ApplyRoster, unchanged-value no-op, Reset clears); controller test
binding the World text element to the live snapshot. Extended the
shared RetailDialogFactoryTests.BuildDialogLayout test fixture with a
Confirmation-type branch (Accept/Reject buttons) since this is its
first RetailDialogType.Confirmation consumer.

Suites: full solution Release build green; AcDream.App.Tests 5100/6
skips, AcDream.Core.Net.Tests 965/0, AcDream.Runtime.Tests 1665/0, all
Release, 0 failures; live-DAT probes (ACDREAM_PROBE_LIVE_MOUNT=1)
green.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik 2026-08-15 11:50:45 +02:00
parent 308f40a3fb
commit ef96c55489
18 changed files with 724 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

127
tests/AcDream.App.Tests/UI/Layout/CharacterManagementUiControllerTests.cs
View file

@ -99,6 +99,32 @@ public sealed class CharacterManagementUiControllerTests
Assert.True(restore.Enabled);
}
/// <summary>
/// Campaign LA gate round 2 finding 3: retail's UpdateWorldName@0x004ec120
/// / RecvNotice_WorldName@0x004ec360 both push Client::GetWorldName()
/// onto element 0x1000039B. The controller binds Runtime's borrowed
/// snapshot field to that same element.
/// </summary>
[Fact]
public void WorldName_TicksFromSnapshot_IntoTheWorldTextElement()
{
using var environment = new EnvironmentHarness();
CharacterManagementUiController controller = environment.Controller;
var worldText = Assert.IsType<UiText>(environment.Screen.FindElement(
CharacterManagementUiController.WorldTextElementId));
Assert.Equal(
"sawato",
string.Join(" ", worldText.LinesProvider().Select(static line => line.Text)));
environment.Runtime.SetWorldName("Frostfell");
controller.Tick();
Assert.Equal(
"Frostfell",
string.Join(" ", worldText.LinesProvider().Select(static line => line.Text)));
}
[Fact]
public void RowHeight_UsesAllowedSlotsAndClampsAtOneTenthForLargeRosters()
{
@ -346,6 +372,81 @@ public sealed class CharacterManagementUiControllerTests
controller.Rows.Select(static row => row.Label!).ToArray());
}
/// <summary>
/// Campaign LA gate round 2 finding 1: Exit -> MakeConfirmExitDialog
/// (0x004ed250, retail's confirm-only dialog type 1) -> Cancel/Reject
/// leaves the screen exactly as it was — no exit request reaches
/// Runtime's window-close binding.
/// </summary>
[Fact]
public void ExitButton_OpenThenCancel_KeepsScreenActive_NoExitRequested()
{
using var environment = new EnvironmentHarness();
CharacterManagementUiController controller = environment.Controller;
UiButton exit = environment.Button(
CharacterManagementUiController.ExitElementId);
exit.OnClick!();
Assert.NotEqual(0u, controller.ConfirmExitDialogContext);
ImportedLayout dialog = environment.LastDialog(RetailDialogType.Confirmation);
Assert.Equal(
"Are you sure you want to leave?",
Message(dialog));
DialogButton(dialog, RetailConfirmationDialogView.RejectButtonId).OnClick!();
Assert.Equal(0, environment.Runtime.RequestExitCalls);
Assert.Equal(0u, controller.ConfirmExitDialogContext);
Assert.False(environment.Dialogs.IsOpen);
Assert.True(controller.Root.Visible);
}
/// <summary>
/// Confirm reaches the SAME graceful-shutdown seam window-close uses —
/// asserted here via the bindings fake, since the controller/Runtime
/// boundary is a plain host <c>Action</c>
/// (<see cref="CharacterSelectionRuntimeBindings.RequestExit"/>), not a
/// generation-gated Runtime command.
/// </summary>
[Fact]
public void ExitButton_OpenThenConfirm_ReachesGracefulShutdownSeam()
{
using var environment = new EnvironmentHarness();
CharacterManagementUiController controller = environment.Controller;
UiButton exit = environment.Button(
CharacterManagementUiController.ExitElementId);
exit.OnClick!();
ImportedLayout dialog = environment.LastDialog(RetailDialogType.Confirmation);
DialogButton(dialog, RetailConfirmationDialogView.AcceptButtonId).OnClick!();
Assert.Equal(1, environment.Runtime.RequestExitCalls);
Assert.Equal(0u, controller.ConfirmExitDialogContext);
Assert.False(environment.Dialogs.IsOpen);
}
/// <summary>
/// MakeConfirmExitDialog's own guard (<c>m_confirmExitDialogContext != 0
/// -&gt; return</c>): a second Exit click while the confirmation is
/// already open does not open a second dialog.
/// </summary>
[Fact]
public void ExitButton_SecondClickWhileOpen_IsNoOp()
{
using var environment = new EnvironmentHarness();
UiButton exit = environment.Button(
CharacterManagementUiController.ExitElementId);
exit.OnClick!();
Assert.Equal(1, environment.DialogLayouts.Count(
entry => entry.Type == RetailDialogType.Confirmation));
exit.OnClick!();
Assert.Equal(1, environment.DialogLayouts.Count(
entry => entry.Type == RetailDialogType.Confirmation));
}
[Fact]
public void AuthoredRowDoubleActivation_EntersTheHighlightedCharacter()
{
@ -598,7 +699,8 @@ public sealed class CharacterManagementUiControllerTests
name => $"WARNING! {name}\nType DELETE in the box below.",
"DELETE",
"Please Wait",
"Entering World");
"Entering World",
"Are you sure you want to leave?");
private static void AssertDetachedAndUnbound(ImportedLayout screen)
{
@ -633,6 +735,15 @@ public sealed class CharacterManagementUiControllerTests
0x21000004u,
0x100003A5u));
root.Children.Add(list);
root.Children.Add(new ElementInfo
{
Id = CharacterManagementUiController.WorldTextElementId,
Type = 12u,
X = 21f,
Y = 44f,
Width = 193f,
Height = 110f,
});
root.Children.Add(ButtonInfo(
CharacterManagementUiController.CreateElementId));
root.Children.Add(ButtonInfo(
@ -641,6 +752,10 @@ public sealed class CharacterManagementUiControllerTests
CharacterManagementUiController.DeleteElementId));
root.Children.Add(ButtonInfo(
CharacterManagementUiController.RestoreElementId));
root.Children.Add(ButtonInfo(
CharacterManagementUiController.CreditsElementId));
root.Children.Add(ButtonInfo(
CharacterManagementUiController.ExitElementId));
if (includePreview)
{
root.Children.Add(new ElementInfo
@ -762,7 +877,8 @@ public sealed class CharacterManagementUiControllerTests
RequestDelete,
ConfirmDelete,
Restore,
Cancel);
Cancel,
RequestExit);
}
public FakeView View { get; } = new();
@ -773,6 +889,7 @@ public sealed class CharacterManagementUiControllerTests
public int ConfirmDeleteCalls { get; private set; }
public int CancelCalls { get; private set; }
public int RestoreCalls { get; private set; }
public int RequestExitCalls { get; private set; }
public RuntimeCommandStatus RestoreStatus { get; set; } =
RuntimeCommandStatus.Accepted;
public bool ThrowOnRestore { get; set; }
@ -814,6 +931,9 @@ public sealed class CharacterManagementUiControllerTests
public void SetLifecycle(RuntimeCharacterSelectionLifecycle lifecycle) =>
Update(snapshot => snapshot with { Lifecycle = lifecycle });
public void SetWorldName(string worldName) =>
Update(snapshot => snapshot with { WorldName = worldName });
public void SetError(string message) => Update(snapshot => snapshot with
{
Lifecycle = RuntimeCharacterSelectionLifecycle.AwaitingSelection,
@ -915,6 +1035,8 @@ public sealed class CharacterManagementUiControllerTests
return Result(RuntimeCommandStatus.Accepted);
}
private void RequestExit() => RequestExitCalls++;
private RuntimeCharacterSelectionButtons ButtonsFor(uint characterId)
{
RuntimeCharacterSelectionEntry? selected = View.Entries
@ -959,6 +1081,7 @@ public sealed class CharacterManagementUiControllerTests
"account",
SlotCount: 5,
RosterCount: View.Entries.Length,
WorldName: "sawato",
highlightedCharacterId,
HighlightedDisplayIndex: Array.FindIndex(
View.Entries,