Equalize team sizes (#992)

## Description:

Ensure that team sizes are equal.

Closes #841

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors

---------

Co-authored-by: Scott Anderson <662325+scottanderson@users.noreply.github.com>
This commit is contained in:
Scott Anderson
2025-06-02 14:31:10 -04:00
committed by 1brucben
parent 2c9bb9a80f
commit bb5b064555
3 changed files with 16 additions and 4 deletions
+5 -1
View File
@@ -29,7 +29,11 @@ export enum GameEnv {
export interface ServerConfig {
turnIntervalMs(): number;
gameCreationRate(): number;
lobbyMaxPlayers(map: GameMapType, mode: GameMode): number;
lobbyMaxPlayers(
map: GameMapType,
mode: GameMode,
numPlayerTeams: number | undefined,
): number;
numWorkers(): number;
workerIndex(gameID: GameID): number;
workerPath(gameID: GameID): string;
+10 -2
View File
@@ -143,11 +143,19 @@ export abstract class DefaultServerConfig implements ServerConfig {
return 60 * 1000;
}
lobbyMaxPlayers(map: GameMapType, mode: GameMode): number {
lobbyMaxPlayers(
map: GameMapType,
mode: GameMode,
numPlayerTeams: number | undefined,
): number {
const [l, m, s] = numPlayersConfig[map] ?? [50, 30, 20];
const r = Math.random();
const base = r < 0.3 ? l : r < 0.6 ? m : s;
return Math.min(mode === GameMode.Team ? Math.ceil(base * 1.5) : base, 150);
let p = Math.min(mode === GameMode.Team ? Math.ceil(base * 1.5) : base, l);
if (numPlayerTeams !== undefined) {
p -= p % numPlayerTeams;
}
return p;
}
workerIndex(gameID: GameID): number {
+1 -1
View File
@@ -51,7 +51,7 @@ export class MapPlaylist {
// Create the default public game config (from your GameManager)
return {
gameMap: map,
maxPlayers: config.lobbyMaxPlayers(map, mode),
maxPlayers: config.lobbyMaxPlayers(map, mode, numPlayerTeams),
gameType: GameType.Public,
difficulty: Difficulty.Medium,
infiniteGold: false,