Merge pull request #291 from mcdemarco/develop

Frogger: fix a croc bug, mark continuous pool variant experimental

Author: mcdemarco

locales/en/apgames.json

@@ -237,7 +237,7 @@
         "emu": "More information on the Decktet system can be found on the [official Decktet website](https://www.decktet.com). Cards in players' hands are hidden from observers, and they are hidden from opponents until the deck is empty, at which point the players have perfect information, so the hands are revealed. Cards drawn from the discard pile are also always visible to opponents.",
         "entropy": "In this implementation, the players play two games simultaneously but with a single shared stream of randomized pieces. Each player places a piece on their *opponent's* Order board and then makes a move on their *own* Order board; players thus act as both Order and Chaos at the same time. The player with the greatest score wins! Since both players had the exact same placement choices, this provides the cleanest measure of relative skill.",
         "exxit": "Translations of the rules tend to omit certain nuances. This implementation conforms with the original French edition of the rules.\n\nBecause the board is built out as you play in irregular shapes, the hexes are labelled numerically instead of algebraically. This ensures that the labels don't change as the map grows.",
-        "frogger": "As in other Decktet games at Abstract Play, the deck is displayed at the bottom of the board and includes both cards in the deck and unknown cards in other players' hands.  After the first hand, all cards are drawn from the open draw pool, so hands gradually become open.  The discards pile is also displayed.\n\nDue to how randomization works at Abstract Play, forced passes are needed for a player to refill the draw pool in the middle of his turn.  These are handled by the server, but a couple of variants for the draw pool have also been added to avoid forced passing.\n\nThe Crocodiles variant is by Jorge Arroyo, the translator of the English rules.  The Advanced rules and other minor variants are by P. D. Magnus; they appear in The Decktet Book, where the game is called Xing.",
+        "frogger": "As in other Decktet games at Abstract Play, the deck is displayed at the bottom of the board and includes both cards in the deck and unknown cards in other players' hands.  After the first hand, all cards are drawn from the open draw pool, so hands gradually become open.  The discards pile is also displayed.\n\nDue to how randomization works at Abstract Play, forced passes are needed for a player to refill the draw pool in the middle of his turn.  Passes are handled automatically by the server, but a there's also a draw pool variant that avoids forced passing if desired.\n\nThe Crocodiles variant is by Jorge Arroyo, the translator of the English rules.  The Advanced rules and other minor variants are by P. D. Magnus; they appear in The Decktet Book, where the game is called Xing.",
         "garden": "To make it very clear what happened on a previous turn, each move is displayed over four separate boards. The first board shows the game after the piece was first placed. The second board shows the state after adjacent pieces were flipped. The third board shows any harvests. The fourth board is the final game state and is where you make your moves.\n\nIn our implementation, black is always the \"tome\" or tie-breaker colour. The last player to harvest black will have a `0.1` after their score.",
         "gyges": "The goal squares are adjacent to all the cells in the back row. The renderer cannot currently handle \"floating\" cells.",
         "homeworlds": "The win condition is what's called \"Sinister Homeworlds.\" You only win by defeating the opponent to your left. If someone else does that, the game continues, but your left-hand opponent now shifts clockwise. For example, in a four-player game, if I'm South, then I win if I eliminate West. But if the North player ends up eliminating West, the game continues, but now my left-hand opponent is North.",
@@ -1213,7 +1213,7 @@
                 "name": "Free swim"
             },
             "refills": {
-		"description": "The draw pool may be refilled during a player's turn, by splitting their actions over two turns.",
+		"description": "The draw pool may be refilled during a player's turn, by splitting their actions over two partial turns.",
                 "name": "Refills"
             }
         },

src/games/frogger.ts

@@ -80,7 +80,7 @@ export class FroggerGame extends GameBase {
             { uid: "freeswim" }, //no check on market card claims
             { uid: "#market" }, //Now called the draw pool.  The base setting is no refills.
             { uid: "refills", group: "market", default: true }, //the official rule
-            { uid: "continuous", group: "market" }, //continuous small refills
+            { uid: "continuous", group: "market", experimental: true }, //continuous small refills
         ],
         categories: ["goal>evacuate", "mechanic>move", "mechanic>bearoff", "mechanic>block", "mechanic>random>setup", "mechanic>random>play", "board>shape>rect", "board>connect>rect", "components>decktet", "other>2+players"],
         flags: ["autopass", "custom-buttons", "custom-randomization", "random-start", "experimental"],
@@ -778,9 +778,20 @@ export class FroggerGame extends GameBase {
         for (let col = 1; col < this.columns - 1; col++) {
             // check for pawn column using the suit board
             if ( this.suitboard.has(this.coords2algebraic(col, 3)) ) {
-                //We have a croc's column; we could go looking for its row
-                // but we can also just derive it from the stack length.
-                const crocRow = (((this.stack.length / this.numplayers) - 1) % 3) + 1;
+                //We have a croc's column; we have to go looking for its row
+                // because the stack length is unreliable.
+                let crocRow = 1;
+                for (let row = 1; row <= 3; row++) {
+                    const cell = this.coords2algebraic(col, row);
+                    if (this.board.has(cell)) {
+                        const occupant = this.board.get(cell);
+                        if (occupant === "X0") {
+                            crocRow = row;
+                            break;
+                        }
+                    }
+                }
+
                 const victimRow = (crocRow % 3) + 1;
                 const crocFrom = this.coords2algebraic(col, crocRow);
                 const victimFrom = this.coords2algebraic(col, victimRow);