From 6fb6e6e5544f0e3be3be812660d8bf0644cf901a Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Thu, 22 Feb 2024 10:25:59 +0100
Subject: [PATCH] Fix merge, testing to be done...
---
overcooked_simulator/__main__.py | 14 ++++++++++----
.../game_content/environment_config.yaml | 2 +-
overcooked_simulator/gui_2d_vis/overcooked_gui.py | 14 ++++----------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/overcooked_simulator/__main__.py b/overcooked_simulator/__main__.py
index 668071ae..1520c7e6 100644
--- a/overcooked_simulator/__main__.py
+++ b/overcooked_simulator/__main__.py
@@ -40,7 +40,6 @@ def start_pygame_gui(cli_args):
def main(cli_args=None):
-
study_server = None
study_server_args = None
if USE_STUDY_SERVER:
@@ -93,9 +92,16 @@ def main(cli_args=None):
print("Start PyGame GUI:")
pygame_gui_3 = Process(target=start_pygame_gui, args=(cli_args,))
pygame_gui_3.start()
-
- while pygame_gui.is_alive():
- time.sleep(1)
+ while (
+ pygame_gui.is_alive()
+ and pygame_gui_2.is_alive()
+ and pygame_gui_3.is_alive()
+ ):
+ time.sleep(1)
+
+ else:
+ while pygame_gui.is_alive():
+ time.sleep(1)
except KeyboardInterrupt:
print("Received Keyboard interrupt")
diff --git a/overcooked_simulator/game_content/environment_config.yaml b/overcooked_simulator/game_content/environment_config.yaml
index eadb5b3d..11a443d0 100644
--- a/overcooked_simulator/game_content/environment_config.yaml
+++ b/overcooked_simulator/game_content/environment_config.yaml
@@ -5,7 +5,7 @@ plates:
# range of seconds until the dirty plate arrives.
game:
- time_limit_seconds: 20
+ time_limit_seconds: 12
meals:
all: true
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 802b3b51..74b30586 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -1435,18 +1435,9 @@ class PyGameGUI:
self.reset_window_size()
self.init_ui_elements()
-
self.reset_gui_values()
-
self.update_screen_elements()
- self.reset_window_size()
-
- self.init_ui_elements()
- self.manage_button_visibility()
-
- self.update_selection_elements()
-
# Game loop
self.running = True
# This dict can be left as-is, since pygame will generate a
@@ -1494,7 +1485,10 @@ class PyGameGUI:
]:
self.handle_key_event(event)
- if event.type in [pygame.JOYBUTTONDOWN, pygame.JOYBUTTONUP] and self.menu_state == MenuStates.Game:
+ if (
+ event.type in [pygame.JOYBUTTONDOWN, pygame.JOYBUTTONUP]
+ and self.menu_state == MenuStates.Game
+ ):
self.handle_joy_stick_event(event, joysticks=self.joysticks)
self.manager.process_events(event)
--
GitLab