From 634408eea28ccee090036e32f829ac86792ed0f1 Mon Sep 17 00:00:00 2001
From: YariKartoshe4ka <yaroslav.kikel.06@inbox.ru>
Date: Mon, 13 Jul 2020 15:51:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D1=8B=D1=85=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BE=D0=BA,=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=BB=D0=B8=D0=B7=201.1.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/config.json           |  2 +-
 main.py                      |  2 +-
 requirements.txt             |  2 +-
 scenes/game/__init__.py      |  0
 scenes/game/functions.py     | 34 +++++++++++++++++-----------------
 scenes/headpiece/__init__.py |  0
 scenes/lobby/__init__.py     |  0
 scenes/settings/__init__.py  |  0
 scenes/table/__init__.py     |  0
 9 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 scenes/game/__init__.py
 delete mode 100644 scenes/headpiece/__init__.py
 delete mode 100644 scenes/lobby/__init__.py
 delete mode 100644 scenes/settings/__init__.py
 delete mode 100644 scenes/table/__init__.py

diff --git a/config/config.json b/config/config.json
index a2e76a3..b587787 100644
--- a/config/config.json
+++ b/config/config.json
@@ -6,5 +6,5 @@
     "sub_scene": "game",
     "speed": 2,
     "score": 0,
-    "version": "1.0.0"
+    "version": "1.1.0"
 }
\ No newline at end of file
diff --git a/main.py b/main.py
index f9f6a0a..1e19d7d 100644
--- a/main.py
+++ b/main.py
@@ -1,8 +1,8 @@
 import os
 from json import load
 from updater import check_software_updates
-
 import pygame
+
 import scenes.headpiece.functions
 import scenes.lobby.functions
 import scenes.table.functions
diff --git a/requirements.txt b/requirements.txt
index 06e6cb7..a1f9a41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 pygame==1.9.6
-packaging==2.4.7
+packaging==20.4
 requests==2.24.0
\ No newline at end of file
diff --git a/scenes/game/__init__.py b/scenes/game/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/scenes/game/functions.py b/scenes/game/functions.py
index db19896..4211cc3 100644
--- a/scenes/game/functions.py
+++ b/scenes/game/functions.py
@@ -187,26 +187,25 @@ def check_collides(config, base_dir, astrs, boosts, plate, play, table, settings
     boosts_collides = pygame.sprite.spritecollide(plate, boosts, False)
 
     if astrs_collides:
+        if config['user']['effects']:
+                    pygame.mixer.music.load(plate.sounds['bang'])
+                    pygame.mixer.music.play()
+    
         for boost in boosts:
             if boost.name == 'shield' and boost.is_active:
                 boosts.remove(boost)
                 break
         else:
-            for astr in astrs_collides:
-                if config['user']['effects']:
-                    pygame.mixer.music.load(plate.sounds['bang'])
-                    pygame.mixer.music.play()
-
-                with open(f'{base_dir}/config/score.csv', 'a') as file:
-                    line = ','.join([str(config['score']), config['user']['nick']]) + '\n'
-                    file.write(line)
+            with open(f'{base_dir}/config/score.csv', 'a') as file:
+                line = ','.join([str(config['score']), config['user']['nick']]) + '\n'
+                file.write(line)
 
-                plate.reset()
-                astrs.empty()
-                boosts.empty()
+            plate.reset()
+            astrs.empty()
+            boosts.empty()
 
-                config['speed'] = 2
-                config['sub_scene'] = 'end'
+            config['speed'] = 2
+            config['sub_scene'] = 'end'
 
     elif boosts_collides and not boosts_collides[0].is_active:
         boost = boosts_collides[0]
@@ -224,15 +223,16 @@ def check_collides(config, base_dir, astrs, boosts, plate, play, table, settings
 
 
     elif plate.rect.bottom >= plate.screen_rect.bottom:
+        if config['user']['effects']:
+                pygame.mixer.music.load(plate.sounds['bang'])
+                pygame.mixer.music.play()
+
         for boost in boosts:
             if boost.name == 'shield' and boost.is_active:
                 boosts.remove(boost)
+                plate.is_jump = True
                 break
         else:
-            if config['user']['effects']:
-                pygame.mixer.music.load(plate.sounds['bang'])
-                pygame.mixer.music.play()
-
             with open(f'{base_dir}/config/score.csv', 'a') as file:
                 line = ','.join([str(config['score']), config['user']['nick']]) + '\n'
                 file.write(line)
diff --git a/scenes/headpiece/__init__.py b/scenes/headpiece/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/scenes/lobby/__init__.py b/scenes/lobby/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/scenes/settings/__init__.py b/scenes/settings/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/scenes/table/__init__.py b/scenes/table/__init__.py
deleted file mode 100644
index e69de29..0000000