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

79 lines
3.0 KiB
C#

using System.Collections.Generic;
using System.Linq;
public class SkillNoDuplicationRandomSelectInOrderFilter : ISkillSelectFilter
{
private readonly string _randomSelectCount;
private readonly ISkillParameterSelectFilter _sortFilter;
private readonly ISkillParameterSelectFilter _duplicationFilter;
private readonly ISkillCalcFilter _orderFilter;
private string _assertionHeadMessage = "id_no_duplication_random_count_in_order=";
public SkillNoDuplicationRandomSelectInOrderFilter(string optionText, SkillBase skill)
{
string[] array = optionText.Split(':');
_assertionHeadMessage += optionText;
_duplicationFilter = CheckParamFilter(array[0], skill);
_sortFilter = CheckParamFilter(array[1], skill);
switch (array[2])
{
case "descending":
_orderFilter = new SkillCalcMaxFilter();
break;
case "ascending":
_orderFilter = new SkillCalcMinFilter();
break;
default:
_orderFilter = new SkillCalcMaxFilter();
break;
}
_randomSelectCount = array[3];
}
public int CalcCount(SkillOptionValue option)
{
return option.ParseInt(_randomSelectCount);
}
public IEnumerable<BattleCardBase> Filtering(IEnumerable<BattleCardBase> cards, SkillOptionValue option, SkillConditionCheckerOption checkerOption)
{
int num = CalcCount(option);
List<BattleCardBase> list = new List<BattleCardBase>();
BattleManagerBase ins = list.FirstOrDefault()?.SelfBattlePlayer?.BattleMgr;
cards = cards.OrderBy((BattleCardBase x) => x.Index);
List<BattleCardBase> list2 = cards.ToList();
bool flag = list.Count < num;
while (flag && list2.Count > 0)
{
int LotteringValue = _orderFilter.Filtering(_sortFilter.Filtering(list2));
List<BattleCardBase> list3 = list2.Where((BattleCardBase card) => _sortFilter.Filtering(new BattleCardBase[1] { card }).FirstOrDefault() == LotteringValue).ToList();
while (flag && list3.Count > 0)
{
int index = (ins.InstanceIsRandomDraw ? ins.StableRandom(list3.Count()) : 0);
BattleCardBase battleCardBase = list3[index];
list.Add(battleCardBase);
int duplicationValue = _duplicationFilter.Filtering(new BattleCardBase[1] { battleCardBase }).FirstOrDefault();
list2 = list2.Where((BattleCardBase c) => _duplicationFilter.Filtering(new BattleCardBase[1] { c.Card }).FirstOrDefault() != duplicationValue).ToList();
list3 = list3.Where((BattleCardBase c) => _duplicationFilter.Filtering(new BattleCardBase[1] { c.Card }).FirstOrDefault() != duplicationValue).ToList();
flag = list.Count < num;
}
}
return list;
}
private ISkillParameterSelectFilter CheckParamFilter(string optionText, SkillBase skill)
{
SkillFilterCreator.ParseContentInfo(optionText, out var retParsedInfo);
ISkillParameterSelectFilter skillParameterSelectFilter = SkillFilterCreator.CreateParameterSelectFilter(retParsedInfo.Name, retParsedInfo, skill);
if (skillParameterSelectFilter == null)
{
skillParameterSelectFilter = new SkillParameterSelectCostFilter();
}
return skillParameterSelectFilter;
}
}