Skip to content
Snippets Groups Projects
Commit e96dc3ae authored by fheinrich's avatar fheinrich
Browse files

Random seed, fixed buttons on postgamescreen

parent 5ad17037
No related branches found
No related tags found
1 merge request!62Resolve "Game Flow"
Pipeline #47049 passed
...@@ -18,6 +18,7 @@ import os ...@@ -18,6 +18,7 @@ import os
import signal import signal
import subprocess import subprocess
from pathlib import Path from pathlib import Path
import random
from subprocess import Popen from subprocess import Popen
from typing import Tuple, TypedDict from typing import Tuple, TypedDict
...@@ -124,6 +125,8 @@ class StudyState: ...@@ -124,6 +125,8 @@ class StudyState:
self.current_config: EnvironmentConfig = yaml.load( self.current_config: EnvironmentConfig = yaml.load(
environment_config, Loader=yaml.Loader environment_config, Loader=yaml.Loader
) )
seed = int(random.random() * 1000000)
print(seed)
creation_json = CreateEnvironmentConfig( creation_json = CreateEnvironmentConfig(
manager_id=server_manager_id, manager_id=server_manager_id,
number_players=self.study_config["num_players"] + self.study_config["num_bots"], number_players=self.study_config["num_players"] + self.study_config["num_bots"],
...@@ -131,7 +134,7 @@ class StudyState: ...@@ -131,7 +134,7 @@ class StudyState:
item_info_config=item_info, item_info_config=item_info,
environment_config=environment_config, environment_config=environment_config,
layout_config=layout, layout_config=layout,
seed=1234567890, seed=seed,
).model_dump(mode="json") ).model_dump(mode="json")
env_info = requests.post( env_info = requests.post(
......
...@@ -670,18 +670,6 @@ class PyGameGUI: ...@@ -670,18 +670,6 @@ class PyGameGUI:
# Game screen # 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( self.orders_label = pygame_gui.elements.UILabel(
text="Orders:", text="Orders:",
relative_rect=pygame.Rect(0, 0, self.screen_margin, self.screen_margin), relative_rect=pygame.Rect(0, 0, self.screen_margin, self.screen_margin),
...@@ -732,9 +720,8 @@ class PyGameGUI: ...@@ -732,9 +720,8 @@ class PyGameGUI:
# PostGame screen # PostGame screen
######################################################################## ########################################################################
rect = pygame.Rect((0, 0), (220, 80)) rect = pygame.Rect((0, 0), (220, 80))
rect.bottom = -20
self.next_game_button = pygame_gui.elements.UIButton( self.next_game_button = pygame_gui.elements.UIButton(
relative_rect=rect, relative_rect=rect,
manager=self.manager, manager=self.manager,
...@@ -744,6 +731,7 @@ class PyGameGUI: ...@@ -744,6 +731,7 @@ class PyGameGUI:
) )
rect = pygame.Rect((0, 0), (220, 80)) rect = pygame.Rect((0, 0), (220, 80))
rect.bottom = -20
self.finish_study_button = pygame_gui.elements.UIButton( self.finish_study_button = pygame_gui.elements.UIButton(
relative_rect=rect, relative_rect=rect,
manager=self.manager, manager=self.manager,
...@@ -844,7 +832,6 @@ class PyGameGUI: ...@@ -844,7 +832,6 @@ class PyGameGUI:
self.rest = [ self.rest = [
self.fullscreen_button, self.fullscreen_button,
self.quit_button, self.quit_button,
self.finished_button,
] ]
def show_screen_elements(self, elements: list): def show_screen_elements(self, elements: list):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment