feat(battle-node): BuildBattleStart consumes MatchContext for player half
ClassId/CharaId/CardMasterName/BattleType flow from ctx. PlayerBattleStart Profile removed; Rank/BattlePoint remain as standalone consts pending real per-viewer rank tracker. One test updated, one new test added. Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -38,12 +38,17 @@ public static class ScriptedLifecycle
|
||||
SelfDeck: BuildPlayerDeck(ctx.SelfDeckCardIds)),
|
||||
bid: battleId);
|
||||
|
||||
public static MsgEnvelope BuildBattleStart(long playerViewerId) =>
|
||||
public static MsgEnvelope BuildBattleStart(MatchContext ctx, long playerViewerId) =>
|
||||
EnvelopeForPush(NetworkBattleUri.BattleStart,
|
||||
new BattleStartBody(
|
||||
TurnState: 0, // player goes first
|
||||
BattleType: 11, // TK2 NetworkBattleType
|
||||
SelfInfo: ScriptedProfiles.PlayerBattleStartProfile,
|
||||
BattleType: ctx.BattleType,
|
||||
SelfInfo: new BattleStartSelfInfo(
|
||||
Rank: ScriptedProfiles.PlayerRank,
|
||||
BattlePoint: ScriptedProfiles.PlayerBattlePoint,
|
||||
ClassId: ctx.ClassId,
|
||||
CharaId: ctx.CharaId,
|
||||
CardMasterName: ctx.CardMasterName),
|
||||
OppoInfo: ScriptedProfiles.OpponentBattleStartProfile));
|
||||
|
||||
public static MsgEnvelope BuildDeal() =>
|
||||
|
||||
@@ -27,13 +27,10 @@ internal static class ScriptedProfiles
|
||||
Seed: BattleSeed,
|
||||
OppoDeckCount: 30);
|
||||
|
||||
// From frame[5] (BattleStart).
|
||||
public static readonly BattleStartSelfInfo PlayerBattleStartProfile = new(
|
||||
Rank: "10",
|
||||
BattlePoint: "6270",
|
||||
ClassId: "1",
|
||||
CharaId: "1",
|
||||
CardMasterName: "card_master_node_10015");
|
||||
// From frame[5] (BattleStart). Hardcoded; see spec §Deferred plumbing — sourcing these
|
||||
// from real per-viewer state needs a TK2 rank/battle-point tracker.
|
||||
public const string PlayerRank = "10";
|
||||
public const string PlayerBattlePoint = "6270";
|
||||
|
||||
public static readonly BattleStartOppoInfo OpponentBattleStartProfile = new(
|
||||
Rank: "1",
|
||||
|
||||
@@ -239,7 +239,7 @@ public sealed class BattleSession
|
||||
Phase = BattleSessionPhase.AwaitingLoaded;
|
||||
break;
|
||||
case NetworkBattleUri.Loaded when Phase == BattleSessionPhase.AwaitingLoaded:
|
||||
result.Add((ScriptedLifecycle.BuildBattleStart(ViewerId), NoStock: false));
|
||||
result.Add((ScriptedLifecycle.BuildBattleStart(Context, ViewerId), NoStock: false));
|
||||
result.Add((ScriptedLifecycle.BuildDeal(), NoStock: false));
|
||||
Phase = BattleSessionPhase.AwaitingSwap;
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user