Files
SVSimServer/SVSim.BattleEngine/Engine/Wizard/CardMaster.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

169 lines
3.8 KiB
C#

using System;
using System.Collections.Generic;
using System.Linq;
using Cute;
using LitJson;
using Wizard.Battle.Recovery;
// TODO(engine-cleanup-pass2): 19 of 25 methods unrun in baseline
// Type: Wizard.CardMaster
// See data_dumps/reports/engine-cleanup/live-methods.baseline.txt
namespace Wizard;
public class CardMaster
{
public class UpdateInfo
{
public bool NeedUpdateLocalCardMaster { get; private set; }
public string NewCardMasterHash { get; private set; }
public UpdateInfo(JsonData data)
{
if (data.Keys.Contains("card_master_hash"))
{
NeedUpdateLocalCardMaster = true;
NewCardMasterHash = data["card_master_hash"].ToString();
}
else
{
NeedUpdateLocalCardMaster = false;
NewCardMasterHash = string.Empty;
}
}
}
public enum CardMasterId
{
Default = 1 }
private static Dictionary<CardMasterId, CardMaster> _dictCardMaster = null;
private readonly IDictionary<int, CardParameter> m_cardParameters;
private readonly IDictionary<string, int> _hashIdCardId;
private CardParameter _classCardParam;
public static CardMasterId BatttleCardMasterId { get; private set; } = CardMasterId.Default;
public static CardMaster GetInstance(CardMasterId cardMasterId)
{
if (_dictCardMaster == null)
{
return null;
}
CardMaster value = null;
_dictCardMaster.TryGetValue(cardMasterId, out value);
return value;
}
public static CardMaster GetInstanceForBattle()
{
return GetInstance(BatttleCardMasterId);
}
public static void DeleteAllInstance()
{
_dictCardMaster = null;
BatttleCardMasterId = CardMasterId.Default;
}
private CardMaster(List<CardCSVData> cardList)
{
m_cardParameters = cardList.ToDictionary((CardCSVData entry) => int.Parse(entry.card_id), (CardCSVData entry) => new CardParameter(entry));
if (!IsUseLocalCardMaster())
{
_hashIdCardId = cardList.ToDictionary((CardCSVData entry) => entry.CardHashId, (CardCSVData entry) => int.Parse(entry.card_id));
}
_classCardParam = new CardParameter();
}
public static bool IsClass(int cardId)
{
return cardId < 100;
}
public static bool IsMutationCardCheck(int baseCardID)
{
if (baseCardID > 800000000)
{
return baseCardID % 800000000 < 10000000;
}
return false;
}
public static bool IsChoiceBraveCardCheck(int baseCardId)
{
return baseCardId / 1000000 == 930;
}
public IEnumerable<CardParameter> GetAllParameters()
{
return m_cardParameters.Values;
}
public List<int> GetAllCardIds()
{
return m_cardParameters.Keys.ToList();
}
public CardParameter GetCardParameterFromId(int cardId)
{
if (IsClass(cardId))
{
return _classCardParam;
}
m_cardParameters.TryGetValue(cardId, out var value);
return value;
}
public bool CardExists(int cardId)
{
return m_cardParameters.Keys.Contains(cardId);
}
public List<int> GetSameCardListByBaseCardId(int baseCardId)
{
List<int> list = new List<int>();
foreach (KeyValuePair<int, CardParameter> cardParameter in m_cardParameters)
{
CardParameter value = cardParameter.Value;
if (value.BaseCardId == baseCardId)
{
list.Add(value.CardId);
}
}
return list;
}
public void RegisterCardParameter(int cardId, CardParameter cardParam)
{
m_cardParameters.Add(cardId, cardParam);
}
public void UnregisterCardParameter(int cardId)
{
m_cardParameters.Remove(cardId);
}
public static void SetBattleCardMasterId(CardMasterId cardMasterId)
{
BatttleCardMasterId = cardMasterId;
}
public static void SetBattleCardMasterId(int cardMasterId)
{
if (Enum.IsDefined(typeof(CardMasterId), cardMasterId))
{
SetBattleCardMasterId((CardMasterId)cardMasterId);
}
}
public static bool IsUseLocalCardMaster()
{
return false;
}
}