Release 1.2.1

YariKartoshe4ka · Sep 6, 2020 · ed556d2 · ed556d2
2 parents aa933b7 + ea5954c
commit ed556d2
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 24 deletions.
diff --git a/config/config.json b/config/config.json
@@ -6,6 +6,5 @@
     "sub_scene": "game",
     "speed": 2,
     "score": 0,
-    "version": "1.2.0",
-    "color": 0
+    "version": "1.2.1"
 }
diff --git a/main.py b/main.py
@@ -74,6 +74,10 @@ def main():
         elif config['scene'] == 'settings':
             scenes.settings.functions.check_events(config, back_button, play_button, table_button, settings_button, effects_button, full_screen_button, nick_input)
             scenes.settings.functions.update(bg, config, back_button, settings_buttons, nick_input)
+
+            if full_screen_button.state != config['user']['full_screen']:
+                screen = pygame.display.set_mode(config['mode'], pygame.FULLSCREEN * config['user']['full_screen'])
+                full_screen_button.state = config['user']['full_screen']
 
         elif config['scene'] == 'game':
             scenes.game.functions.update(screen, config, base_dir, bg, plate, astrs, boosts, score, end, pause, tick)
@@ -84,19 +88,9 @@ def main():
         if tick >= config['FPS'] * 10:
             tick = 0
 
-
-
         if config.get('debug'):
             print(f'FPS: {clock.get_fps()}', end='\r')
 
-        if full_screen_button.state != config['user']['full_screen']:
-            if config['user']['full_screen']:
-                screen = pygame.display.set_mode(config['mode'], pygame.FULLSCREEN)
-            else:
-                screen = pygame.display.set_mode(config['mode'])
-            full_screen_button.state = config['user']['full_screen']
-
-
         pygame.display.update()
         clock.tick(config['FPS'])
 

diff --git a/updater.py b/updater.py
@@ -20,9 +20,12 @@ def gui(base_dir):
     pygame.display.set_caption('Space Way')
 
     screen_rect = screen.get_rect()
-    font = pygame.font.Font(f'{base_dir}/assets/updater/pixeboy.ttf', 28)
 
-    bg = pygame.image.load(f'{base_dir}/assets/updater/background.bmp')
+    copytree(f'{base_dir}/assets/updater', f'{base_dir}/tmp/updater')
+
+    font = pygame.font.Font(f'{base_dir}/tmp/updater/pixeboy.ttf', 28)
+
+    bg = pygame.image.load(f'{base_dir}/tmp/updater/background.bmp')
     bg_rect = bg.get_rect()
 
     tick = 0
@@ -77,6 +80,7 @@ def install_software_updates(remote_version, base_dir, window):
             zip = get(f'https://github.com/YariKartoshe4ka/Space-Way/archive/{remote_version}.zip')
         except:
             window.terminate()
+            rmtree(f'{base_dir}/tmp')
             Popen(['start', '', f'{base_dir}/Space Way.exe'], shell=True)
             exit()
 
@@ -90,21 +94,17 @@ def install_software_updates(remote_version, base_dir, window):
         with ZipFile(f'{base_dir}/tmp/update.zip') as file:
             file.extractall(f'{base_dir}/tmp/')
 
-        rmtree(f'{base_dir}/assets', ignore_errors=True)
+        rmtree(f'{base_dir}/assets')
         unlink(f'{base_dir}/icon.ico')
         unlink(f'{base_dir}/config/config.json')
 
-        copytree(f'{base_dir}/tmp/Space-Way-{remote_version}/assets',
-                 f'{base_dir}/assets',
-                 ignore=lambda d, f: ['updater'] if 'updater' in f else [],
-                 dirs_exist_ok=True)
+        copytree(f'{base_dir}/tmp/Space-Way-{remote_version}/assets', f'{base_dir}/assets')
 
         copyfile(f'{base_dir}/tmp/Space-Way-{remote_version}/config/config.json', f'{base_dir}/config/config.json')
         copyfile(f'{base_dir}/tmp/Space-Way-{remote_version}/icon.ico', f'{base_dir}/icon.ico')
 
-        rmtree(f'{base_dir}/tmp')
-
         window.terminate()
+        rmtree(f'{base_dir}/tmp')
         Popen(['start', '', f'{base_dir}/Space Way.exe', remote_version, base_dir], shell=True)
         exit()
 
@@ -113,6 +113,7 @@ def install_software_updates(remote_version, base_dir, window):
             zip = get(f'https://github.com/YariKartoshe4ka/Space-Way/archive/{remote_version}.zip')
         except:
             window.terminate()
+            rmtree(f'{base_dir}/tmp')
             Popen(f'python3 "{base_dir}/main.py"', shell=True)
             exit()
 
@@ -136,9 +137,8 @@ def install_software_updates(remote_version, base_dir, window):
         copyfile(f'{base_dir}/tmp/Space-Way-{remote_version}/icon.ico', f'{base_dir}/icon.ico')
         copyfile(f'{base_dir}/tmp/Space-Way-{remote_version}/config/config.json', f'{base_dir}/config/config.json')
 
-        rmtree(f'{base_dir}/tmp')
-
         window.terminate()
+        rmtree(f'{base_dir}/tmp')
         Popen(f'python3 "{base_dir}/main.py"', shell=True)
         exit()
 
@@ -149,4 +149,3 @@ def install_software_updates(remote_version, base_dir, window):
     window = Process(target=gui, args=(base_dir,))
     window.start()
     install_software_updates(remote_version, base_dir, window)
-