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
@@ -30,13 +30,6 @@ public class AttackSelectControl
|
||||
_isReady = attackPairCard._isReady;
|
||||
_hasStartedMoving = attackPairCard._hasStartedMoving;
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
_battleCardView = null;
|
||||
_isReady = false;
|
||||
_hasStartedMoving = false;
|
||||
}
|
||||
}
|
||||
|
||||
public AttackPairCard _attackInitiator;
|
||||
@@ -66,21 +59,6 @@ public class AttackSelectControl
|
||||
_attackInitiator = new AttackPairCard(attackPair._attackInitiator);
|
||||
_attackTarget = new AttackPairCard(attackPair._attackTarget);
|
||||
}
|
||||
|
||||
public bool Compare(IBattleCardView attackInitiatorView, IBattleCardView attackTargetView)
|
||||
{
|
||||
if (_attackInitiator._battleCardView == attackInitiatorView)
|
||||
{
|
||||
return _attackTarget._battleCardView == attackTargetView;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void Clear()
|
||||
{
|
||||
_attackInitiator.Clear();
|
||||
_attackTarget.Clear();
|
||||
}
|
||||
}
|
||||
|
||||
public class WaitUntilAttackPairIsReadyVfx : VfxBase
|
||||
@@ -107,24 +85,12 @@ public class AttackSelectControl
|
||||
}
|
||||
}
|
||||
|
||||
private BattleCardBase currentAttackInitiatorBattleCard;
|
||||
|
||||
private bool areAttackPairsBeingUpdated;
|
||||
|
||||
private readonly AttackPair currentAttackPair = new AttackPair(null, null);
|
||||
|
||||
private readonly List<AttackPair> successfulAttackPairs = new List<AttackPair>();
|
||||
|
||||
public const float Z_FLOAT_AMOUNT = -100f;
|
||||
|
||||
private const float EPSILON = 0.1f;
|
||||
|
||||
private const float SMOOTHING_AMOUNT = 0.01f;
|
||||
|
||||
private const float DECAY_MULTIPLIER = 10f;
|
||||
|
||||
private const float IDLING_POSITION = 0.025390625f;
|
||||
|
||||
private IBattleCardView currentAttackInitiator
|
||||
{
|
||||
get
|
||||
@@ -149,55 +115,6 @@ public class AttackSelectControl
|
||||
}
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
float t = MotionUtils.CalculateFrameRateIndependantDampingConstant(0.01f, 10f);
|
||||
if (currentAttackInitiator != null && !currentAttackInitiator._attackTargetSelectInfo.IsCardInvolvedInAttack)
|
||||
{
|
||||
MoveCardUpwards(currentAttackPair._attackInitiator, t);
|
||||
}
|
||||
if (currentAttackTarget != null && !currentAttackTarget._attackTargetSelectInfo.IsCardInvolvedInAttack)
|
||||
{
|
||||
MoveCardUpwards(currentAttackPair._attackTarget, t);
|
||||
}
|
||||
}
|
||||
|
||||
public void RegisterAttackInitiator(BattleCardBase attackInitiatorCard, BattlePlayerBase opponentBattlePlayer)
|
||||
{
|
||||
currentAttackInitiatorBattleCard = attackInitiatorCard;
|
||||
currentAttackInitiator = attackInitiatorCard.BattleCardView;
|
||||
ToggleAttackableCardFrameEffects(isEnabled: true, opponentBattlePlayer);
|
||||
attackInitiatorCard.BattleCardView._attackTargetSelectInfo._isBeingSelectedInAttack = true;
|
||||
if (!attackInitiatorCard.BattleCardView._attackTargetSelectInfo.IsCardInvolvedInAttack)
|
||||
{
|
||||
ResetCardOrientationAndStopMovement(attackInitiatorCard.BattleCardView);
|
||||
}
|
||||
}
|
||||
|
||||
public void RegisterAttackTarget(IBattleCardView attackTargetCard)
|
||||
{
|
||||
if (currentAttackTarget == attackTargetCard)
|
||||
{
|
||||
return;
|
||||
}
|
||||
if (attackTargetCard != null)
|
||||
{
|
||||
attackTargetCard._attackTargetSelectInfo._isBeingSelectedInAttack = true;
|
||||
if (!attackTargetCard._attackTargetSelectInfo.IsCardInvolvedInAttack)
|
||||
{
|
||||
ResetCardOrientationAndStopMovement(attackTargetCard);
|
||||
}
|
||||
}
|
||||
currentAttackPair._attackTarget._isReady = !IsCardTranslatable(attackTargetCard);
|
||||
currentAttackPair._attackTarget._hasStartedMoving = !IsCardTranslatable(attackTargetCard);
|
||||
ResetCardPosition(currentAttackTarget);
|
||||
if (currentAttackTarget != null)
|
||||
{
|
||||
currentAttackTarget._attackTargetSelectInfo._isBeingSelectedInAttack = false;
|
||||
}
|
||||
currentAttackTarget = attackTargetCard;
|
||||
}
|
||||
|
||||
public virtual void RegisterAttackPair(AttackPair attackPair)
|
||||
{
|
||||
IBattleCardView battleCardView = attackPair._attackInitiator._battleCardView;
|
||||
@@ -217,34 +134,6 @@ public class AttackSelectControl
|
||||
}
|
||||
}
|
||||
|
||||
public void CancelAttackSelect(bool wasAttackSuccessful, BattlePlayerBase opponentBattlePlayer)
|
||||
{
|
||||
if (wasAttackSuccessful)
|
||||
{
|
||||
AttackPair attackPair = new AttackPair(currentAttackPair);
|
||||
RegisterAttackPair(attackPair);
|
||||
}
|
||||
else
|
||||
{
|
||||
ResetCardPosition(currentAttackInitiator);
|
||||
ResetCardPosition(currentAttackTarget);
|
||||
}
|
||||
if (currentAttackInitiatorBattleCard != null)
|
||||
{
|
||||
ToggleAttackableCardFrameEffects(isEnabled: false, opponentBattlePlayer);
|
||||
}
|
||||
if (currentAttackInitiator != null)
|
||||
{
|
||||
currentAttackInitiator._attackTargetSelectInfo._isBeingSelectedInAttack = false;
|
||||
}
|
||||
if (currentAttackTarget != null)
|
||||
{
|
||||
currentAttackTarget._attackTargetSelectInfo._isBeingSelectedInAttack = false;
|
||||
}
|
||||
currentAttackInitiatorBattleCard = null;
|
||||
currentAttackPair.Clear();
|
||||
}
|
||||
|
||||
public void ResetCardOrientationAndStopMovement(IBattleCardView targetCard)
|
||||
{
|
||||
if (!targetCard._attackTargetSelectInfo.IsUneffectedByAttackTargetting)
|
||||
@@ -294,13 +183,6 @@ public class AttackSelectControl
|
||||
|
||||
private void ResetCardPosition(IBattleCardView targetCard)
|
||||
{
|
||||
if (!BattleManagerBase.GetIns().IsRecovery && IsCardTranslatable(targetCard) && !targetCard._attackTargetSelectInfo.IsCardInvolvedInAttack && !targetCard._attackTargetSelectInfo.IsUneffectedByAttackTargetting)
|
||||
{
|
||||
ImmediateVfxMgr.GetInstance().Register(SequentialVfxPlayer.Create(InstantVfx.Create(delegate
|
||||
{
|
||||
iTween.Stop(targetCard.CardWrapObject);
|
||||
}), new DelaySetupVfx(() => (targetCard._attackTargetSelectInfo._isBeingSelectedInAttack || targetCard._attackTargetSelectInfo.IsCardInvolvedInAttack) ? ((VfxBase)NullVfx.GetInstance()) : ((VfxBase)new FallToGroundVfx(targetCard.CardWrapObject)))));
|
||||
}
|
||||
}
|
||||
|
||||
public virtual void StartCardIdling(IBattleCardView battleCardView)
|
||||
@@ -309,47 +191,6 @@ public class AttackSelectControl
|
||||
iTween.MoveAdd(battleCardView.CardWrapObject, iTween.Hash("z", 0.025390625f, "time", Random.Range(0.5f, 0.6f), "looptype", iTween.LoopType.pingPong, "easetype", iTween.EaseType.easeInOutQuad));
|
||||
}
|
||||
|
||||
public virtual VfxBase RemoveAttackPairVfx(IBattleCardView attackInitiator, IBattleCardView attackTarget)
|
||||
{
|
||||
AttackPair attackPairToRemove = null;
|
||||
for (int i = 0; i < successfulAttackPairs.Count; i++)
|
||||
{
|
||||
if (successfulAttackPairs[i].Compare(attackInitiator, attackTarget))
|
||||
{
|
||||
attackPairToRemove = successfulAttackPairs[i];
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (attackPairToRemove != null)
|
||||
{
|
||||
VfxBase vfxBase = CreateWaitUntilAttackPairIsReadyVfx(attackPairToRemove);
|
||||
VfxBase vfxBase2 = InstantVfx.Create(delegate
|
||||
{
|
||||
successfulAttackPairs.Remove(attackPairToRemove);
|
||||
});
|
||||
return SequentialVfxPlayer.Create(vfxBase, vfxBase2);
|
||||
}
|
||||
return NullVfx.GetInstance();
|
||||
}
|
||||
|
||||
private void ToggleAttackableCardFrameEffects(bool isEnabled, BattlePlayerBase opponentBattlePlayer)
|
||||
{
|
||||
List<BattleCardBase> classAndInPlayCardList = opponentBattlePlayer.ClassAndInPlayCardList;
|
||||
for (int i = 0; i < classAndInPlayCardList.Count; i++)
|
||||
{
|
||||
if (CanCardAttackTarget(currentAttackInitiatorBattleCard, classAndInPlayCardList[i], opponentBattlePlayer.InPlayCards) && classAndInPlayCardList[i].AreCanBeAttackedConditionsFulfilled)
|
||||
{
|
||||
classAndInPlayCardList[i].BattleCardView._inPlayFrameEffect.ToggleTargetSelectEffect(isEnabled);
|
||||
}
|
||||
}
|
||||
currentAttackInitiator._inPlayFrameEffect.ToggleTargetSelectEffect(isEnabled, isAttackTargetSelectInitiator: true);
|
||||
}
|
||||
|
||||
private VfxBase CreateWaitUntilAttackPairIsReadyVfx(AttackPair attackPair)
|
||||
{
|
||||
return new WaitUntilAttackPairIsReadyVfx(attackPair);
|
||||
}
|
||||
|
||||
private IEnumerator UpdateAttackPairs()
|
||||
{
|
||||
areAttackPairsBeingUpdated = true;
|
||||
@@ -380,7 +221,7 @@ public class AttackSelectControl
|
||||
|
||||
private void MoveCardUpwards(AttackPair.AttackPairCard attackPairCard, float t)
|
||||
{
|
||||
if (BattleManagerBase.GetIns().IsRecovery)
|
||||
if (false /* Pre-Phase-5b: IsRecovery guard headless-safe as false */)
|
||||
{
|
||||
attackPairCard._isReady = true;
|
||||
}
|
||||
@@ -508,15 +349,6 @@ public class AttackSelectControl
|
||||
return true;
|
||||
}
|
||||
|
||||
public static bool IsAttackPossible(BattleCardBase attacker, BattleCardBase target, IEnumerable<BattleCardBase> opponentInPlayCards)
|
||||
{
|
||||
if (attacker.Attackable)
|
||||
{
|
||||
return CanCardAttackTarget(attacker, target, opponentInPlayCards);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public static bool IsAttackPossible(AIVirtualCard attacker, AIVirtualCard target, BattlePlayerBase opponent)
|
||||
{
|
||||
if (attacker.BaseCard.Attackable)
|
||||
|
||||
Reference in New Issue
Block a user