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
@@ -9,17 +9,6 @@ using Wizard.Battle.View.Vfx;
|
||||
|
||||
public class Skill_token_draw : SkillBase
|
||||
{
|
||||
protected const string OPTION_DUPLICATION_FALSE = "false";
|
||||
|
||||
public const string OPTION_DUPLICATION_TRUE = "true";
|
||||
|
||||
private const string TOKEN_EFFECT_PATH = "cmn_token_draw_1";
|
||||
|
||||
private const string OPTION_OLDEST = "oldest";
|
||||
|
||||
private const string OPTION_EXCEPT_FUSION_CARD_ID_TRUE = "true";
|
||||
|
||||
private const string OPTION_EXCEPT_GAME_PLAY_CARD_ID_TRUE = "true";
|
||||
|
||||
protected IEnumerable<int> _tokenIds;
|
||||
|
||||
@@ -31,14 +20,6 @@ public class Skill_token_draw : SkillBase
|
||||
|
||||
protected int _randomCount = -1;
|
||||
|
||||
private const string GLEAMING_GEM = "Gleaming_Gem_";
|
||||
|
||||
private const string RADIANT_CRYSTAL = "Radiant_Crystal_";
|
||||
|
||||
private const string GLEAMING_GEM_V2 = "Gleaming_Gem_v2_";
|
||||
|
||||
private const string RADIANT_CRYSTAL_V2 = "Radiant_Crystal_v2_";
|
||||
|
||||
public override bool IsTargetIndicate => false;
|
||||
|
||||
public override bool IsAllowDestroyTarget => true;
|
||||
@@ -175,7 +156,7 @@ public class Skill_token_draw : SkillBase
|
||||
{
|
||||
string[] source = text.Replace(")", "").Replace("(", "").Split(':');
|
||||
int classType = 0;
|
||||
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
|
||||
DataMgr dataMgr = SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr.GameMgr.GetDataMgr();
|
||||
foreach (BattleCardBase targetCard in targetCards)
|
||||
{
|
||||
classType = (targetCard.IsPlayer ? dataMgr.GetPlayerClassId() : dataMgr.GetEnemyClassId());
|
||||
@@ -301,7 +282,7 @@ public class Skill_token_draw : SkillBase
|
||||
{
|
||||
IsVisibleTarget = true;
|
||||
}
|
||||
vfxWithLoading.RegisterToMainVfx(new DrawTokenVfx(drawList, vfxWithLoading2.MainVfx, playerSide, IsVisibleTarget));
|
||||
vfxWithLoading.RegisterToMainVfx(NullVfx.GetInstance());
|
||||
vfxWithLoading.RegisterToLoadingVfx(vfxWithLoading2.LoadingVfx);
|
||||
vfxWithLoading.RegisterToMainVfx(InstantVfx.Create(delegate
|
||||
{
|
||||
@@ -344,7 +325,7 @@ public class Skill_token_draw : SkillBase
|
||||
|
||||
public virtual bool IsVisibleDrawSkillTarget(BattlePlayerBase selfBattlePlayer, CallParameter parameter)
|
||||
{
|
||||
if (!selfBattlePlayer.IsPlayer && !GameMgr.GetIns().IsAdminWatch)
|
||||
if (!selfBattlePlayer.IsPlayer && !SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr.GameMgr.IsAdminWatch)
|
||||
{
|
||||
if (parameter.targetCards.Count() > 0)
|
||||
{
|
||||
@@ -395,7 +376,7 @@ public class Skill_token_draw : SkillBase
|
||||
{
|
||||
continue;
|
||||
}
|
||||
int index = (BattleManagerBase.IsRandomDraw ? base.SkillPrm.selfBattlePlayer.BattleMgr.StableRandom(list.Count) : num2);
|
||||
int index = (base.SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr.InstanceIsRandomDraw ? base.SkillPrm.selfBattlePlayer.BattleMgr.StableRandom(list.Count) : num2);
|
||||
int id = list[index];
|
||||
if (!allowDuplication)
|
||||
{
|
||||
@@ -408,7 +389,8 @@ public class Skill_token_draw : SkillBase
|
||||
|
||||
public static VfxWithLoading CreateTokenSpawnVfx(SkillBase skill, BattleCardBase firstToken)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
// Static helper with `skill` param — route through skill.SkillPrm rather than instance SkillPrm.
|
||||
if (skill.SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr.IsRecovery)
|
||||
{
|
||||
return NullVfxWithLoading.GetInstance();
|
||||
}
|
||||
@@ -426,7 +408,7 @@ public class Skill_token_draw : SkillBase
|
||||
_ => Color.clear,
|
||||
};
|
||||
string text = "cmn_token_draw_1";
|
||||
DataMgr.SpecialBattleSetting specialBattleSettingInfo = GameMgr.GetIns().GetDataMgr().SpecialBattleSettingInfo;
|
||||
DataMgr.SpecialBattleSetting specialBattleSettingInfo = skill.SkillPrm.ownerCard.SelfBattlePlayer.BattleMgr.GameMgr.GetDataMgr().SpecialBattleSettingInfo;
|
||||
if (specialBattleSettingInfo != null && specialBattleSettingInfo.TokenDrawOverrideEffectPair.ContainsKey(firstToken.CardId))
|
||||
{
|
||||
text = specialBattleSettingInfo.TokenDrawOverrideEffectPair[firstToken.CardId];
|
||||
|
||||
Reference in New Issue
Block a user