e98bd10dbe
Live two-client run (data_dumps/captures/battle_test) exposed a turn-handover
stall: ending a turn on client A made BOTH clients show A's turn again; the
opponent never got a turn. Root cause: JudgeHandler routed the {spin:0} Judge to
ctx.Other. The client rule is 'receive opponent TurnEnd -> SendJudge', so the
PASSIVE player (the one taking over the turn) is the Judge sender, and 'receive
Judge -> ControlTurnStartPlayer' starts the RECEIVER's turn. Routing to ctx.Other
delivered the Judge to the player who had just ended their turn, restarting it in
a closed loop while the taker-over sat on 'Opponent's Turn'.
Fix: the PvP Judge {spin} reflects back to ctx.From (the sender / turn taker-over),
matching the Bot arm's existing 'Judge to sender only' handover. The sender then
emits TurnStart, which relays to the opponent as {spin}. Updated the dispatch unit
test and the PvpHandshakeAndGameplay integration test to the real handover order
(passive sends Judge -> receives it back -> sends TurnStart -> opponent sees it).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
39 lines
1.8 KiB
C#
39 lines
1.8 KiB
C#
using SVSim.BattleNode.Protocol;
|
|
using SVSim.BattleNode.Protocol.Bodies;
|
|
|
|
namespace SVSim.BattleNode.Sessions.Dispatch.Handlers;
|
|
|
|
internal sealed class TurnEndHandler : IFrameHandler
|
|
{
|
|
public IReadOnlyList<DispatchRoute> Handle(FrameDispatchContext ctx)
|
|
{
|
|
// case 4: Bot — Judge to sender only (no real opponent; client flips back to its local AI).
|
|
if (ctx.Type == BattleType.Bot && ctx.SenderPhase == BattleSessionPhase.AfterReady)
|
|
return new[] { new DispatchRoute(ctx.From, BattleFrames.BuildJudgeBroadcast(), false) };
|
|
|
|
// case 8: general AfterReady arm — matches (and consumes) for any non-Bot type once the
|
|
// sender is AfterReady, even if it yields no routes (legacy `break;`).
|
|
if (ctx.SenderPhase == BattleSessionPhase.AfterReady)
|
|
{
|
|
if (ctx.Type == BattleType.Pvp && ctx.BothAfterReady())
|
|
{
|
|
// Opponent sees {turnState}; receiving TurnEnd drives ITS SendJudge (handover gate):
|
|
// the opponent (the turn taker-over) then sends a Judge, which JudgeHandler reflects
|
|
// back to it to start its turn. battleCode/actionSeq/cemetery are dropped.
|
|
var te = ctx.Env with { Body = new TurnEndBody(TurnState: 0) };
|
|
return new[] { new DispatchRoute(ctx.Other, te, false) };
|
|
}
|
|
if (ctx.Type == BattleType.Scripted)
|
|
return new[] { new DispatchRoute(ctx.Other, ctx.Env, false) };
|
|
|
|
return Array.Empty<DispatchRoute>(); // Pvp-not-both-ready → drop (Bot already returned above)
|
|
}
|
|
|
|
// case 11: scripted-bot TurnEnd whose sender has no handshake phase (test stub) → forward.
|
|
if (ctx.IsScriptedBot(ctx.From))
|
|
return new[] { new DispatchRoute(ctx.Other, ctx.Env, false) };
|
|
|
|
return Array.Empty<DispatchRoute>();
|
|
}
|
|
}
|