From b2f08ded32b87b8de4677ad26efbc3cf34cdb316 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.uni-bielefeld.de>
Date: Sun, 25 Feb 2024 15:10:03 +0100
Subject: [PATCH] Formatting
---
.../game_content/agents/random_agent.py | 2 +-
.../gui_2d_vis/overcooked_gui.py | 25 +++++++++++++------
2 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/overcooked_simulator/game_content/agents/random_agent.py b/overcooked_simulator/game_content/agents/random_agent.py
index 2b3de5c7..211f4450 100644
--- a/overcooked_simulator/game_content/agents/random_agent.py
+++ b/overcooked_simulator/game_content/agents/random_agent.py
@@ -207,7 +207,7 @@ async def agent():
if not task_type:
task_type = random.choice(["GOTO", "PUT", "INTERACT"])
- threshold = datetime.now() + timedelta(seconds=15.0)
+ threshold = datetime.now() + timedelta(seconds=TIME_TO_STOP_ACTION)
if task_type == "GOTO":
counter_type = random.choice(list(counters.keys()))
task_args = random.choice(counters[counter_type])["pos"]
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index 7a08aeee..4a862e4c 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -793,7 +793,7 @@ class PyGameGUI:
self.fullscreen_button,
self.player_selection_container,
self.bot_number_container,
- self.press_a_image
+ self.press_a_image,
]
self.tutorial_screen_elements = [
@@ -948,7 +948,10 @@ class PyGameGUI:
relative_rect=rect,
manager=self.manager,
object_id="#recipe",
- anchors={"centerx": "centerx", "top_target": self.completed_meals_text_label},
+ anchors={
+ "centerx": "centerx",
+ "top_target": self.completed_meals_text_label,
+ },
)
else:
meal_label = pygame_gui.elements.UILabel(
@@ -956,7 +959,10 @@ class PyGameGUI:
relative_rect=rect,
manager=self.manager,
object_id="#recipe",
- anchors={"centerx": "centerx", "top_target": self.last_completed_meals[idx - 1]},
+ anchors={
+ "centerx": "centerx",
+ "top_target": self.last_completed_meals[idx - 1],
+ },
)
self.last_completed_meals.append(meal_label)
self.all_completed_meals.append(meal_label)
@@ -1137,7 +1143,10 @@ class PyGameGUI:
manager=self.manager,
# container=self.recipes_container,
object_id="#recipe",
- anchors={"centerx": "centerx", "top_target": self.text_recipes_label},
+ anchors={
+ "centerx": "centerx",
+ "top_target": self.text_recipes_label,
+ },
)
else:
recipe_label = pygame_gui.elements.UILabel(
@@ -1149,7 +1158,10 @@ class PyGameGUI:
manager=self.manager,
# container=self.recipes_container,
object_id="#recipe",
- anchors={"centerx": "centerx", "top_target": self.last_recipes_labels[idx-1]},
+ anchors={
+ "centerx": "centerx",
+ "top_target": self.last_recipes_labels[idx - 1],
+ },
)
self.last_recipes_labels.append(recipe_label)
self.all_recipes_labels.append(recipe_label)
@@ -1252,7 +1264,6 @@ class PyGameGUI:
self.state_player_id = player_id
def setup_game(self, tutorial=False):
-
self.connect_websockets()
state = self.request_state()
@@ -1517,11 +1528,9 @@ class PyGameGUI:
case MenuStates.PostGame:
match event.ui_element:
-
case self.next_game_button:
self.button_continue_postgame_pressed()
-
case self.finish_study_button:
self.menu_state = MenuStates.End
--
GitLab