Cleaner fen generation + first draft of Apocalypse + a few fixes

[xogo.git] / variants / Chakart / class.js

diff --git a/variants/Chakart/class.js b/variants/Chakart/class.js
index eab2a36..815be74 100644 (file)
--- a/variants/Chakart/class.js
+++ b/variants/Chakart/class.js
@@ -1,7 +1,7 @@
 import ChessRules from "/base_rules.js";
 import GiveawayRules from "/variants/Giveaway/class.js";
-import { ArrayFun } from "/utils/array.js";
-import { Random } from "/utils/alea.js";
+import {ArrayFun} from "/utils/array.js";
+import {Random} from "/utils/alea.js";
 import PiPo from "/utils/PiPo.js";
 import Move from "/utils/Move.js";
 
@@ -127,18 +127,16 @@ export default class ChakartRules extends ChessRules {
           ]
         }
       },
-      specials, bowsered, super.pieces(color, x, y));
+      specials, bowsered, super.pieces(color, x, y)
+    );
   }
 
-  genRandInitFen(seed) {
+  genRandInitBaseFen() {
     const options = Object.assign({mode: "suicide"}, this.options);
     const gr = new GiveawayRules({options: options, genFenOnly: true});
-    const baseFen = gr.genRandInitFen(seed);
-    const fenParts = baseFen.split(" ");
-    let others = JSON.parse(fenParts[3]);
-    delete others["enpassant"];
-    others["flags"] = "1111"; //Peach + Mario flags
-    return fenParts.slice(0, 3).join(" ") + " " + JSON.stringify(others);
+    let res = gr.genRandInitBaseFen();
+    res.o["flags"] = "1111"; //Peach + Mario flags
+    return res;
   }
 
   fen2board(f) {
@@ -189,31 +187,24 @@ export default class ChakartRules extends ChessRules {
     this.reserve = {}; //to be filled later
   }
 
+  canStepOver(i, j) {
+    return (
+      this.board[i][j] == "" ||
+      ['i', V.EGG, V.MUSHROOM].includes(this.getPiece(i, j))
+    );
+  }
+
   // For Toadette bonus
-  getDropMovesFrom([c, p]) {
-    if (typeof c != "string" || this.reserve[c][p] == 0)
-      return [];
-    let moves = [];
-    const start = (c == 'w' && p == 'p' ? 1 : 0);
-    const end = (c == 'b' && p == 'p' ? 7 : 8);
-    for (let i = start; i < end; i++) {
-      for (let j = 0; j < this.size.y; j++) {
-        const pieceIJ = this.getPiece(i, j);
-        const colIJ = this.getColor(i, j);
-        if (this.board[i][j] == "" || colIJ == 'a' || pieceIJ == 'i') {
-          let m = new Move({
-            start: {x: c, y: p},
-            appear: [new PiPo({x: i, y: j, c: c, p: p})],
-            vanish: []
-          });
-          // A drop move may remove a bonus (or hidden queen!)
-          if (this.board[i][j] != "")
-            m.vanish.push(new PiPo({x: i, y: j, c: colIJ, p: pieceIJ}));
-          moves.push(m);
-        }
-      }
-    }
-    return moves;
+  canDrop([c, p], [i, j]) {
+    return (
+      (
+        this.board[i][j] == "" ||
+        this.getColor(i, j) == 'a' ||
+        this.getPiece(i, j) == 'i'
+      )
+      &&
+      (p != "p" || (c == 'w' && i < this.size.x - 1) || (c == 'b' && i > 0))
+    );
   }
 
   getPotentialMovesFrom([x, y]) {
@@ -276,20 +267,13 @@ export default class ChakartRules extends ChessRules {
         case 'b':
         case 'r':
           // Explicitely listing types to avoid moving immobilized piece
-          moves = this.getPotentialMovesOf(piece, [x, y]);
+          moves = super.getPotentialMovesOf(piece, [x, y]);
           break;
       }
     }
     return moves;
   }
 
-  canStepOver(i, j) {
-    return (
-      this.board[i][j] == "" ||
-      ['i', V.EGG, V.MUSHROOM].includes(this.getPiece(i, j))
-    );
-  }
-
   getPawnMovesFrom([x, y]) {
     const color = this.turn;
     const oppCol = C.GetOppCol(color);
@@ -355,14 +339,14 @@ export default class ChakartRules extends ChessRules {
 
   getKnightMovesFrom([x, y]) {
     // Add egg on initial square:
-    return this.getPotentialMovesOf('n', [x, y]).map(m => {
+    return super.getPotentialMovesOf('n', [x, y]).map(m => {
       m.appear.push(new PiPo({p: "e", c: "a", x: x, y: y}));
       return m;
     });
   }
 
   getQueenMovesFrom(sq) {
-    const normalMoves = this.getPotentialMovesOf('q', sq);
+    const normalMoves = super.getPotentialMovesOf('q', sq);
     // If flag allows it, add 'invisible movements'
     let invisibleMoves = [];
     if (this.powerFlags[this.turn]['q']) {
@@ -384,10 +368,10 @@ export default class ChakartRules extends ChessRules {
   }
 
   getKingMovesFrom([x, y]) {
-    let moves = this.getPotentialMovesOf('k', [x, y]);
+    let moves = super.getPotentialMovesOf('k', [x, y]);
     // If flag allows it, add 'remote shell captures'
     if (this.powerFlags[this.turn]['k']) {
-      let shellCaptures = this.getPotentialMovesOf('y', [x, y]);
+      let shellCaptures = super.getPotentialMovesOf('y', [x, y]);
       shellCaptures.forEach(sc => {
         sc.shell = true; //easier play()
         sc.choice = 'z'; //to display in showChoices()
@@ -472,7 +456,11 @@ export default class ChakartRules extends ChessRules {
             this.getColor(i, j) == oppCol
           ) {
             const pieceIJ = this.getPiece(i, j);
-            if (pieceIJ == 'i') {
+            if (
+              pieceIJ == 'i' &&
+              // Ensure that current move doesn't erase invisible queen
+              move.appear.every(a => a.x != i || a.y != j)
+            ) {
               move.vanish.push(new PiPo({x: i, y: j, c: oppCol, p: 'i'}));
               move.appear.push(new PiPo({x: i, y: j, c: oppCol, p: 'q'}));
             }