Add Bestemshe variant

src/board.ts

@@ -183,13 +183,14 @@ function updatePocketPieces(
 export function baseMove(state: HeadlessState, orig: cg.Key, dest: cg.Key): cg.Piece | boolean {
   const origPiece = state.pieces.get(orig),
     destPiece = state.pieces.get(dest);
-  if ((orig === dest && state.variant !== 'togyzkumalak') || !origPiece) return false;
+  if ((orig === dest && state.variant !== 'togyzkumalak' && state.variant !== 'bestemshe') || !origPiece) return false;
   const captured = isCapture(state.variant, destPiece, origPiece);
   if (dest === state.selected) unselect(state);
   callUserFunction(state.events.move, orig, dest, captured);
 
   switch (state.variant) {
     case 'togyzkumalak':
+    case 'bestemshe':
       setPieces(state, togyzkumalakUpdatePiecesFromMove(state.dimensions, state.pieces, orig, dest));
       break;
     case 'oware':
@@ -217,7 +218,8 @@ export function baseMove(state: HeadlessState, orig: cg.Key, dest: cg.Key): cg.P
 
 function isCapture(variant: cg.Variant, destPiece: cg.Piece | undefined, origPiece: cg.Piece): cg.Piece | undefined {
   switch (variant) {
-    case 'togyzkumalak': {
+    case 'togyzkumalak':
+    case 'bestemshe': {
       //TODO account for wrapping around board (simimlar to oware capture)
       const count = destPiece && Number(destPiece.role.split('-')[0].substring(1));
       return destPiece && destPiece.playerIndex !== origPiece.playerIndex && count && (count === 2 || count % 2 === 1)
@@ -464,7 +466,7 @@ function isMovable(state: HeadlessState, orig: cg.Key): boolean {
 
 export function canMove(state: HeadlessState, orig: cg.Key, dest: cg.Key): boolean {
   return (
-    (orig !== dest || state.variant === 'togyzkumalak') &&
+    (orig !== dest || state.variant === 'togyzkumalak' || state.variant === 'bestemshe') &&
     isMovable(state, orig) &&
     (state.movable.free || !!state.movable.dests?.get(orig)?.includes(dest))
   );

src/fen.ts

@@ -2,8 +2,8 @@ import { pos2key, NRanks, invNRanks } from './util';
 import * as cg from './types';
 
 export const initial: cg.FEN = 'rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR';
-const commaFenVariants: cg.Variant[] = ['oware', 'togyzkumalak', 'backgammon', 'nackgammon'];
-const mancalaFenVariants: cg.Variant[] = ['oware', 'togyzkumalak'];
+const commaFenVariants: cg.Variant[] = ['oware', 'togyzkumalak', 'bestemshe', 'backgammon', 'nackgammon'];
+const mancalaFenVariants: cg.Variant[] = ['oware', 'togyzkumalak', 'bestemshe'];
 
 function roles(letter: string) {
   return (letter.replace('+', 'p') + '-piece') as cg.Role;

src/render.ts

@@ -360,6 +360,7 @@ function appendValue<K, V>(map: Map<K, V[]>, key: K, value: V): void {
 function variantSpecificHighlightClass(variant: cg.Variant, k: cg.Key, orientation: cg.Orientation): string {
   switch (variant) {
     case 'togyzkumalak':
+    case 'bestemshe':
       return k[1] === '1' ? ' p1' : ' p2';
     case 'nackgammon':
     case 'backgammon':

src/svg.ts

@@ -422,6 +422,7 @@ function roleToSvgName(variant: cg.Variant, piece: DrawShapePiece): string {
       return (piece.playerIndex === 'p1' ? 'b' : 'w') + piece.role[0].toUpperCase();
     case 'oware':
     case 'togyzkumalak':
+    case 'bestemshe':
       return piece.role[0].split('-')[0].substring(1);
     case 'nackgammon':
     case 'backgammon':

src/types.ts

@@ -48,6 +48,7 @@ export type Variant =
   | 'amazons'
   | 'oware'
   | 'togyzkumalak'
+  | 'bestemshe'
   | 'go9x9'
   | 'go13x13'
   | 'go19x19'

src/util.ts

@@ -170,7 +170,7 @@ export const posToTranslateRel = (
     pos,
     orientation,
     100,
-    v === 'togyzkumalak' ? 150 : v === 'backgammon' || v === 'nackgammon' ? 116 : 100,
+    v === 'togyzkumalak' || v === 'bestemshe' ? 150 : v === 'backgammon' || v === 'nackgammon' ? 116 : 100,
     bt,
   );
 

src/wrap.ts

@@ -92,7 +92,7 @@ export function renderWrap(element: HTMLElement, s: HeadlessState, relative: boo
         );
         container.appendChild(renderCoords(files.slice(0, s.dimensions.width).reverse(), 'files' + ' p2'));
       }
-    } else if (s.variant === 'togyzkumalak') {
+    } else if (s.variant === 'togyzkumalak' || s.variant === 'bestemshe') {
       if (s.orientation === 'p1') {
         container.appendChild(renderCoords(ranks.slice(0, s.dimensions.width), 'files' + ' p1'));
         container.appendChild(renderCoords(ranks.slice(0, s.dimensions.width), 'files' + ' p2'));
@@ -154,7 +154,7 @@ export function renderWrap(element: HTMLElement, s: HeadlessState, relative: boo
 
   if (s.boardScores) {
     const bd = s.dimensions;
-    if (s.variant === 'togyzkumalak') {
+    if (s.variant === 'togyzkumalak' || s.variant === 'bestemshe') {
       const boardScores = invNRanks.slice(-bd.height).map(y =>
         NRanks.slice(0, bd.width).map(x => {
           const piece = s.pieces.get(pos2key([x, y]));