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

add profile picture for opponent and remove username of p1 in getUserInfo

Browse Source
This commit is contained in:
tomoron
2024-09-28 18:37:27 +02:00
parent 20ead24a3a
commit 10c2ef0e63
2 changed files with 16 additions and 8 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

@ -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/28 04:10:56 by tomoron ### ########.fr # # Updated: 2024/09/28 18:18:51 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -73,6 +73,7 @@ class Game:
self.end = False self.end = False
self.left = None self.left = None
self.winner = None self.winner = None
self.expSleepTime = 0
self.p1Pos = {"pos":0, "up": False} self.p1Pos = {"pos":0, "up": False}
self.p2Pos = {"pos":0, "up": False} self.p2Pos = {"pos":0, "up": False}
@ -396,6 +397,8 @@ class Game:
print("AAAAAAAAAAAAAAAAAAAAAAA update") print("AAAAAAAAAAAAAAAAAAAAAAA update")
now = time.time() now = time.time()
delta = now - self.lastUpdate delta = now - self.lastUpdate
print("delta :", delta)
print("\033[31msleep time diff :", (delta - self.expSleepTime) * 1000, "ms")
currentBallPos = self.ballPos["pos"] currentBallPos = self.ballPos["pos"]
velX = self.ballVel[0] velX = self.ballVel[0]
velZ = self.ballVel[1] velZ = self.ballVel[1]
@ -449,6 +452,7 @@ class Game:
break; break;
sleep_time = self.getSleepTime() sleep_time = self.getSleepTime()
print("sleep time : " , sleep_time) print("sleep time : " , sleep_time)
self.expSleepTime = sleep_time
await asyncio.sleep(sleep_time) await asyncio.sleep(sleep_time)
print("game end") print("game end")
await self.saveResults() await self.saveResults()

18
docker-compose/requirements/djangoserver/file/server/server/typeRequests/getUserInfo.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/09/20 00:16:57 by edbernar #+# #+# # # Created: 2024/09/20 00:16:57 by edbernar #+# #+# #
# Updated: 2024/09/28 04:43:44 by tomoron ### ########.fr # # Updated: 2024/09/28 18:35:21 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
@ -18,14 +18,18 @@ import json
def getHistory(user, games): def getHistory(user, games):
res = [] res = []
for x in games: for x in games:
p1 = {"score":int(x.p1Score), "username":x.player1.username} player = None
p2 = {"score":int(x.p2Score), "username":x.player2.username} opponent = None
if(x.player2 == user): if(x.player1 == user):
p1, p2 = p2, p1 player = {"score":int(x.p1Score)}
opponent = {"score":int(x.p2Score), "username":x.player2.username, "pfp":x.player2.pfp}
else:
player = {"score":int(x.p2Score)}
opponent = {"score":int(x.p1Score), "username":x.player1.username, "pfp":x.player1.pfp}
res.append({ res.append({
"id":x.id, "id":x.id,
"p1":p1, "p1":player,
"p2":p2, "p2":opponent,
"won":x.winner == user "won":x.winner == user
}) })
return(res) return(res)