Merge branch 'develop'

Author: Perlkonig

locales/en/apgames.json

@@ -282,13 +282,20 @@
     },
     "variants": {
         "abande": {
+            "#board": {
+                "description": "7x7 square board"
+            },
             "hex": {
                 "description": "A 37-space hexagonal board.",
                 "name": "Board: Hexagonal"
             },
             "snub": {
                 "description": "A hybrid orthogonal/hexagonal board shape with unique connection characteristics.",
                 "name": "Board: Snub Square"
+            },
+            "libre": {
+                "name": "Abande Libre",
+                "description": "No board. Pieces are instead placed next to each other to form a hexagonal grid as you play."
             }
         },
         "accasta": {
@@ -3394,6 +3401,7 @@
             "MOVE2EMPTY": "You cannot move to empty spaces.",
             "PARTIAL": "It's possible you're trying to move a stack. Provide the destination.",
             "TOOEARLY": "You cannot move until the first player has placed two pieces.",
+            "TOOEARLY_libre": "You cannot move until four stones have been placed on the board.",
             "TOOFAR": "You can only move to an adjacent cell. {{to}} is not adjacent to {{from}}.",
             "TOOHIGH": "Moving from {{from}} to {{to}} would result in a stack taller than three pieces high.",
             "TRIPLESTACK": "You cannot move triple stacks."

src/common/modular/board.ts

@@ -265,4 +265,16 @@ export class ModularBoard {
         }
         return blocked;
     }
+
+    public neighbours(hex: ModularHex): ModularHex[] {
+        const g = this.grid;
+        const ns: ModularHex[] = [];
+        for (const dir of hex.directions) {
+            const n = g.neighborOf(hex, dir, {allowOutside: true});
+            if (this.getHexAtAxial(n.q, n.r) !== undefined) {
+                ns.push(n);
+            }
+        }
+        return ns;
+    }
 }

src/common/modular/hex.test.ts

@@ -1,11 +1,12 @@
-import { defineHex, Orientation, Hex, type HexOffset } from "honeycomb-grid";
+import { defineHex, Direction, Orientation, Hex, type HexOffset } from "honeycomb-grid";
 
 export type HexArgs = {q: number; r: number};
 
 export interface ModularHex extends Hex {
     uid: string;
     col: number;
     row: number;
+    directions: Direction[];
     dupe(): ModularHex;
 }
 
@@ -29,6 +30,14 @@ export const createModularHex = (orientation: Orientation = Orientation.FLAT, of
             return this.r + (this.q + offset * (this.q & 1)) / 2;
         }
 
+        public get directions(): Direction[] {
+            if (this.orientation === Orientation.POINTY) {
+                return [Direction.NE, Direction.E, Direction.SE, Direction.SW, Direction.W, Direction.NW];
+            } else {
+                return [Direction.N, Direction.NE, Direction.SE, Direction.S, Direction.SW, Direction.NW];
+            }
+        }
+
         static create(args: HexArgs): ModularHex {
             return new ModularHexImpl({q: args.q, r: args.r});
         }