engine cleanup passes 4-7 + multi-instancing ambient rip
Squashes 146 commits from battle-engine-extraction. Net: 2,045 files changed, +11,896 / -158,687 lines. Ships engine passes 4-7 (dead-code cull, view-layer stub, receive-path shrink) plus the Phase-5 AsyncLocal ambient deletion that turns concurrent battles into a type-system property rather than a scope contract. ## What landed **Passes 4-7 (chunks 1-34):** Extended the Phase-4 const-false collapse into a cascading cull across the skill graph, view layer, and receive-path periphery. Six mode flags (IsWatchBattle/IsReplayBattle/IsAdmin/IsAdminWatch/IsPuzzleQuest/ IsAINetwork) became `const false`, every guarded block deleted. Field*.cs subclass ctors + BackGroundBase + ObjectChecker culled to no-ops. Mulligan family reworked to take a mgr param through IMulliganMgr.InitMulligan. Emotion/Recovery/Resource clusters null-stubbed. Prediction/OperationSimulator/ skill filters converted from static ambient reads to per-mgr reads via SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr / ins.BattleMgr / this.BattleMgr. **Phase-5 ambient rip (chunks 35-47):** Deleted BattleAmbient / BattleAmbient- Context / TestBattleScope in full. Every per-battle mutable slot now lives on the mgr instance itself: mgr.InstanceIsForecast / InstanceIsRandomDraw / InstanceRecoveryInfo / InstanceViewerId / InstanceNetworkAgent / GameMgr BattleManagerBase.GetIns() returns null unconditionally; the residual static flags + 3 façades (Certification.ViewerId, Data.BattleRecoveryInfo, ToolboxGame.RealTimeNetworkAgent) are null-tolerant defaults kept for the handful of engine-internal readers that still reference their types. Zero BattleAmbient references anywhere in engine + node + tests. Added pre-seeded GameMgr ctor overload threaded through the mgr chain (BattleManagerBase → SingleBattleMgr / NetworkBattleManagerBase → NetworkStandard- BattleMgr → HeadlessBattleMgr / HeadlessNetworkBattleMgr). Fixtures build a GameMgr, seed it via HeadlessEngineEnv.SeedCharaIds/SeedNetUser, and pass it to the mgr's ctor — no ambient reach. Node side (SVSim.BattleNode/SessionBattleEngine): _ctx replaced with a plain GameMgr field; 34 `using var _ambient = BattleAmbient.Enter(_ctx)` scope wraps ripped from every accessor and mutator; EngineGlobalInit.WirePerSessionGameMgr takes GameMgr as a param and runs from SessionBattleEngine.SetupInternal BEFORE mgr construction. Test side: TestBattleScope deleted; 18 fixture [SetUp]s migrated to `HeadlessEngineEnv.EnsureProcessGlobals()`; MultiInstanceEngineTests rewritten around per-mgr construction (GetIns() → null is the pinned invariant). ## Regression fixes - **chunk-48** (MulliganCtrl): chunk-35's `= null` stubs on card lookups broke the live receive-driven Deal path (BattlePlayerBase.DrawCard NRE'd downstream of NetworkPlayerMulliganCtrl.StartMulliganVfx). Restored the three lookups via `_battlePlayer.BattleMgr.GetBattleCardIdx`. Engine tests were satisfied by the WireMulliganPhase seam; unit tests exposed the live-path gap. ## Ship state - SVSim.BattleEngine.Tests: 56/56 pass, 2 skip - SVSim.UnitTests: 1554/1554 pass (was 1523/31-fail before chunk 48) - Solution build: 0 source warnings (40 pre-existing NU1902 MessagePack CVEs in SVSim.EmulatedEntrypoint, unrelated) - Sequential PVP smoke: verified live (two back-to-back battles, no regression on cleanup/spinup) - Concurrent PVP smoke: verified live Adds tools/engine-port/ClosureAnalyzer/ — the Roslyn transitive-type-closure analyzer needed to make future cascade cleanup safe (per feedback memory "Engine cleanup needs closure tool" from the 2026-06-28 pass-3 failure). Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
@@ -7,29 +7,17 @@ public class UserRank : HeaderData
|
||||
{
|
||||
public int[] id = new int[3];
|
||||
|
||||
public int[] periodNum = new int[3];
|
||||
|
||||
public int[] masterPoint = new int[3];
|
||||
|
||||
public int[] rankId = new int[3];
|
||||
|
||||
public int targetMasterPoint;
|
||||
|
||||
public int currentMasterPoint;
|
||||
}
|
||||
|
||||
public const int GRAND_MASTER_PERIOD = 3;
|
||||
|
||||
public const int MASTER_RANK_INDEX = 24;
|
||||
|
||||
public int rank;
|
||||
|
||||
public int battle_point;
|
||||
|
||||
public int master_point;
|
||||
|
||||
public int successive_win_number;
|
||||
|
||||
public bool is_master_rank;
|
||||
|
||||
public bool is_grand_master_rank;
|
||||
@@ -39,40 +27,4 @@ public class UserRank : HeaderData
|
||||
public UserPromotionMatch user_promotion_match = new UserPromotionMatch();
|
||||
|
||||
public static bool IsGrandMasterAvailability { get; set; }
|
||||
|
||||
public void Initialize(JsonData userRank, Format format)
|
||||
{
|
||||
rank = userRank["rank"].ToInt();
|
||||
battle_point = userRank["battle_point"].ToInt();
|
||||
master_point = userRank["master_point"].ToInt();
|
||||
successive_win_number = userRank["successive_win_number"].ToInt();
|
||||
is_master_rank = userRank["is_master_rank"].ToInt() != 0;
|
||||
is_grand_master_rank = userRank.GetValueOrDefault("is_grand_master_rank", 0) != 0;
|
||||
user_promotion_match.is_promotion = userRank["is_promotion"].ToInt() != 0;
|
||||
if (user_promotion_match.is_promotion)
|
||||
{
|
||||
user_promotion_match.match_count = userRank["user_promotion_match"]["match_count"].ToInt();
|
||||
user_promotion_match.battle_result = userRank["user_promotion_match"]["battle_result"].ToInt();
|
||||
user_promotion_match.win = userRank["user_promotion_match"]["win"].ToInt();
|
||||
user_promotion_match.lose = userRank["user_promotion_match"]["lose"].ToInt();
|
||||
}
|
||||
if (is_master_rank && format != Format.Crossover)
|
||||
{
|
||||
IsGrandMasterAvailability = false;
|
||||
if (userRank.Keys.Contains("target_grand_master_point"))
|
||||
{
|
||||
grandMasterData.targetMasterPoint = userRank["target_grand_master_point"].ToInt();
|
||||
IsGrandMasterAvailability = true;
|
||||
}
|
||||
if (userRank.Keys.Contains("current_grand_master_point"))
|
||||
{
|
||||
grandMasterData.currentMasterPoint = userRank["current_grand_master_point"].ToInt();
|
||||
IsGrandMasterAvailability = true;
|
||||
}
|
||||
}
|
||||
if (is_master_rank && format == Format.Crossover)
|
||||
{
|
||||
grandMasterData.currentMasterPoint = master_point;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user