Account for Elephant and Hawk in Seirawan game stage
[fairymax.git] / fairymax.c
index 3a89dd5..072e67f 100644 (file)
@@ -68,10 +68,10 @@ int StartKey;
 #endif\r
 \r
 /* make unique integer from engine move representation */\r
-#define PACK_MOVE 256*K + L;\r
+#define PACK_MOVE 256*K + L + (PromPiece << 16);\r
 \r
 /* convert intger argument back to engine move representation */\r
-#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255;\r
+#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255;\r
 \r
 /* Global variables visible to engine. Normally they */\r
 /* would be replaced by the names under which these  */\r
@@ -225,6 +225,8 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
           R-=i/FAC;                            /*** total captd material ***/\r
           Fifty = t|p<3?0:Fifty+1;\r
           sp=ps;\r
+          if(!(u&32)&PromPiece&(K&112)==(k?0:112))\r
+           prom=b[K]=39+k-PromPiece,J+=333,pl[k+14-PromPiece]--; /* gating    */\r
                      return l;}                /*   & not in check, signal */\r
          v=m;                                  /* (prevent fail-lows on    */\r
         }                                      /*   K-capt. replies)       */\r
@@ -544,9 +546,12 @@ int main(int argc, char **argv)
                         tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);\r
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
                         PromPiece = 0; /* Always promote to Queen ourselves */\r
+                        if(pl[Side+13])PromPiece=1;else if(pl[Side+15])PromPiece=-1; /* S-Chess gating */\r
                         N=0;K=I;\r
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
                             Side ^= BLACK^WHITE;\r
+                            if(b[K]&&Score+D(Side,-I,I,Q,2*S,2*S,2)>S)\r
+                                prom=b[K]=0,J-=333,pl[30-Side-PromPiece]++; /* undo bad gating */\r
                             if(UnderProm>=0 && UnderProm != L)\r
                             {    printf("tellics I hate under-promotions!\n");\r
                                  printf("resign { underpromotion } \n");\r
@@ -779,6 +784,7 @@ int main(int argc, char **argv)
                         sscanf(line, "variant %s", command);\r
                         LoadGame(command);\r
                         InitGame(); Setup = 0;\r
+                        if(strstr(command,"seirawan")) pl[13] = pl[15] = pl[29] = pl[31] = 1, R += 2*(w[6]/FAC + w[8]/FAC);\r
                        continue;\r
                }\r
                 if (!strcmp(command, "edit")) {\r