mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 12:00:44 +00:00
0b9d43cb46
## Description: I hope we can get this into v30? The nation count is configurable now, just like the bot count. Replaced the "Disable Nations" toggle with a nations slider (0–400) in SinglePlayer and Host Lobby modals. <img width="710" height="121" alt="Screenshot 2026-03-03 021952" src="https://github.com/user-attachments/assets/c8d0f0c3-db51-4303-95fa-dbc770460ec2" /> Public games are staying exactly the same, this is just for singleplayer and private lobby fun. Youtubers could play HvN against 400 nations, for example. Singleplayer enjoyers no longer have to play against 1 nation in HvN, they can freely choose. `GameConfig.disableNations: boolean` got replaced by `nations: number (0-400, optional)` `undefined` = map default, `0` = disabled, number = custom count Nations slider defaults to the map's nation count, shows "(MAP DEFAULT)" label when unchanged Compact map toggle reduces nations to 25% when at default, restores when toggled off (just like we already do with bots) The nation count for HvN no longer automatically matches the human count in singleplayer and private games, only in public games. **What if there aren't enough nations configured for the map?** We just use the HvN logic (Generate random nations) ### Warning **This infra PR also needs to get merged: https://github.com/openfrontio/infra/pull/263 Otherwise players can set 0 nations and get achievements.** ## 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 ## Please put your Discord username so you can be contacted if a bug or regression is found: FloPinguin
196 lines
5.7 KiB
TypeScript
196 lines
5.7 KiB
TypeScript
import {
|
|
Ranking,
|
|
RankType,
|
|
} from "../src/client/components/baseComponents/ranking/GameInfoRanking";
|
|
import {
|
|
Difficulty,
|
|
GameMapSize,
|
|
GameMapType,
|
|
GameMode,
|
|
GameType,
|
|
} from "../src/core/game/Game";
|
|
import { AnalyticsRecord, GameConfig } from "../src/core/Schemas";
|
|
import {
|
|
GOLD_INDEX_STEAL,
|
|
GOLD_INDEX_TRADE,
|
|
GOLD_INDEX_TRAIN_OTHER,
|
|
GOLD_INDEX_TRAIN_SELF,
|
|
GOLD_INDEX_WAR,
|
|
} from "../src/core/StatsSchemas";
|
|
|
|
describe("Ranking class", () => {
|
|
const mockConfig: GameConfig = {
|
|
gameMap: GameMapType.Montreal,
|
|
difficulty: Difficulty.Medium,
|
|
donateGold: false,
|
|
donateTroops: false,
|
|
gameType: GameType.Public,
|
|
gameMode: GameMode.FFA,
|
|
gameMapSize: GameMapSize.Normal,
|
|
nations: "disabled",
|
|
bots: 0,
|
|
infiniteGold: false,
|
|
infiniteTroops: false,
|
|
instantBuild: false,
|
|
maxPlayers: 40,
|
|
disabledUnits: [],
|
|
randomSpawn: false,
|
|
};
|
|
|
|
const gameTickDuration = 1000;
|
|
const gameDuration = gameTickDuration / 10;
|
|
|
|
function makeSession(
|
|
overrides: Partial<AnalyticsRecord> = {},
|
|
): AnalyticsRecord {
|
|
return {
|
|
version: "v0.0.2",
|
|
info: {
|
|
duration: gameTickDuration,
|
|
winner: ["player", "p2"],
|
|
players: [
|
|
{
|
|
clientID: "p1",
|
|
username: "[X] Alice",
|
|
clanTag: "X",
|
|
cosmetics: { flag: "USA" },
|
|
stats: {
|
|
units: { port: [2n, 0n, 0n, 2n] },
|
|
conquests: [5n],
|
|
gold: [0n, 100n, 20n, 0n, 15n, 5n], // total 140
|
|
bombs: {
|
|
abomb: [1n],
|
|
hbomb: [1n],
|
|
mirv: [2n],
|
|
},
|
|
},
|
|
persistentID: null,
|
|
},
|
|
{
|
|
clientID: "p2",
|
|
username: "Bob",
|
|
stats: {
|
|
units: { city: [2n, 0n, 0n, 2n] },
|
|
conquests: [8n],
|
|
gold: [0n, 50n, 10n, 5n], // total 65, no train trade
|
|
bombs: {
|
|
abomb: [0n],
|
|
hbomb: [2n],
|
|
mirv: [0n],
|
|
},
|
|
},
|
|
persistentID: null,
|
|
},
|
|
{
|
|
clientID: "p3",
|
|
username: "Charlie",
|
|
stats: {
|
|
// no units, but has conquests/killedAt to count as played
|
|
conquests: [8n],
|
|
killedAt: BigInt(600),
|
|
gold: [0n, 10n, 2n, 10n, 0n, 5n], // total 27
|
|
bombs: {},
|
|
},
|
|
persistentID: null,
|
|
},
|
|
],
|
|
gameID: "",
|
|
lobbyCreatedAt: 0,
|
|
config: { ...mockConfig },
|
|
start: 0,
|
|
end: 0,
|
|
num_turns: 0,
|
|
lobbyFillTime: 0,
|
|
},
|
|
gitCommit: "DEV",
|
|
subdomain: "",
|
|
domain: "",
|
|
};
|
|
}
|
|
|
|
test("summarizes players correctly", () => {
|
|
const r = new Ranking(makeSession());
|
|
const players = r.sortedBy(RankType.ConquestHumans);
|
|
|
|
expect(players.length).toBe(3);
|
|
|
|
const p1 = players.find((p) => p.id === "p1")!;
|
|
expect(p1.username).toBe("Alice");
|
|
expect(p1.flag).toBe("USA");
|
|
expect(p1.conquests).toStrictEqual([5n]);
|
|
expect(p1.atoms).toBe(1);
|
|
expect(p1.mirv).toBe(2);
|
|
});
|
|
|
|
test("correctly identifies winner", () => {
|
|
const r = new Ranking(makeSession());
|
|
const p2 = r.sortedBy(RankType.ConquestHumans).find((p) => p.id === "p2")!;
|
|
expect(p2.winner).toBe(true);
|
|
});
|
|
|
|
test("rank by total gold", () => {
|
|
const r = new Ranking(makeSession());
|
|
const rankedPlayers = r.sortedBy(RankType.TotalGold);
|
|
expect(rankedPlayers.length).toBe(3);
|
|
expect(rankedPlayers[0].id).toBe("p1");
|
|
expect(rankedPlayers[1].id).toBe("p2");
|
|
expect(rankedPlayers[2].id).toBe("p3");
|
|
});
|
|
|
|
test("rank by stolen gold", () => {
|
|
const r = new Ranking(makeSession());
|
|
const rankedPlayers = r.sortedBy(RankType.StolenGold);
|
|
expect(rankedPlayers.length).toBe(3);
|
|
expect(rankedPlayers[0].id).toBe("p3");
|
|
expect(rankedPlayers[1].id).toBe("p2");
|
|
expect(rankedPlayers[2].id).toBe("p1");
|
|
});
|
|
|
|
test("rank by hydros", () => {
|
|
const r = new Ranking(makeSession());
|
|
const rankedPlayers = r.sortedBy(RankType.Hydros);
|
|
expect(rankedPlayers.length).toBe(3);
|
|
expect(rankedPlayers[0].id).toBe("p2");
|
|
expect(rankedPlayers[1].id).toBe("p1");
|
|
expect(rankedPlayers[2].id).toBe("p3");
|
|
});
|
|
|
|
test("lifetime score is percentage of duration", () => {
|
|
const r = new Ranking(makeSession());
|
|
const p3 = r.sortedBy(RankType.ConquestHumans).find((p) => p.id === "p3")!;
|
|
const expected = Number(BigInt(600)) / gameDuration;
|
|
expect(r.score(p3, RankType.Lifetime)).toBe(expected);
|
|
});
|
|
|
|
test("lifetime score gives 100 when alive", () => {
|
|
const r = new Ranking(makeSession());
|
|
const p1 = r.allPlayers.find((p) => p.id === "p1")!;
|
|
expect(r.score(p1, RankType.Lifetime)).toBe(100);
|
|
});
|
|
|
|
test("winners should be ahead of players with same score", () => {
|
|
const r = new Ranking(makeSession());
|
|
const sortedPlayers = r.sortedBy(RankType.ConquestHumans);
|
|
expect(sortedPlayers[0].id).toBe("p2"); // p2 & p3 same score but winner first
|
|
});
|
|
|
|
test("gold scores work correctly", () => {
|
|
const r = new Ranking(makeSession());
|
|
const p1 = r.sortedBy(RankType.TotalGold).find((p) => p.id === "p1")!;
|
|
expect(r.score(p1, RankType.StolenGold)).toBe(
|
|
Number(p1.gold[GOLD_INDEX_STEAL] ?? 0n),
|
|
);
|
|
expect(r.score(p1, RankType.NavalTrade)).toBe(
|
|
Number(p1.gold[GOLD_INDEX_TRADE] ?? 0n),
|
|
);
|
|
const ownTrain = p1.gold[GOLD_INDEX_TRAIN_SELF] ?? 0n;
|
|
const otherTrain = p1.gold[GOLD_INDEX_TRAIN_OTHER] ?? 0n;
|
|
expect(r.score(p1, RankType.TrainTrade)).toBe(
|
|
Number(ownTrain + otherTrain),
|
|
);
|
|
expect(r.score(p1, RankType.ConqueredGold)).toBe(
|
|
Number(p1.gold[GOLD_INDEX_WAR] ?? 0n),
|
|
);
|
|
});
|
|
});
|