Merge branch 'develop'

Author: Perlkonig

locales/en/apgames.json

@@ -2840,6 +2840,12 @@
                 "description": "Display the board using vertexes instead of hexes."
             }
         },
+        "diffusion": {
+            "pips": {
+                "description": "Display the stones as pips instead of as numerals.",
+                "name": "Pips"
+            }
+        },
         "entropy": {
             "piece-numbers": {
                 "name": "Piece numbers",
@@ -2940,6 +2946,12 @@
                 "name": "Hide moves"
             }
         },
+        "oware": {
+            "pips": {
+                "description": "Display the stones as pips instead of as numerals.",
+                "name": "Pips"
+            }
+        },
         "pente": {
             "hide-threatened": {
                 "description": "Don't highlight pieces that are threatened to be captured.",
@@ -3067,6 +3079,12 @@
                 "name": "Flat view"
             }
         },
+        "toguz": {
+            "pips": {
+                "description": "Display the stones as pips instead of as numerals.",
+                "name": "Pips"
+            }
+        },
         "trax": {
             "show-origin": {
                 "description": "Mark the position of the first piece.",
@@ -4241,7 +4259,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/_base.ts

@@ -265,7 +265,7 @@ export abstract class GameBase  {
     public abstract currplayer: number|undefined;
 
     public abstract move(move: string, opts?: IMoveOptions): GameBase;
-    public abstract render(opts: IRenderOpts): APRenderRep;
+    public abstract render(opts: IRenderOpts): APRenderRep|APRenderRep[];
     public abstract state(opts?: {strip?: boolean, player?: number}): IAPGameState;
     public abstract load(idx: number): GameBase;
     public abstract clone(): GameBase;

src/games/arimaa.ts

@@ -54,6 +54,7 @@ export class ArimaaGame extends GameBase {
         notes: "apgames:notes.arimaa",
         urls: [
             "https://arimaa.com/arimaa/",
+            "https://arimaa.com/arimaa/learn/rulesIntro.html",
             "https://boardgamegeek.com/boardgame/4616/arimaa",
         ],
         people: [
@@ -76,8 +77,8 @@ export class ArimaaGame extends GameBase {
             { uid: "eee", name: "Endless Endgame", group: "setup" },
             { uid: "free", name: "Arbitrary Setup", group: "setup", unrated: true },
         ],
-        categories: ["goal>breakthrough", "mechanic>capture", "mechanic>move", "mechanic>coopt", "board>shape>rect", "board>connect>rect", "components>special"],
-        flags: ["experimental", "perspective", "no-moves", "custom-buttons", "random-start"]
+        categories: ["goal>breakthrough", "goal>cripple", "goal>immobilize", "mechanic>capture", "mechanic>move", "mechanic>coopt", "mechanic>random>setup", "board>shape>rect", "board>connect>rect", "components>chess"],
+        flags: ["experimental", "perspective", "no-moves", "custom-buttons", "random-start", "custom-colours"]
     };
     public static coords2algebraic(x: number, y: number): string {
         return GameBase.coords2algebraic(x, y, 8);
@@ -1126,10 +1127,10 @@ export class ArimaaGame extends GameBase {
             for (const colour of [1, 2] as const) {
                 legend[`${pc}${colour}`] = {
                     name,
-                    colour,
+                    colour: this.getPlayerColour(colour),
                     colour2: {
                         func: "bestContrast",
-                        bg: colour,
+                        bg: this.getPlayerColour(colour),
                         fg: [
                             "_context_strokes",
                             "_context_fill"
@@ -1143,13 +1144,13 @@ export class ArimaaGame extends GameBase {
                         name,
                         colour: {
                             func: "flatten",
-                            fg: colour,
+                            fg: this.getPlayerColour(colour),
                             bg: "_context_background",
-                            opacity: 0.5,
+                            opacity: 0.375,
                         },
                         colour2: {
                             func: "bestContrast",
-                            bg: colour,
+                            bg: this.getPlayerColour(colour),
                             fg: [
                                 "_context_strokes",
                                 "_context_fill"
@@ -1360,4 +1361,12 @@ export class ArimaaGame extends GameBase {
         }
     }
 
+    public getPlayerColour(p: playerid): number|string {
+        if (p === 1) {
+            return "#bf9212";
+        } else {
+            return "#989898";
+        }
+    }
+
 }

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;
     }
 
@@ -1911,8 +1918,7 @@ export class FroggerGame extends GameBase {
 
         // add flood markers for the start and end columns
         const points = [];
-        for (let r = 0; r <= this.numplayers; r++) {
-            const row = this.rows - 2 - r;
+        for (let row = 0; row <= this.numplayers; row++) {
             points.push({col: 0, row: row} as RowCol);
             points.push({col: this.columns - 1, row: row} as RowCol);
         }

src/games/krypte.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import { GameBase, IAPGameState, IClickResult, IIndividualState, IRenderOpts, IValidationResult } from "./_base";
 import { APGamesInformation } from "../schemas/gameinfo";
 import { APMoveResult } from "../schemas/moveresults";