diff --git a/docker-compose/requirements/djangoserver/file/server/server/Bot.py b/docker-compose/requirements/djangoserver/file/server/server/Bot.py index 0b032b9..cd30f0c 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Bot.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Bot.py @@ -3,10 +3,10 @@ # ::: :::::::: # # Bot.py :+: :+: :+: # # +:+ +:+ +:+ # -# By: tomoron +#+ +:+ +#+ # +# By: edbernar = 0): - travel = min(self.objective["pos"] - self.pos["pos"], maxDistance) - else: - travel = max(self.objective["pos"] - self.pos["pos"], -maxDistance) - print("travel :", travel) - self.game.move(self.socket, self.pos["pos"] + travel, self.pos["up"]) + maxDistance = GameSettings.maxPlayerSpeed * (time.time() - lastUpdate) + print("maxDistance :", maxDistance) + travel = self.objective["pos"] - self.pos["pos"] + if(travel >= 0): + travel = min(self.objective["pos"] - self.pos["pos"], maxDistance) + else: + travel = max(self.objective["pos"] - self.pos["pos"], -maxDistance) + print("travel :", travel) + self.game.move(self.socket, self.pos["pos"] + travel, self.pos["up"]) lastUpdate = time.time() await asyncio.sleep(1 / 20) diff --git a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py index 1c054ba..a6cb09d 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py +++ b/docker-compose/requirements/djangoserver/file/server/server/GameSettings.py @@ -3,10 +3,10 @@ # ::: :::::::: # # GameSettings.py :+: :+: :+: # # +:+ +:+ +:+ # -# By: tomoron +#+ +:+ +#+ # +# By: edbernar { if (content.opponentLeft) - simpleText.innerText = `Your opponent has given up...\nYou will be redirected to the ` + content.tournamentCode ? "tournamenet" : "lobby" + ` in ${time} seconds` + simpleText.innerText = `Your opponent has given up...\nYou will be redirected to the ` + (content.tournamentCode ? "tournament" : "lobby") + ` in ${time} seconds` else - simpleText.innerText = `You will be redirected to the ` + content.tournamentCode ? "tournamenet" : "lobby" + ` in ${time} seconds` + simpleText.innerText = `You will be redirected to the ` + (content.tournamentCode ? "tournament" : "lobby") + ` in ${time} seconds` time--; if (time == -1) { diff --git a/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js b/docker-compose/requirements/nginx/static/javascript/tournamentPage/TournamentPage.js index 748f607..f22d72a 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 { - info.id = 0; + info.id = -1; info.username = null; info.pfp = null; }); @@ -75,11 +75,8 @@ class TournamentPage let i = 0; Object.values(playerList).forEach((info) => { - if (!found && info.id == 0 || info.id == content.id) - { + if (!found && info.id == -1 || (info.id == content.id && info.id != 0)) found = true; - alreadyConnected = info.id == content.id; - } if (!found) i++; }); @@ -88,11 +85,6 @@ class TournamentPage console.warn("Tournament is full."); return ; } - // if (alreadyConnected) - // { - // console.warn("Player is already in game."); - // return ; - // } newInfo(`${content.username} joined the tournament.`); document.getElementById('user-' + playerNb[i]).innerText = content.username; document.getElementById('pfp-' + playerNb[i]).style.backgroundImage = `url(${content.pfp})`; diff --git a/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js b/docker-compose/requirements/nginx/static/javascript/typeResponse/typeTournament.js index 9d94fdc..d0fe22e 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