Phase 8: StartingRandomTilePct rule — full-stack implementation
- GameRules: add StartingRandomTilePct (int, 0–100, default 0)
- Board.Create(): accept startingRandomTilePct param; each tile
independently seeded from {Lake, Hill, Forest, Field} on Base1
- GameEngine: pass rules.StartingRandomTilePct to Board.Create()
- GameMessages: add StartingRandomTilePct to CustomRulesOverride + CustomRulesDto
- CustomLobby entity: add StartingRandomTilePctOverride column
- GameRuleSet entity: add StartingRandomTilePct column
- Migration AddStartingTileRule: new columns on custom_lobbies + game_rule_sets
- All 6 handlers wired: Create, LobbyReady, UpdateRules, AcceptSuggestion,
ListCustomLobbies, ListActiveLobbies
- Client lobby_room_screen.gd: "Starting Tile Affinity %" SpinBox (0–100)
in BOARD section; displayed in rules label and suggestion summary
Generated with [Claude Code](https://claude.ai/code)
via [Happy](https://happy.engineering)
Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Happy <yesreply@happy.engineering>
This commit is contained in:
@@ -204,6 +204,7 @@ func _update_rules_label() -> void:
|
||||
"mpBuff": "MP Buff",
|
||||
"boardWidth": "Board W",
|
||||
"boardHeight": "Board H",
|
||||
"startingRandomTilePct":"Starting Tile %",
|
||||
}
|
||||
for key in fields:
|
||||
if _current_rules.has(key):
|
||||
@@ -287,6 +288,7 @@ func _format_rules_summary(rules: Dictionary) -> String:
|
||||
"mpBuff": "MP Buff",
|
||||
"boardWidth": "Board W",
|
||||
"boardHeight": "Board H",
|
||||
"startingRandomTilePct":"Starting Tile %",
|
||||
"firstPlayerSkipsDraw": "1st Player Skips Draw",
|
||||
"minDeckSize": "Min Deck",
|
||||
"maxDeckSize": "Max Deck",
|
||||
@@ -446,6 +448,7 @@ func _open_rules_editor() -> void:
|
||||
_section_label(inner, "BOARD")
|
||||
add_int.call("Board Width", "boardWidth", 3, 12, 6, "")
|
||||
add_int.call("Board Height", "boardHeight", 3, 12, 6, "")
|
||||
add_int.call("Starting Tile Affinity %","startingRandomTilePct", 0, 100, 0, "% of tiles that start with a random basic affinity (0 = all void)")
|
||||
|
||||
# ── Deck ───────────────────────────────────────────────────────────────────
|
||||
_section_label(inner, "DECK")
|
||||
|
||||
@@ -80,6 +80,9 @@ public sealed class CustomLobby
|
||||
/// <summary>Board height override in rows.</summary>
|
||||
public int? BoardHeightOverride { get; set; }
|
||||
|
||||
/// <summary>Percentage (0–100) of tiles that start with a random basic affinity. 0 = all void.</summary>
|
||||
public int? StartingRandomTilePctOverride { get; set; }
|
||||
|
||||
// ── Ready-up state ────────────────────────────────────────────────────────
|
||||
|
||||
/// <summary>True once the host has clicked Ready in the lobby room.</summary>
|
||||
|
||||
@@ -76,6 +76,9 @@ public sealed class GameRuleSet
|
||||
/// <summary>Flat MP bonus added to each unit at the start of its owner's turn. 0 = no buff.</summary>
|
||||
public int MpBuff { get; set; } = 0;
|
||||
|
||||
/// <summary>Percentage (0–100) of tiles that start with a random basic affinity. 0 = all void.</summary>
|
||||
public int StartingRandomTilePct { get; set; } = 0;
|
||||
|
||||
// ── Origin Points Rewards ─────────────────────────────────────────────────
|
||||
|
||||
/// <summary>OP awarded to the winner of a ranked game.</summary>
|
||||
|
||||
+417
@@ -0,0 +1,417 @@
|
||||
// <auto-generated />
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.EntityFrameworkCore.Infrastructure;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
|
||||
using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
|
||||
using SOR.Database.Contexts;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SOR.Database.Migrations.Game
|
||||
{
|
||||
[DbContext(typeof(GameDbContext))]
|
||||
[Migration("20260320221447_AddStartingTileRule")]
|
||||
partial class AddStartingTileRule
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void BuildTargetModel(ModelBuilder modelBuilder)
|
||||
{
|
||||
#pragma warning disable 612, 618
|
||||
modelBuilder
|
||||
.HasDefaultSchema("game")
|
||||
.HasAnnotation("ProductVersion", "8.0.0")
|
||||
.HasAnnotation("Relational:MaxIdentifierLength", 63);
|
||||
|
||||
NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.CustomLobby", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<int?>("BoardHeightOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("BoardWidthOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool?>("DiscardOnMaxHandOverride")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int?>("DrawPerTurnOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<bool?>("FirstPlayerSkipsDrawOverride")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<Guid?>("GameSessionId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid?>("GuestAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid?>("GuestDeckId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("GuestFirstTurnPref")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("GuestReady")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int?>("HandSizeCapOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<Guid>("HostAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("HostDeckId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("HostFirstTurnPref")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<bool>("HostReady")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int?>("MaxArchTier1Override")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("MaxDeckSizeOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MaxPlayers")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("MinDeckSizeOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("MpBuffOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<int?>("OpeningHandSizeOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Password")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<int?>("SpAccumulationPerTurnOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("SpCapOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<bool?>("SpHasCapOverride")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<int?>("TimeLimitMinutesOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("TurnLimitOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int?>("TurnTimerSecondsOverride")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("HostAccountId");
|
||||
|
||||
b.HasIndex("Status", "CreatedAt");
|
||||
|
||||
b.ToTable("custom_lobbies", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.GameActionLog", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("ActionType")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<Guid>("ActorAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("GameSessionId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTimeOffset>("OccurredAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("PayloadJson")
|
||||
.HasColumnType("jsonb")
|
||||
.HasColumnName("payload");
|
||||
|
||||
b.Property<string>("ResultJson")
|
||||
.HasColumnType("jsonb")
|
||||
.HasColumnName("result");
|
||||
|
||||
b.Property<int>("SequenceNumber")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("ActorAccountId");
|
||||
|
||||
b.HasIndex("GameSessionId", "SequenceNumber")
|
||||
.IsUnique();
|
||||
|
||||
b.ToTable("action_logs", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.GameRuleSet", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<int>("BoardHeight")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("BoardWidth")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<bool>("DiscardOnMaxHand")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int>("DrawPerTurn")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<bool>("FirstPlayerSkipsDraw")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int>("HandSizeCap")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<bool>("IsCustomDefault")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<bool>("IsRankedDefault")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int>("LoserOpReward")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MaxArchTier1")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MaxDeckSize")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MinDeckSize")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("MpBuff")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<int>("OpeningHandSize")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("RankDiffOpMultiplierPct")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("SpAccumulationPerTurn")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("SpCap")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<bool>("SpHasCap")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<int>("TimeLimitMinutes")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("TurnLimit")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<int>("TurnTimerSeconds")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTimeOffset>("UpdatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<int>("WinnerOpReward")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("IsCustomDefault");
|
||||
|
||||
b.HasIndex("IsRankedDefault");
|
||||
|
||||
b.ToTable("game_rule_sets", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.GameSession", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTimeOffset?>("EndedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<DateTimeOffset?>("LastActionAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid>("PlayerOneAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("PlayerOneDeckId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<bool>("PlayerOneReady")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<Guid>("PlayerTwoAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("PlayerTwoDeckId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<bool>("PlayerTwoReady")
|
||||
.HasColumnType("boolean");
|
||||
|
||||
b.Property<string>("RuleSnapshotJson")
|
||||
.HasColumnType("jsonb")
|
||||
.HasColumnName("rule_snapshot");
|
||||
|
||||
b.Property<DateTimeOffset?>("StartedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("StateJson")
|
||||
.HasColumnType("jsonb")
|
||||
.HasColumnName("state");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<string>("WinCondition")
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<Guid?>("WinnerAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("PlayerOneAccountId");
|
||||
|
||||
b.HasIndex("PlayerTwoAccountId");
|
||||
|
||||
b.HasIndex("Status", "CreatedAt");
|
||||
|
||||
b.ToTable("game_sessions", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.LobbyPreset", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTimeOffset>("CreatedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Name")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.Property<Guid>("OwnerAccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<string>("RulesJson")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("OwnerAccountId");
|
||||
|
||||
b.ToTable("lobby_presets", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.MatchmakingEntry", b =>
|
||||
{
|
||||
b.Property<Guid>("Id")
|
||||
.ValueGeneratedOnAdd()
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("AccountId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<Guid>("DeckId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<DateTimeOffset>("JoinedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<Guid?>("MatchedGameSessionId")
|
||||
.HasColumnType("uuid");
|
||||
|
||||
b.Property<int>("RankScore")
|
||||
.HasColumnType("integer");
|
||||
|
||||
b.Property<DateTimeOffset?>("ResolvedAt")
|
||||
.HasColumnType("timestamp with time zone");
|
||||
|
||||
b.Property<string>("Status")
|
||||
.IsRequired()
|
||||
.HasColumnType("text");
|
||||
|
||||
b.HasKey("Id");
|
||||
|
||||
b.HasIndex("AccountId", "Status");
|
||||
|
||||
b.HasIndex("Status", "RankScore");
|
||||
|
||||
b.ToTable("matchmaking_entries", "game");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.GameActionLog", b =>
|
||||
{
|
||||
b.HasOne("SOR.Database.Entities.Game.GameSession", "Session")
|
||||
.WithMany("ActionLog")
|
||||
.HasForeignKey("GameSessionId")
|
||||
.OnDelete(DeleteBehavior.Cascade)
|
||||
.IsRequired();
|
||||
|
||||
b.Navigation("Session");
|
||||
});
|
||||
|
||||
modelBuilder.Entity("SOR.Database.Entities.Game.GameSession", b =>
|
||||
{
|
||||
b.Navigation("ActionLog");
|
||||
});
|
||||
#pragma warning restore 612, 618
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
#nullable disable
|
||||
|
||||
namespace SOR.Database.Migrations.Game
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public partial class AddStartingTileRule : Migration
|
||||
{
|
||||
/// <inheritdoc />
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
/// <inheritdoc />
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -75,7 +75,7 @@ public static class GameEngine
|
||||
PlayerOneAccountId = p1AccountId.ToString(),
|
||||
Rules = rules,
|
||||
Phase = GamePhase.Placement,
|
||||
Board = Board.Create(rules.BoardWidth, rules.BoardHeight),
|
||||
Board = Board.Create(rules.BoardWidth, rules.BoardHeight, rules.StartingRandomTilePct),
|
||||
};
|
||||
|
||||
state.Players[p1AccountId.ToString()] = BuildPlayerState(p1AccountId, p1Deck, p1ArchSpirit);
|
||||
|
||||
@@ -116,7 +116,8 @@ public sealed record CustomRulesOverride(
|
||||
int? TurnTimerSeconds = null,
|
||||
int? TimeLimitMinutes = null,
|
||||
int? TurnLimit = null,
|
||||
int? MpBuff = null);
|
||||
int? MpBuff = null,
|
||||
int? StartingRandomTilePct = null);
|
||||
|
||||
/// <summary>Join an open custom lobby with the specified deck.</summary>
|
||||
public sealed record JoinCustomLobbyRequest(Guid LobbyId, Guid DeckId, string? Password = null);
|
||||
@@ -519,6 +520,7 @@ public sealed record CustomRulesDto(
|
||||
int TimeLimitMinutes,
|
||||
int TurnLimit,
|
||||
int MpBuff,
|
||||
int StartingRandomTilePct,
|
||||
bool HasPassword);
|
||||
|
||||
/// <summary>Client-facing lobby preset summary.</summary>
|
||||
|
||||
@@ -50,5 +50,11 @@ public sealed record GameRules
|
||||
/// <summary>Flat MP bonus added to each unit at the start of its owner's turn. 0 = no buff.</summary>
|
||||
public int MpBuff { get; init; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// Percentage (0–100) of board tiles that receive a random basic affinity (Base1) at game start.
|
||||
/// 0 = all void (default). 100 = every tile randomised.
|
||||
/// </summary>
|
||||
public int StartingRandomTilePct { get; init; } = 0;
|
||||
|
||||
public static readonly GameRules Default = new();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
namespace SOR.Game.Grid;
|
||||
|
||||
using SOR.Database.Enums;
|
||||
|
||||
/// <summary>
|
||||
/// Rectangular game board — a dictionary of Tiles keyed by "x,y".
|
||||
///
|
||||
@@ -13,15 +15,30 @@ public sealed class Board
|
||||
|
||||
public Dictionary<string, Tile> Tiles { get; init; } = new();
|
||||
|
||||
/// <summary>Create an empty board with all tiles initialized to Void/Void affinities.</summary>
|
||||
public static Board Create(int width, int height)
|
||||
// Basic affinities eligible for random tile seeding (excludes Void, Aether, and tile-only compounds).
|
||||
private static readonly Affinity[] _randomAffinities =
|
||||
[Affinity.Lake, Affinity.Hill, Affinity.Forest, Affinity.Field];
|
||||
|
||||
/// <summary>
|
||||
/// Create a board. When <paramref name="startingRandomTilePct"/> is greater than 0,
|
||||
/// each tile independently has that probability (0–100) of receiving a random basic
|
||||
/// affinity on its Base1 slot; Base2 remains Void, yielding Gateway-type tiles.
|
||||
/// </summary>
|
||||
public static Board Create(int width, int height, int startingRandomTilePct = 0)
|
||||
{
|
||||
var tiles = new Dictionary<string, Tile>(width * height);
|
||||
var pct = Math.Clamp(startingRandomTilePct, 0, 100);
|
||||
|
||||
for (int y = 0; y < height; y++)
|
||||
for (int x = 0; x < width; x++)
|
||||
{
|
||||
var c = new Coord(x, y);
|
||||
tiles[c.ToKey()] = new Tile { Coord = c };
|
||||
var c = new Coord(x, y);
|
||||
var tile = new Tile { Coord = c };
|
||||
|
||||
if (pct > 0 && Random.Shared.Next(100) < pct)
|
||||
tile.Base1 = _randomAffinities[Random.Shared.Next(_randomAffinities.Length)];
|
||||
|
||||
tiles[c.ToKey()] = tile;
|
||||
}
|
||||
return new Board { Width = width, Height = height, Tiles = tiles };
|
||||
}
|
||||
|
||||
@@ -76,6 +76,7 @@ internal sealed class GameAcceptRuleSuggestionHandler : GameHandlerBase, IMessag
|
||||
lobby.TimeLimitMinutesOverride = r.TimeLimitMinutes;
|
||||
lobby.TurnLimitOverride = r.TurnLimit;
|
||||
lobby.MpBuffOverride = r.MpBuff;
|
||||
lobby.StartingRandomTilePctOverride = r.StartingRandomTilePct;
|
||||
|
||||
await _gameDb.SaveChangesAsync(ct);
|
||||
_suggestions.Remove(lobby.Id);
|
||||
@@ -99,6 +100,7 @@ internal sealed class GameAcceptRuleSuggestionHandler : GameHandlerBase, IMessag
|
||||
TimeLimitMinutes = r.TimeLimitMinutes ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit = r.TurnLimit ?? GameRules.Default.TurnLimit,
|
||||
MpBuff = r.MpBuff ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct = r.StartingRandomTilePct ?? GameRules.Default.StartingRandomTilePct,
|
||||
}, lobby.Password != null);
|
||||
|
||||
var updatedPush = ServerMessage.Push("game.custom.lobby_updated",
|
||||
|
||||
@@ -63,6 +63,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
|
||||
TimeLimitMinutes = req.Rules?.TimeLimitMinutes ?? defaultRules?.TimeLimitMinutes ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit = req.Rules?.TurnLimit ?? defaultRules?.TurnLimit ?? GameRules.Default.TurnLimit,
|
||||
MpBuff = req.Rules?.MpBuff ?? defaultRules?.MpBuff ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct = req.Rules?.StartingRandomTilePct ?? defaultRules?.StartingRandomTilePct ?? GameRules.Default.StartingRandomTilePct,
|
||||
};
|
||||
|
||||
var lobby = new CustomLobby
|
||||
@@ -89,6 +90,7 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
|
||||
TimeLimitMinutesOverride = req.Rules?.TimeLimitMinutes,
|
||||
TurnLimitOverride = req.Rules?.TurnLimit,
|
||||
MpBuffOverride = req.Rules?.MpBuff,
|
||||
StartingRandomTilePctOverride = req.Rules?.StartingRandomTilePct,
|
||||
CreatedAt = DateTimeOffset.UtcNow,
|
||||
};
|
||||
|
||||
@@ -121,5 +123,6 @@ internal sealed class GameCreateCustomLobbyHandler : GameHandlerBase, IMessageHa
|
||||
TimeLimitMinutes : r.TimeLimitMinutes,
|
||||
TurnLimit : r.TurnLimit,
|
||||
MpBuff : r.MpBuff,
|
||||
StartingRandomTilePct : r.StartingRandomTilePct,
|
||||
HasPassword : hasPassword);
|
||||
}
|
||||
|
||||
@@ -93,6 +93,7 @@ internal sealed class GameListActiveLobbiesHandler : GameHandlerBase, IMessageHa
|
||||
TimeLimitMinutes : l.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit : l.TurnLimitOverride ?? GameRules.Default.TurnLimit,
|
||||
MpBuff : l.MpBuffOverride ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
|
||||
HasPassword : l.Password != null)));
|
||||
|
||||
return ServerMessage.Reply("game.custom.list_active.ack", message.Seq,
|
||||
|
||||
@@ -99,6 +99,7 @@ internal sealed class GameListCustomLobbiesHandler : GameHandlerBase, IMessageHa
|
||||
TimeLimitMinutes : l.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit : l.TurnLimitOverride ?? GameRules.Default.TurnLimit,
|
||||
MpBuff : l.MpBuffOverride ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct : l.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
|
||||
HasPassword : l.Password != null),
|
||||
CreatedAt : l.CreatedAt));
|
||||
|
||||
|
||||
@@ -137,6 +137,7 @@ internal sealed class GameLobbyReadyHandler : GameHandlerBase, IMessageHandler
|
||||
TimeLimitMinutes = lobby.TimeLimitMinutesOverride ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit = lobby.TurnLimitOverride ?? GameRules.Default.TurnLimit,
|
||||
MpBuff = lobby.MpBuffOverride ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct = lobby.StartingRandomTilePctOverride ?? GameRules.Default.StartingRandomTilePct,
|
||||
};
|
||||
|
||||
var session = new GameSession
|
||||
|
||||
@@ -70,6 +70,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
|
||||
lobby.TimeLimitMinutesOverride = r.TimeLimitMinutes;
|
||||
lobby.TurnLimitOverride = r.TurnLimit;
|
||||
lobby.MpBuffOverride = r.MpBuff;
|
||||
lobby.StartingRandomTilePctOverride = r.StartingRandomTilePct;
|
||||
|
||||
await _gameDb.SaveChangesAsync(ct);
|
||||
|
||||
@@ -92,6 +93,7 @@ internal sealed class GameUpdateLobbyRulesHandler : GameHandlerBase, IMessageHan
|
||||
TimeLimitMinutes = r.TimeLimitMinutes ?? GameRules.Default.TimeLimitMinutes,
|
||||
TurnLimit = r.TurnLimit ?? GameRules.Default.TurnLimit,
|
||||
MpBuff = r.MpBuff ?? GameRules.Default.MpBuff,
|
||||
StartingRandomTilePct = r.StartingRandomTilePct ?? GameRules.Default.StartingRandomTilePct,
|
||||
}, lobby.Password != null);
|
||||
|
||||
var updatedPush = ServerMessage.Push("game.custom.lobby_updated",
|
||||
|
||||
Reference in New Issue
Block a user