From e55a6cb258b0755df6db6348ae2f52fcf5b13b9b Mon Sep 17 00:00:00 2001
From: yukirij <yukirij@yukiri.net>
Date: Sun, 18 Aug 2024 18:30:45 -0700
Subject: [PATCH] Add debug prints for promotion checking.

---
 game/src/board/mod.rs |  6 +++---
 game/src/game/mod.rs  |  6 ++++--
 game/src/util/hex.rs  | 10 +++-------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/game/src/board/mod.rs b/game/src/board/mod.rs
index 3815ae0..8ff655e 100644
--- a/game/src/board/mod.rs
+++ b/game/src/board/mod.rs
@@ -85,14 +85,14 @@ impl Board {
         ];
 
         for (piece, hex) in &layout {
-            self.set_piece(piece.clone(), hex.tile());
+            self.set_piece(piece.clone(), hex.tile);
         }
 
         for (piece, hex) in &layout {
             let mut piece = piece.clone();
             piece.player = 1;
-            let hex = Hex::from_hex(8 - hex.x(), 8 - hex.y());
-            self.set_piece(piece, hex.tile());
+            let hex = Hex::from_hex(8 - hex.x, 8 - hex.y);
+            self.set_piece(piece, hex.tile);
         }
     }
 
diff --git a/game/src/game/mod.rs b/game/src/game/mod.rs
index 867ea56..511063c 100644
--- a/game/src/game/mod.rs
+++ b/game/src/game/mod.rs
@@ -73,7 +73,8 @@ impl Game {
 
                                 // Check for target promotion.
                                 let hex = Hex::from_tile(play.to);
-                                if !target.promoted && !Hex::is_back(hex.x(), hex.y(), target.player) {
+                                if !target.promoted && !Hex::is_back(hex.x, hex.y, target.player) {
+                                    println!("promotion {} {} ({}, {})", target.class, play.to, hex.x, hex.y);
                                     target.promoted = true;
                                 }
                             }
@@ -101,7 +102,8 @@ impl Game {
 
                     // Check for piece promotion.
                     let hex = Hex::from_tile(play.from);
-                    if !piece.promoted && !Hex::is_back(hex.x(), hex.y(), piece.player) {
+                    if !piece.promoted && !Hex::is_back(hex.x, hex.y, piece.player) {
+                        println!("promotion {} {} ({}, {})", piece.class, play.to, hex.x, hex.y);
                         if let Some(piece) = &mut self.board.pieces[pid as usize] {
                             piece.promoted = true;
                         }
diff --git a/game/src/util/hex.rs b/game/src/util/hex.rs
index 480f832..4330225 100644
--- a/game/src/util/hex.rs
+++ b/game/src/util/hex.rs
@@ -1,9 +1,9 @@
 const ROWS :[u8; 10] = [ 0, 5, 11, 18, 26, 35, 43, 50, 56, 61 ];
 
 pub struct Hex {
-    x:u8,
-    y:u8,
-    tile:u8,
+    pub x:u8,
+    pub y:u8,
+    pub tile:u8,
 }
 impl Hex {
     pub fn new() -> Self
@@ -79,8 +79,4 @@ impl Hex {
             y == COLUMNS[x as usize][1 ^ player as usize]
         } else { false }
     }
-
-    pub fn x(&self) -> u8 { self.x }
-    pub fn y(&self) -> u8 { self.y }
-    pub fn tile(&self) -> u8 { self.tile }
 }