Skip to content

fix(core): guard against division by zero on 100% fallout coverage in WinCheckExecution #4891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
berkelmali wants to merge 2 commits into
base: main
Choose a base branch
from
+42 −4
Open

fix(core): guard against division by zero on 100% fallout coverage in WinCheckExecution #4891

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
beeac71
fix(core): guard against division by zero on 100% fallout coverage in…
berkelmali Aug 6, 2026
2e37552
fix(core): guard territory win check on positive non-fallout tiles count
berkelmali Aug 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions src/core/execution/WinCheckExecution.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,12 @@ export class WinCheckExecution implements Execution {
const timeElapsed = this.mg.elapsedGameSeconds();
const numTilesWithoutFallout =
this.mg.numLandTiles() - this.mg.numTilesWithFallout();
if (
const isTerritoryWin =
numTilesWithoutFallout > 0 &&
(max.numTilesOwned() / numTilesWithoutFallout) * 100 >
this.mg.config().percentageTilesOwnedToWin(timeElapsed) ||
this.mg.config().percentageTilesOwnedToWin(timeElapsed);
if (
isTerritoryWin ||
(this.mg.config().gameConfig().maxTimerValue !== undefined &&
timeElapsed - this.mg.config().gameConfig().maxTimerValue! * 60 >= 0) ||
timeElapsed >= WinCheckExecution.HARD_TIME_LIMIT_SECONDS
Expand Down Expand Up @@ -164,9 +167,12 @@ export class WinCheckExecution implements Execution {
const timeElapsed = this.mg.elapsedGameSeconds();
const numTilesWithoutFallout =
this.mg.numLandTiles() - this.mg.numTilesWithFallout();
const percentage = (max[1] / numTilesWithoutFallout) * 100;
const isTerritoryWin =
numTilesWithoutFallout > 0 &&
(max[1] / numTilesWithoutFallout) * 100 >
this.mg.config().percentageTilesOwnedToWin(timeElapsed);
if (
percentage > this.mg.config().percentageTilesOwnedToWin(timeElapsed) ||
isTerritoryWin ||
(this.mg.config().gameConfig().maxTimerValue !== undefined &&
timeElapsed - this.mg.config().gameConfig().maxTimerValue! * 60 >= 0) ||
timeElapsed >= WinCheckExecution.HARD_TIME_LIMIT_SECONDS
Expand Down
32 changes: 32 additions & 0 deletions tests/core/executions/WinCheckExecution.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,38 @@ describe("WinCheckExecution", () => {
expect(mg.setWinner).not.toHaveBeenCalled();
});

it("should not set territory winner in FFA when non-fallout tiles is zero", () => {
const player = {
numTilesOwned: vi.fn(() => 10),
name: vi.fn(() => "P1"),
};
mg.players = vi.fn(() => [player]);
mg.numLandTiles = vi.fn(() => 100);
mg.numTilesWithFallout = vi.fn(() => 100);
winCheck.checkWinnerFFA();
expect(mg.setWinner).not.toHaveBeenCalled();
});
Comment on lines +85 to +95

@coderabbitai coderabbitai Bot Aug 6, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | 🏗️ Heavy lift

Use setup() and real game state for both regression tests.

These tests replace mg methods with vi.fn() and use a partial mock. Rewrite them with setup() and drive the core simulation directly. Keep the zero non-fallout tile and positive ownership scenario, then assert the real game has no winner.

As per coding guidelines, tests under tests/**/*.test.ts must use setup() and exercise the core simulation directly instead of using mocks.

Also applies to: 97-115

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@tests/core/executions/WinCheckExecution.test.ts` around lines 85 - 95,
Rewrite both regression tests around checkWinnerFFA to use setup() and the real
game state instead of partial mg mocks and vi.fn methods. Configure the
simulation to retain zero non-fallout tiles while a player has positive
territory ownership, invoke the core winner check, and assert that the real game
state has no winner.

Source: Coding guidelines


it("should not set territory winner in Team mode when non-fallout tiles is zero", () => {
mg.config = vi.fn(() => ({
gameConfig: vi.fn(() => ({
gameMode: GameMode.Team,
})),
percentageTilesOwnedToWin: vi.fn(() => 50),
}));
const player = {
numTilesOwned: vi.fn(() => 10),
team: vi.fn(() => ColoredTeams.Red),
name: vi.fn(() => "P1"),
};
mg.players = vi.fn(() => [player]);
mg.numLandTiles = vi.fn(() => 100);
mg.numTilesWithFallout = vi.fn(() => 100);
winCheck.init(mg, 0);
winCheck.checkWinnerTeam();
expect(mg.setWinner).not.toHaveBeenCalled();
});

it("should return false for activeDuringSpawnPhase", () => {
expect(winCheck.activeDuringSpawnPhase()).toBe(false);
});
Expand Down
Loading