Merge pull request #30 from Ivan23BG/update-player-vs-ia

On ne peut plus jouer quand l'ia calcule
Ivan23BG · Apr 10, 2024 · e45ce3a · e45ce3a
2 parents 436f905 + 9cb5986
commit e45ce3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/app.py b/src/main/app.py
@@ -119,7 +119,7 @@ def hexiaia_place_piece():
     try:
         if game_board is not None:
 
-            move_IA = game_board.get_best_move(2,current_IA)
+            move_IA = game_board.get_best_move(3,current_IA)
             game_board.place_piece(current_IA, move_IA) # Try to place the piece
             iamove = "hex" + str(move_IA[0]) + "-" + str(move_IA[1])
 

diff --git a/src/main/game_ui/static/js/game_hexia.js b/src/main/game_ui/static/js/game_hexia.js
@@ -22,6 +22,7 @@ async function fetchFirstMoveJSON() {
 
 // request for IA's move
 async function fetchIAMoveJSON(IA) {
+    console.log("deux");
     const response = await fetch('/hexiaia_place_piece', {method: 'POST',headers: {'Content-Type': 'application/json'},body: JSON.stringify({'current_IA': IA})});
     const data = response.json();
     return data;
@@ -42,7 +43,8 @@ window.onload = async function () {
     let player = 0; // Player default value 
     let IA = 0; // IA default value 
 
-    let recup_error = false;
+    let recup_error = false; // Variable qui empêche que l'IA joue si on clic sur un hex pas bon
+    let playable = true; // Check if player can play or not 
     let game_over = false;
     let short_path = [];
     let winner = 0;
@@ -81,7 +83,8 @@ window.onload = async function () {
             // show spinner
             document.getElementById('spinner').style.display = 'block';
 
-            if (this.getAttribute('disabled')) {
+
+            if (this.getAttribute('disabled') || playable===false) {
                 // hide spinner
                 document.getElementById('spinner').style.display = 'none';
                 return;
@@ -164,15 +167,16 @@ window.onload = async function () {
 
             //Place piece if player doesn't win
             if (game_over!=true && recup_error!=true){
-                const data = await fetchIAMoveJSON(IA);  // Get IA's move                
+                playable=false;
+                const data = await fetchIAMoveJSON(IA);  // Get IA's move            
                 let iamove = data.iamove;
                 console.log(data.iamove);
                 var iahex = document.getElementById(iamove);
                 console.log(iahex);
 
                 game_history.push(iamove);
                 toggle_colour(iahex,IA);
-
+                playable = true;   
                 // check if current_IA won
                 if (data.game_over === true) {
                     winner = IA;