From f536d40e12fd7161e409f51207fdc816197cf0da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Tue, 5 Mar 2024 12:00:23 +0100
Subject: [PATCH] Update CI script and game configurations
Changed the pdoc execution command in the .gitlab-ci.yml to fix the link in the footer text. Adjustments were also made to the layout of the game in the basic.layout and __init__.py files, along with the game, player, and effect configurations. The player speed was reduced, the ability to undo dispenser pickup was added, and the effect
---
.gitlab-ci.yml | 2 +-
cooperative_cuisine/__init__.py | 28 +++++++++++++------
.../configs/layouts/basic.layout | 2 +-
3 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1c6015b..4e55859a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ pages:
- apt-get install -y python3-dev python3-pip graphviz graphviz-dev
- pip install pdoc
- pip install ".[rl]"
- - pdoc --output-dir public cooperative_cuisine !cooperative_cuisine.reinforcement_learning --logo https://gitlab.ub.uni-bielefeld.de/uploads/-/system/project/avatar/6780/Cooking-Vector-Illustration-Icon-Graphics-4267218-1-580x435.jpg --docformat google --favicon overcooked-simulator/cooperative_cuisine/pygame_2d_vis/images/favicon.ico --footer-text "Developed@[SCS](https://scs.techfak.uni-bielefeld.de/)"
+ - pdoc --output-dir public cooperative_cuisine !cooperative_cuisine.reinforcement_learning --logo https://gitlab.ub.uni-bielefeld.de/uploads/-/system/project/avatar/6780/Cooking-Vector-Illustration-Icon-Graphics-4267218-1-580x435.jpg --docformat google --favicon overcooked-simulator/cooperative_cuisine/pygame_2d_vis/images/favicon.ico --footer-text "Developed@<a href="https://scs.techfak.uni-bielefeld.de/">SCS</a>
artifacts:
paths:
- public
diff --git a/cooperative_cuisine/__init__.py b/cooperative_cuisine/__init__.py
index 88b6bfbc..765bf5cb 100644
--- a/cooperative_cuisine/__init__.py
+++ b/cooperative_cuisine/__init__.py
@@ -265,14 +265,14 @@ For example
```
#QU#FO#TNLB#
-#__________M
-#__________K
-W__________I
-#__A_____A_D
+@__________M
+|__________K
+$__________I
+#__A____A__D
C__________E
-C__________G
-#__________#
-#P#S+#X##S+#
+#__________G
+C__________#
+##PS+#X##S+#
```
## Environment Config
@@ -291,6 +291,7 @@ plates:
game:
time_limit_seconds: 300
+ undo_dispenser_pickup: true
meals:
all: true
@@ -308,13 +309,22 @@ layout_chars:
U: Pot # with Stove
T: Tomato
-orders:
+orders: # how to create orders
...
player_config:
radius: 0.4
- speed_units_per_seconds: 8
+ speed_units_per_seconds: 6
interaction_range: 1.6
+ restricted_view: False
+ view_angle: 70
+ view_range: 4 # in grid units, can be "null"
+
+effect_manager: # fire effect
+ ...
+
+extra_setup_functions: # scores, recording, msgs, etc.
+ ...
```
## PyGame Visualization Config
diff --git a/cooperative_cuisine/configs/layouts/basic.layout b/cooperative_cuisine/configs/layouts/basic.layout
index 556080f3..4e78d297 100644
--- a/cooperative_cuisine/configs/layouts/basic.layout
+++ b/cooperative_cuisine/configs/layouts/basic.layout
@@ -2,7 +2,7 @@
@__________M
|__________K
$__________I
-#__A_____A_D
+#__A____A__D
C__________E
#__________G
C__________#
--
GitLab