feat(ui): D.2b item interaction + retail cursors + live character sheet
Lands the codex-worktree D.2b stream plus the extraction the 2026-07-02 UI architecture review mandated before commit: - ItemInteractionController: single owner of double-click use/equip/ container-open, targeted-use mode (health kits), drag-out drop; toolbar shortcut drags don't drop the real item. ItemEquipRules for multi-slot (coat) coverage via equip masks. - Cursor phase: CursorFeedbackController (semantic priority chain: drag > resize > window-move > target-mode > text) + RetailCursorCatalog (enums 0x27/0x28/0x29, hotspot 14,14; ClientUISystem::UpdateCursorState 0x00564630) resolved through the portal EnumIDMap chain by RetailCursorResolver; RetailCursorManager applies dat cursor art to the OS cursor. Register row AP-72 covers the OS standard-cursor fallback. - Character window goes live: CharacterSheetProvider owns sheet assembly, XP-curve/raise-cost math and the raise flow — extracted out of GameWindow per Code Structure Rule 1 instead of committing the ~430-line feature body there. Optimistic XP/credit debits go through eventful store APIs (new ClientObjectTable.UpdateInt64Property + LocalPlayerState.DebitIntProperty/DebitInt64Property) instead of raw property-dictionary writes; register row AP-73 covers the still-missing raise ledger (#163). - RetailWindowFrame: the shared nine-slice window mount recipe; the character window uses it, remaining windows migrate via #164. - Status-bar buttons toggle inventory/character windows; retail row-major backpack ordering; WorldSession.SendUseWithTarget + raise/train sends. GameWindow shrinks 14,214 -> 13,877 lines despite the new features; the sheet/raise logic is unit-tested in CharacterSheetProviderTests instead of trapped in the god object. Build green; full suite 3,286 tests pass. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
e3fc7ac5ba
commit
b7dc91a053
74 changed files with 6669 additions and 238 deletions
109
tests/AcDream.App.Tests/UI/Layout/CharacterLayoutImportProbe.cs
Normal file
109
tests/AcDream.App.Tests/UI/Layout/CharacterLayoutImportProbe.cs
Normal file
|
|
@ -0,0 +1,109 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using AcDream.App.Studio;
|
||||
using AcDream.App.UI;
|
||||
using AcDream.App.UI.Layout;
|
||||
using DatReaderWriter;
|
||||
using DatReaderWriter.Options;
|
||||
using Xunit;
|
||||
|
||||
namespace AcDream.App.Tests.UI.Layout;
|
||||
|
||||
public sealed class CharacterLayoutImportProbe
|
||||
{
|
||||
private const uint CharacterLayout = 0x2100002Eu;
|
||||
|
||||
private static string? DatDir()
|
||||
{
|
||||
var d = Environment.GetEnvironmentVariable("ACDREAM_DAT_DIR")
|
||||
?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
|
||||
"Documents", "Asheron's Call");
|
||||
return Directory.Exists(d) ? d : null;
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Selected_attribute_shows_raise_buttons_on_visible_footer_state()
|
||||
{
|
||||
var datDir = DatDir();
|
||||
if (datDir is null) return;
|
||||
|
||||
using var dats = new DatCollection(datDir, DatAccessType.Read);
|
||||
var layout = LayoutImporter.Import(dats, CharacterLayout, _ => (1u, 30, 26), null);
|
||||
Assert.NotNull(layout);
|
||||
|
||||
CharacterStatController.Bind(layout!, SampleData.SampleCharacter, spriteResolve: _ => (1u, 30, 26));
|
||||
|
||||
var rows = new List<UiClickablePanel>();
|
||||
CollectRows(layout!.Root, rows);
|
||||
Assert.True(rows.Count >= 9, $"expected at least 9 attribute rows, found {rows.Count}");
|
||||
|
||||
rows[4].OnClick!();
|
||||
|
||||
var buttons = new List<UiButton>();
|
||||
CollectButtons(layout.Root, buttons);
|
||||
|
||||
Assert.Contains(buttons, b =>
|
||||
b.ElementId == CharacterStatController.RaiseOneId
|
||||
&& b.ActiveState == "Normal"
|
||||
&& IsEffectivelyVisible(b));
|
||||
Assert.Contains(buttons, b =>
|
||||
b.ElementId == CharacterStatController.RaiseTenId
|
||||
&& b.ActiveState == "Normal"
|
||||
&& IsEffectivelyVisible(b));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Close_button_resolves_and_invokes_controller_close_callback()
|
||||
{
|
||||
var datDir = DatDir();
|
||||
if (datDir is null) return;
|
||||
|
||||
using var dats = new DatCollection(datDir, DatAccessType.Read);
|
||||
var layout = LayoutImporter.Import(dats, CharacterLayout, _ => (1u, 30, 26), null);
|
||||
Assert.NotNull(layout);
|
||||
|
||||
var close = layout!.FindElement(WindowChromeController.CharacterCloseButtonId);
|
||||
Assert.NotNull(close);
|
||||
Assert.True(close is UiButton or UiDatElement,
|
||||
$"character close button resolved to {close?.GetType().Name ?? "null"}");
|
||||
|
||||
int closes = 0;
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter, onClose: () => closes++);
|
||||
close!.OnEvent(new UiEvent(0u, close, UiEventType.Click));
|
||||
|
||||
Assert.Equal(1, closes);
|
||||
}
|
||||
|
||||
private static void CollectRows(UiElement node, List<UiClickablePanel> result)
|
||||
{
|
||||
if (node is UiClickablePanel row && row.Height is >= 20f and <= 22f && row.OnClick is not null)
|
||||
result.Add(row);
|
||||
foreach (var child in node.Children)
|
||||
CollectRows(child, result);
|
||||
}
|
||||
|
||||
private static void CollectButtons(UiElement node, List<UiButton> result)
|
||||
{
|
||||
if (node is UiButton button
|
||||
&& (button.ElementId == CharacterStatController.RaiseOneId
|
||||
|| button.ElementId == CharacterStatController.RaiseTenId))
|
||||
{
|
||||
result.Add(button);
|
||||
}
|
||||
|
||||
foreach (var child in node.Children)
|
||||
CollectButtons(child, result);
|
||||
}
|
||||
|
||||
private static bool IsEffectivelyVisible(UiElement element)
|
||||
{
|
||||
for (UiElement? e = element; e is not null; e = e.Parent)
|
||||
{
|
||||
if (!e.Visible) return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
192
tests/AcDream.App.Tests/UI/Layout/CharacterSheetProviderTests.cs
Normal file
192
tests/AcDream.App.Tests/UI/Layout/CharacterSheetProviderTests.cs
Normal file
|
|
@ -0,0 +1,192 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using AcDream.App.UI.Layout;
|
||||
using AcDream.Core.Items;
|
||||
using AcDream.Core.Player;
|
||||
using Xunit;
|
||||
|
||||
namespace AcDream.App.Tests.UI.Layout;
|
||||
|
||||
/// <summary>
|
||||
/// Tests for <see cref="CharacterSheetProvider"/> — the extracted character-sheet
|
||||
/// assembly + raise flow (formerly private methods inside GameWindow). Covers the
|
||||
/// XP-curve math against a known synthetic ExperienceTable and the single-owner
|
||||
/// spend routing (table debits fire ObjectUpdated; LocalPlayerState debits fire
|
||||
/// CharacterChanged).
|
||||
/// </summary>
|
||||
public sealed class CharacterSheetProviderTests
|
||||
{
|
||||
private const uint PlayerGuid = 0x50000001u;
|
||||
|
||||
/// <summary>Synthetic cumulative-XP curves. Levels band 1→2 spans 100..250.</summary>
|
||||
private static DatReaderWriter.DBObjs.ExperienceTable MakeXpTable() => new()
|
||||
{
|
||||
Levels = new ulong[] { 0, 100, 250, 450 },
|
||||
Attributes = new uint[] { 0, 10, 30, 60, 100 },
|
||||
Vitals = new uint[] { 0, 4, 12, 24 },
|
||||
TrainedSkills = new uint[] { 0, 5, 15, 30 },
|
||||
SpecializedSkills = new uint[] { 0, 8, 24, 48 },
|
||||
};
|
||||
|
||||
private sealed class Harness
|
||||
{
|
||||
public ClientObjectTable Table { get; } = new();
|
||||
public LocalPlayerState Player { get; } = new();
|
||||
public CharacterSheetProvider Provider { get; }
|
||||
public (uint statId, ulong cost)? SentAttribute;
|
||||
public (uint skillId, uint credits)? SentTrain;
|
||||
public bool CanSend = true;
|
||||
|
||||
public Harness()
|
||||
{
|
||||
Provider = new CharacterSheetProvider(
|
||||
Table, Player,
|
||||
playerGuid: () => PlayerGuid,
|
||||
activeToonName: () => "default",
|
||||
fallbackSheet: name => new CharacterSheet { Name = name, Level = -1 },
|
||||
canSendRaise: () => CanSend,
|
||||
sendRaiseAttribute: (statId, cost) => SentAttribute = (statId, cost),
|
||||
sendRaiseVital: (_, _) => { },
|
||||
sendRaiseSkill: (_, _) => { },
|
||||
sendTrainSkill: (skillId, credits) => SentTrain = (skillId, credits))
|
||||
{
|
||||
ExperienceTable = MakeXpTable(),
|
||||
};
|
||||
}
|
||||
|
||||
/// <summary>Put the player's ClientObject in the table with live sheet properties.</summary>
|
||||
public ClientObject AddPlayerObject(long unassignedXp = 1000L)
|
||||
{
|
||||
var player = new ClientObject { ObjectId = PlayerGuid, Name = "Testy" };
|
||||
player.Properties.Ints[0x19u] = 1; // level
|
||||
player.Properties.Int64s[1u] = 150L; // total XP — mid 100..250 band
|
||||
player.Properties.Int64s[2u] = unassignedXp;
|
||||
Table.AddOrUpdate(player);
|
||||
return player;
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildSheet_NoLiveData_UsesFallbackSheet()
|
||||
{
|
||||
var h = new Harness();
|
||||
|
||||
var sheet = h.Provider.BuildSheet();
|
||||
|
||||
Assert.Equal(-1, sheet.Level); // fallback marker
|
||||
Assert.Equal("Player", sheet.Name); // toon key "default" + no object → "Player"
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildSheet_LiveData_ComputesLevelBandAndRaiseCosts()
|
||||
{
|
||||
var h = new Harness();
|
||||
h.AddPlayerObject(unassignedXp: 777L);
|
||||
h.Player.OnAttributeUpdate(atType: 1u, ranks: 1u, start: 10u, xp: 10u); // Strength
|
||||
|
||||
var sheet = h.Provider.BuildSheet();
|
||||
|
||||
Assert.Equal("Testy", sheet.Name); // live object name beats "Player"
|
||||
Assert.Equal(1, sheet.Level);
|
||||
Assert.Equal(150L, sheet.TotalXp);
|
||||
Assert.Equal(777L, sheet.UnassignedXp);
|
||||
// Level band 100..250, at 150: 100 XP to next, 1/3 through the band.
|
||||
Assert.Equal(100L, sheet.XpToNextLevel);
|
||||
Assert.Equal(1f / 3f, sheet.XpFraction, precision: 4);
|
||||
Assert.Equal(11, sheet.Strength); // ranks + start
|
||||
// Raise x1: Attributes[2] − xpSpent = 30 − 10; x10 clamps at curve end: 100 − 10.
|
||||
Assert.Equal(20L, sheet.AttributeRaiseCosts[0]);
|
||||
Assert.Equal(90L, sheet.AttributeRaise10Costs[0]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildSheet_Skills_MapsAdvancementAndCurveCosts()
|
||||
{
|
||||
var h = new Harness();
|
||||
h.AddPlayerObject();
|
||||
h.Player.OnSkillUpdate(skillId: 6u, ranks: 1u, status: 2u, xp: 5u,
|
||||
init: 0u, resistance: 0u, lastUsed: 0, formulaBonus: 0u); // trained
|
||||
h.Player.OnSkillUpdate(skillId: 7u, ranks: 0u, status: 0u, xp: 0u,
|
||||
init: 0u, resistance: 0u, lastUsed: 0, formulaBonus: 0u); // inactive → excluded
|
||||
|
||||
var sheet = h.Provider.BuildSheet();
|
||||
|
||||
var skill = Assert.Single(sheet.Skills);
|
||||
Assert.Equal(6u, skill.Id);
|
||||
Assert.Equal("Skill 6", skill.Name); // no SkillTable → id fallback name
|
||||
Assert.Equal(CharacterSkillAdvancementClass.Trained, skill.AdvancementClass);
|
||||
// TrainedSkills curve: x1 = 15 − 5; x10 clamps at index 3: 30 − 5.
|
||||
Assert.Equal(10L, skill.RaiseCost);
|
||||
Assert.Equal(25L, skill.Raise10Cost);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HandleRaiseRequest_Attribute_SendsAndDebitsThroughTableEvents()
|
||||
{
|
||||
var h = new Harness();
|
||||
h.AddPlayerObject(unassignedXp: 1000L);
|
||||
h.Player.OnAttributeUpdate(atType: 1u, ranks: 1u, start: 10u, xp: 10u);
|
||||
int tableUpdates = 0;
|
||||
h.Table.ObjectUpdated += _ => tableUpdates++;
|
||||
|
||||
h.Provider.HandleRaiseRequest(new CharacterStatController.RaiseRequest(
|
||||
CharacterStatController.RaiseTargetKind.Attribute, StatId: 1u, Cost: 20L, Amount: 1));
|
||||
|
||||
Assert.Equal((1u, 20ul), h.SentAttribute);
|
||||
var strength = h.Player.GetAttribute(LocalPlayerState.AttributeKind.Strength);
|
||||
Assert.Equal(2u, strength!.Value.Ranks); // optimistic rank apply
|
||||
Assert.Equal(980L, h.Table.Get(PlayerGuid)!.Properties.GetInt64(2u)); // XP debited
|
||||
Assert.True(tableUpdates >= 1); // via the eventful API
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HandleRaiseRequest_Blocked_WhenCanSendIsFalse()
|
||||
{
|
||||
var h = new Harness();
|
||||
h.AddPlayerObject(unassignedXp: 1000L);
|
||||
h.Player.OnAttributeUpdate(atType: 1u, ranks: 1u, start: 10u, xp: 10u);
|
||||
h.CanSend = false;
|
||||
|
||||
h.Provider.HandleRaiseRequest(new CharacterStatController.RaiseRequest(
|
||||
CharacterStatController.RaiseTargetKind.Attribute, StatId: 1u, Cost: 20L, Amount: 1));
|
||||
|
||||
Assert.Null(h.SentAttribute);
|
||||
Assert.Equal(1u, h.Player.GetAttribute(LocalPlayerState.AttributeKind.Strength)!.Value.Ranks);
|
||||
Assert.Equal(1000L, h.Table.Get(PlayerGuid)!.Properties.GetInt64(2u));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HandleRaiseRequest_TrainSkill_DebitsFirstPresentCreditProperty()
|
||||
{
|
||||
var h = new Harness();
|
||||
var player = h.AddPlayerObject();
|
||||
player.Properties.Ints[0xC0u] = 4; // only the second id in the 0x18→0xC0→0xB5 chain
|
||||
h.Player.OnSkillUpdate(skillId: 6u, ranks: 0u, status: 1u, xp: 0u,
|
||||
init: 0u, resistance: 0u, lastUsed: 0, formulaBonus: 0u); // untrained
|
||||
|
||||
h.Provider.HandleRaiseRequest(new CharacterStatController.RaiseRequest(
|
||||
CharacterStatController.RaiseTargetKind.TrainSkill, StatId: 6u, Cost: 4L, Amount: 1));
|
||||
|
||||
Assert.Equal((6u, 4u), h.SentTrain);
|
||||
Assert.Equal(2u, h.Player.GetSkill(6u)!.Value.Status); // promoted to trained
|
||||
Assert.Equal(0, player.Properties.GetInt(0xC0u)); // credits debited
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SpendUnassignedXp_FallsBackToLocalPlayer_WhenPlayerObjectAbsent()
|
||||
{
|
||||
var h = new Harness(); // note: nothing added to the table
|
||||
var props = new PropertyBundle();
|
||||
props.Int64s[2u] = 500L;
|
||||
h.Player.OnProperties(props);
|
||||
h.Player.OnAttributeUpdate(atType: 1u, ranks: 1u, start: 10u, xp: 10u);
|
||||
int changed = 0;
|
||||
h.Player.CharacterChanged += () => changed++;
|
||||
|
||||
h.Provider.HandleRaiseRequest(new CharacterStatController.RaiseRequest(
|
||||
CharacterStatController.RaiseTargetKind.Attribute, StatId: 1u, Cost: 100L, Amount: 1));
|
||||
|
||||
Assert.Equal(400L, h.Player.Properties.GetInt64(2u)); // debited on the LPS side
|
||||
Assert.True(changed >= 1); // and CharacterChanged fired
|
||||
}
|
||||
}
|
||||
|
|
@ -50,10 +50,114 @@ public class CharacterStatControllerTests
|
|||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter);
|
||||
|
||||
Assert.Equal("Aluvian Heritage", heritage.LinesProvider()[0].Text);
|
||||
Assert.Equal("Female Aluvian Adventurer", heritage.LinesProvider()[0].Text);
|
||||
Assert.Equal("Non-Player Killer", pk.LinesProvider()[0].Text);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Bind_WindowChromeButton_InvokesCloseCallback()
|
||||
{
|
||||
var close = MakeButton(WindowChromeController.CharacterCloseButtonId);
|
||||
var layout = Fake((WindowChromeController.CharacterCloseButtonId, close));
|
||||
int closes = 0;
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter, onClose: () => closes++);
|
||||
close.OnEvent(new UiEvent(0u, close, UiEventType.Click));
|
||||
|
||||
Assert.Equal(1, closes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void CharacterIdentityText_StatHeaderLine_ComposesRetailGenderHeritageTitle()
|
||||
{
|
||||
var sheet = new CharacterSheet
|
||||
{
|
||||
Gender = "Female",
|
||||
Heritage = "Aluvian",
|
||||
Title = "the Adventurer",
|
||||
};
|
||||
|
||||
Assert.Equal("Female Aluvian Adventurer", CharacterIdentityText.StatHeaderLine(sheet));
|
||||
}
|
||||
|
||||
[Theory]
|
||||
[InlineData(1, "Male")]
|
||||
[InlineData(2, "Female")]
|
||||
[InlineData(0, null)]
|
||||
public void CharacterIdentityText_GenderDisplayName_UsesRetailEnum(int value, string? expected)
|
||||
=> Assert.Equal(expected, CharacterIdentityText.GenderDisplayName(value));
|
||||
|
||||
[Theory]
|
||||
[InlineData(1, "Aluvian")]
|
||||
[InlineData(2, "Gharu'ndim")]
|
||||
[InlineData(5, "Umbraen")]
|
||||
[InlineData(13, "Olthoi")]
|
||||
[InlineData(99, null)]
|
||||
public void CharacterIdentityText_HeritageGroupDisplayName_UsesRetailEnum(int value, string? expected)
|
||||
=> Assert.Equal(expected, CharacterIdentityText.HeritageGroupDisplayName(value));
|
||||
|
||||
[Fact]
|
||||
public void Bind_HeaderElements_UseVisibleAttributesPageWhenIdsAreDuplicated()
|
||||
{
|
||||
var root = new UiPanel { Width = 300, Height = 600 };
|
||||
var attrPage = MakeDatElement(CharacterStatController.AttributesPageId, top: 25, width: 300, height: 575);
|
||||
var hiddenPage = MakeDatElement(CharacterStatController.SkillsPageId, top: 25, width: 300, height: 575);
|
||||
|
||||
var visibleName = new UiText { ElementId = CharacterStatController.NameId };
|
||||
var hiddenName = new UiText { ElementId = CharacterStatController.NameId };
|
||||
var visibleHeritage = new UiText { ElementId = CharacterStatController.HeritageId };
|
||||
var hiddenHeritage = new UiText { ElementId = CharacterStatController.HeritageId };
|
||||
var visibleLevel = new UiText { ElementId = CharacterStatController.LevelId };
|
||||
var hiddenLevel = new UiText { ElementId = CharacterStatController.LevelId };
|
||||
var visibleTotalXp = new UiText { ElementId = CharacterStatController.TotalXpId };
|
||||
var hiddenTotalXp = new UiText { ElementId = CharacterStatController.TotalXpId };
|
||||
var visibleTotalXpLabel = new UiText { ElementId = CharacterStatController.TotalXpLabelId };
|
||||
var hiddenTotalXpLabel = new UiText { ElementId = CharacterStatController.TotalXpLabelId };
|
||||
var visibleMeter = new UiMeter { ElementId = CharacterStatController.XpMeterId };
|
||||
var hiddenMeter = new UiMeter { ElementId = CharacterStatController.XpMeterId };
|
||||
var visibleXpNext = new UiText { ElementId = CharacterStatController.XpNextValueId };
|
||||
var hiddenXpNext = new UiText { ElementId = CharacterStatController.XpNextValueId };
|
||||
visibleMeter.AddChild(visibleXpNext);
|
||||
hiddenMeter.AddChild(hiddenXpNext);
|
||||
|
||||
attrPage.AddChild(visibleName);
|
||||
attrPage.AddChild(visibleHeritage);
|
||||
attrPage.AddChild(visibleLevel);
|
||||
attrPage.AddChild(visibleTotalXpLabel);
|
||||
attrPage.AddChild(visibleTotalXp);
|
||||
attrPage.AddChild(visibleMeter);
|
||||
hiddenPage.AddChild(hiddenName);
|
||||
hiddenPage.AddChild(hiddenHeritage);
|
||||
hiddenPage.AddChild(hiddenLevel);
|
||||
hiddenPage.AddChild(hiddenTotalXpLabel);
|
||||
hiddenPage.AddChild(hiddenTotalXp);
|
||||
hiddenPage.AddChild(hiddenMeter);
|
||||
root.AddChild(attrPage);
|
||||
root.AddChild(hiddenPage);
|
||||
|
||||
var layout = new ImportedLayout(root, new Dictionary<uint, UiElement>
|
||||
{
|
||||
[CharacterStatController.NameId] = hiddenName,
|
||||
[CharacterStatController.HeritageId] = hiddenHeritage,
|
||||
[CharacterStatController.LevelId] = hiddenLevel,
|
||||
[CharacterStatController.TotalXpLabelId] = hiddenTotalXpLabel,
|
||||
[CharacterStatController.TotalXpId] = hiddenTotalXp,
|
||||
[CharacterStatController.XpMeterId] = hiddenMeter,
|
||||
[CharacterStatController.XpNextValueId] = hiddenXpNext,
|
||||
});
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter);
|
||||
|
||||
Assert.Equal("Studio Player", visibleName.LinesProvider()[0].Text);
|
||||
Assert.Equal("Female Aluvian Adventurer", visibleHeritage.LinesProvider()[0].Text);
|
||||
Assert.Equal("126", visibleLevel.LinesProvider()[0].Text);
|
||||
Assert.Equal("Total Experience (XP):", visibleTotalXpLabel.LinesProvider()[0].Text);
|
||||
Assert.Equal((1_250_000_000L).ToString("N0"), visibleTotalXp.LinesProvider()[0].Text);
|
||||
Assert.Equal((42_000_000L).ToString("N0"), visibleXpNext.LinesProvider()[0].Text);
|
||||
Assert.Empty(hiddenName.LinesProvider());
|
||||
Assert.Empty(hiddenXpNext.LinesProvider());
|
||||
}
|
||||
|
||||
// ── XP meter fill ────────────────────────────────────────────────────────
|
||||
|
||||
[Fact]
|
||||
|
|
@ -514,6 +618,31 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal("Normal", btn10.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_OnlyOneAffordable_SplitsOneAndTenStates()
|
||||
{
|
||||
var btn1 = MakeButton();
|
||||
var btn10 = MakeButton();
|
||||
var list = new UiPanel();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.RaiseOneId, btn1),
|
||||
(CharacterStatController.RaiseTenId, btn10),
|
||||
(CharacterStatController.ListBoxId, list));
|
||||
var sheet = new CharacterSheet
|
||||
{
|
||||
UnassignedXp = 500L,
|
||||
AttributeRaiseCosts = new long[] { 0L, 0L, 0L, 0L, 110L, 0L, 0L, 0L, 0L },
|
||||
AttributeRaise10Costs = new long[] { 0L, 0L, 0L, 0L, 1_100L, 0L, 0L, 0L, 0L },
|
||||
};
|
||||
|
||||
CharacterStatController.Bind(layout, () => sheet);
|
||||
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[4].OnClick!();
|
||||
|
||||
Assert.Equal("Normal", btn1.ActiveState);
|
||||
Assert.Equal("Ghosted", btn10.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_MaxedRow_ShowsGhostedState()
|
||||
{
|
||||
|
|
@ -535,6 +664,95 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal("Ghosted", btn10.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_ClickAffordableAttribute_EmitsRaiseRequest()
|
||||
{
|
||||
var btn1 = MakeButton();
|
||||
var list = new UiPanel();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.RaiseOneId, btn1),
|
||||
(CharacterStatController.ListBoxId, list));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter, onRaiseRequest: requests.Add);
|
||||
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[4].OnClick!();
|
||||
btn1.OnClick!();
|
||||
|
||||
var request = Assert.Single(requests);
|
||||
Assert.Equal(CharacterStatController.RaiseTargetKind.Attribute, request.Kind);
|
||||
Assert.Equal(5u, request.StatId);
|
||||
Assert.Equal(110L, request.Cost);
|
||||
Assert.Equal(1, request.Amount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_ClickAffordableAttribute_KeepsNormalStateUntilCostsRefresh()
|
||||
{
|
||||
var btn1 = MakeButton();
|
||||
var list = new UiPanel();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.RaiseOneId, btn1),
|
||||
(CharacterStatController.ListBoxId, list));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter, onRaiseRequest: requests.Add);
|
||||
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[4].OnClick!();
|
||||
Assert.Equal("Normal", btn1.ActiveState);
|
||||
|
||||
btn1.OnClick!();
|
||||
|
||||
Assert.Single(requests);
|
||||
Assert.Equal("Normal", btn1.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_ClickAffordableVital_EmitsMaxVitalId()
|
||||
{
|
||||
var btn1 = MakeButton();
|
||||
var list = new UiPanel();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.RaiseOneId, btn1),
|
||||
(CharacterStatController.ListBoxId, list));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter, onRaiseRequest: requests.Add);
|
||||
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[6].OnClick!();
|
||||
btn1.OnClick!();
|
||||
|
||||
var request = Assert.Single(requests);
|
||||
Assert.Equal(CharacterStatController.RaiseTargetKind.Vital, request.Kind);
|
||||
Assert.Equal(1u, request.StatId);
|
||||
Assert.Equal(90L, request.Cost);
|
||||
Assert.Equal(1, request.Amount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_ClickUnaffordableTen_DoesNotEmitRequest()
|
||||
{
|
||||
var btn10 = MakeButton();
|
||||
var list = new UiPanel();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.RaiseTenId, btn10),
|
||||
(CharacterStatController.ListBoxId, list));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
var sheet = new CharacterSheet
|
||||
{
|
||||
UnassignedXp = 500L,
|
||||
AttributeRaiseCosts = new long[] { 0L, 0L, 0L, 0L, 110L, 0L, 0L, 0L, 0L },
|
||||
AttributeRaise10Costs = new long[] { 0L, 0L, 0L, 0L, 1_100L, 0L, 0L, 0L, 0L },
|
||||
};
|
||||
|
||||
CharacterStatController.Bind(layout, () => sheet, onRaiseRequest: requests.Add);
|
||||
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[4].OnClick!();
|
||||
btn10.OnClick!();
|
||||
|
||||
Assert.Empty(requests);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void RaiseButtons_Deselect_HidesButtons()
|
||||
{
|
||||
|
|
@ -635,10 +853,7 @@ public class CharacterStatControllerTests
|
|||
|
||||
ClickTab(layout, left: 92f);
|
||||
|
||||
var headerPanels = list.Children
|
||||
.Where(c => c is UiPanel and not UiClickablePanel)
|
||||
.Cast<UiPanel>()
|
||||
.ToList();
|
||||
var headerPanels = SkillHeaders(list);
|
||||
var headers = headerPanels
|
||||
.Select(c => c.Children.OfType<UiText>().First().LinesProvider()[0].Text)
|
||||
.ToList();
|
||||
|
|
@ -654,7 +869,7 @@ public class CharacterStatControllerTests
|
|||
Assert.All(headerPanels, h =>
|
||||
Assert.Equal(Vector4.One, h.Children.OfType<UiText>().First().LinesProvider()[0].Color));
|
||||
|
||||
var rows = list.Children.OfType<UiClickablePanel>().ToList();
|
||||
var rows = SkillRows(list);
|
||||
Assert.Equal(12, rows.Count);
|
||||
Assert.All(rows, row =>
|
||||
{
|
||||
|
|
@ -692,7 +907,7 @@ public class CharacterStatControllerTests
|
|||
spriteResolve: id => (id, 16, 16));
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
Assert.Equal(12, list.Children.OfType<UiClickablePanel>().Count());
|
||||
Assert.Equal(12, SkillRows(list).Count);
|
||||
|
||||
ClickTab(layout, left: 0f);
|
||||
var rows = list.Children.OfType<UiClickablePanel>().ToList();
|
||||
|
|
@ -704,8 +919,8 @@ public class CharacterStatControllerTests
|
|||
public void SkillsTab_MouseClick_RebuildsVisibleListWhenListIdIsDuplicated()
|
||||
{
|
||||
var root = new UiPanel { Width = 300, Height = 600 };
|
||||
var attrPage = new UiPanel { Top = 25, Width = 300, Height = 575 };
|
||||
var hiddenPage = new UiPanel { Top = 25, Width = 300, Height = 575 };
|
||||
var attrPage = MakeDatElement(CharacterStatController.AttributesPageId, top: 25, width: 300, height: 575);
|
||||
var hiddenPage = MakeDatElement(CharacterStatController.SkillsPageId, top: 25, width: 300, height: 575);
|
||||
var name = new UiText();
|
||||
var visibleList = MakeDatElement(CharacterStatController.ListBoxId, top: 112, width: 300, height: 398);
|
||||
var hiddenDuplicateList = MakeDatElement(CharacterStatController.ListBoxId, top: 112, width: 300, height: 398);
|
||||
|
|
@ -761,7 +976,7 @@ public class CharacterStatControllerTests
|
|||
spriteResolve: id => (id, 16, 16));
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
var rows = list.Children.OfType<UiClickablePanel>().ToList();
|
||||
var rows = SkillRows(list);
|
||||
rows[1].OnClick!();
|
||||
|
||||
Assert.Equal("War Magic: 285", title.LinesProvider()[0].Text);
|
||||
|
|
@ -777,6 +992,31 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal(Vector4.Zero, rows[0].BackgroundColor);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SkillsTab_ClickRaiseTen_EmitsSkillRaiseRequest()
|
||||
{
|
||||
var list = new UiPanel { Width = 300 };
|
||||
var btn10 = MakeButton();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.ListBoxId, list),
|
||||
(CharacterStatController.RaiseTenId, btn10));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter,
|
||||
spriteResolve: id => (id, 16, 16),
|
||||
onRaiseRequest: requests.Add);
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
SkillRows(list)[1].OnClick!();
|
||||
btn10.OnClick!();
|
||||
|
||||
var request = Assert.Single(requests);
|
||||
Assert.Equal(CharacterStatController.RaiseTargetKind.Skill, request.Kind);
|
||||
Assert.Equal(34u, request.StatId);
|
||||
Assert.Equal(111_000_000L, request.Cost);
|
||||
Assert.Equal(10, request.Amount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SkillsTab_SelectHealing_ShowsUntrainedSkillFooter()
|
||||
{
|
||||
|
|
@ -800,7 +1040,7 @@ public class CharacterStatControllerTests
|
|||
spriteResolve: id => (id, 16, 16));
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
list.Children.OfType<UiClickablePanel>().ToList()[5].OnClick!();
|
||||
SkillRows(list)[5].OnClick!();
|
||||
|
||||
Assert.Equal("Healing", title.LinesProvider()[0].Text);
|
||||
Assert.Equal("Skill Credits To Raise:", l1Label.LinesProvider()[0].Text);
|
||||
|
|
@ -811,6 +1051,133 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal("Normal", btn1.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SkillsTab_ClickUntrainedSkill_EmitsTrainSkillRequest()
|
||||
{
|
||||
var list = new UiPanel { Width = 300 };
|
||||
var btn1 = MakeButton();
|
||||
var layout = Fake(
|
||||
(CharacterStatController.ListBoxId, list),
|
||||
(CharacterStatController.RaiseOneId, btn1));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter,
|
||||
spriteResolve: id => (id, 16, 16),
|
||||
onRaiseRequest: requests.Add);
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
SkillRows(list)[5].OnClick!();
|
||||
btn1.OnClick!();
|
||||
|
||||
var request = Assert.Single(requests);
|
||||
Assert.Equal(CharacterStatController.RaiseTargetKind.TrainSkill, request.Kind);
|
||||
Assert.Equal(21u, request.StatId);
|
||||
Assert.Equal(6L, request.Cost);
|
||||
Assert.Equal(1, request.Amount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SkillsTab_ClickTrain_RebuildsSelectedSkillAsTrained()
|
||||
{
|
||||
var list = new UiPanel { Width = 300 };
|
||||
var btn1 = MakeButton();
|
||||
var btn10 = MakeButton();
|
||||
CharacterSheet sheet = new()
|
||||
{
|
||||
SkillCredits = 10,
|
||||
UnassignedXp = 1_000,
|
||||
Skills = new[]
|
||||
{
|
||||
new CharacterSkill(100u, "Train Me", 0x06000001u,
|
||||
CharacterSkillAdvancementClass.Untrained,
|
||||
BaseLevel: 5,
|
||||
CurrentLevel: 5,
|
||||
UsableUntrained: true,
|
||||
TrainedCost: 4,
|
||||
SpecializedCost: 0,
|
||||
RaiseCost: 0,
|
||||
Raise10Cost: 0),
|
||||
},
|
||||
};
|
||||
var layout = Fake(
|
||||
(CharacterStatController.ListBoxId, list),
|
||||
(CharacterStatController.RaiseOneId, btn1),
|
||||
(CharacterStatController.RaiseTenId, btn10));
|
||||
var requests = new List<CharacterStatController.RaiseRequest>();
|
||||
|
||||
CharacterStatController.Bind(layout, () => sheet,
|
||||
spriteResolve: id => (id, 16, 16),
|
||||
onRaiseRequest: request =>
|
||||
{
|
||||
requests.Add(request);
|
||||
sheet = new CharacterSheet
|
||||
{
|
||||
SkillCredits = 6,
|
||||
UnassignedXp = 1_000,
|
||||
Skills = new[]
|
||||
{
|
||||
new CharacterSkill(100u, "Train Me", 0x06000001u,
|
||||
CharacterSkillAdvancementClass.Trained,
|
||||
BaseLevel: 5,
|
||||
CurrentLevel: 5,
|
||||
UsableUntrained: true,
|
||||
TrainedCost: 4,
|
||||
SpecializedCost: 0,
|
||||
RaiseCost: 10,
|
||||
Raise10Cost: 100),
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
SkillRows(list).Single().OnClick!();
|
||||
Assert.False(btn10.Visible);
|
||||
|
||||
btn1.OnClick!();
|
||||
|
||||
var request = Assert.Single(requests);
|
||||
Assert.Equal(CharacterStatController.RaiseTargetKind.TrainSkill, request.Kind);
|
||||
Assert.Equal("Train Me", SkillRows(list).Single().Children.OfType<UiText>().ToList()[1].LinesProvider()[0].Text);
|
||||
Assert.True(btn1.Visible);
|
||||
Assert.True(btn10.Visible);
|
||||
Assert.Equal("Normal", btn1.ActiveState);
|
||||
Assert.Equal("Normal", btn10.ActiveState);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SkillsTab_BindsCharacterScrollbarToScrollableViewport()
|
||||
{
|
||||
var root = new UiPanel { Width = 300, Height = 600 };
|
||||
var page = new UiPanel { Width = 300, Height = 600 };
|
||||
var name = new UiText();
|
||||
var list = MakeDatElement(CharacterStatController.ListBoxId, top: 137, width: 300, height: 80);
|
||||
var scrollbarShell = MakeDatElement(CharacterStatController.ListScrollbarId, top: 137, width: 16, height: 80);
|
||||
scrollbarShell.Left = 281;
|
||||
|
||||
page.AddChild(name);
|
||||
page.AddChild(list);
|
||||
page.AddChild(scrollbarShell);
|
||||
root.AddChild(page);
|
||||
|
||||
var layout = new ImportedLayout(root, new Dictionary<uint, UiElement>
|
||||
{
|
||||
[CharacterStatController.NameId] = name,
|
||||
[CharacterStatController.ListBoxId] = list,
|
||||
[CharacterStatController.ListScrollbarId] = scrollbarShell,
|
||||
});
|
||||
|
||||
CharacterStatController.Bind(layout, SampleData.SampleCharacter,
|
||||
spriteResolve: id => (id, 16, 16));
|
||||
|
||||
ClickTab(layout, left: 92f);
|
||||
|
||||
var bar = page.Children.OfType<UiScrollbar>().Single();
|
||||
Assert.True(bar.Visible);
|
||||
Assert.NotNull(bar.Model);
|
||||
Assert.Contains(list.Children, c => c is UiScrollablePanel);
|
||||
Assert.False(scrollbarShell.Visible);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetRaiseCost_Index4Focus_Returns110()
|
||||
{
|
||||
|
|
@ -818,6 +1185,13 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal(110L, CharacterStatController.GetRaiseCost(sheet, 4));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetRaiseCost_Amount10Index4Focus_Returns1100()
|
||||
{
|
||||
var sheet = SampleData.SampleCharacter();
|
||||
Assert.Equal(1_100L, CharacterStatController.GetRaiseCost(sheet, 4, amount: 10));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void GetRaiseCost_Index0Strength_Returns0()
|
||||
{
|
||||
|
|
@ -868,10 +1242,22 @@ public class CharacterStatControllerTests
|
|||
Assert.Equal(9, costs.Length);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SampleCharacter_AttributeRaise10Costs_HasNineEntries()
|
||||
{
|
||||
var costs = SampleData.SampleCharacter().AttributeRaise10Costs;
|
||||
Assert.NotNull(costs);
|
||||
Assert.Equal(9, costs.Length);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SampleCharacter_AttributeRaiseCosts_FocusAt110()
|
||||
=> Assert.Equal(110L, SampleData.SampleCharacter().AttributeRaiseCosts[4]);
|
||||
|
||||
[Fact]
|
||||
public void SampleCharacter_AttributeRaise10Costs_FocusAt1100()
|
||||
=> Assert.Equal(1_100L, SampleData.SampleCharacter().AttributeRaise10Costs[4]);
|
||||
|
||||
[Fact]
|
||||
public void SampleCharacter_AttributeRaiseCosts_StrengthAt0()
|
||||
=> Assert.Equal(0L, SampleData.SampleCharacter().AttributeRaiseCosts[0]);
|
||||
|
|
@ -1098,12 +1484,32 @@ public class CharacterStatControllerTests
|
|||
|
||||
private static string FirstRowName(UiElement list)
|
||||
{
|
||||
var row = list.Children.OfType<UiClickablePanel>().FirstOrDefault();
|
||||
var row = Descendants(list).OfType<UiClickablePanel>().FirstOrDefault();
|
||||
if (row is null) return "<no row>";
|
||||
var texts = row.Children.OfType<UiText>().ToList();
|
||||
return texts.Count > 1 ? texts[1].LinesProvider()[0].Text : "<no text>";
|
||||
}
|
||||
|
||||
private static List<UiClickablePanel> SkillRows(UiElement list)
|
||||
=> Descendants(list).OfType<UiClickablePanel>().ToList();
|
||||
|
||||
private static List<UiPanel> SkillHeaders(UiElement list)
|
||||
=> Descendants(list)
|
||||
.Where(c => c is UiPanel and not UiClickablePanel
|
||||
&& c.Children.OfType<UiText>().Any())
|
||||
.Cast<UiPanel>()
|
||||
.ToList();
|
||||
|
||||
private static IEnumerable<UiElement> Descendants(UiElement root)
|
||||
{
|
||||
foreach (var child in root.Children)
|
||||
{
|
||||
yield return child;
|
||||
foreach (var nested in Descendants(child))
|
||||
yield return nested;
|
||||
}
|
||||
}
|
||||
|
||||
private static UiDatElement MakeDatElement(uint id, float top, float width, float height)
|
||||
{
|
||||
var info = new ElementInfo
|
||||
|
|
@ -1123,9 +1529,9 @@ public class CharacterStatControllerTests
|
|||
}
|
||||
|
||||
/// <summary>Manufacture a minimal UiButton with a fake ElementInfo (no dat sprites).</summary>
|
||||
private static UiButton MakeButton()
|
||||
private static UiButton MakeButton(uint id = 0u)
|
||||
{
|
||||
var info = new ElementInfo { Id = 0, Type = 1 };
|
||||
var info = new ElementInfo { Id = id, Type = 1 };
|
||||
return new UiButton(info, static _ => (0u, 0, 0));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -136,6 +136,19 @@ public class ChatWindowControllerTests
|
|||
|
||||
// ── Test 3: Input is placed as a child of the input bar ─────────────────
|
||||
|
||||
[Fact]
|
||||
public void Bind_Transcript_ForcesScrollableTextMode()
|
||||
{
|
||||
var (rootInfo, layout, vm) = BuildTestTree();
|
||||
var bus = new CaptureBus();
|
||||
|
||||
var ctrl = ChatWindowController.Bind(rootInfo, layout, vm, () => bus, null, null, NoTex);
|
||||
|
||||
Assert.NotNull(ctrl);
|
||||
Assert.False(ctrl!.Transcript.Centered);
|
||||
Assert.False(ctrl.Transcript.RightAligned);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Bind_Input_IsChildOfInputBar()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -63,6 +63,18 @@ public class DatWidgetFactoryTests
|
|||
Assert.Equal(AnchorEdges.Left | AnchorEdges.Top | AnchorEdges.Right, e.Anchors);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Create_PropagatesStateCursors()
|
||||
{
|
||||
var info = new ElementInfo { Type = 3 };
|
||||
info.StateCursors["Drag_rollover_accept"] = new UiCursorMedia(0x06008888u, 7, 8);
|
||||
|
||||
var e = DatWidgetFactory.Create(info, NoTex, null)!;
|
||||
|
||||
Assert.Equal(new UiCursorMedia(0x06008888u, 7, 8),
|
||||
e.CursorForState("Drag_rollover_accept", allowFallback: false));
|
||||
}
|
||||
|
||||
// ── Test 5: ReadOrder propagated to ZOrder ───────────────────────────────
|
||||
|
||||
[Fact]
|
||||
|
|
|
|||
|
|
@ -148,6 +148,22 @@ public class ElementReaderTests
|
|||
Assert.Equal((0x06001001u, 1), merged.StateMedia["HideDetail"]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Merge_DerivedStateCursorOverridesBase()
|
||||
{
|
||||
var base_ = new ElementInfo();
|
||||
base_.StateCursors[""] = new UiCursorMedia(0x06003000u, 1, 2);
|
||||
base_.StateCursors["Drag_rollover_accept"] = new UiCursorMedia(0x06003001u, 3, 4);
|
||||
|
||||
var derived = new ElementInfo();
|
||||
derived.StateCursors[""] = new UiCursorMedia(0x06004000u, 5, 6);
|
||||
|
||||
var merged = ElementReader.Merge(base_, derived);
|
||||
|
||||
Assert.Equal(new UiCursorMedia(0x06004000u, 5, 6), merged.StateCursors[""]);
|
||||
Assert.Equal(new UiCursorMedia(0x06003001u, 3, 4), merged.StateCursors["Drag_rollover_accept"]);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Merge_ChildrenComeFromDerived()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ public class InventoryControllerTests
|
|||
private const uint BurdenText = 0x100001D8u;
|
||||
private const uint BurdenCaption = 0x100001D7u;
|
||||
private const uint ContentsCaption = 0x100001C5u;
|
||||
private const uint TitleText = 0x100001D3u;
|
||||
private const uint ContentsScrollbar = 0x100001C7u;
|
||||
|
||||
private static (ImportedLayout layout, UiItemList grid, UiItemList containers,
|
||||
|
|
@ -35,16 +36,17 @@ public class InventoryControllerTests
|
|||
var burdenText = new TestElement { Width = 36, Height = 15 };
|
||||
var burdenCap = new TestElement { Width = 36, Height = 15 };
|
||||
var contentsCap = new TestElement { Width = 192, Height = 15 };
|
||||
var titleText = new TestElement { Width = 276, Height = 25 };
|
||||
var scrollbar = new UiScrollbar { Width = 16, Height = 96 };
|
||||
var root = new TestElement { Width = 300, Height = 362 };
|
||||
root.AddChild(grid); root.AddChild(containers); root.AddChild(top);
|
||||
root.AddChild(meter); root.AddChild(burdenText); root.AddChild(burdenCap);
|
||||
root.AddChild(contentsCap); root.AddChild(scrollbar);
|
||||
root.AddChild(contentsCap); root.AddChild(titleText); root.AddChild(scrollbar);
|
||||
var byId = new Dictionary<uint, UiElement>
|
||||
{
|
||||
[ContentsGrid] = grid, [ContainerList] = containers, [TopContainer] = top,
|
||||
[BurdenMeter] = meter, [BurdenText] = burdenText, [BurdenCaption] = burdenCap,
|
||||
[ContentsCaption] = contentsCap, [ContentsScrollbar] = scrollbar,
|
||||
[ContentsCaption] = contentsCap, [TitleText] = titleText, [ContentsScrollbar] = scrollbar,
|
||||
};
|
||||
return (new ImportedLayout(root, byId), grid, containers, top, meter,
|
||||
burdenText, burdenCap, contentsCap);
|
||||
|
|
@ -52,13 +54,23 @@ public class InventoryControllerTests
|
|||
|
||||
private static InventoryController Bind(ImportedLayout layout, ClientObjectTable objects,
|
||||
int? strength = 100, List<uint>? uses = null, List<uint>? closes = null,
|
||||
List<(uint item, uint container, int placement)>? puts = null)
|
||||
List<(uint item, uint container, int placement)>? puts = null,
|
||||
string? ownerName = null,
|
||||
Action? onClose = null)
|
||||
=> InventoryController.Bind(layout, objects, () => Player,
|
||||
iconIds: (_, _, _, _, _) => 0u,
|
||||
strength: () => strength, datFont: null,
|
||||
ownerName: ownerName is null ? null : () => ownerName,
|
||||
sendUse: uses is null ? null : g => uses.Add(g),
|
||||
sendNoLongerViewing: closes is null ? null : g => closes.Add(g),
|
||||
sendPutItemInContainer: puts is null ? null : (i, c, p) => puts.Add((i, c, p)));
|
||||
sendPutItemInContainer: puts is null ? null : (i, c, p) => puts.Add((i, c, p)),
|
||||
onClose: onClose);
|
||||
|
||||
private static UiButton MakeButton(uint id)
|
||||
{
|
||||
var info = new ElementInfo { Id = id, Type = 1 };
|
||||
return new UiButton(info, static _ => (0u, 0, 0)) { Width = 16, Height = 16 };
|
||||
}
|
||||
|
||||
// Seed a side bag (a container) in the player's pack, plus optionally its own contents.
|
||||
private static void SeedBag(ClientObjectTable t, uint bag, int slot, int itemsCapacity = 24)
|
||||
|
|
@ -100,6 +112,23 @@ public class InventoryControllerTests
|
|||
Assert.Equal(0u, containers.GetItem(1)!.ItemId); // padded empty frame
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Populate_uses_manifest_container_hint_before_create_object_details()
|
||||
{
|
||||
var (layout, grid, containers, _, _, _, _, _) = BuildLayout();
|
||||
var objects = new ClientObjectTable();
|
||||
objects.ReplaceContents(Player, new[]
|
||||
{
|
||||
new ContainerContentEntry(0xC, 1u),
|
||||
new ContainerContentEntry(0xA, 0u),
|
||||
});
|
||||
|
||||
Bind(layout, objects);
|
||||
|
||||
Assert.Equal(0xCu, containers.GetItem(0)!.ItemId);
|
||||
Assert.Equal(0xAu, grid.GetItem(0)!.ItemId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Equipped_items_are_excluded_from_the_grid_and_selector()
|
||||
{
|
||||
|
|
@ -125,6 +154,7 @@ public class InventoryControllerTests
|
|||
var (layout, grid, _, _, _, _, _, _) = BuildLayout();
|
||||
Bind(layout, new ClientObjectTable());
|
||||
Assert.Equal(6, grid.Columns);
|
||||
Assert.Equal(UiItemListFlow.RowMajor, grid.Flow);
|
||||
Assert.Equal(32f, grid.CellWidth);
|
||||
Assert.Equal(32f, grid.CellHeight);
|
||||
}
|
||||
|
|
@ -164,11 +194,27 @@ public class InventoryControllerTests
|
|||
public void Captions_render_known_strings()
|
||||
{
|
||||
var (layout, _, _, _, _, _, burdenCap, contentsCap) = BuildLayout();
|
||||
Bind(layout, new ClientObjectTable());
|
||||
var title = layout.FindElement(TitleText)!;
|
||||
Bind(layout, new ClientObjectTable(), ownerName: "Horan");
|
||||
Assert.Contains("Inventory of Horan", CaptionText(title));
|
||||
Assert.Contains("Burden", CaptionText(burdenCap));
|
||||
Assert.Contains("Contents of Backpack", CaptionText(contentsCap));
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Window_chrome_button_invokes_close_callback()
|
||||
{
|
||||
var (layout, _, _, _, _, _, _, _) = BuildLayout();
|
||||
var close = MakeButton(WindowChromeController.InventoryCloseButtonId);
|
||||
layout.Root.AddChild(close);
|
||||
int closes = 0;
|
||||
|
||||
Bind(layout, new ClientObjectTable(), onClose: () => closes++);
|
||||
close.OnEvent(new UiEvent(0u, close, UiEventType.Click));
|
||||
|
||||
Assert.Equal(1, closes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Burden_reads_wire_EncumbranceVal_over_carried_sum()
|
||||
{
|
||||
|
|
@ -354,6 +400,42 @@ public class InventoryControllerTests
|
|||
Assert.Empty(closes);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TargetMode_suppressesSelectedSquare_onPendingSource()
|
||||
{
|
||||
var (layout, grid, _, _, _, _, _, _) = BuildLayout();
|
||||
var objects = new ClientObjectTable();
|
||||
objects.AddOrUpdate(new ClientObject
|
||||
{
|
||||
ObjectId = Player,
|
||||
Type = ItemType.Creature,
|
||||
ItemsCapacity = 102,
|
||||
});
|
||||
SeedContained(objects, 0xA, Player, slot: 0);
|
||||
objects.Get(0xA)!.Useability = 0x000A0008u;
|
||||
var interaction = new ItemInteractionController(
|
||||
objects,
|
||||
playerGuid: () => Player,
|
||||
sendUse: null,
|
||||
sendUseWithTarget: null,
|
||||
sendWield: null,
|
||||
sendDrop: null,
|
||||
nowMs: () => 1_000);
|
||||
|
||||
InventoryController.Bind(layout, objects, () => Player,
|
||||
iconIds: (_, _, _, _, _) => 0u,
|
||||
strength: () => 100,
|
||||
datFont: null,
|
||||
itemInteraction: interaction);
|
||||
grid.GetItem(0)!.Clicked!();
|
||||
Assert.True(grid.GetItem(0)!.Selected);
|
||||
|
||||
Assert.True(interaction.ActivateItem(0xAu));
|
||||
|
||||
Assert.True(interaction.IsTargetModeActive);
|
||||
Assert.False(grid.GetItem(0)!.Selected);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Default_mainPackCell_isOpenContainer()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using System.IO;
|
||||
using AcDream.App.UI;
|
||||
using AcDream.App.UI.Layout;
|
||||
using AcDream.Core.Items;
|
||||
using DatReaderWriter;
|
||||
using DatReaderWriter.Options;
|
||||
using Xunit;
|
||||
|
|
@ -86,4 +87,34 @@ public class InventoryFrameImportProbe
|
|||
"(else the Alphablend backdrop overpaints/washes out the panel content)");
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Close_button_resolves_and_invokes_controller_close_callback()
|
||||
{
|
||||
var datDir = DatDir();
|
||||
if (datDir is null) return; // CI: no live dat - skip
|
||||
|
||||
using var dats = new DatCollection(datDir, DatAccessType.Read);
|
||||
var layout = LayoutImporter.Import(dats, Frame, _ => (0u, 0, 0), null);
|
||||
Assert.NotNull(layout);
|
||||
|
||||
var close = layout!.FindElement(WindowChromeController.InventoryCloseButtonId);
|
||||
Assert.NotNull(close);
|
||||
Assert.True(close is UiButton or UiDatElement,
|
||||
$"inventory close button resolved to {close?.GetType().Name ?? "null"}");
|
||||
|
||||
int closes = 0;
|
||||
InventoryController.Bind(
|
||||
layout,
|
||||
new ClientObjectTable(),
|
||||
playerGuid: static () => 0u,
|
||||
iconIds: static (_, _, _, _, _) => 0u,
|
||||
strength: static () => 100,
|
||||
datFont: null,
|
||||
onClose: () => closes++);
|
||||
|
||||
close!.OnEvent(new UiEvent(0u, close, UiEventType.Click));
|
||||
|
||||
Assert.Equal(1, closes);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,6 +40,22 @@ public class LayoutImporterTests
|
|||
/// draws nothing until a controller binds its <c>LinesProvider</c>);
|
||||
/// the Type-3 must also be present.
|
||||
/// </summary>
|
||||
[Fact]
|
||||
public void BuildFromInfos_StampsDatElementId_OnRootAndItemList()
|
||||
{
|
||||
const uint RootId = 0x100005F9u;
|
||||
const uint ListId = 0x100001C6u;
|
||||
|
||||
var root = new ElementInfo { Id = RootId, Type = 3, Width = 160, Height = 58 };
|
||||
var itemList = new ElementInfo { Id = ListId, Type = 0x10000031u, X = 5, Y = 5, Width = 72, Height = 72 };
|
||||
|
||||
var tree = LayoutImporter.BuildFromInfos(root, new[] { itemList }, NoTex, null);
|
||||
|
||||
Assert.Equal(RootId, tree.Root.DatElementId);
|
||||
var found = Assert.IsType<UiItemList>(tree.FindElement(ListId));
|
||||
Assert.Equal(ListId, found.DatElementId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void BuildFromInfos_Type12Child_IsSkipped_Type3Present()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -11,6 +11,8 @@ public class PaperdollControllerTests
|
|||
private const uint Player = 0x50000001u;
|
||||
private const uint Pack = 0x40000005u;
|
||||
private const uint HeadSlot = 0x100005ABu; // HeadWear 0x1
|
||||
private const uint ChestSlot = 0x100001E2u; // ChestWear 0x2
|
||||
private const uint ChestArmorSlot = 0x100005ACu; // ChestArmor 0x200
|
||||
private const uint ShieldSlot = 0x100001E1u; // Shield 0x200000
|
||||
private const uint WeaponSlot = 0x100001DFu; // composite 0x3500000
|
||||
private const uint FingerLSlot= 0x100001DCu; // FingerWearLeft 0x40000
|
||||
|
|
@ -19,7 +21,7 @@ public class PaperdollControllerTests
|
|||
|
||||
private static (ImportedLayout layout, Dictionary<uint, UiItemList> lists) BuildLayout()
|
||||
{
|
||||
var ids = new[] { HeadSlot, ShieldSlot, WeaponSlot, FingerLSlot };
|
||||
var ids = new[] { HeadSlot, ChestSlot, ChestArmorSlot, ShieldSlot, WeaponSlot, FingerLSlot };
|
||||
var lists = new Dictionary<uint, UiItemList>();
|
||||
var byId = new Dictionary<uint, UiElement>();
|
||||
var root = new RootElement { Width = 224, Height = 214 };
|
||||
|
|
@ -112,6 +114,47 @@ public class PaperdollControllerTests
|
|||
Assert.Equal((uint)EquipMask.FingerWearLeft, wields[0].mask); // ValidLocations & slotMask = left finger only
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HandleDropRelease_onAutoWearSlot_sendsFullValidLocations()
|
||||
{
|
||||
var (layout, lists) = BuildLayout();
|
||||
var objects = new ClientObjectTable();
|
||||
const EquipMask coatMask =
|
||||
EquipMask.ChestWear
|
||||
| EquipMask.UpperArmWear
|
||||
| EquipMask.LowerArmWear;
|
||||
SeedPackItem(objects, 0xE02u, coatMask);
|
||||
var wields = new List<(uint item, uint mask)>();
|
||||
var ctrl = Bind(layout, objects, wields);
|
||||
var payload = new ItemDragPayload(0xE02u, ItemDragSource.Inventory, 0, lists[ChestSlot].Cell);
|
||||
|
||||
ctrl.HandleDropRelease(lists[ChestSlot], lists[ChestSlot].Cell, payload);
|
||||
|
||||
Assert.Equal((uint)coatMask, wields[0].mask);
|
||||
Assert.Equal(coatMask, objects.Get(0xE02u)!.CurrentlyEquippedLocation);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void HandleDropRelease_onArmorAutoWearSlot_sendsFullValidLocations()
|
||||
{
|
||||
var (layout, lists) = BuildLayout();
|
||||
var objects = new ClientObjectTable();
|
||||
const EquipMask hauberkMask =
|
||||
EquipMask.ChestArmor
|
||||
| EquipMask.AbdomenArmor
|
||||
| EquipMask.UpperArmArmor
|
||||
| EquipMask.LowerArmArmor;
|
||||
SeedPackItem(objects, 0xE03u, hauberkMask);
|
||||
var wields = new List<(uint item, uint mask)>();
|
||||
var ctrl = Bind(layout, objects, wields);
|
||||
var payload = new ItemDragPayload(0xE03u, ItemDragSource.Inventory, 0, lists[ChestArmorSlot].Cell);
|
||||
|
||||
ctrl.HandleDropRelease(lists[ChestArmorSlot], lists[ChestArmorSlot].Cell, payload);
|
||||
|
||||
Assert.Equal((uint)hauberkMask, wields[0].mask);
|
||||
Assert.Equal(hauberkMask, objects.Get(0xE03u)!.CurrentlyEquippedLocation);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void Empty_equip_slot_shows_the_configured_frame() // visible frame so all positions are usable (Slice 1; the doll is Slice 2)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@ public class ToolbarControllerTests
|
|||
|
||||
// The four mutually-exclusive combat-mode indicator element ids (must match ToolbarController's list).
|
||||
private static readonly uint[] CombatIds = { 0x10000192u, 0x10000193u, 0x10000194u, 0x10000195u };
|
||||
private const uint CharacterButtonId = 0x10000199u;
|
||||
private const uint InventoryButtonId = 0x100001B1u;
|
||||
|
||||
private static (ImportedLayout layout, Dictionary<uint, UiItemList> slots,
|
||||
Dictionary<uint, UiElement> indicators) FakeToolbar()
|
||||
|
|
@ -34,6 +36,8 @@ public class ToolbarControllerTests
|
|||
var e = new UiPanel { Visible = true };
|
||||
dict[id] = e; indicators[id] = e; root.AddChild(e);
|
||||
}
|
||||
AddButton(CharacterButtonId);
|
||||
AddButton(InventoryButtonId);
|
||||
return (new ImportedLayout(root, dict), slots, indicators);
|
||||
|
||||
void AddSlot(uint id)
|
||||
|
|
@ -41,6 +45,23 @@ public class ToolbarControllerTests
|
|||
var list = new UiItemList(_ => (0u, 0, 0)) { Width = 32, Height = 32 };
|
||||
dict[id] = list; slots[id] = list; root.AddChild(list);
|
||||
}
|
||||
|
||||
void AddButton(uint id)
|
||||
{
|
||||
var info = new ElementInfo
|
||||
{
|
||||
Id = id,
|
||||
Type = 1,
|
||||
Width = 32,
|
||||
Height = 32,
|
||||
DefaultStateName = "Normal",
|
||||
};
|
||||
info.StateMedia["Normal"] = (0x1u, 1);
|
||||
info.StateMedia["Highlight"] = (0x2u, 1);
|
||||
var button = new UiButton(info, _ => (0u, 0, 0)) { Width = 32, Height = 32 };
|
||||
dict[id] = button;
|
||||
root.AddChild(button);
|
||||
}
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -95,6 +116,93 @@ public class ToolbarControllerTests
|
|||
Assert.Equal(0x5001u, used);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WindowToggleButtons_clickCallbacks_fire()
|
||||
{
|
||||
var (layout, _, _) = FakeToolbar();
|
||||
var repo = new ClientObjectTable();
|
||||
int inventoryClicks = 0;
|
||||
int characterClicks = 0;
|
||||
|
||||
var ctrl = ToolbarController.Bind(layout, repo,
|
||||
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
|
||||
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
|
||||
ctrl.BindWindowToggles(
|
||||
toggleInventory: () => inventoryClicks++,
|
||||
toggleCharacter: () => characterClicks++);
|
||||
|
||||
((UiButton)layout.FindElement(InventoryButtonId)!).OnEvent(new UiEvent(0u, null, UiEventType.Click));
|
||||
((UiButton)layout.FindElement(CharacterButtonId)!).OnEvent(new UiEvent(0u, null, UiEventType.Click));
|
||||
|
||||
Assert.Equal(1, inventoryClicks);
|
||||
Assert.Equal(1, characterClicks);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void InventoryButton_whenTargetModeActive_targetsPlayerInsteadOfTogglingInventory()
|
||||
{
|
||||
const uint player = 0x50000001u;
|
||||
const uint pack = 0x50000010u;
|
||||
const uint kit = 0x50000A01u;
|
||||
var (layout, _, _) = FakeToolbar();
|
||||
var repo = new ClientObjectTable();
|
||||
repo.AddOrUpdate(new ClientObject { ObjectId = player, Type = ItemType.Creature });
|
||||
repo.AddOrUpdate(new ClientObject { ObjectId = pack, Type = ItemType.Container, ItemsCapacity = 24 });
|
||||
repo.MoveItem(pack, player, 0);
|
||||
repo.AddOrUpdate(new ClientObject { ObjectId = kit, Type = ItemType.Misc, Useability = 0x000A0008u });
|
||||
repo.MoveItem(kit, pack, 0);
|
||||
var useWithTarget = new List<(uint Source, uint Target)>();
|
||||
var interaction = new ItemInteractionController(
|
||||
repo,
|
||||
playerGuid: () => player,
|
||||
sendUse: null,
|
||||
sendUseWithTarget: (source, target) => useWithTarget.Add((source, target)),
|
||||
sendWield: null,
|
||||
sendDrop: null,
|
||||
nowMs: () => 1_000);
|
||||
int inventoryClicks = 0;
|
||||
|
||||
var ctrl = ToolbarController.Bind(layout, repo,
|
||||
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
|
||||
iconIds: (_,_,_,_,_) => 0u,
|
||||
useItem: _ => { },
|
||||
itemInteraction: interaction);
|
||||
ctrl.BindWindowToggles(
|
||||
toggleInventory: () => inventoryClicks++,
|
||||
toggleCharacter: () => { });
|
||||
interaction.ActivateItem(kit);
|
||||
|
||||
((UiButton)layout.FindElement(InventoryButtonId)!).OnEvent(new UiEvent(0u, null, UiEventType.Click));
|
||||
|
||||
Assert.Equal(0, inventoryClicks);
|
||||
Assert.Equal(new[] { (kit, player) }, useWithTarget);
|
||||
Assert.False(interaction.IsTargetModeActive);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WindowButtonState_highlightsWhenOpen()
|
||||
{
|
||||
var (layout, _, _) = FakeToolbar();
|
||||
var repo = new ClientObjectTable();
|
||||
var ctrl = ToolbarController.Bind(layout, repo,
|
||||
() => Array.Empty<PlayerDescriptionParser.ShortcutEntry>(),
|
||||
iconIds: (_,_,_,_,_) => 0u, useItem: _ => { });
|
||||
var inventoryButton = (UiButton)layout.FindElement(InventoryButtonId)!;
|
||||
var characterButton = (UiButton)layout.FindElement(CharacterButtonId)!;
|
||||
|
||||
ctrl.SetInventoryOpen(true);
|
||||
ctrl.SetCharacterOpen(true);
|
||||
|
||||
Assert.Equal("Highlight", inventoryButton.ActiveState);
|
||||
Assert.Equal("Highlight", characterButton.ActiveState);
|
||||
|
||||
ctrl.SetInventoryOpen(false);
|
||||
ctrl.SetCharacterOpen(false);
|
||||
|
||||
Assert.Equal("Normal", inventoryButton.ActiveState);
|
||||
Assert.Equal("Normal", characterButton.ActiveState);
|
||||
}
|
||||
|
||||
// ── C1: combat-mode indicator tests ─────────────────────────────────────
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue