From e96dc3ae7249fe0b41e7fe570c182cd67e7b87b7 Mon Sep 17 00:00:00 2001
From: fheinrich <fheinrich@techfak.de>
Date: Fri, 23 Feb 2024 14:58:22 +0100
Subject: [PATCH] Random seed, fixed buttons on postgamescreen
---
overcooked_simulator/example_study_server.py | 5 ++++-
.../gui_2d_vis/overcooked_gui.py | 17 ++---------------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/overcooked_simulator/example_study_server.py b/overcooked_simulator/example_study_server.py
index 9c1b09d9..faedbe3d 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 f3881f2d..fa005adb 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):
--
GitLab