tom/METH_Transcendence
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

forgot to replace ball at center, fix map border colisions, fix for ball going straight not working but its a WIP

Browse Source
This commit is contained in:
tomoron
2024-10-09 09:16:11 +02:00
parent 2046ed4c9a
commit 4407901a4a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker-compose/requirements/djangoserver/file/server/server/Ball.py
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/06 03:24:10 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] self.vel[1] = -self.vel[1]
def default(self): def default(self):
self.pos = [-1, 1] self.pos = [0, 0]
self.up = False self.up = False
self.vel = [0, 0] self.vel = [0, 0]
self.speed = GameSettings.startSpeed self.speed = GameSettings.startSpeed
@ -104,6 +104,8 @@ class Ball:
wallsTime = self.getTimeUntilWallColision("left","right", self.pos[0], self.vel[0]) wallsTime = self.getTimeUntilWallColision("left","right", self.pos[0], self.vel[0])
if(wallsTime < 0): if(wallsTime < 0):
return(min_time) return(min_time)
if(min_time < 0):
return(wallsTime)
return(min(min_time, wallsTime)) return(min(min_time, wallsTime))
def getTimeUntilWallColision(self, limitNeg, limitPos, position, velocity): def getTimeUntilWallColision(self, limitNeg, limitPos, position, velocity):
@ -159,7 +161,9 @@ class Ball:
min_time = (min(min_time, time)) min_time = (min(min_time, time))
if(min_time < 0): if(min_time < 0):
return(wallsTime) return(wallsTime)
return(min(wallsTime,min_time)) if(wallsTime < 0):
return(min_time)
return(min(wallsTime, min_time))
def getSleepTime(self): def getSleepTime(self):
try: try:

6
docker-compose/requirements/djangoserver/file/server/server/Bot.py
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/05 03:54:20 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.pos = {"pos":0, "up": False}
self.objective = {"pos":0, "up": False} self.objective = {"pos":0, "up": False}
self.skin = 0 self.skin = 0
#asyncio.create_task(self.updateLoop()) asyncio.create_task(self.updateLoop())
#asyncio.create_task(self.goToObjectiveLoop()) asyncio.create_task(self.goToObjectiveLoop())
print("I am a bot, boop boop beep boop") print("I am a bot, boop boop beep boop")
def createTempBall(self): def createTempBall(self):