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

fix identification of jumpers, fix generation of obstacles

Browse Source
This commit is contained in:
tomoron
2024-09-27 18:21:38 +02:00
parent bc80836329
commit ea23b45b87
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/09/13 16:20:58 by tomoron #+# #+# # # Created: 2024/09/13 16:20:58 by tomoron #+# #+# #
# Updated: 2024/09/27 17:51:24 by tomoron ### ########.fr # # Updated: 2024/09/27 18:21:08 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -119,19 +119,18 @@ class Game:
self.obstacles.append(x) self.obstacles.append(x)
i = 0 i = 0
down = False down = False
up = False
while(i < len(Game.jumpersPos) - 2): while(i < len(Game.jumpersPos) - 2):
if(random.randint(1, 100) < 50): if(random.randint(1, 100) < 50):
self.obstacles.append(Game.jumpersPos[i]) self.obstacles.append(Game.jumpersPos[i])
down = True down = True
else: else:
self.obstacles.append(Game.jumpersPos[i + 1]) self.obstacles.append(Game.jumpersPos[i + 1])
up = True
i+=2 i+=2
if not down: if not down:
self.obstacles.append(Game.jumpersPos[i]) self.obstacles.append(Game.jumpersPos[i])
if not up: else:
self.obstacles.append(Game.jumpersPos[i + 1]) self.obstacles.append(Game.jumpersPos[i + 1])
self.p1.sync_send({"type":"game", "content":{"action":7, "content":self.obstacles}}) self.p1.sync_send({"type":"game", "content":{"action":7, "content":self.obstacles}})
self.obstaclesInvLength() self.obstaclesInvLength()
self.p2.sync_send({"type":"game", "content":{"action":7, "content":self.obstacles}}) self.p2.sync_send({"type":"game", "content":{"action":7, "content":self.obstacles}})
@ -346,8 +345,8 @@ class Game:
if(self.obstacles[i]["isUp"] != self.ballPos["up"]): if(self.obstacles[i]["isUp"] != self.ballPos["up"]):
continue continue
if(self.twoPointsDistance((self.obstacles[i]["pos"]["x"], self.obstacles[i]["pos"]["z"]), ballPos) < Game.jumperRadius): if(self.twoPointsDistance((self.obstacles[i]["pos"]["x"], self.obstacles[i]["pos"]["z"]), ballPos) < Game.jumperRadius):
self.p1.sync_send({"type":"game", "content":{"action":8,"name":Game.jumpersPos[i]["name"]}}) self.p1.sync_send({"type":"game", "content":{"action":8,"name":self.obstacles[i]["name"]}})
self.p2.sync_send({"type":"game", "content":{"action":8,"name":Game.jumpersPos[i]["name"]}}) self.p2.sync_send({"type":"game", "content":{"action":8,"name":self.obstacles[i]["name"]}})
self.ballPos["up"] = not self.ballPos["up"] self.ballPos["up"] = not self.ballPos["up"]
def checkWallsColision(self, ballPos): def checkWallsColision(self, ballPos):