Merge pull request #301 from TruncateGame/fix/npc-winning

Fix bug where NPC couldn't win by touching an artifact on WASM builds
TruncateGame · Mar 1, 2025 · 6cdad10 · 6cdad10
2 parents d5c82a9 + dfc769e
commit 6cdad10
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 38 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/truncate_client/src/lib.rs b/truncate_client/src/lib.rs
@@ -126,6 +126,18 @@ impl WebHandle {
     }
 }
 
+#[cfg(target_arch = "wasm32")]
+#[wasm_bindgen]
+pub fn backchannel_setup() {
+    use web_sys::console;
+
+    // Make sure panics are logged using `console.error`.
+    console_error_panic_hook::set_once();
+
+    // Redirect tracing to console.log and friends:
+    tracing_wasm::set_as_global_default();
+}
+
 // Functions used in the web worker
 // Used to evaluate games as the NPC using a separate thread,
 // preventing the UI from hanging during computation.

diff --git a/truncate_client/src/regions/native_menu.rs b/truncate_client/src/regions/native_menu.rs
@@ -98,11 +98,7 @@ pub fn render_native_menu_if_required(
             }
             ui.text_edit_singleline(room_code);
             if ui.button("Join Game").clicked() {
-                send_to_server(PlayerMessage::JoinGame(
-                    room_code.clone(),
-                    outer.name.clone(),
-                    token.clone(),
-                ));
+                outer.launched_code = Some(room_code.clone());
                 return Some(GameStatus::PendingJoin(room_code.clone()));
             }
             if let Some(existing_token) = token {

diff --git a/truncate_core/Cargo.toml b/truncate_core/Cargo.toml
@@ -19,6 +19,7 @@ chksum-hash-sha2 = { version = "0.0.0", default-features = false, features = [
     "256",
 ] }
 noise = "0.8"
+tracing = "0.1.41"
 
 [dev-dependencies]
 insta = { version = "1.29.0", features = ["yaml"] }

diff --git a/truncate_core/src/game.rs b/truncate_core/src/game.rs
@@ -567,18 +567,15 @@ impl Game {
                 }
 
                 let neighbors = self.board.neighbouring_squares(position);
+                if !neighbors.iter().any(|&(_, square)| match square {
+                    Square::Occupied { player: p, .. } => p == player,
+                    Square::Artifact { player: p, .. } => p == player,
+                    _ => false,
+                }) {
+                    if neighbors.iter().any(|&(_, square)| matches!(square, Square::Artifact { player: p, .. } if p != player)) {
+                        return Err(GamePlayError::OpponentStartPlace);
+                    }
 
-                if self.turn_count == 0 && neighbors.iter().any(|&(_, square)| matches!(square, Square::Artifact { player: p, .. } if p != player)) {
-                    return Err(GamePlayError::OpponentStartPlace);
-                }
-
-                if !neighbors.iter().any(
-                    |&(_, square)| match square {
-                        Square::Occupied { player: p, .. } => p == player,
-                        Square::Artifact { player: p, .. } => p == player,
-                        _ => false,
-                    },
-                ) {
                     return Err(GamePlayError::NonAdjacentPlace);
                 }
 

diff --git a/truncate_core/src/moves/mod.rs b/truncate_core/src/moves/mod.rs
@@ -1014,7 +1014,7 @@ mod tests {
             players,
             player_turn_count: vec![0, 0],
             judge: short_dict(),
-            turn_count: 1, // any non zero value will do to avoid hitting OpponentStartPlace error
+            turn_count: 0,
             ..Game::new_legacy(3, 1, None, GameRules::generation(0))
         };
         game.start();

diff --git a/truncate_core/src/npc/mod.rs b/truncate_core/src/npc/mod.rs
@@ -89,7 +89,6 @@ impl Game {
         let evaluation_player = game
             .next_player
             .expect("Minimax only works in non-periodic playmodes");
-
         let mut internal_arborist = if npc_params.pruning {
             Arborist::pruning()
         } else {
@@ -140,15 +139,15 @@ impl Game {
         };
 
         if log {
-            println!(
+            tracing::debug!(
                 "Bot checked {} boards, going to a depth of {looked}",
                 arborist.assessed()
             );
-            println!("Bot has the hand: {}", game.players[evaluation_player].hand);
+            tracing::debug!("Bot has the hand: {}", game.players[evaluation_player].hand);
 
-            println!("Chosen tree has the score {best_score:#?}");
+            tracing::debug!("Chosen tree has the score {best_score:#?}");
             if let Some(board) = &best_score.board {
-                println!("Bot is aiming for the board {board}");
+                tracing::debug!("Bot is aiming for the board {board}");
             }
         }
 
@@ -717,10 +716,8 @@ mod tests {
         initial_board: &'a str,
         depth: usize,
         dict: &WordDict,
-        turn_count: u32,
     ) -> (&'a str, String) {
         let mut game = test_game(initial_board, hand);
-        game.turn_count = turn_count;
 
         let (best_move, pruned_checks, total_checks) = best_test_move(&game, &dict, depth);
 
@@ -989,7 +986,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1031,7 +1027,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1073,7 +1068,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1115,7 +1109,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1157,7 +1150,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1202,7 +1194,6 @@ mod tests {
                 "###,
                 3,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1250,7 +1241,6 @@ mod tests {
                 "###,
                 4,
                 &dict,
-                0,
             );
 
             insta::with_settings!({
@@ -1304,7 +1294,6 @@ mod tests {
                 "###,
                 2,
                 &dict,
-                3, // any non zero turn count value will do
             );
 
             insta::with_settings!({

diff --git a/web_client/src/static/worker.js b/web_client/src/static/worker.js
@@ -25,6 +25,8 @@ self.onmessage = function (e) {
             console.log("[WORKER] Successfully loaded Truncate");
 
             loadedWasm = true;
+            wasm_bindgen.backchannel_setup();
+
         }
 
         function on_wasm_error(error) {