fix(gameplay): reconcile wield ownership and target facing
Preserve PlayerDescription inventory/equipment ownership across authoritative manifest replacement, make weapon switching and combat/UI consumers read the same canonical object state, and carry the complete outbound player position frame across landblocks. Route target-facing and mouse-look through the shared MovementManager and MotionInterpreter completion owner. Match retail input aggregation, toggle ordering, turn/sidestep remapping, per-axis hold keys, and synchronous movement publication without render-only heading state. Initialize the live streaming origin from the first accepted canonical player Position, defer other projections until that origin exists, and retain logical entity identity through hydration. Advance the project ledger from completed M2 to active M3, synchronize CLAUDE.md/AGENTS.md and durable memory, and record the next cast-lifecycle, spellbook/enchantment, and two-client portal gates. Co-Authored-By: Codex <noreply@openai.com>
This commit is contained in:
Erik
parent
b26f84cc69
commit
7b7ffcd278
36 changed files with 3884 additions and 761 deletions
|
|
@ -1,6 +1,7 @@
|
|||
using System;
|
||||
using System.Numerics;
|
||||
using AcDream.App.Input;
|
||||
using AcDream.App.Rendering;
|
||||
using AcDream.Core.Physics;
|
||||
using AcDream.Core.Physics.Motion;
|
||||
using DatReaderWriter.DBObjs;
|
||||
|
|
@ -27,7 +28,9 @@ namespace AcDream.Core.Tests.Input;
|
|||
public class PlayerMoveToCutoverTests
|
||||
{
|
||||
private const uint NC = 0x8000003Du;
|
||||
private const uint MissileCombat = 0x8000003Fu;
|
||||
private const uint Ready = 0x41000003u;
|
||||
private const uint Reload = 0x40000016u;
|
||||
private const uint Walk = 0x45000005u;
|
||||
private const uint Run = 0x44000007u;
|
||||
private const uint TurnRight = 0x6500000Du;
|
||||
|
|
@ -73,7 +76,10 @@ public class PlayerMoveToCutoverTests
|
|||
|
||||
var mt = new MotionTable { DefaultStyle = (DRWMotionCommand)NC };
|
||||
mt.StyleDefaults[(DRWMotionCommand)NC] = (DRWMotionCommand)Ready;
|
||||
mt.StyleDefaults[(DRWMotionCommand)MissileCombat] = (DRWMotionCommand)Ready;
|
||||
mt.Cycles[(int)((NC << 16) | (Ready & 0xFFFFFFu))] = MakeMd(0x300u);
|
||||
mt.Cycles[(int)((MissileCombat << 16) | (Ready & 0xFFFFFFu))] = MakeMd(0x300u);
|
||||
mt.Cycles[(int)((MissileCombat << 16) | (Reload & 0xFFFFFFu))] = MakeMd(0x301u);
|
||||
mt.Cycles[(int)((NC << 16) | (Walk & 0xFFFFFFu))] = MakeMd(0x301u);
|
||||
mt.Cycles[(int)((NC << 16) | (Run & 0xFFFFFFu))] = MakeMd(0x302u);
|
||||
// The MoveToManager's aux-turn steering / TurnToHeading nodes
|
||||
|
|
@ -82,6 +88,7 @@ public class PlayerMoveToCutoverTests
|
|||
// _DoMotion error and the manager cancels the moveto (retail
|
||||
// dispatch-failure semantics), so the fixture needs one.
|
||||
mt.Cycles[(int)((NC << 16) | (TurnRight & 0xFFFFFFu))] = MakeMd(0x303u);
|
||||
mt.Cycles[(int)((MissileCombat << 16) | (TurnRight & 0xFFFFFFu))] = MakeMd(0x303u);
|
||||
return new AnimationSequencer(setup, mt, loader);
|
||||
}
|
||||
|
||||
|
|
@ -102,8 +109,27 @@ public class PlayerMoveToCutoverTests
|
|||
{
|
||||
public required PlayerMovementController Controller;
|
||||
public required MoveToManager MoveTo;
|
||||
public required EntityPhysicsHost PlayerHost;
|
||||
public required Dictionary<uint, IPhysicsObjHost> Hosts;
|
||||
public int MoveToCompleteCount;
|
||||
public WeenieError LastCompleteError;
|
||||
|
||||
public void AddStaticTarget(uint guid, Position position)
|
||||
{
|
||||
var target = new EntityPhysicsHost(
|
||||
guid,
|
||||
getPosition: () => position,
|
||||
getVelocity: () => Vector3.Zero,
|
||||
getRadius: () => 0.5f,
|
||||
inContact: () => true,
|
||||
minterpMaxSpeed: () => null,
|
||||
curTime: () => Controller.SimTimeSeconds,
|
||||
physicsTimerTime: () => Controller.SimTimeSeconds,
|
||||
getObjectA: id => Hosts.TryGetValue(id, out var host) ? host : null,
|
||||
handleUpdateTarget: _ => { },
|
||||
interruptCurrentMovement: () => { });
|
||||
Hosts[guid] = target;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>The EnterPlayerModeNow bind set, verbatim shape: real sink,
|
||||
|
|
@ -116,6 +142,12 @@ public class PlayerMoveToCutoverTests
|
|||
var controller = new PlayerMovementController(MakeFlatEngine());
|
||||
var seq = MakeSequencer();
|
||||
seqOut = seq;
|
||||
// Production AnimatedEntity wiring installs the completion callback
|
||||
// before EnterPlayerModeNow binds the sink and calls SetPosition.
|
||||
// A synchronous zero-tick completion at the CPhysicsObj movement
|
||||
// boundary must therefore reach MotionInterpreter even during the
|
||||
// initial placement stop.
|
||||
seq.MotionDoneTarget = (m, ok) => controller.Motion.MotionDone(m, ok);
|
||||
// Production (EnterPlayerModeNow) order: the sink binds BEFORE the
|
||||
// initial SetPosition — SetPosition → StopCompletely needs the sink
|
||||
// for its type-5 motion-table dispatch, the completable partner of
|
||||
|
|
@ -130,10 +162,19 @@ public class PlayerMoveToCutoverTests
|
|||
controller.SetPosition(new Vector3(96f, 96f, 50f), 0x0001);
|
||||
controller.Yaw = 0f; // heading 90 = facing +X
|
||||
|
||||
var rig = new Rig { Controller = controller, MoveTo = null! };
|
||||
const uint selfGuid = 0x5000000Au;
|
||||
var hosts = new Dictionary<uint, IPhysicsObjHost>();
|
||||
EntityPhysicsHost playerHost = null!;
|
||||
var rig = new Rig
|
||||
{
|
||||
Controller = controller,
|
||||
MoveTo = null!,
|
||||
PlayerHost = null!,
|
||||
Hosts = hosts,
|
||||
};
|
||||
var moveTo = new MoveToManager(
|
||||
controller.Motion,
|
||||
stopCompletely: () => controller.Motion.StopCompletely(),
|
||||
stopCompletely: () => controller.StopCompletelyAtPhysicsObjectBoundary(),
|
||||
getPosition: () => new Position(
|
||||
controller.CellId, controller.Position, controller.BodyOrientation),
|
||||
getHeading: () => MoveToMath.HeadingFromYaw(controller.Yaw),
|
||||
|
|
@ -143,12 +184,28 @@ public class PlayerMoveToCutoverTests
|
|||
contact: () => controller.BodyInContact,
|
||||
isInterpolating: () => false,
|
||||
getVelocity: () => controller.BodyVelocity,
|
||||
getSelfId: () => 0x5000000Au,
|
||||
setTarget: (_, _, _, _) => { },
|
||||
clearTarget: () => { },
|
||||
getTargetQuantum: () => 0.0,
|
||||
setTargetQuantum: _ => { },
|
||||
getSelfId: () => selfGuid,
|
||||
setTarget: (ctx, id, radius, quantum) =>
|
||||
playerHost.SetTarget(ctx, id, radius, quantum),
|
||||
clearTarget: () => playerHost.ClearTarget(),
|
||||
getTargetQuantum: () => playerHost.TargetManager.GetTargetQuantum(),
|
||||
setTargetQuantum: quantum => playerHost.TargetManager.SetTargetQuantum(quantum),
|
||||
curTime: () => controller.SimTimeSeconds);
|
||||
playerHost = new EntityPhysicsHost(
|
||||
selfGuid,
|
||||
getPosition: () => new Position(
|
||||
controller.CellId, controller.Position, controller.BodyOrientation),
|
||||
getVelocity: () => controller.BodyVelocity,
|
||||
getRadius: () => 0.5f,
|
||||
inContact: () => controller.BodyInContact,
|
||||
minterpMaxSpeed: () => controller.Motion.GetMaxSpeed(),
|
||||
curTime: () => controller.SimTimeSeconds,
|
||||
physicsTimerTime: () => controller.SimTimeSeconds,
|
||||
getObjectA: id => hosts.TryGetValue(id, out var host) ? host : null,
|
||||
handleUpdateTarget: info => moveTo.HandleUpdateTarget(info),
|
||||
interruptCurrentMovement: () =>
|
||||
moveTo.CancelMoveTo(WeenieError.ActionCancelled));
|
||||
hosts[selfGuid] = playerHost;
|
||||
moveTo.MoveToComplete = err =>
|
||||
{
|
||||
rig.MoveToCompleteCount++;
|
||||
|
|
@ -158,6 +215,7 @@ public class PlayerMoveToCutoverTests
|
|||
controller.Motion.InterruptCurrentMovement =
|
||||
() => moveTo.CancelMoveTo(WeenieError.ActionCancelled);
|
||||
rig.MoveTo = moveTo;
|
||||
rig.PlayerHost = playerHost;
|
||||
return rig;
|
||||
}
|
||||
|
||||
|
|
@ -290,8 +348,6 @@ public class PlayerMoveToCutoverTests
|
|||
// under the production completion feed.
|
||||
var rig = MakeRig(out var seq);
|
||||
var c = rig.Controller;
|
||||
seq.MotionDoneTarget = (m, ok) => c.Motion.MotionDone(m, ok);
|
||||
|
||||
for (int f = 0; f < 300 && c.Motion.MotionsPending(); f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput());
|
||||
|
|
@ -317,7 +373,6 @@ public class PlayerMoveToCutoverTests
|
|||
// pops; remotes 0/40).
|
||||
var rig = MakeRig(out var seq);
|
||||
var c = rig.Controller;
|
||||
seq.MotionDoneTarget = (m, ok) => c.Motion.MotionDone(m, ok);
|
||||
var dest = new Vector3(104f, 96f, 50f); // 8 m dead ahead (heading 90)
|
||||
|
||||
// A few idle frames first — production always has render ticks
|
||||
|
|
@ -355,6 +410,130 @@ public class PlayerMoveToCutoverTests
|
|||
Assert.Equal(1, rig.MoveToCompleteCount);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void ServerTurnToObject_AfterMissileReload_ProductionFeed_RotatesAndCompletes()
|
||||
{
|
||||
// Live bow repro (2026-07-15): ACE broadcasts MissileCombat/Reload,
|
||||
// then a type-8 TurnToObject carrying StopCompletely before it
|
||||
// launches the arrow. After target resolution, retail's object turn
|
||||
// is exactly one TurnToHeading node, so this pins the animation-queue
|
||||
// boundary without replacing TargetManager with a test-only poll.
|
||||
var rig = MakeRig(out var seq);
|
||||
var c = rig.Controller;
|
||||
for (int f = 0; f < 120; f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput { Run = true });
|
||||
seq.Advance(1f / 60f);
|
||||
}
|
||||
|
||||
Assert.Equal(WeenieError.None, c.Motion.DoMotion(
|
||||
MissileCombat, new MovementParameters()));
|
||||
Assert.Equal(WeenieError.None, c.Motion.DoInterpretedMotion(
|
||||
Reload, new MovementParameters { Speed = 2f }));
|
||||
|
||||
const uint targetGuid = 0x80001234u;
|
||||
rig.AddStaticTarget(targetGuid, new Position(
|
||||
c.CellId, new Vector3(88f, 96f, 50f), Quaternion.Identity));
|
||||
|
||||
rig.MoveTo.PerformMovement(new MovementStruct
|
||||
{
|
||||
Type = MovementType.TurnToObject,
|
||||
ObjectId = targetGuid,
|
||||
TopLevelId = targetGuid,
|
||||
Params = new MovementParameters
|
||||
{
|
||||
StopCompletelyFlag = true,
|
||||
Speed = 1f,
|
||||
},
|
||||
});
|
||||
|
||||
float initialYaw = c.Yaw;
|
||||
for (int f = 0; f < 600 && rig.MoveTo.IsMovingTo(); f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput { Run = true });
|
||||
seq.Advance(1f / 60f);
|
||||
}
|
||||
|
||||
string interpQueue = string.Join(", ",
|
||||
c.Motion.PendingMotions.Select(n => $"0x{n.Motion:X8}"));
|
||||
string animationQueue = string.Join(", ",
|
||||
seq.Manager.PendingAnimations.Select(n => $"0x{n.Motion:X8}/{n.NumAnims}"));
|
||||
Assert.True(initialYaw != c.Yaw,
|
||||
$"turn never changed yaw; moving={rig.MoveTo.IsMovingTo()} "
|
||||
+ $"complete={rig.MoveToCompleteCount} error={rig.LastCompleteError} "
|
||||
+ $"interp=[{interpQueue}] animation=[{animationQueue}]");
|
||||
Assert.False(rig.MoveTo.IsMovingTo());
|
||||
Assert.Equal(1, rig.MoveToCompleteCount);
|
||||
Assert.InRange(MoveToMath.HeadingFromYaw(c.Yaw), 269.99f, 270.01f);
|
||||
Assert.False(c.Motion.MotionsPending());
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void KeyboardTurnRelease_ThenAttackStop_DrainsBeforeServerTurnToObject()
|
||||
{
|
||||
// Live bow repro (2026-07-15): turn the character away with a player
|
||||
// input edge, release the key, begin an attack (MaybeStopCompletely),
|
||||
// then receive ACE's type-8 TurnToObject. Retail routes the input
|
||||
// DoMotion/StopMotion calls through CPhysicsObj -> MovementManager,
|
||||
// so every edge runs the zero-tick completion sweep and leaves no
|
||||
// orphan that can starve BeginTurnToHeading.
|
||||
var rig = MakeRig(out var seq);
|
||||
var c = rig.Controller;
|
||||
|
||||
for (int f = 0; f < 90; f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput { Run = true, TurnRight = true });
|
||||
seq.Advance(1f / 60f);
|
||||
}
|
||||
|
||||
c.Update(1f / 60f, new MovementInput { Run = true });
|
||||
seq.Advance(1f / 60f);
|
||||
for (int f = 0; f < 120 && c.Motion.MotionsPending(); f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput { Run = true });
|
||||
seq.Advance(1f / 60f);
|
||||
}
|
||||
|
||||
Assert.False(c.Motion.MotionsPending(),
|
||||
"keyboard turn release must leave no interpreter queue orphan");
|
||||
Assert.Empty(seq.Manager.PendingAnimations);
|
||||
|
||||
Assert.True(c.PrepareForAttackRequest());
|
||||
Assert.False(c.Motion.MotionsPending(),
|
||||
"attack-entry StopCompletely must synchronously drain zero-tick Ready");
|
||||
Assert.Empty(seq.Manager.PendingAnimations);
|
||||
|
||||
const uint targetGuid = 0x80004321u;
|
||||
rig.AddStaticTarget(targetGuid, new Position(
|
||||
c.CellId, c.Position + new Vector3(12f, 0f, 0f), Quaternion.Identity));
|
||||
float initialYaw = c.Yaw;
|
||||
rig.Controller.SetLastMoveWasAutonomous(false);
|
||||
rig.MoveTo.PerformMovement(new MovementStruct
|
||||
{
|
||||
Type = MovementType.TurnToObject,
|
||||
ObjectId = targetGuid,
|
||||
TopLevelId = targetGuid,
|
||||
Params = new MovementParameters
|
||||
{
|
||||
StopCompletelyFlag = true,
|
||||
Speed = 1f,
|
||||
},
|
||||
});
|
||||
|
||||
for (int f = 0; f < 600 && rig.MoveTo.IsMovingTo(); f++)
|
||||
{
|
||||
c.Update(1f / 60f, new MovementInput { Run = true });
|
||||
seq.Advance(1f / 60f);
|
||||
}
|
||||
|
||||
Assert.NotEqual(initialYaw, c.Yaw);
|
||||
Assert.False(rig.MoveTo.IsMovingTo());
|
||||
Assert.Equal(1, rig.MoveToCompleteCount);
|
||||
Assert.InRange(MoveToMath.HeadingFromYaw(c.Yaw), 89.99f, 90.01f);
|
||||
Assert.False(c.Motion.MotionsPending());
|
||||
Assert.Empty(seq.Manager.PendingAnimations);
|
||||
}
|
||||
|
||||
[Fact]
|
||||
public void JumpRelease_CancelsMoveTo()
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue