Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2026-11-10 01:07:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

fresh start

Browse Source
This commit is contained in:
Theouche
2024-08-28 16:38:39 +02:00
parent c2e55cc504
commit a8103c122d
12 changed files with 382 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pong/game/game.py
View File

@@ -4,7 +4,7 @@ import json
import asyncio
import random
from datetime import datetime
from .utils import endfortheouche
from .utils import handle_game_data
from asgiref.sync import sync_to_async
@@ -75,9 +75,9 @@ class Game:
target_y = future_ball_position['y']
player2_position = self.game_state['player2_position']
# Ajuste la position du bot en fonction de la position prévue de la balle
# Adjusts bot position based on expected ball position
if player2_position < target_y < player2_position + 80:
pass # Pas besoin de bouger, le bot est déjà bien placé
pass #bot already placed
elif player2_position < target_y:
self.game_state['player2_position'] = min(player2_position + (50 * self.speed), 300)
elif player2_position + 80 > target_y:
@@ -94,9 +94,9 @@ class Game:
future_x += velocity_x
future_y += velocity_y
# Gérer les rebonds sur les murs
# Dealing with bounces off walls
if future_y <= 0 or future_y >= 300:
velocity_y = -velocity_y # Inverser la direction du mouvement vertical
velocity_y = -velocity_y # Reverse the direction of vertical movement
return {'x': future_x, 'y': future_y}
@@ -206,9 +206,7 @@ class Game:
self.game_state['player2_position'] = min(self.game_state['player2_position'] + (5 * self.speed), 300)
async def end_game(self, disconnected_player=None):
print("end GAME CALLED")
if not self.ended:
print("Game ended !!!!! ")
self.ended = True
if self.game_loop_task:
self.game_loop_task.cancel()
@@ -237,7 +235,6 @@ class Game:
if not self.botgame:
if not self.localgame:
await self.player2.send(end_message)
print("save data")
await sync_to_async(endfortheouche)(self.game_state['player1_name'], self.game_state['player2_name'],
await sync_to_async(handle_game_data)(self.game_state['player1_name'], self.game_state['player2_name'],
self.game_state['player1_score'], self.game_state['player2_score'],
self.bt1, self.bt2, duration, False, None)

3
pong/game/models.py
View File

@@ -4,7 +4,6 @@ from django.db import models
from django.contrib.auth.models import User
User.add_to_class('auth_token', models.CharField(max_length=100, null=True, blank=True, unique=True))
# Create your models here.
class Player(models.Model):
name = models.CharField(max_length=100)
@@ -55,7 +54,7 @@ class Match(models.Model):
super().clean()
def save(self, *args, **kwargs):
self.clean() # Appel de la méthode clean() avant d'enregistrer
self.clean()
super().save(*args, **kwargs)
def __str__(self):

33
pong/game/utils.py
View File

@@ -4,34 +4,22 @@ from django.shortcuts import get_object_or_404
from django.db.models import Max, Sum, F
from datetime import timedelta
from channels.db import database_sync_to_async
#from asgiref.sync import database_sync_to_async
######## try synchrone version ########
def endfortheouche(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
def handle_game_data(p1, p2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament):
try:
print("Debut de endfortheouche")
print(f"Paramètres : p1={p1}, p2={p2}, s_p1={s_p1}, s_p2={s_p2}")
# Vérification de l'existence des joueurs et création si nécessaire
player_1 = get_or_create_player(p1)
player_2 = get_or_create_player(p2)
print("ok")
print("############# BEFORE MATCH")
create_match(player_1, player_2, s_p1, s_p2, bt_p1, bt_2, dur, is_tournoi, name_tournament)
print("############# AFTER DONE")
update_player_statistics(p1)
print("############# END STAT P1")
update_player_statistics(p2)
except Exception as e:
print(f"Error in endfortheouche: {e}")
def get_player_by_name(name):
print(f"Checking if player '{name}' exists")
exists = Player.objects.filter(name=name).exists()
print(f"Player exists: {exists}")
return exists
@@ -40,19 +28,12 @@ def get_player(name):
def get_or_create_player(name):
print("here !!")
print(f"Checking existence for player: {name}")
player_exists = get_player_by_name(name)
print(f"END search in database!! (Player exists: {player_exists})")
if not player_exists:
print("Player does not exist, creating player...")
player = create_player(name)
print(f"Player created: {player}")
return player
else:
print("Player exists, fetching player...")
player = get_player(name)
print(f"Player fetched: {player}")
return player
@@ -70,7 +51,6 @@ def create_player(
num_participated_tournaments=0,
num_won_tournaments=0
):
print("create player !!!")
player = Player(
name=name,
@@ -118,20 +98,15 @@ def create_match(player1, player2, score_player1, score_player2, nbr_ball_touch_
return match
def update_player_statistics(player_name):
print("############# BEG STAT P")
player = get_object_or_404(Player, name=player_name)
# Filtrer les matchs où le joueur est joueur 1 ou joueur 2
print("############# HERE")
matches_as_player1 = Match.objects.filter(player1=player)
matches_as_player2 = Match.objects.filter(player2=player)
print("############# ACTUALLY, IT'S GOOD")
# Calculer les statistiques
total_match = matches_as_player1.count() + matches_as_player2.count()
# avoid dividing by 0
if total_match == 0:
# Eviter la division par zéro
player.total_match = total_match
player.total_win = 0
player.p_win = 0
@@ -179,7 +154,6 @@ def update_player_statistics(player_name):
best_score_as_player2 = matches_as_player2.aggregate(Max('score_player2'))['score_player2__max'] or 0
best_score = max(best_score_as_player1, best_score_as_player2)
# Mettre à jour les champs du joueur
player.total_match = total_match
player.total_win = total_win
player.p_win = p_win
@@ -193,11 +167,8 @@ def update_player_statistics(player_name):
#player.num_won_tournaments = total_win_tourn
player.save()
print("CHAKU IS THE BEST")
def get_player_p_win(player_name):
# Rechercher le joueur par son nom
player = get_object_or_404(Player, name=player_name)
# Retourner la valeur de p_win
return player.p_win

27
pong/game/views.py
View File

@@ -1,10 +1,6 @@
# /pong/game/views.py
from django.shortcuts import render
def index(request):
return render(request, 'index.html')
from django.core.exceptions import ObjectDoesNotExist
from .models import Player, Tournoi, Match
from .utils import create_player, create_tournoi, create_match
@@ -12,12 +8,14 @@ from django.http import JsonResponse
from django.contrib.auth.models import User
from django.contrib.auth import authenticate
from django.views.decorators.csrf import csrf_exempt
""" from .serializers import MatchSerializer """
from rest_framework import viewsets
import json
import uuid
def index(request):
return render(request, 'index.html')
@csrf_exempt
def check_user_exists(request):
if request.method == 'POST':
@@ -69,11 +67,6 @@ def get_or_create_token(user):
break
return user.auth_token
####################### THEOUCHE PART ############################
from django.http import JsonResponse
def match_list_json(request):
matches = Match.objects.all()
data = {
@@ -86,10 +79,8 @@ def match_list_json(request):
return JsonResponse(data)
def player_list_json(request):
# Récupère tous les joueurs
players = Player.objects.all()
# Crée un dictionnaire avec les informations des joueurs
data = {
'players': list(players.values(
'id', 'name', 'total_match', 'total_win', 'p_win',
@@ -98,31 +89,19 @@ def player_list_json(request):
'num_participated_tournaments', 'num_won_tournaments'
))
}
# Renvoie les données en JSON
return JsonResponse(data)
def tournoi_list_json(request):
# Récupère tous les joueurs
tournois = Tournoi.objects.all()
# Crée un dictionnaire avec les informations des joueurs
data = {
'tournois': list(tournois.values(
'id', 'name', 'nbr_player', 'date', 'winner'
))
}
# Renvoie les données en JSON
return JsonResponse(data)
####################### THEOUCHE PART ############################
####################### jcheca PART ############################
from web3 import Web3
provider = Web3.HTTPProvider("https://sepolia.infura.io/v3/60e51df7c97c4f4c8ab41605a4eb9907")