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>
211 lines
4.7 KiB
C#
211 lines
4.7 KiB
C#
using System.Collections.Generic;
|
|
|
|
namespace Wizard;
|
|
|
|
public class AISelectedTargetInfoSet
|
|
{
|
|
public static readonly int LENGTH = 2;
|
|
|
|
private AISelectedTargetInfo[] _set;
|
|
|
|
public AISelectedTargetInfo PreprocessTarget { get; private set; }
|
|
|
|
public AISelectedTargetInfo ChoiceTarget { get; private set; }
|
|
|
|
public bool HasChoiceTarget
|
|
{
|
|
get
|
|
{
|
|
if (ChoiceTarget != null)
|
|
{
|
|
return ChoiceTarget.HasTarget;
|
|
}
|
|
return false;
|
|
}
|
|
}
|
|
|
|
public AISelectedTargetInfoSet()
|
|
{
|
|
_set = new AISelectedTargetInfo[LENGTH];
|
|
}
|
|
|
|
public AISelectedTargetInfoSet Clone()
|
|
{
|
|
return new AISelectedTargetInfoSet(this);
|
|
}
|
|
|
|
private AISelectedTargetInfoSet(AISelectedTargetInfoSet set)
|
|
{
|
|
_set = new AISelectedTargetInfo[LENGTH];
|
|
for (int i = 0; i < LENGTH; i++)
|
|
{
|
|
AISelectedTargetInfo aISelectedTargetInfo = set.Get(i);
|
|
_set[i] = aISelectedTargetInfo;
|
|
}
|
|
PreprocessTarget = set.PreprocessTarget;
|
|
ChoiceTarget = set.ChoiceTarget;
|
|
}
|
|
|
|
public AISelectedTargetInfo Get(int index)
|
|
{
|
|
if (index < 0 || index > 1)
|
|
{
|
|
return null;
|
|
}
|
|
return _set[index];
|
|
}
|
|
|
|
public void Set(AISelectedTargetInfo info, int index)
|
|
{
|
|
if (index >= 0 && index <= 1)
|
|
{
|
|
_set[index] = info;
|
|
}
|
|
}
|
|
|
|
public void SetPreprocessTarget(AISelectedTargetInfo info)
|
|
{
|
|
PreprocessTarget = info;
|
|
}
|
|
|
|
public void SetChoiceTarget(AISelectedTargetInfo info)
|
|
{
|
|
ChoiceTarget = info;
|
|
}
|
|
|
|
public bool IsTargetExist(int index)
|
|
{
|
|
if (index < 0 || index > 1)
|
|
{
|
|
return false;
|
|
}
|
|
return _set[index]?.HasTarget ?? false;
|
|
}
|
|
|
|
public bool IsAnyTargetExists()
|
|
{
|
|
if (PreprocessTarget != null && PreprocessTarget.HasTarget)
|
|
{
|
|
return true;
|
|
}
|
|
if (HasChoiceTarget)
|
|
{
|
|
return true;
|
|
}
|
|
AISelectedTargetInfo[] set = _set;
|
|
foreach (AISelectedTargetInfo aISelectedTargetInfo in set)
|
|
{
|
|
if (aISelectedTargetInfo != null && aISelectedTargetInfo.HasTarget)
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
public AISelectedTargetInfo GetChoiceInfo()
|
|
{
|
|
if (HasChoiceTarget)
|
|
{
|
|
return ChoiceTarget;
|
|
}
|
|
AISelectedTargetInfo[] set = _set;
|
|
foreach (AISelectedTargetInfo aISelectedTargetInfo in set)
|
|
{
|
|
if (aISelectedTargetInfo != null && aISelectedTargetInfo.Type == TargetSelectType.Choice)
|
|
{
|
|
return aISelectedTargetInfo;
|
|
}
|
|
}
|
|
return null;
|
|
}
|
|
|
|
public AISelectedTargetInfoSet GetSimilarTargetInfoSet(AIVirtualField field)
|
|
{
|
|
AISelectedTargetInfoSet aISelectedTargetInfoSet = new AISelectedTargetInfoSet();
|
|
if (PreprocessTarget != null)
|
|
{
|
|
AISelectedTargetInfo similarTargetInfo = PreprocessTarget.GetSimilarTargetInfo(field);
|
|
aISelectedTargetInfoSet.SetPreprocessTarget(similarTargetInfo);
|
|
}
|
|
if (ChoiceTarget != null)
|
|
{
|
|
AISelectedTargetInfo similarTargetInfo2 = ChoiceTarget.GetSimilarTargetInfo(field);
|
|
aISelectedTargetInfoSet.SetChoiceTarget(similarTargetInfo2);
|
|
}
|
|
for (int i = 0; i < _set.Length; i++)
|
|
{
|
|
AISelectedTargetInfo aISelectedTargetInfo = _set[i];
|
|
AISelectedTargetInfo info = null;
|
|
if (aISelectedTargetInfo != null)
|
|
{
|
|
info = aISelectedTargetInfo.GetSimilarTargetInfo(field);
|
|
}
|
|
aISelectedTargetInfoSet.Set(info, i);
|
|
}
|
|
return aISelectedTargetInfoSet;
|
|
}
|
|
|
|
public bool IsDuplicate(AISelectedTargetInfoSet compare)
|
|
{
|
|
if (compare == null)
|
|
{
|
|
return false;
|
|
}
|
|
if (PreprocessTarget == null)
|
|
{
|
|
if (compare.PreprocessTarget != null)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else if (!PreprocessTarget.IsDuplicate(compare.PreprocessTarget))
|
|
{
|
|
return false;
|
|
}
|
|
if (ChoiceTarget == null)
|
|
{
|
|
if (compare.ChoiceTarget != null)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else if (!ChoiceTarget.IsDuplicate(compare.ChoiceTarget))
|
|
{
|
|
return false;
|
|
}
|
|
for (int i = 0; i < LENGTH; i++)
|
|
{
|
|
AISelectedTargetInfo aISelectedTargetInfo = _set[i];
|
|
AISelectedTargetInfo aISelectedTargetInfo2 = compare.Get(i);
|
|
if (aISelectedTargetInfo == null)
|
|
{
|
|
if (aISelectedTargetInfo2 != null)
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
else if (!aISelectedTargetInfo.IsDuplicate(aISelectedTargetInfo2))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
public void UpdateRemovalType(AIScriptTokenArgType whichTarget, AIRemovalType removalType)
|
|
{
|
|
if (whichTarget != AIScriptTokenArgType.TARGET_SELECT && whichTarget != AIScriptTokenArgType.SECOND_TARGET_SELECT)
|
|
{
|
|
AIConsoleUtility.LogError($"whichTarget=={whichTarget} is invalid!!");
|
|
return;
|
|
}
|
|
int num = ((whichTarget != AIScriptTokenArgType.TARGET_SELECT) ? 1 : 0);
|
|
AISelectedTargetInfo aISelectedTargetInfo = _set[num];
|
|
if (aISelectedTargetInfo != null)
|
|
{
|
|
aISelectedTargetInfo.RemovalType = removalType;
|
|
}
|
|
}
|
|
}
|