X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=client%2Fsrc%2Fvariants%2FCwda.js;h=c5ecf092e64fdab34db0972608efd0c8786fd310;hb=74afb57db5e15af26de042ba3f70f3409f13cb5f;hp=9142d4684b80ec02cea950a150034f45bc8e0383;hpb=b2f43cc30477acd48ab83ed8b792dd9521dab502;p=vchess.git

diff --git a/client/src/variants/Cwda.js b/client/src/variants/Cwda.js
index 9142d468..c5ecf092 100644
--- a/client/src/variants/Cwda.js
+++ b/client/src/variants/Cwda.js
@@ -55,7 +55,8 @@ export class CwdaRules extends ChessRules {
         'n': 'w',
         'b': 'f',
         'q': 'c',
-        'k': 'k'
+        'k': 'k',
+        'p': 'p'
       },
       // Nutty Knights
       'N': {
@@ -63,7 +64,8 @@ export class CwdaRules extends ChessRules {
         'n': 'i',
         'b': 't',
         'q': 'l',
-        'k': 'k'
+        'k': 'k', //TODO: e
+        'p': 'p' //TODO: v
       },
       // Remarkable Rookies
       'R': {
@@ -71,26 +73,31 @@ export class CwdaRules extends ChessRules {
         'n': 'y',
         'b': 'h',
         'q': 'o',
-        'k': 'k'
+        'k': 'a',
+        'p': 'u'
       }
     };
   }
 
   static GenRandInitFen(options) {
     const baseFen = ChessRules.GenRandInitFen(options.randomness);
-    let blackLine = baseFen.substr(0, 8);
+    let blackLine = baseFen.substr(0, 8), blackPawns = "pppppppp";
     if (options.army2 != 'F') {
       blackLine = blackLine.split('')
         .map(p => V.PiecesMap[options.army2][p]).join('');
+      blackPawns = V.PiecesMap[options.army2]['p'].repeat(8);
     }
-    let whiteLine = baseFen.substr(35, 8);
+    let whiteLine = baseFen.substr(35, 8), whitePawns = "PPPPPPPP";
     if (options.army1 != 'F') {
       whiteLine = whiteLine.split('')
         .map(p => V.PiecesMap[options.army1][p.toLowerCase()])
         .join('').toUpperCase();
+      whitePawns = V.PiecesMap[options.army1]['p'].toUpperCase().repeat(8);
     }
     return (
-      blackLine + baseFen.substring(8, 35) + whiteLine +
+      blackLine + "/" + blackPawns +
+      baseFen.substring(17, 26) +
+      whitePawns + "/" + whiteLine +
       baseFen.substr(43) + " " + options.army1 + options.army2
     );
   }
@@ -112,8 +119,7 @@ export class CwdaRules extends ChessRules {
   static IsGoodFen(fen) {
     if (!ChessRules.IsGoodFen(fen)) return false;
     const armies = V.ParseFen(fen).armies;
-    if (!armies || !armies.match(/^[CNRF]{2,2}$/)) return false;
-    return true;
+    return (!!armies && armies.match(/^[CNRF]{2,2}$/));
   }
 
   getFen() {
@@ -144,6 +150,12 @@ export class CwdaRules extends ChessRules {
   static get N_QUEEN() {
     return 'l';
   }
+  static get N_KING() {
+    return 'e';
+  }
+  static get N_PAWN() {
+    return 'v';
+  }
   static get R_ROOK() {
     return 's';
   }
@@ -156,12 +168,28 @@ export class CwdaRules extends ChessRules {
   static get R_QUEEN() {
     return 'o';
   }
+  static get R_KING() {
+    return 'a';
+  }
+  static get R_PAWN() {
+    return 'u';
+  }
+
+  getPiece(x, y) {
+    const p = this.board[x][y][1];
+    if (['u', 'v'].includes(p)) return 'p';
+    if (['a', 'e'].includes(p)) return 'k';
+    return p;
+  }
 
   static get PIECES() {
     return ChessRules.PIECES.concat(
-      [V.C_ROOK, V.C_KNIGHT, V.C_BISHOP, V.C_QUEEN]).concat(
-      [V.N_ROOK, V.N_KNIGHT, V.N_BISHOP, V.N_QUEEN]).concat(
-      [V.R_ROOK, V.R_KNIGHT, V.R_BISHOP, V.R_QUEEN]);
+      [
+        V.C_ROOK, V.C_KNIGHT, V.C_BISHOP, V.C_QUEEN,
+        V.N_ROOK, V.N_KNIGHT, V.N_BISHOP, V.N_QUEEN, V.N_KING, V.N_PAWN,
+        V.R_ROOK, V.R_KNIGHT, V.R_BISHOP, V.R_QUEEN, V.R_KING, V.R_PAWN
+      ]
+    );
   }
 
   getPotentialMovesFrom(sq) {
@@ -304,13 +332,9 @@ export class CwdaRules extends ChessRules {
   }
 
   getPotentialN_knightMoves(sq) {
-    const backward = (this.turn == 'w' ? 1 : -1);
-    const kingSteps = [
-      [0, -1], [0, 1], [backward, -1], [backward, 0], [backward, 1]
-    ];
     return (
       this.getSlideNJumpMoves(sq, V.steps.$n, 1).concat(
-      this.getSlideNJumpMoves(sq, kingSteps, 1))
+      this.getSlideNJumpMoves(sq, V.steps.f, 1))
     );
   }
 
@@ -445,13 +469,9 @@ export class CwdaRules extends ChessRules {
   }
 
   isAttackedByN_knight(sq, color) {
-    const backward = (color == 'w' ? -1 : 1);
-    const kingSteps = [
-      [0, -1], [0, 1], [backward, -1], [backward, 0], [backward, 1]
-    ];
     return (
-      this.isAttackedBySlideNJump(sq, color, V.N_KNIGHT, V.steps.$n) ||
-      this.isAttackedBySlideNJump(sq, color, V.N_KNIGHT, kingSteps, 1)
+      this.isAttackedBySlideNJump(sq, color, V.N_KNIGHT, V.steps.$n, 1) ||
+      this.isAttackedBySlideNJump(sq, color, V.N_KNIGHT, V.steps.f, 1)
     );
   }