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

125 lines
3.9 KiB
C#

using System.Collections.Generic;
using System.Linq;
using Wizard.Battle.UI;
using Wizard.Battle.View.Vfx;
public class Skill_attack_count : SkillBase
{
public class CardPair
{
public BattleCardBase card { get; private set; }
public int Sub { get; private set; }
public BuffInfo buffInfo { get; private set; }
public CardPair(BattleCardBase card, int sub, BuffInfo buffInfo)
{
this.card = card;
Sub = sub;
this.buffInfo = buffInfo;
}
}
public bool IsRecovery => base.OptionValue.GetString(SkillFilterCreator.ContentKeyword.attack_count) == "recovery";
public Skill_attack_count(SkillParameter skillPrm, string option)
: base(skillPrm, option)
{
}
public int GetSetAttackCount()
{
if (!IsRecovery)
{
return base.OptionValue.GetInt(SkillFilterCreator.ContentKeyword.attack_count, -1);
}
return -1;
}
private int GetAddAttackCount()
{
return base.OptionValue.GetInt(SkillFilterCreator.ContentKeyword.add_attack_count, -1);
}
public bool IsSetAttackCount()
{
return GetSetAttackCount() != -1;
}
public bool IsAddAttackCount()
{
return GetAddAttackCount() != -1;
}
public override VfxWithLoading Start(CallParameter parameter)
{
bool isRecovery = IsRecovery;
int num = (IsAddAttackCount() ? GetAddAttackCount() : GetSetAttackCount());
VfxWithLoadingSequential vfxWithLoadingSequential = VfxWithLoadingSequential.Create();
CallOnChangeMaxAttackableCount(parameter.targetCards.ToList());
foreach (BattleCardBase targetCard in parameter.targetCards)
{
BattleCardBase battleCardBase = targetCard;
if (num != -1)
{
BuffInfo buffInfo = (IsBattleLog ? AddBuffInfoIfNeeded(targetCard) : null);
int maxAttackableCount = targetCard.MaxAttackableCount;
int intValue = (IsAddAttackCount() ? num : (num - maxAttackableCount));
vfxWithLoadingSequential.RegisterToMainVfx(battleCardBase.SkillApplyInformation.GiveAttackCount(this, num));
BuffInfoContainer buffInfoContainer = new BuffInfoContainer(battleCardBase, buffInfo, intValue, "", null, 0L);
SetOnLoseEvent(battleCardBase, buffInfo, buffInfoContainer);
base.buffInfoContainer.Add(buffInfoContainer);
}
if (isRecovery)
{
vfxWithLoadingSequential.RegisterToMainVfx(battleCardBase.RecoveryAttackCount());
}
}
vfxWithLoadingSequential.RegisterVfxWithLoading(CreateSkillEffect(base.SkillPrm.resourceMgr, parameter.targetCards));
if (IsBattleLog)
{
if (isRecovery)
{
BattleLogManager.GetInstance().AddLogSkillAttackCountRecovery(parameter.targetCards.ToList(), this);
}
else
{
BattleLogManager.GetInstance().AddLogSkillGain(parameter.targetCards.ToList(), this, SkillGainType.AttackCount, num);
}
}
return vfxWithLoadingSequential;
}
public override VfxWithLoading Stop(SkillProcessor skillProcessor)
{
ParallelVfxPlayer parallelVfxPlayer = ParallelVfxPlayer.Create();
parallelVfxPlayer.Register(base.Stop(skillProcessor));
List<BattleCardBase> list = new List<BattleCardBase>();
foreach (BuffInfoContainer item in buffInfoContainer)
{
list.Add(item._targetCard);
item._targetCard.RemoveBuffInfo(item._buffInfo);
parallelVfxPlayer.Register(item._targetCard.SkillApplyInformation.DepriveAttackCount(this));
}
CallOnUpdateSkillEffect(list, updateAttackEffect: true);
buffInfoContainer.Clear();
return VfxWithLoading.Create(parallelVfxPlayer);
}
public override void SetOnLoseEvent(BattleCardBase targetCard, BuffInfo buff, BuffInfoContainer container)
{
targetCard.OnLoseSkillOneTime += delegate(SkillBase loseSkill, SkillProcessor skillProcessor, BattleCardBase card)
{
card.RemoveBuffInfo(buff);
buffInfoContainer.Remove(container);
card.SkillApplyInformation.ForceDepriveAttackCount();
return NullVfx.GetInstance();
};
}
protected virtual void CallOnChangeMaxAttackableCount(List<BattleCardBase> targetCards)
{
}
}