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
|
|
@ -37,14 +37,14 @@ public sealed class GameEventWiringTests
|
|||
return body;
|
||||
}
|
||||
|
||||
private static (GameEventDispatcher, ClientObjectTable, CombatState, Spellbook, ChatLog) MakeAll()
|
||||
private static (GameEventDispatcher, ClientObjectTable, CombatState, Spellbook, ChatLog) MakeAll(Func<uint>? playerGuid = null)
|
||||
{
|
||||
var dispatcher = new GameEventDispatcher();
|
||||
var items = new ClientObjectTable();
|
||||
var combat = new CombatState();
|
||||
var spellbook = new Spellbook();
|
||||
var chat = new ChatLog();
|
||||
GameEventWiring.WireAll(dispatcher, items, combat, spellbook, chat);
|
||||
GameEventWiring.WireAll(dispatcher, items, combat, spellbook, chat, playerGuid: playerGuid);
|
||||
return (dispatcher, items, combat, spellbook, chat);
|
||||
}
|
||||
|
||||
|
|
@ -123,20 +123,20 @@ public sealed class GameEventWiringTests
|
|||
[Fact]
|
||||
public void WireAll_WieldObject_ConfirmsOptimisticWield()
|
||||
{
|
||||
var (d, items, _, _, _) = MakeAll();
|
||||
const uint player = 0x2000u;
|
||||
var (d, items, _, _, _) = MakeAll(() => player);
|
||||
items.AddOrUpdate(new ClientObject { ObjectId = 0x1500, WeenieClassId = 1 });
|
||||
items.MoveItem(0x1500, 0x9999u, newSlot: 0); // start in a pack
|
||||
items.WieldItemOptimistic(0x1500, player, EquipMask.MeleeWeapon); // optimistic wield → snapshot pending
|
||||
|
||||
byte[] payload = new byte[12];
|
||||
byte[] payload = new byte[8];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x1500);
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(4), (uint)EquipMask.MeleeWeapon);
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(8), player);
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.WieldObject, payload));
|
||||
d.Dispatch(env!.Value); // server confirms the wield
|
||||
|
||||
Assert.False(items.RollbackMove(0x1500)); // pending snapshot was cleared by ConfirmMove
|
||||
Assert.Equal(player, items.Get(0x1500)!.ContainerId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -215,6 +215,59 @@ public sealed class GameEventWiringTests
|
|||
Assert.Equal(0.5f, local.ManaPercent!.Value, precision: 3);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WireAll_PlayerDescription_PopulatesLocalPlayerStateSkills()
|
||||
{
|
||||
var dispatcher = new GameEventDispatcher();
|
||||
var items = new ClientObjectTable();
|
||||
var combat = new CombatState();
|
||||
var spellbook = new Spellbook();
|
||||
var chat = new ChatLog();
|
||||
var local = new LocalPlayerState();
|
||||
int callbackRun = -1;
|
||||
|
||||
GameEventWiring.WireAll(dispatcher, items, combat, spellbook, chat, local,
|
||||
onSkillsUpdated: (run, _) => callbackRun = run,
|
||||
resolveSkillFormulaBonus: (skillId, attrs) =>
|
||||
{
|
||||
Assert.Equal(24u, skillId);
|
||||
Assert.Equal(50u, attrs[1u]);
|
||||
return 80u;
|
||||
});
|
||||
|
||||
var sb = new MemoryStream();
|
||||
using var w = new BinaryWriter(sb);
|
||||
w.Write(0u); // propertyFlags
|
||||
w.Write(0x52u); // weenieType
|
||||
w.Write(0x03u); // vectorFlags = Attribute | Skill
|
||||
w.Write(0u); // has_health = false
|
||||
w.Write(0x01u); // attribute_flags = Strength only
|
||||
w.Write(0u); // Strength ranks
|
||||
w.Write(50u); // Strength start
|
||||
w.Write(0u); // Strength xp
|
||||
|
||||
w.Write((ushort)1); // skill count
|
||||
w.Write((ushort)8); // buckets
|
||||
w.Write(24u); // Run
|
||||
w.Write((ushort)12);
|
||||
w.Write((ushort)1); // const_one
|
||||
w.Write(2u); // trained
|
||||
w.Write(3456u); // xp
|
||||
w.Write(30u); // init
|
||||
w.Write(0u); // resistance
|
||||
w.Write(1.5); // last used
|
||||
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.PlayerDescription, sb.ToArray()));
|
||||
dispatcher.Dispatch(env!.Value);
|
||||
|
||||
var run = local.GetSkill(24u);
|
||||
Assert.NotNull(run);
|
||||
Assert.Equal(122u, run!.Value.CurrentLevel);
|
||||
Assert.Equal(2u, run.Value.Status);
|
||||
Assert.Equal(3456u, run.Value.Xp);
|
||||
Assert.Equal(122, callbackRun);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WireAll_PlayerDescription_FeedsSpellbook()
|
||||
{
|
||||
|
|
@ -392,6 +445,48 @@ public sealed class GameEventWiringTests
|
|||
Assert.Equal(2, items.ObjectCount);
|
||||
Assert.NotNull(items.Get(0x50000A01u));
|
||||
Assert.NotNull(items.Get(0x50000A02u));
|
||||
Assert.Equal(0u, items.Get(0x50000A01u)!.ContainerTypeHint);
|
||||
Assert.Equal(1u, items.Get(0x50000A02u)!.ContainerTypeHint);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void PlayerDescription_ReplacesPlayerPackContents_InRetailManifestOrder()
|
||||
{
|
||||
const uint playerGuid = 0x50000001u;
|
||||
var dispatcher = new GameEventDispatcher();
|
||||
var items = new ClientObjectTable();
|
||||
var combat = new CombatState();
|
||||
var spellbook = new Spellbook();
|
||||
var chat = new ChatLog();
|
||||
GameEventWiring.WireAll(dispatcher, items, combat, spellbook, chat,
|
||||
playerGuid: () => playerGuid);
|
||||
|
||||
var sb = new MemoryStream();
|
||||
using var w = new BinaryWriter(sb);
|
||||
w.Write(0u); // propertyFlags = 0
|
||||
w.Write(0x52u); // weenieType
|
||||
w.Write(0x201u); // vectorFlags = ATTRIBUTE | ENCHANTMENT
|
||||
w.Write(1u); // has_health
|
||||
w.Write(0u); // attribute_flags = 0 (no attrs)
|
||||
w.Write(0u); // enchantment_mask = 0
|
||||
|
||||
w.Write(0u); // option_flags = None (no GAMEPLAY_OPTIONS -> strict inv path)
|
||||
w.Write(0u); // options1
|
||||
w.Write(0u); // legacy hotbar list count = 0
|
||||
w.Write(0u); // spellbook_filters
|
||||
|
||||
w.Write(2u);
|
||||
w.Write(0x50000A02u); w.Write(1u);
|
||||
w.Write(0x50000A01u); w.Write(0u);
|
||||
w.Write(0u); // equipped count
|
||||
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.PlayerDescription, sb.ToArray()));
|
||||
dispatcher.Dispatch(env!.Value);
|
||||
|
||||
Assert.Equal(new[] { 0x50000A02u, 0x50000A01u }, items.GetContents(playerGuid));
|
||||
Assert.Equal(playerGuid, items.Get(0x50000A02u)!.ContainerId);
|
||||
Assert.Equal(1u, items.Get(0x50000A02u)!.ContainerTypeHint);
|
||||
Assert.Equal(0u, items.Get(0x50000A01u)!.ContainerTypeHint);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -441,6 +536,7 @@ public sealed class GameEventWiringTests
|
|||
Assert.NotNull(items.Get(0x700u));
|
||||
// (b) WeenieClassId must be 0, NOT the ContainerType discriminator (1) — misuse gone
|
||||
Assert.Equal(0u, items.Get(0x700u)!.WeenieClassId);
|
||||
Assert.Equal(1u, items.Get(0x700u)!.ContainerTypeHint);
|
||||
// (c) equipped guid has its equip slot set
|
||||
Assert.NotNull(items.Get(0x701u));
|
||||
Assert.Equal(EquipMask.MeleeWeapon, items.Get(0x701u)!.CurrentlyEquippedLocation);
|
||||
|
|
@ -573,6 +669,9 @@ public sealed class GameEventWiringTests
|
|||
|
||||
Assert.Equal(0x500000C9u, items.Get(0x50000A01u)!.ContainerId);
|
||||
Assert.Equal(0x500000C9u, items.Get(0x50000A02u)!.ContainerId);
|
||||
Assert.Equal(new[] { 0x50000A01u, 0x50000A02u }, items.GetContents(0x500000C9u));
|
||||
Assert.Equal(0u, items.Get(0x50000A01u)!.ContainerTypeHint);
|
||||
Assert.Equal(1u, items.Get(0x50000A02u)!.ContainerTypeHint);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -638,13 +737,14 @@ public sealed class GameEventWiringTests
|
|||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(0), 0x50000B02u);
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(4), 0x500000C1u);
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(8), 0u); // placement
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(12), 0u); // containerType
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(12), 1u); // containerType
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.InventoryPutObjInContainer, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
||||
// ConfirmMove cleared the pending snapshot → a later rollback is a no-op (the move stuck).
|
||||
Assert.False(items.RollbackMove(0x50000B02u));
|
||||
Assert.Equal(0x500000C1u, items.Get(0x50000B02u)!.ContainerId);
|
||||
Assert.Equal(1u, items.Get(0x50000B02u)!.ContainerTypeHint);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
|
|
@ -661,4 +761,21 @@ public sealed class GameEventWiringTests
|
|||
Assert.Equal(0u, items.Get(0x50000A01u)!.ContainerId);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void WireAll_InventoryPutObjectIn3D_ConfirmsOptimisticDrop()
|
||||
{
|
||||
var (d, items, _, _, _) = MakeAll();
|
||||
items.RecordMembership(0x50000A03u, containerId: 0x500000C9u);
|
||||
items.MoveItem(0x50000A03u, 0x500000C9u, 4);
|
||||
items.MoveItemOptimistic(0x50000A03u, newContainerId: 0u, newSlot: -1);
|
||||
|
||||
byte[] payload = new byte[4];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x50000A03u);
|
||||
var env = GameEventEnvelope.TryParse(WrapEnvelope(GameEventType.InventoryPutObjectIn3D, payload));
|
||||
d.Dispatch(env!.Value);
|
||||
|
||||
Assert.Equal(0u, items.Get(0x50000A03u)!.ContainerId);
|
||||
Assert.False(items.RollbackMove(0x50000A03u));
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -156,6 +156,22 @@ public sealed class CreateObjectTests
|
|||
Assert.Equal(2.5f, parsed.Value.UseRadius!.Value, precision: 3);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void TryParse_WeenieFlagsTargetType_ReadsTargetType()
|
||||
{
|
||||
byte[] body = BuildMinimalCreateObjectWithWeenieHeader(
|
||||
guid: 0x50000009u,
|
||||
name: "Healing Kit",
|
||||
itemType: (uint)ItemType.Misc,
|
||||
weenieFlags: 0x00080000u,
|
||||
targetType: (uint)ItemType.Creature);
|
||||
|
||||
var parsed = CreateObject.TryParse(body);
|
||||
|
||||
Assert.NotNull(parsed);
|
||||
Assert.Equal((uint)ItemType.Creature, parsed!.Value.TargetType);
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// D.5.1 (2026-06-16): IconId was discarded at cs:516 — surface it so the
|
||||
// action bar / equipment UI can read icon dat ids from spawn messages.
|
||||
|
|
@ -451,6 +467,7 @@ public sealed class CreateObjectTests
|
|||
uint? value = null,
|
||||
uint? useability = null,
|
||||
float? useRadius = null,
|
||||
uint? targetType = null,
|
||||
uint iconOverlayId = 0,
|
||||
uint iconUnderlayId = 0,
|
||||
// intermediate fields for cursor-arithmetic test
|
||||
|
|
@ -516,7 +533,7 @@ public sealed class CreateObjectTests
|
|||
BinaryPrimitives.WriteSingleLittleEndian(tmp, useRadius ?? 0f);
|
||||
bytes.AddRange(tmp.ToArray());
|
||||
}
|
||||
if ((weenieFlags & 0x00080000u) != 0) WriteU32(bytes, 0); // TargetType u32
|
||||
if ((weenieFlags & 0x00080000u) != 0) WriteU32(bytes, targetType ?? 0u); // TargetType u32
|
||||
if ((weenieFlags & 0x00000080u) != 0) WriteU32(bytes, uiEffects); // UiEffects u32
|
||||
if ((weenieFlags & 0x00000200u) != 0) bytes.Add(0); // CombatUse sbyte/1 byte
|
||||
if ((weenieFlags & 0x00000400u) != 0) WriteU16(bytes, structure ?? 0); // Structure u16
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Buffers.Binary;
|
||||
using System.Text;
|
||||
using AcDream.Core.Items;
|
||||
using AcDream.Core.Net.Messages;
|
||||
using Xunit;
|
||||
|
||||
|
|
@ -176,6 +177,21 @@ public sealed class GameEventDispatcherTests
|
|||
Assert.Equal(0.42f, parsed.Value.HealthPercent, 4);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ParseWieldObject_acceptsAceEightBytePayload()
|
||||
{
|
||||
byte[] payload = new byte[8];
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload, 0x50000A01u);
|
||||
BinaryPrimitives.WriteUInt32LittleEndian(payload.AsSpan(4), (uint)EquipMask.ChestArmor);
|
||||
|
||||
var parsed = GameEvents.ParseWieldObject(payload);
|
||||
|
||||
Assert.NotNull(parsed);
|
||||
Assert.Equal(0x50000A01u, parsed!.Value.ItemGuid);
|
||||
Assert.Equal((uint)EquipMask.ChestArmor, parsed.Value.EquipLoc);
|
||||
Assert.Equal(0u, parsed.Value.WielderGuid);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ParseWeenieError_RoundTrip()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -57,6 +57,8 @@ public sealed class ObjectTableWiringTests
|
|||
Structure = 80,
|
||||
MaxStructure = 100,
|
||||
Workmanship = 4.5f,
|
||||
Useability = 0x000A0008u,
|
||||
TargetType = (uint)ItemType.Creature,
|
||||
};
|
||||
|
||||
var d = ObjectTableWiring.ToWeenieData(spawn);
|
||||
|
|
@ -96,6 +98,8 @@ public sealed class ObjectTableWiringTests
|
|||
Assert.Equal(80, d.Structure);
|
||||
Assert.Equal(100, d.MaxStructure);
|
||||
Assert.Equal(4.5f, d.Workmanship);
|
||||
Assert.Equal(0x000A0008u, d.Useability);
|
||||
Assert.Equal((uint)ItemType.Creature, d.TargetType);
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -28,6 +28,58 @@ public sealed class WorldSessionCombatTests
|
|||
CharacterActions.CombatMode.Magic), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendRaiseAttribute_UsesRetailBuilder()
|
||||
{
|
||||
using var session = NewSession();
|
||||
byte[]? captured = null;
|
||||
session.GameActionCapture = body => captured = body;
|
||||
|
||||
session.SendRaiseAttribute(5u, 110u);
|
||||
|
||||
Assert.NotNull(captured);
|
||||
Assert.Equal(CharacterActions.BuildRaiseAttribute(1, 5u, 110u), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendRaiseVital_UsesRetailBuilder()
|
||||
{
|
||||
using var session = NewSession();
|
||||
byte[]? captured = null;
|
||||
session.GameActionCapture = body => captured = body;
|
||||
|
||||
session.SendRaiseVital(1u, 90u);
|
||||
|
||||
Assert.NotNull(captured);
|
||||
Assert.Equal(CharacterActions.BuildRaiseVital(1, 1u, 90u), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendRaiseSkill_UsesRetailBuilder()
|
||||
{
|
||||
using var session = NewSession();
|
||||
byte[]? captured = null;
|
||||
session.GameActionCapture = body => captured = body;
|
||||
|
||||
session.SendRaiseSkill(34u, 111_000_000u);
|
||||
|
||||
Assert.NotNull(captured);
|
||||
Assert.Equal(CharacterActions.BuildRaiseSkill(1, 34u, 111_000_000u), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendTrainSkill_UsesRetailBuilder()
|
||||
{
|
||||
using var session = NewSession();
|
||||
byte[]? captured = null;
|
||||
session.GameActionCapture = body => captured = body;
|
||||
|
||||
session.SendTrainSkill(21u, 6u);
|
||||
|
||||
Assert.NotNull(captured);
|
||||
Assert.Equal(CharacterActions.BuildTrainSkill(1, 21u, 6u), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendMeleeAttack_UsesRetailMeleeBuilder()
|
||||
{
|
||||
|
|
@ -88,4 +140,19 @@ public sealed class WorldSessionCombatTests
|
|||
Assert.NotNull(captured);
|
||||
Assert.Equal(SocialActions.BuildQueryHealth(1, 0x50000007u), captured);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void SendUseWithTarget_UsesRetailBuilder()
|
||||
{
|
||||
using var session = NewSession();
|
||||
byte[]? captured = null;
|
||||
session.GameActionCapture = body => captured = body;
|
||||
|
||||
session.SendUseWithTarget(0x50000A01u, 0x50000001u);
|
||||
|
||||
Assert.NotNull(captured);
|
||||
Assert.Equal(
|
||||
InteractRequests.BuildUseWithTarget(1, 0x50000A01u, 0x50000001u),
|
||||
captured);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue