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>
97 lines
2.6 KiB
C#
97 lines
2.6 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using LitJson;
|
|
|
|
namespace Wizard;
|
|
|
|
public class DeckGroupListData
|
|
{
|
|
public List<DeckGroup> DeckGroupList { get; private set; } = new List<DeckGroup>();
|
|
|
|
public bool VisiblePreRotation { get; private set; }
|
|
|
|
public DeckGroupListData()
|
|
{
|
|
}
|
|
|
|
public DeckGroupListData(JsonData jsonData, Format format)
|
|
{
|
|
Initialize(DeckListUtility.ParseDeckInfoResponceData(jsonData, format));
|
|
}
|
|
|
|
public DeckGroupListData(DeckGroup deckGroup)
|
|
{
|
|
Initialize(new List<DeckGroup> { deckGroup });
|
|
}
|
|
|
|
public DeckGroupListData(List<DeckGroup> deckGroupList)
|
|
{
|
|
Initialize(deckGroupList);
|
|
}
|
|
|
|
private void Initialize(List<DeckGroup> deckGroupList)
|
|
{
|
|
DeckGroupList = deckGroupList;
|
|
VisiblePreRotation = Prerelease.Status == Prerelease.eStatus.PRE_ROTATION;
|
|
}
|
|
|
|
public List<DeckGroup> SelectDeckGroupList(Format format)
|
|
{
|
|
List<DeckGroup> list = new List<DeckGroup>();
|
|
switch (format)
|
|
{
|
|
case Format.All:
|
|
list = ((!VisiblePreRotation) ? DeckGroupList.Where((DeckGroup group) => group.DeckFormat != Format.PreRotation).ToList() : DeckGroupList);
|
|
break;
|
|
case Format.PreRotation:
|
|
if (VisiblePreRotation)
|
|
{
|
|
list = DeckGroupList.Where((DeckGroup deckGroup) => deckGroup.DeckFormat == Format.PreRotation).ToList();
|
|
}
|
|
break;
|
|
case Format.MyRotation:
|
|
list = DeckGroupList.Where((DeckGroup deckGroup) => deckGroup.DeckFormat == format).ToList();
|
|
list.RemoveAll((DeckGroup deckGroup) => deckGroup.AttributeType == DeckAttributeType.DefaultDeck);
|
|
break;
|
|
default:
|
|
list = DeckGroupList.Where((DeckGroup deckGroup) => deckGroup.DeckFormat == format).ToList();
|
|
break;
|
|
}
|
|
return list;
|
|
}
|
|
|
|
public List<DeckData> GetDeckListByAttribute(DeckAttributeType deckAttributeType, Format format = Format.All)
|
|
{
|
|
return (from deck in GetDeckListByFormat(format)
|
|
where deck.DeckAttributeType == deckAttributeType
|
|
select deck).ToList();
|
|
}
|
|
|
|
public DeckData GetDeckByAttribute(DeckAttributeType deckAttributeType, int deckId, Format format)
|
|
{
|
|
return GetDeckListByAttribute(deckAttributeType, format).FirstOrDefault((DeckData deckData) => deckData.GetDeckID() == deckId);
|
|
}
|
|
|
|
public List<DeckData> GetDeckListByFormat(Format format)
|
|
{
|
|
List<DeckData> list = new List<DeckData>();
|
|
foreach (DeckGroup item in SelectDeckGroupList(format))
|
|
{
|
|
list.AddRange(item.DeckDataList);
|
|
}
|
|
return list;
|
|
}
|
|
|
|
public bool IsExistDeckListByFormat(Format format = Format.All)
|
|
{
|
|
foreach (DeckData item in GetDeckListByFormat(format))
|
|
{
|
|
if (!item.IsNoCard())
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
}
|