SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
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
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
SVSim.BattleEngine/Engine/SingleBattleMgr.cs
View File

@@ -12,8 +12,6 @@ public class SingleBattleMgr : BattleManagerBase
{
private bool? _isPlayerFirstTurn;
public IBattleMgrContentsCreator ContentsCreator => _contentsCreator;
public AIBattleInfoReceiver BattleInfoReceiver { get; protected set; }
public event Action OnBattleRetire;
@@ -23,6 +21,13 @@ public class SingleBattleMgr : BattleManagerBase
{
}
// Phase-5 chunk 45: overload accepting a pre-seeded GameMgr so test fixtures can construct
// with a chara-id/net-user-seeded GameMgr without going through the ambient bridge.
public SingleBattleMgr(IBattleMgrContentsCreator contentsCreator, GameMgr gameMgr)
: base(contentsCreator, gameMgr)
{
}
public override IInnerOptionsBuilder CreateEnemyInnerOptionsBuilder()
{
return new EnemyAIInnerOptionsBuilder();
@@ -60,7 +65,7 @@ public class SingleBattleMgr : BattleManagerBase
{
SetUpStoryPlayerTurnStartEmote();
}
switch (GameMgr.GetIns().GetDataMgr().m_BattleType)
switch (this.GameMgr.GetDataMgr().m_BattleType)
{
case DataMgr.BattleType.BossRushQuest:
case DataMgr.BattleType.SecretBossQuest:
@@ -75,7 +80,7 @@ public class SingleBattleMgr : BattleManagerBase
private void SetUpBossRushSpecialSkill()
{
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
DataMgr dataMgr = this.GameMgr.GetDataMgr();
DataMgr.SpecialBattleSetting specialBattleSettingInfo = dataMgr.SpecialBattleSettingInfo;
BossRushBattleData bossRushBattleData = dataMgr.BossRushBattleData;
if (specialBattleSettingInfo == null || bossRushBattleData == null)
@@ -202,7 +207,7 @@ public class SingleBattleMgr : BattleManagerBase
private void SetUpStorySpecialBattle()
{
DataMgr.SpecialBattleSetting specialBattleSettingInfo = GameMgr.GetIns().GetDataMgr().SpecialBattleSettingInfo;
DataMgr.SpecialBattleSetting specialBattleSettingInfo = this.GameMgr.GetDataMgr().SpecialBattleSettingInfo;
if (specialBattleSettingInfo != null)
{
_isPlayerFirstTurn = specialBattleSettingInfo.IsPlayerFirstTurn;
@@ -243,11 +248,6 @@ public class SingleBattleMgr : BattleManagerBase
return list;
}
public void SingleBattleFirstRecoverySetting()
{
StartRecoveryRecording();
}
protected override void FirstRecoverySetting()
{
EmotionDataSetting();
@@ -255,7 +255,7 @@ public class SingleBattleMgr : BattleManagerBase
private void EmotionDataSetting()
{
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
DataMgr dataMgr = this.GameMgr.GetDataMgr();
if (dataMgr.m_BattleType != DataMgr.BattleType.Story)
{
if (dataMgr.m_BattleType == DataMgr.BattleType.Quest)
@@ -316,7 +316,7 @@ public class SingleBattleMgr : BattleManagerBase
public override void SetupEnemyAI()
{
EnemyAI enemyAI = new SoloBattleEnemyAI();
EnemyAI enemyAI = new SoloBattleEnemyAI(this);
enemyAI.LoadBufferedBattleState();
EnemyAI = enemyAI;
BattleInfoReceiver = new AIBattleInfoReceiver(EnemyAI);
@@ -330,8 +330,8 @@ public class SingleBattleMgr : BattleManagerBase
public override void SetupInitialGameState(bool isPlayerFirstTurn, bool isRandomDraw, int playerMaxLife, int enemyMaxLife)
{
enemyMaxLife = AITestGlobal.AI_MAX_LIFE;
DataMgr dataMgr = GameMgr.GetIns().GetDataMgr();
DataMgr dataMgr = this.GameMgr.GetDataMgr();
enemyMaxLife = dataMgr.m_EnemyAIMaxLife;
DataMgr.SpecialBattleSetting specialBattleSettingInfo = dataMgr.SpecialBattleSettingInfo;
if ((dataMgr.m_BattleType == DataMgr.BattleType.Story || dataMgr.IsQuestBattleType()) && specialBattleSettingInfo != null)
{
@@ -363,12 +363,11 @@ public class SingleBattleMgr : BattleManagerBase
BattlePlayer.Class.ApplyDamage(null, new BattleCardBase.DamageParam(specialBattleSettingInfo.PlayerStartMaxLife - specialBattleSettingInfo.PlayerStartLife, BattlePlayer.Class), doesAttackerPossessKiller: false, isReflectedDamage: false, null, null);
}
}
AITestGlobal.AI_MAX_LIFE = 20;
}
public override void FinishBattle()
{
GameMgr.GetIns().GetDataMgr().ClearSpecialBattleSettingInfo();
this.GameMgr.GetDataMgr().ClearSpecialBattleSettingInfo();
EnemyAI.StopEnemyAI();
}
@@ -389,9 +388,9 @@ public class SingleBattleMgr : BattleManagerBase
public override void PlayRetire()
{
if (RecoveryRecordManagerBase.IsExistsSingleRecoveryFile() && GameMgr.GetIns().GetDataMgr().BossRushBattleData == null)
if (RecoveryRecordManagerBase.IsExistsSingleRecoveryFile() && this.GameMgr.GetDataMgr().BossRushBattleData == null)
{
GameMgr.GetIns().GetDataMgr().SetRecoveryData(RecoveryOperationInfo.ReadRecoveryFile(OperationRecorderBase.RecordDirectoryPath + "recovery_single.json"));
this.GameMgr.GetDataMgr().SetRecoveryData(RecoveryOperationInfo.ReadRecoveryFile(OperationRecorderBase.RecordDirectoryPath + "recovery_single.json"));
RecoveryRecordManagerBase.DeleteRecoveryFile();
}
base.PlayRetire();