X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.h;h=f88eead856bf13a630cb0d393d9ec0149976990f;hp=6592de1a8bbf1d2b04a34b51f9a24c706ef673c1;hb=df4b106716f0fb0a5f5887b1cffeb544174008f7;hpb=a952c6bc6d64ba4c9fe4f0952896a9fd6e63b4a9 diff --git a/src/piece.h b/src/piece.h index 6592de1a..f88eead8 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,26 @@ 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); + +extern const Value PieceValueMidgame[17]; +extern const Value PieceValueEndgame[17]; +extern const int SlidingArray[18]; //// @@ -73,7 +91,7 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) { } inline int piece_is_slider(Piece p) { - return SlidingArray[int(p)]; + return SlidingArray[p]; } inline SquareDelta pawn_push(Color c) {