diff --git a/overcooked_simulator/example_study_server.py b/overcooked_simulator/example_study_server.py index 9c1b09d96d9bac33be79628094b1d3091138184c..faedbe3dc9f4a4398469affd7eff21e2fd0c1e2d 100644 --- a/overcooked_simulator/example_study_server.py +++ b/overcooked_simulator/example_study_server.py @@ -18,6 +18,7 @@ import os import signal import subprocess from pathlib import Path +import random from subprocess import Popen from typing import Tuple, TypedDict @@ -124,6 +125,8 @@ class StudyState: self.current_config: EnvironmentConfig = yaml.load( environment_config, Loader=yaml.Loader ) + seed = int(random.random() * 1000000) + print(seed) creation_json = CreateEnvironmentConfig( manager_id=server_manager_id, number_players=self.study_config["num_players"] + self.study_config["num_bots"], @@ -131,7 +134,7 @@ class StudyState: item_info_config=item_info, environment_config=environment_config, layout_config=layout, - seed=1234567890, + seed=seed, ).model_dump(mode="json") env_info = requests.post( diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py index f3881f2d48c7ac88c9b4cc2e18029717600c5e4e..fa005adba9103c05f6de38fc4fc3a73c8b397fcb 100644 --- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py +++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py @@ -670,18 +670,6 @@ class PyGameGUI: # Game screen ######################################################################## - self.finished_button = pygame_gui.elements.UIButton( - relative_rect=pygame.Rect( - ( - (self.window_width - self.buttons_width), - (self.window_height - self.buttons_height), - ), - (self.buttons_width, self.buttons_height), - ), - text="Finish round", - manager=self.manager, - ) - self.orders_label = pygame_gui.elements.UILabel( text="Orders:", relative_rect=pygame.Rect(0, 0, self.screen_margin, self.screen_margin), @@ -732,9 +720,8 @@ class PyGameGUI: # PostGame screen ######################################################################## - - rect = pygame.Rect((0, 0), (220, 80)) + rect.bottom = -20 self.next_game_button = pygame_gui.elements.UIButton( relative_rect=rect, manager=self.manager, @@ -744,6 +731,7 @@ class PyGameGUI: ) rect = pygame.Rect((0, 0), (220, 80)) + rect.bottom = -20 self.finish_study_button = pygame_gui.elements.UIButton( relative_rect=rect, manager=self.manager, @@ -844,7 +832,6 @@ class PyGameGUI: self.rest = [ self.fullscreen_button, self.quit_button, - self.finished_button, ] def show_screen_elements(self, elements: list):