Behavior-preserving; 231 BattleNode tests green. One enum conflated two axes. Split: - HandshakePhase (per participant): AwaitingInitNetwork..AfterReady. On IHasHandshakePhase.Phase, FrameDispatchContext.SenderPhase, the handler gates. - SessionLifecycle (per battle): Active | Terminal. On the renamed BattleSessionState.Lifecycle (was SessionPhase, defaulting to a handshake value) and BattleSession.Lifecycle (was Phase). Reads are only != Terminal, so the Active default is behavior-identical. OpponentTurn was dead (never assigned) -> dropped. BattleSessionPhase deleted; the two axes can no longer be cross-assigned. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
41 lines
1.9 KiB
C#
41 lines
1.9 KiB
C#
using SVSim.BattleNode.Lifecycle;
|
|
using SVSim.BattleNode.Protocol;
|
|
using SVSim.BattleNode.Sessions.Participants; // IHasHandshakePhase
|
|
|
|
namespace SVSim.BattleNode.Sessions.Dispatch.Handlers;
|
|
|
|
internal sealed class SwapHandler : IFrameHandler
|
|
{
|
|
public IReadOnlyList<DispatchRoute> Handle(FrameDispatchContext ctx)
|
|
{
|
|
if (ctx.SenderPhase != HandshakePhase.AwaitingSwap)
|
|
return Array.Empty<DispatchRoute>();
|
|
|
|
var routes = new List<DispatchRoute>();
|
|
var hand = ServerBattleFrames.ComputeHandAfterSwap(BattleFrames.ExtractIdxList(ctx.Env));
|
|
|
|
// SwapResponse is always immediate — completes the sender's own mulligan UI.
|
|
routes.Add(new DispatchRoute(ctx.From, ServerBattleFrames.BuildSwapResponse(hand), Stock.Normal));
|
|
ctx.State.PostSwapHands[ctx.From] = hand;
|
|
ctx.SenderPhase = HandshakePhase.AfterReady;
|
|
|
|
// Release Ready to every swapper once all handshake-driving participants have swapped.
|
|
// IHasHandshakePhase membership IS the "participates in mulligan" set.
|
|
var swappers = new[] { ctx.A, ctx.B }.Where(p => p is IHasHandshakePhase).ToList();
|
|
if (swappers.All(ctx.State.PostSwapHands.ContainsKey))
|
|
{
|
|
foreach (var p in swappers)
|
|
{
|
|
var opponent = ReferenceEquals(p, ctx.A) ? ctx.B : ctx.A;
|
|
var idxSeed = BattleSeeds.IdxChange(ctx.State.MasterSeed, p.ViewerId);
|
|
var ready = opponent is IHasHandshakePhase
|
|
&& ctx.State.PostSwapHands.TryGetValue(opponent, out var oppoHand)
|
|
? ServerBattleFrames.BuildReady(ctx.State.PostSwapHands[p], oppoHand, idxSeed)
|
|
: ServerBattleFrames.BuildReady(ctx.State.PostSwapHands[p], idxSeed);
|
|
routes.Add(new DispatchRoute(p, ready, Stock.Normal));
|
|
}
|
|
}
|
|
return routes;
|
|
}
|
|
}
|