X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpiece.h;h=df81e5ff47e53c47161fe26ef0be0c77c46213c4;hb=d2d953713f053c6add74a7c1f7c2a66440a99f50;hp=6592de1a8bbf1d2b04a34b51f9a24c706ef673c1;hpb=a5ae7fe26030bdd73a95fde3ebe841abfe84ec5e;p=stockfish diff --git a/src/piece.h b/src/piece.h index 6592de1a..df81e5ff 100644 --- a/src/piece.h +++ b/src/piece.h @@ -27,6 +27,7 @@ #include "color.h" #include "square.h" +#include "value.h" //// @@ -51,9 +52,22 @@ ENABLE_OPERATORS_ON(Piece); //// Constants //// -const int SlidingArray[18] = { - 0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0 -}; +/// Important: If the material values are changed, one must also +/// adjust the piece square tables, and the method game_phase() in the +/// Position class! +/// +/// Values modified by Joona Kiiski + +const Value PawnValueMidgame = Value(0x0C6); +const Value PawnValueEndgame = Value(0x102); +const Value KnightValueMidgame = Value(0x331); +const Value KnightValueEndgame = Value(0x34E); +const Value BishopValueMidgame = Value(0x344); +const Value BishopValueEndgame = Value(0x359); +const Value RookValueMidgame = Value(0x4F6); +const Value RookValueEndgame = Value(0x4FE); +const Value QueenValueMidgame = Value(0x9D9); +const Value QueenValueEndgame = Value(0x9FE); //// @@ -72,10 +86,6 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) { return Piece((int(c) << 3) | int(pt)); } -inline int piece_is_slider(Piece p) { - return SlidingArray[int(p)]; -} - inline SquareDelta pawn_push(Color c) { return (c == WHITE ? DELTA_N : DELTA_S); }