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
@@ -49,19 +49,8 @@ public class MyRotationInfo
|
||||
IconName = "my_rotation_ability_icon_" + abilityId;
|
||||
DarkIconName = "my_rotation_ability_icon_dark_" + abilityId;
|
||||
}
|
||||
|
||||
public static bool IsEqual(MyRotationBonus left, MyRotationBonus right)
|
||||
{
|
||||
if (left.AbilityId == right.AbilityId && left.OriginalAbilityText == right.OriginalAbilityText && left.AddStartPp == right.AddStartPp && left.AddStartLife == right.AddStartLife && left.IncreaseAddPptotalTurn == right.IncreaseAddPptotalTurn)
|
||||
{
|
||||
return left.IncreaseAddPptotalAmount == right.IncreaseAddPptotalAmount;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private const int NEMESIS_START_PACK_NUMBER = 7;
|
||||
|
||||
private List<UnlimitedRestrictedCard> _restrictedCardData = new List<UnlimitedRestrictedCard>();
|
||||
|
||||
private List<int> _rePrintCardList = new List<int>();
|
||||
@@ -72,10 +61,6 @@ public class MyRotationInfo
|
||||
|
||||
public string PackSelectText { get; private set; }
|
||||
|
||||
public string FirstPackId { get; private set; }
|
||||
|
||||
public string LastPackId { get; private set; }
|
||||
|
||||
public string LastPackText { get; private set; }
|
||||
|
||||
public List<string> AbilityIdList { get; private set; }
|
||||
@@ -86,22 +71,6 @@ public class MyRotationInfo
|
||||
|
||||
public bool IsEnableNemesis { get; private set; }
|
||||
|
||||
public static bool IsEqualAbility(MyRotationInfo left, MyRotationInfo right)
|
||||
{
|
||||
if (left.Abilities.Count != right.Abilities.Count)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
for (int i = 0; i < left.Abilities.Count; i++)
|
||||
{
|
||||
if (!MyRotationBonus.IsEqual(left.Abilities[i], right.Abilities[i]))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
public MyRotationInfo(JsonData json)
|
||||
{
|
||||
Id = json["rotation_id"].ToString();
|
||||
@@ -109,84 +78,11 @@ public class MyRotationInfo
|
||||
AbilityIdList = new List<string>(json["abilities"].ToString().Split('|'));
|
||||
}
|
||||
|
||||
public void ParseRestrictJson(JsonData rotationRoot)
|
||||
{
|
||||
List<UnlimitedRestrictedCard> list = new List<UnlimitedRestrictedCard>();
|
||||
foreach (string key in rotationRoot.Keys)
|
||||
{
|
||||
if (int.TryParse(key, out var result))
|
||||
{
|
||||
list.Add(new UnlimitedRestrictedCard(result, rotationRoot[key].ToInt()));
|
||||
}
|
||||
}
|
||||
_restrictedCardData = list;
|
||||
}
|
||||
|
||||
public bool IsRePrintCard(int baseCardId)
|
||||
{
|
||||
return _rePrintCardList.Contains(baseCardId);
|
||||
}
|
||||
|
||||
public void ParseRePrintJson(JsonData rotationRoot)
|
||||
{
|
||||
List<int> list = new List<int>();
|
||||
if (rotationRoot.Count == 0)
|
||||
{
|
||||
_rePrintCardList = list;
|
||||
return;
|
||||
}
|
||||
foreach (string key in rotationRoot.Keys)
|
||||
{
|
||||
list.Add(rotationRoot[key].ToInt());
|
||||
}
|
||||
_rePrintCardList = list;
|
||||
}
|
||||
|
||||
public void ParseAbilitiesJson(JsonData abilities)
|
||||
{
|
||||
List<MyRotationBonus> list = new List<MyRotationBonus>();
|
||||
foreach (JsonData value in abilities.Values)
|
||||
{
|
||||
if (AbilityIdList.Contains(value["ability_id"].ToString()))
|
||||
{
|
||||
MyRotationBonus item = new MyRotationBonus(value["ability_id"].ToString(), value["ability"].ToString(), value["add_start_pp"].ToInt(), value["add_start_life"].ToInt(), value["increase_add_pptotal_turn"].ToInt(), value["increase_add_pptotal_amount"].ToInt(), value["ability_desc"].ToString());
|
||||
list.Add(item);
|
||||
}
|
||||
}
|
||||
Abilities = list;
|
||||
}
|
||||
|
||||
public void InitializeText()
|
||||
{
|
||||
string text = null;
|
||||
foreach (string cardPadkId in CardPadkIdList)
|
||||
{
|
||||
if (cardPadkId != 10000.ToString())
|
||||
{
|
||||
text = cardPadkId;
|
||||
break;
|
||||
}
|
||||
}
|
||||
string text2 = CardPadkIdList[CardPadkIdList.Count - 1];
|
||||
string shortName = Data.Master.CardSetNameMgr.Get(text).ShortName;
|
||||
string shortName2 = Data.Master.CardSetNameMgr.Get(text2).ShortName;
|
||||
FirstPackId = text;
|
||||
LastPackId = text2;
|
||||
int num = int.Parse(text) - 10000;
|
||||
int num2 = int.Parse(text2) - 10000;
|
||||
PackSelectText = Data.SystemText.Get("Card_0296", shortName, shortName2, num.ToString(), num2.ToString());
|
||||
LastPackText = shortName2;
|
||||
IsEnableNemesis = num2 >= 7;
|
||||
}
|
||||
|
||||
public void InitializeRePrintCard(List<CardParameter> allCardParameter)
|
||||
{
|
||||
foreach (int rePrintCard in _rePrintCardList)
|
||||
{
|
||||
RePrintDictionary.Add(rePrintCard, new MyRotationRePrintInfo(rePrintCard, allCardParameter));
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsRePrintCardAvailablePack(int baseCardId, string cardPackId)
|
||||
{
|
||||
if (!RePrintDictionary.TryGetValue(baseCardId, out var value))
|
||||
|
||||
Reference in New Issue
Block a user