Files
SVSimServer/SVSim.BattleEngine/Engine/Wizard/BattleRecoveryInfo.cs
gamer147 2d9a6eea4b 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>
2026-07-03 19:18:54 -04:00

127 lines
3.3 KiB
C#

using System;
using LitJson;
namespace Wizard;
public class BattleRecoveryInfo : ReplayDetailInfo
{
public int turn_state;
public string node_server_url = "";
public int Play_seq;
public bool is_owner;
public bool _isConventionRoom;
public bool is_opponent_master_rank;
public bool IsReceivedDeal;
public bool IsMulliganEnd;
public string roomId;
public DataMgr.BattleType BattleType { get; private set; } = DataMgr.BattleType.None;
public int Pub_seq { get; private set; }
public BattleParameter BattleParameterInstance { get; private set; }
public int OpponentHighFormatRank { get; private set; }
public bool IsEnableGuildInviteButton { get; private set; }
public ConventionInfo ConventionInfo { get; private set; }
public bool IsGatheringRoom { get; private set; }
public bool CanUseNonPossessionCard { get; private set; }
public BattleRecoveryInfo(JsonData data)
: base(data)
{
BattleParameterInstance = BattleParameter.JsonToBattleParameter(data);
BattleType = BattleParameterInstance.ConvertClientBattleType();
if (BattleType == DataMgr.BattleType.Gathering)
{
IsGatheringRoom = true;
BattleType = DataMgr.BattleType.RoomBattle;
}
if (BattleType == DataMgr.BattleType.OfflineEvent)
{
_isConventionRoom = true;
BattleType = DataMgr.BattleType.RoomBattle;
}
Data.CurrentFormat = BattleParameterInstance.DeckFormat;
/* Pre-Phase-5b: DataMgr.TwoPickFormat write dropped */
node_server_url = data["node_server_url"].ToString();
turn_state = data["turn_state"].ToInt();
Pub_seq = data["pubSeq1"].ToInt();
Play_seq = data["playSeq1"].ToInt();
if (data.Keys.Contains("isOwner"))
{
is_owner = data["isOwner"].ToInt() == 1;
}
if (data.Keys.Contains("is_colosseum_rank_battle"))
{
Data.ArenaData.ColosseumData.IsRankMatching = true;
}
if (data.Keys.Contains("is_competition_rank_battle"))
{
Data.ArenaData.CompetitionData.IsRankMatching = true;
}
if (data.Keys.Contains("maxRank2"))
{
OpponentHighFormatRank = data["maxRank2"].ToInt();
}
if (data.Keys.Contains("roomId"))
{
roomId = data["roomId"].ToString();
}
if (data.Keys.Contains("tournament"))
{
ConventionInfo = new ConventionInfo(data["tournament"]);
}
if (data.Keys.Contains("is_invitation_user"))
{
IsEnableGuildInviteButton = data["is_invitation_user"].ToBoolean();
}
is_opponent_master_rank = data["isMasterRank2"].ToInt() == 1;
CanUseNonPossessionCard = data.GetValueOrDefault("is_enabled_all_card", defaultValue: false);
}
protected override void SetOpponentDeck(JsonData data)
{
}
protected override void CheckMulliganFlags(JsonData data)
{
if (IsMulliganEnd && IsReceivedDeal)
{
return;
}
foreach (string key in data.Keys)
{
if (!(key == "uri"))
{
continue;
}
JsonData jsonData = data[key];
if (Enum.IsDefined(typeof(NetworkBattleDefine.NetworkBattleURI), jsonData.ToString()))
{
switch ((NetworkBattleDefine.NetworkBattleURI)Enum.Parse(typeof(NetworkBattleDefine.NetworkBattleURI), jsonData.ToString()))
{
case NetworkBattleDefine.NetworkBattleURI.Deal:
IsReceivedDeal = true;
break;
case NetworkBattleDefine.NetworkBattleURI.Ready:
IsMulliganEnd = true;
break;
}
}
}
}
}