SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

engine cleanup passes 4-7 + multi-instancing ambient rip

Browse Source 
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>
This commit is contained in:
gamer147
2026-07-03 19:18:54 -04:00
parent 5c1db83967
commit 2d9a6eea4b
2045 changed files with 11704 additions and 158495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
SVSim.BattleEngine/Engine/LitJson/JsonData.cs
View File

@@ -52,15 +52,6 @@ public class JsonData : IJsonWrapper, IList, ICollection, IEnumerable, IOrderedD
}
}
public ICollection<JsonData> Values
{
get
{
EnsureDictionary();
return inst_object.Values;
}
}
int ICollection.Count => Count;
bool ICollection.IsSynchronized => EnsureCollection().IsSynchronized;

64
SVSim.BattleEngine/Engine/LitJson/JsonMapper.cs
View File

@@ -666,50 +666,11 @@ public class JsonMapper
}
}
public static void ToJson(object obj, JsonWriter writer)
{
WriteValue(obj, writer, writer_is_private: false, 0);
}
public static JsonData ToObject(JsonReader reader)
{
return (JsonData)ToWrapper(() => new JsonData(), reader);
}
public static JsonData ToObject(TextReader reader)
{
JsonReader reader2 = new JsonReader(reader);
return (JsonData)ToWrapper(() => new JsonData(), reader2);
}
public static JsonData ToObject(string json)
{
return (JsonData)ToWrapper(() => new JsonData(), json);
}
public static T ToObject<T>(JsonReader reader)
{
return (T)ReadValue(typeof(T), reader);
}
public static T ToObject<T>(TextReader reader)
{
JsonReader reader2 = new JsonReader(reader);
return (T)ReadValue(typeof(T), reader2);
}
public static T ToObject<T>(string json)
{
JsonReader reader = new JsonReader(json);
return (T)ReadValue(typeof(T), reader);
}
public static object ToObject(Type toType, string json)
{
JsonReader reader = new JsonReader(json);
return ReadValue(toType, reader);
}
public static IJsonWrapper ToWrapper(WrapperFactory factory, JsonReader reader)
{
return ReadValue(factory, reader);
@@ -720,29 +681,4 @@ public class JsonMapper
JsonReader reader = new JsonReader(json);
return ReadValue(factory, reader);
}
public static void RegisterExporter<T>(ExporterFunc<T> exporter)
{
ExporterFunc value = delegate(object obj, JsonWriter writer)
{
exporter((T)obj, writer);
};
custom_exporters_table[typeof(T)] = value;
}
public static void RegisterImporter<TJson, TValue>(ImporterFunc<TJson, TValue> importer)
{
ImporterFunc importer2 = (object input) => importer((TJson)input);
RegisterImporter(custom_importers_table, typeof(TJson), typeof(TValue), importer2);
}
public static void UnregisterExporters()
{
custom_exporters_table.Clear();
}
public static void UnregisterImporters()
{
custom_importers_table.Clear();
}
}

28
SVSim.BattleEngine/Engine/LitJson/JsonReader.cs
View File

@@ -36,30 +36,6 @@ public class JsonReader
private JsonToken token;
public bool AllowComments
{
get
{
return lexer.AllowComments;
}
set
{
lexer.AllowComments = value;
}
}
public bool AllowSingleQuotedStrings
{
get
{
return lexer.AllowSingleQuotedStrings;
}
set
{
lexer.AllowSingleQuotedStrings = value;
}
}
public bool SkipNonMembers
{
get
@@ -72,10 +48,6 @@ public class JsonReader
}
}
public bool EndOfInput => end_of_input;
public bool EndOfJson => end_of_json;
public JsonToken Token => token;
public object Value => token_value;

25
SVSim.BattleEngine/Engine/LitJson/JsonWriter.cs
View File

@@ -30,31 +30,6 @@ public class JsonWriter
private TextWriter writer;
public int IndentValue
{
get
{
return indent_value;
}
set
{
indentation = indentation / indent_value * value;
indent_value = value;
}
}
public bool PrettyPrint
{
get
{
return pretty_print;
}
set
{
pretty_print = value;
}
}
public TextWriter TextWriter => writer;
public bool Validate

24
SVSim.BattleEngine/Engine/LitJson/Lexer.cs
View File

@@ -36,30 +36,6 @@ internal class Lexer
private int unichar;
public bool AllowComments
{
get
{
return allow_comments;
}
set
{
allow_comments = value;
}
}
public bool AllowSingleQuotedStrings
{
get
{
return allow_single_quoted_strings;
}
set
{
allow_single_quoted_strings = value;
}
}
public bool EndOfInput => end_of_input;
public int Token => token;

11
SVSim.BattleEngine/Engine/LitJson/ParserToken.cs
View File

@@ -3,12 +3,6 @@ namespace LitJson;
internal enum ParserToken
{
None = 65536,
Number,
True,
False,
Null,
CharSeq,
Char,
Text,
Object,
ObjectPrime,
@@ -18,7 +12,4 @@ internal enum ParserToken
ArrayPrime,
Value,
ValueRest,
String,
End,
Epsilon
}
String}