Merge pull request #296 from mcdemarco/develop

Frogger: fix win condition

Author: mcdemarco

src/games/frogger.ts

@@ -394,13 +394,15 @@ export class FroggerGame extends GameBase {
         return ( suits.indexOf(suit) === -1 )
     }
 
-    private countColumnFrogs(home?: boolean): number {
+    private countColumnFrogs(home?: boolean, player?: playerid): number {
         //Returns number of currplayer's frogs in the start (false/undefined) or home (true) column.
+        if (player === undefined)
+            player = this.currplayer;
         let col = 0;
         if (home)
             col = this.columns - 1;
 
-        const cell = this.coords2algebraic(col, this.currplayer as number);
+        const cell = this.coords2algebraic(col, player as number);
         if (!this.board.has(cell))
             return 0;
         const piece = this.board.get(cell)!;
@@ -1786,9 +1788,15 @@ export class FroggerGame extends GameBase {
     }
 
     protected checkEOG(): FroggerGame {
-        if ( this.countColumnFrogs(true) === 6 ) {
+        //You can only win on your own turn.
+        let prevplayer = this.currplayer - 1;
+        if (prevplayer < 1) {
+            prevplayer = this.numplayers;
+        }
+        
+        if ( this.countColumnFrogs(true, prevplayer as playerid) === 6 ) {
             this.gameover = true;
-            this.winner.push(this.currplayer);
+            this.winner.push(prevplayer as playerid);
         }
 
         if (this.gameover) {

test/games/frogger.test.ts

@@ -470,4 +470,13 @@ describe("Frogger", () => {
 
     });
 
+    it ("Declares the winner", () => {
+        //Trimmed a game down to the last move for testing purposes.
+        const g = new FroggerGame(`{"game":"frogger","numplayers":2,"variants":["refills","advanced","courts","freeswim"],"gameover":false,"winner":[],"stack":[{"_version":"20251229","_results":[{"type":"move","from":"a3","to":"c2","what":"2VL","how":"forward"}],"_timestamp":"2026-01-11T15:35:08.026Z","currplayer":2,"lastmove":"2VL:a3-c2/","board":{"dataType":"Map","value":[["b4","PMYK"],["c4","PSVK"],["d4","NM"],["e4","PMSL"],["f4","5SV"],["g4","NY"],["h4","3SK"],["i4","PVLY"],["j4","8MS"],["k4","5ML"],["a3","X1-4"],["l3","X1-1"],["l2","X2-5"],["i1","X2"],["c2","X1"]]},"closedhands":[[],[]],"hands":[[],["NL","9LK"]],"market":["1S"],"discards":["6SY","TSLK","TMLY","TSVY","8VL","5YK","2VL"],"nummoves":3}]}`);
+
+        expect(g.validateMove("9LK:i1-k2/NL:k2-l2/")).to.have.deep.property("valid", true);
+        g.move("9LK:i1-k2/NL:k2-l2/");
+        expect(g.gameover).eq(true);
+    });
+
 });