From 3d2be0fc85a0dc8ee9f2517ae54be3eae5e4b425 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Wed, 3 Jan 2024 15:12:50 +0100
Subject: [PATCH] Actually fixed quit button. Did not quit because threads were
started but never stopped.
---
overcooked_simulator/game_content/player_config.yaml | 2 +-
overcooked_simulator/gui_2d_vis/overcooked_gui.py | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/overcooked_simulator/game_content/player_config.yaml b/overcooked_simulator/game_content/player_config.yaml
index 4e863b3d..7387659a 100644
--- a/overcooked_simulator/game_content/player_config.yaml
+++ b/overcooked_simulator/game_content/player_config.yaml
@@ -1,3 +1,3 @@
radius: 0.4
-move_dist: 0.2
+move_dist: 0.12
interaction_range: 1.6
\ No newline at end of file
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index f2ba8fa3..47edef81 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -96,7 +96,7 @@ class PyGameGUI:
):
self.game_screen = None
self.FPS = 60
- self.simulator = simulator
+ self.simulator: Simulator = simulator
self.player_names = player_names
self.player_keys = player_keys
@@ -579,6 +579,7 @@ class PyGameGUI:
self.simulator.start()
def change_to_start_window(self):
+ self.simulator.stop()
self.menu_state = MenuStates.Start
self.back_button.hide()
self.quit_button.show()
@@ -604,6 +605,7 @@ class PyGameGUI:
self.setup_simulation(config_path, layout_path)
def change_to_end_window(self):
+ self.simulator.stop()
self.menu_state = MenuStates.End
self.start_button.hide()
self.back_button.show()
@@ -686,8 +688,8 @@ class PyGameGUI:
game_screen_rect = self.game_screen.get_rect()
game_screen_rect.center = [
- (self.window_width) // 2,
- (self.window_height) // 2,
+ self.window_width // 2,
+ self.window_height // 2,
]
self.main_window.blit(self.game_screen, game_screen_rect)
--
GitLab