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

refactor(battlenode): rename mode-id field off BattleType, add BattleModes (§D)

Browse Source 
Behavior-preserving; 271 BattleNode/Matching/Services tests green, full solution builds.

"BattleType" meant two things: the Sessions.BattleType enum (Pvp/Bot) and an int
"mode id" field. Renamed the int field on MatchContext AND the BattleStartBody wire
DTO to BattleModeId (wire key stays "battleType" via JsonPropertyName), so BattleType
now means only the enum project-wide.

New Bridge/BattleModes.cs (TakeTwo = 11) replaces every 11 literal — both prod
MatchContextBuilder sites and the test fixtures/assertions. The arbitrary-passthrough
42 and bot 0 stay literal.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-05 07:44:02 -04:00
parent d119d2c277
commit 578d0a75ef
24 changed files with 57 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
SVSim.UnitTests/BattleNode/Lifecycle/ServerBattleFramesTests.cs
View File

@@ -69,22 +69,22 @@ public class ServerBattleFramesTests
}
[Test]
public void BuildBattleStart_HasTurnStateZero_AndUsesContextBattleType()
public void BuildBattleStart_HasTurnStateZero_AndUsesContextBattleModeId()
{
var env = ServerBattleFrames.BuildBattleStart(FixtureCtx(), FakeOpponentCtx(), selfViewerId: 1, turnState: TurnState.First);
var body = (BattleStartBody)env.Body;
Assert.That(body.TurnState, Is.EqualTo(TurnState.First));
Assert.That(body.BattleType, Is.EqualTo(11));
Assert.That(body.BattleModeId, Is.EqualTo(BattleModes.TakeTwo));
}
[Test]
public void BuildBattleStart_class_chara_cardMaster_battleType_flow_from_context()
public void BuildBattleStart_class_chara_cardMaster_battleModeId_flow_from_context()
{
var ctx = FixtureCtx() with
{
ClassId = "7", CharaId = "5000123",
CardMasterName = "card_master_test_v2",
BattleType = 42,
BattleModeId = 42,
};
var env = ServerBattleFrames.BuildBattleStart(ctx, FakeOpponentCtx(), selfViewerId: 1, turnState: TurnState.First);
@@ -93,7 +93,7 @@ public class ServerBattleFramesTests
Assert.That(body.SelfInfo.ClassId, Is.EqualTo("7"));
Assert.That(body.SelfInfo.CharaId, Is.EqualTo("5000123"));
Assert.That(body.SelfInfo.CardMasterName, Is.EqualTo("card_master_test_v2"));
Assert.That(body.BattleType, Is.EqualTo(42));
Assert.That(body.BattleModeId, Is.EqualTo(42));
}
[Test]
@@ -171,7 +171,7 @@ public class ServerBattleFramesTests
ClassId: "1", CharaId: "1", CardMasterName: "card_master_node_10015",
CountryCode: "KOR", UserName: "Player", SleeveId: "3000011",
EmblemId: "701441011", DegreeId: "300003", FieldId: 43, IsOfficial: 0,
BattleType: 11);
BattleModeId: BattleModes.TakeTwo);
// A prod-captured opponent MatchContext fixture that the BuildMatched/BuildBattleStart
// helpers read from for the oppo half.
@@ -180,5 +180,5 @@ public class ServerBattleFramesTests
ClassId: "8", CharaId: "8", CardMasterName: "card_master_node_10015",
CountryCode: "JPN", UserName: "Opponent", SleeveId: "704141010",
EmblemId: "400001100", DegreeId: "120027", FieldId: 5, IsOfficial: 0,
BattleType: 0);
BattleModeId: 0);
}

4
SVSim.UnitTests/BattleNode/Lifecycle/TypedBodyWireShapeTests.cs
View File

@@ -158,7 +158,7 @@ public class TypedBodyWireShapeTests
ClassId: "1", CharaId: "1", CardMasterName: "card_master_node_10015",
CountryCode: "KOR", UserName: "Player", SleeveId: "3000011",
EmblemId: "701441011", DegreeId: "300003", FieldId: 43, IsOfficial: 0,
BattleType: 11);
BattleModeId: BattleModes.TakeTwo);
// Prod-captured opponent fixture — 30-card deck and the prod-captured opponent
// cosmetics (ClassId/CharaId "8") so the wire bytes asserted below (oppoInfo classId/charaId,
@@ -169,5 +169,5 @@ public class TypedBodyWireShapeTests
ClassId: "8", CharaId: "8", CardMasterName: "card_master_node_10015",
CountryCode: "JPN", UserName: "Opponent", SleeveId: "704141010",
EmblemId: "400001100", DegreeId: "120027", FieldId: 5, IsOfficial: 0,
BattleType: 0);
BattleModeId: 0);
}