// promotions by pieces with Lion power stepping in & out the zone in same turn\r
// promotion on capture\r
\r
-#define VERSION "0.17"\r
+#define VERSION "0.21"\r
\r
-//define PATH level==0 /*|| path[0] == 0x3490a && (level==1 || path[1] == 0x285b3 && (level == 2 || path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))))*/\r
+//define PATH level==0 || path[0] == 0x590cb && (level==1 || path[1] == 0x4c0c9 && (level == 2 || path[2] == 0x8598ca && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5))*/)))\r
#define PATH 0\r
\r
#define HASH\r
#define CHECKEXT\r
#define LMR 4\r
#define LIONTRAP\r
-#define WINGS\r
+#define XWINGS\r
#define KINGSAFETY\r
#define KSHIELD\r
-#define XFORTRESS\r
+#define FORTRESS\r
#define PAWNBLOCK\r
+#define TANDEM 100 /* bonus for pairs of attacking light steppers */\r
#define KYLIN 100 /* extra end-game value of Kylin for promotability */\r
#define PROMO 0 /* extra bonus for 'vertical' piece when it actually promotes (diagonal pieces get half) */\r
\r
#define PROMOTE (1<<2*SQLEN+1) /* promotion bit in move */\r
#define SPECIAL 1400 /* start of special moves */\r
#define BURN (SPECIAL + 96) /* start of burn encodings */\r
+#define CASTLE (SPECIAL + 100) /* castling encodings */\r
#define STEP(X,Y) (BW*(X)+ (Y))\r
#define SORTKEY(X) 0\r
\r
#define P_WHITE 0x0F\r
#define P_BLACK 0xF0\r
\r
+// Piece-Square Tables\r
+#define PST_NEUTRAL 0\r
+#define PST_STEPPER BH\r
+#define PST_WJUMPER (BW*BH)\r
+#define PST_SLIDER (BW*BH+BH)\r
+#define PST_TRAP (2*BW*BH)\r
+#define PST_CENTER (2*BW*BH+BH)\r
+#define PST_WPPROM (3*BW*BH)\r
+#define PST_BPPROM (3*BW*BH+BH)\r
+#define PST_BJUMPER (4*BW*BH)\r
+#define PST_ZONDIST (4*BW*BH+BH)\r
+#define PST_ADVANCE (5*BW*BH)\r
+#define PST_RETRACT (5*BW*BH+BH)\r
+#define PST_WFLYER (6*BW*BH)\r
+#define PST_BFLYER (6*BW*BH+BH)\r
+#define PST_LANCE (7*BW*BH)\r
+#define PST_END (8*BW*BH)\r
+\r
typedef unsigned int Move;\r
\r
char *MoveToText(Move move, int m); // from WB driver\r
void pmap(int *m, int col);\r
void pboard(int *b);\r
void pbytes(unsigned char *b);\r
+int myRandom();\r
\r
typedef struct {\r
int lock[5];\r
} PieceDesc;\r
\r
typedef struct {\r
- int from, to, piece, victim, new, booty, epSquare, epVictim[8], ep2Square, revMoveCount;\r
+ int from, to, piece, victim, new, booty, epSquare, epVictim[9], ep2Square, revMoveCount;\r
int savKeyL, savKeyH, gain, loss, filling, saveDelta;\r
char fireMask;\r
} UndoInfo;\r
\r
-char *array, fenArray[4000], startPos[4000], *reason, checkStack[300];\r
-int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, stalemate, tsume, pvCuts, allowRep, entryProm, pVal;\r
+char *array, *IDs, fenArray[4000], startPos[4000], *reason, checkStack[300];\r
+int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, stalemate;\r
+int tsume, pvCuts, allowRep, entryProm, okazaki, pVal;\r
int stm, xstm, hashKeyH=1, hashKeyL=1, framePtr, msp, nonCapts, rootEval, filling, promoDelta;\r
int retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;\r
int ll, lr, ul, ur; // corner squares\r
int nodes, startTime, lastRootMove, lastRootIter, tlim1, tlim2, tlim3, repCnt, comp, abortFlag;\r
Move ponderMove;\r
-Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];\r
+Move retMove, moveStack[20000], path[100], repStack[300], pv[1000], repeatMove[300], killer[100][2];\r
\r
int maxDepth; // used by search\r
\r
#define R 37 /* jump capture */\r
#define N -1 /* Knight */\r
#define J -2 /* jump */\r
-#define D -3 /* linear double move */\r
-#define T -4 /* linear triple move */\r
-#define L -5 /* true Lion move */\r
-#define F -6 /* Lion + 3-step */\r
-#define S -7 /* Lion + range */\r
-#define H -9 /* hook move */\r
-#define C -10 /* capture only */\r
-#define M -11 /* non-capture only */\r
+#define I -3 /* jump + step */\r
+#define D -4 /* linear double move */\r
+#define T -5 /* linear triple move */\r
+#define K -6 /* triple + range */\r
+#define L -7 /* true Lion move */\r
+#define W -8 /* Werewolf move */\r
+#define F -9 /* Lion + 3-step */\r
+#define S -10 /* Lion + range */\r
+#define H -11 /* hook move */\r
+#define C -12 /* capture only */\r
+#define M -13 /* non-capture only */\r
\r
#define LVAL 1000 /* piece value of Lion. Used in chu for recognizing it to implement Lion-trade rules */\r
#define FVAL 5000 /* piece value of Fire Demon. Used in code for recognizing moves with it and do burns */\r
{"AB", "G", 60, { 1,0,1,0,1,0,1,0 }, 1 }, // Angry Boar\r
{"I", "G", 80, { 1,1,0,0,0,0,0,1 }, 2 }, // Iron\r
{"N", "G", 60, { N,0,0,0,0,0,0,N }, 0 }, // Knight\r
- {"ST", "G", 50, { 0,1,0,0,0,0,0,1 }, 0 }, // Stone\r
+ {"SG", "G", 50, { 0,1,0,0,0,0,0,1 }, 0 }, // Stone\r
+ { NULL } // sentinel\r
+};\r
+\r
+PieceDesc waPieces[] = {\r
+ {"TE", "", 720, { X,X,1,X,X,X,1,X }, 4 }, // Tenacious Falcon\r
+ {"GS", "", 500, { X,0,X,0,X,0,X,0 }, 4 }, // Gliding Swallow (R)\r
+ {"CE", "", 430, { X,3,1,1,X,1,1,3 }, 3 }, // Cloud Eagle\r
+ {"K", "", 410, { 1,1,1,1,1,1,1,1 }, 2 }, // Crane King (K)\r
+ {"TF", "", 390, { I,I,0,I,I,I,0,I }, 4 }, // Treacherous Fox\r
+ {"FF", "TE", 380, { 1,X,0,X,0,X,0,X }, 4 }, // Flying Falcon\r
+ {"RF", "", 290, { X,1,1,0,X,0,1,1 }, 3 }, // Raiding Falcon\r
+ {"SW", "GS", 260, { 1,0,X,0,1,0,X,0 }, 6 }, // Swallow's Wing (SM)\r
+ {"PO", "", 260, { 1,1,1,1,1,1,1,1 }, 2 }, // Plodding Ox (K)\r
+ {"RR", "TF", 260, { X,1,0,1,1,1,0,1 }, 2 }, // Running Rabit\r
+ {"RB", "", 240, { 1,1,1,1,0,1,1,1 }, 2 }, // Roaming Boar\r
+ {"HH", "", 220, { N,0,0,N,N,0,0,N }, 1 }, // Heavenly Horse\r
+ {"VW", "PO", 220, { 1,1,1,0,1,0,1,1 }, 2 }, // Violent Wolf (G)\r
+ {"VS", "RB", 200, { 1,1,0,1,0,1,0,1 }, 2 }, // Violent Stag (S)\r
+ {"FG", "SW", 190, { 1,1,0,0,1,0,0,1 }, 2 }, // Flying Goose (C)\r
+ {"CM", "VS", 175, { 1,1,0,0,1,0,0,1 }, 2 }, // Climbing Monkey (C)\r
+ {"LH", "HH", 170, { X,0,0,0,2,0,0,0 }, 1 }, // Liberated Horse\r
+ {"BD", "VW", 150, { 0,1,1,0,1,0,1,1 }, 2 }, // Blind Dog\r
+ {"OC", "PO", 150, { X,0,0,0,0,0,0,0 }, 1 }, // Oxcart (L)\r
+ {"FC", "RF", 130, { 0,1,1,0,0,0,1,1 }, 2 }, // Flying Cock\r
+ {"SO", "CE", 115, { 1,0,0,1,0,1,0,0 }, 2 }, // Swooping Owl\r
+ {"SC", "FF", 105, { 1,0,0,1,0,1,0,0 }, 2 }, // Strutting Crow\r
+ {"P", "VW", 80, { 1,0,0,0,0,0,0,0 }, 2 }, // Sparrow Pawn (P)\r
{ NULL } // sentinel\r
};\r
\r
PieceDesc ddPieces[] = {\r
- {"LO", "", 10, { 1,H,1,H,1,H,1,H } }, // Long-Nosed Goblin\r
- {"OK", "LO", 10, { 2,1,2,0,2,0,2,1 } }, // Old Kite\r
- {"PS", "HM", 10, { J,0,1,J,0,J,1,0 } }, // Poisonous Snake\r
- {"GE", "", 10, { 3,3,5,5,3,5,5,3 } }, // Great Elephant\r
- {"WS", "LD", 10, { 1,1,2,0,1,0,2,1 } }, // Western Barbarian\r
- {"EA", "LN", 10, { 2,1,1,0,2,0,1,1 } }, // Eastern Barbarian\r
- {"NO", "FE", 10, { 0,2,1,1,0,1,1,2 } }, // Northern Barbarian\r
- {"SO", "WE", 10, { 0,1,1,2,0,2,1,1 } }, // Southern Barbarian\r
- {"FE", "", 10, { 2,X,2,2,2,2,2,X } }, // Fragrant Elephant\r
- {"WE", "", 10, { 2,2,2,X,2,X,2,2 } }, // White Elephant\r
- {"FT", "", 10, { X,X,5,0,X,0,5,X } }, // Free Dream-Eater\r
- {"FR", "", 10, { 5,X,X,0,5,0,X,X } }, // Free Demon\r
- {"WB", "FT", 10, { 2,X,X,X,2,X,X,X } }, // Water Buffalo\r
- {"RB", "FR", 10, { X,X,X,X,0,X,X,X } }, // Rushing Bird\r
- {"SB", "", 10, { X,X,2,2,2,2,2,X } }, // Standard Bearer\r
-\r
- {"FH", "FK", 10, { 1,2,1,0,1,0,1,2 } }, // Flying Horse\r
- {"NK", "SB", 10, { 1,1,1,1,1,1,1,1 } }, // Neighbor King\r
+ {"HM", "", 10, { H,0,H,0,H,0,H,0 } }, // Hook Mover H!\r
+ {"LO", "", 10, { 1,H,1,H,1,H,1,H } }, // Long-Nosed Goblin G!\r
+ {"OK", "LO", 10, { 2,1,2,0,2,0,2,1 } }, // Old Kite K'\r
+ {"PS", "HM", 10, { J,0,1,J,0,J,1,0 } }, // Poisonous Snake S'\r
+ {"FF", "", 10, { F,F,F,F,F,F,F,F } }, // Furious Fiend +L!\r
+ {"GE", "", 10, { 3,3,5,5,3,5,5,3 } }, // Great Elephant +W!\r
+ {"WS", "LD", 10, { 1,1,2,0,1,0,2,1 } }, // Western Barbarian W'\r
+ {"EA", "LN", 10, { 2,1,1,0,2,0,1,1 } }, // Eastern Barbarian E'\r
+ {"NO", "FE", 10, { 0,2,1,1,0,1,1,2 } }, // Northern Barbarian N'\r
+ {"SO", "WE", 10, { 0,1,1,2,0,2,1,1 } }, // Southern Barbarian S'\r
+ {"FE", "", 10, { 2,X,2,2,2,2,2,X } }, // Fragrant Elephant +N'\r
+ {"WE", "", 10, { 2,2,2,X,2,X,2,2 } }, // White Elephant +S'\r
+ {"FT", "", 10, { X,X,5,0,X,0,5,X } }, // Free Dream-Eater +W\r
+ {"FR", "", 10, { 5,X,X,0,5,0,X,X } }, // Free Demon +U\r
+ {"WB", "FT", 10, { 2,X,X,X,2,X,X,X } }, // Water Buffalo W\r
+ {"RU", "FR", 10, { X,X,X,X,0,X,X,X } }, // Rushing Bird U\r
+ {"SB", "", 10, { X,X,2,2,2,2,2,X } }, // Standard Bearer +N\r
+ {"FH", "FK", 10, { 1,2,1,0,1,0,1,2 } }, // Flying Horse H'\r
+ {"NK", "SB", 10, { 1,1,1,1,1,1,1,1 } }, // Neighbor King N\r
+ {"RG", "", 10, { 1,1,0,1,1,1,1,1 } }, // Right General R'\r
+ {"LG", "", 10, { 1,1,1,1,1,1,0,1 } }, // Left General L'\r
{"BM", "MW", 10, { 0,1,1,1,0,1,1,1 } }, // Blind Monkey\r
- {"DO", "", 10, { 2,X,2,X,2,X,2,X } }, // Dove\r
- {"EB", "DO", 10, { 2,0,2,0,0,0,2,0 } }, // Enchanted Badger\r
- {"EF", "SD", 10, { 0,2,0,0,2,0,0,2 } }, // Enchanted Fox\r
- {"RA", "", 10, { X,0,X,1,X,1,X,0 } }, // Racing Chariot\r
- {"SQ", "", 10, { X,1,X,0,X,0,X,1 } }, // Square Mover\r
+ {"DO", "", 10, { 2,5,2,5,2,5,2,5 } }, // Dove\r
+ {"EB", "DO", 10, { 2,0,2,0,0,0,2,0 } }, // Enchanted Badger B'\r
+ {"EF", "SD", 10, { 0,2,0,0,2,0,0,2 } }, // Enchanted Fox X'\r
+ {"RA", "", 10, { X,0,X,1,X,1,X,0 } }, // Racing Chariot A\r
+ {"SQ", "", 10, { X,1,X,0,X,0,X,1 } }, // Square Mover Q'\r
{"PR", "SQ", 10, { 1,1,2,1,0,1,2,1 } }, // Prancing Stag\r
- {"WT", "", 10, { X,1,2,0,X,0,2,X } }, // White Tiger\r
- {"BD", "", 10, { 2,X,X,0,2,0,X,1 } }, // Blue Dragon\r
- {"HD", "", 10, { X,0,0,0,1,0,0,0 } }, // Howling Dog\r
- {"VB", "", 10, { 0,2,1,0,0,0,1,2 } }, // Violent Bear\r
- {"SA", "", 10, { 2,1,0,0,2,0,0,1 } }, // Savage Tiger\r
- {"W", "", 10, { 0,2,0,0,0,0,0,2 } }, // Wood\r
- {"CS", "DH", 70, { 0,1,0,1,0,1,0,1 } }, // cat sword\r
- {"FD", "DK", 150, { 0,2,0,2,0,2,0,2 } }, // flying dragon\r
- {"KN", "GD", 150, { J,1,J,1,J,1,J,1 } }, // kirin\r
- {"PH", "GB", 150, { 1,J,1,J,1,J,1,J } }, // phoenix\r
- {"LN", "FF", 1000, { L,L,L,L,L,L,L,L } }, // lion\r
- {"LD", "GE", 10, { T,T,T,T,T,T,T,T } }, // Lion Dog\r
- {"AB", "", 10, { 1,0,1,0,1,0,1,0 } }, // Angry Boar\r
- {"B", "", 10, { 0,X,0,X,0,X,0,X } }, // Bishop\r
- {"C", "", 10, { 1,1,0,0,1,0,0,1 } }, // Copper\r
- {"DH", "", 10, { 1,X,1,X,1,X,1,X } }, // Dragon Horse\r
- {"DK", "", 10, { X,1,X,1,X,1,X,1 } }, // Dragon King\r
- {"FK", "", 10, { } }, // \r
- {"EW", "", 10, { 1,1,1,0,0,0,1,1 } }, // Evil Wolf\r
- {"FL", "", 10, { } }, // \r
- {"", "", 10, { } }, // \r
- {"", "", 10, { } }, // \r
+ {"WT", "", 10, { X,1,2,0,X,0,2,X } }, // White Tiger T!\r
+ {"BD", "", 10, { 2,X,X,0,2,0,X,1 } }, // Blue Dragon D!\r
+ {"HD", "", 10, { X,0,0,0,1,0,0,0 } }, // Howling Dog D'\r
+ {"VB", "", 10, { 0,2,1,0,0,0,1,2 } }, // Violent Bear V\r
+ {"ST", "", 10, { 2,1,0,0,2,0,0,1 } }, // Savage Tiger T'\r
+ {"W", "", 10, { 0,2,0,0,0,0,0,2 } }, // Wood General V'\r
+ {"CS", "DH", 70, { 0,1,0,1,0,1,0,1 } }, // Cat Sword C'\r
+ {"FD", "DK", 150, { 0,2,0,2,0,2,0,2 } }, // Flying Dragon F'\r
+ {"LD", "GE", 10, { T,T,T,T,T,T,T,T } }, // Lion Dog W!\r
+ {"AB", "", 10, { 1,0,1,0,1,0,1,0 } }, // Angry Boar A'\r
+ {"EW", "", 10, { 1,1,1,0,0,0,1,1 } }, // Evil Wolf\r
+ {"SD", "", 10, { 5,2,5,2,5,2,5,2 } }, // She-Devil\r
+ {"GD", "", 10, { 2,3,X,3,2,3,X,3 } }, // Great Dragon\r
+ {"GO", "", 10, { X,3,2,3,X,3,2,3 } }, // Golden Bird\r
+ {"LC", "", 10, { X,0,0,X,1,0,0,X } }, // Left Chariot L'\r
+ {"RC", "", 10, { X,X,0,0,1,X,0,0 } }, // Right Chariot R'\r
+ // Chu pieces (but with different promotion)\r
+ {"LN", "FF",LVAL, { L,L,L,L,L,L,L,L }, 4 }, // lion\r
+ {"FK", "", 600, { X,X,X,X,X,X,X,X }, 4 }, // free king\r
+ {"DK", "", 400, { X,1,X,1,X,1,X,1 }, 4 }, // dragon king\r
+ {"DH", "", 350, { 1,X,1,X,1,X,1,X }, 4 }, // dragon horse\r
+ {"R", "", 300, { X,0,X,0,X,0,X,0 }, 4 }, // rook\r
+ {"K", "", 280, { 1,1,1,1,1,1,1,1 }, 2, 4 }, // king\r
+ {"B", "", 250, { 0,X,0,X,0,X,0,X }, 2 }, // bishop\r
+ {"VM", "", 200, { X,0,1,0,X,0,1,0 }, 2 }, // vertical mover\r
+ {"SM", "", 200, { 1,0,X,0,1,0,X,0 }, 6 }, // side mover\r
+ {"G", "", 151, { 1,1,1,0,1,0,1,1 }, 2 }, // gold\r
+ {"FL", "", 150, { 1,1,0,1,1,1,0,1 }, 2 }, // ferocious leopard\r
+ {"KN", "GD", 154, { J,1,J,1,J,1,J,1 }, 2 }, // kirin\r
+ {"PH", "GO", 153, { 1,J,1,J,1,J,1,J }, 2 }, // phoenix\r
+ {"RV", "", 150, { X,0,0,0,X,0,0,0 }, 1 }, // reverse chariot\r
+ {"L", "", 150, { X,0,0,0,0,0,0,0 }, 1 }, // lance\r
+ {"S", "", 100, { 1,1,0,1,0,1,0,1 }, 2 }, // silver\r
+ {"C", "", 100, { 1,1,0,0,1,0,0,1 }, 2 }, // copper\r
+ {"P", "", 40, { 1,0,0,0,0,0,0,0 }, 2 }, // pawn\r
{"", "", 10, { } }, // \r
{"", "", 10, { } }, // \r
{ NULL } // sentinel\r
};\r
\r
PieceDesc makaPieces[] = {\r
- {"DV", "", 10, { 0,1,0,1,0,0,1,1 } }, // Deva\r
- {"DS", "", 10, { 0,1,1,0,0,1,0,1 } }, // Dark Spirit\r
- {"T", "", 10, { 0,1,0,0,1,0,0,1 } }, // Tile\r
- {"CS", "", 10, { 1,0,0,1,1,1,0,0 } }, // Coiled Serpent\r
- {"RD", "", 10, { 1,0,1,1,1,1,1,0 } }, // Reclining Dragon\r
- {"CC", "", 10, { 0,1,1,0,1,0,1,1 } }, // Chinese Cock\r
- {"OM", "", 10, { 0,1,0,1,1,1,0,1 } }, // Old Monkey\r
- {"BB", "", 10, { 0,1,0,1,X,1,0,1 } }, // Blind Bear\r
- {"OR", "", 10, { 0,2,0,0,2,0,0,2 } }, // Old Rat\r
- {"LD", "WS", 10, { T,T,T,T,T,T,T,T } }, // Lion Dog\r
- {"WR", "", 10, { 0,3,1,3,0,3,1,3 } }, // Wrestler\r
- {"GG", "", 10, { 3,1,3,0,3,0,3,1 } }, // Guardian of the Gods\r
- {"BD", "", 10, { 0,3,1,0,1,0,1,3 } }, // Budhist Devil\r
- {"SD", "", 10, { 5,2,5,2,5,2,5,2 } }, // She-Devil\r
- {"DY", "", 10, { J,0,1,0,J,0,1,0 } }, // Donkey\r
- {"CP", "", 10, { 0,H,0,2,0,2,0,H } }, // Capricorn\r
- {"HM", "", 10, { H,0,H,0,H,0,H,0 } }, // Hook Mover\r
- {"SF", "", 10, { 0,1,X,1,0,1,0,1 } }, // Side Flier\r
- {"LC", "", 10, { X,0,0,X,1,0,0,X } }, // Left Chariot\r
- {"RC", "", 10, { X,X,0,0,1,X,0,0 } }, // Right Chariot\r
- {"FG", "", 10, { X,X,X,0,X,0,X,X } }, // Free Gold\r
- {"FS", "", 10, { X,X,0,X,0,X,0,X } }, // Free Silver\r
- {"FC", "", 10, { X,X,0,0,X,0,0,X } }, // Free Copper\r
- {"FI", "", 10, { X,X,0,0,0,0,0,X } }, // Free Iron\r
- {"FT", "", 10, { 0,X,0,0,X,0,0,X } }, // Free Tile\r
- {"FN", "", 10, { 0,X,0,0,0,0,0,X } }, // Free Stone\r
- {"FTg", "", 10, { 0,X,X,X,X,X,X,X } }, // Free Tiger\r
- {"FLp", "", 10, { X,X,0,X,X,X,0,X } }, // Free Leopard (Free Boar?)\r
- {"FSp", "", 10, { X,0,0,X,X,X,0,0 } }, // Free Serpent (Whale?)\r
- {"FrD", "", 10, { X,0,X,X,X,X,X,0 } }, // Free Dragon\r
- {"FC", "", 10, { 0,X,0,X,0,X,0,X } }, // Free Cat (Bishop?)\r
- {"EM", "", 10, { } }, // Emperor\r
- {"TK", "", 10, { } }, // Teaching King\r
- {"BS", "", 10, { } }, // Budhist Spirit\r
- {"WS", "", 10, { X,X,0,X,1,X,0,X } }, // Wizard Stork\r
- {"MW", "", 10, { 1,X,0,X,X,X,0,X } }, // Mountain Witch\r
- {"FF", "", 10, { } }, // Furious Fiend\r
- {"GD", "", 10, { 2,3,X,3,2,3,X,3 } }, // Great Dragon\r
- {"GB", "", 10, { X,3,2,3,X,3,2,3 } }, // Golden Bird\r
- {"FrW", "", 10, { } }, // Free Wolf\r
- {"FrB", "", 10, { } }, // Free Bear\r
- {"BT", "", 10, { X,0,0,X,0,X,0,0 } }, // Bat\r
+ {"DV", "TK", 10, { 0,1,0,1,0,0,1,1 } }, // Deva I'\r
+ {"DS", "BS", 10, { 0,1,1,0,0,1,0,1 } }, // Dark Spirit J'\r
+ {"T", "fT", 10, { 0,1,0,0,1,0,0,1 } }, // Tile General Y\r
+ {"CO", "fS", 10, { 1,0,0,1,1,1,0,0 } }, // Coiled Serpent S!\r
+ {"RD", "fD", 10, { 1,0,1,1,1,1,1,0 } }, // Reclining Dragon D!\r
+ {"CC", "WS", 10, { 0,1,1,0,1,0,1,1 } }, // Chinese Cock N'\r
+ {"OM", "MW", 10, { 0,1,0,1,1,1,0,1 } }, // Old Monkey M'\r
+ {"BB", "fB", 10, { 0,1,0,1,X,1,0,1 } }, // Blind Bear B'\r
+ {"OR", "BA", 10, { 0,2,0,0,2,0,0,2 } }, // Old Rat O'\r
+ {"LD", "WS", 10, { T,T,T,T,T,T,T,T } }, // Lion Dog W!\r
+ {"WR", "G", 10, { 0,3,1,3,0,3,1,3 } }, // Wrestler W'\r
+ {"GG", "G", 10, { 3,1,3,0,3,0,3,1 } }, // Guardian of the Gods G'\r
+ {"BD", "G", 10, { 0,3,1,0,1,0,1,3 } }, // Budhist Devil D'\r
+ {"SD", "G", 10, { 5,2,5,2,5,2,5,2 } }, // She-Devil S'\r
+ {"DY", "G", 10, { J,0,1,0,J,0,1,0 } }, // Donkey Y'\r
+ {"CA", "G", 10, { 0,H,0,2,0,2,0,H } }, // Capricorn C!\r
+ {"HM", "G", 10, { H,0,H,0,H,0,H,0 } }, // Hook Mover H!\r
+ {"SF", "G", 10, { 0,1,X,1,0,1,0,1 } }, // Side Flier F!\r
+ {"LC", "G", 10, { X,0,0,X,1,0,0,X } }, // Left Chariot L'\r
+ {"RC", "G", 10, { X,X,0,0,1,X,0,0 } }, // Right Chariot R'\r
+ {"fT", "", 10, { 0,X,X,X,X,X,X,X } }, // Free Tiger +T\r
+ {"fD", "", 10, { X,0,X,X,X,X,X,0 } }, // Free Dragon +D!\r
+ {"fG", "", 10, { X,X,X,0,X,0,X,X } }, // Free Gold +G\r
+ {"fS", "", 10, { X,X,0,X,0,X,0,X } }, // Free Silver +S\r
+ {"fI", "", 10, { X,X,0,0,0,0,0,X } }, // Free Iron +I\r
+ {"fY", "", 10, { 0,X,0,0,X,0,0,X } }, // Free Tile +Y\r
+ {"fU", "", 10, { 0,X,0,0,0,0,0,X } }, // Free Stone +U\r
+ {"EM", "", 10, { 0,0,0,0,0,0,0,0 } }, // Emperor +K\r
+ {"TK", "", 10, { K,K,K,K,K,K,K,K } }, // Teaching King +I'\r
+ {"BS", "", 10, { S,S,S,S,S,S,S,S } }, // Budhist Spirit +J'\r
+ {"WS", "", 10, { X,X,0,X,1,X,0,X } }, // Wizard Stork +N'\r
+ {"MW", "", 10, { 1,X,0,X,X,X,0,X } }, // Mountain Witch +M'\r
+ {"FF", "", 10, { F,F,F,F,F,F,F,F } }, // Furious Fiend +L!\r
+ {"GD", "", 10, { 2,3,X,3,2,3,X,3 } }, // Great Dragon +W!\r
+ {"GO", "", 10, { X,3,2,3,X,3,2,3 } }, // Golden Bird +X\r
+ {"fW", "", 10, { X,X,X,0,0,0,X,X } }, // Free Wolf +W\r
+ {"BA", "", 10, { X,0,0,X,0,X,0,0 } }, // Bat +O'\r
+ {"FD", "G", 150, { 0,2,0,2,0,2,0,2 }, 2 }, // Flying Dragon\r
+ // Dai pieces with different promotion\r
+ {"FD", "G", 150, { 0,2,0,2,0,2,0,2 }, 2 }, // Flying Dragon\r
+ {"VO", "G", 200, { 2,0,2,0,2,0,2,0 }, 2 }, // Violent Ox\r
+ {"EW", "fW", 80, { 1,1,1,0,0,0,1,1 }, 2 }, // Evil Wolf\r
+ {"CS", "B", 70, { 0,1,0,1,0,1,0,1 }, 1 }, // Cat Sword\r
+ {"AB", "FB", 60, { 1,0,1,0,1,0,1,0 }, 1 }, // Angry Boar\r
+ {"T", "fY", 80, { 0,1,0,0,1,0,0,1 }, 2 }, // Tile\r
+ {"I", "fI", 80, { 1,1,0,0,0,0,0,1 }, 2 }, // Iron\r
+ {"N", "G", 60, { N,0,0,0,0,0,0,N }, 0 }, // Knight\r
+ {"SG", "fU", 50, { 0,1,0,0,0,0,0,1 }, 0 }, // Stone\r
+ // Chu pieces (but with different promotion)\r
+ {"LN", "FF",LVAL, { L,L,L,L,L,L,L,L }, 4 }, // lion\r
+ {"FK", "", 600, { X,X,X,X,X,X,X,X }, 4 }, // free king\r
+ {"FO", "", 400, { X,X,0,X,X,X,0,X }, 4 }, // flying ox (free leopard)\r
+ {"FB", "", 400, { 0,X,X,X,0,X,X,X }, 4 }, // free boar\r
+ {"DK", "", 400, { X,1,X,1,X,1,X,1 }, 4 }, // dragon king\r
+ {"DH", "", 350, { 1,X,1,X,1,X,1,X }, 4 }, // dragon horse\r
+ {"WH", "", 350, { X,X,0,0,X,0,0,X }, 3 }, // white horse (free copper)\r
+ {"R", "G", 300, { X,0,X,0,X,0,X,0 }, 4 }, // rook\r
+ {"WL", "", 250, { X,0,0,X,X,X,0,0 }, 4 }, // whale (free serpent)\r
+ {"K", "EM", 280, { 1,1,1,1,1,1,1,1 }, 2, 4 }, // king\r
+ {"CP", "", 270, { 1,1,1,1,1,1,1,1 }, 2, 4 }, // king\r
+ {"B", "G", 250, { 0,X,0,X,0,X,0,X }, 2 }, // bishop\r
+ {"VM", "G", 200, { X,0,1,0,X,0,1,0 }, 2 }, // vertical mover\r
+ {"SM", "G", 200, { 1,0,X,0,1,0,X,0 }, 6 }, // side mover\r
+ {"DE", "CP", 201, { 1,1,1,1,0,1,1,1 }, 2 }, // drunk elephant\r
+ {"BT", "fT", 152, { 0,1,1,1,1,1,1,1 }, 2 }, // blind tiger\r
+ {"G", "fG", 151, { 1,1,1,0,1,0,1,1 }, 2 }, // gold\r
+ {"FL", "FO", 150, { 1,1,0,1,1,1,0,1 }, 2 }, // ferocious leopard\r
+ {"KN", "GD", 154, { J,1,J,1,J,1,J,1 }, 2 }, // kirin\r
+ {"PH", "GB", 153, { 1,J,1,J,1,J,1,J }, 2 }, // phoenix\r
+ {"RV", "G", 150, { X,0,0,0,X,0,0,0 }, 1 }, // reverse chariot\r
+ {"L", "G", 150, { X,0,0,0,0,0,0,0 }, 1 }, // lance\r
+ {"S", "fS", 100, { 1,1,0,1,0,1,0,1 }, 2 }, // silver\r
+ {"C", "WH", 100, { 1,1,0,0,1,0,0,1 }, 2 }, // copper\r
+ {"GB", "RV", 50, { 1,0,0,0,1,0,0,0 }, 1 }, // go between\r
+ {"P", "G", 40, { 1,0,0,0,0,0,0,0 }, 2 }, // pawn\r
{"", "", 10, { } }, // \r
{ NULL } // sentinel\r
};\r
};\r
\r
PieceDesc chessPieces[] = {\r
- {"FK", "", 950, { X,X,X,X,X,X,X,X } },\r
+ {"Q", "", 950, { X,X,X,X,X,X,X,X } },\r
{"R", "", 500, { X,0,X,0,X,0,X,0 } },\r
{"B", "", 320, { 0,X,0,X,0,X,0,X } },\r
{"N", "", 300, { N,N,N,N,N,N,N,N } },\r
{"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
- {"P", "FK", 80, { M,C,0,0,0,0,0,C } },\r
+ {"P", "Q", 80, { M,C,0,0,0,0,0,C } },\r
{ NULL } // sentinel\r
};\r
\r
PieceDesc lionPieces[] = {\r
- {"LN","", LVAL, { L,L,L,L,L,L,L,L } },\r
- {"FK", "", 600, { X,X,X,X,X,X,X,X } },\r
+ {"L", "", LVAL, { L,L,L,L,L,L,L,L } },\r
+ {"Q", "", 600, { X,X,X,X,X,X,X,X } },\r
{"R", "", 300, { X,0,X,0,X,0,X,0 } },\r
{"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
{"B", "", 190, { 0,X,0,X,0,X,0,X } },\r
{"N", "", 180, { N,N,N,N,N,N,N,N } },\r
- {"P", "FK", 50, { M,C,0,0,0,0,0,C } },\r
+ {"P", "Q", 50, { M,C,0,0,0,0,0,C } },\r
{ NULL } // sentinel\r
};\r
\r
PieceDesc shatranjPieces[] = {\r
- {"FK", "", 150, { 0,1,0,1,0,1,0,1 } },\r
+ {"Q", "", 150, { 0,1,0,1,0,1,0,1 } },\r
{"R", "", 500, { X,0,X,0,X,0,X,0 } },\r
{"B", "", 90, { 0,J,0,J,0,J,0,J } },\r
{"N", "", 300, { N,N,N,N,N,N,N,N } },\r
{"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
- {"P", "FK", 80, { M,C,0,0,0,0,0,C } },\r
+ {"P", "Q", 80, { M,C,0,0,0,0,0,C } },\r
{ NULL } // sentinel\r
};\r
\r
PieceDesc makrukPieces[] = {\r
- {"SM","", 150, { 0,1,0,1,0,1,0,1 } },\r
+ {"M", "", 150, { 0,1,0,1,0,1,0,1 } },\r
{"R", "", 500, { X,0,X,0,X,0,X,0 } },\r
{"S", "", 200, { 1,1,0,1,0,1,0,1 } }, // silver\r
{"N", "", 300, { N,N,N,N,N,N,N,N } },\r
{"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
- {"P", "SM", 80, { M,C,0,0,0,0,0,C } },\r
+ {"P", "M", 80, { M,C,0,0,0,0,0,C } },\r
+ { NULL } // sentinel\r
+};\r
+\r
+PieceDesc wolfPieces[] = {\r
+ {"W", "W",1050,{ W,W,W,W,W,W,W,W }, 6, 5 }, // kludge to get extra Werewolves\r
+ {"R", "", 500, { X,0,X,0,X,0,X,0 }, 3 },\r
+ {"B", "", 320, { 0,X,0,X,0,X,0,X }, 1 },\r
+ {"N", "", 300, { N,N,N,N,N,N,N,N }, 1 },\r
+ {"K", "", 280, { 1,1,1,1,1,1,1,1 }, 0, 4 },\r
+ {"P", "R", 80, { M,C,0,0,0,0,0,C } },\r
{ NULL } // sentinel\r
};\r
\r
-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..."\r
- "/............/............/"\r
- "...: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";\r
-char daiArray[] = "LN:STICSGKGSCI:STNL/:RV.:CS.:FL.:BT:DE:BT.:FL.:CS.:RV/.:VO.:AB.:EW:KN:LN:PH:EW.:AB.:VO./R:FD:SM:VMB:DH:DK:FK:DK:DHB:VM:SM:FDR"\r
- "/PPPPPPPPPPPPPPP/....:GB.....:GB..../.............../.............../.............../....:gb.....:gb..../ppppppppppppppp/"\r
- "r:fd:sm:vmb:dh:dk:fk:dk:dhb:vm:sm:fdr/.:vo.:ab.:ew:ph:ln:kn:ew.:ab.:vo./:rv.:cs.:fl.:bt:de:bt.:fl.:cs.:rv/ln:sticsgkgsci:stnl";\r
-char tenArray[] = "LN:FLICSGK:DEGSCI:FLNL/:RV.:CS:CS.:BT:KN:LN:FK:PH:BT.:CS:CS.:RV/:SS:VSB:DH:DK:WB:FI:LH:FE:FI:WB:DK:DHB:VS:SS/"\r
- ":SM:VMR:HF:SE:BG:RG:GG:VG:RG:BG:SE:HFR:VM:SM/PPPPPPPPPPPPPPPP/....D......D..../"\r
- "................/................/................/................/"\r
- "....d......d..../pppppppppppppppp/:sm:vmr:hf:se:bg:rg:vg:gg:rg:bg:se:hfr:vm:sm/"\r
- ":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";\r
-char shoArray[] = "LNSGKGSNL/.B..:DE..R./PPPPPPPPP/........./........./........./ppppppppp/.r..:de..b./lnsgkgsnl";\r
-char chessArray[] = "RNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnb:fkkbnr";\r
-char lionArray[] = "R:LNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/r:lnb:fkkbnr";\r
-char shatArray[]= "RNBK:FKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbk:fkbnr";\r
-char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rns:smksnr";\r
+char chuArray[] = "lfcsgekgscfl/a1b1txot1b1a/mvrhdqndhrvm/pppppppppppp/3i4i3"\r
+ "/12/12/"\r
+ "3I4I3/PPPPPPPPPPPP/MVRHDNQDHRVM/A1B1TOXT1B1A/LFCSGKEGSCFL";\r
+char daiArray[] = "lnuicsgkgsciunl/a1c'1f1tet1f1c'1a/1x'1a'1wxl!ow1a'1x'1/rf'mvbhdqdhbvmf'r/"\r
+ "ppppppppppppppp/4p'5p'4/15/15/15/4P'5P'4/PPPPPPPPPPPPPPP/"\r
+ "RF'MVBHDQDHBVMF'R/1X'1A'1WOL!XW1A'1X'1/A1C'1F1TET1F1C'1A/LNUICSGKGSCIUNL";\r
+char tenArray[] = "lnficsgekgscifnl/a1c!c!1txql!ot1c!c!1a/s'v'bhdw!d!q!h!d!w!dhbv's'/"\r
+ "mvrf!e!b!r!v!q!r!b!e!f!rvm/pppppppppppppppp/4d6d4/"\r
+ "16/16/16/16/"\r
+ "4D6D4/PPPPPPPPPPPPPPPP/MVRF!E!B!R!Q!V!R!B!E!F!RVM/"\r
+ "S'V'BHDW!D!H!Q'D!W!DHBV'S'/A1C!C!TOL!QXT1C!C!1A/LNFICSGKEGSCIFNL";\r
+char cashewArray[]= "lh!f'dh'j'ki'qc'hg!l/t!p'w!+oogngx+xl!k'd!/r've'fst'+nt'sfw'vl'/ppppppppppppp/3d'5d'3/13/"\r
+ "13/13/3D'5D'3/PPPPPPPPPPPPP/L'VW'FST'+NT'SFE'VR'/D!K'L!+XXGNGO+OW!P'T!/LG!HC'QI'KJ'H'DF'H!L";\r
+char macadArray[] = "lxcsgi'kj'gscol/1f'1w!1tet1l!1f'1/rr'g'bdh!qc!dbw'l'r/ppppppppppppp/3p'5p'3/13/"\r
+ "13/13/3P'5P'3/PPPPPPPPPPPPP/RL'W'BDC!QH!DBG'R'R/1F'1L!1TET1W!1F'1/LOCSGI'KJ'GSCXL";\r
+char shoArray[] = "lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL";\r
+char waArray[] = "hmlcvkwgudo/1e3s3f1/ppprpppxppp/3p3p3/11/11/11/3P3P3/PPPXPPPRPPP/1F3S3E1/ODUGWKVCLMH";\r
+char chessArray[] = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR";\r
+char lionArray[] = "rlbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RLBQKBNR";\r
+char shatArray[] = "rnbkqbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBKQBNR";\r
+char thaiArray[] = "rnsmksnr/8/pppppppp/8/8/PPPPPPPP/8/RNSKMSNR";\r
+char wolfArray[] = "rnbwkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBWKBNR";\r
+\r
+// translation tables for single-(dressed-)letter IDs to multi-letter names, per variant\r
+// A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.V.W.X.Y.Z.\r
+char chuIDs[] = "RVB C DKDEFLG DHGB..K L SMLNKNP FKR S BT..VM..PH....";\r
+char daiIDs[] = "RVB C DKDEFLG DHI ..K L SMN KNP FKR S BTSGVMEWPH...." // L\r
+ "AB CS FD GB VO " // L'\r
+ " LN "; // L!\r
+char tenIDs[] = "RVB C DKDEFLG DHI ..K L SMN KNP FKR S BT..VM..PH...." // L\r
+ ".. ..D .. FE SS VS " // L'\r
+ " BGCSFISEHF LH LN GGRG VGWB "; // L!\r
+char waIDs[] = "....FCBDCEFFFGLH....K SOCM..OCP ..RRSW..SCVSVWTF....";\r
+char chessIDs[] = "A B ....E F ........K L M N ..P Q R S ......W ......"; // covers all chess-like variants\r
+char makaIDs[] = "RVB C DKDEFLG DHI ..K L SMN KNP FKR S BTSG..EWPHT .." // L (also for Macadamia)\r
+ "ABBBCSBDE FDGG DVDS LCBMCCORGB RCSD WRVODY " // L'\r
+ " CARD HM LN CO VMLD "; // L!\r
+char dadaIDs[] = "RVB C DKEFFLG DHI ..K L SMNKKNP FKR S ..SGVBEWPH...." // L (also for Cashew)\r
+ "ABEBCSHDEAFDPRFHLGRGOKLCOMNOORPS RCSOST W WSVO " // L'\r
+ "RAWB BD LGHM LN SQ WTRUVMLD "; // L!\r
\r
typedef struct {\r
int boardWidth, boardFiles, boardRanks, zoneDepth, varNr; // board sizes\r
char *name; // WinBoard name\r
char *array; // initial position\r
+ char *IDs;\r
} VariantDesc;\r
\r
-typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU, V_SHATRANJ, V_MAKRUK, V_LION } Variant;\r
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU,\r
+ V_CASHEW, V_MACAD, V_SHATRANJ, V_MAKRUK, V_LION, V_WA, V_WOLF } Variant;\r
\r
#define SAME (-1)\r
\r
VariantDesc variants[] = {\r
- { 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
- { 16, 8, 8, 1, V_CHESS, "nocastle", chessArray }, // FIDE\r
- { 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray }, // Sho\r
- { 18, 9, 9, 3, V_SHO, "sho", shoArray }, // Sho duplicat\r
- { 30, 15, 15, 5, V_DAI, "dai", daiArray }, // Dai\r
- { 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray }, // Tenjiku\r
- { 16, 8, 8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj\r
- { 16, 8, 8, 3, V_MAKRUK, "makruk", thaiArray}, // Makruk\r
- { 16, 8, 8, 1, V_LION, "lion", lionArray}, // Mighty Lion\r
+ { 24, 12, 12, 4, V_CHU, "chu", chuArray, chuIDs }, // Chu\r
+ { 16, 8, 8, 1, V_CHESS, "nocastle", chessArray,chessIDs }, // FIDE\r
+ { 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray, chuIDs }, // Sho\r
+ { 18, 9, 9, 3, V_SHO, "sho", shoArray, chuIDs }, // Sho duplicat\r
+ { 30, 15, 15, 5, V_DAI, "dai", daiArray, daiIDs }, // Dai\r
+ { 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray, tenIDs }, // Tenjiku\r
+ { 16, 8, 8, 1, V_SHATRANJ,"shatranj",shatArray, chessIDs}, // Shatranj\r
+ { 16, 8, 8, 3, V_MAKRUK, "makruk", thaiArray, chessIDs}, // Makruk\r
+ { 16, 8, 8, 1, V_LION, "lion", lionArray, chessIDs}, // Mighty Lion\r
+ { 22, 11, 11, 3, V_WA, "wa-shogi", waArray, waIDs}, // Wa\r
+ { 16, 8, 8, 1, V_WOLF, "werewolf",wolfArray, chessIDs}, // Werewolf Chess\r
+ { 26, 13, 13,13, V_CASHEW, "cashew-shogi", cashewArray, dadaIDs }, // Cashew\r
+ { 26, 13, 13,13, V_MACAD, "macadamia-shogi", macadArray, makaIDs }, // Macadamia\r
\r
{ 0, 0, 0, 0, 0 }, // sentinel\r
{ 34, 17, 17, 0, V_DADA, "dada", chuArray }, // Dai Dai\r
{ 2,-1}\r
};\r
\r
-int epList[96], ep2List[96], toList[96], reverse[96]; // decoding tables for double and triple moves\r
+int epList[104], ep2List[104], toList[104], reverse[104]; // decoding tables for double and triple moves\r
int kingStep[10], knightStep[10]; // raw tables for step vectors (indexed as -1 .. 8)\r
int neighbors[9]; // similar to kingStep, but starts with null-step\r
char fireFlags[10]; // flags for Fire-Demon presence (last two are dummies, which stay 0, for compactify)\r
char mobWeight;\r
unsigned char promoGain;\r
char bulk;\r
+ char ranking;\r
} PieceInfo; // piece-list entry\r
\r
int last[2], royal[2], kylin[2];\r
int attackMaps[200*BSIZE], *attacks = attackMaps;\r
char distance[2*BSIZE]; // distance table\r
char promoBoard[BSIZE]; // flags to indicate promotion zones\r
-char rawFire[BSIZE+2*BWMAX]; // flags to indicate squares controlled by Fire Demons\r
-signed char PST[5*BSIZE];\r
+unsigned char rawFire[BSIZE+2*BWMAX]; // flags to indicate squares controlled by Fire Demons\r
+signed char PST[7*BSIZE];\r
\r
#define board (rawBoard + 6*BHMAX + 3)\r
#define fireBoard (rawFire + BWMAX + 1)\r
return ListLookUp(name, makrukPieces);\r
case V_LION: // Mighty Lion\r
return ListLookUp(name, lionPieces);\r
+ case V_WA: // Wa\r
+ return ListLookUp(name, waPieces);\r
+ case V_WOLF: // Werewolf\r
+ return ListLookUp(name, wolfPieces);\r
+ case V_CASHEW: // Cashew\r
+ return ListLookUp(name, ddPieces);\r
+ case V_MACAD: // Cashew\r
+ return ListLookUp(name, makaPieces);\r
}\r
return NULL;\r
}\r
int\r
EasyProm (signed char *r)\r
{\r
- int i;\r
if(r[0] == X) return 30 + PROMO*((unsigned int)(r[1] | r[2] | r[3] | r[5] | r[6] | r[7]) <= 1);\r
if(r[1] == X || r[7] == X) return 30 + PROMO/2;\r
return 0;\r
int i, m=0;\r
for(i=0; i<8; i++) {\r
int d = r[i];\r
- if(r[i] < 0) d == r[i] >= L ? 2 : 36;\r
+ if(r[i] < 0) d = r[i] >= L ? 2 : 36;\r
if(d > m) m = d;\r
}\r
return m;\r
void\r
Compactify (int stm)\r
{ // remove pieces that are permanently gone (captured or promoted) from one side's piece list\r
- int i, j, k;\r
+ int i, k;\r
for(i=stm+2; i<=last[stm]; i+=2) { // first pass: unpromoted pieces\r
if((k = p[i].promo) >= 0 && p[i].pos == ABSENT) { // unpromoted piece no longer there\r
p[k].promo = -2; // orphan promoted version\r
p[i].value = v = list->value;\r
for(j=0; j<8; j++) p[i].range[j] = list->range[j^4*(WHITE-stm)];\r
switch(Range(p[i].range)) {\r
- case 1: p[i].pst = BH; break;\r
- case 2: p[i].pst = bsize; break;\r
- default: p[i].pst = bsize + BH; break;\r
+ case 1: p[i].pst = PST_STEPPER; break;\r
+ case 2: p[i].pst = PST_WJUMPER; break;\r
+ default: p[i].pst = PST_SLIDER; break;\r
}\r
key = (stm == WHITE ? &list->whiteKey : &list->blackKey);\r
if(!*key) *key = ~(myRandom()*myRandom());\r
p[i].pieceKey = *key;\r
p[i].promoFlag = 0;\r
p[i].bulk = list->bulk;\r
+ p[i].ranking = list->ranking;\r
p[i].mobWeight = v > 600 ? 0 : v >= 400 ? 1 : v >= 300 ? 2 : v > 150 ? 3 : v >= 100 ? 2 : 0;\r
if(Lance(list->range))\r
- p[i].mobWeight = 5 + 3*(list->range[4]==X), p[i].pst = 0; // clear path but don't move forward\r
+ p[i].mobWeight = 0, p[i].pst = list->range[4] ? PST_NEUTRAL : PST_LANCE; // keep back\r
for(j=stm+2; j<= last[stm]; j+=2) {\r
if(p[j].promo >= i) p[j].promo += 2;\r
}\r
if(royal[stm] >= i) royal[stm] += 2;\r
if(kylin[stm] >= i) kylin[stm] += 2;\r
- if(p[i].value == (currentVariant == V_SHO ? 410 : 280) ) royal[stm] = i, p[i].pst = 0;\r
+ if(p[i].value == (currentVariant == V_SHO || currentVariant == V_WA ? 410 : 280) ) royal[stm] = i, p[i].pst = 0;\r
p[i].qval = (currentVariant == V_TENJIKU ? list->ranking : 0); // jump-capture hierarchy\r
return i;\r
}\r
\r
void\r
-SetUp(char *array, int var)\r
+SetUp (char *array, int var)\r
{\r
- int i, j, n, m, nr, color;\r
- char c, *q, name[3], prince = 0;\r
+ int i, j, n, m, color, c;\r
+ char name[3], prince = 0;\r
PieceDesc *p1, *p2;\r
last[WHITE] = 1; last[BLACK] = 0;\r
- for(i=0; ; i++) {\r
+ royal[WHITE] = royal[BLACK] = 0;\r
+ for(i=BH-1; ; i--) {\r
//printf("next rank: %s\n", array);\r
for(j = BW*i; ; j++) {\r
int pflag=0;\r
c = name[0] = *array++;\r
if(!c) goto eos;\r
if(c == '.') continue;\r
+ if(c > '0' && c <= '9') {\r
+ c -= '0'; if(*array >= '0' && *array <= '9') c = 10*c + *array++ - '0';\r
+ j += c - 1; continue;\r
+ }\r
if(c == '/') break;\r
name[1] = name[2] = 0;\r
- if(c == ':') name[0] = *array++, name[1] = *array++;\r
- if(name[0] >= 'a') {\r
+ if(c >= 'a') {\r
color = BLACK;\r
- name[0] += 'A' - 'a';\r
- if(name[1]) name[1] += 'A' - 'a';\r
+ c += 'A' - 'a';\r
} else color = WHITE;\r
- if(!strcmp(name, "CP")) prince |= color+1; // remember if we added Crown Prince\r
+ if(*array == '\'') c += 26, array++; else\r
+ if(*array == '!') c += 52, array++;\r
+ name[0] = IDs[2*(c - 'A')];\r
+ name[1] = IDs[2*(c - 'A') + 1]; if(name[1] == ' ') name[1] = 0;\r
+ if(!strcmp(name, "CP") || pflag && !strcmp(name, "DE")) prince |= color+1; // remember if we added Crown Prince\r
p1 = LookUp(name, var);\r
- if(!p1) printf("tellusererror Unknown piece '%s' in setup\n", name), exit(-1);\r
+ if(!p1) printf("tellusererror Unknown piece '%s' in setup (%d)\n", name, c), exit(-1);\r
if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead\r
n = AddPiece(color, p1);\r
p[n].pos = j;\r
}\r
}\r
eos:\r
+ // add dummy Kings if not yet added (needed to set royal[] to valid value!)\r
+ if(!royal[WHITE]) p[AddPiece(WHITE, LookUp("K", V_CHU))].pos = ABSENT;\r
+ if(!royal[BLACK]) p[AddPiece(BLACK, LookUp("K", V_CHU))].pos = ABSENT;\r
// add dummy Crown Princes if not yet added\r
if(!(prince & WHITE+1)) p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos = ABSENT;\r
if(!(prince & BLACK+1)) p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;\r
if(x != ABSENT) for(j=0; j<8; j++) fireBoard[x+kStep[j]] |= n;\r
n <<= 1;\r
}\r
+ for(i=2; i<6; i++) if(p[i].ranking == 5) p[i].promo = -1, p[i].promoFlag = 0; // take promotability away from Werewolves\r
for(i=0; i<BH; i++) for(j=0; j<BH; j++) board[BW*i+j] = EMPTY;\r
for(i=WHITE+2; i<=last[WHITE]; i+=2) if(p[i].pos != ABSENT) {\r
int g = p[i].promoGain;\r
+ if(i == kylin[WHITE]) p[i].promoGain = 1.25*KYLIN, p[i].value += KYLIN;\r
+// if(j > 0 && p[i].pst == PST_STEPPER) p[i].pst = PST_WPPROM; // use white pre-prom bonus\r
+ if(j > 0 && p[i].pst == PST_STEPPER && p[i].value >= 100)\r
+ p[i].pst = p[i].value <= 150 ? PST_ADVANCE : PST_WPPROM; // light steppers advance\r
+ if(j > 0 && p[i].bulk == 6) p[i].pst = PST_WFLYER, p[i].mobWeight = 4; // SM defends zone\r
if((j = p[i].promo) > 0 && g)\r
- p[i].promoGain = (p[j].value - p[i].value - g)*1.25, p[i].value = p[j].value - g;\r
+ p[i].promoGain = (p[j].value - p[i].value - g)*0.9, p[i].value = p[j].value - g;\r
else p[i].promoGain = 0;\r
- if(i == kylin[WHITE]) p[i].promoGain = 1.25*KYLIN, p[i].value += KYLIN;\r
- if(j > 0 && p[i].pst == BH) p[i].pst = 3*BW*BH; // use white pre-prom bonus\r
board[p[i].pos] = i;\r
rootEval += p[i].value + PST[p[i].pst + p[i].pos];\r
promoDelta += p[i].promoGain;\r
} else p[i].promoGain = 0;\r
for(i=BLACK+2; i<=last[BLACK]; i+=2) if(p[i].pos != ABSENT) {\r
int g = p[i].promoGain;\r
+// if(j > 0 && p[i].pst == PST_STEPPER) p[i].pst = PST_BPPROM; // use black pre-prom bonus\r
+ if(j > 0 && p[i].pst == PST_STEPPER && p[i].value >= 100)\r
+ p[i].pst = p[i].value <= 150 ? PST_RETRACT : PST_BPPROM; // light steppers advance\r
+ if(j > 0 && p[i].pst == PST_WJUMPER) p[i].pst = PST_BJUMPER; // use black pre-prom bonus\r
+ if(j > 0 && p[i].bulk == 6) p[i].pst = PST_BFLYER, p[i].mobWeight = 4; // SM defends zone\r
if((j = p[i].promo) > 0 && g)\r
- p[i].promoGain = (p[j].value - p[i].value - g)*1.25, p[i].value = p[j].value - g;\r
+ p[i].promoGain = (p[j].value - p[i].value - g)*0.9, p[i].value = p[j].value - g;\r
else p[i].promoGain = 0;\r
if(i == kylin[BLACK]) p[i].promoGain = 1.25*KYLIN, p[i].value += KYLIN;\r
- if(j > 0 && p[i].pst == BH) p[i].pst = 3*BW*BH + BH; // use black pre-prom bonus\r
- if(j > 0 && p[i].pst == bsize) p[i].pst = 4*BW*BH; // use white pre-prom bonus\r
board[p[i].pos] = i;\r
rootEval -= p[i].value + PST[p[i].pst + p[i].pos];\r
promoDelta -= p[i].promoGain;\r
bHeight = variants[var].boardRanks;\r
zone = variants[var].zoneDepth;\r
array = variants[var].array;\r
+ IDs = variants[var].IDs;\r
}\r
bsize = bWidth*bHeight;\r
chuFlag = (currentVariant == V_CHU || currentVariant == V_LION);\r
tenFlag = (currentVariant == V_TENJIKU);\r
- chessFlag = (currentVariant == V_CHESS || currentVariant == V_LION);\r
- stalemate = (currentVariant == V_CHESS || currentVariant == V_MAKRUK || currentVariant == V_LION);\r
+ chessFlag = (currentVariant == V_CHESS || currentVariant == V_LION || currentVariant == V_WOLF);\r
+ stalemate = (currentVariant == V_CHESS || currentVariant == V_MAKRUK || currentVariant == V_LION || currentVariant == V_WOLF);\r
repDraws = (stalemate || currentVariant == V_SHATRANJ);\r
ll = 0; lr = bHeight - 1; ul = (bHeight - 1)*bWidth; ur = ul + bHeight - 1;\r
pawn = LookUp("P", currentVariant); pVal = pawn ? pawn->value : 0; // get Pawn value\r
// Lion-Dog triple moves\r
toList[64+i] = 3*kStep[i]; epList[64+i] = kStep[i];\r
toList[72+i] = 3*kStep[i]; epList[72+i] = 2*kStep[i];\r
- toList[80+i] = 3*kStep[i]; epList[80+i] = kStep[i]; ep2List[80+i] = 2*kStep[i];\r
+ toList[80+i] = 3*kStep[i]; epList[80+i] = 2*kStep[i]; ep2List[80+i] = kStep[i];\r
toList[88+i] = kStep[i]; epList[88+i] = 2*kStep[i];\r
}\r
\r
+ toList[100] = BH - 2; epList[100] = BH - 1; ep2List[100] = BH - 3;\r
+ toList[100+1] = 2; epList[100+1] = 0; ep2List[100+1] = 3;\r
+ toList[100+2] = bsize - BH - 2; epList[100+2] = bsize - BH - 1; ep2List[100+2] = bsize - BH - 3;\r
+ toList[100+3] = bsize - BW + 2; epList[100+3] = bsize - BW; ep2List[100+3] = bsize - BW + 3;\r
+\r
// fill distance table\r
for(i=0; i<2*BSIZE; i++) {\r
distance[i] = 0;\r
for(j=0; j<BH; j++) {\r
for(i=0; i<BH; i++) {\r
int s = BW*i + j, d = BH*(BH-2) - abs(2*i - BH + 1)*(BH-1) - (2*j - BH + 1)*(2*j - BH + 1);\r
- PST[s] = 2*(i==0 | i==BH-1) + (i==1 | i==BH-2); // last-rank markers in null table\r
- PST[BH+s] = d/4 - (i < 2 || i > BH-3 ? 3 : 0) - (j == 0 || j == BH-1 ? 5 : 0)\r
- + 3*(i==zone || i==BH-zone-1); // stepper centralization\r
- PST[BH*BW+s] = d/6; // double-stepper centralization\r
- PST[BH*BW+BH+s] = d/12 - 5*(i==BH/2 || i==(BH-1)/2); // slider centralization\r
- PST[2*BH*BW+s] = j < 3 || j > BH-4 ? (i < 3 ? 7 : i == 3 ? 4 : i == 4 ? 2 : 0) : 0;\r
- PST[2*BH*BW+BH+s] = ((BH-1)*(BH-1) - (2*i - BH + 1)*(2*i - BH + 1) - (2*j - BH + 1)*(2*j - BH + 1))/6;\r
- PST[3*BH*BW+s] = PST[3*BH*BW+BH+s] = PST[BH+s]; // as stepper, but with pre-promotion bonus W/B\r
- PST[4*BH*BW+s] = PST[BW*BH+s]; // as jumper, but with pre-promotion bonus B\r
- PST[4*BH*BW+BH+s] = BW*(zone - 1 - i); // board step to enter promo zone black\r
+ PST[s] = 2*(i==0 | i==BH-1) + (i==1 | i==BH-2); // last-rank markers in null table\r
+ PST[PST_STEPPER+s] = d/4 - (i < 2 || i > BH-3 ? 3 : 0) - (j == 0 || j == BH-1 ? 5 : 0)\r
+ + 3*(i==zone || i==BH-zone-1); // stepper centralization\r
+ PST[PST_WJUMPER+s] = d/6; // double-stepper centralization\r
+ PST[PST_SLIDER +s] = d/12 - 15*(i==BH/2 || i==(BH-1)/2);// slider centralization\r
+ PST[PST_TRAP +s] = j < 3 || j > BH-4 ? (i < 3 ? 7 : i == 3 ? 4 : i == 4 ? 2 : 0) : 0;\r
+ PST[PST_CENTER+s] = ((BH-1)*(BH-1) - (2*i - BH + 1)*(2*i - BH + 1) - (2*j - BH + 1)*(2*j - BH + 1))/6;\r
+ PST[PST_WPPROM+s] = PST[PST_BPPROM+s] = PST[PST_STEPPER+s]; // as stepper, but with pre-promotion bonus W/B\r
+ PST[PST_BJUMPER+s] = PST[PST_WJUMPER+s]; // as jumper, but with pre-promotion bonus B\r
+ PST[PST_ZONDIST+s] = BW*(zone - 1 - i); // board step to enter promo zone black\r
+ PST[PST_ADVANCE+s] = PST[PST_WFLYER-s-1] = 2*(5*i+i*i) - (i >= zone)*6*(i-zone+1)*(i-zone+1)\r
+ - (2*j - BH + 1)*(2*j - BH + 1)/BH + BH/2\r
+ - 50 - 35*(j==0 || j == BH-1) - 15*(j == 1 || BH-2); // advance-encouraging table\r
+ PST[PST_WFLYER +s] = PST[PST_LANCE-s-1] = (i == zone-1)*40 + (i == zone-2)*20 - 20;\r
+ PST[PST_LANCE +s] = (PST[PST_STEPPER+j] - PST[PST_STEPPER+s])/2; \r
}\r
- if(zone > 0) PST[3*BW*BH+BW*(BH-1-zone) + j] += 10, PST[3*BW*BH+BH + BW*zone + j] += 10;\r
+ if(zone > 0) PST[PST_WPPROM+BW*(BH-1-zone) + j] += 10, PST[PST_BPPROM + BW*zone + j] += 10;\r
+ if(j > (BH-1)/2 - 3 && j < BH/2 + 3)\r
+ PST[PST_WPPROM + j] += 4, PST[PST_BPPROM + BW*(BH-1) + j] += 4; // fortress\r
+ if(j > (BH-1)/2 - 2 && j < BH/2 + 2)\r
+ PST[PST_WPPROM + BW + j] += 2, PST[PST_BPPROM + BW*(BH-2) + j] += 2; // fortress\r
#if KYLIN\r
// pre-promotion bonuses for jumpers\r
- if(zone > 0) PST[BW*BH + BW*(BH-2-zone) + j] = PST[4*BW*BH + BW*(zone+1) + j] = 100,\r
- PST[BW*BH + BW*(BH-1-zone) + j] = PST[4*BW*BH + BW*zone + j] = 200;\r
+ if(zone > 0) PST[PST_WJUMPER + BW*(BH-2-zone) + j] = PST[PST_BJUMPER + BW*(zone+1) + j] = 100,\r
+ PST[PST_WJUMPER + BW*(BH-1-zone) + j] = PST[PST_BJUMPER + BW*zone + j] = 200;\r
#endif\r
}\r
\r
{\r
if(board[y] != EMPTY) return 1; // edge, capture or own piece\r
//if(flag) printf("# add %c%d%c%d, pf=%d\n", x%BW+'a',x/BW,y%BW+'a',y/BW, promoFlags);\r
- if( (promoBoard[x] | promoBoard[y]) & promoFlags &&\r
- (!entryProm || promoBoard[y] & ~promoBoard[x] & CAN_PROMOTE )){ // piece can promote with this move\r
+ if( (entryProm ? promoBoard[y] & ~promoBoard[x] & CAN_PROMOTE\r
+ : promoBoard[y] | promoBoard[x] ) & promoFlags ){ // piece can promote with this move\r
moveStack[msp++] = moveStack[nonCapts]; // create space for promotion\r
moveStack[nonCapts++] = x<<SQLEN | y | PROMOTE; // push promotion\r
if((promoFlags & promoBoard[y] & (CANT_DEFER | DONT_DEFER | LAST_RANK)) == 0) { // deferral could be a better alternative\r
char rowMask[] = { 0100, 0140, 0160, 070, 034, 016, 07, 03, 01 };\r
char rows[9];\r
\r
-int\r
+void\r
AreaStep (int from, int x, int flags, int n, int d)\r
{\r
int i;\r
}\r
}\r
\r
-int\r
+void\r
AreaMoves (int from, int piece, int range)\r
{\r
int i;\r
for(r=b; r<=t-2; r++) rows[r] |= rows[r+1] | rows[r+2]; // smear vertically\r
}\r
\r
+void\r
+GenCastlings ()\r
+{ // castings for Lion Chess. Assumes board width = 8 and Kings on e-file, and K/R value = 280/300!\r
+ int f = BH>>1, t = CASTLE;\r
+ if(stm != WHITE) f += bsize - BW, t += 2;\r
+ if(p[board[f]].value = 280) {\r
+ if(p[board[f-4]].value == 300 && board[f-3] == EMPTY && board[f-2] == EMPTY && board[f-1] == EMPTY) moveStack[msp++] = f<<SQLEN | t+1;\r
+ if(p[board[f+3]].value == 300 && board[f+1] == EMPTY && board[f+2] == EMPTY) moveStack[msp++] = f<<SQLEN | t;\r
+ }\r
+}\r
+\r
int\r
GenNonCapts (int promoSuppress)\r
{\r
for(j=0; j<8; j++) {\r
int y, v = kStep[j], r = p[i].range[j];\r
if(r < 0) { // jumping piece, special treatment\r
- if(r == N) { // pure Knightm do off-ray jump\r
+ if(r == N) { // pure Knight, do off-ray jump\r
NewNonCapture(x, x + nStep[j], pFlag);\r
} else\r
if(r >= S) { // in any case, do a jump of 2\r
int occup = NewNonCapture(x, x + 2*v, pFlag);\r
- if(r < J) { // Lion power, also single step\r
- if(!NewNonCapture(x, x + v, pFlag)) nullMove = x; else occup = 1;\r
+ if(r < I) { // Lion power, also single step\r
+ if(!NewNonCapture(x, x + v, pFlag)) nullMove = (r == W ? ABSENT : x); else occup = 1;\r
if(r <= L) { // true Lion, also Knight jump\r
if(!occup & r < L) for(y=x+2*v; !NewNonCapture(x, y+=v, pFlag) && r == S; ); // BS and FF moves\r
v = nStep[j];\r
- NewNonCapture(x, x + v, pFlag);\r
+ if(r != W) NewNonCapture(x, x + v, pFlag);\r
+ } else if(r == T) NewNonCapture(x, x+3*v, pFlag); // Lion Dog, also triple step\r
+ else if(r == K) {\r
+ occup |= NewNonCapture(x, x+3*v, pFlag); // Lion Dog, also triple step\r
+ if(!occup) for(y=x+3*v; !NewNonCapture(x, y+=v, pFlag); ); // TK moves\r
}\r
- }\r
+ } else if(r == I) NewNonCapture(x, x + v, pFlag); // also do step\r
} else\r
if(r == M) { // FIDE Pawn; check double-move\r
if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v] & LAST_RANK)\r
int\r
MapOneColor (int start, int last, int *map)\r
{\r
- int i, j, k, totMob = 0;\r
+ int i, j, totMob = 0;\r
for(i=start+2; i<=last; i+=2) {\r
int mob = 0;\r
if(p[i].pos == ABSENT) continue;\r
if(r < J) { // Lion power, also single step\r
if(board[x + v] != EMPTY && board[x + v] != EDGE)\r
map[2*(x + v) + start] += one[j];\r
- if(r == T) { // Lion Dog, also jump of 3\r
+ if(r < I) {\r
+ if(r == T || r == K) { // Lion Dog, also jump of 3\r
if(board[x + 3*v] != EMPTY && board[x + 3*v] != EDGE)\r
map[2*(x + 3*v) + start] += one[j];\r
+ if(r == K) { // also range (Teaching King)\r
+ int y = x, n = 0;\r
+ while(1) {\r
+ if(board[y+=v] == EDGE) break;\r
+ if(board[y] != EMPTY) {\r
+ if(n > 2) map[2*y + start] += one[j]; // outside Lion range\r
+ break;\r
+ }\r
+ n++;\r
+ }\r
+ }\r
} else\r
if(r <= L) { // true Lion, also Knight jump\r
if(r < L) { // Lion plus (limited) range\r
int y = x, n = 0;\r
- r = (r == S ? 36 : 3);\r
- while(n++ <= r) {\r
+ int rg = (r == S ? 36 : 3);\r
+ while(n++ < rg) {\r
if(board[y+=v] == EDGE) break;\r
if(board[y] != EMPTY) {\r
if(n > 2) map[2*y + start] += one[j]; // outside Lion range\r
}\r
}\r
v = nStep[j];\r
- if(board[x + v] != EMPTY && board[x + v] != EDGE)\r
+ if(board[x + v] != EMPTY && board[x + v] != EDGE && r != W)\r
map[2*(x + v) + start] += one[8];\r
}\r
+ }\r
}\r
} else\r
if(r == C) { // FIDE Pawn diagonal\r
int i;\r
for(i=0; i<2*bsize; i++) map[i] = 0;\r
mobilityScore = MapOneColor(1, last[WHITE], map);\r
+\r
mobilityScore -= MapOneColor(0, last[BLACK], map);\r
}\r
\r
} else u->new = u->piece;\r
\r
if(u->to >= SPECIAL) { // two-step Lion move\r
+ if(u->to >= CASTLE) { // move Rook, faking it was an e.p. victim so that UnMake works automatically\r
+ u->epSquare = epList[u->to - SPECIAL];\r
+ u->ep2Square = ep2List[u->to - SPECIAL];\r
+ u->epVictim[0] = board[u->epSquare]; // kludgy: fake that King e.p. captured the Rook!\r
+ u->epVictim[1] = board[u->ep2Square]; // should be EMPTY (but you never know, so save as well).\r
+ board[u->ep2Square] = u->epVictim[0]; // but put Rook back\r
+ board[u->epSquare] = EMPTY;\r
+ p[u->epVictim[0]].pos = u->ep2Square;\r
+ p[u->epVictim[1]].pos = ABSENT;\r
+ u->to = toList[u->to - SPECIAL];\r
+ hashKeyL ^= p[u->epVictim[0]].pieceKey * squareKey[u->epSquare];\r
+ hashKeyH ^= p[u->epVictim[0]].pieceKey * squareKey[u->epSquare+BH];\r
+ hashKeyL ^= p[u->epVictim[0]].pieceKey * squareKey[u->ep2Square];\r
+ hashKeyH ^= p[u->epVictim[0]].pieceKey * squareKey[u->ep2Square+BH];\r
+ } else {\r
// take care of first e.p. victim\r
u->epSquare = u->from + epList[u->to - SPECIAL]; // decode\r
u->epVictim[0] = board[u->epSquare]; // remember for takeback\r
hashKeyH ^= p[u->epVictim[1]].pieceKey * squareKey[u->ep2Square+BH];\r
if(p[u->piece].value != LVAL && p[u->epVictim[0]].value == LVAL) deferred |= PROMOTE; // flag non-Lion x Lion\r
cnt50 = 0; // double capture irreversible\r
+ }\r
}\r
\r
if(u->fireMask & fireBoard[u->to]) { // we moved next to enemy Fire Demon (must be done after SPECIAL, to decode to-sqr)\r
u->epVictim[0] = EDGE; // kludge to flag to UnMake this is special move\r
}\r
\r
- u->booty += PST[p[u->new].pst + u->to] - PST[p[u->piece].pst + u->from];\r
-\r
u->victim = board[u->to];\r
p[u->victim].pos = ABSENT;\r
+ if(p[u->victim].ranking == 5 && p[u->piece].ranking < 4) { // contageous piece captured by non-royal\r
+ u->booty -= p[u->new].value;\r
+ u->new = u->piece & 1 | 2; // promote to it\r
+ if(p[u->new].pos != ABSENT) u->new += 2;\r
+ p[u->piece].pos = ABSENT;\r
+ u->booty += p[u->new].value;\r
+ }\r
+\r
+ u->booty += PST[p[u->new].pst + u->to] - PST[p[u->piece].pst + u->from];\r
+\r
filling += p[u->new].bulk - p[u->piece].bulk - p[u->victim].bulk;\r
promoDelta += p[u->new].promoGain - p[u->piece].promoGain + p[u->victim].promoGain;\r
u->booty += p[u->victim].value + PST[p[u->victim].pst + u->to];\r
}\r
\r
void\r
-GenCapts(int sqr, int victimValue)\r
+GenCapts (int sqr, int victimValue)\r
{ // generate all moves that capture the piece on the given square\r
- int i, range, att = attacks[2*sqr + stm];\r
+ int i, att = attacks[2*sqr + stm];\r
//printf("GenCapts(%c%d,%d) %08x\n",sqr%BW+'a',sqr/BW,victimValue,att);\r
if(!att) return; // no attackers at all!\r
for(i=0; i<8; i++) { // try all rays\r
- int x, v, jumper, jcapt=0;\r
+ int x, v, jcapt=0;\r
if(att & attackMask[i]) { // attacked by move in this direction\r
v = -kStep[i]; x = sqr;\r
while( board[x+=v] == EMPTY ); // scan towards source until we encounter a 'stop'\r
NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // hit and run\r
}\r
break;\r
+ case T: // Lion-Dog move (awful!)\r
+ case K:\r
+ if(d > 3) break;\r
+ NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
+ att -= one[i];\r
+ if(d == 3) { // check if we can take one or two intermediates (with higher piece index) with it\r
+ if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr]) {\r
+ NewCapture(x, SPECIAL + 64 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. first\r
+ if((board[x-2*v] & TYPE) == xstm && board[x-2*v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. both\r
+ } else if((board[x-2*v] & TYPE) == xstm && board[x-2*v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. second\r
+ } else if(d == 2) { // check if we can take intermediate with it\r
+ if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr]) {\r
+ NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. first, stop at 2nd\r
+ NewCapture(x, SPECIAL + 88 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // shoot 2nd, take 1st\r
+ if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and 2nd\r
+ } else if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 2nd\r
+ } else { // d=1; can move on to second, or move back for igui\r
+ NewCapture(x, SPECIAL + 8*i + (i^4) + victimValue, p[attacker].promoFlag); // igui\r
+ if(board[sqr-v] == EMPTY) { // 2nd empty\r
+ NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and run to 2nd\r
+ if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, end on 3rd\r
+ } else if((board[sqr-v] & TYPE) == stm) { // 2nd own\r
+ if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 72 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, end on 3rd\r
+ } else if((board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr]) {\r
+ NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st, capture and stop at 2nd\r
+ NewCapture(x, SPECIAL + 88 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // shoot 2nd\r
+ if(board[sqr-2*v] == EMPTY || (board[sqr-2*v] & TYPE) == xstm && board[sqr-2*v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 80 + i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p. 1st and 2nd\r
+ }\r
+ }\r
+ break;\r
case J: // plain jump (as in KY, PH)\r
if(d != 2) break;\r
+ case I: // jump + step (as in Wa TF)\r
+ if(d > 2) break;\r
NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
att -= one[i];\r
break;\r
+ case W: // jump + locust jump + 3-slide (Werewolf)\r
+ if(d > 2) break;\r
+ NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
+ att -= one[i];\r
+ if(d == 2) { // check if we can take intermediate with it\r
+ if((board[x-v] & TYPE) == xstm && board[x-v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // e.p.\r
+ } else { // d=1; can move on to second\r
+ if(board[sqr-v] == EMPTY || (board[sqr-v] & TYPE) == xstm && board[sqr-v] > board[sqr])\r
+ NewCapture(x, SPECIAL + 9*i + victimValue - SORTKEY(attacker), p[attacker].promoFlag); // hit and run\r
+ }\r
+ break;\r
case C: // FIDE Pawn\r
if(d != 1) break;\r
NewCapture(x, sqr + victimValue - SORTKEY(attacker), p[attacker].promoFlag);\r
//printf("mask[%d] = %o\n", i, att);\r
if((att & attackMask[i]) == 0) break;\r
}\r
- // more attacks to come; san for next stop\r
+ // more attacks to come; scan for next stop\r
if(jcapt < p[board[x]].qval) jcapt = p[board[x]].qval; // raise barrier for range jumpers further upstream\r
while(board[x+=v] == EMPTY); // this should never run off-board, if the attack map is not corrupted\r
} while(1);\r
for(i=0; i<8; i++) { // scan all knight jumps to locate source\r
int x = sqr - nStep[i], attacker = board[x];\r
if(attacker == EMPTY || (attacker & TYPE) != stm) continue;\r
- if(p[attacker].range[i] <= L && p[attacker].range[i] >= S || p[attacker].range[i] == N) { // has Knight jump in our direction\r
+ if(p[attacker].range[i] == L || p[attacker].range[i] < W && p[attacker].range[i] >= S || p[attacker].range[i] == N) { // has Knight jump in our direction\r
NewCapture(x, sqr + victimValue, p[attacker].promoFlag); // plain jump (as in N)\r
if(p[attacker].range[i] < N) { // Lion power; generate double captures over two possible intermediates\r
int v = kStep[i]; // leftish path\r
int\r
Fortress (int forward, int king, int lion)\r
{ // penalty for lack of Lion-proof fortress\r
- int rank = PST[king], anchor, r, l, q;\r
- if(!rank) return -300;\r
+ int rank = PST[king], anchor, r, l, q, res = 0;\r
+ if(rank != 2) return 25*(rank-2);\r
anchor = king + forward*(rank-1);\r
\r
+ q = Guard(anchor); l = Guard(anchor-1); r = Guard(anchor+1);\r
+ if(!q) return l > 1 || r > 1 ? 0 : -25;\r
+ if(q == 1) res = 40*(l > 1 && r > 1); // TGT, EGT or TGE get 40\r
+ else { // T or E in front of King\r
+ if(l > 1) res = 30 + (r > 1)*(20 + 5*(q==2)); // TT., ET. or TE. (30), TET (50), TTE (55)\r
+ else if(r > 1) res = 30; // .TT, .ET or .TE (30)\r
+ }\r
+ q = 0;\r
+ if(filling > 32) {\r
+ if(r > 1 && Guard(king+2) == 1) q += 10;\r
+ if(l > 1 && Guard(king-2) == 1) q += 10; \r
+ q += 5*(Guard(king+1) == 1);\r
+ q += 5*(Guard(king-1) == 1);\r
+ if(filling < 96) q = q*(filling - 32)>>6;\r
+ }\r
+ return res + q;\r
+\r
if(Guard(anchor) == 3 || Guard(anchor+1) == 3 || Guard(anchor-1) == 3) return 0;\r
if(rank == 2 && Guard(king+1) == 3 || Guard(king-1) == 3) return -50;\r
if(Guard(r=anchor) == 2 || Guard(r=anchor+1) == 2 || Guard(r=anchor-1) == 2)\r
}\r
\r
int\r
-Surround (int stm, int king, int start)\r
+Surround (int stm, int king, int start, int max)\r
{\r
int i, s=0;\r
for(i=start; i<9; i++) {\r
v = p[piece].value;\r
s += -(v > 70) & v;\r
}\r
- return (s > 512 ? 512 : s);\r
+ return (s > max ? max : s);\r
}\r
\r
int\r
int\r
Evaluate (int difEval)\r
{\r
- int wLion = ABSENT, bLion = ABSENT, wKing, bKing, score=mobilityScore, f, i, j;\r
+ int wLion = ABSENT, bLion = ABSENT, wKing, bKing, score=mobilityScore, f, i, j, max=512;\r
+\r
+ if(tsume) return difEval;\r
\r
if(p[WHITE+2].value == LVAL) wLion = p[WHITE+2].pos;\r
if(p[BLACK+2].value == LVAL) bLion = p[BLACK+2].pos;\r
if(bLion == ABSENT && p[BLACK+4].value == LVAL) bLion = p[BLACK+4].pos;\r
\r
#ifdef LIONTRAP\r
-# define lionTrap (PST + 2*BH*BW)\r
+# define lionTrap (PST + PST_TRAP)\r
// penalty for Lion in enemy corner, when enemy Lion is nearby\r
if(wLion != ABSENT && bLion != ABSENT) { // both have a Lion\r
static int distFac[36] = { 0, 0, 10, 9, 8, 7, 5, 3, 1 };\r
\r
#ifdef KINGSAFETY\r
// basic centralization in end-game (also facilitates bare-King mating)\r
- wKing = p[royal[WHITE]].pos; if(wKing == ABSENT) wKing = p[royal[WHITE]+1].pos;\r
- bKing = p[royal[BLACK]].pos; if(bKing == ABSENT) bKing = p[royal[BLACK]+1].pos;\r
+ wKing = p[royal[WHITE]].pos; if(wKing == ABSENT) wKing = p[royal[WHITE]+2].pos;\r
+ bKing = p[royal[BLACK]].pos; if(bKing == ABSENT) bKing = p[royal[BLACK]+2].pos;\r
if(filling < 32) {\r
int lead = (stm == WHITE ? difEval : -difEval);\r
- score += (PST[3*BW*BH+wKing] - PST[3*BW*BH+bKing])*(32 - filling) >> 7;\r
- if(lead > 100) score -= PST[3*BW*BH+bKing]*(32 - filling) >> 3; // white leads, drive black K to corner\r
- if(lead < -100) score += PST[3*BW*BH+wKing]*(32 - filling) >> 3; // black leads, drive white K to corner\r
+ score += (PST[PST_CENTER+wKing] - PST[PST_CENTER+bKing])*(32 - filling) >> 7;\r
+ if(lead > 100) score -= PST[PST_CENTER+bKing]*(32 - filling) >> 3; // white leads, drive black K to corner\r
+ if(lead < -100) score += PST[PST_CENTER+wKing]*(32 - filling) >> 3; // black leads, drive white K to corner\r
+ max = 16*filling;\r
}\r
\r
# ifdef FORTRESS\r
f = 0;\r
if(bLion != ABSENT) f += Fortress( BW, wKing, bLion);\r
if(wLion != ABSENT) f -= Fortress(-BW, bKing, wLion);\r
- score += (filling < 96 ? f : f*(224 - filling) >> 7); // build up slowly\r
+ score += (filling < 192 ? f : f*(224 - filling) >> 5); // build up slowly\r
# endif\r
\r
# ifdef KSHIELD\r
- score += Surround(WHITE, wKing, 1) - Surround(BLACK, bKing, 1) >> 3;\r
+ score += Surround(WHITE, wKing, 1, max) - Surround(BLACK, bKing, 1, max) >> 3;\r
# endif\r
\r
#endif\r
if(filling < 128) {\r
int sq;\r
if((wLion = kylin[WHITE]) && (sq = p[wLion].pos) != ABSENT) {\r
- int anchor = sq - PST[5*BW*BH - 1 - sq];\r
- score += (512 - Surround(BLACK, anchor, 0))*(128 - filling)*PST[p[wLion].pst + sq] >> 15;\r
+ int anchor = sq - PST[5*BW*BH - 1 - sq]; // FIXME: PST_ZONDIST indexed backwards\r
+ score += (512 - Surround(BLACK, anchor, 0, 512))*(128 - filling)*PST[p[wLion].pst + sq] >> 15;\r
}\r
if((bLion = kylin[BLACK]) && (sq = p[bLion].pos) != ABSENT) {\r
- int anchor = sq + PST[4*BW*BH + BH + sq];\r
- score -= (512 - Surround(WHITE, anchor, 0))*(128 - filling)*PST[p[bLion].pst + sq] >> 15;\r
+ int anchor = sq + PST[PST_ZONDIST + sq];\r
+ score -= (512 - Surround(WHITE, anchor, 0, 512))*(128 - filling)*PST[p[bLion].pst + sq] >> 15;\r
}\r
}\r
#endif\r
\r
#ifdef PAWNBLOCK\r
- // penalty for blocking own P or GB: 20 by slider, 10 by other, but 50 if only retreat mode is straight back\r
+ // penalty for blocking own P or GB: 20 by slider, 10 by other, but 50 if only RETRACT mode is straight back\r
for(i=last[WHITE]; i > 1 && p[i].value<=50; i-=2) {\r
if((f = p[i].pos) != ABSENT) { // P present,\r
if((j = board[f + BW])&1) // square before it white (odd) piece\r
}\r
#endif\r
\r
- return difEval - (filling*filling*promoDelta >> 16) + (stm ? score : -score);\r
+#ifdef TANDEM\r
+ if(zone > 0) {\r
+ int rw = BW*(BH-1-zone), rb = BW*zone, h=0;\r
+ for(f=0; f<BH; f++) {\r
+ if(p[board[rw+f]].pst == PST_ADVANCE) {\r
+ h += (p[board[rw+f-BW]].pst == PST_ADVANCE);\r
+ if(f > 0) h += (p[board[rw+f-BW-1]].pst == PST_ADVANCE);\r
+ if(f+1 < BH) h += (p[board[rw+f-BW+1]].pst == PST_ADVANCE);\r
+ }\r
+ if(p[board[rb+f]].pst == PST_ADVANCE) {\r
+ h -= (p[board[rb+f+BW]].pst == PST_RETRACT);\r
+ if(f > 0) h -= (p[board[rb+f+BW-1]].pst == PST_RETRACT);\r
+ if(f+1 < BH) h -= (p[board[rb+f+BW+1]].pst == PST_RETRACT);\r
+ }\r
+ }\r
+ score += h*TANDEM;\r
+ }\r
+#endif\r
+\r
+ return difEval - (filling*promoDelta >> 8) + (stm ? score : -score);\r
}\r
\r
inline void\r
// in-check test and TSUME filter\r
{\r
k = p[king=royal[stm]].pos;\r
- if( k == ABSENT) k = p[king + 2].pos;\r
- else if(p[king + 2].pos != ABSENT) k = ABSENT; // two kings is no king...\r
+ if( k == ABSENT) {\r
+ if((k = p[king + 2].pos) == ABSENT && (!tsume || tsume & stm+1))\r
+ return -INF; // lose when no King (in tsume only for side to be mated)\r
+ } else if(p[king + 2].pos != ABSENT) {\r
+ if(tsume && tsume & stm+1) {\r
+ retDep = 60; return INF; // we win when not in check\r
+ }\r
+ k = ABSENT; // two kings is no king...\r
+ }\r
if( k != ABSENT) { // check is possible\r
if(!attacks[2*k + xstm]) {\r
if(tsume && tsume & stm+1) {\r
}\r
} else { // he has no king! Test for attacks on Crown Prince\r
k = p[king + 2].pos;\r
- if(attacks[2*k + stm]) return INF; // we have attack on Crown Prince\r
+ if(k == ABSENT ? !tsume : attacks[2*k + stm]) return INF; // we have attack on Crown Prince\r
}\r
//printf("King safe\n");fflush(stdout);\r
// EVALUATION & WINDOW SHIFT\r
if(hit >= 0) {\r
bestScore = hashTable[index].score[hit];\r
hashMove = hashTable[index].move[hit];\r
+\r
if((bestScore <= alpha || hashTable[index].flag[hit] & H_LOWER) &&\r
(bestScore >= beta || hashTable[index].flag[hit] & H_UPPER) ) {\r
iterDep = resDep = hashTable[index].depth[hit]; bestMoveNr = 0;\r
if(to == ABSENT) continue; // ignore if absent\r
if(!attacks[2*to + stm]) continue; // skip if not attacked\r
group = p[nextVictim].value; // remember value of this found victim\r
- if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) { resDep = QSdepth + 1; goto cutoff; }\r
+ if(iterDep <= QSdepth + 1 && 2*group + curEval + 30 < alpha) {\r
+ resDep = QSdepth + 1; nextVictim -= 2;\r
+ if(bestScore < 2*group + curEval + 30) bestScore = 2*group + curEval + 30;\r
+ goto cutoff;\r
+ }\r
if(PATH) printf("%d:%2d:%2d group=%d, to=%c%d\n",level,depth,iterDep,group,to%BW+'a',to/BW+ONE);\r
GenCapts(to, 0);\r
if(PATH) printf("%d:%2d:%2d first=%d msp=%d\n",level,depth,iterDep,firstMove,msp);\r
case 6: // non-captures\r
nonCapts = msp;\r
nullMove = GenNonCapts(oldPromo);\r
+ if(msp == nonCapts) goto cutoff;\r
#ifdef KILLERS\r
{ // swap killers to front\r
Move h = killer[level][0]; int j = curMove;\r
\r
if(flag & depth >= 0) printf("%2d:%d made %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0));\r
for(i=2; i<=cnt50; i+=2) if(repStack[level-i+200] == hashKeyH) {\r
+ retDep = iterDep;\r
if(repDraws) { score = 0; goto repetition; }\r
if(!allowRep) {\r
moveStack[curMove] = 0; // erase forbidden move\r
MapFromScratch(attacks); // for as long as incremental update does not work.\r
//if(flag & depth >= 0) printf("%2d:%d mapped %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0));\r
//if(PATH) pmap(attacks, stm);\r
- if(chuFlag && p[tb.victim].value == LVAL) {// verify legality of Lion capture in Chu Shogi\r
+ if(chuFlag && (p[tb.victim].value == LVAL || p[tb.epVictim[0]].value == LVAL)) {// verify legality of Lion capture in Chu Shogi\r
score = 0;\r
if(p[tb.piece].value == LVAL) { // Ln x Ln: can make Ln 'vulnerable' (if distant and not through intemediate > GB)\r
if(dist[tb.from-tb.to] != 1 && attacks[2*tb.to + stm] && p[tb.epVictim[0]].value <= 50)\r
score = -INF; // our Lion is indeed made vulnerable and can be recaptured\r
} else { // other x Ln\r
- if(promoSuppress & PROMOTE) score = -INF; // non-Lion captures Lion after opponent did same\r
+ if(promoSuppress & PROMOTE) { // non-Lion captures Lion after opponent did same\r
+ if(!okazaki || attacks[2*tb.to + stm]) score = -INF;\r
+ }\r
defer |= PROMOTE; // if we started, flag he cannot do it in reply\r
}\r
if(score == -INF) {\r
score = -Search(-beta, -iterAlpha, -difEval - tb.booty, iterDep-1+ext,\r
curMove >= late && iterDep > QSdepth + LMR,\r
promoSuppress & ~PROMOTE, defer, depth ? INF : tb.gain);\r
+\r
#else\r
score = 0;\r
#endif\r
#ifdef HASH\r
// hash store\r
hashTable[index].lock[hit] = hashKeyH;\r
- hashTable[index].depth[hit] = iterDep;\r
+ hashTable[index].depth[hit] = resDep;\r
hashTable[index].score[hit] = bestScore;\r
hashTable[index].flag[hit] = (bestScore < beta) * H_UPPER;\r
if(bestScore > alpha) {\r
{\r
int i, j;\r
for(i=0; i<182; i++) {\r
- printf("%3d. %3d %3d %4d %02x %d %d %x %3d ", i, p[i].value, p[i].promo, p[i].pos, p[i].promoFlag&255, p[i].mobWeight, p[i].qval, p[i].bulk, p[i].promoGain);\r
+ printf("%3d. %3d %3d %4d %02x %d %d %x %3d %4d ", i, p[i].value, p[i].promo, p[i].pos, p[i].promoFlag&255, p[i].mobWeight, p[i].qval, p[i].bulk, p[i].promoGain, p[i].pst);\r
for(j=0; j<8; j++) printf(" %2d", p[i].range[j]);\r
- if(i<2 || i>11) printf("\n"); else printf(" %02x\n", fireFlags[i-2]&255);\r
+ if(i<2 || i>11) printf("\n"); else printf(" %02x %d\n", fireFlags[i-2]&255, p[i].ranking);\r
}\r
printf("last: %d / %d\nroyal %d / %d\n", last[WHITE], last[BLACK], royal[WHITE], royal[BLACK]);\r
}\r
for(i=BH-1; i>=0; i--) {\r
for(j=0; j<BH; j++) printf("%3x", b[BW*i+j]);\r
printf("\n");\r
+\r
}\r
}\r
\r
\r
// some parameter of your engine\r
#define MAXMOVES 2000 /* maximum game length */\r
- #define MAXPLY 30 /* maximum search depth */\r
+ #define MAXPLY 60 /* maximum search depth */\r
\r
#define OFF 0\r
#define ON 1\r
if(chuFlag && p[undoInfo.victim].value == LVAL && p[undoInfo.piece].value != LVAL) sup2 |= PROMOTE;\r
rootEval = -rootEval - undoInfo.booty;\r
for(i=0; i<200; i++) repStack[i] = repStack[i+1], checkStack[i] = checkStack[i+1];\r
+\r
+\r
repStack[199] = hashKeyH, checkStack[199] = inCheck;\r
printf("# makemove %08x %c%d %c%d\n", move, sup1%BW+'a', sup1/BW, sup2%BW+'a', sup2/BW);\r
return stm ^ WHITE;\r
sup2 = sup1; sup1 = sup0;\r
}\r
\r
-char fenNames[] = "RV....DKDEFL..DHGB......SMLNKN..FK....BT..VM..PH..LN"; // pairs of char\r
-char fenPromo[] = "WLDHSMSECPB R HFDE....WHFB..LNG ..DKVMFS..FO..FK...."; // pairs of char\r
-\r
-char *\r
-Convert (char *fen)\r
-{\r
- char *p = fenArray, *q, *rows[36], tmp[4000];\r
- int n=0;\r
- printf("# convert FEN '%s'\n", fen);\r
- q = strchr(fen, ' '); if(q) *q = 0; q = fen;\r
- do { rows[n++] = q; q = strchr(q, '/'); if(!q) break; *q++ = 0; } while(1);\r
- *tmp = 0;\r
- while(--n >= 0) { strcat(tmp, rows[n]); if(n) strcat(tmp, "/"); }\r
- fen = tmp;\r
- printf("# flipped FEN '%s'\n", fen);\r
- while(*fen) {\r
- if(*fen == ' ') { *p = 0; break; }\r
- if(n=atoi(fen)) fen++; // digits read\r
- if(n > 9) fen++; // double digit\r
- while(n-- > 0) *p++ = '.'; // expand to empty squares\r
- if(currentVariant == V_LION && (*fen == 'L' || *fen == 'l')) *fen += 'Z' - 'L'; // L in Mighty-Lion Chess changed in Z for Lion\r
- if(isalpha(*fen)) {\r
- char *table = fenNames;\r
- n = *fen > 'Z' ? 'a' - 'A' : 0;\r
- if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_LION ||\r
- currentVariant == V_MAKRUK || currentVariant == V_SHO) && *fen - n == 'N' // In Chess N is Knight, not Lion\r
- || table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {\r
- *p++ = ':';\r
- *p++ = table[2* (*fen - 'A' - n)] + n;\r
- *p++ = table[2* (*fen - 'A' - n)+1] + n;\r
- }\r
- } else *p++ = *fen;\r
- fen++;\r
- }\r
- printf("# converted FEN '%s'\n", fenArray);\r
- return fenArray;\r
-}\r
-\r
int\r
Setup2 (char *fen)\r
{\r
+ char *p;\r
int stm = WHITE;\r
+ static char startFEN[4000];\r
if(fen) {\r
char *q = strchr(fen, '\n');\r
if(q) *q = 0;\r
if(q = strchr(fen, ' ')) stm = (q[1] == 'b' ? BLACK : WHITE); // fen contains color field\r
- if(strchr(fen, '.') || strchr(fen, ':')) array = fen; else array = Convert(fen);\r
- }\r
+ } else fen = array;\r
rootEval = promoDelta = filling = cnt50 = moveNr = 0;\r
- SetUp(array, currentVariant);\r
- strcpy(startPos, array);\r
+ SetUp(fen, currentVariant);\r
sup0 = sup1 = sup2 = ABSENT;\r
- hashKeyH = hashKeyL = 87620895*currentVariant;\r
+ hashKeyH = hashKeyL = 87620895*currentVariant + !!fen;\r
+ for(p=startPos; *p++ = *fen++; ) {} // remember last start position for undo\r
return stm;\r
}\r
\r
char *promoChar = "";\r
if(f == t) { sprintf(buf, "@@@@"); return buf; } // null-move notation in WB protocol\r
buf[0] = '\0';\r
- if(t >= SPECIAL) { // kludgy! Print as side effect non-standard WB command to remove victims from double-capture (breaks hint command!)\r
+ if(t >= SPECIAL) {\r
+ if(t < CASTLE) { // castling is printed as a single move, implying its side effects\r
int e = f + epList[t - SPECIAL];\r
-// printf("take %c%d\n", e%BW+'a', e/BW+ONE);\r
- sprintf(buf, "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e;\r
- if(multiLine) printf("move %s\n", buf), buf[0] = '\0';\r
if(ep2List[t - SPECIAL]) {\r
- e = g + ep2List[t - SPECIAL];\r
+ int e2 = f + ep2List[t - SPECIAL];\r
// printf("take %c%d\n", e%BW+'a', e/BW+ONE);\r
- sprintf(buf+strlen(buf), "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e;\r
- if(multiLine) printf("move %s\n", buf), buf[0] = '\0';\r
+ sprintf(buf+strlen(buf), "%c%d%c%d,", f%BW+'a', f/BW+ONE, e2%BW+'a', e2/BW+ONE); f = e2;\r
+ if(multiLine) printf("move %s\n", buf), buf[0] = '\0';\r
}\r
+// printf("take %c%d\n", e%BW+'a', e/BW+ONE);\r
+ sprintf(buf, "%c%d%c%d,", f%BW+'a', f/BW+ONE, e%BW+'a', e/BW+ONE); f = e;\r
+ if(multiLine) printf("move %s\n", buf), buf[0] = '\0';\r
+ }\r
t = g + toList[t - SPECIAL];\r
}\r
- if(move & PROMOTE) promoChar = currentVariant == V_MAKRUK ? "m" : repDraws ? "q" : "+";\r
+ if(move & PROMOTE) promoChar = currentVariant == V_MAKRUK ? "m" : currentVariant == V_WOLF ? "r" : repDraws ? "q" : "+";\r
sprintf(buf+strlen(buf), "%c%d%c%d%s", f%BW+'a', f/BW+ONE, t%BW+'a', t/BW+ONE, promoChar);\r
return buf;\r
}\r
int\r
ReadSquare (char *p, int *sqr)\r
{\r
- int i=0, f, r;\r
+ int f, r;\r
f = p[0] - 'a';\r
r = atoi(p + 1) - ONE;\r
*sqr = r*BW + f;\r
Search(-INF-1, INF+1, 0, QSdepth+1, 0, sup1 & ~PROMOTE, sup2, INF);\r
postThinking++;\r
\r
- listStart = retFirst; listEnd = msp = retMSP;\r
+ listStart = retFirst; msp = retMSP;\r
+ if(currentVariant == V_LION) GenCastlings(); listEnd = msp;\r
+ for(i=listStart; i<msp && currentVariant == V_WOLF; i++) { // mark Werewolf captures as promotions\r
+ int to = moveStack[i] & SQUARE, from = moveStack[i] >> SQLEN & SQUARE;\r
+ if(to >= SPECIAL) continue;\r
+ if(p[board[to]].ranking == 5 && p[board[from]].ranking < 4) moveStack[i] |= PROMOTE;\r
+ }\r
}\r
\r
MOVE\r
e = t;\r
moveText += ReadSquare(moveText, &t);\r
for(i=0; i<8; i++) if(f + kStep[i] == e) break;\r
- if(i >= 8) return INVALID; // this rejects Lion Dog 2+1 and 2-1 moves!\r
- for(j=0; j<8; j++) if(e + kStep[j] == t) break;\r
- if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves!\r
- t2 = SPECIAL + 8*i + j;\r
+ if(i >= 8) { // first leg not King step. Try Lion Dog 2+1 or 2-1\r
+ for(i=0; i<8; i++) if(f + 2*kStep[i] == e) break;\r
+ if(i >= 8) return INVALID; // not even that\r
+ if(f + 3*kStep[i] == t) t2 = SPECIAL + 72 + i; // 2+1\r
+ else if(f + kStep[i] == t) t2 = SPECIAL + 88 + i; // 2-1\r
+ else return INVALID;\r
+ } else if(f + 3*kStep[i] == t) { // Lion Dog 1+2 move\r
+ t2 = SPECIAL + 64 + i;\r
+ } else if(*moveText == ',') { // 3rd leg follows!\r
+ if(f + 2*kStep[i] != t) return INVALID; // 3-leg moves must be linear!\r
+ moveText += ReadSquare(moveText, &e);\r
+ if(e != t) return INVALID; // must again continue with same piece\r
+ moveText += ReadSquare(moveText, &t);\r
+ if(f + 3*kStep[i] == t) t2 = SPECIAL + 80 + i; // 1+1+1\r
+ else if(f + kStep[i] == t) t2 = SPECIAL + 88 + i; // 2-1 entered as 1+1-1\r
+ else return INVALID;\r
+ } else {\r
+ for(j=0; j<8; j++) if(e + kStep[j] == t) break;\r
+ if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves!\r
+ t2 = SPECIAL + 8*i + j;\r
+ }\r
} else if(chessFlag && board[f] != EMPTY && p[board[f]].value == pVal && board[t] == EMPTY) { // Pawn to empty, could be e.p.\r
if(t == f + BW + 1) t2 = SPECIAL + 16; else\r
if(t == f + BW - 1) t2 = SPECIAL + 48; else\r
if(t == f - BW + 1) t2 = SPECIAL + 20; else\r
if(t == f - BW - 1) t2 = SPECIAL + 52; // fake double-move\r
+ } else if(currentVariant == V_LION && board[f] != EMPTY && p[board[f]].value == 280 && (t-f == 2 || f-t == 2)) { // castling\r
+ if(t == f+2 && f < BW) t2 = CASTLE; else\r
+ if(t == f-2 && f < BW) t2 = CASTLE + 1; else\r
+ if(t == f+2 && f > BW) t2 = CASTLE + 2; else\r
+ if(t == f-2 && f > BW) t2 = CASTLE + 3;\r
}\r
ret = f<<SQLEN | t2;\r
+ if(currentVariant == V_WOLF && *moveText == 'w') *moveText = '\n';\r
if(*moveText != '\n' && *moveText != '=') ret |= PROMOTE;\r
printf("# suppress = %c%d\n", sup1%BW+'a', sup1/BW);\r
// ListMoves();\r
if(!(flags & promoBoard[t] & (CANT_DEFER | LAST_RANK))) { // but change it into a deferral if that is allowed\r
moveStack[i] &= ~PROMOTE;\r
if(p[board[f]].value == 40) p[board[f]].promoFlag &= LAST_RANK; else\r
- if(!(flags & promoBoard[f])) moveStack[i] |= DEFER; // came from outside zone, so essential deferral\r
+ if(!(flags & promoBoard[f]) && currentVariant != V_WOLF) moveStack[i] |= DEFER; // came from outside zone, so essential deferral\r
}\r
}\r
if(i >= listEnd) {\r
for(i=listStart; i<listEnd; i++) {\r
if(sqr == (moveStack[i]>>SQLEN & SQUARE)) {\r
int t = moveStack[i] & SQUARE;\r
+ if(t >= CASTLE) t = toList[t - SPECIAL]; else // decode castling\r
if(t >= SPECIAL) {\r
int e = sqr + epList[t - SPECIAL]; // decode\r
b[e] = 'C';\r
int e, t = moveStack[i] & SQUARE;\r
if(t < SPECIAL) continue; // only special moves\r
e = lastLift + epList[t - SPECIAL]; // decode\r
+ if(sqr == lastLift + ep2List[t - SPECIAL]) { // second leg of 3-leg move\r
+ b[e] = 'C'; cnt++;\r
+ continue;\r
+ }\r
t = lastLift + toList[t - SPECIAL];\r
if(e != sqr) continue;\r
- b[t] = (!boardCopy[t] ? 'Y' : 'R'); cnt++;\r
+ if(!b[t]) b[t] = (!boardCopy[t] ? 'Y' : 'R'); cnt++;\r
}\r
}\r
if(!cnt) return;\r
int\r
SearchBestMove (MOVE *move, MOVE *ponderMove)\r
{\r
- int score, i;\r
+ int score;\r
printf("# SearchBestMove\n");\r
startTime = GetTickCount();\r
nodes = 0;\r
printf("# s=%d\n", startTime);fflush(stdout);\r
MapFromScratch(attacks);\r
retMove = INVALID; repCnt = 0;\r
- score = Search(-INF-1, INF+1, rootEval, maxDepth, 0, sup1, sup2, INF);\r
+ score = Search(-INF-1, INF+1, rootEval, maxDepth + QSdepth, 0, sup1, sup2, INF);\r
*move = retMove;\r
*ponderMove = pv[1];\r
printf("# best=%s\n", MoveToText(pv[0],0));\r
\r
void GetLine(int root)\r
{\r
+\r
int i, c;\r
while(1) {\r
// wait for input, and read it until we have collected a complete line\r
- for(i = 0; (inBuf[i] = c = getchar()) != '\n'; i++) if(c == EOF || i>7997) exit(0);\r
- inBuf[i+1] = 0;\r
+ do {\r
+ for(i = 0; (inBuf[i] = c = getchar()) != '\n'; i++) if(c == EOF || i>7997) exit(0);\r
+ inBuf[i+1] = 0;\r
+ } while(!i); // ignore empty lines\r
\r
// extract the first word\r
sscanf(inBuf, "%s", command);\r
}\r
}\r
\r
+ int\r
main()\r
{\r
- int engineSide=NONE; // side played by engine\r
+ int engineSide=NONE; // side played by engine\r
MOVE move;\r
int i, score, curVarNr;\r
\r
- Init(V_CHU); // Chu\r
+ setvbuf(stdin, NULL, _IOLBF, 1024); // buffering more than one line flaws test for pending input!\r
+\r
+ Init(V_CHU); // Chu\r
seed = startTime = GetTickCount(); moveNr = 0; // initialize random\r
\r
while(1) { // infinite loop\r
\r
- fflush(stdout); // make sure everything is printed before we do something that might take time\r
+ fflush(stdout); // make sure everything is printed before we do something that might take time\r
*inBuf = 0; if(moveNr >= 20) randomize = OFF;\r
//if(moveNr >20) printf("resign\n");\r
\r
}\r
stm = MakeMove2(stm, move); // assumes MakeMove returns new side to move\r
gameMove[moveNr++] = move; // remember game\r
- printf("move %s\n", MoveToText(pMove, 1));\r
+ printf("move %s%s\n", MoveToText(pMove, 1), p[undoInfo.victim].ranking == 5 && p[undoInfo.piece].ranking < 4 ? "w" : "");\r
listEnd = 0;\r
continue; // go check if we should ponder\r
}\r
printf("feature option=\"Full analysis PV -check 1\"\n"); // example of an engine-defined option\r
printf("feature option=\"Allow repeats -check 0\"\n");\r
printf("feature option=\"Promote on entry -check 0\"\n");\r
+ printf("feature option=\"Okazaki rule -check 0\"\n");\r
printf("feature option=\"Resign -check 0\"\n"); // \r
printf("feature option=\"Contempt -spin 0 -200 200\"\n"); // and another one\r
printf("feature option=\"Tsume -combo no /// Sente mates /// Gote mates\"\n");\r
if(sscanf(inBuf+7, "Allow repeats=%d", &allowRep) == 1) continue;\r
if(sscanf(inBuf+7, "Resign=%d", &resign) == 1) continue;\r
if(sscanf(inBuf+7, "Contempt=%d", &contemptFactor) == 1) continue;\r
+ if(sscanf(inBuf+7, "Okazaki rule=%d", &okazaki) == 1) continue;\r
if(sscanf(inBuf+7, "Promote on entry=%d", &entryProm) == 1) continue;\r
if(sscanf(inBuf+7, "Tsume=%s", command) == 1) {\r
if(!strcmp(command, "no")) tsume = 0; else\r
}\r
if(!strcmp(command, "sd")) { sscanf(inBuf, "sd %d", &maxDepth); continue; }\r
if(!strcmp(command, "st")) { sscanf(inBuf, "st %d", &timePerMove); continue; }\r
+\r
if(!strcmp(command, "memory")) { SetMemorySize(atoi(inBuf+7)); continue; }\r
if(!strcmp(command, "ping")) { printf("pong%s", inBuf+4); continue; }\r
// if(!strcmp(command, "")) { sscanf(inBuf, " %d", &); continue; }\r
Init(curVarNr = i); stm = Setup2(NULL); break;\r
}\r
}\r
+ if(currentVariant == V_WOLF)\r
+ printf("setup (PNBR......................WKpnbr......................wk) 8x8+0_fairy rnbwkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBWKBNR w 0 1\n"\r
+ "piece W& K3cpafK\n");\r
if(currentVariant == V_SHO)\r
printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n");\r
+ if(currentVariant == V_WA)\r
+ printf("setup (P..^S^FV..^LW^OH.F.^R.E....R...D.GOL^M..^H.M.C.^CU.^W/.......^V.^P.^U..^DS.^GXK"\r
+ "p..^s^fv..^lw^oh.f.^r.e....r...d.gol^m..^h.m.c.^cu.^w/.......^v.^p.^u..^ds.^gxk) 11x11+0_chu "\r
+ "hmlcvkwgudo/1e3s3f1/ppprpppxppp/3p3p3/11/11/11/3P3P3/PPPXPPPRPPP/1F3S3E1/ODUGWKVCLMH w 0 1\n"\r
+ "piece P& fW\npiece O& fR\npiece H& fRbW2\npiece U& fWbF\npiece L& fWbF\npiece M& vWfF\npiece G& vWfF\npiece C& sWfF\n"\r
+ "piece +P& WfF\npiece +O& K\npiece +H& vN\npiece +U& BfW\npiece +L& vRfF3bFsW\npiece +M& FfW\npiece +G& sRvW\npiece +C& vRsWfF\n"\r
+ "piece D& sbWfF\npiece V& FfW\npiece W& WfF\npiece S& sRvW\npiece R& FfRbW\npiece F& BfW\npiece X& FvWAvD\n"\r
+ "piece +D& WfF\npiece +V& FfsW\npiece +W& K\npiece +S& R\npiece +R& FvWAvD\npiece +F& BvRsW\npiece E& vRfF3bFsW\n");\r
+ if(currentVariant == V_MACAD)\r
+ printf("setup (P.*B*RQSEXOG....D^J'..*LP'.L!J'...*W!...*F'...^C.C.^L!.^P'^K.T*L'.*C!*H!^I'.^E...*R'^P^T*W'*G'^G^SI'^X^OK"\r
+ "p.*b*rqsexog....d^j'..*lp'.l!j'...*w!...*f'...^c.c.^l!.^p'^k.t*l'.*c!*h!^i'.^e...*r'^p^t*w'*g'^g^si'^x^ok) 13x13+0_chu "\r
+ "%s w 0 1\n", macadArray);\r
+ if(currentVariant == V_CASHEW)\r
+ printf("setup (P.^K'^S'QS.XOGND'.HDT!...P'.L!E'.^EK'W!..LF'V^W'J'H'...^L!^N..FT'L'C'G!H!D!I'.^H'..R'..^C'^F'..W'^X^OK"\r
+ "p.^k'^s'qs.xognd'.hdt!...p'.l!e'.^ek'w!..lf'v^w'j'h'...^l!^n..ft'l'c'g!h!d!i'.^h'..r'..^c'^f'..w'^x^ok) 13x13+0_chu "\r
+ "%s w 0 1\n", cashewArray);\r
repStack[199] = hashKeyH, checkStack[199] = 0;\r
continue;\r
}\r
if(!strcmp(command, "remove")) { stm = TakeBack(2); continue; }\r
printf("Error: unknown command\n");\r
}\r
+ return 0;\r
}\r
\r
projects / hachu.git / blobdiff