diff --git a/project/yahtzee/__pycache__/settings.cpython-310.pyc b/project/yahtzee/__pycache__/settings.cpython-310.pyc deleted file mode 100644 index da3e4924..00000000 Binary files a/project/yahtzee/__pycache__/settings.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/__pycache__/settings.cpython-39.pyc b/project/yahtzee/__pycache__/settings.cpython-39.pyc deleted file mode 100644 index 651fef79..00000000 Binary files a/project/yahtzee/__pycache__/settings.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/__pycache__/urls.cpython-310.pyc b/project/yahtzee/__pycache__/urls.cpython-310.pyc deleted file mode 100644 index f7cf5802..00000000 Binary files a/project/yahtzee/__pycache__/urls.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/__pycache__/urls.cpython-39.pyc b/project/yahtzee/__pycache__/urls.cpython-39.pyc deleted file mode 100644 index 2f7b0304..00000000 Binary files a/project/yahtzee/__pycache__/urls.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/__pycache__/wsgi.cpython-310.pyc b/project/yahtzee/__pycache__/wsgi.cpython-310.pyc deleted file mode 100644 index 47b976cd..00000000 Binary files a/project/yahtzee/__pycache__/wsgi.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/__pycache__/wsgi.cpython-39.pyc b/project/yahtzee/__pycache__/wsgi.cpython-39.pyc deleted file mode 100644 index 2025191c..00000000 Binary files a/project/yahtzee/__pycache__/wsgi.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/admin.cpython-310.pyc b/project/yahtzee/api/__pycache__/admin.cpython-310.pyc deleted file mode 100644 index 5f82ea49..00000000 Binary files a/project/yahtzee/api/__pycache__/admin.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/admin.cpython-39.pyc b/project/yahtzee/api/__pycache__/admin.cpython-39.pyc deleted file mode 100644 index 91716239..00000000 Binary files a/project/yahtzee/api/__pycache__/admin.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/apps.cpython-310.pyc b/project/yahtzee/api/__pycache__/apps.cpython-310.pyc deleted file mode 100644 index 22bcb760..00000000 Binary files a/project/yahtzee/api/__pycache__/apps.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/apps.cpython-39.pyc b/project/yahtzee/api/__pycache__/apps.cpython-39.pyc deleted file mode 100644 index 0aa4a960..00000000 Binary files a/project/yahtzee/api/__pycache__/apps.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/controllers.cpython-310.pyc b/project/yahtzee/api/__pycache__/controllers.cpython-310.pyc deleted file mode 100644 index 4ff8f773..00000000 Binary files a/project/yahtzee/api/__pycache__/controllers.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/controllers.cpython-39.pyc b/project/yahtzee/api/__pycache__/controllers.cpython-39.pyc deleted file mode 100644 index 5b52bc73..00000000 Binary files a/project/yahtzee/api/__pycache__/controllers.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/models.cpython-310.pyc b/project/yahtzee/api/__pycache__/models.cpython-310.pyc deleted file mode 100644 index 4830a4d8..00000000 Binary files a/project/yahtzee/api/__pycache__/models.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/models.cpython-39.pyc b/project/yahtzee/api/__pycache__/models.cpython-39.pyc deleted file mode 100644 index cbdb1397..00000000 Binary files a/project/yahtzee/api/__pycache__/models.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/serializers.cpython-310.pyc b/project/yahtzee/api/__pycache__/serializers.cpython-310.pyc deleted file mode 100644 index 19a6d0ba..00000000 Binary files a/project/yahtzee/api/__pycache__/serializers.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/api/__pycache__/serializers.cpython-39.pyc b/project/yahtzee/api/__pycache__/serializers.cpython-39.pyc deleted file mode 100644 index 6579a827..00000000 Binary files a/project/yahtzee/api/__pycache__/serializers.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/admin.cpython-310.pyc b/project/yahtzee/frontend/__pycache__/admin.cpython-310.pyc deleted file mode 100644 index d933464e..00000000 Binary files a/project/yahtzee/frontend/__pycache__/admin.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/admin.cpython-39.pyc b/project/yahtzee/frontend/__pycache__/admin.cpython-39.pyc deleted file mode 100644 index 4bfc6721..00000000 Binary files a/project/yahtzee/frontend/__pycache__/admin.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/apps.cpython-310.pyc b/project/yahtzee/frontend/__pycache__/apps.cpython-310.pyc deleted file mode 100644 index a3670aa0..00000000 Binary files a/project/yahtzee/frontend/__pycache__/apps.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/apps.cpython-39.pyc b/project/yahtzee/frontend/__pycache__/apps.cpython-39.pyc deleted file mode 100644 index 5bcc39ce..00000000 Binary files a/project/yahtzee/frontend/__pycache__/apps.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/forms.cpython-310.pyc b/project/yahtzee/frontend/__pycache__/forms.cpython-310.pyc deleted file mode 100644 index b3cd5b79..00000000 Binary files a/project/yahtzee/frontend/__pycache__/forms.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/forms.cpython-39.pyc b/project/yahtzee/frontend/__pycache__/forms.cpython-39.pyc deleted file mode 100644 index 9a13d966..00000000 Binary files a/project/yahtzee/frontend/__pycache__/forms.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/models.cpython-310.pyc b/project/yahtzee/frontend/__pycache__/models.cpython-310.pyc deleted file mode 100644 index ded7ddaf..00000000 Binary files a/project/yahtzee/frontend/__pycache__/models.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/models.cpython-39.pyc b/project/yahtzee/frontend/__pycache__/models.cpython-39.pyc deleted file mode 100644 index 08f221c6..00000000 Binary files a/project/yahtzee/frontend/__pycache__/models.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/views.cpython-310.pyc b/project/yahtzee/frontend/__pycache__/views.cpython-310.pyc deleted file mode 100644 index 84894c8f..00000000 Binary files a/project/yahtzee/frontend/__pycache__/views.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/__pycache__/views.cpython-39.pyc b/project/yahtzee/frontend/__pycache__/views.cpython-39.pyc deleted file mode 100644 index e3d194b3..00000000 Binary files a/project/yahtzee/frontend/__pycache__/views.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/migrations/0001_initial.py b/project/yahtzee/frontend/migrations/0001_initial.py deleted file mode 100644 index 7e036548..00000000 --- a/project/yahtzee/frontend/migrations/0001_initial.py +++ /dev/null @@ -1,77 +0,0 @@ -# Generated by Django 4.0 on 2021-12-16 02:37 - -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('auth', '0012_alter_user_first_name_max_length'), - ] - - operations = [ - migrations.CreateModel( - name='Game', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('game_id', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)), - ('is_public', models.BooleanField(default=True)), - ('join_code', models.UUIDField(default=uuid.uuid4, editable=False, unique=True)), - ('active', models.BooleanField(default=True)), - ('is_open', models.BooleanField(default=True)), - ('host', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.user')), - ], - ), - migrations.CreateModel( - name='Score', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('ones', models.IntegerField(null=True)), - ('twos', models.IntegerField(null=True)), - ('threes', models.IntegerField(null=True)), - ('fours', models.IntegerField(null=True)), - ('fives', models.IntegerField(null=True)), - ('sixes', models.IntegerField(null=True)), - ('three_oak', models.IntegerField(null=True)), - ('four_oak', models.IntegerField(null=True)), - ('full_house', models.IntegerField(null=True)), - ('small_straight', models.IntegerField(null=True)), - ('large_straight', models.IntegerField(null=True)), - ('yahtzee', models.IntegerField(null=True)), - ('chance', models.IntegerField(null=True)), - ('bonus_yahtzees', models.IntegerField(default=0)), - ('game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='frontend.game')), - ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.user')), - ], - ), - migrations.CreateModel( - name='Hand', - fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('d1', models.IntegerField(default=5)), - ('d2', models.IntegerField(default=4)), - ('d3', models.IntegerField(default=1)), - ('d4', models.IntegerField(default=3)), - ('d5', models.IntegerField(default=2)), - ('roll_count', models.IntegerField(default=2)), - ('rem_rounds', models.IntegerField(default=13)), - ('yahtzee_flag', models.IntegerField(null=True)), - ('game', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='frontend.game')), - ('player', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='auth.user')), - ], - ), - migrations.AddField( - model_name='game', - name='players', - field=models.ManyToManyField(related_name='board', to='frontend.Hand'), - ), - migrations.AddField( - model_name='game', - name='scores', - field=models.ManyToManyField(related_name='board', to='frontend.Score'), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0002_alter_hand_d1_alter_hand_d3_alter_hand_d5.py b/project/yahtzee/frontend/migrations/0002_alter_hand_d1_alter_hand_d3_alter_hand_d5.py deleted file mode 100644 index 23037732..00000000 --- a/project/yahtzee/frontend/migrations/0002_alter_hand_d1_alter_hand_d3_alter_hand_d5.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 4.0 on 2021-12-16 02:37 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=2), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=2), - ), - migrations.AlterField( - model_name='hand', - name='d5', - field=models.IntegerField(default=6), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0003_auto_20211216_0241.py b/project/yahtzee/frontend/migrations/0003_auto_20211216_0241.py deleted file mode 100644 index 6dfcf00f..00000000 --- a/project/yahtzee/frontend/migrations/0003_auto_20211216_0241.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.10 on 2021-12-16 02:41 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0002_alter_hand_d1_alter_hand_d3_alter_hand_d5'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=5), - ), - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=4), - ), - migrations.AlterField( - model_name='hand', - name='d5', - field=models.IntegerField(default=3), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0004_auto_20211216_0320.py b/project/yahtzee/frontend/migrations/0004_auto_20211216_0320.py deleted file mode 100644 index c2f45fa7..00000000 --- a/project/yahtzee/frontend/migrations/0004_auto_20211216_0320.py +++ /dev/null @@ -1,28 +0,0 @@ -# Generated by Django 3.2.10 on 2021-12-16 03:20 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0003_auto_20211216_0241'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=5), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='hand', - name='d4', - field=models.IntegerField(default=4), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0005_auto_20211216_0321.py b/project/yahtzee/frontend/migrations/0005_auto_20211216_0321.py deleted file mode 100644 index ffa871de..00000000 --- a/project/yahtzee/frontend/migrations/0005_auto_20211216_0321.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.10 on 2021-12-16 03:21 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0004_auto_20211216_0320'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=4), - ), - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=3), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=5), - ), - migrations.AlterField( - model_name='hand', - name='d4', - field=models.IntegerField(default=5), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0006_auto_20211216_0325.py b/project/yahtzee/frontend/migrations/0006_auto_20211216_0325.py deleted file mode 100644 index d4afecf6..00000000 --- a/project/yahtzee/frontend/migrations/0006_auto_20211216_0325.py +++ /dev/null @@ -1,38 +0,0 @@ -# Generated by Django 3.2.10 on 2021-12-16 03:25 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0005_auto_20211216_0321'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=6), - ), - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=4), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=6), - ), - migrations.AlterField( - model_name='hand', - name='d4', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='hand', - name='d5', - field=models.IntegerField(default=4), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0007_alter_hand_d1_alter_hand_d2_alter_hand_d3_and_more.py b/project/yahtzee/frontend/migrations/0007_alter_hand_d1_alter_hand_d2_alter_hand_d3_and_more.py deleted file mode 100644 index 4190fdef..00000000 --- a/project/yahtzee/frontend/migrations/0007_alter_hand_d1_alter_hand_d2_alter_hand_d3_and_more.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 4.0 on 2021-12-16 03:43 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0006_auto_20211216_0325'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=5), - ), - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=3), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='hand', - name='d4', - field=models.IntegerField(default=2), - ), - ] diff --git a/project/yahtzee/frontend/migrations/0008_auto_20211216_0344.py b/project/yahtzee/frontend/migrations/0008_auto_20211216_0344.py deleted file mode 100644 index 9145d02d..00000000 --- a/project/yahtzee/frontend/migrations/0008_auto_20211216_0344.py +++ /dev/null @@ -1,33 +0,0 @@ -# Generated by Django 3.2.10 on 2021-12-16 03:44 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('frontend', '0007_alter_hand_d1_alter_hand_d2_alter_hand_d3_and_more'), - ] - - operations = [ - migrations.AlterField( - model_name='hand', - name='d1', - field=models.IntegerField(default=1), - ), - migrations.AlterField( - model_name='hand', - name='d2', - field=models.IntegerField(default=6), - ), - migrations.AlterField( - model_name='hand', - name='d3', - field=models.IntegerField(default=3), - ), - migrations.AlterField( - model_name='hand', - name='d5', - field=models.IntegerField(default=6), - ), - ] diff --git a/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-310.pyc b/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-310.pyc deleted file mode 100644 index 6b61a69c..00000000 Binary files a/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-310.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-39.pyc b/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-39.pyc deleted file mode 100644 index fb4bee40..00000000 Binary files a/project/yahtzee/frontend/migrations/__pycache__/0001_initial.cpython-39.pyc and /dev/null differ diff --git a/project/yahtzee/frontend/models.py b/project/yahtzee/frontend/models.py index ab933112..2fac060d 100644 --- a/project/yahtzee/frontend/models.py +++ b/project/yahtzee/frontend/models.py @@ -168,7 +168,7 @@ def smallStraight (self): values.append(x) count += 1 values.sort() - if (count > 2): + if (count > 3): if (values[0]+1 == values[1] and values[1]+1 == values[2] and values[2]+1 == values[3]): return 30 elif (values[1]+1 == values[2] and values[2]+1 == values[3] and values[3]+1 == dice[4]):