Generalize pawn movements: cleaner and smaller code

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

diff --git a/client/src/variants/Allmate2.js b/client/src/variants/Allmate2.js
index daa3542..386bf69 100644 (file)
--- a/client/src/variants/Allmate2.js
+++ b/client/src/variants/Allmate2.js
@@ -1,6 +1,6 @@
 import { ChessRules, PiPo, Move } from "@/base_rules";
 
-export const VariantRules = class Allmate2Rules extends ChessRules {
+export class Allmate2Rules extends ChessRules {
   static get HasEnpassant() {
     return false;
   }
@@ -32,7 +32,7 @@ export const VariantRules = class Allmate2Rules extends ChessRules {
       let attacked = {};
       for (let i=0; i<V.size.x; i++) {
         for (let j=0; j<V.size.y; j++) {
-          if (this.getColor(i,j) == oppCol && this.isAttacked([i,j], [color]))
+          if (this.getColor(i,j) == oppCol && this.isAttacked([i,j], color))
             attacked[i+"_"+j] = [i,j];
         }
       }
@@ -74,7 +74,7 @@ export const VariantRules = class Allmate2Rules extends ChessRules {
                 if (om.start.x == sq[0] && om.start.y == sq[1])
                   // Piece moved:
                   sq = [om.appear[0].x, om.appear[0].y];
-                if (!this.isAttacked(sq, [color]))
+                if (!this.isAttacked(sq, color))
                   delete attacked[origSq[0]+"_"+origSq[1]];
               });
               V.UndoOnBoard(this.board, om);
@@ -226,7 +226,7 @@ export const VariantRules = class Allmate2Rules extends ChessRules {
                 if (em.start.x == attacked[0] && em.start.y == attacked[1])
                   // King moved:
                   sq = [em.appear[0].x, em.appear[0].y];
-                if (!this.isAttacked(sq, [oppCol]))
+                if (!this.isAttacked(sq, oppCol))
                   res = true;
                 V.UndoOnBoard(this.board, em);
                 if (res)