From e77455493b01dd4a8ba90f1894089ac557cc01f3 Mon Sep 17 00:00:00 2001
From: Kum1ta <eddydhj@gmail.com>
Date: Mon, 11 Nov 2024 13:55:58 +0100
Subject: [PATCH] Tournament     - fix bug with final 1v1 between bot and bot  
   - add time before change page at end of tournament     - remove event
 listener in typeTournament

---
 .../file/server/server/GameSettings.py        |  4 +-
 .../static/javascript/multiLocalGame/Map.js   |  2 +-
 .../tournamentPage/TournamentPage.js          | 12 ++-
 .../javascript/typeResponse/typeTournament.js | 88 +------------------
 4 files changed, 13 insertions(+), 93 deletions(-)

diff --git a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py
index 6d7ff27..7cde8c2 100644
--- a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py
+++ b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py
@@ -6,7 +6,7 @@
 #    By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/10/06 16:33:56 by tomoron           #+#    #+#              #
-#    Updated: 2024/10/22 18:40:34 by tomoron          ###   ########.fr        #
+#    Updated: 2024/11/11 10:27:03 by edbernar         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -44,7 +44,7 @@ class GameSettings:
 	wallLength = 1
 	wallWidth = 0.05
 	bounceSpeedIncrease = 0.2
-	maxScore = 3
+	maxScore = 1
 
 	maxPlayerSpeed = 4
 	playerSpeedTolerance = 0.15
diff --git a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js
index dfb057f..d50f043 100644
--- a/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js
+++ b/docker-compose/requirements/nginx/static/javascript/multiLocalGame/Map.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/08/28 12:23:48 by edbernar          #+#    #+#             */
-/*   Updated: 2024/09/27 23:56:31 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/11 10:26:38 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
index f025a71..fface76 100644
--- a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
+++ b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/01 13:42:29 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/27 23:40:49 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/11 11:41:30 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -177,19 +177,23 @@ class TournamentPage
 				loserPos = player2Nb + (player2Nb % 2 == 0 ? player2Nb - 1 : player2Nb);
 			else
 				loserPos = player1Nb + (player1Nb % 2 == 0 ? player1Nb - 1 : player1Nb);
+			if (playerNb.indexOf(pos) == -1)
+			{
+				pos = playerNb[0] + playerNb[1] + playerNb[2] + playerNb[3];
+				loserPos = playerNb[4] + playerNb[5] + playerNb[6] + playerNb[7];
+			}
 			document.getElementById('pfp-' + pos).style.backgroundImage = `url(${winnerData.pfp})`;
-			console.log("loserPos : ", loserPos);
 			document.getElementById('pfp-' + loserPos).style.backgroundImage = `linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('${playerList['player' + (content.p1Win ? player2Nb : player1Nb)].pfp}')`;
 		}
 	}
 
-	end(content)
+	static end(content)
 	{
 		console.log("Tournament is over. The winner is : ", playerList['player' + playerNb[content.winnerId]]);
 		newInfo(`The winner is : ${playerList['player' + playerNb[content.winnerId]].username}`);
 		timeout = setTimeout(() => {
 			pageRenderer.changePage("lobbyPage", false);
-		});
+		}, 4000);
 	}
 }
 
diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js
index 332a0b0..5c2ab8a 100644
--- a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js
+++ b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js
@@ -6,7 +6,7 @@
 /*   By: edbernar <edbernar@student.42angouleme.    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/10/01 13:29:50 by edbernar          #+#    #+#             */
-/*   Updated: 2024/10/27 23:30:11 by edbernar         ###   ########.fr       */
+/*   Updated: 2024/11/11 11:41:31 by edbernar         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -68,88 +68,4 @@ function joinTournament(content)
 	}
 }
 
-export { typeTournament };
-
-
-
-document.addEventListener('keydown', (event) => {
-	if (event.key === "a")
-	{
-
-		typeTournament(
-			{
-			    "action": 5,
-			    "players": [
-			        // {
-			        //     "id": 0,
-			        //     "username": "edbernar",
-			        //     "pfp": "/static/img/default_pfp.jpg"
-			        // },
-			        {
-			            "id": 1,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 2,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 3,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 4,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 5,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 6,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        },
-			        {
-			            "id": 7,
-			            "username": "bot",
-			            "pfp": "/static/img/robot_pfp.jpg"
-			        }
-			    ],
-			    "messages": [],
-			    "history": [
-			        {
-			            "p1": 3,
-			            "p2": 2,
-			            "p1Win": true
-			        },
-			        {
-			            "p1": 5,
-			            "p2": 4,
-			            "p1Win": true
-			        },
-			        {
-			            "p1": 7,
-			            "p2": 6,
-			            "p1Win": true
-			        },
-			        {
-			            "p1": 7,
-			            "p2": 5,
-			            "p1Win": true
-			        },
-			        {
-			            "p1": 1,
-			            "p2": 0,
-			            "p1Win": false
-			        }
-			    ]
-			}
-		);
-	}
-});
+export { typeTournament };
\ No newline at end of file