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>
153 lines
5.9 KiB
C#
153 lines
5.9 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using Wizard.Battle.UI;
|
|
using Wizard.Battle.View.Vfx;
|
|
|
|
public class Skill_damage_cut : SkillBase
|
|
{
|
|
private class DamageCutBuffContainer : BuffInfoContainer
|
|
{
|
|
public DamageCutInfo DamageCutInfo { get; private set; }
|
|
|
|
public DamageClippingInfo DamageClipping { get; private set; }
|
|
|
|
public DamageCutBuffContainer(BattleCardBase card, BuffInfo info, DamageCutInfo damageCut, DamageClippingInfo damageClipping)
|
|
: base(card, info, -1, "", null, 0L)
|
|
{
|
|
DamageCutInfo = damageCut;
|
|
DamageClipping = damageClipping;
|
|
}
|
|
}
|
|
|
|
private string _maxParameter;
|
|
|
|
private string _minParameter;
|
|
|
|
protected List<BattleCardBase> _targetCards;
|
|
|
|
private DamageCutInfo.DamageType _type;
|
|
|
|
public int CutAmount { get; private set; }
|
|
|
|
public int ClippingMax { get; private set; }
|
|
|
|
public int LifeLowerLimit { get; private set; }
|
|
|
|
public Skill_damage_cut(SkillParameter skillPrm, string option)
|
|
: base(skillPrm, option)
|
|
{
|
|
SetDuplicateBanSkillNum();
|
|
}
|
|
|
|
public override VfxWithLoading Start(CallParameter parameter)
|
|
{
|
|
CutAmount = base.OptionValue.GetInt(SkillFilterCreator.ContentKeyword.cut_amount, 0);
|
|
LifeLowerLimit = base.OptionValue.GetInt(SkillFilterCreator.ContentKeyword.life_lower_limit, -1);
|
|
ClippingMax = base.OptionValue.GetInt(SkillFilterCreator.ContentKeyword.cut_clipping, int.MaxValue);
|
|
_maxParameter = base.OptionValue.GetString(SkillFilterCreator.ContentKeyword.cut_clipping_range_max, string.Empty);
|
|
_minParameter = base.OptionValue.GetString(SkillFilterCreator.ContentKeyword.cut_clipping_range_min, string.Empty);
|
|
_type = base.OptionValue.GetDamageCutGainType();
|
|
_targetCards = parameter.targetCards.ToList();
|
|
if (base.DuplicateBanSkillNum != string.Empty)
|
|
{
|
|
_targetCards = _targetCards.Where((BattleCardBase c) => !c.SkillApplyInformation.DamageCutList.Any((DamageCutInfo d) => (!base.IsDuplicateBanSelfSkill || d.OwnerCard == base.SkillPrm.ownerCard) && d.DuplicateBanSkillNum == base.DuplicateBanSkillNum)).ToList();
|
|
}
|
|
VfxBase vfxToRegister = NullVfx.GetInstance();
|
|
if (CutAmount > 0)
|
|
{
|
|
DamageCutInfo damageCutInfo = new DamageCutInfo(CutAmount, _type, base.SkillPrm.ownerCard, base.DuplicateBanSkillNum);
|
|
vfxToRegister = ProcessGiveAndDeprive(_targetCards, (BattleCardBase c) => c.SkillApplyInformation.GiveDamageCut(damageCutInfo), damageCutInfo, null);
|
|
if (IsBattleLog)
|
|
{
|
|
BattleLogManager.GetInstance().AddLogSkillGain(_targetCards, this, SkillGainType.DamageCut, CutAmount);
|
|
}
|
|
}
|
|
else if (ClippingMax != int.MaxValue || LifeLowerLimit > 0)
|
|
{
|
|
DamageClippingInfo clipping = new DamageClippingInfo(ClippingMax, _maxParameter, _minParameter, LifeLowerLimit);
|
|
vfxToRegister = ProcessGiveAndDeprive(_targetCards, (BattleCardBase c) => c.SkillApplyInformation.GiveDamageMaxClipping(clipping), null, clipping);
|
|
if (IsBattleLog)
|
|
{
|
|
if (ClippingMax != int.MaxValue)
|
|
{
|
|
BattleLogManager.GetInstance().AddLogSkillGain(_targetCards, this, SkillGainType.DamageMaxClipping, ClippingMax);
|
|
}
|
|
else
|
|
{
|
|
BattleLogManager.GetInstance().AddLogSkillGain(_targetCards, this, SkillGainType.LifeLowerLimit, LifeLowerLimit);
|
|
}
|
|
}
|
|
}
|
|
VfxWithLoadingSequential vfxWithLoadingSequential = VfxWithLoadingSequential.Create();
|
|
vfxWithLoadingSequential.RegisterVfxWithLoading(CreateSkillEffect(base.SkillPrm.resourceMgr, _targetCards));
|
|
vfxWithLoadingSequential.RegisterToMainVfx(vfxToRegister);
|
|
return vfxWithLoadingSequential;
|
|
}
|
|
|
|
public override VfxWithLoading Stop(SkillProcessor skillProcessor)
|
|
{
|
|
base.Stop(skillProcessor);
|
|
ParallelVfxPlayer parallelVfxPlayer = ParallelVfxPlayer.Create();
|
|
List<BattleCardBase> list = new List<BattleCardBase>();
|
|
foreach (DamageCutBuffContainer item in buffInfoContainer)
|
|
{
|
|
if (item.DamageCutInfo != null)
|
|
{
|
|
parallelVfxPlayer.Register(item._targetCard.SkillApplyInformation.DepriveDamageCut(item.DamageCutInfo));
|
|
}
|
|
else if (item.DamageClipping != null)
|
|
{
|
|
parallelVfxPlayer.Register(item._targetCard.SkillApplyInformation.DepriveDamageMaxClipping(item.DamageClipping));
|
|
}
|
|
list.Add(item._targetCard);
|
|
item._targetCard.RemoveBuffInfo(item._buffInfo);
|
|
if (item._targetCard.IsClass)
|
|
{
|
|
UpdateClassBuffIfActive(item._targetCard);
|
|
}
|
|
}
|
|
CallOnUpdateSkillEffect(list);
|
|
buffInfoContainer.Clear();
|
|
return VfxWithLoading.Create(parallelVfxPlayer);
|
|
}
|
|
|
|
private VfxBase ProcessGiveAndDeprive(IEnumerable<BattleCardBase> targets, Func<BattleCardBase, VfxBase> giveFunc, DamageCutInfo damageCut, DamageClippingInfo damageClipping)
|
|
{
|
|
BuffInfo buffInfo = null;
|
|
ParallelVfxPlayer parallelVfxPlayer = ParallelVfxPlayer.Create();
|
|
foreach (BattleCardBase target in targets)
|
|
{
|
|
BattleCardBase battleCardBase = target;
|
|
VfxBase vfx = giveFunc(battleCardBase);
|
|
if (IsBattleLog)
|
|
{
|
|
buffInfo = AddBuffInfoIfNeeded(battleCardBase);
|
|
}
|
|
if (buffInfo != null && base.SkillPrm.ownerCard.IsClass && base.SkillPrm.ownerCard == target)
|
|
{
|
|
buffInfo.IsHiddenClassLogSkill = true;
|
|
}
|
|
if (target.IsClass)
|
|
{
|
|
UpdateClassBuffIfActive(target);
|
|
}
|
|
DamageCutBuffContainer damageCutBuffContainer = new DamageCutBuffContainer(battleCardBase, buffInfo, damageCut, damageClipping);
|
|
buffInfoContainer.Add(damageCutBuffContainer);
|
|
SetOnLoseEvent(battleCardBase, buffInfo, damageCutBuffContainer);
|
|
parallelVfxPlayer.Register(vfx);
|
|
}
|
|
return 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);
|
|
return (CutAmount > 0) ? card.SkillApplyInformation.FourceDepriveDamageCut() : card.SkillApplyInformation.ForceDepriveDamageMaxClipping();
|
|
};
|
|
}
|
|
}
|