Add variant falcon

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index d72a13b..dea62b1 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -90,6 +90,7 @@ int Fifty;
 int UnderProm;\r
 int GameNr;\r
 int Resign;\r
+int Cambodian;\r
 int Threshold = 800;\r
 int Score;\r
 int makruk;\r
@@ -255,7 +256,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       }\r
       s=t;v=r^flag>>12;                        /* calc. alternated vector  */\r
       if(flag&15^4|u&32||                      /* no double or moved before*/\r
-         p>2&&                                 /* no P & no lateral K move,*/\r
+         p>2&!(flag&S)&&                       /* no P & no virgin jump,   */\r
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */\r
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */\r
         )t+=flag&4;                            /* fake capt. for nonsliding*/\r
@@ -382,7 +383,7 @@ InitGame()
  for(i=0;i<16*BH;i++)b[i]=0;\r
  for(i=0;i<32;i++)pl[i]=0;\r
  K=BW;W(K--)\r
- {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/\r
+ {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16+16*!!makruk]=18;b[K+96-16*!!makruk]=1; /* initial board setup*/\r
   pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;\r
   if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;\r
   if(w[oo[K]] == -1)pl[oo[K]]=1;\r
@@ -412,7 +413,7 @@ void CopyBoard(int s)
                                          \r
 void PrintVariants(int combo)\r
 {\r
-        int i, j, count=0, total=0; char c, buf[80];\r
+        int i, j, count=0, total=0; char c=EOF+1, buf[80];\r
         FILE *f;\r
 \r
         f = fopen(INI_FILE, "r");\r
@@ -441,6 +442,7 @@ void PrintOptions()
        printf("feature option=\"Ini File -file %s\"\n", inifile);\r
        printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);\r
        printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");\r
+       printf("feature option=\"Cambodian Makruk rules -check %d\"\n", Cambodian);\r
        printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");\r
        printf("feature option=\"Dummy String Example -string happy birthday!\"\n");\r
        printf("feature option=\"Dummy Path Example -path .\"\n");\r
@@ -465,6 +467,7 @@ int LoadGame(char *name)
         gating = 0;\r
         if(name != NULL)\r
         {  /* search for game name in definition file */\r
+           if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else\r
            if(!strcmp(name, "fairy")) name = selectedFairy;\r
            gating = !strcmp(name, "seirawan");\r
            while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\r
@@ -732,6 +735,7 @@ int main(int argc, char **argv)
                        if(sscanf(line+7, "Clear Hash") == 1) for(i=0; i<U; i++) A->K = 0;\r
                        if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;\r
                        if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;\r
+                       if(sscanf(line+7, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;\r
                        continue;\r
                }\r
                if (!strcmp(command, "go")) {\r
@@ -827,15 +831,12 @@ int main(int argc, char **argv)
                                             break;\r
                                         default:\r
                                             b[m]=p+color+32; // assume non-virgin\r
+                                           if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square\r
+                                               color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
                                             if(w[p]<0) { // Royal piece on original square: virgin\r
-                                               if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
                                                 Q-=w[p]; // assume value was flipped to indicate royalty\r
                                                 if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material\r
                                            } else { Q+=w[p]; R+=w[p]/FAC; }\r
-                                            if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||\r
-                                               (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
-                                                b[m] &= ~32; // corner piece as in original setup: virgin\r
                                        case 0: // undefined piece, ignore\r
                                             break;\r
                                         }\r
@@ -866,6 +867,7 @@ int main(int argc, char **argv)
                 else { int i=-1;\r
                     if(b[L] && (b[L]&16) == Side && w[b[L]&15] < 0) // capture own King: castling\r
                     { i=K; K = L; L = i>L ? i-1 : i+2; }\r
+                   if(w[GT&15] < -1) pl[GT&31]++, J+=89729; // promotion to royal piece\r
                     if(b[K]&32) GT = 0; // non-virgin mover => true promotion rather than gating\r
                     if(D(Side,-I,I,Q,O,LL|S,3)!=I) {\r
                         /* did have move syntax, but illegal move */\r