X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FExtinction.js;h=db8abc0622f3008c961d06fc9492f6a64fec5625;hb=e50a802531b99829c533f22ecd21e359e7e1e049;hp=748f9e46d3e488a4d7f7e34abcaf01fc96fa642e;hpb=0c3fe8a6c3e02af46e0bc646b40c1a0c420f9dcd;p=vchess.git

diff --git a/client/src/variants/Extinction.js b/client/src/variants/Extinction.js
index 748f9e46..db8abc06 100644
--- a/client/src/variants/Extinction.js
+++ b/client/src/variants/Extinction.js
@@ -1,131 +1,116 @@
 import { ChessRules } from "@/base_rules";
 
-export const VariantRules = class  ExtinctionRules extends ChessRules
-{
-	setOtherVariables(fen)
-	{
-		super.setOtherVariables(fen);
-		const pos = V.ParseFen(fen).position;
-		// NOTE: no need for safety "|| []", because each piece type must be present
-		// (otherwise game is already over!)
-		this.material =
-		{
-			"w":
-			{
-				[V.KING]: pos.match(/K/g).length,
-				[V.QUEEN]: pos.match(/Q/g).length,
-				[V.ROOK]: pos.match(/R/g).length,
-				[V.KNIGHT]: pos.match(/N/g).length,
-				[V.BISHOP]: pos.match(/B/g).length,
-				[V.PAWN]: pos.match(/P/g).length
-			},
-			"b":
-			{
-				[V.KING]: pos.match(/k/g).length,
-				[V.QUEEN]: pos.match(/q/g).length,
-				[V.ROOK]: pos.match(/r/g).length,
-				[V.KNIGHT]: pos.match(/n/g).length,
-				[V.BISHOP]: pos.match(/b/g).length,
-				[V.PAWN]: pos.match(/p/g).length
-			}
-		};
-	}
+export class ExtinctionRules extends ChessRules {
+  static get PawnSpecs() {
+    return Object.assign(
+      {},
+      ChessRules.PawnSpecs,
+      { promotions: ChessRules.PawnSpecs.promotions.concat([V.KING]) }
+    );
+  }
 
-	getPotentialPawnMoves([x,y])
-	{
-		let moves = super.getPotentialPawnMoves([x,y]);
-		// Add potential promotions into king
-		const color = this.turn;
-		const shift = (color == "w" ? -1 : 1);
-		const lastRank = (color == "w" ? 0 : V.size.x-1);
+  static IsGoodPosition(position) {
+    if (!ChessRules.IsGoodPosition(position)) return false;
+    // Also check that each piece type is present
+    const rows = position.split("/");
+    let pieces = {};
+    for (let row of rows) {
+      for (let i = 0; i < row.length; i++) {
+        if (isNaN(parseInt(row[i], 10)) && !pieces[row[i]])
+          pieces[row[i]] = true;
+      }
+    }
+    if (Object.keys(pieces).length != 12) return false;
+    return true;
+  }
 
-		if (x+shift == lastRank)
-		{
-			// Normal move
-			if (this.board[x+shift][y] == V.EMPTY)
-				moves.push(this.getBasicMove([x,y], [x+shift,y], {c:color,p:V.KING}));
-			// Captures
-			if (y>0 && this.board[x+shift][y-1] != V.EMPTY
-				&& this.canTake([x,y], [x+shift,y-1]))
-			{
-				moves.push(this.getBasicMove([x,y], [x+shift,y-1], {c:color,p:V.KING}));
-			}
-			if (y<V.size.y-1 && this.board[x+shift][y+1] != V.EMPTY
-				&& this.canTake([x,y], [x+shift,y+1]))
-			{
-				moves.push(this.getBasicMove([x,y], [x+shift,y+1], {c:color,p:V.KING}));
-			}
-		}
+  setOtherVariables(fen) {
+    super.setOtherVariables(fen);
+    const pos = V.ParseFen(fen).position;
+    // NOTE: no need for safety "|| []", because each piece type is present
+    // (otherwise game is already over!)
+    this.material = {
+      w: {
+        [V.KING]: pos.match(/K/g).length,
+        [V.QUEEN]: pos.match(/Q/g).length,
+        [V.ROOK]: pos.match(/R/g).length,
+        [V.KNIGHT]: pos.match(/N/g).length,
+        [V.BISHOP]: pos.match(/B/g).length,
+        [V.PAWN]: pos.match(/P/g).length
+      },
+      b: {
+        [V.KING]: pos.match(/k/g).length,
+        [V.QUEEN]: pos.match(/q/g).length,
+        [V.ROOK]: pos.match(/r/g).length,
+        [V.KNIGHT]: pos.match(/n/g).length,
+        [V.BISHOP]: pos.match(/b/g).length,
+        [V.PAWN]: pos.match(/p/g).length
+      }
+    };
+  }
 
-		return moves;
-	}
+  // TODO: verify this assertion
+  atLeastOneMove() {
+    return true; //always at least one possible move
+  }
 
-	// TODO: verify this assertion
-	atLeastOneMove()
-	{
-		return true; //always at least one possible move
-	}
+  filterValid(moves) {
+    return moves; //there is no check
+  }
 
-	underCheck(color)
-	{
-		return false; //there is no check
-	}
+  getCheckSquares() {
+    return [];
+  }
 
-	getCheckSquares(color)
-	{
-		return [];
-	}
+  postPlay(move) {
+    super.postPlay(move);
+    // Treat the promotion case: (not the capture part)
+    if (move.appear[0].p != move.vanish[0].p) {
+      this.material[move.appear[0].c][move.appear[0].p]++;
+      this.material[move.appear[0].c][V.PAWN]--;
+    }
+    if (move.vanish.length == 2 && move.appear.length == 1)
+      //capture
+      this.material[move.vanish[1].c][move.vanish[1].p]--;
+  }
 
-	updateVariables(move)
-	{
-		super.updateVariables(move);
-		// Treat the promotion case: (not the capture part)
-		if (move.appear[0].p != move.vanish[0].p)
-		{
-			this.material[move.appear[0].c][move.appear[0].p]++;
-			this.material[move.appear[0].c][V.PAWN]--;
-		}
-		if (move.vanish.length==2 && move.appear.length==1) //capture
-			this.material[move.vanish[1].c][move.vanish[1].p]--;
-	}
+  postUndo(move) {
+    super.postUndo(move);
+    if (move.appear[0].p != move.vanish[0].p) {
+      this.material[move.appear[0].c][move.appear[0].p]--;
+      this.material[move.appear[0].c][V.PAWN]++;
+    }
+    if (move.vanish.length == 2 && move.appear.length == 1)
+      this.material[move.vanish[1].c][move.vanish[1].p]++;
+  }
 
-	unupdateVariables(move)
-	{
-		super.unupdateVariables(move);
-		if (move.appear[0].p != move.vanish[0].p)
-		{
-			this.material[move.appear[0].c][move.appear[0].p]--;
-			this.material[move.appear[0].c][V.PAWN]++;
-		}
-		if (move.vanish.length==2 && move.appear.length==1)
-			this.material[move.vanish[1].c][move.vanish[1].p]++;
-	}
+  getCurrentScore() {
+    if (this.atLeastOneMove()) {
+      // Game not over?
+      const color = this.turn;
+      if (
+        Object.keys(this.material[color]).some(p => {
+          return this.material[color][p] == 0;
+        })
+      ) {
+        return this.turn == "w" ? "0-1" : "1-0";
+      }
+      return "*";
+    }
+    return this.turn == "w" ? "0-1" : "1-0"; //NOTE: currently unreachable...
+  }
 
-	getCurrentScore()
-	{
-		if (this.atLeastOneMove()) // game not over?
-		{
-			const color = this.turn;
-			if (Object.keys(this.material[color]).some(
-				p => { return this.material[color][p] == 0; }))
-			{
-				return (this.turn == "w" ? "0-1" : "1-0");
-			}
-			return "*";
-		}
-
-		return (this.turn == "w" ? "0-1" : "1-0"); //NOTE: currently unreachable...
-	}
-
-	evalPosition()
-	{
-		const color = this.turn;
-		if (Object.keys(this.material[color]).some(
-			p => { return this.material[color][p] == 0; }))
-		{
-			// Very negative (resp. positive) if white (reps. black) pieces set is incomplete
-			return (color=="w"?-1:1) * V.INFINITY;
-		}
-		return super.evalPosition();
-	}
-}
+  evalPosition() {
+    const color = this.turn;
+    if (
+      Object.keys(this.material[color]).some(p => {
+        return this.material[color][p] == 0;
+      })
+    ) {
+      // Very negative (resp. positive)
+      // if white (reps. black) pieces set is incomplete
+      return (color == "w" ? -1 : 1) * V.INFINITY;
+    }
+    return super.evalPosition();
+  }
+};