mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 16:46:35 +00:00
Aotumuri
f1d162825e
Resolves #1041 ## Description: Remove the singleplayer spawn countdown so the game starts when the player spawns, spawn nations immediately after player spawn, and align game timer/max-timer timing with the new start point. Added a singleplayer regression test for spawn-immunity timing (GameImpl.test.ts) and updated spawn-phase loop tests to use gameType: GameType.Public where singleplayer behavior is not under test (e.g. MIRV/AI/Spawn/WinCheck-related suites), eliminating inSpawnPhase() timeout hangs after the new singleplayer start logic. https://github.com/user-attachments/assets/c07a585f-1153-490e-88ca-a91fc7ae5756 ## 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: aotumuri
88 lines
2.5 KiB
TypeScript
88 lines
2.5 KiB
TypeScript
import {
|
|
Game,
|
|
Player,
|
|
PlayerInfo,
|
|
PlayerType,
|
|
UnitType,
|
|
} from "../src/core/game/Game";
|
|
import { setup } from "./util/Setup";
|
|
|
|
let game: Game;
|
|
let player: Player;
|
|
let other: Player;
|
|
|
|
describe("PlayerImpl", () => {
|
|
beforeEach(async () => {
|
|
game = await setup("plains", { instantBuild: true }, [
|
|
new PlayerInfo("player", PlayerType.Human, null, "player_id"),
|
|
new PlayerInfo("other", PlayerType.Human, null, "other_id"),
|
|
]);
|
|
|
|
player = game.player("player_id");
|
|
other = game.player("other_id");
|
|
|
|
player.conquer(game.ref(0, 0));
|
|
other.conquer(game.ref(50, 50));
|
|
player.addGold(BigInt(1000000));
|
|
|
|
game.config().structureMinDist = () => 10;
|
|
});
|
|
|
|
test("City can be upgraded", () => {
|
|
const city = player.buildUnit(UnitType.City, game.ref(0, 0), {});
|
|
const buCity = player
|
|
.buildableUnits(game.ref(0, 0))
|
|
.find((bu) => bu.type === UnitType.City);
|
|
expect(buCity).toBeDefined();
|
|
expect(buCity!.canUpgrade).toBe(city.id());
|
|
});
|
|
|
|
test("DefensePost cannot be upgraded", () => {
|
|
player.buildUnit(UnitType.DefensePost, game.ref(0, 0), {});
|
|
const buDefensePost = player
|
|
.buildableUnits(game.ref(0, 0))
|
|
.find((bu) => bu.type === UnitType.DefensePost);
|
|
expect(buDefensePost).toBeDefined();
|
|
expect(buDefensePost!.canUpgrade).toBeFalsy();
|
|
});
|
|
|
|
test("City can be upgraded from another city", () => {
|
|
const city = player.buildUnit(UnitType.City, game.ref(0, 0), {});
|
|
const cityToUpgrade = player.findUnitToUpgrade(
|
|
UnitType.City,
|
|
game.ref(0, 1),
|
|
);
|
|
expect(cityToUpgrade).toBeTruthy();
|
|
if (cityToUpgrade === false) {
|
|
return;
|
|
}
|
|
expect(cityToUpgrade.id()).toBe(city.id());
|
|
});
|
|
test("City cannot be upgraded when too far away", () => {
|
|
player.buildUnit(UnitType.City, game.ref(0, 0), {});
|
|
const cityToUpgrade = player.findUnitToUpgrade(
|
|
UnitType.City,
|
|
game.ref(50, 50),
|
|
);
|
|
expect(cityToUpgrade).toBe(false);
|
|
});
|
|
test("Unit cannot be upgraded when not enough gold", () => {
|
|
player.buildUnit(UnitType.City, game.ref(0, 0), {});
|
|
player.removeGold(BigInt(1000000));
|
|
const cityToUpgrade = player.findUnitToUpgrade(
|
|
UnitType.City,
|
|
game.ref(0, 1),
|
|
);
|
|
expect(cityToUpgrade).toBe(false);
|
|
});
|
|
|
|
test("Can't send alliance requests when dead", () => {
|
|
// conquer other
|
|
const otherTiles = other.tiles();
|
|
for (const tile of otherTiles) {
|
|
player.conquer(tile);
|
|
}
|
|
expect(other.canSendAllianceRequest(player)).toBe(false);
|
|
});
|
|
});
|