Merge branch 'develop'

config/config.json

@@ -6,5 +6,5 @@
     "sub_scene": "game",
     "speed": 2,
     "score": 0,
-    "version": "1.0.0"
+    "version": "1.1.0"
 }

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

requirements.txt

@@ -1,3 +1,3 @@
 pygame==1.9.6
-packaging==2.4.7
+packaging==20.4
 requests==2.24.0

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)