Skip to content

Attempt a GIGO solution for Frogger's randomMove issue #280

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 2 commits into from
Dec 31, 2025
Merged

Attempt a GIGO solution for Frogger's randomMove issue #280

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
e888e39
Fix the value of complete when falling back unprofitably
mcdemarco Dec 31, 2025
286ca18
Make randomMove return a non-move if cards are hidden
mcdemarco Dec 31, 2025
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
10 changes: 7 additions & 3 deletions src/games/frogger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,10 @@ export class FroggerGame extends GameBase {
if ( handcard ) {
//hop forward
const card = this.randomElement( this.closedhands[this.currplayer - 1].concat(this.hands[this.currplayer - 1]) );
//Card shouldn't be invisible but if it is we need to give up gracefully.
if (card === "") {
return "hidden";
}
//Suit check for random move forward.
const suits = this.getSuits(card, "randomMove (forward)");
const suit = this.randomElement(suits);
Expand Down Expand Up @@ -1209,7 +1213,7 @@ export class FroggerGame extends GameBase {
//Check cards.
//(The case remaining with no card is falling back at no profit.)
if (subIFM.card) {
if (subIFM.forward && (cloned.closedhands[cloned.currplayer - 1].concat(cloned.hands[cloned.currplayer - 1])).indexOf(subIFM.card!) < 0 ) {
if (subIFM.forward && (cloned.closedhands[cloned.currplayer - 1].concat(cloned.hands[cloned.currplayer - 1])).indexOf(subIFM.card!) < 0 ) {
//Bad hand card.
result.valid = false;
result.message = i18next.t("apgames:validation.frogger.NO_SUCH_HAND_CARD", {card: subIFM.card});
Expand Down Expand Up @@ -1321,9 +1325,9 @@ export class FroggerGame extends GameBase {
// When backing up to start you can pick any market card.
// We already checked it was in the market.
} else if (!complete && cloned.market.length > 0) {
// No card. May be a partial move.
// No card. May be a partial move, or can back up without a card.
result.valid = true;
result.complete = -1;
result.complete = 0;
result.canrender = true;
if (s < cloned.nummoves - 1)
result.message = i18next.t("apgames:validation.frogger.CARD_NEXT_OR");
Expand Down
10 changes: 10 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 @@ -126,6 +126,15 @@ describe("Frogger", () => {
expect(g.validateMove("8YK:a3-c2/c2-d2,1S/b2-a3,7SK/")).to.have.deep.property("valid", false); //Wrong direction.
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")).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")).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-")).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.
g.move("8YK:a3-c2/c2-b2,1S/b2-a3,7SK/");
expect(g.validateMove("8YK:a3-c2/c2-b2,1S/b2-a3,7SK/")).to.have.deep.property("valid", false); //No longer legal.

Expand Down Expand Up @@ -335,4 +344,5 @@ describe("Frogger", () => {
expect(g.validateMove("5YK:b2-e2/e2-d2,NV/")).to.have.deep.property("valid", true);

});

});