khetai 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 397d91c1cb38ed6a3c61ef8132415e88c74fcd80c933b124b028515109c656a1
-  data.tar.gz: 24b234943d22a75d358a3c4caa5723469d6ee98665e710ecdcc981288b975f11
+  metadata.gz: b0de4779baa3060126c239bcb22e4ed4cff09168f223d282b4653ee0b48a49c0
+  data.tar.gz: add3d7364b84a82e2268b2ae2e17ee3169a63e1191f7bbfefe036ffb9b727a64
 SHA512:
-  metadata.gz: 1bd6ceb6036f2a11bdce881f176ccccfe247d2884aa647b2da423b81cc3ff36120fa56fac338b4aacb55edcb2e11a4b722c85b3633c7c307e0419f0cf5b5bb07
-  data.tar.gz: ed3131f4fefe5bc2050a396bb39036b73782bbabc39756445806dbf6b07485a4503e119fcef4baaa491033d3c695bfde451efac6a9ca83aa5287197b0af18d55
+  metadata.gz: adeeb8e3bd8605661ad1a3a7a58cdcae7728bafc6c1fb329f4ba602600e103c25adcfbfbdbfc29390a28272df04d4f15a92ea84c55034c5b1ed77e7b0d103249
+  data.tar.gz: 184800f1ddfc7db6d7366a29e611e8edf8149177423ce9236ee685b6ed7aa6c3b6ecb1faffd520d6da6a68041daee91c34b00d5800cefd63f1a23e50b7f9437e

data/.gitignore

@@ -7,6 +7,7 @@
 /spec/reports/
 /tmp/
 /build/
+/scripts/
 /ext/khetai/dev/build/
 /ext/khetai/dev/fltk-ui/build/
 /ext/khetai/dev/fltk-ui/build_khetai/

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.3.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    khetai (0.3.2)
+    khetai (0.3.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -1,5 +1,7 @@
 # KhetAI
 
+An AI engine for the board game Khet. This gem provides move calculation for a specified color with configurable search depth and time limits.
+
 ## Installation
 
     $ gem install khetai
@@ -45,8 +47,19 @@ The representation of the board gets converted an array of 8-bit integers once i
 
 The internals of the gem are written in C, located in `ext/khetai`.
 
+## Development System Requirements
+
+To build the gem from source, you'll need:
+- Ruby >= 2.0.0
+- GCC or compatible C compiler
+- Development headers (usually provided by ruby-dev or ruby-devel package)
+
 ## Build and Deploy Commands
 
+This project uses `asdf` as the version manager for Ruby. However, any Ruby version greater than `2.0.0` should work to compile this gem.
+
+    $ gem install bundler
+    $ bundle install
     $ bundle exec rake compile
     $ bundle exec rake build
     $ gem install pkg/khetai-<version>.gem

data/ext/khetai/dev/fltk-ui/game_board.cpp

@@ -134,6 +134,11 @@ int GameBoard::handle(int event) {
         if (key == 'r') {
             resetPieces();
         } else if (key == FL_Enter) {
+            square_selected = false;
+            square_selected_num = -1;
+            redraw();
+            Fl::flush();
+
             const char *max_time_value = max_time_input->value();
             if (!max_time_value || max_time_value[0] == '\0') {
                 max_time_input->value("5");
@@ -507,7 +512,6 @@ void GameBoard::updateLaserPosition() {
     if (laser_y >= y() + (rows * cell_height) || laser_y <= y() || laser_x >= x() + (cols * cell_width) || laser_x <= x()) {
         laser_active = false;
         laser_path.clear();
-        redraw();
         return;
     }
 

data/ext/khetai/dev/fltk-ui/game_board.h

@@ -65,7 +65,7 @@ class GameBoard : public Fl_Widget {
     int cell_width, cell_height;
     bool square_selected = false;
     bool laser_active = false;
-    int laser_step = 3;
+    int laser_step = 5;
     LaserDirection laser_direction;
     float laser_y, laser_x;
     bool remove_piece = false;

data/ext/khetai/khetai_lib.c

@@ -154,7 +154,7 @@ int calculate_score() {
         enum Player player = j;
         for (int k = 0; k < 13; k++) {
             int i = get_board_index(player, k);
-            if (i != EPT) {
+            if (i != EMPTY) {
                 Square s = board[i];
                 int value = 0;
                 switch (get_piece(s)) {
@@ -211,25 +211,32 @@ void make_move(Move move) {
         if (is_piece(board[end]))
             hash ^= keys[board[end]][end];
 
-        Square moving_piece = board[start];
-        board[start] = board[end];
-        board[end] = moving_piece;
-        // add starting piece to end location
-        hash ^= keys[board[end]][end];
-
-        enum Player moving_player = get_owner(moving_piece);
-        update_piece_tracker(moving_player, start, end);
+        Square starting_square = board[start];
+        Square ending_square = board[end];
+        board[start] = ending_square;
+        board[end] = starting_square;
 
-        // add ending piece to start location if swapping
-        if (is_piece(board[start])) {
-            hash ^= keys[board[start]][start];
+        // add starting piece to end location
+        hash ^= keys[starting_square][end];
 
-            enum Player other_player = get_owner(board[start]);
-            update_piece_tracker(other_player, end, start);
+        enum Player moving_player = get_owner(starting_square);
+        if (!is_piece(ending_square)) {
+            update_piece_tracker(moving_player, start, end, false);
+        } else {
+            // add ending piece to start location if swapping
+            hash ^= keys[ending_square][start];
+
+            enum Player other_player = get_owner(ending_square);
+            if (get_owner(starting_square) == other_player)
+                update_piece_tracker(other_player, end, start, true);
+            else {
+                update_piece_tracker(moving_player, start, end, false);
+                update_piece_tracker(other_player, end, start, false);
+            }
         }
 
-        if (get_piece(moving_piece) == PHARAOH)
-            pharaoh_loc[get_owner(moving_piece)] = end;
+        if (get_piece(starting_square) == PHARAOH)
+            pharaoh_loc[get_owner(starting_square)] = end;
     }
 
     undo_moves[undo_index] = new_move(end, start, -rotation);
@@ -305,20 +312,27 @@ void undo_move() {
     if (rotation != 0) {
         board[start] = rotate(board[start], rotation);
     } else {
-        Square moving_piece = board[start];
-        board[start] = board[end];
-        board[end] = moving_piece;
-
-        enum Player moving_player = get_owner(moving_piece);
-        update_piece_tracker(moving_player, start, end);
+        Square starting_square = board[start];
+        Square ending_square = board[end];
+        board[start] = ending_square;
+        board[end] = starting_square;
+
+        enum Player moving_player = get_owner(starting_square);
+        if (ending_square == 0) {
+            update_piece_tracker(moving_player, start, end, false);
+        } else {
+            enum Player other_player = get_owner(ending_square);
 
-        if (board[start] != 0) {
-            enum Player other_player = get_owner(board[start]);
-            update_piece_tracker(other_player, end, start);
+            if (get_owner(starting_square) == other_player)
+                update_piece_tracker(other_player, end, start, true);
+            else {
+                update_piece_tracker(moving_player, start, end, false);
+                update_piece_tracker(other_player, end, start, false);
+            }
         }
 
-        if (get_piece(moving_piece) == PHARAOH)
-            pharaoh_loc[get_owner(moving_piece)] = end;
+        if (get_piece(starting_square) == PHARAOH)
+            pharaoh_loc[get_owner(starting_square)] = end;
     }
     checkmate = false;
 }
@@ -326,7 +340,7 @@ void undo_move() {
 void find_valid_moves(Move *valid_moves, int *vi) {
     for (int i = 0; i < 13; i++) {
         uint8_t board_pos = piece_trackers[whose_turn].positions[i];
-        if (board_pos != EPT) {
+        if (board_pos != EMPTY) {
             enum Piece piece = get_piece(board[board_pos]);
             switch (piece) {
             case ANUBIS:
@@ -367,7 +381,7 @@ void find_valid_scarab_moves(int i, Move *valid_moves, int *vi) {
     for (int j = 0; j < 8; j++) {
         int dest = i + directions[j];
         if (can_move[whose_turn][dest]) {
-            if (!is_piece(board[dest]) || (get_owner(board[dest]) != whose_turn && get_piece(board[dest]) != PHARAOH)) {
+            if (!is_piece(board[dest]) || (get_piece(board[dest]) != SCARAB && get_piece(board[dest]) != PHARAOH)) {
                 valid_moves[(*vi)++] = new_move(i, dest, 0);
             }
         }
@@ -415,8 +429,8 @@ uint64_t get_board_hash() {
 
 void init_piece_trackers() {
     for (int i = 0; i < 13; i++) {
-        piece_trackers[SILVER].positions[i] = EPT;
-        piece_trackers[RED].positions[i] = EPT;
+        piece_trackers[SILVER].positions[i] = EMPTY;
+        piece_trackers[RED].positions[i] = EMPTY;
     }
 
     int si = 0;
@@ -435,8 +449,8 @@ void init_piece_trackers() {
                 ri++;
             }
         } else {
-            piece_trackers[SILVER].board_idx_position[i] = EPT;
-            piece_trackers[RED].board_idx_position[i] = EPT;
+            piece_trackers[SILVER].board_idx_position[i] = EMPTY;
+            piece_trackers[RED].board_idx_position[i] = EMPTY;
         }
     }
 }
@@ -445,9 +459,9 @@ bool is_move_legal(Move move) {
     int start = get_start(move);
     int end = get_end(move);
     if (is_piece(board[start]) && get_owner(board[start]) == whose_turn) {
-        if (!is_piece(board[end]) || get_rotation(move) != 0)
+        if (!is_piece(board[end]) || (get_rotation(move) != 0 && start == end))
             return true;
-        else if (is_piece(board[end]) && get_piece(board[start]) == SCARAB && get_piece(board[end]) <= 3)
+        else if (is_piece(board[end]) && (get_piece(board[start]) == SCARAB && get_piece(board[end]) < 3))
             return true;
     }
     return false;

data/ext/khetai/khetai_lib.h

@@ -182,7 +182,10 @@ typedef struct HashEntry {
 extern HashEntry table[TABLE_SIZE];
 static inline HashEntry *search_table(uint64_t key) { return &table[key & TABLE_MASK]; };
 
-#define EPT 0xFF
+#define NO_SWAP 0
+#define SWAP_SAME 1
+#define SWAP_OTHER 2
+#define EMPTY 0xFF
 typedef struct PieceTracker {
     uint8_t positions[13];
     uint8_t board_idx_position[120];
@@ -191,20 +194,28 @@ extern PieceTracker piece_trackers[2];
 
 static inline uint8_t get_board_index(enum Player player, uint8_t pos_idx) { return piece_trackers[player].positions[pos_idx]; }
 static inline uint8_t get_position_index(enum Player player, uint8_t board_idx) { return piece_trackers[player].board_idx_position[board_idx]; }
-static inline void update_piece_tracker(enum Player player, uint8_t old_board_idx, uint8_t new_board_idx) {
+static inline void update_piece_tracker(enum Player player, uint8_t old_board_idx, uint8_t new_board_idx, bool swap) {
     uint8_t pos_idx = get_position_index(player, old_board_idx);
-    piece_trackers[player].positions[pos_idx] = new_board_idx;
-    piece_trackers[player].board_idx_position[old_board_idx] = EPT;
-    piece_trackers[player].board_idx_position[new_board_idx] = pos_idx;
+    if (!swap) {
+        piece_trackers[player].positions[pos_idx] = new_board_idx;
+        piece_trackers[player].board_idx_position[old_board_idx] = EMPTY;
+        piece_trackers[player].board_idx_position[new_board_idx] = pos_idx;
+    } else {
+        uint8_t other_pos_idx = get_position_index(player, new_board_idx);
+        piece_trackers[player].positions[pos_idx] = new_board_idx;
+        piece_trackers[player].positions[other_pos_idx] = old_board_idx;
+        piece_trackers[player].board_idx_position[new_board_idx] = pos_idx;
+        piece_trackers[player].board_idx_position[old_board_idx] = other_pos_idx;
+    }
 }
 static inline void remove_from_piece_tracker(enum Player player, uint8_t board_idx) {
     uint8_t pos_idx = get_position_index(player, board_idx);
-    piece_trackers[player].positions[pos_idx] = EPT;
-    piece_trackers[player].board_idx_position[board_idx] = EPT;
+    piece_trackers[player].positions[pos_idx] = EMPTY;
+    piece_trackers[player].board_idx_position[board_idx] = EMPTY;
 }
 static inline void add_to_piece_tracker(enum Player player, uint8_t board_idx) {
     uint8_t pos_idx = 0;
-    while (piece_trackers[player].positions[pos_idx] != EPT)
+    while (piece_trackers[player].positions[pos_idx] != EMPTY)
         pos_idx++;
     piece_trackers[player].positions[pos_idx] = board_idx;
     piece_trackers[player].board_idx_position[board_idx] = pos_idx;

data/lib/khetai/version.rb

@@ -1,3 +1,3 @@
 module KhetAI
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: khetai
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - jkugs
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-12-07 00:00:00.000000000 Z
+date: 2024-12-15 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -20,6 +20,7 @@ extra_rdoc_files: []
 files:
 - ".clang-format"
 - ".gitignore"
+- ".tool-versions"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -105,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: Khet AI