diff --git a/pong/game/game.py b/pong/game/game.py index 4214d77..b1308ad 100644 --- a/pong/game/game.py +++ b/pong/game/game.py @@ -164,9 +164,9 @@ class Game: await self.player1.send(end_message) if not self.botgame: await self.player2.send(end_message) - await endfortheouche(self.game_state['player1_name'], self.game_state['player2_name'], - self.game_state['player1_score'], self.game_state['player2_score'], - self.bt1, self.bt2, 42, False, None) + #await endfortheouche(self.game_state['player1_name'], self.game_state['player2_name'], + # self.game_state['player1_score'], self.game_state['player2_score'], + # self.bt1, self.bt2, 42, False, None) ### pour Theo ### # nickname player1 diff --git a/pong/game/migrations/0001_initial.py b/pong/game/migrations/0001_initial.py index 1156ab7..ceac39a 100644 --- a/pong/game/migrations/0001_initial.py +++ b/pong/game/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 5.0.7 on 2024-07-30 19:44 +# Generated by Django 5.0.7 on 2024-07-31 13:42 import django.db.models.deletion from django.db import migrations, models @@ -48,7 +48,7 @@ class Migration(migrations.Migration): ('score_player2', models.PositiveSmallIntegerField()), ('nbr_ball_touch_p1', models.PositiveIntegerField()), ('nbr_ball_touch_p2', models.PositiveIntegerField()), - ('duration', models.DurationField()), + ('duration', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True)), ('date', models.DateField(auto_now_add=True)), ('is_tournoi', models.BooleanField()), ('player1', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='match_as_player1', to='game.player')), diff --git a/pong/game/migrations/0002_alter_match_duration.py b/pong/game/migrations/0002_alter_match_duration.py deleted file mode 100644 index 2347a71..0000000 --- a/pong/game/migrations/0002_alter_match_duration.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 5.0.7 on 2024-07-31 13:17 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('game', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='match', - name='duration', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - ] diff --git a/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py b/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py deleted file mode 100644 index df55fa5..0000000 --- a/pong/game/migrations/0002_player_best_score_player_m_duration_and_more.py +++ /dev/null @@ -1,68 +0,0 @@ -# Generated by Django 5.0.7 on 2024-07-24 16:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('game', '0001_initial'), - ] - - operations = [ - migrations.AddField( - model_name='player', - name='best_score', - field=models.PositiveSmallIntegerField(default=0), - ), - migrations.AddField( - model_name='player', - name='m_duration', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - migrations.AddField( - model_name='player', - name='m_nbr_ball_touch', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - migrations.AddField( - model_name='player', - name='m_score_adv_match', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - migrations.AddField( - model_name='player', - name='m_score_match', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - migrations.AddField( - model_name='player', - name='num_participated_tournaments', - field=models.PositiveSmallIntegerField(default=0), - ), - migrations.AddField( - model_name='player', - name='num_won_tournaments', - field=models.PositiveSmallIntegerField(default=0), - ), - migrations.AddField( - model_name='player', - name='p_win', - field=models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True), - ), - migrations.AddField( - model_name='player', - name='total_duration', - field=models.DurationField(blank=True, null=True), - ), - migrations.AddField( - model_name='player', - name='total_match', - field=models.PositiveSmallIntegerField(default=0), - ), - migrations.AddField( - model_name='player', - name='total_win', - field=models.PositiveSmallIntegerField(default=0), - ), - ]