{% for round in tournament_rounds %}
-
-
Round {{ forloop.counter }}
- {% for match in round %}
-
-
- {{ match.player1 }}
- {% if match.score1 is not None %}{{ match.score1 }}{% endif %}
-
-
- {{ match.player2|default:"BYE" }}
- {% if match.score2 is not None %}{{ match.score2 }}{% endif %}
-
-
- {% if not forloop.last %}
{% endif %}
- {% endfor %}
+
+ {% for match in round %}
+
+
+ {{ match.player1 }}
+
+
+ {{ match.player2|default:"BYE" }}
+
+ {% endfor %}
+
{% endfor %}
diff --git a/pong/game/tournament.py b/pong/game/tournament.py
index 1f039fb..c2b944c 100644
--- a/pong/game/tournament.py
+++ b/pong/game/tournament.py
@@ -7,16 +7,18 @@ import random
from .matchmaking import match_maker
from .game import Game
+TOURNAMENT_NAMES = [
+ "Champion's Clash", "Ultimate Showdown", "Battle Royale",
+ "Victory's Cup", "Legends Tournament", "Elite Series", "Clash of 42",
+ "Shibuya Incident", "Cunning Game", "Elite of the Stars", "Chaku's Disciples"
+]
+
class TournamentMatch(Game):
def __init__(self, game_id, player1, player2, tournament):
# Initialize the parent Game class with the provided parameters
super().__init__(game_id, player1, player2, False)
# Store the current game instance in active games
match_maker.active_games[game_id] = self
- # Set the game for the players
- player1.set_game(self)
- if player2:
- player2.set_game(self)
# Store the tournament instance
self.tournament = tournament
@@ -25,7 +27,8 @@ class TournamentMatch(Game):
await super().end_game(disconnected_player)
# Handle the end of the match in the tournament context
await self.tournament.handle_match_end(self)
-
+ if self.game_id in match_maker.active_games:
+ del match_maker.active_games[self.game_id]
class TournamentMatchMaker:
def __init__(self):
@@ -33,17 +36,17 @@ class TournamentMatchMaker:
self.matches = []
self.rounds = []
self.current_round = 0
- self.tournament_state = "waiting" # Can be "waiting", "in_progress", or "ended"
+ self.games = 0
+ self.tournament_state = "waiting" #Can be "waiting", "in_progress", or "ended"
+ self.name = random.choice(TOURNAMENT_NAMES)
async def add_player(self, player):
if self.tournament_state == "waiting" and player not in self.waiting_players:
self.waiting_players.append(player)
- print(f"User {player.user.username} joins the TOURNAMENT WAITING ROOM")
- await self.update_waiting_room()
-
- async def remove_player(self, player):
- if player in self.waiting_players:
- self.waiting_players.remove(player)
+ if player:
+ print(f"User {player.user.username} joins the TOURNAMENT WAITING ROOM")
+ else:
+ print("BOT joins the TOURNAMENT WAITING ROOM")
await self.update_waiting_room()
async def update_waiting_room(self):
@@ -56,32 +59,74 @@ class TournamentMatchMaker:
def generate_waiting_room_html(self):
context = {
- 'players': [player.user.username for player in self.waiting_players],
+ 'players': [player.user.username if player else 'BYE' for player in self.waiting_players],
'tournament_state': self.tournament_state,
'players_count': len(self.waiting_players),
- 'min_players_to_start': 2 # You can adjust this number as needed
+ 'min_players_to_start': 3 # You can adjust this number as needed
}
return render_to_string('pong/tournament_waiting_room.html', context)
+ async def send_to_player(self, player, data):
+ if player:
+ await player.send(json.dumps(data))
+
+ async def remove_player(self, player):
+ if player in self.waiting_players:
+ self.waiting_players.remove(player)
+ await self.update_waiting_room()
+
+ # Tournament start method
async def start_tournament(self):
+
if len(self.waiting_players) < 2:
return False
-
+ if len(self.waiting_players) % 2 == 0:
+ await self.add_player(None)
self.tournament_state = "in_progress"
random.shuffle(self.waiting_players)
- self.current_round = 1
- self.create_matches(self.waiting_players)
- await self.update_brackets()
- await self.start_round_matches()
+ self.current_round = 0
+ await self.advance_tournament()
return True
- def create_matches(self, players):
+ async def advance_tournament(self):
+ players = self.waiting_players
+ while len(players) > 1:
+ self.current_round += 1
+ print(f"Starting round {self.current_round} with {len(players)} players")
+ await self.create_matches(players)
+ await self.update_brackets()
+ await self.start_round_matches()
+ # Wait for all matches in the current round to finish
+ current_round_matches = self.rounds[-1]
+ while not all(match.ended for match in current_round_matches):
+ await asyncio.sleep(1) # Wait for 1 second before checking again
+ # Get winners for the next round
+ players = self.get_round_winners()
+ print(f"Round {self.current_round} finished. {len(players)} players advancing.")
+ # Tournament has ended
+ await self.update_brackets()
+ await self.end_tournament(players[0] if players else None)
+
+ async def create_matches(self, players):
matches = []
for i in range(0, len(players), 2):
+ self.games += 1
if i + 1 < len(players):
- matches.append(TournamentMatch(len(self.matches) + 1, players[i], players[i + 1], self))
+ # Create a new instance of TournamentMatch for this round
+ match = TournamentMatch(self.games, players[i], players[i + 1], self)
+ matches.append(match)
else:
- matches.append(TournamentMatch(len(self.matches) + 1, players[i], None, self)) # Bye
+ # Create a BYE match where the second player is None
+ match = TournamentMatch(self.games, players[i], None, self) # BYE match
+ matches.append(match)
+
+ # Assign the new match instance to the players
+ if players[i]:
+ await players[i].set_game(match)
+ if i + 1 < len(players):
+ if players[i + 1]:
+ await players[i + 1].set_game(match)
+
self.rounds.append(matches)
self.matches.extend(matches)
@@ -115,45 +160,46 @@ class TournamentMatchMaker:
]
async def start_round_matches(self):
+ print(f"Starting TOURNAMENT round #{self.current_round}")
for match in self.rounds[-1]:
if match.player1 and match.player2:
await match_maker.notify_players(match.player1, match.player2, match.game_id, False)
asyncio.create_task(match.start_game())
elif match.player1:
- # Handle bye
+ # Handle BYE match
+ await match_maker.notify_players(match.player1, match.player2, match.game_id, False)
+ #asyncio.create_task(match.start_game())
match.game_state['player1_score'] = 3
match.game_state['player2_score'] = 0
await match.end_game()
- async def handle_match_end(self, match):
- await self.update_brackets()
- if all(m.ended for m in self.rounds[-1]):
- await self.advance_tournament()
-
- async def advance_tournament(self):
- winners = [match.player1 if match.game_state['player1_score'] > match.game_state['player2_score'] else match.player2 for match in self.rounds[-1] if match.player1 and match.player2]
- if len(winners) > 1:
- self.current_round += 1
- self.create_matches(winners)
- await self.update_brackets()
- await self.start_round_matches()
- else:
- await self.end_tournament(winners[0])
+ def get_round_winners(self):
+ winners = []
+ for match in self.rounds[-1]:
+ if match.ended:
+ winner = match.player1 if match.game_state['player1_score'] > match.game_state['player2_score'] else match.player2
+ #if winner:
+ winners.append(winner)
+ return winners
async def end_tournament(self, winner):
self.tournament_state = "ended"
+ winner_username = winner.user.username if winner else "No winner"
+ print(f"The TOURNAMENT winner is {winner_username}")
for player in self.waiting_players:
await self.send_to_player(player, {
'type': 'tournament_end',
- 'winner': winner.user.username
+ 'winner': winner_username
})
+ # Reset tournament state
self.waiting_players = []
self.matches = []
self.rounds = []
self.current_round = 0
+ self.games = 0
- async def send_to_player(self, player, data):
- await player.send(json.dumps(data))
+ async def handle_match_end(self, match):
+ await self.update_brackets()
# Instance of the class
tournament_match_maker = TournamentMatchMaker()
\ No newline at end of file
diff --git a/pong/game/utils.py b/pong/game/utils.py
index d30ae3f..8e9c2db 100644
--- a/pong/game/utils.py
+++ b/pong/game/utils.py
@@ -172,3 +172,5 @@ def get_player_p_win(player_name):
player = get_object_or_404(Player, name=player_name)
return player.p_win
+def getlen():
+ return Tournoi.objects.count()
diff --git a/pong/settings.py b/pong/settings.py
deleted file mode 100644
index b44ccdf..0000000
--- a/pong/settings.py
+++ /dev/null
@@ -1,172 +0,0 @@
-# /pong/settings.py
-
-"""
-Django settings for pong project.
-
-Generated by 'django-admin startproject' using Django 3.2.
-"""
-
-import os
-import logging.config
-from pathlib import Path
-
-# Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
-
-
-# Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
-
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '12345678'
-
-# SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
-
-ALLOWED_HOSTS = ['*']
-
-
-# Application definition
-
-INSTALLED_APPS = [
- 'django.contrib.admin',
- 'django.contrib.auth',
- 'django.contrib.contenttypes',
- 'django.contrib.sessions',
- 'django.contrib.messages',
- 'django.contrib.staticfiles',
- 'channels',
- 'pong.game',
- 'rest_framework'
-]
-
-MIDDLEWARE = [
- 'django.middleware.security.SecurityMiddleware',
- 'django.contrib.sessions.middleware.SessionMiddleware',
- 'django.middleware.common.CommonMiddleware',
- 'django.middleware.csrf.CsrfViewMiddleware',
- 'django.contrib.auth.middleware.AuthenticationMiddleware',
- 'django.contrib.messages.middleware.MessageMiddleware',
- 'django.middleware.clickjacking.XFrameOptionsMiddleware',
-]
-
-ROOT_URLCONF = 'pong.urls'
-
-TEMPLATES = [
- {
- 'BACKEND': 'django.template.backends.django.DjangoTemplates',
- 'DIRS': [os.path.join(BASE_DIR, 'pong', 'static')], # Ensure templates are found
- 'APP_DIRS': True,
- 'OPTIONS': {
- 'context_processors': [
- 'django.template.context_processors.debug',
- 'django.template.context_processors.request',
- 'django.contrib.auth.context_processors.auth',
- 'django.contrib.messages.context_processors.messages',
- ],
- },
- },
-]
-
-ASGI_APPLICATION = 'pong.asgi.application'
-
-# Database
-# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
-
-DATABASES = {
- 'default': {
- 'ENGINE': 'django.db.backends.postgresql',
- 'NAME': os.getenv('DB_NAME'),
- 'USER': os.getenv('DB_USER'),
- 'PASSWORD': os.getenv('DB_PASSWORD'),
- 'HOST': os.getenv('DB_HOST'),
- 'PORT': '5432',
- }
-}
-
-# Password validation
-# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
-
-AUTH_PASSWORD_VALIDATORS = [
- {
- 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
- },
- {
- 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
- },
-]
-
-# Internationalization
-# https://docs.djangoproject.com/en/3.2/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-
-
-# Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.2/howto/static-files/
-
-STATIC_URL = '/static/'
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'pong/static')]
-STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
-
-# Default primary key field type
-# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
-
-# Channels
-# Define the channel layers for WebSockets
-CHANNEL_LAYERS = {
- 'default': {
- 'BACKEND': 'channels.layers.InMemoryChannelLayer',
- },
-}
-
-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
- 'json': {
- '()': 'pythonjsonlogger.jsonlogger.JsonFormatter',
- # Formatter that outputs logs in JSON format, which is ideal for ingestion by Logstash.
- },
- 'default': {
- 'format': '[%(asctime)s] %(levelname)s [%(name)s:%(lineno)s] %(message)s',
- # This is a basic text formatter with timestamp, log level, logger name, line number, and the actual message.
- },
- },
- 'handlers': { # Handlers determine where the log messages are sent
- 'file': {
- 'level': 'INFO', # Minimum log level to be handled (INFO and above)
- 'class': 'logging.FileHandler',
- 'filename': os.path.join(BASE_DIR, 'logs/django.log'), # The file where logs will be saved
- 'formatter': 'json', # Uses the JSON formatter defined above
- },
- 'console': {
- 'level': 'DEBUG', # Minimum log level to be handled (DEBUG and above)
- 'class': 'logging.StreamHandler',
- 'formatter': 'default', # Uses the default text formatter
- },
- },
- 'loggers': { # Loggers are the actual log streams that get configured
- 'django': { # The Django logger catches all messages sent by the Django framework
- 'handlers': ['file', 'console'], # Sends logs to both the file and the console
- 'level': 'DEBUG', # Minimum log level to be logged
- 'propagate': True, # If True, messages will be passed to the parent loggers as well
- },
- },
-}
diff --git a/pong/static/game.js b/pong/static/game.js
index 1d79dcf..1b5a53c 100644
--- a/pong/static/game.js
+++ b/pong/static/game.js
@@ -64,7 +64,6 @@ document.addEventListener('DOMContentLoaded', () => {
quickMatchButton.addEventListener('click', startQuickMatch);
tournamentButton.addEventListener('click', startTournament);
-
async function handleCheckNickname() {
const nickname = nicknameInput.value.trim();
if (nickname) {
@@ -185,7 +184,6 @@ document.addEventListener('DOMContentLoaded', () => {
return data.authenticated;
}
-
async function handleCheckNickname2() {
const nickname2 = nicknameInput2.value.trim();
if (nickname2) {
@@ -388,32 +386,31 @@ document.addEventListener('DOMContentLoaded', () => {
} else if (data.type === 'game_state_update') {
updateGameState(data.game_state);
} else if (data.type === 'player_disconnected') {
- console.log("Player disconnected:", data.player);
+ console.log('Player disconnected:', data.player);
} else if (data.type === 'game_ended') {
- console.log("Game ended:", data.game_id);
+ console.log('Game ended:', data.game_id);
} else if (data.type === 'error') {
console.error(data.message);
- // Assuming you're inside some WebSocket message handling function
} else if (data.type === 'update_tournament_waiting_room') {
// Update the HTML content of the tournament bracket
document.getElementById('tournament-bracket').innerHTML = data.html;
-
// Reattach the event listener to the "Start Tournament" button
const startButton = document.getElementById('start-tournament-btn');
if (startButton) {
startButton.addEventListener('click', function() {
if (typeof socket !== 'undefined' && socket.readyState === WebSocket.OPEN) {
- console.log("Start TOURNAMENT sent..");
+ console.log('Start TOURNAMENT sent..');
socket.send(JSON.stringify({type: 'start_tournament'}));
} else {
- console.error("WebSocket is not open or undefined");
+ console.error('WebSocket is not open or undefined');
}
});
- } else {
- console.error('Start button not found');
}
} else if (data.type === 'update_brackets') {
+ // Update the HTML content of the tournament bracket
document.getElementById('tournament-bracket').innerHTML = data.html;
+ } else if (data.type === 'tournament_end') {
+ console.log('Tournament ended, the winner is:', data.winner);
} else {
console.log('Message from server:', data.type, data.message);
}
@@ -443,7 +440,7 @@ document.addEventListener('DOMContentLoaded', () => {
function updateGameState(newState) {
gameState = newState;
renderGame();
- checkForWinner();
+ //checkForWinner();
}
function renderGame() {
diff --git a/pong/static/index.html b/pong/static/index.html
index 0cf0b7f..aa89490 100644
--- a/pong/static/index.html
+++ b/pong/static/index.html
@@ -110,8 +110,8 @@