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
@@ -5,65 +5,10 @@ using Wizard.Battle.Phase;
|
||||
|
||||
public static class EmitHandUtility
|
||||
{
|
||||
public static void SendSelectSkill(NetworkBattleSender.SELECT_SKILL_OPERATION skillSelectOperation, BattleManagerBase battleMgr, BattleCardBase cardInfoToSend, bool isEvolveSelect, List<BattleCardBase> compInfoToSend = null, List<SkillBase> activeSelectSkills = null, bool isBurialRite = false, bool isChoiceBrave = false)
|
||||
{
|
||||
NetworkStandardBattleMgr networkStandardBattleMgr = ConvertToStandardNetworkBattleMgr(battleMgr);
|
||||
if (networkStandardBattleMgr == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
string text = string.Empty;
|
||||
List<int> list = new List<int>();
|
||||
switch (skillSelectOperation)
|
||||
{
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.StartSelect:
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.StartFusionSelect:
|
||||
text = cardInfoToSend.Index.ToString();
|
||||
if (activeSelectSkills != null)
|
||||
{
|
||||
list.AddRange(from s in activeSelectSkills
|
||||
where RegisterSkillConditionCheck.IsSkillConditionCheck(s, isNotHandCheck: true)
|
||||
select s.SkillPrm.ownerCard.Skills.IndexOf(s));
|
||||
}
|
||||
break;
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.SelectCard:
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.CompleteSelect:
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.SelectFusionIngredient:
|
||||
text = (cardInfoToSend.IsPlayer ? "1" : "0") + ConvertToThreeDigitCardIndex(cardInfoToSend.Index);
|
||||
break;
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.CompleteFusionSelect:
|
||||
text = cardInfoToSend.Index.ToString();
|
||||
break;
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.StartChoiceSelect:
|
||||
text = cardInfoToSend.Index.ToString();
|
||||
break;
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.CancelSelect:
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.CancelChoiceSelect:
|
||||
text = string.Empty;
|
||||
break;
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.SelectChoiceCard:
|
||||
case NetworkBattleSender.SELECT_SKILL_OPERATION.CompleteChoiceSelect:
|
||||
{
|
||||
for (int i = 0; i < compInfoToSend.Count; i++)
|
||||
{
|
||||
if (i > 0)
|
||||
{
|
||||
text += ",";
|
||||
}
|
||||
text += compInfoToSend[i].Index;
|
||||
}
|
||||
break;
|
||||
}
|
||||
default:
|
||||
Debug.LogError("Invalid Select Skill Operation");
|
||||
return;
|
||||
}
|
||||
networkStandardBattleMgr.NetworkSender.SendSelectSkill(skillSelectOperation, isEvolveSelect, text, list, isBurialRite, isChoiceBrave);
|
||||
}
|
||||
|
||||
public static void SendSelectObject(BattleManagerBase battleMgr, BattleCardBase selectedCard)
|
||||
{
|
||||
if (!GameMgr.GetIns().GetDataMgr().IsRoomBattleType())
|
||||
if (true /* Pre-Phase-5b: no room battle type headless; always fall through */)
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -91,22 +36,12 @@ public static class EmitHandUtility
|
||||
ConvertToStandardNetworkBattleMgr(battleMgr)?.NetworkSender.SendSlideObject(slideObjectType, selectedCard, attackingCard);
|
||||
}
|
||||
|
||||
public static void ResetSelectedSlideCard(BattleManagerBase battleMgr)
|
||||
{
|
||||
ConvertToStandardNetworkBattleMgr(battleMgr)?.NetworkSender.ResetSelectedSlideCard();
|
||||
}
|
||||
|
||||
private static NetworkStandardBattleMgr ConvertToStandardNetworkBattleMgr(BattleManagerBase battleMgr)
|
||||
{
|
||||
if (ToolboxGame.RealTimeNetworkAgent == null)
|
||||
if (battleMgr?.InstanceNetworkAgent == null)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return battleMgr as NetworkStandardBattleMgr;
|
||||
}
|
||||
|
||||
private static string ConvertToThreeDigitCardIndex(int cardIndex)
|
||||
{
|
||||
return cardIndex.ToString().PadLeft(3, '0');
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user