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

Serv

Browse Source 
- add variable for disable bot movement
Site
    - fix bug with message in end screen game
    - fix dispose for list user in tournament page
This commit is contained in:
Kum1ta
2024-10-16 01:33:13 +02:00
parent adae90904b
commit 18eed2de28
5 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,10 +3,10 @@
# ::: :::::::: #
# Bot.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/05 03:54:20 by tomoron #+# #+# #
# Updated: 2024/10/14 20:18:58 by tomoron ### ########.fr #
# Updated: 2024/10/16 01:25:20 by edbernar ### ########.fr #
# #
# **************************************************************************** #
@ -18,6 +18,8 @@ import random
import asyncio
import time
DISABLE_BOT_MOVEMENT = False
class Bot(Player):
def __init__(self, game=None, tournament=None):
self.socket = DummySocket(game)
@ -84,18 +86,19 @@ class Bot(Player):
async def goToObjectiveLoop(self):
lastUpdate = time.time()
while not self.isEnd():
if(self.pos["pos"] != self.objective["pos"] or self.pos["up"] != self.objective["up"]):
self.pos["up"] = self.objective["up"]
if (not DISABLE_BOT_MOVEMENT):
if(self.pos["pos"] != self.objective["pos"] or self.pos["up"] != self.objective["up"]):
self.pos["up"] = self.objective["up"]
maxDistance = GameSettings.maxPlayerSpeed * (time.time() - lastUpdate)
print("maxDistance :", maxDistance)
travel = self.objective["pos"] - self.pos["pos"]
if(travel >= 0):
travel = min(self.objective["pos"] - self.pos["pos"], maxDistance)
else:
travel = max(self.objective["pos"] - self.pos["pos"], -maxDistance)
print("travel :", travel)
self.game.move(self.socket, self.pos["pos"] + travel, self.pos["up"])
maxDistance = GameSettings.maxPlayerSpeed * (time.time() - lastUpdate)
print("maxDistance :", maxDistance)
travel = self.objective["pos"] - self.pos["pos"]
if(travel >= 0):
travel = min(self.objective["pos"] - self.pos["pos"], maxDistance)
else:
travel = max(self.objective["pos"] - self.pos["pos"], -maxDistance)
print("travel :", travel)
self.game.move(self.socket, self.pos["pos"] + travel, self.pos["up"])
lastUpdate = time.time()
await asyncio.sleep(1 / 20)

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

@ -3,10 +3,10 @@
# ::: :::::::: #
# GameSettings.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/06 16:33:56 by tomoron #+# #+# #
# Updated: 2024/10/12 23:31:00 by tomoron ### ########.fr #
# Updated: 2024/10/16 01:24:44 by edbernar ### ########.fr #
# #
# **************************************************************************** #