Waldmeister: Going for local testing

Author: Perlkonig

locales/en/apgames.json

@@ -274,6 +274,7 @@
         "toguz": "Depicting state changes in sowing games is challenging. The initial chosen pit is marked, as is any capture. Small numbers appear to show the change in the number of stones in each pit. If you believe you have encountered a bug, please let us know in Discord.",
         "tumbleweed": "A space is claimed by a player if they have a piece on it, or if they have the majority of the line of sights to it. The score is the number of territory own by each player. The game ends when both players pass in succession. If there is no change in score for 20 plies, the game also ends.",
         "twixt": "The notation is based on Hansel notation at <http://www.ibiblio.org/twixtpuzzles/>. Some modifications are that link removal specifically specifies the link direction, and commas separate the moves. To add/remove links, click on the pegs between them. You can also remove a link by clicking on the line itself.",
+        "waldmeister": "Players play two games sequentially. In the first round, Player 1 is playing for colours and Player 2 is playing for heights. At the end of the first round, scores are tabulated and scoring groups highlighted. Then in the second round, Player 2 plays first and plays for colours, and Player 1 plays for heights.\n\nWhen customizing, colours 1 and 2 are the player colours, and colours 3, 4, and 5 are the dark green, light green, and yellow green tree colours.",
         "witch": "The first player does not start as owning any pieces and may remove any piece (other than a crown) on their first turn. The second player chooses their colour on their first turn, after which, removing your opponent's pieces is no longer possible."
     },
     "variants": {
@@ -3269,9 +3270,14 @@
         "SCORES": "Scores",
         "STACKSIZES": "Stack heights",
         "tumbleweed": "Score (pieces + influence)",
-       "ESTIMATEDSCORES": "Estimated scores",
+        "ESTIMATEDSCORES": "Estimated scores",
         "TOPLACE": "Piece to place",
         "valley": "Moon Tokens",
+        "waldmeister": {
+            "COLOUR": "colours",
+            "GOALS": "Goals",
+            "HEIGHT": "heights"
+        },
         "YEAR": "Year"
     },
     "validation": {
@@ -5623,6 +5629,14 @@
             "SAME_START_END": "The start and end points are the same.",
             "SINGLE_LINE": "The {{range}} is not a straight unbroken line of your birds."
         },
+        "waldmeister": {
+            "INITIAL_INSTRUCTIONS_move": "Select a piece on the board to move.",
+            "INITIAL_INSTRUCTIONS_place": "Select one of your pieces to place on the board.",
+            "LABEL_STASH": "Player {{playerNum}}'s stash",
+            "PARTIAL_MOVE": "Select the destination.",
+            "PARTIAL_MOVE_PLACE": "Select a piece from your hand to place on the board.",
+            "PARTIAL_PLACE": "Select a space on the board to place your {{piece}} piece."
+        },
         "witch": {
             "2P_PRIVILEGE": "Only the second player may choose the pieces they wish to play.",
             "AFFILIATE": "Choose which piece you wish to play by clicking any sun or moon piece.",

src/common/graphs/hextri.ts

@@ -14,6 +14,7 @@ export class HexTriGraph implements IGraph {
     public readonly alternating: boolean;
     public readonly perimeter: number;
     public graph: UndirectedGraph
+    private _reverseLetters = false;
 
     constructor(minwidth: number, maxwidth: number, alternating = false) {
         if (minwidth >= maxwidth) {
@@ -40,8 +41,20 @@ export class HexTriGraph implements IGraph {
 
     public static directions: HexDir[] = ["NE","E","SE","SW","W","NW"];
 
+    public set reverseLetters(val: boolean) {
+        this._reverseLetters = val;
+    }
+
+    public get reverseLetters(): boolean {
+        return this._reverseLetters;
+    }
+
     public coords2algebraic(x: number, y: number): string {
-        return columnLabels[this.height - y - 1] + (x + 1).toString();
+        let idx = this.height - y - 1;
+        if (this.reverseLetters) {
+            idx = (this.height - 1) - idx;
+        }
+        return columnLabels[idx] + (x + 1).toString();
     }
 
     public algebraic2coords(cell: string): [number, number] {
@@ -56,7 +69,10 @@ export class HexTriGraph implements IGraph {
             throw new Error(`The row label is invalid: ${pair[0]}`);
         }
 
-        const realY = this.height - y - 1;
+        let realY = this.height - y - 1;
+        if (this.reverseLetters) {
+            realY = (this.height - 1) - realY;
+        }
         const delta = Math.abs(realY - this.midrow);
         const rowWidth = this.maxwidth - delta;
         if ( (x < 0) || (x > rowWidth) ) {

src/games/index.ts

@@ -221,6 +221,7 @@ import { RampartGame, IRampartState } from "./rampart";
 import { KrypteGame, IKrypteState } from "./krypte";
 import { EnsoGame, IEnsoState } from "./enso";
 import { RincalaGame, IRincalaState } from "./rincala";
+import { WaldMeisterGame, IWaldMeisterState } from "./waldmeister";
 
 export {
     APGamesInformation, GameBase, GameBaseSimultaneous, IAPGameState,
@@ -445,6 +446,7 @@ export {
     KrypteGame, IKrypteState,
     EnsoGame, IEnsoState,
     RincalaGame, IRincalaState,
+    WaldMeisterGame, IWaldMeisterState,
 };
 
 const games = new Map<string, typeof AmazonsGame | typeof BlamGame | typeof CannonGame |
@@ -522,7 +524,7 @@ const games = new Map<string, typeof AmazonsGame | typeof BlamGame | typeof Cann
                               typeof SunspotGame | typeof StawvsGame | typeof LascaGame |
                               typeof EmergoGame | typeof FroggerGame | typeof ArimaaGame |
                               typeof RampartGame | typeof KrypteGame | typeof EnsoGame |
-                              typeof RincalaGame
+                              typeof RincalaGame | typeof WaldMeisterGame
                 >();
 // Manually add each game to the following array
 [
@@ -557,6 +559,7 @@ const games = new Map<string, typeof AmazonsGame | typeof BlamGame | typeof Cann
     BloqueoGame, PilastriGame, TessellaGame, GorogoGame, BiscuitGame, QuincunxGame,
     SiegeOfJGame, StairsGame, EmuGame, DeckfishGame, BluestoneGame, SunspotGame, StawvsGame,
     LascaGame, EmergoGame, FroggerGame, ArimaaGame, RampartGame, KrypteGame, EnsoGame, RincalaGame,
+    WaldMeisterGame,
 ].forEach((g) => {
     if (games.has(g.gameinfo.uid)) {
         throw new Error("Another game with the UID '" + g.gameinfo.uid + "' has already been used. Duplicates are not allowed.");
@@ -1010,6 +1013,8 @@ export const GameFactory = (game: string, ...args: any[]): GameBase|GameBaseSimu
             return new EnsoGame(...args);
         case "rincala":
             return new RincalaGame(...args);
+        case "waldmeister":
+            return new WaldMeisterGame(...args);
     }
     return;
 }