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

fix(paperdoll): restore authored slot backgrounds

Browse source 
Port the retail UIItem catalog path so every supported equipment location resolves its exact empty-state silhouette from live DAT. Share one definition table between equip behavior and presentation, wire runtime plus UI Studio, pin all 21 prototypes and surfaces, and retire AP-66.

Co-Authored-By: Codex <codex@openai.com>
This commit is contained in:
Erik 2026-07-13 09:43:21 +02:00
parent 6ba4148b24
commit 1be18cc4db
11 changed files with 335 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

26
tests/AcDream.App.Tests/UI/Layout/PaperdollControllerTests.cs
View file

@ -36,12 +36,14 @@ public class PaperdollControllerTests
private static PaperdollController Bind(ImportedLayout layout, ClientObjectTable objects,
List<(uint item, uint mask)>? wields = null, uint emptySlot = 0u,
SelectionState? selection = null)
SelectionState? selection = null,
IReadOnlyDictionary<uint, uint>? emptySlotSprites = null)
=> PaperdollController.Bind(layout, objects, () => Player,
iconIds: (_, _, _, _, _) => 0x1234u,
sendWield: wields is null ? null : (i, m) => wields.Add((i, m)),
emptySlotSprite: emptySlot,
selection: selection ?? new SelectionState());
selection: selection ?? new SelectionState(),
emptySlotSprites: emptySlotSprites);
private static void SeedEquipped(ClientObjectTable t, uint guid, EquipMask loc)
{
@ -219,6 +221,26 @@ public class PaperdollControllerTests
Assert.Equal(0x06004D20u, lists[HeadSlot].Cell.EmptySprite);
}
[Fact]
public void PerLocation_empty_sprites_override_the_generic_fallback()
{
var (layout, lists) = BuildLayout();
var sprites = new Dictionary<uint, uint>
{
[HeadSlot] = 0x06006D7Fu,
[ChestSlot] = 0x060032C5u,
[ChestArmorSlot] = 0x06006D7Bu,
[ShieldSlot] = 0x06000F6Cu,
[WeaponSlot] = 0x06000F66u,
[FingerLSlot] = 0x06000F5Au,
};
Bind(layout, new ClientObjectTable(), emptySlot: 0x06004D20u, emptySlotSprites: sprites);
foreach (var (element, sprite) in sprites)
Assert.Equal(sprite, lists[element].Cell.EmptySprite);
}
[Fact]
public void Live_player_wield_repaints_the_slot() // event-driven: ObjectMoved → Concerns → Populate
{

85
tests/AcDream.App.Tests/UI/Layout/PaperdollSlotBackgroundTests.cs Normal file
View file

@ -0,0 +1,85 @@
using System;
using System.Collections.Generic;
using System.IO;
using AcDream.App.UI.Layout;
using DatReaderWriter;
using DatReaderWriter.Options;
using Xunit;
namespace AcDream.App.Tests.UI.Layout;
public class PaperdollSlotBackgroundTests
{
public static TheoryData<uint, uint> SlotPrototypeCases => new()
{
{ 0x100001DAu, 0x10000446u }, // neck
{ 0x100001DBu, 0x10000447u }, // left wrist
{ 0x100001DCu, 0x10000448u }, // left ring
{ 0x100001DDu, 0x10000449u }, // right wrist
{ 0x100001DEu, 0x1000044Au }, // right ring
{ 0x100001DFu, 0x1000044Bu }, // weapon
{ 0x100001E0u, 0x1000044Cu }, // ammo
{ 0x100001E1u, 0x1000044Du }, // shield
{ 0x100001E2u, 0x1000044Eu }, // shirt
{ 0x100001E3u, 0x1000044Fu }, // pants
{ 0x1000058Eu, 0x1000058Fu }, // trinket
{ 0x100005E9u, 0x100005EAu }, // cloak
{ 0x100005ABu, 0x100005B4u }, // head
{ 0x100005ACu, 0x100005B5u }, // chest armor
{ 0x100005ADu, 0x100005B6u }, // abdomen armor
{ 0x100005AEu, 0x100005B7u }, // upper arm armor
{ 0x100005AFu, 0x100005B8u }, // lower arm armor
{ 0x100005B0u, 0x100005B9u }, // hands
{ 0x100005B1u, 0x100005BAu }, // upper legs
{ 0x100005B2u, 0x100005BBu }, // lower legs
{ 0x100005B3u, 0x100005BDu }, // feet
};
[Theory]
[MemberData(nameof(SlotPrototypeCases))]
public void Slot_uses_authored_UIItem_prototype(uint slotElement, uint prototypeElement)
{
Assert.True(PaperdollSlotBackgrounds.TryGetPrototype(slotElement, out uint actual));
Assert.Equal(prototypeElement, actual);
}
[Fact]
public void Live_dat_resolves_all_pinned_retail_backgrounds()
{
string datDir = Environment.GetEnvironmentVariable("ACDREAM_DAT_DIR")
?? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile),
"Documents", "Asheron's Call");
if (!Directory.Exists(datDir)) return;
using var dats = new DatCollection(datDir, DatAccessType.Read);
IReadOnlyDictionary<uint, uint> actual = PaperdollSlotBackgrounds.ResolveEmptySprites(dats);
var expected = new Dictionary<uint, uint>
{
[0x100001DAu] = 0x06000F68u,
[0x100001DBu] = 0x06000F5Du,
[0x100001DCu] = 0x06000F5Au,
[0x100001DDu] = 0x06000F6Au,
[0x100001DEu] = 0x06000F6Bu,
[0x100001DFu] = 0x06000F66u,
[0x100001E0u] = 0x06000F5Eu,
[0x100001E1u] = 0x06000F6Cu,
[0x100001E2u] = 0x060032C5u,
[0x100001E3u] = 0x060032C4u,
[0x1000058Eu] = 0x06006A6Cu,
[0x100005E9u] = 0x0600708Fu,
[0x100005ABu] = 0x06006D7Fu,
[0x100005ACu] = 0x06006D7Bu,
[0x100005ADu] = 0x06006D79u,
[0x100005AEu] = 0x06006D87u,
[0x100005AFu] = 0x06006D81u,
[0x100005B0u] = 0x06006D7Du,
[0x100005B1u] = 0x06006D89u,
[0x100005B2u] = 0x06006D83u,
[0x100005B3u] = 0x06006D85u,
};
Assert.Equal(expected.Count, actual.Count);
foreach (var (slot, sprite) in expected)
Assert.Equal(sprite, actual[slot]);
}
}