fix(R4-V5): moveto wedge - StopCompletely's missing animation dispatch orphaned pending_motions; + the P1 autonomous store family
Live bug (2026-07-03, user door test): a server MoveTo armed (movingTo=True) but the local body never moved; the retail observer saw ACE walk the server-side player to the door; the next local input reasserted the stale position (rubber-band). Log evidence: the player's pending_motions queue was non-empty on 92/94 MotionDone pops (remotes: 0/40) - MoveToManager's retail wait-for-anims gate (BeginTurnToHeading's MotionsPending check) never opened. ROOT CAUSE (found via a production-faithful repro test - the original suite force-drained the queue, masking it): the R3 port MISIDENTIFIED retail's StopCompletely_Internal body. It is NOT a physics velocity zero - CPhysicsObj::StopCompletely_Internal (0x0050ead0) tailcalls CPartArray::StopCompletelyInternal (0x00518890) which is MotionTableManager::PerformMovement(type 5): an ANIMATION-side full stop whose UNCONDITIONALLY-queued pending_animations entry is the completable partner of the A9 pending_motions node CMotionInterp::StopCompletely enqueues (raw @00527e90 between the state writes and add_to_queue). Without the dispatch, every StopCompletely (login/teleport SetPosition + every MoveToManager PerformMovement head) left an orphan node with no completion - the queue never drained at idle. (The R3 code comment claimed a register row for the stand-in; none was ever added - porting the real mechanism closes that violation without a row.) Fix set (all retail-anchored): - IInterpretedMotionSink gains StopCompletely() (default true = the null-sink posture); MotionTableDispatchSink routes it to the R2 manager's already-ported type-5 op (StopObjectCompletely + Ready-sentinel entry) + TurnStopped for the ObservedOmega seam. - MotionInterpreter.StopCompletely calls DefaultSink?.StopCompletely() at the exact retail slot (after the state writes, before add_to_queue); the immediate set_velocity(Zero) is kept as the documented physics-effect stand-in. - PlayerMovementController ticks CheckForCompletedMotions after UseTime - retail's per-tick CPartArray::HandleMovement slot (0x00517d60 = MotionTableManager::UseTime = CheckForCompletedMotions tailcall, called every tick from UpdateObjectInternal @005159a4). NOTE: a first-cut per-tick apply_current_movement pump was tried and REVERTED - retail's apply callers are all event-driven (hold-key, HitGround/LeaveGround, ReportExhaustion), not per-tick; the remote block's per-tick apply is a pre-existing adaptation outside this fix's scope. - The P1 autonomous-store family, completing the pin's port shape (the gate landed in V5; the STORE side was missing): (a) the unpack store (00509730: last_move_was_autonomous = wire byte) in the GameWindow player branch - local player only for now (remote interps have no WeenieObj, which A3 reads as IsThePlayer; storing a remote's autonomous byte would mis-route their per-tick apply onto the raw branch); (b) input edges store =1 at the controller edge block - retail's CPhysicsObj::DoMotion @00510030 / StopMotion @005100e0 / TakeControlFromServer @006b32f4 input-boundary stores; (c) section 2's per-frame velocity write now PRESERVES the flag (V5's first cut stamped it per frame, the wrong altitude - retail stores it at event boundaries only); (d) InstallSpeculativeTurnToTarget stores false (models the wire mt-6's unpack store; part of the AP-23 adaptation) so the event-driven applies (e.g. HitGround mid-moveto) route interpreted and cannot clobber the manager's dispatched motions with idle raw state. Tests: new ServerMoveToPosition_ProductionCompletionFeed_WalksToArrival drives the controller under the PRODUCTION completion feed (sequencer.Advance -> MotionDoneTarget) instead of force-draining - this is the test that reproduced the live wedge (queue stuck at the two A9 Ready orphans) and now proves the drain. Existing cutover tests mirror the wire-path autonomous store before PerformMovement. Full suite green: 3,957. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Erik
parent
b87726dc2c
commit
c2dc1a889c
6 changed files with 201 additions and 12 deletions
|
|
@ -344,6 +344,19 @@ public sealed class PlayerMovementController
|
|||
/// Update — heading reads/writes go through Yaw, not this).</summary>
|
||||
internal Quaternion BodyOrientation => _body.Orientation;
|
||||
|
||||
/// <summary>R4-V5 wedge fix — the P1 unpack store
|
||||
/// (<c>CPhysics::SetObjectMovement</c> @00509730:
|
||||
/// <c>last_move_was_autonomous = arg7</c>, written on the unpack path
|
||||
/// for every applied movement event). GameWindow's local-player 0xF74C
|
||||
/// branch stores the wire autonomous byte here (always false — the P1
|
||||
/// gate drops autonomous echoes); the speculative use install stores
|
||||
/// false too (it models the wire mt-6 ACE sends moments later). Routes
|
||||
/// the per-tick pump's A3 dual dispatch to the INTERPRETED branch
|
||||
/// during a server moveto so apply_raw can't clobber the manager's
|
||||
/// dispatched motions with the idle raw state.</summary>
|
||||
internal void SetLastMoveWasAutonomous(bool autonomous)
|
||||
=> _body.LastMoveWasAutonomous = autonomous;
|
||||
|
||||
/// <summary>
|
||||
/// Wire the player's AnimationSequencer current cycle velocity into
|
||||
/// <see cref="MotionInterpreter.GetCycleVelocity"/>. When attached,
|
||||
|
|
@ -497,6 +510,22 @@ public sealed class PlayerMovementController
|
|||
// §3 placement decision).
|
||||
MoveTo?.UseTime();
|
||||
|
||||
// R4-V5 wedge fix (2026-07-03 live door bug), retail's per-tick
|
||||
// completion slot: CPartArray::HandleMovement — a tailcall chain to
|
||||
// MotionTableManager::CheckForCompletedMotions (0x00517d60 →
|
||||
// 0x0051bfd0) — runs every tick right AFTER MovementManager::UseTime
|
||||
// in UpdateObjectInternal (@005159a4). It flushes pending_animations
|
||||
// entries whose animations already ran out so their AnimationDone →
|
||||
// MotionDone pops land each tick even when no op fired that frame.
|
||||
// (apply_current_movement is NOT part of the per-tick order — its
|
||||
// retail callers are all event-driven: hold-key toggles, HitGround/
|
||||
// LeaveGround, ReportExhaustion.) Full tick ordering remains R6
|
||||
// scope; the companion fix is StopCompletely's previously-missing
|
||||
// StopCompletely_Internal animation dispatch (see
|
||||
// MotionInterpreter.StopCompletely), whose completable entry this
|
||||
// slot drains.
|
||||
_motion.CheckForCompletedMotions?.Invoke();
|
||||
|
||||
// Portal-space guard: while teleporting, no input is processed and
|
||||
// no physics is resolved. Return a zero-movement result so the caller
|
||||
// can detect the frozen state (MotionStateChanged = false, no commands).
|
||||
|
|
@ -582,6 +611,20 @@ public sealed class PlayerMovementController
|
|||
else if (!input.TurnRight && !input.TurnLeft
|
||||
&& (_prevTurnRightHeld || _prevTurnLeftHeld))
|
||||
{ _motion.StopMotion(MotionCommand.TurnRight, p); motionEdgeFired = true; }
|
||||
|
||||
// Retail stores last_move_was_autonomous = 1 at the CPhysicsObj
|
||||
// INPUT boundary — CPhysicsObj::DoMotion @00510030 /
|
||||
// CPhysicsObj::StopMotion @005100e0 (per call, before routing
|
||||
// to MovementManager) and CommandInterpreter::
|
||||
// TakeControlFromServer @006b32f4. The MoveToManager's
|
||||
// _DoMotion goes through CMotionInterp internals and NEVER
|
||||
// touches the flag; the wire unpack path stores the wire byte
|
||||
// (P1, 00509730). This edge block IS acdream's input boundary,
|
||||
// so an edge firing is exactly retail's store site. The flag
|
||||
// routes the per-tick pump's A3 dual dispatch (raw for
|
||||
// input-driven motion, interpreted for server/manager-driven).
|
||||
if (motionEdgeFired)
|
||||
_body.LastMoveWasAutonomous = true;
|
||||
}
|
||||
|
||||
_prevForwardHeld = input.Forward;
|
||||
|
|
@ -655,16 +698,16 @@ public sealed class PlayerMovementController
|
|||
// that adjust_motion ran above. The hand-mirrored formulas are gone
|
||||
// (register TS-22 retired).
|
||||
var stateVel = _motion.get_state_velocity();
|
||||
// R3-W6: autonomous=true flags input-driven motion (the default
|
||||
// false silently cleared LastMoveWasAutonomous and flipped the
|
||||
// A3 dual dispatch to the interpreted branch). R4-V5: while the
|
||||
// MoveToManager is driving, the last movement EVENT was the
|
||||
// server's non-autonomous moveto — retail stores the wire
|
||||
// autonomous byte on the unpack path (P1 pin,
|
||||
// last_move_was_autonomous), so the per-frame stamp must not
|
||||
// overwrite that with true mid-moveto.
|
||||
bool autonomousMove = MoveTo is null || !MoveTo.IsMovingTo();
|
||||
_body.set_local_velocity(new Vector3(stateVel.X, stateVel.Y, savedWorldVz), autonomous: autonomousMove);
|
||||
// R4-V5 wedge fix: PRESERVE the flag — retail's
|
||||
// last_move_was_autonomous is stored at EVENT boundaries only
|
||||
// (input DoMotion/StopMotion edges above, the P1 wire-unpack
|
||||
// store, LeaveGround's own autonomous=1 write), never re-stamped
|
||||
// by the per-tick velocity write. V5's first cut stamped it per
|
||||
// frame here, which mis-routed the pump's A3 dual dispatch on
|
||||
// event-transition frames (apply_raw clobbering a just-armed
|
||||
// moveto's dispatched motion with the raw Ready state).
|
||||
_body.set_local_velocity(new Vector3(stateVel.X, stateVel.Y, savedWorldVz),
|
||||
autonomous: _body.LastMoveWasAutonomous);
|
||||
}
|
||||
|
||||
// ── 3. Jump (charged) ─────────────────────────────────────────────────
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue