X-Git-Url: https://git.auder.net/?p=vchess.git;a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCheck3.js;h=a4b292a43110807ef1be603c55df4dbb94568bdf;hp=63d5ae56a9934a4ce13c9ca1337d21cd90be80f3;hb=e71161fbfffe53b0f4b174e0467cdd98cc70b7b0;hpb=1c5bfdf23707e893735f185786e9774b2270ace1

diff --git a/client/src/variants/Check3.js b/client/src/variants/Check3.js
index 63d5ae56..a4b292a4 100644
--- a/client/src/variants/Check3.js
+++ b/client/src/variants/Check3.js
@@ -1,20 +1,67 @@
 import { ChessRules } from "@/base_rules";
 
-export const VariantRules = class AntimatterRules extends ChessRules {
-  getPotentialMovesFrom([x, y]) {
-    let moves = super.getPotentialMovesFrom([x, y]);
-
-    // Handle "matter collisions"
-    moves.forEach(m => {
-      if (
-        m.vanish.length > 1 &&
-        m.appear.length <= 1 &&
-        m.vanish[0].p == m.vanish[1].p
-      ) {
-        m.appear.pop();
-      }
-    });
-
-    return moves;
+export const VariantRules = class Check3Rules extends ChessRules {
+  static IsGoodFlags(flags) {
+    // 4 for castle + 2 for checks (0,1 or 2)
+    return !!flags.match(/^[01]{4,4}[012]{2,2}$/);
+  }
+
+  setFlags(fenflags) {
+    super.setFlags(fenflags); //castleFlags
+    this.checkFlags = { w: 0, b: 0 };
+    const flags = fenflags.substr(4); //skip first 4 digits, for castle
+    for (let c of ["w", "b"]) {
+      this.checkFlags[c] = parseInt(flags.charAt(c == "w" ? 0 : 1));
+    }
+  }
+
+  aggregateFlags() {
+    return [this.castleFlags, this.checkFlags];
+  }
+
+  disaggregateFlags(flags) {
+    this.castleFlags = flags[0];
+    this.checkFlags = flags[1];
+  }
+
+  getPpath(b) {
+    if (b[1] == 'k' && this.checkFlags[b[0]] > 0)
+      return "Check3/" + b[0] + 'k_' + this.checkFlags[b[0]];
+    return b;
+  }
+
+  updateVariables(move) {
+    super.updateVariables(move);
+    // Does this move give check?
+    const oppCol = this.turn;
+    if (this.underCheck(oppCol))
+      this.checkFlags[oppCol]++;
+  }
+
+  getCurrentScore() {
+    const color = this.turn;
+    if (this.checkFlags[color] >= 3)
+      return color == "w" ? "0-1" : "1-0";
+    return super.getCurrentScore();
+  }
+
+  static GenRandInitFen() {
+    const randFen = ChessRules.GenRandInitFen();
+    // Add check flags (at 0)
+    return randFen.replace(" w 0 1111", " w 0 111100");
+  }
+
+  getFlagsFen() {
+    let fen = super.getFlagsFen();
+    // Add check flags
+    for (let c of ["w", "b"])
+      fen += this.checkFlags[c];
+    return fen;
+  }
+
+  evalPosition() {
+    const baseEval = super.evalPosition();
+    // Take number of checks into account
+    return baseEval/5 - this.checkFlags["w"] + this.checkFlags["b"];
   }
 };