Merge branch 'main' into 55-environment-has-internal-time-not-datetime-now

overcooked_simulator/game_content/layouts/basic.layout

-#QU#TNLB#
-#_______M
-#_______#
-W________
-#__A__A__
-C________
-C_______#
-#_______X
-#P#S+#S+#
+#QU#T###NLB#
+#__________M
+#__________#
+W___________
+#__A_____A__
+C___________
+C__________#
+#__________X
+#P#S+####S+#
\ No newline at end of file

overcooked_simulator/game_content/layouts/empty.layout

-_____
-_____
-____P
+____
+APA_
+____
\ No newline at end of file

overcooked_simulator/game_content/player_config.yaml

 radius: 0.4
-move_dist: 0.2
+move_dist: 0.12
 interaction_range: 1.6
\ No newline at end of file

overcooked_simulator/gui_2d_vis/gui_theme.json

+{
+  "defaults": {
+    "colours": {
+      "normal_bg": "#45494e",
+      "hovered_bg": "#35393e",
+      "disabled_bg": "#25292e",
+      "selected_bg": "#193754",
+      "dark_bg": "#15191e",
+      "normal_text": "#c5cbd8",
+      "hovered_text": "#FFFFFF",
+      "selected_text": "#FFFFFF",
+      "disabled_text": "#6d736f",
+      "link_text": "#0000EE",
+      "link_hover": "#2020FF",
+      "link_selected": "#551A8B",
+      "text_shadow": "#777777",
+      "normal_border": "#DDDDDD",
+      "hovered_border": "#B0B0B0",
+      "disabled_border": "#808080",
+      "selected_border": "#8080B0",
+      "active_border": "#8080B0",
+      "filled_bar": "#f4251b",
+      "unfilled_bar": "#CCCCCC"
+    }
+  },
+  "button": {
+    "colours": {
+      "normal_bg": "#45494e",
+      "hovered_bg": "#35393e",
+      "disabled_bg": "#25292e",
+      "selected_bg": "#193754",
+      "active_bg": "#193754",
+      "dark_bg": "#15191e",
+      "normal_text": "#c5cbd8",
+      "hovered_text": "#FFFFFF",
+      "selected_text": "#FFFFFF",
+      "disabled_text": "#6d736f",
+      "active_text": "#FFFFFF",
+      "normal_border": "#DDDDDD",
+      "hovered_border": "#B0B0B0",
+      "disabled_border": "#808080",
+      "selected_border": "#8080B0",
+      "active_border": "#8080B0"
+    },
+    "misc": {
+      "tool_tip_delay": "1.5"
+    }
+  }
+}
\ No newline at end of file

overcooked_simulator/pygame_gui/visualization.yaml → overcooked_simulator/gui_2d_vis/visualization.yaml

@@ -3,6 +3,9 @@
 GameWindow:
   WhatIsFixed: window_width  # entweder grid oder window_width
   size: 600
+  screen_margin: 100
+  start_width: 600
+  start_height: 600
 
 Kitchen:
   ground_tiles_color: sgigray76

overcooked_simulator/main.py

@@ -7,7 +7,7 @@ from datetime import datetime
 import pygame
 
 from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.pygame_gui.pygame_gui import PyGameGUI
+from overcooked_simulator.gui_2d_vis.overcooked_gui import PyGameGUI
 from overcooked_simulator.simulation_runner import Simulator
 
 log = logging.getLogger(__name__)
@@ -50,12 +50,9 @@ def main():
         pygame.K_i,
     ]
     keys2 = [pygame.K_a, pygame.K_d, pygame.K_w, pygame.K_s, pygame.K_f, pygame.K_e]
-    gui = PyGameGUI(simulator, [f"p{i}" for i in range(number_player)], [keys1, keys2])
 
-    simulator.start()
+    gui = PyGameGUI(simulator, [f"p{i}" for i in range(number_player)], [keys1, keys2])
     gui.start_pygame()
-
-    simulator.stop()
     sys.exit()
 
 

overcooked_simulator/overcooked_environment.py

@@ -160,7 +160,7 @@ class Environment:
         Args:
             layout_file: Path to the layout file.
         """
-        current_y: float = 1.5
+        current_y: float = 0.5
         counters: list[Counter] = []
         designated_player_positions: list[npt.NDArray] = []
         free_positions: list[npt.NDArray] = []
@@ -173,7 +173,7 @@ class Environment:
 
         for line in lines:
             line = line.replace("\n", "").replace(" ", "")  # remove newline char
-            current_x = 1.5
+            current_x = 0.5
             for character in line:
                 character = character.capitalize()
                 pos = np.array([current_x, current_y])
@@ -193,8 +193,7 @@ class Environment:
                     self.kitchen_width = current_x
             current_y += 1
 
-        self.kitchen_height = int(self.kitchen_height + 2.5)
-        self.kitchen_width = int(self.kitchen_width + 0.5)
+        self.kitchen_width -= 0.5
 
         return counters, designated_player_positions, free_positions
 

overcooked_simulator/simulation_runner.py

@@ -27,7 +27,7 @@ class Simulator(Thread):
 
     def __init__(
         self,
-        env_layout_path,
+        env_config_path,
         layout_path,
         frequency: int,
         item_info_path=ROOT_DIR / "game_content" / "item_info.yaml",
@@ -40,7 +40,7 @@ class Simulator(Thread):
         self.step_frequency: int = frequency
         self.preferred_sleep_time_ns: float = 1e9 / self.step_frequency
         self.env: Environment = Environment(
-            env_layout_path, layout_path, item_info_path
+            env_config_path, layout_path, item_info_path
         )
 
         super().__init__()

setup.py

@@ -10,7 +10,7 @@ with open("README.md") as readme_file:
 with open("CHANGELOG.md") as history_file:
     history = history_file.read()
 
-requirements = ["numpy", "pygame", "scipy", "pytest>=3", "pyyaml"]
+requirements = ["numpy", "pygame", "scipy", "pytest>=3", "pyyaml", "pygame-gui"]
 
 test_requirements = [
     "pytest>=3",