diff --git a/SVSim.BattleNode/Lifecycle/ScriptedLifecycle.cs b/SVSim.BattleNode/Lifecycle/ScriptedLifecycle.cs index 478d6fc..3f958fa 100644 --- a/SVSim.BattleNode/Lifecycle/ScriptedLifecycle.cs +++ b/SVSim.BattleNode/Lifecycle/ScriptedLifecycle.cs @@ -22,35 +22,58 @@ public static class ScriptedLifecycle /// public const long FakeOpponentViewerId = 999_999_999L; - public static MsgEnvelope BuildMatched(MatchContext ctx, long playerViewerId, long opponentViewerId, string battleId) => + public static MsgEnvelope BuildMatched( + MatchContext selfCtx, MatchContext oppoCtx, + long selfViewerId, long oppoViewerId, + string battleId, long seed) => EnvelopeForPush(NetworkBattleUri.Matched, new MatchedBody( SelfInfo: new MatchedSelfInfo( - CountryCode: ctx.CountryCode, - UserName: ctx.UserName, - SleeveId: ctx.SleeveId, - EmblemId: ctx.EmblemId, - DegreeId: ctx.DegreeId, - FieldId: ctx.FieldId, - IsOfficial: ctx.IsOfficial, - OppoId: opponentViewerId, - Seed: ScriptedProfiles.BattleSeed), - OppoInfo: ScriptedProfiles.OpponentMatchedProfile with { OppoId = playerViewerId }, - SelfDeck: BuildPlayerDeck(ctx.SelfDeckCardIds)), + CountryCode: selfCtx.CountryCode, + UserName: selfCtx.UserName, + SleeveId: selfCtx.SleeveId, + EmblemId: selfCtx.EmblemId, + DegreeId: selfCtx.DegreeId, + FieldId: selfCtx.FieldId, + IsOfficial: selfCtx.IsOfficial, + OppoId: oppoViewerId, + Seed: seed), + OppoInfo: new MatchedOppoInfo( + CountryCode: oppoCtx.CountryCode, + UserName: oppoCtx.UserName, + SleeveId: oppoCtx.SleeveId, + EmblemId: oppoCtx.EmblemId, + DegreeId: oppoCtx.DegreeId, + FieldId: oppoCtx.FieldId, + IsOfficial: oppoCtx.IsOfficial, + OppoId: selfViewerId, + Seed: seed, + OppoDeckCount: oppoCtx.SelfDeckCardIds.Count), + SelfDeck: BuildPlayerDeck(selfCtx.SelfDeckCardIds)), bid: battleId); - public static MsgEnvelope BuildBattleStart(MatchContext ctx, long playerViewerId) => + public static MsgEnvelope BuildBattleStart( + MatchContext selfCtx, MatchContext oppoCtx, long selfViewerId) => EnvelopeForPush(NetworkBattleUri.BattleStart, new BattleStartBody( TurnState: 0, // player goes first - BattleType: ctx.BattleType, + BattleType: selfCtx.BattleType, SelfInfo: new BattleStartSelfInfo( Rank: ScriptedProfiles.PlayerRank, BattlePoint: ScriptedProfiles.PlayerBattlePoint, - ClassId: ctx.ClassId, - CharaId: ctx.CharaId, - CardMasterName: ctx.CardMasterName), - OppoInfo: ScriptedProfiles.OpponentBattleStartProfile)); + ClassId: selfCtx.ClassId, + CharaId: selfCtx.CharaId, + CardMasterName: selfCtx.CardMasterName), + OppoInfo: new BattleStartOppoInfo( + // Rank/IsMasterRank/BattlePoint/MasterPoint stay hardcoded โ€” + // PvP rank tracking is deferred (per spec ยง Out of scope). + Rank: "1", + IsMasterRank: "0", + BattlePoint: 0, + MasterPoint: "0", + ClassId: oppoCtx.ClassId, + CharaId: oppoCtx.CharaId, + CardMasterName: oppoCtx.CardMasterName))); public static MsgEnvelope BuildDeal() => EnvelopeForPush(NetworkBattleUri.Deal, diff --git a/SVSim.BattleNode/Sessions/BattleSession.cs b/SVSim.BattleNode/Sessions/BattleSession.cs index fb78b25..affd46e 100644 --- a/SVSim.BattleNode/Sessions/BattleSession.cs +++ b/SVSim.BattleNode/Sessions/BattleSession.cs @@ -98,15 +98,19 @@ public sealed class BattleSession case NetworkBattleUri.InitBattle when Phase == BattleSessionPhase.AwaitingInitBattle: // Phase 1: push Matched only to the "real" participant. The session reads - // selfInfo from from.Context; opponent half currently comes from - // ScriptedProfiles inside ScriptedLifecycle.BuildMatched (Phase 2 generalises - // to use other.Context for per-perspective Matched). - result.Add((from, ScriptedLifecycle.BuildMatched(from.Context, from.ViewerId, other.ViewerId, BattleId), false)); + // selfInfo from from.Context and oppoInfo from other.Context (the scripted + // bot's Context fixture preserves the prod-captured cosmetics that previously + // lived in ScriptedProfiles). + result.Add((from, ScriptedLifecycle.BuildMatched( + from.Context, other.Context, + from.ViewerId, other.ViewerId, + BattleId, ScriptedProfiles.BattleSeed), false)); Phase = BattleSessionPhase.AwaitingLoaded; break; case NetworkBattleUri.Loaded when Phase == BattleSessionPhase.AwaitingLoaded: - result.Add((from, ScriptedLifecycle.BuildBattleStart(from.Context, from.ViewerId), false)); + result.Add((from, ScriptedLifecycle.BuildBattleStart( + from.Context, other.Context, from.ViewerId), false)); result.Add((from, ScriptedLifecycle.BuildDeal(), false)); Phase = BattleSessionPhase.AwaitingSwap; break; diff --git a/SVSim.BattleNode/Sessions/Participants/ScriptedBotParticipant.cs b/SVSim.BattleNode/Sessions/Participants/ScriptedBotParticipant.cs index 025d762..30eb321 100644 --- a/SVSim.BattleNode/Sessions/Participants/ScriptedBotParticipant.cs +++ b/SVSim.BattleNode/Sessions/Participants/ScriptedBotParticipant.cs @@ -1,3 +1,4 @@ +using System.Linq; using SVSim.BattleNode.Bridge; using SVSim.BattleNode.Lifecycle; using SVSim.BattleNode.Protocol; @@ -22,8 +23,12 @@ public sealed class ScriptedBotParticipant : IBattleParticipant { public long ViewerId => ScriptedLifecycle.FakeOpponentViewerId; public MatchContext Context { get; } = new( - SelfDeckCardIds: Array.Empty(), - ClassId: "0", CharaId: "0", CardMasterName: "card_master_node_10015", + // 30 dummy card ids so oppoCtx.SelfDeckCardIds.Count == 30 (matches the + // hardcoded OppoDeckCount that ScriptedProfiles.OpponentMatchedProfile shipped). + SelfDeckCardIds: Enumerable.Range(1, 30).Select(_ => 0L).ToList(), + // BattleStart opponent half: ClassId/CharaId from ScriptedProfiles.OpponentBattleStartProfile. + ClassId: "8", CharaId: "8", CardMasterName: "card_master_node_10015", + // Matched opponent half: cosmetic fields from ScriptedProfiles.OpponentMatchedProfile. CountryCode: "JPN", UserName: "Opponent", SleeveId: "704141010", EmblemId: "400001100", DegreeId: "120027", FieldId: 5, IsOfficial: 0, BattleType: 0); diff --git a/SVSim.UnitTests/BattleNode/Lifecycle/ScriptedLifecycleTests.cs b/SVSim.UnitTests/BattleNode/Lifecycle/ScriptedLifecycleTests.cs index 1cd5ed0..d186719 100644 --- a/SVSim.UnitTests/BattleNode/Lifecycle/ScriptedLifecycleTests.cs +++ b/SVSim.UnitTests/BattleNode/Lifecycle/ScriptedLifecycleTests.cs @@ -12,8 +12,9 @@ public class ScriptedLifecycleTests [Test] public void BuildMatched_PutsOppoIdInSelfInfoEqualToTheRealOpponentVid() { - var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), - playerViewerId: 906243102, opponentViewerId: 847666884, battleId: "b"); + var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), ScriptedBotCtx(), + selfViewerId: 906243102, oppoViewerId: 847666884, + battleId: "b", seed: ScriptedProfiles.BattleSeed); Assert.That(env.Uri, Is.EqualTo(NetworkBattleUri.Matched)); var body = (MatchedBody)env.Body; @@ -25,7 +26,7 @@ public class ScriptedLifecycleTests [Test] public void BuildMatched_ContainsThirtyCardSelfDeck() { - var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), 1, 2, "b"); + var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), ScriptedBotCtx(), 1, 2, "b", ScriptedProfiles.BattleSeed); var body = (MatchedBody)env.Body; Assert.That(body.SelfDeck.Count, Is.EqualTo(30)); } @@ -34,7 +35,7 @@ public class ScriptedLifecycleTests public void BuildMatched_deck_idxs_pair_1to30_with_context_card_ids() { var draftedDeck = Enumerable.Range(1, 30).Select(i => 200_000_000L + i).ToList(); - var env = ScriptedLifecycle.BuildMatched(FixtureCtx(draftedDeck), 1, 2, "b"); + var env = ScriptedLifecycle.BuildMatched(FixtureCtx(draftedDeck), ScriptedBotCtx(), 1, 2, "b", ScriptedProfiles.BattleSeed); var body = (MatchedBody)env.Body; for (int i = 0; i < 30; i++) @@ -55,7 +56,7 @@ public class ScriptedLifecycleTests EmblemId = "888", DegreeId = "777", FieldId = 42, IsOfficial = 1, }; - var env = ScriptedLifecycle.BuildMatched(ctx, 1, 2, "b"); + var env = ScriptedLifecycle.BuildMatched(ctx, ScriptedBotCtx(), 1, 2, "b", ScriptedProfiles.BattleSeed); var body = (MatchedBody)env.Body; Assert.That(body.SelfInfo.CountryCode, Is.EqualTo("JPN")); @@ -70,7 +71,7 @@ public class ScriptedLifecycleTests [Test] public void BuildBattleStart_HasTurnStateZero_AndUsesContextBattleType() { - var env = ScriptedLifecycle.BuildBattleStart(FixtureCtx(), playerViewerId: 1); + var env = ScriptedLifecycle.BuildBattleStart(FixtureCtx(), ScriptedBotCtx(), selfViewerId: 1); var body = (BattleStartBody)env.Body; Assert.That(body.TurnState, Is.EqualTo(0)); Assert.That(body.BattleType, Is.EqualTo(11)); @@ -86,7 +87,7 @@ public class ScriptedLifecycleTests BattleType = 42, }; - var env = ScriptedLifecycle.BuildBattleStart(ctx, playerViewerId: 1); + var env = ScriptedLifecycle.BuildBattleStart(ctx, ScriptedBotCtx(), selfViewerId: 1); var body = (BattleStartBody)env.Body; Assert.That(body.SelfInfo.ClassId, Is.EqualTo("7")); @@ -185,4 +186,13 @@ public class ScriptedLifecycleTests CountryCode: "KOR", UserName: "Player", SleeveId: "3000011", EmblemId: "701441011", DegreeId: "300003", FieldId: 43, IsOfficial: 0, BattleType: 11); + + // Mirrors ScriptedBotParticipant.Context โ€” the scripted opponent's MatchContext fixture + // that the new BuildMatched/BuildBattleStart helpers read from for the oppo half. + private static MatchContext ScriptedBotCtx() => new( + SelfDeckCardIds: Enumerable.Range(1, 30).Select(_ => 0L).ToList(), + ClassId: "8", CharaId: "8", CardMasterName: "card_master_node_10015", + CountryCode: "JPN", UserName: "Opponent", SleeveId: "704141010", + EmblemId: "400001100", DegreeId: "120027", FieldId: 5, IsOfficial: 0, + BattleType: 0); } diff --git a/SVSim.UnitTests/BattleNode/Lifecycle/TypedBodyWireShapeTests.cs b/SVSim.UnitTests/BattleNode/Lifecycle/TypedBodyWireShapeTests.cs index ce9a57f..1c37910 100644 --- a/SVSim.UnitTests/BattleNode/Lifecycle/TypedBodyWireShapeTests.cs +++ b/SVSim.UnitTests/BattleNode/Lifecycle/TypedBodyWireShapeTests.cs @@ -27,8 +27,8 @@ public class TypedBodyWireShapeTests // Matching.StartBattleLoad reads it back, and GetSelfDeck().Select(...) crashes // with "Value cannot be null. Parameter name: source". The prod wire format // emits envelope keys (uri first) before body keys; we must too. - var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), - playerViewerId: 1, opponentViewerId: 2, battleId: "b"); + var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), ScriptedBotCtx(), + selfViewerId: 1, oppoViewerId: 2, battleId: "b", seed: ScriptedProfiles.BattleSeed); var json = MsgEnvelope.ToJson(env); var uriIdx = json.IndexOf("\"uri\":", StringComparison.Ordinal); @@ -45,8 +45,9 @@ public class TypedBodyWireShapeTests [Test] public void BuildMatched_SerializesAllWireKeysExpectedByTheClient() { - var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), - playerViewerId: 906243102, opponentViewerId: 847666884, battleId: "597830888107"); + var env = ScriptedLifecycle.BuildMatched(FixtureCtx(), ScriptedBotCtx(), + selfViewerId: 906243102, oppoViewerId: 847666884, battleId: "597830888107", + seed: ScriptedProfiles.BattleSeed); var json = MsgEnvelope.ToJson(env); var node = JsonNode.Parse(json)!.AsObject(); @@ -85,7 +86,7 @@ public class TypedBodyWireShapeTests [Test] public void BuildBattleStart_SerializesAllWireKeysAndPreservesBattlePointAsymmetry() { - var env = ScriptedLifecycle.BuildBattleStart(FixtureCtx(), playerViewerId: 906243102); + var env = ScriptedLifecycle.BuildBattleStart(FixtureCtx(), ScriptedBotCtx(), selfViewerId: 906243102); var json = MsgEnvelope.ToJson(env); var node = JsonNode.Parse(json)!.AsObject(); @@ -193,4 +194,15 @@ public class TypedBodyWireShapeTests CountryCode: "KOR", UserName: "Player", SleeveId: "3000011", EmblemId: "701441011", DegreeId: "300003", FieldId: 43, IsOfficial: 0, BattleType: 11); + + // Mirrors ScriptedBotParticipant.Context โ€” 30-card deck and the prod-captured opponent + // cosmetics (ClassId/CharaId "8") so the wire bytes asserted below (oppoInfo classId/charaId, + // oppoDeckCount=30, etc.) remain byte-identical after the BuildMatched/BuildBattleStart + // signature change. + private static MatchContext ScriptedBotCtx() => new( + SelfDeckCardIds: Enumerable.Range(1, 30).Select(_ => 0L).ToList(), + ClassId: "8", CharaId: "8", CardMasterName: "card_master_node_10015", + CountryCode: "JPN", UserName: "Opponent", SleeveId: "704141010", + EmblemId: "400001100", DegreeId: "120027", FieldId: 5, IsOfficial: 0, + BattleType: 0); }