diff --git a/overcooked_simulator/gui_2d_vis/gui_theme.json b/overcooked_simulator/gui_2d_vis/gui_theme.json
index 37c116f45629adcf8aa960e01ac0bc1a60c0a564..61a517d193ce7132ed8ff734dc3de83c217cf1b6 100644
--- a/overcooked_simulator/gui_2d_vis/gui_theme.json
+++ b/overcooked_simulator/gui_2d_vis/gui_theme.json
@@ -6,7 +6,7 @@
"disabled_bg": "#25292e",
"selected_bg": "#193754",
"dark_bg": "#15191e",
- "normal_text": "#c5cbd8",
+ "normal_text": "#000000",
"hovered_text": "#FFFFFF",
"selected_text": "#FFFFFF",
"disabled_text": "#6d736f",
@@ -95,7 +95,39 @@
},
"#players": {
"colours": {
- "normal_bg": "#fffacd"
+ "dark_bg": "#fffacd",
+ "normal_border": "#fffacd"
+ }
+ },
+ "#players_players": {
+ "colours": {
+ "dark_bg": "#fffacd"
+ }
+ },
+ "#players_bots": {
+ "colours": {
+ "dark_bg": "#fffacd"
+ }
+ },
+ "#number_players_label": {
+ "colours": {
+ "dark_bg": "#fffacd",
+ "normal_text": "#000000"
+ },
+ "font": {
+ "size": 14,
+ "bold": 1
+ }
+ },
+ "#number_bots_label": {
+ "colours": {
+ "dark_bg": "#fffacd",
+ "normal_text": "#000000"
+ },
+ "font": {
+ "size": 14,
+ "bold": 1,
+ "colour": "#000000"
}
}
}
\ No newline at end of file
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
index c50760996cc3092f942ae80fe17ce10453fb1c3d..8437aa59a7a871db4aa1625599d39e91eff125f1 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/overcooked_simulator/gui_2d_vis/overcooked_gui.py
@@ -384,14 +384,16 @@ class PyGameGUI:
object_id="#score_label",
)
+ #######################
+
player_selection_rect = pygame.Rect(
(0, 0),
(
- self.window_width,
- (self.window_height // 2) - (self.buttons_height // 2),
+ self.window_width * 0.9,
+ (self.window_height // 3),
),
)
- player_selection_rect.bottom = 0
+ player_selection_rect.bottom = -10
self.player_selection_container = pygame_gui.elements.UIPanel(
player_selection_rect,
manager=self.manager,
@@ -399,7 +401,7 @@ class PyGameGUI:
anchors={"bottom": "bottom", "centerx": "centerx"},
)
- multiple_keysets_button_rect = pygame.Rect((0, 0), (210, 50))
+ multiple_keysets_button_rect = pygame.Rect((0, 0), (190, 50))
self.multiple_keysets_button = pygame_gui.elements.UIButton(
relative_rect=multiple_keysets_button_rect,
manager=self.manager,
@@ -409,7 +411,7 @@ class PyGameGUI:
object_id="#wasd",
)
- split_players_button_rect = pygame.Rect((0, 0), (210, 50))
+ split_players_button_rect = pygame.Rect((0, 0), (190, 50))
self.split_players_button = pygame_gui.elements.UIButton(
relative_rect=split_players_button_rect,
manager=self.manager,
@@ -423,22 +425,38 @@ class PyGameGUI:
else:
self.split_players_button.hide()
- xbox_controller_button_rect = pygame.Rect((0, 0), (210, 50))
+ xbox_controller_button_rect = pygame.Rect((0, 0), (190, 50))
xbox_controller_button_rect.right = 0
self.xbox_controller_button = pygame_gui.elements.UIButton(
relative_rect=xbox_controller_button_rect,
manager=self.manager,
container=self.player_selection_container,
- text="Use game controller?",
+ text="Controller?",
anchors={"right": "right", "centery": "centery"},
object_id="#controller",
)
+ ########
+ #
+ # panel = pygame_gui.elements.UIPanel(
+ # pygame.Rect((50, 50), (700, 500)),
+ # manager=manager,
+ # anchors={
+ # "left": "left",
+ # "right": "right",
+ # "top": "top",
+ # "bottom": "bottom",
+ # },
+ # )
+
players_container_rect = pygame.Rect(
(0, 0),
- (500, self.player_selection_container.get_abs_rect().height // 3),
+ (
+ self.window_width * 0.6,
+ self.player_selection_container.get_abs_rect().height // 3,
+ ),
)
- self.players_container = pygame_gui.elements.UIPanel(
+ self.player_number_container = pygame_gui.elements.UIPanel(
relative_rect=players_container_rect,
manager=self.manager,
object_id="#players_players",
@@ -448,10 +466,13 @@ class PyGameGUI:
bot_container_rect = pygame.Rect(
(0, 0),
- (500, self.player_selection_container.get_abs_rect().height // 3),
+ (
+ self.window_width * 0.6,
+ self.player_selection_container.get_abs_rect().height // 3,
+ ),
)
bot_container_rect.bottom = 0
- self.bots_container = pygame_gui.elements.UIPanel(
+ self.bot_number_container = pygame_gui.elements.UIPanel(
relative_rect=bot_container_rect,
manager=self.manager,
object_id="#players_bots",
@@ -463,7 +484,8 @@ class PyGameGUI:
self.added_players_label = pygame_gui.elements.UILabel(
number_players_rect,
manager=self.manager,
- container=self.players_container,
+ object_id="#number_players_label",
+ container=self.player_number_container,
text=f"Humans to be added: {self.number_humans_to_be_added}",
anchors={"center": "center"},
)
@@ -472,7 +494,8 @@ class PyGameGUI:
self.added_bots_label = pygame_gui.elements.UILabel(
number_bots_rect,
manager=self.manager,
- container=self.bots_container,
+ object_id="#number_bots_label",
+ container=self.bot_number_container,
text=f"Bots to be added: {self.number_bots_to_be_added}",
anchors={"center": "center"},
)
@@ -485,7 +508,7 @@ class PyGameGUI:
text="+",
manager=self.manager,
object_id="#add_player",
- container=self.players_container,
+ container=self.player_number_container,
anchors={"right": "right", "centery": "centery"},
)
self.add_human_player_button.can_hover()
@@ -497,7 +520,7 @@ class PyGameGUI:
text="-",
manager=self.manager,
object_id="#remove_player",
- container=self.players_container,
+ container=self.player_number_container,
anchors={"left": "left", "centery": "centery"},
)
self.remove_human_button.can_hover()
@@ -509,7 +532,7 @@ class PyGameGUI:
text="+",
manager=self.manager,
object_id="#add_bot",
- container=self.bots_container,
+ container=self.bot_number_container,
anchors={"right": "right", "centery": "centery"},
)
self.add_bot_button.can_hover()
@@ -521,7 +544,7 @@ class PyGameGUI:
text="-",
manager=self.manager,
object_id="#remove_bot",
- container=self.bots_container,
+ container=self.bot_number_container,
anchors={"left": "left", "centery": "centery"},
)
self.remove_bot_button.can_hover()
@@ -725,7 +748,7 @@ class PyGameGUI:
self.menu_state = MenuStates.Start
self.reset_window_size()
- self.reset_gui_values()
+ self.update_selection_elements()
log.debug("Pressed back button")