Ladebeze66/ft_transcendence
1
0
Fork 0
mirror of https://github.com/AudebertAdrien/ft_transcendence.git synced 2025-12-15 21:56:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

debugging

Browse Source
This commit is contained in:
CHIBOUB Chakib 2024-09-11 19:02:01 +02:00
parent 730431736a
commit 18147ff10b
4 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pong/game/game.py
View File

@ -9,6 +9,9 @@ from asgiref.sync import sync_to_async
from .models import Tournoi
class Game:
# Global variable to handle the using of the database
USING_DB = False
def __init__(self, game_id, player1, player2, localgame):
self.game_id = game_id
self.player1 = player1
@ -243,6 +246,9 @@ class Game:
if not self.botgame:
if not self.localgame:
await self.player2.send(end_message)
while (Game.USING_DB):
await asyncio.sleep(1)
Game.USING_DB = True
if hasattr(self, 'tournament'):
print(f"*** Game #{self.game_id} from tournament: {self.tournament.tournoi_reg.name} ENDED ***")
await sync_to_async(handle_game_data)(self.game_state['player1_name'], self.game_state['player2_name'],
@ -253,3 +259,4 @@ class Game:
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)
Game.USING_DB = False

20
pong/game/tournament.py
View File

@ -82,13 +82,13 @@ class TournamentMatchMaker:
# Tournament start method
async def start_tournament(self):
if len(self.waiting_players) < 2:
if len(self.waiting_players) < 3:
return False
if len(self.waiting_players) % 2 == 0:
await self.add_player(None)
self.tournament_state = "in_progress"
random.shuffle(self.waiting_players)
'''if (len(self.waiting_players) % 2) != 0:
print("Adding a BYE to the tournament..")
await self.add_player(None)'''
self.tournament_state = "in_progress"
self.current_round = 0
len_tournament = await sync_to_async(getlen)()
self.final_name = self.name + " #" + str(len_tournament + 1)
@ -97,7 +97,7 @@ class TournamentMatchMaker:
return True
async def advance_tournament(self):
players = self.waiting_players
players = self.waiting_players
while len(players) > 1:
self.current_round += 1
print(f"Starting round {self.current_round} with {len(players)} players")
@ -180,6 +180,14 @@ class TournamentMatchMaker:
match.game_state['player1_score'] = 3
match.game_state['player2_score'] = 0
await match.end_game()
await self.send_game_text(match.player1, "You lucky bastard! You got an auto-win!")
async def send_game_text(self, player, text):
message = json.dumps({
'type': 'game_text_update',
'game_text': text
})
await player.send(message)
def get_round_winners(self):
winners = []

4
pong/settings.py
View File

@ -136,7 +136,7 @@ CHANNEL_LAYERS = {
},
}
LOGGING = {
'''LOGGING = {
'version': 1, # The version of the logging configuration schema
'disable_existing_loggers': False, # Allows existing loggers to keep logging
'formatters': { # Defines how log messages will be formatted
@ -169,4 +169,4 @@ LOGGING = {
'propagate': True, # If True, messages will be passed to the parent loggers as well
},
},
}
}'''

6
pong/static/game.js
View File

@ -388,6 +388,8 @@ document.addEventListener('DOMContentLoaded', () => {
document.addEventListener('keydown', handleKeyDown);
} else if (data.type === 'game_state_update') {
updateGameState(data.game_state);
} else if (data.type === 'game_text_update') {
updateGameText(data.game_text);
} else if (data.type === 'player_disconnected') {
console.log('Player disconnected:', data.player);
} else if (data.type === 'game_ended') {
@ -462,6 +464,10 @@ document.addEventListener('DOMContentLoaded', () => {
document.getElementById('game-text').textContent = gameState.game_text;
}
function updateGameText(gameText) {
document.getElementById('game-text').textContent = gameText;
}
const starsContainer = document.getElementById('stars');
for (let i = 0; i < 500; i++) {
const star = document.createElement('div');