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

add bot, move player variables to a player class(might have broke some things idk)

Browse Source
This commit is contained in:
tomoron
2024-10-05 04:30:39 +02:00
parent d8284b78e2
commit 66fbfc2bc7
4 changed files with 82 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,15 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Bot.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/05 03:54:20 by tomoron #+# #+# #
# Updated: 2024/10/05 03:55:31 by tomoron ### ########.fr #
# #
# **************************************************************************** #
class Bot(Player):
def __init__(self):
print("I am a bot boop boop beep boop")

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

@ -6,11 +6,12 @@
# 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/10/03 23:54:53 by tomoron ### ########.fr # # Updated: 2024/10/05 03:50:25 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #
from asgiref.sync import sync_to_async from asgiref.sync import sync_to_async
from .Player import Player
from .models import GameResults, User from .models import GameResults, User
import time import time
import json import json
@ -64,33 +65,22 @@ class Game:
maxScore = 5 maxScore = 5
def __init__(self, socket, withBot, skinId = 0, opponent = None): def __init__(self, socket, withBot, skinId = 0, opponent = None):
self.p1 = None self.p1 = Player()
self.p2 = None self.p2 = Player()
self.p1Ready = False
self.p2Ready = False
self.bot = withBot
self.started = False self.started = False
self.end = False self.end = False
self.left = None self.left = None
self.winner = None self.winner = None
self.gameStart = 0 self.gameStart = 0
self.expSleepTime = 0
self.p1Pos = {"pos":0, "up": False}
self.p2Pos = {"pos":0, "up": False}
self.ballPos = {"pos":(0, 0), "up": False} self.ballPos = {"pos":(0, 0), "up": False}
self.ballVel = (0, 0)
self.speed = Game.startSpeed self.speed = Game.startSpeed
self.ballVel = (self.speed, 0)
self.score = [0, 0] self.score = [0, 0]
self.obstacles = [] self.obstacles = []
self.lastWin = 2 self.lastWin = 2
self.p1Skin = 0
self.p2Skin = 0
self.opponentLock = opponent self.opponentLock = opponent
if(withBot): if(withBot):
self.join(socket, skinId) self.join(socket, skinId)
elif(opponent != None): elif(opponent != None):
@ -138,40 +128,40 @@ class Game:
else: 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.socket.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.socket.sync_send({"type":"game", "content":{"action":7, "content":self.obstacles}})
self.obstaclesInvLength() self.obstaclesInvLength()
def join(self, socket, skin = 0): def join(self, socket, skin = 0):
try: try:
if(self.p1 == None): if(self.p1.socket == None):
print("game created, set as player 1") print("game created, set as player 1")
self.p1 = socket self.p1.socket = socket
self.p1Skin = skin self.p1.skin = skin
else: else:
if(self.opponentLock != None and self.opponentLock != socket.id): if(self.opponentLock != None and self.opponentLock != socket.id):
socket.sendError("You are not invited to this game", 9103) socket.sendError("You are not invited to this game", 9103)
return; return;
print("joined game, set as player 2") print("joined game, set as player 2")
self.p2 = socket self.p2.socket = socket
self.p2Skin = skin self.p2.skin = skin
socket.game = self socket.game = self
if(self.p2 != None and self.p1 != None): if(self.p2.socket != None and self.p1.socket != None):
print("both players here, send opponent to both players") print("both players here, send opponent to both players")
self.p1.sync_send({"type":"game", "content":{"action":1,"id":self.p2.id,"username":self.p2.username, "skin":self.p2Skin}}) self.p1.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p2.socket.id,"username":self.p2.socket.username, "skin":self.p2.skin}})
self.p2.sync_send({"type":"game", "content":{"action":1,"id":self.p1.id,"username":self.p1.username, "skin":self.p1Skin}}) self.p2.socket.sync_send({"type":"game", "content":{"action":1,"id":self.p1.socket.id,"username":self.p1.socket.username, "skin":self.p1.skin}})
except Exception as e: except Exception as e:
socket.sendError("invalid request", 9005, e) socket.sendError("invalid request", 9005, e)
async def setReady(self, socket): async def setReady(self, socket):
if(socket == self.p1): if(socket == self.p1.socket):
self.p1Ready = True self.p1.ready = True
elif (socket == self.p2): elif (socket == self.p2.socket):
self.p2Ready = True self.p2.ready = True
else: else:
return(0) return(0)
if(self.p1Ready and self.p2Ready): if(self.p1.ready and self.p2.ready):
print("both players are ready, starting game") print("both players are ready, starting game")
self.genObstacles() self.genObstacles()
print("obstacles generated :", self.obstacles) print("obstacles generated :", self.obstacles)
@ -181,14 +171,14 @@ class Game:
def endGame(self, winner): def endGame(self, winner):
if(self.end): if(self.end):
return return
self.p1.sync_send({"type":"game","content":{"action":10,"won":winner==1, "opponentLeft":self.left == 2}}) self.p1.socket.sync_send({"type":"game","content":{"action":10,"won":winner==1, "opponentLeft":self.left == 2}})
self.p2.sync_send({"type":"game","content":{"action":10,"won":winner==2, "opponentLeft":self.left == 1}}) self.p2.socket.sync_send({"type":"game","content":{"action":10,"won":winner==2, "opponentLeft":self.left == 1}})
self.winner = winner self.winner = winner
self.end = True self.end = True
def leave(self, socket): def leave(self, socket):
socket.game = None socket.game = None
if (socket == self.p1): if (socket == self.p1.socket):
self.left = 1 self.left = 1
else: else:
self.left = 2 self.left = 2
@ -204,17 +194,17 @@ class Game:
def sendPlayers(self, data): def sendPlayers(self, data):
data_raw = json.dumps({"type":"game","content":data}) data_raw = json.dumps({"type":"game","content":data})
self.p1.sync_send(data_raw) self.p1.socket.sync_send(data_raw)
self.p2.sync_send(data_raw) self.p2.socket.sync_send(data_raw)
def move(self, socket, pos, up): def move(self, socket, pos, up):
opponent = self.p1 if socket != self.p1 else self.p2 opponent = self.p1.socket if socket != self.p1.socket else self.p2.socket
if(socket == self.p1): if(socket == self.p1.socket):
self.p1Pos["pos"] = pos self.p1.pos["pos"] = pos
self.p1Pos["up"] = up; self.p1.pos["up"] = up;
else: else:
self.p2Pos["pos"] = -pos; self.p2.pos["pos"] = -pos;
self.p2Pos["up"] = up self.p2.pos["up"] = up
if(opponent != None): if(opponent != None):
opponent.sync_send({"type":"game","content":{"action":3, "pos":-pos, "up":up, "is_opponent":True}}) opponent.sync_send({"type":"game","content":{"action":3, "pos":-pos, "up":up, "is_opponent":True}})
@ -225,14 +215,14 @@ class Game:
self.gameStart = time.time() * 1000 self.gameStart = time.time() * 1000
else: else:
gameTime = (time.time() * 1000) - self.gameStart gameTime = (time.time() * 1000) - self.gameStart
if(self.p1): if(self.p1.socket):
self.p1.sync_send({"type":"game", "content":{"action":5, self.p1.socket.sync_send({"type":"game", "content":{"action":5,
"pos" : [self.ballPos["pos"][0],self.ballPos["pos"][1]], "pos" : [self.ballPos["pos"][0],self.ballPos["pos"][1]],
"velocity":[self.ballVel[0], self.ballVel[1]], "velocity":[self.ballVel[0], self.ballVel[1]],
"game_time":gameTime "game_time":gameTime
}}) }})
if(self.p2): if(self.p2.socket):
self.p2.sync_send({"type":"game","content":{"action":5, self.p2.socket.sync_send({"type":"game","content":{"action":5,
"pos" : [-self.ballPos["pos"][0],-self.ballPos["pos"][1]], "pos" : [-self.ballPos["pos"][0],-self.ballPos["pos"][1]],
"velocity":[-self.ballVel[0], -self.ballVel[1]], "velocity":[-self.ballVel[0], -self.ballVel[1]],
"game_time":gameTime "game_time":gameTime
@ -355,8 +345,8 @@ class Game:
print("a player suffured from a major skill issue") print("a player suffured from a major skill issue")
self.score[player-1] += 1 self.score[player-1] += 1
print("new score :", self.score) print("new score :", self.score)
self.p1.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.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}})
await asyncio.sleep(4.5) await asyncio.sleep(4.5)
if(self.checkGameEndGoal()): if(self.checkGameEndGoal()):
return return
@ -375,8 +365,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":self.obstacles[i]["name"]}}) self.p1.socket.sync_send({"type":"game", "content":{"action":8,"name":self.obstacles[i]["name"]}})
self.p2.sync_send({"type":"game", "content":{"action":8,"name":self.obstacles[i]["name"]}}) self.p2.socket.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):
@ -402,22 +392,21 @@ class Game:
now = time.time() now = time.time()
delta = now - self.lastUpdate delta = now - self.lastUpdate
print("delta :", delta) 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]
newBallPos = (round(currentBallPos[0] + (delta * velX), 5), newBallPos = (round(currentBallPos[0] + (delta * velX), 5),
round(currentBallPos[1] + (delta * velZ), 5)) round(currentBallPos[1] + (delta * velZ), 5))
if(newBallPos[1] <= Game.limits["back"] or newBallPos[1] >= Game.limits["front"]): if(newBallPos[1] <= Game.limits["back"] or newBallPos[1] >= Game.limits["front"]):
player = self.p2Pos if newBallPos[1] < 0 else self.p1Pos player = self.p2.pos if newBallPos[1] < 0 else self.p1.pos
playerDistance = self.getPlayerDistance(player, newBallPos) playerDistance = self.getPlayerDistance(player, newBallPos)
if(playerDistance >= -(Game.playerLength / 2) and playerDistance <= Game.playerLength / 2 and player["up"] == self.ballPos["up"]): if(playerDistance >= -(Game.playerLength / 2) and playerDistance <= Game.playerLength / 2 and player["up"] == self.ballPos["up"]):
velX = -((self.speed * 0.80) * (playerDistance / (Game.playerLength / 2))) velX = -((self.speed * 0.80) * (playerDistance / (Game.playerLength / 2)))
velZ = self.speed - abs(velX) velZ = self.speed - abs(velX)
if(newBallPos[1] > 0): if(newBallPos[1] > 0):
velZ = -velZ velZ = -velZ
self.p1.sync_send({"type":"game","content":{"action":4, "is_opponent": newBallPos[1] < 0}}) self.p1.socket.sync_send({"type":"game","content":{"action":4, "is_opponent": newBallPos[1] < 0}})
self.p2.sync_send({"type":"game","content":{"action":4, "is_opponent": newBallPos[1] > 0}}) self.p2.socket.sync_send({"type":"game","content":{"action":4, "is_opponent": newBallPos[1] > 0}})
else: else:
await self.scoreGoal(1 if newBallPos[1] < 0 else 2) await self.scoreGoal(1 if newBallPos[1] < 0 else 2)
return; return;
@ -458,12 +447,11 @@ 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()
self.p1.game = None self.p1.socket.game = None
self.p2.game = None self.p2.socket.game = None
@sync_to_async @sync_to_async
def saveResults(self): def saveResults(self):
@ -472,8 +460,8 @@ class Game:
print("unkown winner, setting to 1") print("unkown winner, setting to 1")
self.winner = 1 self.winner = 1
print("saving results") print("saving results")
p1DbUser = User.objects.get(id=self.p1.id) p1DbUser = User.objects.get(id=self.p1.socket.id)
p2DbUser = User.objects.get(id=self.p2.id) p2DbUser = User.objects.get(id=self.p2.socket.id)
results = GameResults.objects.create( results = GameResults.objects.create(
player1 = p1DbUser, player1 = p1DbUser,
player2 = p2DbUser, player2 = p2DbUser,
@ -485,5 +473,5 @@ class Game:
results.save() results.save()
print("results saved") print("results saved")
except Exception as e: except Exception as e:
self.p1.sendError("Couldn't save last game results", 9104, e) self.p1.socket.sendError("Couldn't save last game results", 9104, e)
self.p2.sendError("Couldn't save last game results", 9104, e) self.p2.socket.sendError("Couldn't save last game results", 9104, e)

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

@ -0,0 +1,18 @@
# **************************************************************************** #
# #
# ::: :::::::: #
# Player.py :+: :+: :+: #
# +:+ +:+ +:+ #
# By: tomoron <tomoron@student.42.fr> +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ #
# Created: 2024/10/05 03:22:32 by tomoron #+# #+# #
# Updated: 2024/10/05 03:46:24 by tomoron ### ########.fr #
# #
# **************************************************************************** #
class Player():
def __init__(self):
self.socket = None
self.ready = False
self.pos = {"pos":0, "up": False}
self.skin = 0

2
docker-compose/requirements/djangoserver/file/server/server/Tournament.py
View File

@ -6,7 +6,7 @@
# By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ # # By: edbernar <edbernar@student.42angouleme. +#+ +:+ +#+ #
# +#+#+#+#+#+ +#+ # # +#+#+#+#+#+ +#+ #
# Created: 2024/10/04 17:17:07 by tomoron #+# #+# # # Created: 2024/10/04 17:17:07 by tomoron #+# #+# #
# Updated: 2024/10/05 03:33:17 by edbernar ### ########.fr # # Updated: 2024/10/05 04:31:00 by tomoron ### ########.fr #
# # # #
# **************************************************************************** # # **************************************************************************** #