diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1c6015b2b2c8ab80d386771bc5fe10fbc3c00d0..4e55859a3894f7b48caeace75d46a4806e467c87 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 88b6bfbcdcca5a92efb88d8e4c8b48f6cc659382..765bf5cb4b978abc408ecd3cdec7acecd9dbc923 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 556080f3de7eccbc827bb77b3e74058b4ef55c64..4e78d2971379c8d37c3e12986baaba68bff09287 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__________#