diff --git a/docker-compose/requirements/djangoserver/file/server/server/Bot.py b/docker-compose/requirements/djangoserver/file/server/server/Bot.py index 97f9d9e..63eb318 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Bot.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Bot.py @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/19 18:29:36 by tomoron #+# #+# # -# Updated: 2024/10/22 14:39:52 by tomoron ### ########.fr # +# Updated: 2024/10/22 16:35:59 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -73,6 +73,13 @@ class Bot(Player): self.objective = self.genRandomBallDirection(0, 0, True) return self.objective = self.genRandomBallDirection(tempBall.pos[0], tempBall.up, False) + leftLimit = GameSettings.mapLimits["left"] + (GameSettings.playerLength / 2) + rightLimit = GameSettings.mapLimits["right"] - (GameSettings.playerLength / 2) + if(self.objective["pos"] < leftLimit or self.objective["pos"] > rightLimit): + print("objective out of bound , set objective to limit") + print("prev objective : ", self.objective["pos"]) + self.objective["pos"] = leftLimit if self.objective["pos"] < 0 else rightLimit + print("new objective : ", self.objective["pos"]) def isEnd(self): if(self.tournament != None): diff --git a/docker-compose/requirements/djangoserver/file/server/server/Game.py b/docker-compose/requirements/djangoserver/file/server/server/Game.py index 98da775..7d98905 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Game.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Game.py @@ -6,7 +6,7 @@ # By: edbernar +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/08/09 08:08:00 by edbernar #+# #+# # -# Updated: 2024/09/30 19:41:51 by tomoron ### ########.fr # +# Updated: 2024/10/22 15:57:27 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -24,6 +24,7 @@ import random import re import json import hashlib +from threading import Thread URLMAIL = SERVER_URL + "/verify?token=" @@ -47,9 +48,8 @@ def createAccount(socket, content): MailVerify.objects.create(uid=new_user, token=verif_str).save() print("send") socket.sync_send(json.dumps({"type": "create_account", "content": "Account created"})) - if(not sendVerifMail(verif_str, content["mail"], content["username"])): - print("mail error") - socket.sendError("An error occured while sending the email, glhf", 9026) + thread = Thread(target = sendVerifMail, args = (verif_str, content["mail"], content["username"])) + thread.start() except Exception as e: print("error") socket.sendError("An error occured while creating the account", 9024, e) @@ -139,13 +139,13 @@ def sendVerifMail(verif_str, mail, username): ''', 'html')) try: - serveur = smtplib.SMTP('smtp.mail.me.com', 587) - serveur.ehlo() - serveur.starttls() - serveur.ehlo() - serveur.login(ICLOUD_USER, ICLOUD_PASS) - serveur.sendmail(ICLOUD_USER, mail, msg.as_string()) - serveur.quit() + server = smtplib.SMTP('smtp.mail.me.com', 587) + server.ehlo() + server.starttls() + server.ehlo() + server.login(ICLOUD_USER, ICLOUD_PASS) + server.sendmail(ICLOUD_USER, mail, msg.as_string()) + server.quit() print("E-mail envoyé avec succès !") return(74725) except Exception as e: diff --git a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/gameActions/start.py b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/gameActions/start.py index 5d4dae8..ce213f8 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/typeRequests/gameActions/start.py +++ b/docker-compose/requirements/djangoserver/file/server/server/typeRequests/gameActions/start.py @@ -6,7 +6,7 @@ # By: edbernar = GameSettings.nbGoals): socket.sendError("Goal id out of range", 9039) return; - Game(socket, content.get("with_bot", False), skinId, goalId, opponent) + Game(socket, content.get("with_bot", False), skinId, goalId, False, opponent)