mirror of
https://github.com/AudebertAdrien/ft_transcendence.git
synced 2025-12-17 22:47:49 +01:00
debugging
This commit is contained in:
parent
730431736a
commit
18147ff10b
@ -9,6 +9,9 @@ from asgiref.sync import sync_to_async
|
|||||||
from .models import Tournoi
|
from .models import Tournoi
|
||||||
|
|
||||||
class Game:
|
class Game:
|
||||||
|
# Global variable to handle the using of the database
|
||||||
|
USING_DB = False
|
||||||
|
|
||||||
def __init__(self, game_id, player1, player2, localgame):
|
def __init__(self, game_id, player1, player2, localgame):
|
||||||
self.game_id = game_id
|
self.game_id = game_id
|
||||||
self.player1 = player1
|
self.player1 = player1
|
||||||
@ -243,6 +246,9 @@ class Game:
|
|||||||
if not self.botgame:
|
if not self.botgame:
|
||||||
if not self.localgame:
|
if not self.localgame:
|
||||||
await self.player2.send(end_message)
|
await self.player2.send(end_message)
|
||||||
|
while (Game.USING_DB):
|
||||||
|
await asyncio.sleep(1)
|
||||||
|
Game.USING_DB = True
|
||||||
if hasattr(self, 'tournament'):
|
if hasattr(self, 'tournament'):
|
||||||
print(f"*** Game #{self.game_id} from tournament: {self.tournament.tournoi_reg.name} ENDED ***")
|
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'],
|
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'],
|
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.game_state['player1_score'], self.game_state['player2_score'],
|
||||||
self.bt1, self.bt2, duration, False, None)
|
self.bt1, self.bt2, duration, False, None)
|
||||||
|
Game.USING_DB = False
|
||||||
|
|||||||
@ -82,13 +82,13 @@ class TournamentMatchMaker:
|
|||||||
|
|
||||||
# Tournament start method
|
# Tournament start method
|
||||||
async def start_tournament(self):
|
async def start_tournament(self):
|
||||||
|
if len(self.waiting_players) < 3:
|
||||||
if len(self.waiting_players) < 2:
|
|
||||||
return False
|
return False
|
||||||
if len(self.waiting_players) % 2 == 0:
|
|
||||||
await self.add_player(None)
|
|
||||||
self.tournament_state = "in_progress"
|
|
||||||
random.shuffle(self.waiting_players)
|
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
|
self.current_round = 0
|
||||||
len_tournament = await sync_to_async(getlen)()
|
len_tournament = await sync_to_async(getlen)()
|
||||||
self.final_name = self.name + " #" + str(len_tournament + 1)
|
self.final_name = self.name + " #" + str(len_tournament + 1)
|
||||||
@ -97,7 +97,7 @@ class TournamentMatchMaker:
|
|||||||
return True
|
return True
|
||||||
|
|
||||||
async def advance_tournament(self):
|
async def advance_tournament(self):
|
||||||
players = self.waiting_players
|
players = self.waiting_players
|
||||||
while len(players) > 1:
|
while len(players) > 1:
|
||||||
self.current_round += 1
|
self.current_round += 1
|
||||||
print(f"Starting round {self.current_round} with {len(players)} players")
|
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['player1_score'] = 3
|
||||||
match.game_state['player2_score'] = 0
|
match.game_state['player2_score'] = 0
|
||||||
await match.end_game()
|
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):
|
def get_round_winners(self):
|
||||||
winners = []
|
winners = []
|
||||||
|
|||||||
@ -136,7 +136,7 @@ CHANNEL_LAYERS = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
LOGGING = {
|
'''LOGGING = {
|
||||||
'version': 1, # The version of the logging configuration schema
|
'version': 1, # The version of the logging configuration schema
|
||||||
'disable_existing_loggers': False, # Allows existing loggers to keep logging
|
'disable_existing_loggers': False, # Allows existing loggers to keep logging
|
||||||
'formatters': { # Defines how log messages will be formatted
|
'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
|
'propagate': True, # If True, messages will be passed to the parent loggers as well
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}'''
|
||||||
|
|||||||
@ -388,6 +388,8 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||||||
document.addEventListener('keydown', handleKeyDown);
|
document.addEventListener('keydown', handleKeyDown);
|
||||||
} else if (data.type === 'game_state_update') {
|
} else if (data.type === 'game_state_update') {
|
||||||
updateGameState(data.game_state);
|
updateGameState(data.game_state);
|
||||||
|
} else if (data.type === 'game_text_update') {
|
||||||
|
updateGameText(data.game_text);
|
||||||
} else if (data.type === 'player_disconnected') {
|
} else if (data.type === 'player_disconnected') {
|
||||||
console.log('Player disconnected:', data.player);
|
console.log('Player disconnected:', data.player);
|
||||||
} else if (data.type === 'game_ended') {
|
} else if (data.type === 'game_ended') {
|
||||||
@ -462,6 +464,10 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||||||
document.getElementById('game-text').textContent = gameState.game_text;
|
document.getElementById('game-text').textContent = gameState.game_text;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function updateGameText(gameText) {
|
||||||
|
document.getElementById('game-text').textContent = gameText;
|
||||||
|
}
|
||||||
|
|
||||||
const starsContainer = document.getElementById('stars');
|
const starsContainer = document.getElementById('stars');
|
||||||
for (let i = 0; i < 500; i++) {
|
for (let i = 0; i < 500; i++) {
|
||||||
const star = document.createElement('div');
|
const star = document.createElement('div');
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user