mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 12:10:15 +00:00
evanpelle
081735bf55
## Description: This PR does two things: 1. Allows you to send an alliance request to approve an existing request, ex: * player A sends req to player B * now player B can send an ally request to player A, which accepts the request from player A. This way even if you lose or don't see the alliance notification, you can still accept the alliance. 2. Have AllianceRequestExecution reject the request if not accepted or rejected. There is a bug where sometimes the EventDisplay does not trigger the delete() function, resulting in hung alliance requests. I couldn't figure out why the delete() function is sometimes not called, but I think it's better design to have core/ itself handle abandoned alliance requests, this was UI bugs can't break the game state. ## Please complete the following: - [ ] I have added screenshots for all UI updates - [ ] I process any text displayed to the user through translateText() and I've added it to the en.json file - [ ] I have added relevant tests to the test directory - [ ] 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: evan
78 lines
2.3 KiB
TypeScript
78 lines
2.3 KiB
TypeScript
import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
|
|
import { AllianceRequestReplyExecution } from "../src/core/execution/alliance/AllianceRequestReplyExecution";
|
|
import { Game, Player, PlayerType } from "../src/core/game/Game";
|
|
import { playerInfo, setup } from "./util/Setup";
|
|
|
|
let game: Game;
|
|
let player1: Player;
|
|
let player2: Player;
|
|
|
|
describe("AllianceRequestExecution", () => {
|
|
beforeEach(async () => {
|
|
game = await setup(
|
|
"plains",
|
|
{
|
|
infiniteGold: true,
|
|
instantBuild: true,
|
|
infiniteTroops: true,
|
|
},
|
|
[
|
|
playerInfo("player1", PlayerType.Human),
|
|
playerInfo("player2", PlayerType.Human),
|
|
playerInfo("player3", PlayerType.FakeHuman),
|
|
],
|
|
);
|
|
|
|
player1 = game.player("player1");
|
|
player1.conquer(game.ref(0, 0));
|
|
|
|
player2 = game.player("player2");
|
|
player2.conquer(game.ref(0, 1));
|
|
|
|
while (game.inSpawnPhase()) {
|
|
game.executeNextTick();
|
|
}
|
|
});
|
|
|
|
test("Can create alliance by replying", () => {
|
|
game.addExecution(new AllianceRequestExecution(player1, player2.id()));
|
|
game.executeNextTick();
|
|
|
|
game.addExecution(
|
|
new AllianceRequestReplyExecution(player1.id(), player2, true),
|
|
);
|
|
game.executeNextTick();
|
|
game.executeNextTick();
|
|
|
|
expect(player1.isAlliedWith(player2)).toBeTruthy();
|
|
expect(player2.isAlliedWith(player1)).toBeTruthy();
|
|
});
|
|
|
|
test("Can create alliance by sending alliance request back", () => {
|
|
game.addExecution(new AllianceRequestExecution(player1, player2.id()));
|
|
game.executeNextTick();
|
|
|
|
game.addExecution(new AllianceRequestExecution(player2, player1.id()));
|
|
game.executeNextTick();
|
|
|
|
expect(player1.isAlliedWith(player2)).toBeTruthy();
|
|
expect(player2.isAlliedWith(player1)).toBeTruthy();
|
|
});
|
|
|
|
test("Alliance request expires", () => {
|
|
game.config().allianceRequestDuration = () => 5;
|
|
game.addExecution(new AllianceRequestExecution(player1, player2.id()));
|
|
game.executeNextTick();
|
|
|
|
expect(player1.outgoingAllianceRequests().length).toBe(1);
|
|
|
|
for (let i = 0; i < 6; i++) {
|
|
game.executeNextTick();
|
|
}
|
|
|
|
expect(player1.outgoingAllianceRequests().length).toBe(0);
|
|
expect(player1.isAlliedWith(player2)).toBeFalsy();
|
|
expect(player2.isAlliedWith(player1)).toBeFalsy();
|
|
});
|
|
});
|