X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=variants%2FAtarigo%2Fclass.js;h=2cf9048b3ad830261d6d1938025b96565f492953;hb=a89fb4e9c92632a2e8295048a86d7a0ae0a7ec46;hp=5337f716fe40b101bb13fc73a0fc559c4c0f3c28;hpb=9a036f5fbfe3cc1df18b47e43d5db293de013e47;p=xogo.git

diff --git a/variants/Atarigo/class.js b/variants/Atarigo/class.js
index 5337f71..2cf9048 100644
--- a/variants/Atarigo/class.js
+++ b/variants/Atarigo/class.js
@@ -1,164 +1,14 @@
-import ChessRules from "/base_rules.js";
+import GoRules from "/variants/Go/class.js";
 import Move from "/utils/Move.js";
 import PiPo from "/utils/PiPo.js";
 import {ArrayFun} from "/utils/array.js";
 
-export default class AtarigoRules extends ChessRules {
+export default class AtarigoRules extends GoRules {
 
   static get Options() {
-    return {
-      input: [
-        {
-          label: "Board size",
-          variable: "bsize",
-          type: "number",
-          defaut: 11
-        }
-      ]
-    };
-  }
-
-  get hasFlags() {
-    return false;
-  }
-  get hasEnpassant() {
-    return false;
-  }
-  get clickOnly() {
-    return true;
-  }
-
-  getSvgChessboard() {
-    const flipped = (this.playerColor == 'b');
-    let board = `
-      <svg
-        viewBox="0 0 ${10*(this.size.y)} ${10*(this.size.x)}"
-        class="chessboard_SVG">`;
-    for (let i=0; i < this.size.x; i++) {
-      for (let j=0; j < this.size.y; j++) {
-        const ii = (flipped ? this.size.x - 1 - i : i);
-        const jj = (flipped ? this.size.y - 1 - j : j);
-        board += `
-          <rect
-            id="${this.coordsToId({x: ii, y: jj})}"
-            width="10"
-            height="10"
-            x="${10*j}"
-            y="${10*i}"
-            fill="transparent"
-          />`;
-      }
-    }
-    // Add lines to delimitate "squares"
-    for (let i = 0; i < this.size.x; i++) {
-      const y = i * 10 + 5, maxX = this.size.y * 10 - 5;
-      board += `
-        <line x1="5" y1="${y}" x2="${maxX}" y2="${y}"
-              stroke="black" stroke-width="0.2"/>`;
-    }
-    for (let i = 0; i < this.size.x; i++) {
-      const x = i * 10 + 5, maxY = this.size.x * 10 - 5;
-      board += `
-        <line x1="${x}" y1="5" x2="${x}" y2="${maxY}"
-              stroke="black" stroke-width="0.2"/>`;
-    }
-    board += "</svg>";
-    return board;
-  }
-
-  get size() {
-    return {
-      x: this.options["bsize"],
-      y: this.options["bsize"],
-    };
-  }
-
-  genRandInitBaseFen() {
-    const fenLine = C.FenEmptySquares(this.size.y);
-    return {
-      fen: (fenLine + '/').repeat(this.size.x - 1) + fenLine + " w 0",
-      o: {}
-    };
-  }
-
-  pieces(color, x, y) {
-    return {
-      's': {
-        "class": "stone",
-        moves: []
-      }
-    };
-  }
-
-  doClick(coords) {
-    const [x, y] = [coords.x, coords.y];
-    if (this.board[x][y] != "")
-      return null;
-    const color = this.turn;
-    const oppCol = C.GetOppCol(color);
-    let move = new Move({
-      appear: [ new PiPo({ x: x, y: y, c: color, p: 's' }) ],
-      vanish: [],
-      start: {x: x, y: y}
-    });
-    this.playOnBoard(move); //put the stone
-    let noSuicide = false;
-    let captures = [];
-    for (let s of [[0, 1], [1, 0], [0, -1], [-1, 0]]) {
-      const [i, j] = [x + s[0], y + s[1]];
-      if (this.onBoard(i, j)) {
-        if (this.board[i][j] == "")
-          noSuicide = true; //clearly
-        else if (this.getColor(i, j) == color) {
-          // Free space for us = not a suicide
-          if (!noSuicide) {
-            let explored = ArrayFun.init(this.size.x, this.size.y, false);
-            noSuicide = this.searchForEmptySpace([i, j], color, explored);
-          }
-        }
-        else {
-          // Free space for opponent = not a capture
-          let explored = ArrayFun.init(this.size.x, this.size.y, false);
-          const captureSomething =
-            !this.searchForEmptySpace([i, j], oppCol, explored);
-          if (captureSomething) {
-            for (let ii = 0; ii < this.size.x; ii++) {
-              for (let jj = 0; jj < this.size.y; jj++) {
-                if (explored[ii][jj])
-                  captures.push(new PiPo({ x: ii, y: jj, c: oppCol, p: 's' }));
-              }
-            }
-          }
-        }
-      }
-    }
-    this.undoOnBoard(move); //remove the stone
-    if (!noSuicide && captures.length == 0)
-      return null;
-    Array.prototype.push.apply(move.vanish, captures);
-    return move;
-  }
-
-  searchForEmptySpace([x, y], color, explored) {
-    if (explored[x][y])
-      return false; //didn't find empty space
-    explored[x][y] = true;
-    let res = false;
-    for (let s of [[1, 0], [0, 1], [-1, 0], [0, -1]]) {
-      const [i, j] = [x + s[0], y + s[1]];
-      if (this.onBoard(i, j)) {
-        if (this.board[i][j] == "")
-          res = true;
-        else if (this.getColor(i, j) == color)
-          res = this.searchForEmptySpace([i, j], color, explored) || res;
-      }
-    }
-    return res;
-  }
-
-  filterValid(moves) {
-    // Suicide check not here, because side-computation of captures
-    return moves;
+    let input = GoRules.Options.input;
+    input[0].defaut = 11;
+    return {input: input};
   }
 
   getCurrentScore(move_s) {