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

Merge branch 'main' of github.com:Kum1ta/PTME_Transcendence

Browse Source
This commit is contained in:
Kum1ta
2024-11-15 17:29:09 +01:00
parent 7469f60b7e 3e2e8975fc
commit 11e445003c
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose/requirements/djangoserver/file/server/server/Game.py
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42angouleme.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/11/13 16:21:18 by tomoron #+# #+# # # Created: 2024/11/13 16:21:18 by tomoron #+# #+# #
# Updated: 2024/11/13 16:30:41 by tomoron ### ########.fr # # Updated: 2024/11/15 17:08:23 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -276,7 +276,7 @@ class Game:
if(stop): if(stop):
self.ball.vel = [0, 0] self.ball.vel = [0, 0]
else: else:
self.ball.setStartVel(self.lastWin == 2) self.ball.setStartVel(self.lastWin == 1)
self.sendNewBallInfo(True) self.sendNewBallInfo(True)
self.gameStart = time.time() self.gameStart = time.time()

5
docker-compose/requirements/djangoserver/file/server/server/Player.py
View File

@ -6,7 +6,7 @@
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ # # By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/05 03:22:32 by tomoron #+# #+# # # Created: 2024/10/05 03:22:32 by tomoron #+# #+# #
# Updated: 2024/10/22 15:35:59 by tomoron ### ########.fr # # Updated: 2024/11/15 16:43:28 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -40,12 +40,13 @@ class Player():
newPos = leftLimit if newPos < 0 else rightLimit newPos = leftLimit if newPos < 0 else rightLimit
return(newPos) return(newPos)
print("speed :", abs(newPos - self.pos["pos"]) * (1 / deltaTime))
if(abs(newPos - self.pos["pos"]) * (1 / deltaTime) > GameSettings.maxPlayerSpeed + GameSettings.playerSpeedTolerance): if(abs(newPos - self.pos["pos"]) * (1 / deltaTime) > GameSettings.maxPlayerSpeed + GameSettings.playerSpeedTolerance):
newMove = GameSettings.maxPlayerSpeed * deltaTime newMove = GameSettings.maxPlayerSpeed * deltaTime
if(newPos - self.pos["pos"] < 0): if(newPos - self.pos["pos"] < 0):
newMove = -newMove newMove = -newMove
print("\033[31mplayer is too fast") print("\033[31mplayer is too fast")
print("speed :", abs(newPos - self.pos["pos"]) * (1 / deltaTime))
print("time : ", deltaTime)
newPos = self.pos["pos"] + newMove newPos = self.pos["pos"] + newMove
return(newPos) return(newPos)
print("no problem") print("no problem")