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

85 lines
2.9 KiB
C#

using System;
using System.Collections.Generic;
using System.Linq;
using Wizard;
public class SkillRandomSelectFilter : ISkillSelectFilter
{
private readonly string _context;
private int _count;
public SkillRandomSelectFilter(string randomCountText)
{
_context = randomCountText;
}
public int CalcCount(SkillOptionValue option)
{
return option.ParseInt(_context);
}
public IEnumerable<BattleCardBase> Filtering(IEnumerable<BattleCardBase> cards, SkillOptionValue option, SkillConditionCheckerOption checkerOption)
{
_count = CalcCount(option);
cards = cards.OrderBy((BattleCardBase x) => x.Index);
List<BattleCardBase> attractSkillCardList = cards.Where((BattleCardBase c) => c.SkillApplyInformation.IsAttractSkillTarget).ToList();
List<BattleCardBase> nonAttractSkillCardList = cards.Where((BattleCardBase c) => !c.SkillApplyInformation.IsAttractSkillTarget).ToList();
// Route through the first card's mgr — all cards in a filtering pass share the same mgr,
// and if cards is empty the loop below runs zero times so the null branch is unreachable.
BattleManagerBase battleMgr = attractSkillCardList.FirstOrDefault()?.SelfBattlePlayer?.BattleMgr
?? nonAttractSkillCardList.FirstOrDefault()?.SelfBattlePlayer?.BattleMgr;
_count = Math.Min(_count, attractSkillCardList.Count + nonAttractSkillCardList.Count);
for (int i = 0; i < _count; i++)
{
List<BattleCardBase> list = ((attractSkillCardList.Count > 0) ? attractSkillCardList : nonAttractSkillCardList);
int index = (battleMgr.InstanceIsRandomDraw ? battleMgr.StableRandom(list.Count) : 0);
BattleCardBase battleCardBase = list[index];
list.Remove(battleCardBase);
yield return battleCardBase;
}
}
public static IEnumerable<BattleCardBase> Filtering(int selectCount, IEnumerable<BattleCardBase> cards, BattleManagerBase battleMgr)
{
cards = cards.OrderBy((BattleCardBase x) => x.Index);
List<BattleCardBase> list = cards.ToList();
List<BattleCardBase> list2 = new List<BattleCardBase>();
int num = Math.Min(selectCount, list.Count);
LocalLog.AccumulateLastTraceLog("drawDeck " + list.Count);
for (int num2 = 0; num2 < num; num2++)
{
int index = battleMgr.StableRandom(list.Count);
BattleCardBase item = list[index];
list.Remove(item);
list2.Add(item);
}
return list2;
}
public static IEnumerable<T> Filtering<T>(int selectCount, IEnumerable<T> targets, BattleManagerBase battleMgr, bool isDistinct = false)
{
List<T> list = targets.ToList();
List<T> list2 = new List<T>();
int num = selectCount;
if (isDistinct)
{
num = Math.Min(selectCount, list.Count);
}
for (int i = 0; i < num; i++)
{
if (list.Count > 0)
{
int index = battleMgr.StableRandom(list.Count);
T item = list[index];
list2.Add(item);
if (isDistinct)
{
list.Remove(item);
}
}
}
return list2;
}
}