Merge branch 'develop' of https://github.com/AbstractPlay/gameslib into develop

Author: Perlkonig

locales/en/apgames.json

@@ -4241,7 +4241,8 @@
 	    "TOO_HOPPY": "You may not make more than {{count}} moves on your turn.",
             "TOO_EARLY_FOR_REFILL": "Please submit your refill request before making your remaining moves.",
 	    "TOO_LATE_FOR_BLOCKED": "You do not count as blocked if you've already moved on this turn.",
-            "TOO_LATE_FOR_REFILL": "There is no need to force a refill of the draw pool after your third move.  It will refill automatically after you submit."
+            "TOO_LATE_FOR_REFILL": "There is no need to force a refill of the draw pool after your third move.  It will refill automatically after you submit.",
+            "VALID_REFILL": "Please submit your move to trigger the refill.  You will have {{count}} moves remaining after the refill, as well as the option to pass."
         },
 
         "furl": {

src/games/frogger.ts

@@ -1327,6 +1327,7 @@ export class FroggerGame extends GameBase {
         const cloned: FroggerGame = Object.assign(new FroggerGame(this.numplayers, [...this.variants]), deepclone(this) as FroggerGame);
 
         let allcomplete = false;
+        let refill = false;
         const moves: string[] = m.split("/");
 
         if (moves[moves.length - 1] === "") {
@@ -1403,7 +1404,9 @@ export class FroggerGame extends GameBase {
                     result.valid = false;
                     result.message = i18next.t("apgames:validation.frogger.NO_CARDS_FOR_REFILL");
                     return result;
-                }// else refill = true;
+                } else {
+                    refill = true;
+                }
             }
 
             let complete = false;
@@ -1613,7 +1616,11 @@ export class FroggerGame extends GameBase {
         result.valid = true;
         result.canrender = true;
         result.complete = (allcomplete && moves.length === this.nummoves) ? 1 : 0;
-        result.message = i18next.t("apgames:validation._general.VALID_MOVE");
+        if (refill)
+            result.message = i18next.t("apgames:validation.frogger.VALID_REFILL", {count: 3 - moves.length});
+        else
+            result.message = i18next.t("apgames:validation._general.VALID_MOVE");
+        
         return result;
     }