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

fix ranked match making leave, add tolerance to anti cheat, set ball at middle when a goal is scored

Browse Source
This commit is contained in:
tomoron
2024-11-13 13:47:24 +01:00
parent 224f31d9a3
commit 99e4d4943c
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -201,8 +201,8 @@ class Game:
self.p2.setGame(None) self.p2.setGame(None)
if(Game.waitingForPlayer == self): if(Game.waitingForPlayer == self):
Game.waitingForPlayer = None Game.waitingForPlayer = None
if(self in Game.waitingForPlayerRanked): if(self in Game.rankedWaitingForPlayer):
Game.waitingForPlayerRanked.remove(self) Game.rankedWaitingForPlayer.remove(self)
if(self.p2 != None): if(self.p2 != None):
self.endGame(1 if self.left == 2 else 2) self.endGame(1 if self.left == 2 else 2)
self.end=True self.end=True
@ -260,6 +260,8 @@ class Game:
print("new score :", self.score) print("new score :", self.score)
self.p1.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 2}}) self.p1.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 2}})
self.p2.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 1}}) self.p2.socket.sync_send({"type":"game","content":{"action":6, "is_opponent": player == 1}})
self.prepareGame(True);
self.sendNewBallInfo(True);
await asyncio.sleep(4.5) await asyncio.sleep(4.5)
if(self.checkGameEndGoal()): if(self.checkGameEndGoal()):
return return

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

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/06 16:33:56 by tomoron #+# #+# # # Created: 2024/10/06 16:33:56 by tomoron #+# #+# #
# Updated: 2024/11/11 10:27:03 by edbernar ### ########.fr # # Updated: 2024/11/13 13:15:51 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -44,10 +44,10 @@ class GameSettings:
wallLength = 1 wallLength = 1
wallWidth = 0.05 wallWidth = 0.05
bounceSpeedIncrease = 0.2 bounceSpeedIncrease = 0.2
maxScore = 1 maxScore = 2
maxPlayerSpeed = 4 maxPlayerSpeed = 4
playerSpeedTolerance = 0.15 playerSpeedTolerance = 0.5
BotMovement = True BotMovement = True
maxTimePlayerWait = 10 maxTimePlayerWait = 10