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>
151 lines
4.1 KiB
C#
151 lines
4.1 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Wizard;
|
|
|
|
public class VoiceDictionaries
|
|
{
|
|
public VoiceDictionary playVoices;
|
|
|
|
public VoiceDictionary evoVoices;
|
|
|
|
public VoiceDictionary atkVoices;
|
|
|
|
public VoiceDictionary evoAtkVoices;
|
|
|
|
public VoiceDictionary destroyVoices;
|
|
|
|
public VoiceDictionary evoDestroyVoices;
|
|
|
|
public List<VoiceDictionary> skillVoices;
|
|
|
|
public List<VoiceDictionary> evoSkillVoices;
|
|
|
|
public List<VoiceDictionary> attachSkillVoices;
|
|
|
|
public string VoiceId { get; private set; }
|
|
|
|
public VoiceDictionaries(int cardId, CardMaster.CardMasterId cardMasterId)
|
|
{
|
|
CardParameter cardParameterFromId = CardMaster.GetInstance(cardMasterId).GetCardParameterFromId(cardId);
|
|
if (cardParameterFromId != null)
|
|
{
|
|
VoiceDictionary.SettingVoiceData(ref playVoices, (cardParameterFromId.PlayVoice != null) ? cardParameterFromId.PlayVoice : "");
|
|
VoiceDictionary.SettingVoiceData(ref evoVoices, (cardParameterFromId.EvoVoice != null) ? cardParameterFromId.EvoVoice : "");
|
|
VoiceDictionary.SettingVoiceData(ref atkVoices, ref evoAtkVoices, (cardParameterFromId.AtkVoice != null) ? cardParameterFromId.AtkVoice : "");
|
|
VoiceDictionary.SettingVoiceData(ref destroyVoices, ref evoDestroyVoices, (cardParameterFromId.DestroyVoice != null) ? cardParameterFromId.DestroyVoice : "");
|
|
VoiceDictionary.SettingVoiceDataList(out skillVoices, out evoSkillVoices, (cardParameterFromId.SkillVoice != null) ? cardParameterFromId.SkillVoice : "");
|
|
}
|
|
attachSkillVoices = new List<VoiceDictionary>();
|
|
VoiceId = GetVoiceId();
|
|
}
|
|
|
|
private bool GetVoiceIDBeforeUnderBar(VoiceDictionary dic, ref string retVoiceID)
|
|
{
|
|
string[] allVoiceList = dic.GetAllVoiceList();
|
|
if (allVoiceList.Length == 0)
|
|
{
|
|
return false;
|
|
}
|
|
if (string.IsNullOrEmpty(allVoiceList[0]))
|
|
{
|
|
return false;
|
|
}
|
|
string text = allVoiceList.FirstOrDefault((string v) => v != "NONE".ToLower());
|
|
if (text == null)
|
|
{
|
|
return false;
|
|
}
|
|
retVoiceID = text.Split(new string[1] { "_" }, StringSplitOptions.None)[0];
|
|
return true;
|
|
}
|
|
|
|
private bool GetVoiceIDListBeforeUnderBar(List<VoiceDictionary> dicList, ref string retVoiceID)
|
|
{
|
|
if (dicList != null && dicList.Count > 0)
|
|
{
|
|
for (int i = 0; i < dicList.Count; i++)
|
|
{
|
|
if (GetVoiceIDBeforeUnderBar(dicList[i], ref retVoiceID))
|
|
{
|
|
return true;
|
|
}
|
|
}
|
|
}
|
|
return false;
|
|
}
|
|
|
|
private string GetVoiceId()
|
|
{
|
|
string retVoiceID = "";
|
|
if (GetVoiceIDBeforeUnderBar(playVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDBeforeUnderBar(evoVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDBeforeUnderBar(atkVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDBeforeUnderBar(evoAtkVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDBeforeUnderBar(destroyVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDBeforeUnderBar(evoDestroyVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDListBeforeUnderBar(skillVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
if (GetVoiceIDListBeforeUnderBar(evoSkillVoices, ref retVoiceID))
|
|
{
|
|
return retVoiceID;
|
|
}
|
|
GetVoiceIDListBeforeUnderBar(attachSkillVoices, ref retVoiceID);
|
|
return retVoiceID;
|
|
}
|
|
|
|
public List<string> GetNormalPlayVoices()
|
|
{
|
|
List<string> list = playVoices.GetAllVoiceList().ToList();
|
|
List<string> list2 = new List<string>();
|
|
for (int i = 0; i < list.Count; i++)
|
|
{
|
|
string text = list.ElementAt(i);
|
|
if ((text.Contains("_ub") || text.Contains("_sb") || text.Contains("_ssb")) && !text.Contains("_ubp") && !text.Contains("_sbp") && !text.Contains("_ssbp"))
|
|
{
|
|
if (text.Contains("_ubl"))
|
|
{
|
|
list[i] = list[i].Replace("_ubl", "_ub");
|
|
}
|
|
else if (text.Contains("_sbl"))
|
|
{
|
|
list[i] = list[i].Replace("_sbl", "_sb");
|
|
}
|
|
else if (text.Contains("_ssbl"))
|
|
{
|
|
list[i] = list[i].Replace("_ssbl", "_ssb");
|
|
}
|
|
else
|
|
{
|
|
list2.Add(text);
|
|
}
|
|
}
|
|
}
|
|
foreach (string item in list2)
|
|
{
|
|
list.Remove(item);
|
|
}
|
|
return list;
|
|
}
|
|
}
|