Fix commits, label for orders

overcooked_simulator/gui_2d_vis/gui_theme.json

@@ -56,7 +56,7 @@
     },
     "font": {
       "size": 20,
-      "bold": 1
+      "bold": 0
     }
   },
   "#score_label": {
@@ -68,6 +68,15 @@
       "bold": 1
     }
   },
+  "#orders_label": {
+    "colours": {
+      "normal_text": "#000000"
+    },
+    "font": {
+      "size": 20,
+      "bold": 0
+    }
+  },
   "#quit_button": {
     "colours": {
       "normal_bg": "#f71b29",

overcooked_simulator/gui_2d_vis/overcooked_gui.py

@@ -550,7 +550,7 @@ class PyGameGUI:
 
     def draw_orders(self, state):
         orders = [
-            "Tomato",
+            "Burger",
             "TomatoSoupPlate",
             "OnionSoupPlate",
             "OnionSoupPlate",
@@ -564,9 +564,8 @@ class PyGameGUI:
             (orders_width, orders_height),
         )
 
-        pygame.draw.rect(
-            self.orders_screen, colors["green"], self.orders_screen.get_rect()
-        )
+        bg_color = colors[self.visualization_config["GameWindow"]["background_color"]]
+        pygame.draw.rect(self.orders_screen, bg_color, self.orders_screen.get_rect())
 
         order_rects_start = (orders_height // 2) - (self.grid_size // 2)
 
@@ -607,6 +606,13 @@ class PyGameGUI:
         ]
         self.main_window.blit(self.orders_screen, orders_rect)
 
+        self.orders_label = pygame_gui.elements.UILabel(
+            text="Orders:",
+            relative_rect=pygame.Rect(0, 0, self.screen_margin, self.screen_margin),
+            manager=self.manager,
+            object_id="#orders_label",
+        )
+
     def draw(self, state):
         """Main visualization function.
 
@@ -871,7 +877,9 @@ class PyGameGUI:
 
                 state = self.simulator.get_state()
 
-                self.main_window.fill(colors["lemonchiffon1"])
+                self.main_window.fill(
+                    colors[self.visualization_config["GameWindow"]["background_color"]]
+                )
                 self.manager.draw_ui(self.main_window)
 
                 match self.menu_state:

overcooked_simulator/gui_2d_vis/visualization.yaml

@@ -12,6 +12,8 @@ GameWindow:
   order_bar_height: 100
   order_size: 50
 
+  background_color: lemonchiffon1
+
 Kitchen:
   ground_tiles_color: sgigray76
   background_lines: gray79