diff --git a/Server/src/SOR.Game/GameMessages.cs b/Server/src/SOR.Game/GameMessages.cs
index 23699b7..82f154a 100644
--- a/Server/src/SOR.Game/GameMessages.cs
+++ b/Server/src/SOR.Game/GameMessages.cs
@@ -125,12 +125,12 @@ public sealed record CustomRulesOverride(
/// Board shape. Null or "Default" = auto-select by player count via BoardShapeGenerator.AutoShape.
/// Explicit values: "Rectangle" | "Cross" | "Triangular" | "RadialStar" | "HexRing".
///
- string? BoardShape = null,
+ string? BoardShape = null,
///
/// When set, use this board template instead of generating a board from BoardShape.
/// Null or absent = no template (use shape generator).
///
- Guid? BoardTemplateId = null);
+ Guid? BoardTemplateIdOverride = null);
/// Join an open custom lobby with the specified deck.
public sealed record JoinCustomLobbyRequest(Guid LobbyId, Guid DeckId, string? Password = null);
@@ -718,7 +718,7 @@ public sealed record CustomRulesDto(
/// "Default" = auto by player count; otherwise explicit shape name.
string BoardShape,
bool HasPassword,
- Guid? BoardTemplateId = null);
+ Guid? BoardTemplateIdOverride = null);
/// Client-facing lobby preset summary.
public sealed record LobbyPresetDto(
diff --git a/Server/src/SOR.Game/Handlers/GameCreateCustomLobbyHandler.cs b/Server/src/SOR.Game/Handlers/GameCreateCustomLobbyHandler.cs
index 1730ce3..a6c0539 100644
--- a/Server/src/SOR.Game/Handlers/GameCreateCustomLobbyHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameCreateCustomLobbyHandler.cs
@@ -95,7 +95,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
MpBuffOverride = req.Rules?.MpBuff,
StartingRandomTilePctOverride = req.Rules?.StartingRandomTilePct,
BoardShapeOverride = req.Rules?.BoardShape,
- BoardTemplateIdOverride = req.Rules?.BoardTemplateId,
+ BoardTemplateIdOverride = req.Rules?.BoardTemplateIdOverride,
CreatedAt = DateTimeOffset.UtcNow,
};
@@ -106,7 +106,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
new CreateCustomLobbyResponse(
LobbyId : lobby.Id,
LobbyName : lobby.Name,
- ActiveRules : ToDto(effective, req.Password != null, req.Rules?.BoardShape, req.Rules?.BoardTemplateId),
+ ActiveRules : ToDto(effective, req.Password != null, req.Rules?.BoardShape, req.Rules?.BoardTemplateIdOverride),
MaxPlayers : lobby.MaxPlayers,
GameMode : lobby.GameMode,
TeamCount : lobby.TeamCount));
@@ -115,7 +115,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
// Shared helper used by list/join handlers as well.
// boardShape: the lobby's BoardShapeOverride string; null/"Default" → shown as "Default".
// boardTemplateId: the lobby's BoardTemplateIdOverride; null = no template.
- internal static CustomRulesDto ToDto(GameRules r, bool hasPassword = false, string? boardShape = null, Guid? boardTemplateId = null) => new(
+ internal static CustomRulesDto ToDto(GameRules r, bool hasPassword = false, string? boardShape = null, Guid? boardTemplateIdOverride = null) => new(
OpeningHandSize : r.OpeningHandSize,
FirstPlayerSkipsDraw : r.FirstPlayerSkipsDraw,
SpAccumulationPerTurn : r.SpAccumulationPerTurn,
@@ -137,6 +137,6 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
BoardShape : string.IsNullOrEmpty(boardShape) || boardShape == "Default"
? "Default"
: boardShape,
- HasPassword : hasPassword,
- BoardTemplateId : boardTemplateId);
+ HasPassword : hasPassword,
+ BoardTemplateIdOverride : boardTemplateIdOverride);
}
diff --git a/Server/src/SOR.Game/Handlers/GameListActiveLobbiesHandler.cs b/Server/src/SOR.Game/Handlers/GameListActiveLobbiesHandler.cs
index a68863d..418f6b5 100644
--- a/Server/src/SOR.Game/Handlers/GameListActiveLobbiesHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameListActiveLobbiesHandler.cs
@@ -96,7 +96,7 @@ internal sealed class GameListActiveLobbiesHandler : GameHandlerBase, IMessageHa
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
BoardShape : l.BoardShapeOverride ?? "Default",
HasPassword : l.Password != null,
- BoardTemplateId : l.BoardTemplateIdOverride)));
+ BoardTemplateIdOverride : l.BoardTemplateIdOverride)));
return ServerMessage.Reply("game.custom.list_active.ack", message.Seq,
new ListActiveLobbiesResponse(
diff --git a/Server/src/SOR.Game/Handlers/GameListCustomLobbiesHandler.cs b/Server/src/SOR.Game/Handlers/GameListCustomLobbiesHandler.cs
index 522ec68..43c8dc4 100644
--- a/Server/src/SOR.Game/Handlers/GameListCustomLobbiesHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameListCustomLobbiesHandler.cs
@@ -119,7 +119,7 @@ internal sealed class GameListCustomLobbiesHandler : GameHandlerBase, IMessageHa
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
BoardShape : l.BoardShapeOverride ?? "Default",
HasPassword : l.Password != null,
- BoardTemplateId : l.BoardTemplateIdOverride),
+ BoardTemplateIdOverride : l.BoardTemplateIdOverride),
CreatedAt : l.CreatedAt,
MaxPlayers : l.MaxPlayers,
CurrentPlayerCount : currentPlayerCount,
diff --git a/Server/src/SOR.Game/Handlers/GameUpdateLobbyRulesHandler.cs b/Server/src/SOR.Game/Handlers/GameUpdateLobbyRulesHandler.cs
index 7d5cca2..2a8d9ef 100644
--- a/Server/src/SOR.Game/Handlers/GameUpdateLobbyRulesHandler.cs
+++ b/Server/src/SOR.Game/Handlers/GameUpdateLobbyRulesHandler.cs
@@ -72,7 +72,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
lobby.MpBuffOverride = r.MpBuff;
lobby.StartingRandomTilePctOverride = r.StartingRandomTilePct;
lobby.BoardShapeOverride = r.BoardShape;
- lobby.BoardTemplateIdOverride = r.BoardTemplateId;
+ lobby.BoardTemplateIdOverride = r.BoardTemplateIdOverride;
await _gameDb.SaveChangesAsync(ct);
@@ -96,7 +96,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
TurnLimit = r.TurnLimit ?? GameRules.Default.TurnLimit,
MpBuff = r.MpBuff ?? GameRules.Default.MpBuff,
StartingRandomTilePct = r.StartingRandomTilePct ?? GameRules.Default.StartingRandomTilePct,
- }, lobby.Password != null, r.BoardShape, r.BoardTemplateId);
+ }, lobby.Password != null, r.BoardShape, r.BoardTemplateIdOverride);
var updatedPush = ServerMessage.Push("game.custom.lobby_updated",
new LobbyUpdatedPush(lobby.Id, effective));