Changed study levels

cooperative_cuisine/configs/environment_config.yaml

@@ -86,7 +86,7 @@ orders:
 player_config:
   radius: 0.4
   speed_units_per_seconds: 6
-  interaction_range: 1.6
+  interaction_range: 1.25
   restricted_view: False
   view_angle: 70
   view_range: 4  # in grid units, can be "null"

cooperative_cuisine/configs/study/study_config.yaml

 levels:
+
   - config_path: CONFIGS_DIR/environment_config.yaml
     layout_path: LAYOUTS_DIR/overcooked-1/1-1-far-apart.layout
     item_info_path: CONFIGS_DIR/item_info.yaml
-    name: "Level 1-1: Far Apart"
+    name: "Level 1"
     config_overwrite:
       game:
         time_limit_seconds: 300
       plates:
         clean_plates: 0
         dirty_plates: 0
+    orders:
+      order_gen_kwargs:
+        order_duration_random_func:
+          kwargs:
+            a: 60
+            b: 70
 
   - config_path: CONFIGS_DIR/environment_config.yaml
-    layout_path: LAYOUTS_DIR/basic.layout
+    layout_path: LAYOUTS_DIR/overcooked-1/1-4-bottleneck.layout
     item_info_path: CONFIGS_DIR/item_info.yaml
-    name: "Basic"
+    name: "Level 2"
     config_overwrite:
       game:
         time_limit_seconds: 300
 
   - config_path: CONFIGS_DIR/environment_config.yaml
-    layout_path: LAYOUTS_DIR/overcooked-1/1-4-bottleneck.layout
+    layout_path: LAYOUTS_DIR/overcooked-1/1-5-circle.layout
     item_info_path: CONFIGS_DIR/item_info.yaml
-    name: "Level 1-4: Bottleneck"
+    name: "Level 3"
     config_overwrite:
-      player_config:
-        restricted_view: true
+      game:
+        time_limit_seconds: 180
       plates:
-        clean_plates: 0
+        clean_plates: 1
         dirty_plates: 0
+        return_dirty: false
+
+  - config_path: CONFIGS_DIR/environment_config.yaml
+    layout_path: LAYOUTS_DIR/overcooked-1/4-1-moving-counters.layout
+    item_info_path: CONFIGS_DIR/item_info.yaml
+    name: "Level 4"
+    config_overwrite:
       game:
         time_limit_seconds: 300
+      plates:
+        clean_plates: 0
+        dirty_plates: 0
 
 
 

cooperative_cuisine/player.py

@@ -133,7 +133,7 @@ class Player:
 
     def update_facing_point(self):
         """Update facing point on the player border circle based on the radius."""
-        self.facing_point = self.pos + (self.facing_direction * 0.6)
+        self.facing_point = self.pos + (self.facing_direction * 0.62)
 
     def can_reach(self, counter: Counter) -> bool:
         """Checks whether the player can reach the counter in question. Simple check if the distance is not larger

cooperative_cuisine/pygame_2d_vis/locales/translations.de.json

@@ -12,7 +12,7 @@
     "continue": "Weiter",
     "salad_recipe": "Rezept für Salat:",
     "recipes_in_this_level": "Rezepte in diesem Level:",
-    "level_name": "Level: %{level}",
+    "level_name": "%{level}",
     "was_served": " wurde serviert",
     "waiting_for_players": "WARTE AUF ANDERE SPIELER",
     "orders": "Bestellungen:",

cooperative_cuisine/pygame_2d_vis/locales/translations.en.json

@@ -12,7 +12,7 @@
     "continue": "Continue",
     "salad_recipe": "Salad recipe:",
     "recipes_in_this_level": "Recipes in this level:",
-    "level_name": "Level: %{level}",
+    "level_name": "%{level}",
     "was_served": " was served",
     "waiting_for_players": "WAITING FOR OTHER PLAYERS",
     "orders": "Orders:",

cooperative_cuisine/pygame_2d_vis/visualization.yaml

 # colors: https://www.webucator.com/article/python-color-constants-module/
 
 Gui:
-  language: "en"
+  language: "de"
   use_player_cook_sprites: True
   show_interaction_range: False
   show_counter_centers: False