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:
gamer147
@@ -6,53 +6,7 @@ namespace Wizard.Battle.View
|
||||
{
|
||||
public partial class ReadOnlyVoiceInfo
|
||||
{
|
||||
public const string IGNORE_OPTION = "_none";
|
||||
public const string NONE_NAME = "none";
|
||||
public const int UNION_BURST_NONE = 0;
|
||||
public const int UNION_BURST_NORMAL = 1;
|
||||
public const int UNION_BURST_SHORT = 2;
|
||||
public const int UNION_BURST_NORMAL_60 = 3;
|
||||
public const int UNION_BURST_SHORT_60 = 4;
|
||||
public const int UNION_BURST_NORMAL_DIRECTLY = 5;
|
||||
public const int UNION_BURST_SHORT_DIRECTLY = 6;
|
||||
public const int UNION_BURST_NORMAL_DIRECTLY_60 = 7;
|
||||
public const int UNION_BURST_SHORT_DIRECTLY_60 = 8;
|
||||
public const int UNION_BURST_PLAY = 9;
|
||||
public const int SKYBOUND_ART_NONE = 10;
|
||||
public const int SKYBOUND_ART_NORMAL = 11;
|
||||
public const int SKYBOUND_ART_SHORT = 12;
|
||||
public const int SKYBOUND_ART_NORMAL_60 = 13;
|
||||
public const int SKYBOUND_ART_SHORT_60 = 14;
|
||||
public const int SKYBOUND_ART_NORMAL_DIRECTLY = 15;
|
||||
public const int SKYBOUND_ART_SHORT_DIRECTLY = 16;
|
||||
public const int SKYBOUND_ART_NORMAL_DIRECTLY_60 = 17;
|
||||
public const int SKYBOUND_ART_SHORT_DIRECTLY_60 = 18;
|
||||
public const int SKYBOUND_ART_PLAY = 19;
|
||||
public const int SUPER_SKYBOUND_ART_NONE = 20;
|
||||
public const int SUPER_SKYBOUND_ART_NORMAL = 21;
|
||||
public const int SUPER_SKYBOUND_ART_SHORT = 22;
|
||||
public const int SUPER_SKYBOUND_ART_NORMAL_60 = 23;
|
||||
public const int SUPER_SKYBOUND_ART_SHORT_60 = 24;
|
||||
public const int SUPER_SKYBOUND_ART_NORMAL_DIRECTLY = 25;
|
||||
public const int SUPER_SKYBOUND_ART_SHORT_DIRECTLY = 26;
|
||||
public const int SUPER_SKYBOUND_ART_NORMAL_DIRECTLY_60 = 27;
|
||||
public const int SUPER_SKYBOUND_ART_SHORT_DIRECTLY_60 = 28;
|
||||
public const int SUPER_SKYBOUND_ART_PLAY = 29;
|
||||
private VoiceDictionaries _voiceDictionaries;
|
||||
private int _destroyCardId;
|
||||
public bool HasSummonTokenVoice { get; set; }
|
||||
public string VoiceId { get; set; }
|
||||
public ReadOnlyVoiceInfo(int cardID, CardMaster.CardMasterId cardMasterId) { }
|
||||
public VoiceAndWaitTime GetPlayVoice(IReadOnlyBattleCardInfo cardInfo, BattlePlayerReadOnlyInfoPair playerPair, int executedFixedUseCostIndex, int skillVoiceIndex) => default!;
|
||||
public VoiceAndWaitTime GetSummonTokenVoice() => default!;
|
||||
public VoiceAndWaitTime GetEvolutionVoice() => default!;
|
||||
public VoiceAndWaitTime GetAttackVoice(bool isEvolution) => default!;
|
||||
public VoiceAndWaitTime GetDestroyVoice(bool isEvolution, bool isExecutedWhiteRitual) => default!;
|
||||
public VoiceAndWaitTime GetSkillVoice(bool isEvolution, int skillIndex) => default!;
|
||||
public int GetSkillVoiceCount(bool isEvolution) => default!;
|
||||
public void SetDestroyCardId(int id) { }
|
||||
public static bool IsInvalidFileName(string voiceData) => default!;
|
||||
public int AddAttachSkillVoice(string id) => default!;
|
||||
public string GetAttachSkillVoice(int index) => default!;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user