diff --git a/overcooked_simulator/game_content/player_config.yaml b/overcooked_simulator/game_content/player_config.yaml index 4e863b3d5a470b3c094cfb4c75362f96011eeddc..7387659aa3919ca3315269cbe0ca97c3460aac89 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 f2ba8fa3908ed8f859f0e8257d94d2aaa116bcef..47edef81a9d458845866438dca2e7a387d1b7ad5 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)