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

48
SVSim.BattleEngine/Engine/ClassBattleCardBase.cs
View File

@@ -47,8 +47,6 @@ public abstract class ClassBattleCardBase : BattleCardBase
protected readonly ClassBuildInfo _classBuildInfo;
private readonly ClassBattleCardViewBase _classCardView;
protected int _baseMaxLife;
public int BossRushStartLife;
@@ -89,18 +87,6 @@ public abstract class ClassBattleCardBase : BattleCardBase
}
}
public int CharaId
{
get
{
if (!_classBuildInfo.isPlayer)
{
return GameMgr.GetIns().GetDataMgr().GetEnemyCharaId();
}
return GameMgr.GetIns().GetDataMgr().GetPlayerCharaId();
}
}
public override bool Attackable => false;
public override bool IsClass => true;
@@ -199,10 +185,10 @@ public abstract class ClassBattleCardBase : BattleCardBase
DefaultDamage = new DamageInfo(skill, damage),
FixedDamage = new DamageInfo(skill, damage2)
};
BattleManagerBase ins = BattleManagerBase.GetIns();
BattleManagerBase ins = _buildInfo.BattleMgr;
base.SkillApplyInformation.DamageLife(damageParam.Damage, ins.CurrentTurn, ins.BattlePlayer.IsSelfTurn);
SequentialVfxPlayer sequentialVfxPlayer = SequentialVfxPlayer.Create();
sequentialVfxPlayer.Register(ParallelVfxPlayer.Create(CreateVfxWithCardPlayabilityRefresh(base.VfxCreator.CreateDamage(damageParam.Damage, base.Life, base.MaxLife, BaseMaxLife, isReflectedDamage, isSkillDamage)), parallelVfxPlayer));
sequentialVfxPlayer.Register(ParallelVfxPlayer.Create(CreateVfxWithCardPlayabilityRefresh(NullVfx.GetInstance()), parallelVfxPlayer));
SequentialVfxPlayer sequentialVfxPlayer2 = SequentialVfxPlayer.Create();
if (IsDead)
{
@@ -218,10 +204,10 @@ public abstract class ClassBattleCardBase : BattleCardBase
public override HealResult ApplyHealing(HealParam healParam, SkillProcessor skillProcessor)
{
BattleManagerBase ins = BattleManagerBase.GetIns();
BattleManagerBase ins = _buildInfo.BattleMgr;
int num = HealLife(healParam.HealAmount, ins.CurrentTurn, ins.BattlePlayer.IsSelfTurn);
SequentialVfxPlayer sequentialVfxPlayer = SequentialVfxPlayer.Create();
sequentialVfxPlayer.Register(CreateVfxWithCardPlayabilityRefresh(base.VfxCreator.CreateHealing(num, base.Life, base.MaxLife, BaseMaxLife)));
sequentialVfxPlayer.Register(CreateVfxWithCardPlayabilityRefresh(NullVfx.GetInstance()));
new SkillConditionCheckerOption().HealingCardAndValue = new List<BattlePlayerBase.CardAndValue>
{
new BattlePlayerBase.CardAndValue(this, num)
@@ -239,25 +225,15 @@ public abstract class ClassBattleCardBase : BattleCardBase
return base.SelfBattlePlayer.BattleView.HandView.HandUnfocus();
}
private VfxBase CreatePullHandOutVfx()
{
if (base.IsSelfTurn)
{
return base.SelfBattlePlayer.BattleView.HandView.HandFocus();
}
return NullVfx.GetInstance();
}
public VfxBase DestroyBySpecialWin()
{
return ((ClassCardVfxCreatorBase)base.VfxCreator).CreateDestroy(base.DeathTypeInfo, base.SelfBattlePlayer);
return NullVfx.GetInstance();
}
public VfxBase Retire()
{
SequentialVfxPlayer sequentialVfxPlayer = SequentialVfxPlayer.Create();
sequentialVfxPlayer.Register(this.OnRetire.GetAllFuncVfxResults(this, new SkillProcessor()));
sequentialVfxPlayer.Register(((ClassCardVfxCreatorBase)base.VfxCreator).CreateRetire(base.SelfBattlePlayer));
return sequentialVfxPlayer;
}
@@ -297,19 +273,19 @@ public abstract class ClassBattleCardBase : BattleCardBase
{
HealLife(num4, base.SelfBattlePlayer.Turn, base.SelfBattlePlayer.IsSelfTurn);
}
sequentialVfxPlayer.Register(new LoadAndPlayEffectVfx(fileName, criSeName, base.SelfBattlePlayer.BattleMgr.IsRecovery ? null : base.BattleCardView.Transform, waitTime));
sequentialVfxPlayer.Register(VfxWithLoadingSequential.Create());
HealParam healParam = new HealParam(num, this, this, applyModifier: false);
HealResult healResult = ApplyHealing(healParam, new SkillProcessor());
sequentialVfxPlayer.Register(healResult.PrehealVfxVfx);
sequentialVfxPlayer.Register(healResult.HealVfx);
sequentialVfxPlayer.Register(healResult.PosthealVfxVfx);
base.SkillApplyInformation.DepriveLifeZeroActivateLeonSkill();
sequentialVfxPlayer.Register(new LoadAndPlayEffectVfx(fileName2, criSeName2, Vector3.zero, waitTime2));
sequentialVfxPlayer.Register(VfxWithLoadingSequential.Create());
for (int i = 0; i < list.Count; i++)
{
if (list[i].SkillApplyInformation.IsIndependent)
{
sequentialVfxPlayer.Register(new OneShotHeavenlyAegisPlayVfx(list[i].BattleCardView));
sequentialVfxPlayer.Register(NullVfx.GetInstance());
continue;
}
list[i].FlagCardAsDestroyedBySkill();
@@ -321,7 +297,7 @@ public abstract class ClassBattleCardBase : BattleCardBase
BattlePlayerBase.SummonInfo summonInfo = new BattlePlayerBase.SummonInfo(base.SelfBattlePlayer.IsPlayer, summonedCardsList, SkillBaseSummon.SUMMON_TYPE.TOKEN);
VfxWithLoadingSequential vfxWithLoadingToRegister = base.SelfBattlePlayer.CardManagement(null, new SkillProcessor(), BattlePlayerBase.CARD_MANAGEMENT.SUMMON, isRandom: false, null, null, null, summonInfo) as VfxWithLoadingSequential;
base.SelfBattlePlayer.UpdateHandCardsPlayability();
StartPickMultiCardVfx vfxToRegister = new StartPickMultiCardVfx(summonedCardsList, BattleManagerBase.GetIns().BattleResourceMgr, base.SelfBattlePlayer.IsPlayer, isToken: true, isIgnoreVoice: false, isRandomVoice: false, isGetoff: false, isEvoVoice: false, 0f);
StartPickMultiCardVfx vfxToRegister = new StartPickMultiCardVfx(summonedCardsList, _buildInfo.BattleMgr.BattleResourceMgr, base.SelfBattlePlayer.IsPlayer, isToken: true, isIgnoreVoice: false, isRandomVoice: false, isGetoff: false, isEvoVoice: false, 0f);
if (!base.SelfBattlePlayer.BattleMgr.IsVirtualBattle)
{
BattleLogManager.GetInstance().BeginLogBlockTurnChangeReactive();
@@ -351,7 +327,7 @@ public abstract class ClassBattleCardBase : BattleCardBase
public override VfxBase RecoveryInPlay(int inPlayIndex, bool newReplayMoveTurn = false)
{
return SequentialVfxPlayer.Create(base.BattleCardView.RecoveryInPlay(), new RefreshHealthVfx(base.SelfBattlePlayer));
return SequentialVfxPlayer.Create(base.BattleCardView.RecoveryInPlay(), NullVfx.GetInstance());
}
public override BattleCardBase VirtualClone(BattlePlayerBase virtualSelfBattlePlayer, BattlePlayerBase virtualOpponentBattlePlayer)
@@ -380,8 +356,8 @@ public abstract class ClassBattleCardBase : BattleCardBase
return new BuildInfo(null, 0, classBuildInfo.selfBattlePlayer, classBuildInfo.opponentBattlePlayer, classBuildInfo.selfBattlePlayer, _isPlayer: classBuildInfo.isPlayer, _innerOptions: new CardInnerOptionsBase(), _normalSkillBuildInfos: _sharedEmptySkillInfo.normalSkillBuildInfos, _evolveSkillBuildInfos: _sharedEmptySkillInfo.evolveSkillBuildInfos, _battleCardIndex: 0, _battleMgr: classBuildInfo.battleMgr, _resourceMgr: classBuildInfo.resourceMgr);
}
protected override ISkillApplyInformation CreateSkillApplyInformation(BattleCardBase card, ICardVfxCreator vfxCreator)
protected override ISkillApplyInformation CreateSkillApplyInformation(BattleCardBase card)
{
return new ClassSkillApplyInformation(card, vfxCreator);
return new ClassSkillApplyInformation(card);
}
}