mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-06-21 12:30:16 +00:00
f362e47413
Resolves #3154 ## Description: #2716 introduced nuke cancellation logic on alliance acceptance via `AllianceRequestReplyExecution`. The radial menu action, though, calls `AllianceRequestExecution` instead, which accepts the alliance if a request has already been made by the other player. This PR moves the nuke cancellation logic to `GameImpl`, hooking into the `acceptAllianceRequest` method, therefore accounting for every alliance acceptance, regardless of the specific action that brought to that. ## 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: deshack_82603
102 lines
3.4 KiB
TypeScript
102 lines
3.4 KiB
TypeScript
import { AllianceRejectExecution } from "../src/core/execution/alliance/AllianceRejectExecution";
|
|
import { AllianceRequestExecution } from "../src/core/execution/alliance/AllianceRequestExecution";
|
|
import { NukeExecution } from "../src/core/execution/NukeExecution";
|
|
import { Game, Player, PlayerType, UnitType } from "../src/core/game/Game";
|
|
import { playerInfo, setup } from "./util/Setup";
|
|
import { constructionExecution } from "./util/utils";
|
|
|
|
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.Nation),
|
|
],
|
|
);
|
|
|
|
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 counter-request", () => {
|
|
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("Can reject alliance request", () => {
|
|
game.addExecution(new AllianceRequestExecution(player1, player2.id()));
|
|
game.executeNextTick();
|
|
|
|
game.addExecution(new AllianceRejectExecution(player1.id(), player2));
|
|
game.executeNextTick();
|
|
|
|
expect(player1.isAlliedWith(player2)).toBeFalsy();
|
|
expect(player2.isAlliedWith(player1)).toBeFalsy();
|
|
expect(player1.outgoingAllianceRequests().length).toBe(0);
|
|
});
|
|
|
|
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();
|
|
});
|
|
|
|
// Resolves exploit https://github.com/openfrontio/OpenFrontIO/issues/2071
|
|
test("alliance request is revoked immediately if requester launches a nuke", () => {
|
|
game.config().nukeAllianceBreakThreshold = () => 0;
|
|
// Player 1 sends an alliance request to player 2.
|
|
game.addExecution(new AllianceRequestExecution(player1, player2.id()));
|
|
game.executeNextTick();
|
|
|
|
expect(player1.outgoingAllianceRequests().length).toBe(1);
|
|
expect(player2.incomingAllianceRequests().length).toBe(1);
|
|
|
|
// Player 1 Builds a silo & launches a missile at player 2.
|
|
constructionExecution(game, player1, 0, 0, UnitType.MissileSilo);
|
|
game.addExecution(
|
|
new NukeExecution(UnitType.AtomBomb, player1, game.ref(0, 1), null),
|
|
);
|
|
game.executeNextTick();
|
|
game.executeNextTick();
|
|
|
|
expect(player1.outgoingAllianceRequests().length).toBe(0);
|
|
expect(player2.incomingAllianceRequests().length).toBe(0);
|
|
expect(player1.isAlliedWith(player2)).toBeFalsy();
|
|
expect(player2.isAlliedWith(player1)).toBeFalsy();
|
|
});
|
|
});
|