Skip to content

Test and fix for turn completion issue #281

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

Merged
mcdemarco merged 1 commit into from
Dec 31, 2025
Merged

Test and fix for turn completion issue #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/games/frogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1320,10 +1320,16 @@ export class FroggerGame extends GameBase {
result.valid = false;
result.message = i18next.t("apgames:validation.frogger.INVALID_MARKET_CARD");
return result;
} else {
// If we have a card, a move back is complete.
complete = true;
}
} else if (subIFM.card) {
// When backing up to start you can pick any market card.
// We already checked it was in the market.

// If we have a card, a move back is complete.
complete = true;
} else if (!complete && cloned.market.length > 0) {
// No card. May be a partial move, or can back up without a card.
result.valid = true;
Expand Down Expand Up @@ -1374,7 +1380,7 @@ export class FroggerGame extends GameBase {

//Really really done.
result.valid = true;
result.complete = allcomplete ? 1 : 0;
result.complete = (allcomplete && moves.length === this.nummoves) ? 1 : 0;
result.message = i18next.t("apgames:validation._general.VALID_MOVE");
return result;
}
Expand Down
6 changes: 6 additions & 0 deletions test/games/frogger.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,14 @@ describe("Frogger", () => {
expect(g.validateMove("8YK:a3-c2/c2-b2,1S!/b2-a3,7SK/")).to.have.deep.property("valid", false); //Can't refill.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-a3,7SK/")).to.have.deep.property("valid", true); //A legal sequence.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-a3,7SK/")).to.have.deep.property("complete", 1); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-a3,7SK")).to.have.deep.property("complete", 1); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-a3")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-")).to.have.deep.property("complete", -1); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2,1S")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-b2")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/c2-")).to.have.deep.property("complete", -1); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2/")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-c2")).to.have.deep.property("complete", 0); //A legal sequence, for completeness.
expect(g.validateMove("8YK:a3-")).to.have.deep.property("complete", -1); //A legal sequence, for completeness.
expect(g.validateMove("8YK:")).to.have.deep.property("complete", -1); //A legal sequence, for completeness.
Expand Down Expand Up @@ -187,6 +190,9 @@ describe("Frogger", () => {
expect(g.validateMove("1V//")).to.have.deep.property("valid", true); //A legal sequence (market card).
expect(g.validateMove("1V/")).to.have.deep.property("valid", true); //A legal sequence (market card).
expect(g.validateMove("1V")).to.have.deep.property("valid", true); //A legal sequence (market card).
expect(g.validateMove("1V//")).to.have.deep.property("complete", 1); //A legal sequence (market card).
expect(g.validateMove("1V/")).to.have.deep.property("complete", 1); //A legal sequence (market card).
expect(g.validateMove("1V")).to.have.deep.property("complete", 1); //A legal sequence (market card).
g.move("1V");

expect(g.validateMove("3MV//")).to.have.deep.property("valid", false); //Player 2 isn't blocked.
Expand Down