diff --git a/docker-compose/requirements/djangoserver/file/server/server/Ball.py b/docker-compose/requirements/djangoserver/file/server/server/Ball.py index a2feede..4cfb97d 100644 --- a/docker-compose/requirements/djangoserver/file/server/server/Ball.py +++ b/docker-compose/requirements/djangoserver/file/server/server/Ball.py @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/06 03:24:10 by tomoron #+# #+# # -# Updated: 2024/10/09 09:02:37 by tomoron ### ########.fr # +# Updated: 2024/10/09 09:09:54 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -27,7 +27,7 @@ class Ball: self.vel[1] = -self.vel[1] def default(self): - self.pos = [-1, 1] + self.pos = [0, 0] self.up = False self.vel = [0, 0] self.speed = GameSettings.startSpeed @@ -104,6 +104,8 @@ class Ball: wallsTime = self.getTimeUntilWallColision("left","right", self.pos[0], self.vel[0]) if(wallsTime < 0): return(min_time) + if(min_time < 0): + return(wallsTime) return(min(min_time, wallsTime)) def getTimeUntilWallColision(self, limitNeg, limitPos, position, velocity): @@ -159,7 +161,9 @@ class Ball: min_time = (min(min_time, time)) if(min_time < 0): return(wallsTime) - return(min(wallsTime,min_time)) + if(wallsTime < 0): + return(min_time) + return(min(wallsTime, min_time)) def getSleepTime(self): try: diff --git a/docker-compose/requirements/djangoserver/file/server/server/Bot.py b/docker-compose/requirements/djangoserver/file/server/server/Bot.py index 0c59e13..6470e8b 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/05 03:54:20 by tomoron #+# #+# # -# Updated: 2024/10/09 07:24:54 by tomoron ### ########.fr # +# Updated: 2024/10/09 09:05:42 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -25,8 +25,8 @@ class Bot(Player): self.pos = {"pos":0, "up": False} self.objective = {"pos":0, "up": False} self.skin = 0 - #asyncio.create_task(self.updateLoop()) - #asyncio.create_task(self.goToObjectiveLoop()) + asyncio.create_task(self.updateLoop()) + asyncio.create_task(self.goToObjectiveLoop()) print("I am a bot, boop boop beep boop") def createTempBall(self):