Add Checkered1 + fix last move highlights

[vchess.git] / client / src / variants / Atomic.js

diff --git a/client/src/variants/Atomic.js b/client/src/variants/Atomic.js
index 51346da..9675c58 100644 (file)
--- a/client/src/variants/Atomic.js
+++ b/client/src/variants/Atomic.js
@@ -1,13 +1,6 @@
 import { ChessRules, PiPo } from "@/base_rules";
 
-export const VariantRules = class AtomicRules extends ChessRules {
-  getEpSquare(moveOrSquare) {
-    if (typeof moveOrSquare !== "object" || moveOrSquare.appear.length > 0)
-      return super.getEpSquare(moveOrSquare);
-    // Capturing move: no en-passant
-    return undefined;
-  }
-
+export class AtomicRules extends ChessRules {
   getPotentialMovesFrom([x, y]) {
     let moves = super.getPotentialMovesFrom([x, y]);
 
@@ -65,18 +58,21 @@ export const VariantRules = class AtomicRules extends ChessRules {
     return moves.concat(this.getCastleMoves([x, y]));
   }
 
-  isAttacked(sq, colors) {
+  isAttacked(sq, color) {
     if (
       this.getPiece(sq[0], sq[1]) == V.KING &&
-      this.isAttackedByKing(sq, colors)
-    )
-      return false; //king cannot take...
+      this.isAttackedByKing(sq, color)
+    ) {
+      // A king next to the enemy king is immune to attacks
+      return false;
+    }
     return (
-      this.isAttackedByPawn(sq, colors) ||
-      this.isAttackedByRook(sq, colors) ||
-      this.isAttackedByKnight(sq, colors) ||
-      this.isAttackedByBishop(sq, colors) ||
-      this.isAttackedByQueen(sq, colors)
+      this.isAttackedByPawn(sq, color) ||
+      this.isAttackedByRook(sq, color) ||
+      this.isAttackedByKnight(sq, color) ||
+      this.isAttackedByBishop(sq, color) ||
+      this.isAttackedByQueen(sq, color)
+      // No "attackedByKing": it cannot take
     );
   }
 
@@ -127,15 +123,16 @@ export const VariantRules = class AtomicRules extends ChessRules {
     // If opponent king disappeared, move is valid
     else if (this.kingPos[oppCol][0] < 0) res = false;
     // Otherwise, if we remain under check, move is not valid
-    else res = this.isAttacked(this.kingPos[color], [oppCol]);
+    else res = this.isAttacked(this.kingPos[color], oppCol);
     return res;
   }
 
-  getCheckSquares(color) {
+  getCheckSquares() {
+    const color = this.turn;
     let res = [];
     if (
       this.kingPos[color][0] >= 0 && //king might have exploded
-      this.isAttacked(this.kingPos[color], [V.GetOppCol(color)])
+      this.isAttacked(this.kingPos[color], V.GetOppCol(color))
     ) {
       res = [JSON.parse(JSON.stringify(this.kingPos[color]))];
     }
@@ -148,9 +145,8 @@ export const VariantRules = class AtomicRules extends ChessRules {
     if (kp[0] < 0)
       // King disappeared
       return color == "w" ? "0-1" : "1-0";
-    if (this.atLeastOneMove())
-      return "*";
-    if (!this.isAttacked(kp, [V.GetOppCol(color)])) return "1/2";
+    if (this.atLeastOneMove()) return "*";
+    if (!this.isAttacked(kp, V.GetOppCol(color))) return "1/2";
     return color == "w" ? "0-1" : "1-0"; //checkmate
   }
 };