X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=hachu.c;h=173aae96c176820fdc7247f3f9d60efc2424403b;hb=6b60ddf69ce961d41a579a258444f653729e5c95;hp=ad2904e2c4e239147f738e8975b33b2c57e5d918;hpb=fbdf26b9d971d08e990b906d65e27bc463571212;p=hachu.git

diff --git a/hachu.c b/hachu.c
index ad2904e..173aae9 100644
--- a/hachu.c
+++ b/hachu.c
@@ -11,7 +11,7 @@
 // promotions by pieces with Lion power stepping in & out the zone in same turn
 // promotion on capture
 
-#define VERSION "0.1beta"
+#define VERSION "0.4beta"
 
 #define PATH level==0 || path[0] == 0xc4028 &&  (level==1 /*|| path[1] == 0x75967 && (level == 2 || path[2] == 0x3400b && (level == 3))*/)
 //define PATH 0
@@ -40,7 +40,7 @@
 #define BSIZE BWMAX*BHMAX
 #define ZONE  zone
 
-#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS)
+#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS || currentVariant == V_SHATRANJ)
 
 #define BLACK      0
 #define WHITE      1
@@ -92,8 +92,8 @@ typedef struct {
 } UndoInfo;
 
 char *array, fenArray[4000], *reason;
-int bWidth, bHeight, bsize, zone, currentVariant;
-int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, chuFlag=1, tenFlag, mobilityScore;
+int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag;
+int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;
 int nodes, startTime, tlim1, tlim2, repCnt, comp;
 Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300];
 
@@ -326,6 +326,16 @@ PieceDesc chessPieces[] = {
   { NULL }  // sentinel
 };
 
+PieceDesc shatranjPieces[] = {
+  {"Q", "",  15, { 0,1,0,1,0,1,0,1 } },
+  {"R", "",  50, { X,0,X,0,X,0,X,0 } },
+  {"B", "",   9, { 0,J,0,J,0,J,0,J } },
+  {"N", "",  30, { N,N,N,N,N,N,N,N } },
+  {"K", "",  28, { 1,1,1,1,1,1,1,1 } },
+  {"P", "Q",  8, { M,C,0,0,0,0,0,C } },
+  { NULL }  // sentinel
+};
+
 char chuArray[] = "L:FLCSGK:DEGSC:FLL/:RV.B.:BT:KN:PH:BT.B.:RV/:SM:VMR:DH:DK:LN:FK:DK:DHR:VM:SM/PPPPPPPPPPPP/...:GB....:GB..."
 		  "/............/............/"
 		  "...:gb....:gb.../pppppppppppp/:sm:vmr:dh:dk:fk:ln:dk:dhr:vm:sm/:rv.b.:bt:ph:kn:bt.b.:rv/l:flcsg:dekgsc:fll";
@@ -339,6 +349,7 @@ char tenArray[] = "LN:FLICSGK:DEGSCI:FLNL/:RV.:CS:CS.:BT:KN:LN:FK:PH:BT.:CS:CS.:
 		  ":ss:vsb:dh:dk:wb:fi:fe:lh:fi:wb:dk:dhb:vs:ss/:rv.:cs:cs.:bt:ph:fk:ln:kn:bt.:cs:cs.:rv/ln:flicsg:dekgsci:flnl";
 char shoArray[] = "LNSGKGSNL/.B..:DE..R./PPPPPPPPP/........./........./........./ppppppppp/.r..:de..b./lnsgkgsnl";
 char chessArray[] = "RNBQKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbqkbnr";
+char shatArray[]= "RNBKQBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbkqbnr";
 
 typedef struct {
   int boardWidth, boardFiles, boardRanks, zoneDepth, varNr; // board sizes
@@ -346,7 +357,7 @@ typedef struct {
   char *array; // initial position
 } VariantDesc;
 
-typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU } Variant;
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_SHATRANJ } Variant;
 
 VariantDesc variants[] = {
   { 16,  8,  8, 1, V_CHESS,  "normal", chessArray }, // FIDE
@@ -354,6 +365,8 @@ VariantDesc variants[] = {
   { 24, 12, 12, 4, V_CHU,     "chu",     chuArray }, // Chu
   { 30, 15, 15, 5, V_DAI,     "dai",     daiArray }, // Dai
   { 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray }, // Tenjiku
+  { 16,  8,  8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj
+
 //  { 0, 0, 0, 0, 0 }, // sentinel
   { 34, 17, 17, 0, V_DADA,    "dada",    chuArray }, // Dai Dai
   { 38, 19, 19, 0, V_MAKA,    "maka",    chuArray }, // Maka Dai Dai
@@ -534,6 +547,8 @@ LookUp (char *name, int var)
       return ListLookUp(name, chuPieces);
     case V_CHESS: // FIDE
       return ListLookUp(name, chessPieces);
+    case V_SHATRANJ: // Shatranj
+      return ListLookUp(name, shatranjPieces);
   }
   return NULL;
 }
@@ -628,6 +643,7 @@ Compactify (int stm)
     }
   }
   for(i=stm+2; i<last[stm]; i+=2) { // second pass: promoted pieces
+
     if((k = p[i].promo) == -2 && p[i].pos == ABSENT) { // orphaned promoted piece not present
       SqueezeOut(i);
     }
@@ -672,7 +688,7 @@ SetUp(char *array, int var)
   char c, *q, name[3];
   PieceDesc *p1, *p2;
   last[WHITE] = 1; last[BLACK] = 0;
-  if(var == V_CHESS) // add dummy Crown Princes
+  if(var == V_CHESS || var == V_SHATRANJ) // add dummy Crown Princes
     p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos =  p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;
   for(i=0; ; i++) {
 //printf("next rank: %s\n", array);
@@ -691,6 +707,7 @@ SetUp(char *array, int var)
 	if(name[1]) name[1] += 'A' - 'a';
       } else color = WHITE;
       p1 = LookUp(name, var);
+      if(!p1) printf("tellusererror Unknown piece '%s' in setup\n", name), exit(-1);
       if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead
       n = AddPiece(color, p1);
       p[n].pos = j;
@@ -743,6 +760,7 @@ Init (int var)
   bsize = bWidth*bHeight;
   chuFlag = (currentVariant == V_CHU);
   tenFlag = (currentVariant == V_TENJIKU);
+  chessFlag = (currentVariant == V_CHESS);
 
   for(i= -1; i<9; i++) { // board steps in linear coordinates
     kStep[i] = STEP(direction[i&7].x,   direction[i&7].y);       // King
@@ -928,8 +946,8 @@ GenNonCapts (int promoSuppress)
 	  }
 	} else
 	if(r == M) { // FIDE Pawn; check double-move
-	  if(!NewNonCapture(x, x+v, pFlag) && promoBoard[x-v])
-	    NewNonCapture(x, x+2*v+DEFER, pFlag); // use promoSuppress flag as e.p. flag
+	  if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v])
+	    NewNonCapture(x, x+2*v, pFlag), moveStack[msp-1] |= DEFER; // use promoSuppress flag as e.p. flag
 	}
 	continue;
       }
@@ -1822,8 +1840,6 @@ pmoves(int start, int end)
     #define OFF 0
     #define ON  1
 
-#define DEFAULT_FEN ""
-
 typedef Move MOVE;
 
     int moveNr;              // part of game state; incremented by MakeMove
@@ -1891,7 +1907,8 @@ Convert (char *fen)
     if(isalpha(*fen)) {
       char *table = fenNames;
       n = *fen > 'Z' ? 'a' - 'A' : 0;
-      if(table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {
+      if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ) && *fen - 'A' - n == 'N' // In Chess N is Knight, not Lion
+           || table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {
         *p++ = ':';
         *p++ = table[2* (*fen - 'A' - n)] + n;
         *p++ = table[2* (*fen - 'A' - n)+1] + n;
@@ -1990,6 +2007,7 @@ MapFromScratch(attacks);
     if((moveStack[i] & (PROMOTE | DEFER-1)) == ret) break;
     if((moveStack[i] & DEFER-1) == ret) deferred = i; // promoted version of entered non-promotion is legal
   }
+printf("# moveNr = %d in {%d,%d}\n", i, retFirst, retMSP);
   if(i>=retMSP) {  // no exact match
     if(deferred) { // but maybe non-sensical deferral
       int flags = p[board[f]].promoFlag;
@@ -2101,7 +2119,7 @@ PonderUntilInput (int stm)
     int TakeBack(int n)
     { // reset the game and then replay it to the desired point
       int last, stm;
-      stm = Setup2(NULL);
+      Init(currentVariant); stm = Setup2(NULL);
 printf("# setup done");fflush(stdout);
       last = moveNr - n; if(last < 0) last = 0;
       for(moveNr=0; moveNr<last; moveNr++) stm = MakeMove2(stm, gameMove[moveNr]),printf("make %2d: %x\n", moveNr, gameMove[moveNr]);
@@ -2134,6 +2152,7 @@ printf("# setup done");fflush(stdout);
 
         if(stm == engineSide) {         // if it is the engine's turn to move, set it thinking, and let it move
      
+pboard(board);
           score = SearchBestMove(stm, timeLeft, mps, timeControl, inc, timePerMove, &move, &ponderMove);
 
           if(move == INVALID) {         // game apparently ended
@@ -2180,8 +2199,6 @@ printf("# setup done");fflush(stdout);
         // wait for input, and read it until we have collected a complete line
         for(i = 0; (inBuf[i] = getchar()) != '\n'; i++);
         inBuf[i+1] = 0;
-pboard(board);
-pmoves(retFirst, retMSP);
 
         // extract the first word
         sscanf(inBuf, "%s", command);
@@ -2203,7 +2220,7 @@ printf("in: %s\n", command);
         }
         if(!strcmp(command, "protover")){
           printf("feature ping=1 setboard=1 colors=0 usermove=1 memory=1 debug=1 sigint=0 sigterm=0\n");
-          printf("feature variants=\"normal,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi\"\n");
+          printf("feature variants=\"normal,shatranj,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi\"\n");
           printf("feature myname=\"HaChu " VERSION "\" highlight=1\n");
           printf("feature option=\"Resign -check 0\"\n");           // example of an engine-defined option
           printf("feature option=\"Contempt -spin 0 -200 200\"\n"); // and another one
@@ -2219,7 +2236,6 @@ printf("in: %s\n", command);
           for(i=0; i<5; i++) {
             sscanf(inBuf+8, "%s", command);
             if(!strcmp(variants[i].name, command)) {
-printf("var %d\n",i);
               Init(i); stm = Setup2(NULL); break;
             }
 	  }
@@ -2231,10 +2247,10 @@ printf("var %d\n",i);
         if(!strcmp(command, "ping"))    { printf("pong%s", inBuf+4); continue; }
     //  if(!strcmp(command, ""))        { sscanf(inBuf, " %d", &); continue; }
         if(!strcmp(command, "new"))     {
-          engineSide = BLACK; Init(V_CHESS); stm = Setup2(DEFAULT_FEN); maxDepth = MAXPLY; randomize = OFF; comp = 0;
+          engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; comp = 0;
           continue;
         }
-        if(!strcmp(command, "setboard")){ engineSide = NONE;  stm = Setup2(inBuf+9); continue; }
+        if(!strcmp(command, "setboard")){ engineSide = NONE;  Init(currentVariant); stm = Setup2(inBuf+9); continue; }
         if(!strcmp(command, "easy"))    { ponder = OFF; continue; }
         if(!strcmp(command, "hard"))    { ponder = ON;  continue; }
         if(!strcmp(command, "undo"))    { stm = TakeBack(1); continue; }
@@ -2265,6 +2281,7 @@ printf("var %d\n",i);
         if(!strcmp(command, ""))  {  continue; }
         if(!strcmp(command, "usermove")){
           int move = ParseMove(inBuf+9);
+pboard(board);
           if(move == INVALID) {
             if(reason) printf("Illegal move {%s}\n", reason); else printf("%s\n", reason="Illegal move");
             if(comp) PrintResult(stm, -INF); // against computer: claim