Merged pull request #805 with squash

RainRat · Jul 5, 2024 · 63f4854 · 63f4854
1 parent cdf3bb2
commit 63f4854
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/src/parser.cpp b/src/parser.cpp
@@ -629,6 +629,18 @@ Variant* VariantParser<DoCheck>::parse(Variant* v) {
         if (DoCheck && (idx == std::string::npos || idx2 == std::string::npos))
             std::cerr << "promotedPieceType - Invalid piece type: " << token << std::endl;
     }
+    // priority drops
+    const auto& it_pr_drop = config.find("priorityDropTypes");
+    if (it_pr_drop != config.end())
+    {
+        char token;
+        size_t idx = 0;
+        std::stringstream ss(it_pr_drop->second);
+        while (ss >> token && ((idx = v->pieceToChar.find(toupper(token))) != std::string::npos))
+            v->isPriorityDrop[PieceType(idx)] = true;
+        if (DoCheck && idx == std::string::npos && token != '-')
+            std::cerr << "priorityDropTypes - Invalid piece type: " << token << std::endl;
+    }
     parse_attribute("piecePromotionOnCapture", v->piecePromotionOnCapture);
     parse_attribute("mandatoryPawnPromotion", v->mandatoryPawnPromotion);
     parse_attribute("mandatoryPiecePromotion", v->mandatoryPiecePromotion);

diff --git a/src/position.cpp b/src/position.cpp
@@ -1161,6 +1161,8 @@ bool Position::legal(Move m) const {
           if (popcount((DarkSquares & to ? DarkSquares : ~DarkSquares) & pieces(us, BISHOP)) + 1 > (count_with_hand(us, BISHOP) + 1) / 2)
               return false;
   }
+  if (type_of(m) == DROP && (!var->isPriorityDrop[type_of(moved_piece(m))]) && priorityDropCountInHand[us] > 0)
+      return false;
 
   // No legal moves from target square
   if (immobility_illegal() && (type_of(m) == DROP || type_of(m) == NORMAL) && !(PseudoMoves[0][us][type_of(moved_piece(m))][to] & board_bb()))

diff --git a/src/position.h b/src/position.h
@@ -392,6 +392,7 @@ class Position {
   int pieceCountInPrison[COLOR_NB][PIECE_TYPE_NB];
   Bitboard pawnCannotCheckZone[COLOR_NB];
   PieceType committedGates[COLOR_NB][FILE_NB];
+  int priorityDropCountInHand[COLOR_NB];
   int virtualPieces;
   Bitboard promotedPieces;
   void add_to_hand(Piece pc);
@@ -1761,13 +1762,15 @@ inline void Position::add_to_hand(Piece pc) {
   if (variant()->freeDrops) return;
   pieceCountInHand[color_of(pc)][type_of(pc)]++;
   pieceCountInHand[color_of(pc)][ALL_PIECES]++;
+  priorityDropCountInHand[color_of(pc)] += var->isPriorityDrop[type_of(pc)];
   psq += PSQT::psq[pc][SQ_NONE];
 }
 
 inline void Position::remove_from_hand(Piece pc) {
   if (variant()->freeDrops) return;
   pieceCountInHand[color_of(pc)][type_of(pc)]--;
   pieceCountInHand[color_of(pc)][ALL_PIECES]--;
+  priorityDropCountInHand[color_of(pc)] -= var->isPriorityDrop[type_of(pc)];
   psq -= PSQT::psq[pc][SQ_NONE];
 }
 

diff --git a/src/variant.h b/src/variant.h
@@ -99,6 +99,7 @@ struct Variant {
   bool mustCapture = false;
   bool mustDrop = false;
   PieceType mustDropType = ALL_PIECES;
+  bool isPriorityDrop[PIECE_TYPE_NB] = {};
   bool pieceDrops = false;
   bool dropLoop = false;
   CapturingRule captureType = MOVE_OUT;

diff --git a/src/variants.ini b/src/variants.ini
@@ -223,6 +223,7 @@
 # mustCapture: captures are mandatory (check evasion still takes precedence) [bool] (default: false)
 # mustDrop: drops are mandatory (e.g., for Sittuyin setup phase) [bool] (default: false)
 # mustDropType: piece type for which piece drops are mandatory [PieceType] (default: *)
+# priorityDropTypes: piece types that must be dropped before dropping the other pieces [PieceType] (default: none)
 # pieceDrops: enable piece drops [bool] (default: false)
 # dropLoop: captures promoted pieces are not demoted [bool] (default: false)
 # captureType: captured pieces are removed or go to hand or prison [CapturingRule] (default: out)