diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 09f8704a7125560efe00328a00181bbc8dd16d05..20c922cf496d3f850f66a511a0f29e4c35b6d89c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ pages:
- apt-get install -y python3-dev python3-pip graphviz graphviz-dev
- pip install pdoc
- pip install ".[rl]"
- - pdoc --output-dir public overcooked_simulator !overcooked_simulator.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
+ - 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
artifacts:
paths:
- public
diff --git a/README.md b/README.md
index 7da169c9bb2e36fc85f6e839603ffa27301aadaa..fe1c721bf289d88cbbc4ffb7c9cc49c327e5998c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# Overcooked Simulator
+# Cooperative Cuisine Environment
[Documentation](https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator)
-The real-time overcooked simulation for a cognitive cooperative system.
+The overcooked-like cooperative cuisine environment for real-time human cooperative interactions and artificial agents.
**The name ist still work in progress and we will probably change it.**
@@ -18,7 +18,7 @@ In your `repo`, `PyCharmProjects` or similar directory with the correct environm
```bash
git clone https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator.git
-cd overcooked_simulator
+cd overcooked-simulator
pip install -e .
```
@@ -27,7 +27,7 @@ pip install -e .
Run it via the command line (in your pyenv/conda environment):
```bash
-overcooked-sim --url "localhost" --port 8000
+cooperative_cuisine --url "localhost" --port 8000
```
_The arguments are the defaults. Therefore, they are optional._
@@ -35,15 +35,15 @@ _The arguments are the defaults. Therefore, they are optional._
You can also start the **Game Server** and the **PyGame GUI** individually in different terminals.
```bash
-python3 overcooked_simulator/game_server.py --url "localhost" --port 8000 --manager_ids SECRETKEY1 SECRETKEY2
+python3 cooperative_cuisine/game_server.py --url "localhost" --port 8000 --manager_ids SECRETKEY1 SECRETKEY2
-python3 overcooked_simulator/gui_2d_vis/overcooked_gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY1
+python3 cooperative_cuisine/pygame_2d_vis/gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY1
```
You can start also several GUIs.
```bash
-python3 overcooked_simulator/gui_2d_vis/overcooked_gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY2
+python3 cooperative_cuisine/pygame_2d_vis/gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY2
```
You can replace the GUI with your own GUI (+ study server/matchmaking server).
@@ -53,13 +53,13 @@ You can replace the GUI with your own GUI (+ study server/matchmaking server).
The correct environment needs to be active:
```bash
-pip install overcooked-environment@git+https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator@main
+pip install cooperative_cuisine@git+https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator@main
```
#### Run
You can now use the environment and/or simulator in your python code. Just by importing
-it `import overcooked_environment`
+it `import cooperative_cuisine`
## Configuration
diff --git a/conda.recipe/meta.yml b/conda.recipe/meta.yml
index b654f9f3fa208a7d5a9c6ca5b73735639111a201..40752589ae557189d727cf3cb7e7c48864a9de6f 100644
--- a/conda.recipe/meta.yml
+++ b/conda.recipe/meta.yml
@@ -1,8 +1,8 @@
-{% set data = load_setup_py_data() %}
+{ % set data = load_setup_py_data() % }
package:
- name: overcooked-simulator
- version: {{ data['version'] }}
+ name: cooperative_cuisine
+ version: { { data[ 'version' ] } }
source:
path: ..
@@ -12,10 +12,10 @@ build:
# separate bld.bat and build.sh files instead of this key. Add the line
# "skip: True # [py<35]" (for example) to limit to Python 3.5 and newer, or
# "skip: True # [not win]" to limit to Windows.
- script: {{ PYTHON }} -m pip install --no-deps --ignore-installed -vv .
+ script: { { PYTHON } } -m pip install --no-deps --ignore-installed -vv .
noarch: python
-
-
+
+
requirements:
# if you need compilers, uncomment these
@@ -28,9 +28,9 @@ requirements:
run:
- python
# dependencies are defined in setup.py
- {% for dep in data['install_requires'] %}
- - {{ dep.lower() }}
- {% endfor %}
+ { % for dep in data[ 'install_requires' ] % }
+ - { { dep.lower() } }
+ { % endfor % }
test:
source_files:
@@ -43,6 +43,6 @@ test:
about:
home: https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator
- summary: The real-time overcooked simulation for a cognitive cooperative system
- license: {{ data.get('license') }}
+ summary: A overcooked-like environment for a cognitive cooperative system (also in real-time)
+ license: { { data.get('license') } }
license_file: LICENSE
\ No newline at end of file
diff --git a/overcooked_simulator/__init__.py b/cooperative_cuisine/__init__.py
similarity index 86%
rename from overcooked_simulator/__init__.py
rename to cooperative_cuisine/__init__.py
index a54a47be9ba8caf5bc4717b8d69029a6c7561eb2..ba4ea0fc2df0f3a1e5417fcf0161966f7fcbd195 100644
--- a/overcooked_simulator/__init__.py
+++ b/cooperative_cuisine/__init__.py
@@ -1,6 +1,6 @@
"""
-This is the documentation of the Overcooked Simulator.
+This is the documentation of CooperativeCuisine.
# About the package
@@ -15,7 +15,7 @@ players in a more "real-time"-like environment. They all mostly differ in the vi
like overcooked-ai, ... are most well-known in the community. But more visually appealing 3D versions for cooperation with
humans are getting developed more frequently (cite,...). Besides, the general adaptations of the original overcooked
game.
-With this Overcooked simulator, we want to bring both worlds together: the reinforcement learning and real-time playable
+CooperativeCuisine, we want to bring both worlds together: the reinforcement learning and real-time playable
environment with an appealing visualisation. Enable the potential of developing artificial agents that play with humans
like a "real", cooperative, human partner.
@@ -23,17 +23,17 @@ like a "real", cooperative, human partner.
You need a Python **3.10** or newer environment.
```bash
-pip install overcooked-environment@git+https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator@main
+pip install cooperative_cuisine@git+https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator@main
```
Or clone it and install it as an editable library which allows you to use all the scripts directly.
```bash
git clone https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator.git
-cd overcooked_simulator
+cd overcooked-simulator
pip install -e .
```
# Usage / Examples
- Our overcooked simulator is designed for real time interaction but also for reinforcement
+ Our Cooperative Cuisine is designed for real time interaction but also for reinforcement
learning (gymnasium environment) with time independent step function calls. It focuses on configurability, extensibility and appealing visualization
options.
@@ -41,7 +41,7 @@ options.
Run it via the command line (in your pyenv/conda environment):
```bash
-overcooked-sim --url "localhost" --port 8000
+cooperative_cuisine --url "localhost" --port 8000
```
*The arguments shown are the defaults.*
@@ -49,9 +49,9 @@ overcooked-sim --url "localhost" --port 8000
You can also start the **Game Server** and the **PyGame GUI** individually in different terminals.
```bash
-python3 overcooked_simulator/game_server.py --url "localhost" --port 8000 --manager_ids SECRETKEY1 SECRETKEY2
+python3 cooperative_cuisine/game_server.py --url "localhost" --port 8000 --manager_ids SECRETKEY1 SECRETKEY2
-python3 overcooked_simulator/gui_2d_vis/overcooked_gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY1
+python3 cooperative_cuisine/pygame_2d_vis/gui.py --url "localhost" --port 8000 --manager_ids SECRETKEY1
```
## Connect with agent and receive game state
@@ -61,16 +61,16 @@ To start a game server see above. Your own manager needs to create an environmen
```python
import requests
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.game_server import CreateEnvironmentConfig
-from overcooked_simulator.server_results import CreateEnvResult
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.game_server import CreateEnvironmentConfig
+from cooperative_cuisine.server_results import CreateEnvResult
-with open(ROOT_DIR / "game_content" / "item_info.yaml", "r") as file:
+with open(ROOT_DIR / "configs" / "item_info.yaml", "r") as file:
item_info = file.read()
-with open(ROOT_DIR / "game_content" / "layouts" / "basic.layout", "r") as file:
+with open(ROOT_DIR / "configs" / "layouts" / "basic.layout", "r") as file:
layout = file.read()
-with open(ROOT_DIR / "game_content" / "environment_config.yaml", "r") as file:
+with open(ROOT_DIR / "configs" / "environment_config.yaml", "r") as file:
environment_config = file.read()
create_env = CreateEnvironmentConfig(
@@ -94,8 +94,8 @@ import json
import dataclasses
from websockets import connect
-from overcooked_simulator.overcooked_environment import Action, ActionType, InterActionData
-from overcooked_simulator.utils import custom_asdict_factory
+from cooperative_cuisine.environment import Action, ActionType, InterActionData
+from cooperative_cuisine.utils import custom_asdict_factory
p1_websocket = connect("ws://localhost:8000/ws/player/" + env_info["player_info"]["0"]["client_id"])
@@ -154,19 +154,19 @@ requests.post(
```
## Direct integration into your code
-You can use the `overcooked_simulator.overcooked_environment.Environment` class
+You can use the `cooperative_cuisine.environment.Environment` class
and call the `step`, `get_json_state`, and `perform_action` methods directly.
```python
from datetime import timedelta
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.overcooked_environment import Action, Environment
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import Action, Environment
env = Environment(
- env_config=ROOT_DIR / "game_content" / "environment_config.yaml",
- layout_config=ROOT_DIR / "game_content" / "layouts" / "basic.layout",
- item_info=ROOT_DIR / "game_content" / "item_info.yaml"
+ env_config=ROOT_DIR / "configs" / "environment_config.yaml",
+ layout_config=ROOT_DIR / "configs" / "layouts" / "basic.layout",
+ item_info=ROOT_DIR / "configs" / "item_info.yaml"
)
env.add_player("0")
@@ -194,15 +194,15 @@ Should look like
{'$defs': {'CookingEquipmentState': {'properties': {'content_list': {'items': {'$ref': '#/$defs/ItemState'}, 'title': 'Content List', 'type': 'array'}, 'content_ready': {'anyOf': [{'$ref': '#/$defs/ItemState'}, {'type': 'null'}]}}, 'required': ['content_list', 'content_ready'], 'title': 'CookingEquipmentState', 'type': 'object'}, 'CounterState': {'properties': {'id': {'title': 'Id', 'type': 'string'}, 'category': {'const': 'Counter', 'title': 'Category'}, 'type': {'title': 'Type', 'type': 'string'}, 'pos': {'items': {'type': 'number'}, 'title': 'Pos', 'type': 'array'}, 'occupied_by': {'anyOf': [{'items': {'anyOf': [{'$ref': '#/$defs/ItemState'}, {'$ref': '#/$defs/CookingEquipmentState'}]}, 'type': 'array'}, {'$ref': '#/$defs/ItemState'}, {'$ref': '#/$defs/CookingEquipmentState'}, {'type': 'null'}], 'title': 'Occupied By'}}, 'required': ['id', 'category', 'type', 'pos', 'occupied_by'], 'title': 'CounterState', 'type': 'object'}, 'ItemState': {'properties': {'id': {'title': 'Id', 'type': 'string'}, 'category': {'anyOf': [{'const': 'Item'}, {'const': 'ItemCookingEquipment'}], 'title': 'Category'}, 'type': {'title': 'Type', 'type': 'string'}, 'progress_percentage': {'anyOf': [{'type': 'number'}, {'type': 'integer'}], 'title': 'Progress Percentage'}}, 'required': ['id', 'category', 'type', 'progress_percentage'], 'title': 'ItemState', 'type': 'object'}, 'KitchenInfo': {'properties': {'width': {'title': 'Width', 'type': 'number'}, 'height': {'title': 'Height', 'type': 'number'}}, 'required': ['width', 'height'], 'title': 'KitchenInfo', 'type': 'object'}, 'OrderState': {'properties': {'id': {'title': 'Id', 'type': 'string'}, 'category': {'const': 'Order', 'title': 'Category'}, 'meal': {'title': 'Meal', 'type': 'string'}, 'start_time': {'format': 'date-time', 'title': 'Start Time', 'type': 'string'}, 'max_duration': {'title': 'Max Duration', 'type': 'number'}}, 'required': ['id', 'category', 'meal', 'start_time', 'max_duration'], 'title': 'OrderState', 'type': 'object'}, 'PlayerState': {'properties': {'id': {'title': 'Id', 'type': 'string'}, 'pos': {'items': {'type': 'number'}, 'title': 'Pos', 'type': 'array'}, 'facing_direction': {'items': {'type': 'number'}, 'title': 'Facing Direction', 'type': 'array'}, 'holding': {'anyOf': [{'$ref': '#/$defs/ItemState'}, {'$ref': '#/$defs/CookingEquipmentState'}, {'type': 'null'}], 'title': 'Holding'}, 'current_nearest_counter_pos': {'anyOf': [{'items': {'type': 'number'}, 'type': 'array'}, {'type': 'null'}], 'title': 'Current Nearest Counter Pos'}, 'current_nearest_counter_id': {'anyOf': [{'type': 'string'}, {'type': 'null'}], 'title': 'Current Nearest Counter Id'}}, 'required': ['id', 'pos', 'facing_direction', 'holding', 'current_nearest_counter_pos', 'current_nearest_counter_id'], 'title': 'PlayerState', 'type': 'object'}}, 'properties': {'players': {'items': {'$ref': '#/$defs/PlayerState'}, 'title': 'Players', 'type': 'array'}, 'counters': {'items': {'$ref': '#/$defs/CounterState'}, 'title': 'Counters', 'type': 'array'}, 'kitchen': {'$ref': '#/$defs/KitchenInfo'}, 'score': {'anyOf': [{'type': 'number'}, {'type': 'integer'}], 'title': 'Score'}, 'orders': {'items': {'$ref': '#/$defs/OrderState'}, 'title': 'Orders', 'type': 'array'}, 'ended': {'title': 'Ended', 'type': 'boolean'}, 'env_time': {'format': 'date-time', 'title': 'Env Time', 'type': 'string'}, 'remaining_time': {'title': 'Remaining Time', 'type': 'number'}}, 'required': ['players', 'counters', 'kitchen', 'score', 'orders', 'ended', 'env_time', 'remaining_time'], 'title': 'StateRepresentation', 'type': 'object'}
```
-The BaseModel and TypedDicts can be found in `overcooked_simulator.state_representation`. The
-`overcooked_simulator.state_representation.StateRepresentation` represents the json state that the `get_json_state`
+The BaseModel and TypedDicts can be found in `cooperative_cuisine.state_representation`. The
+`cooperative_cuisine.state_representation.StateRepresentation` represents the json state that the `get_json_state`
returns.
## Generate images from JSON states
You might have stored some json states and now you want to visualize them via the
pygame-2d visualization. You can do that by running the `drawing.py` script and referencing a json file.
```bash
-python3 overcooked_simulator/gui_2d_vis/drawing.py --state my_state.json
+python3 cooperative_cuisine/pygame_2d_vis/drawing.py --state my_state.json
```
- You can specify a different visualization config with `-v` or `--visualization_config`.
- You can specify the name of the output file with `-o` or `--output_file`. The default is `screenshot.jpg`.
@@ -345,8 +345,8 @@ from pathlib import Path
ROOT_DIR = Path(os.path.dirname(os.path.abspath(__file__))) # This is your Project Root
"""A path variable to get access to the layouts coming with the package. For example,
```python
-from overcooked_simulator import ROOT_DIR
+from cooperative_cuisine import ROOT_DIR
-environment_config_path = ROOT_DIR / "game_content" / "environment_config.yaml"
+environment_config_path = ROOT_DIR / "configs" / "environment_config.yaml"
```
"""
diff --git a/overcooked_simulator/__main__.py b/cooperative_cuisine/__main__.py
similarity index 92%
rename from overcooked_simulator/__main__.py
rename to cooperative_cuisine/__main__.py
index e9f482697cb32b3831fa1db872ffce38a1c17584..6c067da2020b3b758b03c83f9abfdbf8da1d4eae 100644
--- a/overcooked_simulator/__main__.py
+++ b/cooperative_cuisine/__main__.py
@@ -2,7 +2,7 @@ import argparse
import time
from multiprocessing import Process
-from overcooked_simulator.utils import (
+from cooperative_cuisine.utils import (
url_and_port_arguments,
disable_websocket_logging_arguments,
add_list_of_manager_ids_arguments,
@@ -12,13 +12,13 @@ USE_STUDY_SERVER = True
def start_game_server(cli_args):
- from overcooked_simulator.game_server import main
+ from cooperative_cuisine.game_server import main
main(cli_args.game_url, cli_args.game_port, cli_args.manager_ids)
def start_study_server(cli_args):
- from overcooked_simulator.study_server import main
+ from cooperative_cuisine.study_server import main
main(
cli_args.study_url,
@@ -30,7 +30,7 @@ def start_study_server(cli_args):
def start_pygame_gui(cli_args):
- from overcooked_simulator.gui_2d_vis.overcooked_gui import main
+ from cooperative_cuisine.pygame_2d_vis.gui import main
main(
cli_args.study_url,
@@ -46,7 +46,7 @@ def main(cli_args=None):
study_server = None
parser = argparse.ArgumentParser(
- prog="Overcooked Simulator",
+ prog="Cooperative Cuisine",
description="Game Engine Server + PyGameGUI: Starts overcooked game engine server and a PyGame 2D Visualization window in two processes.",
epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
)
diff --git a/overcooked_simulator/game_content/agents/arch_config.yml b/cooperative_cuisine/configs/agents/arch_config.yml
similarity index 100%
rename from overcooked_simulator/game_content/agents/arch_config.yml
rename to cooperative_cuisine/configs/agents/arch_config.yml
diff --git a/overcooked_simulator/game_content/agents/random_agent.py b/cooperative_cuisine/configs/agents/random_agent.py
similarity index 98%
rename from overcooked_simulator/game_content/agents/random_agent.py
rename to cooperative_cuisine/configs/agents/random_agent.py
index 211f4450de4b35a98a8f58f2733784752fa5056d..1c36a303bdfd238d4ef0c6c41a06aed8c3c21436 100644
--- a/overcooked_simulator/game_content/agents/random_agent.py
+++ b/cooperative_cuisine/configs/agents/random_agent.py
@@ -10,12 +10,12 @@ from datetime import datetime, timedelta
import numpy as np
from websockets import connect
-from overcooked_simulator.overcooked_environment import (
+from cooperative_cuisine.environment import (
ActionType,
Action,
InterActionData,
)
-from overcooked_simulator.utils import custom_asdict_factory
+from cooperative_cuisine.utils import custom_asdict_factory
TIME_TO_STOP_ACTION = 3.0
diff --git a/overcooked_simulator/game_content/agents/run_config.yml b/cooperative_cuisine/configs/agents/run_config.yml
similarity index 100%
rename from overcooked_simulator/game_content/agents/run_config.yml
rename to cooperative_cuisine/configs/agents/run_config.yml
diff --git a/overcooked_simulator/game_content/environment_config.yaml b/cooperative_cuisine/configs/environment_config.yaml
similarity index 69%
rename from overcooked_simulator/game_content/environment_config.yaml
rename to cooperative_cuisine/configs/environment_config.yaml
index b8992bb5ad8199ac071e0d712db987fceb754124..d589789dcb43f573f2cc9fa212845b880399873c 100644
--- a/overcooked_simulator/game_content/environment_config.yaml
+++ b/cooperative_cuisine/configs/environment_config.yaml
@@ -55,8 +55,8 @@ layout_chars:
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
@@ -90,7 +90,7 @@ player_config:
effect_manager:
FireManager:
- class: !!python/name:overcooked_simulator.effect_manager.FireEffectManager ''
+ class: !!python/name:cooperative_cuisine.effect_manager.FireEffectManager ''
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
@@ -99,10 +99,10 @@ effect_manager:
extra_setup_functions:
# # --------------- Scoring ---------------
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 20
score_on_specific_kwarg: meal_name
@@ -112,69 +112,69 @@ extra_setup_functions:
Salad: 5
TomatoSoup: 10
not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 2
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -5
expired_orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_expired ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -10
# # --------------- Recording ---------------
# json_states:
- # func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ # func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ json_state ]
- # callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ # callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
# callback_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
random_env_events:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
# info_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ cutting_board_100 ]
-# callback_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# callback_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# callback_class_kwargs:
# msg: Glückwunsch du hast was geschnitten!
# fire_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ new_fire ]
-# callback_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# callback_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# callback_class_kwargs:
# msg: Feuer, Feuer, Feuer
# level: Warning
diff --git a/overcooked_simulator/game_content/item_info.yaml b/cooperative_cuisine/configs/item_info.yaml
similarity index 100%
rename from overcooked_simulator/game_content/item_info.yaml
rename to cooperative_cuisine/configs/item_info.yaml
diff --git a/overcooked_simulator/game_content/item_info_debug.yaml b/cooperative_cuisine/configs/item_info_debug.yaml
similarity index 100%
rename from overcooked_simulator/game_content/item_info_debug.yaml
rename to cooperative_cuisine/configs/item_info_debug.yaml
diff --git a/overcooked_simulator/game_content/layouts/basic.layout b/cooperative_cuisine/configs/layouts/basic.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/basic.layout
rename to cooperative_cuisine/configs/layouts/basic.layout
diff --git a/overcooked_simulator/game_content/layouts/empty.layout b/cooperative_cuisine/configs/layouts/empty.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/empty.layout
rename to cooperative_cuisine/configs/layouts/empty.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-1-far-apart.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-1-far-apart.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-1-far-apart.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-1-far-apart.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-2-pedestrians.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-2-pedestrians.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-2-pedestrians.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-2-pedestrians.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-3-moving-counters.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-3-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-3-moving-counters.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-3-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-4-bottleneck.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-4-bottleneck.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-4-bottleneck.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-4-bottleneck.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-5-circle.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-5-circle.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-5-circle.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-5-circle.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/1-6-raising-platforms.layout b/cooperative_cuisine/configs/layouts/overcooked-1/1-6-raising-platforms.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/1-6-raising-platforms.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/1-6-raising-platforms.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-1-moving-trucks.layout b/cooperative_cuisine/configs/layouts/overcooked-1/2-1-moving-trucks.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-1-moving-trucks.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/2-1-moving-trucks.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-2-rats.layout b/cooperative_cuisine/configs/layouts/overcooked-1/2-2-rats.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-2-rats.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/2-2-rats.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-3-separated-conveyors.layout b/cooperative_cuisine/configs/layouts/overcooked-1/2-3-separated-conveyors.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-3-separated-conveyors.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/2-3-separated-conveyors.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/2-4-separated-2.layout b/cooperative_cuisine/configs/layouts/overcooked-1/2-4-separated-2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/2-4-separated-2.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/2-4-separated-2.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-1-ice.layout b/cooperative_cuisine/configs/layouts/overcooked-1/3-1-ice.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-1-ice.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/3-1-ice.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-2-separated-moving-counters.layout b/cooperative_cuisine/configs/layouts/overcooked-1/3-2-separated-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-2-separated-moving-counters.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/3-2-separated-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-3-moving-trucks-2.layout b/cooperative_cuisine/configs/layouts/overcooked-1/3-3-moving-trucks-2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-3-moving-trucks-2.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/3-3-moving-trucks-2.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/3-4-ice-moving-platforms.layout b/cooperative_cuisine/configs/layouts/overcooked-1/3-4-ice-moving-platforms.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/3-4-ice-moving-platforms.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/3-4-ice-moving-platforms.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-1-moving-counters.layout b/cooperative_cuisine/configs/layouts/overcooked-1/4-1-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-1-moving-counters.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/4-1-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-2-dark.layout b/cooperative_cuisine/configs/layouts/overcooked-1/4-2-dark.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-2-dark.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/4-2-dark.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-3-moving-counters.layout b/cooperative_cuisine/configs/layouts/overcooked-1/4-3-moving-counters.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-3-moving-counters.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/4-3-moving-counters.layout
diff --git a/overcooked_simulator/game_content/layouts/overcooked-1/4-4-moving-counters-separated.layout b/cooperative_cuisine/configs/layouts/overcooked-1/4-4-moving-counters-separated.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/overcooked-1/4-4-moving-counters-separated.layout
rename to cooperative_cuisine/configs/layouts/overcooked-1/4-4-moving-counters-separated.layout
diff --git a/overcooked_simulator/game_content/layouts/rl_small.layout b/cooperative_cuisine/configs/layouts/rl_small.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/rl_small.layout
rename to cooperative_cuisine/configs/layouts/rl_small.layout
diff --git a/overcooked_simulator/game_content/layouts/tutorial.layout b/cooperative_cuisine/configs/layouts/tutorial.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/tutorial.layout
rename to cooperative_cuisine/configs/layouts/tutorial.layout
diff --git a/overcooked_simulator/game_content/layouts/zztest_layouts/godot_test_layout.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/godot_test_layout.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/zztest_layouts/godot_test_layout.layout
rename to cooperative_cuisine/configs/layouts/zztest_layouts/godot_test_layout.layout
diff --git a/overcooked_simulator/game_content/layouts/zztest_layouts/test1.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/test1.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/zztest_layouts/test1.layout
rename to cooperative_cuisine/configs/layouts/zztest_layouts/test1.layout
diff --git a/overcooked_simulator/game_content/layouts/zztest_layouts/test2.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/test2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/zztest_layouts/test2.layout
rename to cooperative_cuisine/configs/layouts/zztest_layouts/test2.layout
diff --git a/overcooked_simulator/game_content/layouts/zztest_layouts/test3.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/test3.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/zztest_layouts/test3.layout
rename to cooperative_cuisine/configs/layouts/zztest_layouts/test3.layout
diff --git a/overcooked_simulator/game_content/layouts/zztest_layouts/test4.layout b/cooperative_cuisine/configs/layouts/zztest_layouts/test4.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts/zztest_layouts/test4.layout
rename to cooperative_cuisine/configs/layouts/zztest_layouts/test4.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/godot_test_layout.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/godot_test_layout.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/godot_test_layout.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/godot_test_layout.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/large.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/large.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/large.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/large.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/large_t.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/large_t.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/large_t.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/large_t.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/rot_test.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/rot_test.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/rot_test.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/rot_test.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/split.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/split.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/split.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/split.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/test1.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/test1.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/test1.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/test1.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/test2.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/test2.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/test2.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/test2.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/test3.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/test3.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/test3.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/test3.layout
diff --git a/overcooked_simulator/game_content/layouts_archive/test_layouts/test4.layout b/cooperative_cuisine/configs/layouts_archive/test_layouts/test4.layout
similarity index 100%
rename from overcooked_simulator/game_content/layouts_archive/test_layouts/test4.layout
rename to cooperative_cuisine/configs/layouts_archive/test_layouts/test4.layout
diff --git a/overcooked_simulator/game_content/study/level1/level1_config.yaml b/cooperative_cuisine/configs/study/level1/level1_config.yaml
similarity index 69%
rename from overcooked_simulator/game_content/study/level1/level1_config.yaml
rename to cooperative_cuisine/configs/study/level1/level1_config.yaml
index fd759ffea31052e2b8a10f030351ec9dc649903d..404b54fd1d43899c773914f3fb94a7cf494a34e3 100644
--- a/overcooked_simulator/game_content/study/level1/level1_config.yaml
+++ b/cooperative_cuisine/configs/study/level1/level1_config.yaml
@@ -6,6 +6,7 @@ plates:
game:
time_limit_seconds: 300
+ undo_dispenser_pickup: true
meals:
all: false
@@ -54,8 +55,8 @@ layout_chars:
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
@@ -89,7 +90,7 @@ player_config:
effect_manager:
FireManager:
- class: !!python/name:overcooked_simulator.effect_manager.FireEffectManager ''
+ class: !!python/name:cooperative_cuisine.effect_manager.FireEffectManager ''
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
@@ -98,10 +99,10 @@ effect_manager:
extra_setup_functions:
# # --------------- Scoring ---------------
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 20
score_on_specific_kwarg: meal_name
@@ -111,69 +112,69 @@ extra_setup_functions:
Salad: 5
TomatoSoup: 10
not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 2
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -5
expired_orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_expired ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -10
# # --------------- Recording ---------------
# json_states:
- # func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ # func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ json_state ]
- # callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ # callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
# callback_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
random_env_events:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
# info_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ cutting_board_100 ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Glückwunsch du hast was geschnitten!
# fire_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ new_fire ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Feuer, Feuer, Feuer
# level: Warning
diff --git a/overcooked_simulator/game_content/study/level1/level1_item_info.yaml b/cooperative_cuisine/configs/study/level1/level1_item_info.yaml
similarity index 100%
rename from overcooked_simulator/game_content/study/level1/level1_item_info.yaml
rename to cooperative_cuisine/configs/study/level1/level1_item_info.yaml
diff --git a/overcooked_simulator/game_content/study/level2/level2_config.yaml b/cooperative_cuisine/configs/study/level2/level2_config.yaml
similarity index 68%
rename from overcooked_simulator/game_content/study/level2/level2_config.yaml
rename to cooperative_cuisine/configs/study/level2/level2_config.yaml
index f1fdbdd4dd29a88bc2967ef3b7da8bafb6e92909..918a653361e4e3ef1d3c1eef99319dcd44de4288 100644
--- a/overcooked_simulator/game_content/study/level2/level2_config.yaml
+++ b/cooperative_cuisine/configs/study/level2/level2_config.yaml
@@ -6,6 +6,8 @@ plates:
game:
time_limit_seconds: 300
+ undo_dispenser_pickup: true
+
meals:
all: false
@@ -52,8 +54,8 @@ layout_chars:
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
@@ -87,7 +89,7 @@ player_config:
effect_manager:
FireManager:
- class: !!python/name:overcooked_simulator.effect_manager.FireEffectManager ''
+ class: !!python/name:cooperative_cuisine.effect_manager.FireEffectManager ''
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
@@ -96,10 +98,10 @@ effect_manager:
extra_setup_functions:
# # --------------- Scoring ---------------
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 20
score_on_specific_kwarg: meal_name
@@ -109,69 +111,69 @@ extra_setup_functions:
Salad: 5
TomatoSoup: 10
not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 2
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -5
expired_orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_expired ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -10
# # --------------- Recording ---------------
# json_states:
- # func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ # func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ json_state ]
- # callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ # callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
# callback_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
random_env_events:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
# info_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ cutting_board_100 ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Glückwunsch du hast was geschnitten!
# fire_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ new_fire ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Feuer, Feuer, Feuer
# level: Warning
diff --git a/overcooked_simulator/game_content/study/level2/level2_item_info.yaml b/cooperative_cuisine/configs/study/level2/level2_item_info.yaml
similarity index 100%
rename from overcooked_simulator/game_content/study/level2/level2_item_info.yaml
rename to cooperative_cuisine/configs/study/level2/level2_item_info.yaml
diff --git a/overcooked_simulator/game_content/study/study_config.yaml b/cooperative_cuisine/configs/study/study_config.yaml
similarity index 91%
rename from overcooked_simulator/game_content/study/study_config.yaml
rename to cooperative_cuisine/configs/study/study_config.yaml
index e270381d99f1818f6d11ad6b1d57bf2835834628..e20ee61ff83613bd758ea6d6b5406ed2b640067b 100644
--- a/overcooked_simulator/game_content/study/study_config.yaml
+++ b/cooperative_cuisine/configs/study/study_config.yaml
@@ -1,4 +1,4 @@
-# Config paths are relative to game_content folder.
+# Config paths are relative to configs folder.
# Layout files are relative to layouts folder.
diff --git a/overcooked_simulator/game_content/tutorial_env_config.yaml b/cooperative_cuisine/configs/tutorial_env_config.yaml
similarity index 69%
rename from overcooked_simulator/game_content/tutorial_env_config.yaml
rename to cooperative_cuisine/configs/tutorial_env_config.yaml
index 8bc237910e6286a37732aacf0a8ecc61484f1e85..1a41ba318239c52e435ae32ad9bdd34d34de6c6e 100644
--- a/overcooked_simulator/game_content/tutorial_env_config.yaml
+++ b/cooperative_cuisine/configs/tutorial_env_config.yaml
@@ -52,8 +52,8 @@ layout_chars:
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
@@ -87,7 +87,7 @@ player_config:
effect_manager:
FireManager:
- class: !!python/name:overcooked_simulator.effect_manager.FireEffectManager ''
+ class: !!python/name:cooperative_cuisine.effect_manager.FireEffectManager ''
kwargs:
spreading_duration: [ 5, 10 ]
fire_burns_ingredients_and_meals: true
@@ -96,10 +96,10 @@ effect_manager:
extra_setup_functions:
# # --------------- Scoring ---------------
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 20
score_on_specific_kwarg: meal_name
@@ -109,69 +109,69 @@ extra_setup_functions:
Salad: 5
TomatoSoup: 10
not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 2
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -5
expired_orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_expired ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -10
# # --------------- Recording ---------------
# json_states:
- # func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ # func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ json_state ]
- # callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ # callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
# callback_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
random_env_events:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
# info_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ cutting_board_100 ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Glückwunsch du hast was geschnitten!
# fire_msg:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ new_fire ]
-# log_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+# log_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
# log_class_kwargs:
# msg: Feuer, Feuer, Feuer
# level: Warning
diff --git a/overcooked_simulator/counter_factory.py b/cooperative_cuisine/counter_factory.py
similarity index 96%
rename from overcooked_simulator/counter_factory.py
rename to cooperative_cuisine/counter_factory.py
index 18db7d2255cbed070b5ac0e6d361c979d58414ad..2dc90d33f9ef70c837f042b1e991304f732bfe6a 100644
--- a/overcooked_simulator/counter_factory.py
+++ b/cooperative_cuisine/counter_factory.py
@@ -39,7 +39,7 @@ from typing import Any, Type, TypeVar
import numpy as np
import numpy.typing as npt
-from overcooked_simulator.counters import (
+from cooperative_cuisine.counters import (
Counter,
CookingCounter,
Dispenser,
@@ -51,17 +51,17 @@ from overcooked_simulator.counters import (
SinkAddon,
Trashcan,
)
-from overcooked_simulator.effect_manager import EffectManager
-from overcooked_simulator.game_items import (
+from cooperative_cuisine.effect_manager import EffectManager
+from cooperative_cuisine.game_items import (
ItemInfo,
ItemType,
CookingEquipment,
Plate,
Item,
)
-from overcooked_simulator.hooks import Hooks
-from overcooked_simulator.order import OrderManager
-from overcooked_simulator.utils import get_closest
+from cooperative_cuisine.hooks import Hooks
+from cooperative_cuisine.orders import OrderManager
+from cooperative_cuisine.utils import get_closest
T = TypeVar("T")
@@ -168,11 +168,11 @@ class CounterFactory:
filter(
lambda k: issubclass(k[1], Counter),
inspect.getmembers(
- sys.modules["overcooked_simulator.counters"], inspect.isclass
+ sys.modules["cooperative_cuisine.counters"], inspect.isclass
),
)
)
- """A dictionary of counter classes imported from the 'overcooked_simulator.counters' module."""
+ """A dictionary of counter classes imported from the 'cooperative_cuisine.counters' module."""
self.cooking_counter_equipments: dict[str, set[str]] = {
cooking_counter: {
diff --git a/overcooked_simulator/counters.py b/cooperative_cuisine/counters.py
similarity index 99%
rename from overcooked_simulator/counters.py
rename to cooperative_cuisine/counters.py
index 5f561c5501ef8339e9e020ff96f5c7cf39dbb1b8..ec4a7e0400281f47a23b0c89b3676a8128a99a85 100644
--- a/overcooked_simulator/counters.py
+++ b/cooperative_cuisine/counters.py
@@ -43,7 +43,7 @@ from datetime import datetime, timedelta
from random import Random
from typing import TYPE_CHECKING, Optional, Callable, Set
-from overcooked_simulator.hooks import (
+from cooperative_cuisine.hooks import (
Hooks,
POST_DISPENSER_PICK_UP,
PRE_DISPENSER_PICK_UP,
@@ -65,15 +65,15 @@ from overcooked_simulator.hooks import (
)
if TYPE_CHECKING:
- from overcooked_simulator.effect_manager import Effect
- from overcooked_simulator.overcooked_environment import (
+ from cooperative_cuisine.effect_manager import Effect
+ from cooperative_cuisine.environment import (
OrderManager,
)
import numpy as np
import numpy.typing as npt
-from overcooked_simulator.game_items import (
+from cooperative_cuisine.game_items import (
Item,
CookingEquipment,
Plate,
diff --git a/overcooked_simulator/effect_manager.py b/cooperative_cuisine/effect_manager.py
similarity index 96%
rename from overcooked_simulator/effect_manager.py
rename to cooperative_cuisine/effect_manager.py
index 6b30517e9e1baf810f15b8be3412a27c3a7503cd..2fb36740e748f9662574955c5d2190f4f9cb9e45 100644
--- a/overcooked_simulator/effect_manager.py
+++ b/cooperative_cuisine/effect_manager.py
@@ -12,18 +12,18 @@ from datetime import timedelta, datetime
from random import Random
from typing import TYPE_CHECKING, Tuple
-from overcooked_simulator.game_items import (
+from cooperative_cuisine.game_items import (
ItemInfo,
Item,
ItemType,
Effect,
CookingEquipment,
)
-from overcooked_simulator.hooks import Hooks, NEW_FIRE, FIRE_SPREADING
-from overcooked_simulator.utils import get_touching_counters, find_item_on_counters
+from cooperative_cuisine.hooks import Hooks, NEW_FIRE, FIRE_SPREADING
+from cooperative_cuisine.utils import get_touching_counters, find_item_on_counters
if TYPE_CHECKING:
- from overcooked_simulator.counters import Counter
+ from cooperative_cuisine.counters import Counter
class EffectManager:
diff --git a/overcooked_simulator/overcooked_environment.py b/cooperative_cuisine/environment.py
similarity index 98%
rename from overcooked_simulator/overcooked_environment.py
rename to cooperative_cuisine/environment.py
index 877bdea15c50a6c43b2084f29cd988a1d4e1646d..4242600930850af725c1e7f2824a2d40009fe48b 100644
--- a/overcooked_simulator/overcooked_environment.py
+++ b/cooperative_cuisine/environment.py
@@ -21,18 +21,18 @@ import yaml
from networkx import DiGraph
from scipy.spatial import distance_matrix
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.counter_factory import CounterFactory
-from overcooked_simulator.counters import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.counter_factory import CounterFactory
+from cooperative_cuisine.counters import (
Counter,
PlateConfig,
)
-from overcooked_simulator.effect_manager import EffectManager
-from overcooked_simulator.game_items import (
+from cooperative_cuisine.effect_manager import EffectManager
+from cooperative_cuisine.game_items import (
ItemInfo,
ItemType,
)
-from overcooked_simulator.hooks import (
+from cooperative_cuisine.hooks import (
ITEM_INFO_LOADED,
LAYOUT_FILE_PARSED,
ENV_INITIALIZED,
@@ -52,13 +52,13 @@ from overcooked_simulator.hooks import (
ITEM_INFO_CONFIG,
POST_STEP,
)
-from overcooked_simulator.order import (
+from cooperative_cuisine.orders import (
OrderManager,
OrderConfig,
)
-from overcooked_simulator.player import Player, PlayerConfig
-from overcooked_simulator.state_representation import InfoMsg
-from overcooked_simulator.utils import create_init_env_time, get_closest
+from cooperative_cuisine.player import Player, PlayerConfig
+from cooperative_cuisine.state_representation import InfoMsg
+from cooperative_cuisine.utils import create_init_env_time, get_closest
log = logging.getLogger(__name__)
@@ -274,7 +274,7 @@ class Environment:
lambda cl: hasattr(cl, "progress"),
dict(
inspect.getmembers(
- sys.modules["overcooked_simulator.counters"], inspect.isclass
+ sys.modules["cooperative_cuisine.counters"], inspect.isclass
)
).values(),
)
@@ -323,7 +323,7 @@ class Environment:
lambda cl: hasattr(cl, "progress"),
dict(
inspect.getmembers(
- sys.modules["overcooked_simulator.counters"], inspect.isclass
+ sys.modules["cooperative_cuisine.counters"], inspect.isclass
)
).values(),
)
diff --git a/overcooked_simulator/game_items.py b/cooperative_cuisine/game_items.py
similarity index 99%
rename from overcooked_simulator/game_items.py
rename to cooperative_cuisine/game_items.py
index 94da1512d82c1f538a292359df63cfa3eccd0c73..6ed9f4d25daa7e0eb3b7e844df4c340e29f4e997 100644
--- a/overcooked_simulator/game_items.py
+++ b/cooperative_cuisine/game_items.py
@@ -29,7 +29,7 @@ from enum import Enum
from typing import Optional, TypedDict, TYPE_CHECKING
if TYPE_CHECKING:
- from overcooked_simulator.effect_manager import EffectManager
+ from cooperative_cuisine.effect_manager import EffectManager
log = logging.getLogger(__name__)
"""The logger for this module."""
diff --git a/overcooked_simulator/game_server.py b/cooperative_cuisine/game_server.py
similarity index 98%
rename from overcooked_simulator/game_server.py
rename to cooperative_cuisine/game_server.py
index 502062db6f9e05083a31c85774445a63f4b7442b..e30c4e1216c7778b4f2955149d8501598cdd0f1d 100644
--- a/overcooked_simulator/game_server.py
+++ b/cooperative_cuisine/game_server.py
@@ -29,13 +29,13 @@ from pydantic import BaseModel
from starlette.websockets import WebSocketDisconnect
from typing_extensions import TypedDict
-from overcooked_simulator.overcooked_environment import Action, Environment
-from overcooked_simulator.server_results import (
+from cooperative_cuisine.environment import Action, Environment
+from cooperative_cuisine.server_results import (
CreateEnvResult,
PlayerInfo,
PlayerRequestResult,
)
-from overcooked_simulator.utils import (
+from cooperative_cuisine.utils import (
url_and_port_arguments,
add_list_of_manager_ids_arguments,
disable_websocket_logging_arguments,
@@ -239,7 +239,7 @@ class EnvironmentHandler:
player_hash (str): The unique identifier of the player.
Returns: str: The state representation of the environment for a player. Is
- `overcooked_simulator.state_representation.StateRepresentation` as a json.
+ `cooperative_cuisine.state_representation.StateRepresentation` as a json.
"""
if (
@@ -770,7 +770,6 @@ async def websocket_player_endpoint(websocket: WebSocket, client_id: str):
def main(
host: str, port: int, manager_ids: list[str], enable_websocket_logging: bool = False
):
-
# setup_logging(enable_websocket_logging)
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
@@ -783,9 +782,9 @@ def main(
if __name__ == "__main__":
parser = argparse.ArgumentParser(
- prog="Overcooked Simulator Game Server",
+ prog="Cooperative Cuisine Game Server",
description="Game Engine Server: Starts overcooked game engine server.",
- epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
+ epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/cooperative_cuisine.html",
)
url_and_port_arguments(parser)
@@ -795,5 +794,5 @@ if __name__ == "__main__":
main(args.url, args.port, args.manager_ids, args.enable_websocket_logging)
"""
Or in console:
- uvicorn overcooked_simulator.fastapi_game_server:app --reload
+ uvicorn cooperative_cuisine.fastapi_game_server:app --reload
"""
diff --git a/overcooked_simulator/hooks.py b/cooperative_cuisine/hooks.py
similarity index 98%
rename from overcooked_simulator/hooks.py
rename to cooperative_cuisine/hooks.py
index 54569c94833d1f9645f214bdd00b407c25e52e20..959103602194ad4ba2b5aa423eb5dc1895f7fb07 100644
--- a/overcooked_simulator/hooks.py
+++ b/cooperative_cuisine/hooks.py
@@ -19,7 +19,7 @@ from functools import partial
from typing import Callable, Any, TYPE_CHECKING, Type
if TYPE_CHECKING:
- from overcooked_simulator.overcooked_environment import Environment
+ from cooperative_cuisine.environment import Environment
# TODO add player_id as kwarg to all hooks -> pass player id to all methods
diff --git a/overcooked_simulator/info_msg.py b/cooperative_cuisine/info_msg.py
similarity index 77%
rename from overcooked_simulator/info_msg.py
rename to cooperative_cuisine/info_msg.py
index a691253e95961433c47335e0a1b9a7cf9bb5801f..d28ebfb5a3170ce873c00600a6ae258ad89418f2 100644
--- a/overcooked_simulator/info_msg.py
+++ b/cooperative_cuisine/info_msg.py
@@ -3,17 +3,17 @@
```yaml
extra_setup_functions:
info_msg:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ cutting_board_100 ]
- callback_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+ callback_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
callback_class_kwargs:
msg: Glückwunsch du hast was geschnitten!
fire_msg:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ new_fire ]
- callback_class: !!python/name:overcooked_simulator.info_msg.InfoMsgManager ''
+ callback_class: !!python/name:cooperative_cuisine.info_msg.InfoMsgManager ''
callback_class_kwargs:
msg: Feuer, Feuer, Feuer
level: Warning
@@ -23,8 +23,8 @@
from datetime import timedelta
-from overcooked_simulator.hooks import HookCallbackClass
-from overcooked_simulator.overcooked_environment import Environment
+from cooperative_cuisine.environment import Environment
+from cooperative_cuisine.hooks import HookCallbackClass
class InfoMsgManager(HookCallbackClass):
diff --git a/overcooked_simulator/order.py b/cooperative_cuisine/orders.py
similarity index 97%
rename from overcooked_simulator/order.py
rename to cooperative_cuisine/orders.py
index 7f60abb5d9b1719aeaebebdbbfc45dc7fb7aca41..460f457888663abe5c545e8476ee71d1788129b7 100644
--- a/overcooked_simulator/order.py
+++ b/cooperative_cuisine/orders.py
@@ -6,7 +6,7 @@ It is very configurable by letting you reference own Python classes and function
```yaml
orders:
serving_not_ordered_meals: null
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
order_gen_kwargs:
...
```
@@ -44,8 +44,8 @@ from datetime import datetime, timedelta
from random import Random
from typing import Callable, Tuple, Any, Deque, TypedDict, Type
-from overcooked_simulator.game_items import Item, Plate, ItemInfo
-from overcooked_simulator.hooks import (
+from cooperative_cuisine.game_items import Item, Plate, ItemInfo
+from cooperative_cuisine.hooks import (
Hooks,
SERVE_NOT_ORDERED_MEAL,
SERVE_WITHOUT_PLATE,
@@ -97,7 +97,7 @@ class OrderGeneration:
Example:
```yaml
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
kwargs:
...
```
@@ -334,8 +334,8 @@ class RandomOrderGeneration(OrderGeneration):
You can set this order generation in your `environment_config.yml` with
```yaml
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.orders.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
diff --git a/overcooked_simulator/player.py b/cooperative_cuisine/player.py
similarity index 97%
rename from overcooked_simulator/player.py
rename to cooperative_cuisine/player.py
index 638bc4cd5c0d537aa5823af96543a008b43c3300..9d12abcada3f5689d9a3e695550cc168f47ad4e3 100644
--- a/overcooked_simulator/player.py
+++ b/cooperative_cuisine/player.py
@@ -15,9 +15,9 @@ from typing import Optional
import numpy as np
import numpy.typing as npt
-from overcooked_simulator.counters import Counter
-from overcooked_simulator.game_items import Item, ItemType
-from overcooked_simulator.state_representation import PlayerState
+from cooperative_cuisine.counters import Counter
+from cooperative_cuisine.game_items import Item, ItemType
+from cooperative_cuisine.state_representation import PlayerState
log = logging.getLogger(__name__)
"""The logger for this module."""
diff --git a/overcooked_simulator/gui_2d_vis/__init__.py b/cooperative_cuisine/pygame_2d_vis/__init__.py
similarity index 52%
rename from overcooked_simulator/gui_2d_vis/__init__.py
rename to cooperative_cuisine/pygame_2d_vis/__init__.py
index 9c531caa6003ae868d4eeef943dfa92d5c349fda..f76fc15e4010460e9cb062aadf330b36249c7935 100644
--- a/overcooked_simulator/gui_2d_vis/__init__.py
+++ b/cooperative_cuisine/pygame_2d_vis/__init__.py
@@ -1,10 +1,10 @@
"""
-2D visualization of the overcooked simulator.
+2D visualization of the CooperativeCuisine.
You can select the layout and start an environment:
-- You can play the overcooked simulator. You can quit the application in the top right or end the level in the bottom right: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/gui_2d_vis/images/overcooked-start-screen.png?ref_type=heads)
-- The orders are pictured in the top, the current score in the bottom left and the remaining time in the bottom: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/gui_2d_vis/images/overcooked-level-screen.png?ref_type=heads)
-- The final screen after ending a level shows the score: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/gui_2d_vis/images/overcooked-end-screen.png?ref_type=heads)
+- You can play the CooperativeCuisine. You can quit the application in the top right or end the level in the bottom right: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/pygame_2d_vis/images/overcooked-start-screen.png?ref_type=heads)
+- The orders are pictured in the top, the current score in the bottom left and the remaining time in the bottom: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/pygame_2d_vis/images/overcooked-level-screen.png?ref_type=heads)
+- The final screen after ending a level shows the score: [Screenshot](https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator/-/raw/main/overcooked_simulator/pygame_2d_vis/images/overcooked-end-screen.png?ref_type=heads)
The keys for the control of the players are:
diff --git a/overcooked_simulator/gui_2d_vis/continue.drawio.png b/cooperative_cuisine/pygame_2d_vis/continue.drawio.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/continue.drawio.png
rename to cooperative_cuisine/pygame_2d_vis/continue.drawio.png
diff --git a/overcooked_simulator/gui_2d_vis/drawing.py b/cooperative_cuisine/pygame_2d_vis/drawing.py
similarity index 97%
rename from overcooked_simulator/gui_2d_vis/drawing.py
rename to cooperative_cuisine/pygame_2d_vis/drawing.py
index 94320df123f6ef86e73cae4f41c7d315c300d894..164a20d86c73af7433d68c958bc0b55eb2da71b4 100644
--- a/overcooked_simulator/gui_2d_vis/drawing.py
+++ b/cooperative_cuisine/pygame_2d_vis/drawing.py
@@ -11,10 +11,10 @@ import pygame
import yaml
from scipy.spatial import KDTree
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.gui_2d_vis.game_colors import colors
-from overcooked_simulator.overcooked_environment import Environment
-from overcooked_simulator.state_representation import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import Environment
+from cooperative_cuisine.pygame_2d_vis.game_colors import colors
+from cooperative_cuisine.state_representation import (
PlayerState,
CookingEquipmentState,
ItemState,
@@ -274,7 +274,7 @@ class Visualizer:
Args:
screen: The pygame surface to draw the image on.
- img_path: The path to the image file, given relative to the gui_2d_vis directory.
+ img_path: The path to the image file, given relative to the pygame_2d_vis directory.
size: The size of the image, given in pixels.
pos: The position of the center of the image, given in pixels.
rot_angle: Optional angle to rotate the image around.
@@ -288,14 +288,14 @@ class Visualizer:
normal_image = self.image_cache_dict[cache_entry]
else:
normal_image = pygame.image.load(
- ROOT_DIR / "gui_2d_vis" / img_path
+ ROOT_DIR / "pygame_2d_vis" / img_path
).convert_alpha()
self.image_cache_dict[cache_entry] = normal_image
image = grayscale(normal_image)
self.image_cache_dict[cache_entry + "-burnt"] = image
else:
image = pygame.image.load(
- ROOT_DIR / "gui_2d_vis" / img_path
+ ROOT_DIR / "pygame_2d_vis" / img_path
).convert_alpha()
self.image_cache_dict[cache_entry] = image
image = pygame.transform.scale(image, (size, size))
@@ -975,9 +975,9 @@ def save_screenshot(state: dict, config: dict, filename: str | Path) -> None:
def generate_recipe_images(config: dict, folder_path: str | Path):
os.makedirs(ROOT_DIR / folder_path, exist_ok=True)
env = Environment(
- env_config=str(ROOT_DIR / "game_content" / "environment_config.yaml"),
- layout_config=str(ROOT_DIR / "game_content" / "layouts" / "basic.layout"),
- item_info=str(ROOT_DIR / "game_content" / "item_info.yaml"),
+ env_config=str(ROOT_DIR / "configs" / "environment_config.yaml"),
+ layout_config=str(ROOT_DIR / "configs" / "layouts" / "basic.layout"),
+ item_info=str(ROOT_DIR / "configs" / "item_info.yaml"),
as_files=True,
env_name="0",
)
@@ -999,7 +999,7 @@ def generate_recipe_images(config: dict, folder_path: str | Path):
if __name__ == "__main__":
parser = argparse.ArgumentParser(
- prog="Overcooked Simulator Image Generation",
+ prog="Cooperative Cuisine Image Generation",
description="Generate images for a state in json.",
epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
)
@@ -1007,19 +1007,19 @@ if __name__ == "__main__":
"-s",
"--state",
type=argparse.FileType("r", encoding="UTF-8"),
- default=ROOT_DIR / "gui_2d_vis" / "sample_state.json",
+ default=ROOT_DIR / "pygame_2d_vis" / "sample_state.json",
)
parser.add_argument(
"-v",
"--visualization_config",
type=argparse.FileType("r", encoding="UTF-8"),
- default=ROOT_DIR / "gui_2d_vis" / "visualization.yaml",
+ default=ROOT_DIR / "pygame_2d_vis" / "visualization.yaml",
)
parser.add_argument(
"-o",
"--output_file",
type=str,
- default=ROOT_DIR / "gui_2d_vis" / "generated" / "screenshot.jpg",
+ default=ROOT_DIR / "pygame_2d_vis" / "generated" / "screenshot.jpg",
)
args = parser.parse_args()
with open(args.visualization_config, "r") as f:
diff --git a/overcooked_simulator/gui_2d_vis/game_colors.py b/cooperative_cuisine/pygame_2d_vis/game_colors.py
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/game_colors.py
rename to cooperative_cuisine/pygame_2d_vis/game_colors.py
diff --git a/overcooked_simulator/gui_2d_vis/overcooked_gui.py b/cooperative_cuisine/pygame_2d_vis/gui.py
similarity index 96%
rename from overcooked_simulator/gui_2d_vis/overcooked_gui.py
rename to cooperative_cuisine/pygame_2d_vis/gui.py
index 32537626bfd6c0149ff7fbf16071fbbabef1ea7f..a4ce3b3238cc01ae48a792277a1b2c84b61f4f22 100644
--- a/overcooked_simulator/gui_2d_vis/overcooked_gui.py
+++ b/cooperative_cuisine/pygame_2d_vis/gui.py
@@ -19,17 +19,17 @@ import yaml
from pygame import mixer
from websockets.sync.client import connect
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.game_server import CreateEnvironmentConfig
-from overcooked_simulator.gui_2d_vis.drawing import Visualizer
-from overcooked_simulator.gui_2d_vis.game_colors import colors
-from overcooked_simulator.overcooked_environment import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import (
Action,
ActionType,
InterActionData,
)
-from overcooked_simulator.state_representation import StateRepresentation
-from overcooked_simulator.utils import (
+from cooperative_cuisine.game_server import CreateEnvironmentConfig
+from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer
+from cooperative_cuisine.pygame_2d_vis.game_colors import colors
+from cooperative_cuisine.state_representation import StateRepresentation
+from cooperative_cuisine.utils import (
custom_asdict_factory,
url_and_port_arguments,
disable_websocket_logging_arguments,
@@ -49,7 +49,6 @@ class MenuStates(Enum):
log = logging.getLogger(__name__)
-
class PlayerKeySet:
"""Set of keyboard keys for controlling a player.
First four keys are for movement. Order: Down, Up, Left, Right. 5th key is for interacting with counters. 6th key ist for picking up things or dropping them.
@@ -123,7 +122,7 @@ class PyGameGUI:
pygame.init()
pygame.display.set_icon(
- pygame.image.load(ROOT_DIR / "gui_2d_vis" / "images" / "fish3.png")
+ pygame.image.load(ROOT_DIR / "pygame_2d_vis" / "images" / "fish3.png")
)
self.participant_id = uuid.uuid4().hex
@@ -143,7 +142,7 @@ class PyGameGUI:
self.manager_id = random.choice(manager_ids)
- with open(ROOT_DIR / "gui_2d_vis" / "visualization.yaml", "r") as file:
+ with open(ROOT_DIR / "pygame_2d_vis" / "visualization.yaml", "r") as file:
self.visualization_config = yaml.safe_load(file)
self.FPS = self.visualization_config["GameWindow"]["FPS"]
@@ -184,7 +183,7 @@ class PyGameGUI:
self.sub_processes = []
self.layout_file_paths = sorted(
- (ROOT_DIR / "game_content" / "layouts").rglob("*.layout")
+ (ROOT_DIR / "configs" / "layouts").rglob("*.layout")
)
self.current_layout_idx = 0
@@ -366,9 +365,7 @@ class PyGameGUI:
)
self.send_action(action)
# switch button Y <-> 3
- if (
- joysticks[key_set.joystick].get_button(3)
- ):
+ if joysticks[key_set.joystick].get_button(3):
if event.type == pygame.JOYBUTTONDOWN:
key_set.next_player()
@@ -437,7 +434,9 @@ class PyGameGUI:
def init_ui_elements(self):
self.manager = pygame_gui.UIManager((self.window_width, self.window_height))
- self.manager.get_theme().load_theme(ROOT_DIR / "gui_2d_vis" / "gui_theme.json")
+ self.manager.get_theme().load_theme(
+ ROOT_DIR / "pygame_2d_vis" / "gui_theme.json"
+ )
########################################################################
# Start screen
@@ -453,7 +452,7 @@ class PyGameGUI:
)
img = pygame.image.load(
- ROOT_DIR / "gui_2d_vis" / "continue.drawio.png"
+ ROOT_DIR / "pygame_2d_vis" / "continue.drawio.png"
).convert_alpha()
image_rect = img.get_rect()
@@ -615,7 +614,7 @@ class PyGameGUI:
########################################################################
image = pygame.image.load(
- ROOT_DIR / "gui_2d_vis" / "tutorial_files" / "tutorial.drawio.png"
+ ROOT_DIR / "pygame_2d_vis" / "tutorial_files" / "tutorial.drawio.png"
).convert_alpha()
image_rect = image.get_rect()
image_rect.topleft = (20, self.buttons_height)
@@ -978,7 +977,6 @@ class PyGameGUI:
last_completed_meals = []
for idx, (player, meal) in enumerate(served_meals):
-
if idx == 0:
anchors = {"centerx": "centerx", "top": "top"}
else:
@@ -1132,17 +1130,13 @@ class PyGameGUI:
def create_env_on_game_server(self, tutorial):
if tutorial:
- layout_path = ROOT_DIR / "game_content" / "layouts" / "tutorial.layout"
- environment_config_path = (
- ROOT_DIR / "game_content" / "tutorial_env_config.yaml"
- )
+ layout_path = ROOT_DIR / "configs" / "layouts" / "tutorial.layout"
+ environment_config_path = ROOT_DIR / "configs" / "tutorial_env_config.yaml"
else:
- environment_config_path = (
- ROOT_DIR / "game_content" / "environment_config.yaml"
- )
+ environment_config_path = ROOT_DIR / "configs" / "environment_config.yaml"
layout_path = self.layout_file_paths[self.current_layout_idx]
- item_info_path = ROOT_DIR / "game_content" / "item_info.yaml"
+ item_info_path = ROOT_DIR / "configs" / "item_info.yaml"
with open(item_info_path, "r") as file:
item_info = file.read()
with open(layout_path, "r") as file:
@@ -1334,9 +1328,9 @@ class PyGameGUI:
"aaambos",
"run",
"--arch_config",
- str(ROOT_DIR / "game_content" / "agents" / "arch_config.yml"),
+ str(ROOT_DIR / "configs" / "agents" / "arch_config.yml"),
"--run_config",
- str(ROOT_DIR / "game_content" / "agents" / "run_config.yml"),
+ str(ROOT_DIR / "configs" / "agents" / "run_config.yml"),
f'--general_plus="agent_websocket:{self.websocket_url + player_info["client_id"]};player_hash:{player_hash};agent_id:{player_id}"',
f"--instance={player_hash}",
]
@@ -1348,7 +1342,7 @@ class PyGameGUI:
" ".join(
[
"python",
- str(ROOT_DIR / "game_content" / "agents" / "random_agent.py"),
+ str(ROOT_DIR / "configs" / "agents" / "random_agent.py"),
f'--uri {self.websocket_url + player_info["client_id"]}',
f"--player_hash {player_hash}",
f"--player_id {player_id}",
@@ -1528,7 +1522,7 @@ class PyGameGUI:
websocket.close()
def play_bell_sound(self):
- bell_path = str(ROOT_DIR / "gui_2d_vis" / "sync_bell.wav")
+ bell_path = str(ROOT_DIR / "pygame_2d_vis" / "sync_bell.wav")
mixer.init()
mixer.music.load(bell_path)
mixer.music.set_volume(0.9)
@@ -1542,9 +1536,7 @@ class PyGameGUI:
self.last_level = False
def send_level_done(self):
- _ = requests.post(
- f"{self.request_url}/level_done/{self.participant_id}"
- ).json()
+ _ = requests.post(f"{self.request_url}/level_done/{self.participant_id}").json()
def button_continue_postgame_pressed(self):
if not self.CONNECT_WITH_STUDY_SERVER:
@@ -1666,7 +1658,7 @@ class PyGameGUI:
pygame.font.init()
self.comic_sans = pygame.font.SysFont("Comic Sans MS", 30)
- pygame.display.set_caption("Simple Overcooked Simulator")
+ pygame.display.set_caption("Cooperative Cuisine")
clock = pygame.time.Clock()
@@ -1809,7 +1801,6 @@ def main(
CONNECT_WITH_STUDY_SERVER=False,
USE_AAAMBOS_AGENT=False,
):
-
# setup_logging()
gui = PyGameGUI(
study_host=study_url,
@@ -1825,7 +1816,7 @@ def main(
if __name__ == "__main__":
parser = argparse.ArgumentParser(
- prog="Overcooked Simulator 2D PyGame Visualization",
+ prog="Cooperative Cuisine 2D PyGame Visualization",
description="PyGameGUI: a PyGame 2D Visualization window.",
epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
)
@@ -1834,4 +1825,11 @@ if __name__ == "__main__":
disable_websocket_logging_arguments(parser)
add_list_of_manager_ids_arguments(parser)
args = parser.parse_args()
- main(args.study_url, args.study_port, args.game_url, args.game_port, args.manager_ids, CONNECT_WITH_STUDY_SERVER=True)
+ main(
+ args.study_url,
+ args.study_port,
+ args.game_url,
+ args.game_port,
+ args.manager_ids,
+ CONNECT_WITH_STUDY_SERVER=True,
+ )
diff --git a/overcooked_simulator/gui_2d_vis/gui_theme.json b/cooperative_cuisine/pygame_2d_vis/gui_theme.json
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/gui_theme.json
rename to cooperative_cuisine/pygame_2d_vis/gui_theme.json
diff --git a/overcooked_simulator/gui_2d_vis/images/arrow_right.png b/cooperative_cuisine/pygame_2d_vis/images/arrow_right.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/arrow_right.png
rename to cooperative_cuisine/pygame_2d_vis/images/arrow_right.png
diff --git a/overcooked_simulator/gui_2d_vis/images/basket.png b/cooperative_cuisine/pygame_2d_vis/images/basket.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/basket.png
rename to cooperative_cuisine/pygame_2d_vis/images/basket.png
diff --git a/overcooked_simulator/gui_2d_vis/images/bell_gold.png b/cooperative_cuisine/pygame_2d_vis/images/bell_gold.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/bell_gold.png
rename to cooperative_cuisine/pygame_2d_vis/images/bell_gold.png
diff --git a/overcooked_simulator/gui_2d_vis/images/bell_silver.png b/cooperative_cuisine/pygame_2d_vis/images/bell_silver.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/bell_silver.png
rename to cooperative_cuisine/pygame_2d_vis/images/bell_silver.png
diff --git a/overcooked_simulator/gui_2d_vis/images/bun.png b/cooperative_cuisine/pygame_2d_vis/images/bun.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/bun.png
rename to cooperative_cuisine/pygame_2d_vis/images/bun.png
diff --git a/overcooked_simulator/gui_2d_vis/images/burger.png b/cooperative_cuisine/pygame_2d_vis/images/burger.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/burger.png
rename to cooperative_cuisine/pygame_2d_vis/images/burger.png
diff --git a/overcooked_simulator/gui_2d_vis/images/cheese3.png b/cooperative_cuisine/pygame_2d_vis/images/cheese3.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/cheese3.png
rename to cooperative_cuisine/pygame_2d_vis/images/cheese3.png
diff --git a/overcooked_simulator/gui_2d_vis/images/chopped_fish.png b/cooperative_cuisine/pygame_2d_vis/images/chopped_fish.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/chopped_fish.png
rename to cooperative_cuisine/pygame_2d_vis/images/chopped_fish.png
diff --git a/overcooked_simulator/gui_2d_vis/images/cooked_patty.png b/cooperative_cuisine/pygame_2d_vis/images/cooked_patty.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/cooked_patty.png
rename to cooperative_cuisine/pygame_2d_vis/images/cooked_patty.png
diff --git a/overcooked_simulator/gui_2d_vis/images/counter2.png b/cooperative_cuisine/pygame_2d_vis/images/counter2.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/counter2.png
rename to cooperative_cuisine/pygame_2d_vis/images/counter2.png
diff --git a/overcooked_simulator/gui_2d_vis/images/counter4.png b/cooperative_cuisine/pygame_2d_vis/images/counter4.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/counter4.png
rename to cooperative_cuisine/pygame_2d_vis/images/counter4.png
diff --git a/overcooked_simulator/gui_2d_vis/images/counter5.png b/cooperative_cuisine/pygame_2d_vis/images/counter5.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/counter5.png
rename to cooperative_cuisine/pygame_2d_vis/images/counter5.png
diff --git a/overcooked_simulator/gui_2d_vis/images/cut_fish.png b/cooperative_cuisine/pygame_2d_vis/images/cut_fish.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/cut_fish.png
rename to cooperative_cuisine/pygame_2d_vis/images/cut_fish.png
diff --git a/overcooked_simulator/gui_2d_vis/images/cutting_board_large.png b/cooperative_cuisine/pygame_2d_vis/images/cutting_board_large.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/cutting_board_large.png
rename to cooperative_cuisine/pygame_2d_vis/images/cutting_board_large.png
diff --git a/overcooked_simulator/gui_2d_vis/images/drip2.png b/cooperative_cuisine/pygame_2d_vis/images/drip2.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/drip2.png
rename to cooperative_cuisine/pygame_2d_vis/images/drip2.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fire.png b/cooperative_cuisine/pygame_2d_vis/images/fire.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fire.png
rename to cooperative_cuisine/pygame_2d_vis/images/fire.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fire2.png b/cooperative_cuisine/pygame_2d_vis/images/fire2.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fire2.png
rename to cooperative_cuisine/pygame_2d_vis/images/fire2.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fire3.png b/cooperative_cuisine/pygame_2d_vis/images/fire3.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fire3.png
rename to cooperative_cuisine/pygame_2d_vis/images/fire3.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fire_extinguisher.png b/cooperative_cuisine/pygame_2d_vis/images/fire_extinguisher.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fire_extinguisher.png
rename to cooperative_cuisine/pygame_2d_vis/images/fire_extinguisher.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fish3.png b/cooperative_cuisine/pygame_2d_vis/images/fish3.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fish3.png
rename to cooperative_cuisine/pygame_2d_vis/images/fish3.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fried_fish.png b/cooperative_cuisine/pygame_2d_vis/images/fried_fish.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fried_fish.png
rename to cooperative_cuisine/pygame_2d_vis/images/fried_fish.png
diff --git a/overcooked_simulator/gui_2d_vis/images/fries2.png b/cooperative_cuisine/pygame_2d_vis/images/fries2.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/fries2.png
rename to cooperative_cuisine/pygame_2d_vis/images/fries2.png
diff --git a/overcooked_simulator/gui_2d_vis/images/grated_cheese.png b/cooperative_cuisine/pygame_2d_vis/images/grated_cheese.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/grated_cheese.png
rename to cooperative_cuisine/pygame_2d_vis/images/grated_cheese.png
diff --git a/overcooked_simulator/gui_2d_vis/images/lettuce_cut_smaller.png b/cooperative_cuisine/pygame_2d_vis/images/lettuce_cut_smaller.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/lettuce_cut_smaller.png
rename to cooperative_cuisine/pygame_2d_vis/images/lettuce_cut_smaller.png
diff --git a/overcooked_simulator/gui_2d_vis/images/lettuce_smaller.png b/cooperative_cuisine/pygame_2d_vis/images/lettuce_smaller.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/lettuce_smaller.png
rename to cooperative_cuisine/pygame_2d_vis/images/lettuce_smaller.png
diff --git a/overcooked_simulator/gui_2d_vis/images/meat.png b/cooperative_cuisine/pygame_2d_vis/images/meat.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/meat.png
rename to cooperative_cuisine/pygame_2d_vis/images/meat.png
diff --git a/overcooked_simulator/gui_2d_vis/images/onion_cut.png b/cooperative_cuisine/pygame_2d_vis/images/onion_cut.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/onion_cut.png
rename to cooperative_cuisine/pygame_2d_vis/images/onion_cut.png
diff --git a/overcooked_simulator/gui_2d_vis/images/onion_large.png b/cooperative_cuisine/pygame_2d_vis/images/onion_large.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/onion_large.png
rename to cooperative_cuisine/pygame_2d_vis/images/onion_large.png
diff --git a/overcooked_simulator/gui_2d_vis/images/onion_soup_plate.png b/cooperative_cuisine/pygame_2d_vis/images/onion_soup_plate.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/onion_soup_plate.png
rename to cooperative_cuisine/pygame_2d_vis/images/onion_soup_plate.png
diff --git a/overcooked_simulator/gui_2d_vis/images/onion_soup_pot.png b/cooperative_cuisine/pygame_2d_vis/images/onion_soup_pot.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/onion_soup_pot.png
rename to cooperative_cuisine/pygame_2d_vis/images/onion_soup_pot.png
diff --git a/overcooked_simulator/gui_2d_vis/images/overcooked-end-screen.png b/cooperative_cuisine/pygame_2d_vis/images/overcooked-end-screen.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/overcooked-end-screen.png
rename to cooperative_cuisine/pygame_2d_vis/images/overcooked-end-screen.png
diff --git a/overcooked_simulator/gui_2d_vis/images/overcooked-level-screen.png b/cooperative_cuisine/pygame_2d_vis/images/overcooked-level-screen.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/overcooked-level-screen.png
rename to cooperative_cuisine/pygame_2d_vis/images/overcooked-level-screen.png
diff --git a/overcooked_simulator/gui_2d_vis/images/overcooked-start-screen.png b/cooperative_cuisine/pygame_2d_vis/images/overcooked-start-screen.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/overcooked-start-screen.png
rename to cooperative_cuisine/pygame_2d_vis/images/overcooked-start-screen.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pan.png b/cooperative_cuisine/pygame_2d_vis/images/pan.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pan.png
rename to cooperative_cuisine/pygame_2d_vis/images/pan.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pixel_cook.png b/cooperative_cuisine/pygame_2d_vis/images/pixel_cook.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pixel_cook.png
rename to cooperative_cuisine/pygame_2d_vis/images/pixel_cook.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pixel_cook_masked.png b/cooperative_cuisine/pygame_2d_vis/images/pixel_cook_masked.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pixel_cook_masked.png
rename to cooperative_cuisine/pygame_2d_vis/images/pixel_cook_masked.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pizza.png b/cooperative_cuisine/pygame_2d_vis/images/pizza.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pizza.png
rename to cooperative_cuisine/pygame_2d_vis/images/pizza.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pizza_base.png b/cooperative_cuisine/pygame_2d_vis/images/pizza_base.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pizza_base.png
rename to cooperative_cuisine/pygame_2d_vis/images/pizza_base.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pizza_dough.png b/cooperative_cuisine/pygame_2d_vis/images/pizza_dough.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pizza_dough.png
rename to cooperative_cuisine/pygame_2d_vis/images/pizza_dough.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pizza_wood.png b/cooperative_cuisine/pygame_2d_vis/images/pizza_wood.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pizza_wood.png
rename to cooperative_cuisine/pygame_2d_vis/images/pizza_wood.png
diff --git a/overcooked_simulator/gui_2d_vis/images/plate.png b/cooperative_cuisine/pygame_2d_vis/images/plate.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/plate.png
rename to cooperative_cuisine/pygame_2d_vis/images/plate.png
diff --git a/overcooked_simulator/gui_2d_vis/images/plate_clean.png b/cooperative_cuisine/pygame_2d_vis/images/plate_clean.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/plate_clean.png
rename to cooperative_cuisine/pygame_2d_vis/images/plate_clean.png
diff --git a/overcooked_simulator/gui_2d_vis/images/plate_dirty.png b/cooperative_cuisine/pygame_2d_vis/images/plate_dirty.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/plate_dirty.png
rename to cooperative_cuisine/pygame_2d_vis/images/plate_dirty.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pot.png b/cooperative_cuisine/pygame_2d_vis/images/pot.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pot.png
rename to cooperative_cuisine/pygame_2d_vis/images/pot.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pot_large.png b/cooperative_cuisine/pygame_2d_vis/images/pot_large.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pot_large.png
rename to cooperative_cuisine/pygame_2d_vis/images/pot_large.png
diff --git a/overcooked_simulator/gui_2d_vis/images/pot_smaller.png b/cooperative_cuisine/pygame_2d_vis/images/pot_smaller.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/pot_smaller.png
rename to cooperative_cuisine/pygame_2d_vis/images/pot_smaller.png
diff --git a/overcooked_simulator/gui_2d_vis/images/potato2.png b/cooperative_cuisine/pygame_2d_vis/images/potato2.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/potato2.png
rename to cooperative_cuisine/pygame_2d_vis/images/potato2.png
diff --git a/overcooked_simulator/gui_2d_vis/images/raw_fries.png b/cooperative_cuisine/pygame_2d_vis/images/raw_fries.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/raw_fries.png
rename to cooperative_cuisine/pygame_2d_vis/images/raw_fries.png
diff --git a/overcooked_simulator/gui_2d_vis/images/raw_patty.png b/cooperative_cuisine/pygame_2d_vis/images/raw_patty.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/raw_patty.png
rename to cooperative_cuisine/pygame_2d_vis/images/raw_patty.png
diff --git a/overcooked_simulator/gui_2d_vis/images/salad.png b/cooperative_cuisine/pygame_2d_vis/images/salad.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/salad.png
rename to cooperative_cuisine/pygame_2d_vis/images/salad.png
diff --git a/overcooked_simulator/gui_2d_vis/images/sausage.png b/cooperative_cuisine/pygame_2d_vis/images/sausage.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/sausage.png
rename to cooperative_cuisine/pygame_2d_vis/images/sausage.png
diff --git a/overcooked_simulator/gui_2d_vis/images/sausage_chopped.png b/cooperative_cuisine/pygame_2d_vis/images/sausage_chopped.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/sausage_chopped.png
rename to cooperative_cuisine/pygame_2d_vis/images/sausage_chopped.png
diff --git a/overcooked_simulator/gui_2d_vis/images/sink.png b/cooperative_cuisine/pygame_2d_vis/images/sink.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/sink.png
rename to cooperative_cuisine/pygame_2d_vis/images/sink.png
diff --git a/overcooked_simulator/gui_2d_vis/images/sink1.png b/cooperative_cuisine/pygame_2d_vis/images/sink1.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/sink1.png
rename to cooperative_cuisine/pygame_2d_vis/images/sink1.png
diff --git a/overcooked_simulator/gui_2d_vis/images/sink_large.png b/cooperative_cuisine/pygame_2d_vis/images/sink_large.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/sink_large.png
rename to cooperative_cuisine/pygame_2d_vis/images/sink_large.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato.png b/cooperative_cuisine/pygame_2d_vis/images/tomato.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato3_cut_smaller.png b/cooperative_cuisine/pygame_2d_vis/images/tomato3_cut_smaller.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato3_cut_smaller.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato3_cut_smaller.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato3_smaller.png b/cooperative_cuisine/pygame_2d_vis/images/tomato3_smaller.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato3_smaller.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato3_smaller.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato_cut.png b/cooperative_cuisine/pygame_2d_vis/images/tomato_cut.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato_cut.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato_cut.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato_soup.png b/cooperative_cuisine/pygame_2d_vis/images/tomato_soup.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato_soup.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato_soup.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato_soup_plate.png b/cooperative_cuisine/pygame_2d_vis/images/tomato_soup_plate.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato_soup_plate.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato_soup_plate.png
diff --git a/overcooked_simulator/gui_2d_vis/images/tomato_soup_pot.png b/cooperative_cuisine/pygame_2d_vis/images/tomato_soup_pot.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/tomato_soup_pot.png
rename to cooperative_cuisine/pygame_2d_vis/images/tomato_soup_pot.png
diff --git a/overcooked_simulator/gui_2d_vis/images/trash3.png b/cooperative_cuisine/pygame_2d_vis/images/trash3.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/images/trash3.png
rename to cooperative_cuisine/pygame_2d_vis/images/trash3.png
diff --git a/overcooked_simulator/gui_2d_vis/press_a.drawio.png b/cooperative_cuisine/pygame_2d_vis/press_a.drawio.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/press_a.drawio.png
rename to cooperative_cuisine/pygame_2d_vis/press_a.drawio.png
diff --git a/overcooked_simulator/gui_2d_vis/sample_state.json b/cooperative_cuisine/pygame_2d_vis/sample_state.json
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/sample_state.json
rename to cooperative_cuisine/pygame_2d_vis/sample_state.json
diff --git a/overcooked_simulator/gui_2d_vis/sync_bell.wav b/cooperative_cuisine/pygame_2d_vis/sync_bell.wav
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/sync_bell.wav
rename to cooperative_cuisine/pygame_2d_vis/sync_bell.wav
diff --git a/overcooked_simulator/gui_2d_vis/tutorial.png b/cooperative_cuisine/pygame_2d_vis/tutorial.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/tutorial.png
rename to cooperative_cuisine/pygame_2d_vis/tutorial.png
diff --git a/overcooked_simulator/gui_2d_vis/tutorial_files/recipe_mock.png b/cooperative_cuisine/pygame_2d_vis/tutorial_files/recipe_mock.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/tutorial_files/recipe_mock.png
rename to cooperative_cuisine/pygame_2d_vis/tutorial_files/recipe_mock.png
diff --git a/overcooked_simulator/gui_2d_vis/tutorial_files/tutorial.drawio.png b/cooperative_cuisine/pygame_2d_vis/tutorial_files/tutorial.drawio.png
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/tutorial_files/tutorial.drawio.png
rename to cooperative_cuisine/pygame_2d_vis/tutorial_files/tutorial.drawio.png
diff --git a/overcooked_simulator/gui_2d_vis/video_replay.py b/cooperative_cuisine/pygame_2d_vis/video_replay.py
similarity index 88%
rename from overcooked_simulator/gui_2d_vis/video_replay.py
rename to cooperative_cuisine/pygame_2d_vis/video_replay.py
index 3c8baefa6cae89e61b98321e7e90abb47aea4a88..1c6c348a68e430c6488ecb794ee9536c973f49e1 100644
--- a/overcooked_simulator/gui_2d_vis/video_replay.py
+++ b/cooperative_cuisine/pygame_2d_vis/video_replay.py
@@ -7,19 +7,19 @@ based on the actions. Until now, we did not find any deviations from the json st
# CLI
Sequence of images replay from actions:
```bash
-python video_replay.py -a ~/.local/state/overcooked_simulator/log/ENV_NAME/actions.jsonl -e ~/.local/state/overcooked_simulator/log/ENV_NAME/env_configs.jsonl -d -n 2 -p "0"
+python video_replay.py -a ~/.local/state/cooperative_cuisine/log/ENV_NAME/actions.jsonl -e ~/.local/state/cooperative_cuisine/log/ENV_NAME/env_configs.jsonl -d -n 2 -p "0"
```
Sequence of images replay from json states:
```bash
-python video_replay.py -j ~/.local/state/overcooked_simulator/log/ENV_NAME/json_states.jsonl -d -p "0"
+python video_replay.py -j ~/.local/state/cooperative_cuisine/log/ENV_NAME/json_states.jsonl -d -p "0"
```
The `display` (`-d`, `--display`) requires `opencv-python` (cv2) installed. (`pip install opencv-python`)
Generate a video file from images (requires also `opencv-python`):
```bash
-python video_replay.py --video ~/.local/state/overcooked_simulator/log/ENV_NAME/DIR_NAME_WITH_IMAGES
+python video_replay.py --video ~/.local/state/cooperative_cuisine/log/ENV_NAME/DIR_NAME_WITH_IMAGES
```
For additional CLI arguments:
@@ -42,10 +42,10 @@ import yaml
from PIL import Image
from tqdm import tqdm
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.gui_2d_vis.drawing import Visualizer
-from overcooked_simulator.overcooked_environment import Environment, Action
-from overcooked_simulator.recording import FileRecorder
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import Environment, Action
+from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer
+from cooperative_cuisine.recording import FileRecorder
FPS_DEFAULT = 24
STEP_DURATION_DEFAULT = 200
@@ -73,25 +73,25 @@ def simulate(
```yaml
extra_setup_functions
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
```
You can call simulation function via the command line. For example by replacing the ENVIRONMENT_ID (Linux system) or the complete path:
```bash
- python video_replay.py -a ~/.local/state/overcooked_simulator/log/ENV_NAME/actions.jsonl -e ~/.local/state/overcooked_simulator/log/ENV_NAME/env_configs.jsonl -d -n 2 -p "0"
+ python video_replay.py -a ~/.local/state/cooperative_cuisine/log/ENV_NAME/actions.jsonl -e ~/.local/state/cooperative_cuisine/log/ENV_NAME/env_configs.jsonl -d -n 2 -p "0"
```
Args:
@@ -208,22 +208,22 @@ def from_json_states(
"""
Generate images from recorded json strings in on jsonl file.
- For single image creation based on one json state see `overcooked_simulator.gui_2d_vis.drawing`.
+ For single image creation based on one json state see `cooperative_cuisine.pygame_2d_vis.drawing`.
You can create the jsonl file recording via hooks in the environment_config. These files grow very fast!:
```yaml
json_states:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ json_state ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
```
You can call this function via the command line:
```bash
- python video_replay.py -j ~/.local/state/overcooked_simulator/log/ENV_NAME/json_states.jsonl -d -p "0"
+ python video_replay.py -j ~/.local/state/cooperative_cuisine/log/ENV_NAME/json_states.jsonl -d -p "0"
```
Args:
@@ -264,7 +264,7 @@ def video_from_images(image_paths, video_name, fps):
CLI:
```bash
- python video_replay.py --video ~/.local/state/overcooked_simulator/log/ENV_NAME/DIR_NAME_WITH_IMAGES
+ python video_replay.py --video ~/.local/state/cooperative_cuisine/log/ENV_NAME/DIR_NAME_WITH_IMAGES
```
Args:
@@ -298,7 +298,7 @@ def video_from_images(image_paths, video_name, fps):
if __name__ == "__main__":
parser = ArgumentParser(
- prog="Overcooked Simulator Video Generation",
+ prog="Cooperative Cuisine Video Generation",
description="Generate videos from recorded data.",
epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
)
@@ -307,7 +307,7 @@ if __name__ == "__main__":
"-v",
"--visualization_config",
type=argparse.FileType("r", encoding="UTF-8"),
- default=ROOT_DIR / "gui_2d_vis" / "visualization.yaml",
+ default=ROOT_DIR / "pygame_2d_vis" / "visualization.yaml",
)
parser.add_argument(
"-o",
diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/cooperative_cuisine/pygame_2d_vis/visualization.yaml
similarity index 100%
rename from overcooked_simulator/gui_2d_vis/visualization.yaml
rename to cooperative_cuisine/pygame_2d_vis/visualization.yaml
diff --git a/overcooked_simulator/recording.py b/cooperative_cuisine/recording.py
similarity index 75%
rename from overcooked_simulator/recording.py
rename to cooperative_cuisine/recording.py
index 0bf8660b2139e8d4bf8f83f4329e2d2b8ce8cf16..79f98fb9d845edf4457eb9fcd17b413286ff433e 100644
--- a/overcooked_simulator/recording.py
+++ b/cooperative_cuisine/recording.py
@@ -3,38 +3,38 @@ Record events in jsonl-files.
- `USER_LOG_DIR` corresponds to the log directory of your system for programs. See [platformdirs](
https://pypi.org/project/platformdirs/) -> `user_log_dir`.
-- `ROOT_DIR` to the location of the overcooked_simulator.
+- `ROOT_DIR` to the location of the cooperative_cuisine.
- `ENV_NAME` to the name of the environment.
```yaml
extra_setup_functions:
json_states:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ json_state ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
actions:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ pre_perform_action ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
random_env_events:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
env_configs:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ env_initialized, item_info_config ]
- callback_class: !!python/name:overcooked_simulator.recording.FileRecorder ''
+ callback_class: !!python/name:cooperative_cuisine.recording.FileRecorder ''
callback_class_kwargs:
log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
add_hook_ref: true
@@ -48,10 +48,10 @@ from pathlib import Path
import platformdirs
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.hooks import HookCallbackClass
-from overcooked_simulator.overcooked_environment import Environment
-from overcooked_simulator.utils import NumpyAndDataclassEncoder
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import Environment
+from cooperative_cuisine.hooks import HookCallbackClass
+from cooperative_cuisine.utils import NumpyAndDataclassEncoder
log = logging.getLogger(__name__)
@@ -85,7 +85,7 @@ class FileRecorder(HookCallbackClass):
)
if log_path.startswith("USER_LOG_DIR/"):
log_path = (
- Path(platformdirs.user_log_dir("overcooked_simulator"))
+ Path(platformdirs.user_log_dir("cooperative_cuisine"))
/ log_path[len("USER_LOG_DIR/") :]
)
elif log_path.startswith("ROOT_DIR/"):
diff --git a/overcooked_simulator/reinforcement_learning/__init__.py b/cooperative_cuisine/reinforcement_learning/__init__.py
similarity index 100%
rename from overcooked_simulator/reinforcement_learning/__init__.py
rename to cooperative_cuisine/reinforcement_learning/__init__.py
diff --git a/overcooked_simulator/reinforcement_learning/environment_config_rl.yaml b/cooperative_cuisine/reinforcement_learning/environment_config_rl.yaml
similarity index 67%
rename from overcooked_simulator/reinforcement_learning/environment_config_rl.yaml
rename to cooperative_cuisine/reinforcement_learning/environment_config_rl.yaml
index 8b39daeea0b234bb41b90ed3baff15d8119c1e63..5e75d9bdaea71f52507fa31d3fb1ed47b268bf84 100644
--- a/overcooked_simulator/reinforcement_learning/environment_config_rl.yaml
+++ b/cooperative_cuisine/reinforcement_learning/environment_config_rl.yaml
@@ -55,8 +55,8 @@ layout_chars:
orders:
- order_gen_class: !!python/name:overcooked_simulator.order.RandomOrderGeneration ''
- # the class to that receives the kwargs. Should be a child class of OrderGeneration in order.py
+ order_gen_class: !!python/name:cooperative_cuisine.order.RandomOrderGeneration ''
+ # the class to that receives the kwargs. Should be a child class of OrderGeneration in orders.py
order_gen_kwargs:
order_duration_random_func:
# how long should the orders be alive
@@ -89,7 +89,7 @@ player_config:
effect_manager: { }
# FireManager:
-# class: !!python/name:overcooked_simulator.effect_manager.FireEffectManager ''
+# class: !!python/name:cooperative_cuisine.effect_manager.FireEffectManager ''
# kwargs:
# spreading_duration: [ 5, 10 ]
# fire_burns_ingredients_and_meals: true
@@ -98,75 +98,75 @@ effect_manager: { }
extra_setup_functions:
# # --------------- Scoring ---------------
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 1
serve_not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 1
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -0.2
item_cut:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ cutting_board_100 ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 0.01
stepped:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ post_step ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -0.01
combine:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ drop_off_on_cooking_equipment ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 0.01
# json_states:
- # func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ # func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ json_state ]
- # log_class: !!python/name:overcooked_simulator.recording.LogRecorder ''
+ # log_class: !!python/name:cooperative_cuisine.recording.LogRecorder ''
# log_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/json_states.jsonl
# actions:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ pre_perform_action ]
-# log_class: !!python/name:overcooked_simulator.recording.LogRecorder ''
+# log_class: !!python/name:cooperative_cuisine.recording.LogRecorder ''
# log_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
# random_env_events:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ order_duration_sample, plate_out_of_kitchen_time ]
-# log_class: !!python/name:overcooked_simulator.recording.LogRecorder ''
+# log_class: !!python/name:cooperative_cuisine.recording.LogRecorder ''
# log_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
# add_hook_ref: true
# env_configs:
-# func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+# func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
# kwargs:
# hooks: [ env_initialized, item_info_config ]
-# log_class: !!python/name:overcooked_simulator.recording.LogRecorder ''
+# log_class: !!python/name:cooperative_cuisine.recording.LogRecorder ''
# log_class_kwargs:
# log_path: USER_LOG_DIR/ENV_NAME/LOG_RECORD_NAME.jsonl
# add_hook_ref: true
diff --git a/overcooked_simulator/reinforcement_learning/full_vectorization.py b/cooperative_cuisine/reinforcement_learning/full_vectorization.py
similarity index 100%
rename from overcooked_simulator/reinforcement_learning/full_vectorization.py
rename to cooperative_cuisine/reinforcement_learning/full_vectorization.py
diff --git a/overcooked_simulator/reinforcement_learning/gym_env.py b/cooperative_cuisine/reinforcement_learning/gym_env.py
similarity index 97%
rename from overcooked_simulator/reinforcement_learning/gym_env.py
rename to cooperative_cuisine/reinforcement_learning/gym_env.py
index 4b59ec576878ad4493fbac00288c06a4a6b85a13..7bacc68c42bafd29257976a351307ea4c268cc72 100644
--- a/overcooked_simulator/reinforcement_learning/gym_env.py
+++ b/cooperative_cuisine/reinforcement_learning/gym_env.py
@@ -20,16 +20,16 @@ from stable_baselines3.common.env_util import make_vec_env
from stable_baselines3.common.vec_env import VecVideoRecorder
from wandb.integration.sb3 import WandbCallback
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.counters import Counter, CookingCounter, Dispenser
-from overcooked_simulator.game_items import CookingEquipment
-from overcooked_simulator.gui_2d_vis.drawing import Visualizer
-from overcooked_simulator.overcooked_environment import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.counters import Counter, CookingCounter, Dispenser
+from cooperative_cuisine.environment import (
Environment,
Action,
ActionType,
InterActionData,
)
+from cooperative_cuisine.game_items import CookingEquipment
+from cooperative_cuisine.pygame_2d_vis.drawing import Visualizer
class SimpleActionSpace(Enum):
@@ -99,7 +99,7 @@ with open(layout_path, "r") as file:
layout = file.read()
with open(environment_config_path, "r") as file:
environment_config = file.read()
-with open(ROOT_DIR / "gui_2d_vis" / "visualization.yaml", "r") as file:
+with open(ROOT_DIR / "pygame_2d_vis" / "visualization.yaml", "r") as file:
visualization_config = yaml.safe_load(file)
diff --git a/overcooked_simulator/reinforcement_learning/item_info_rl.yaml b/cooperative_cuisine/reinforcement_learning/item_info_rl.yaml
similarity index 100%
rename from overcooked_simulator/reinforcement_learning/item_info_rl.yaml
rename to cooperative_cuisine/reinforcement_learning/item_info_rl.yaml
diff --git a/overcooked_simulator/reinforcement_learning/rl.layout b/cooperative_cuisine/reinforcement_learning/rl.layout
similarity index 100%
rename from overcooked_simulator/reinforcement_learning/rl.layout
rename to cooperative_cuisine/reinforcement_learning/rl.layout
diff --git a/overcooked_simulator/reinforcement_learning/rl_small.layout b/cooperative_cuisine/reinforcement_learning/rl_small.layout
similarity index 100%
rename from overcooked_simulator/reinforcement_learning/rl_small.layout
rename to cooperative_cuisine/reinforcement_learning/rl_small.layout
diff --git a/overcooked_simulator/scores.py b/cooperative_cuisine/scores.py
similarity index 81%
rename from overcooked_simulator/scores.py
rename to cooperative_cuisine/scores.py
index 3b211d13b9c9f39b62e11b4020433a119470526f..b0f968bd7cfc3d2e44bafd91827b7d4ba3e7ccab 100644
--- a/overcooked_simulator/scores.py
+++ b/cooperative_cuisine/scores.py
@@ -14,10 +14,10 @@ You can filter the events via `kwarg_filter`.
```yaml
extra_setup_functions:
orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ completed_order ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 20
score_on_specific_kwarg: meal_name
@@ -27,24 +27,24 @@ extra_setup_functions:
Salad: 5
TomatoSoup: 10
not_ordered_meals:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ serve_not_ordered_meal ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: 2
trashcan_usages:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ trashcan_usage ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -5
expired_orders:
- func: !!python/name:overcooked_simulator.hooks.hooks_via_callback_class ''
+ func: !!python/name:cooperative_cuisine.hooks.hooks_via_callback_class ''
kwargs:
hooks: [ order_expired ]
- callback_class: !!python/name:overcooked_simulator.scores.ScoreViaHooks ''
+ callback_class: !!python/name:cooperative_cuisine.scores.ScoreViaHooks ''
callback_class_kwargs:
static_score: -10
```
@@ -55,8 +55,8 @@ extra_setup_functions:
from typing import Any
-from overcooked_simulator.hooks import HookCallbackClass
-from overcooked_simulator.overcooked_environment import Environment
+from cooperative_cuisine.environment import Environment
+from cooperative_cuisine.hooks import HookCallbackClass
class ScoreViaHooks(HookCallbackClass):
diff --git a/overcooked_simulator/server_results.py b/cooperative_cuisine/server_results.py
similarity index 89%
rename from overcooked_simulator/server_results.py
rename to cooperative_cuisine/server_results.py
index 54cfad76c7eecb37ce666be1e3213c5f8f21790c..74b84f7dcfdb44040a831cf376bd5658a0ab6969 100644
--- a/overcooked_simulator/server_results.py
+++ b/cooperative_cuisine/server_results.py
@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
from typing_extensions import TypedDict, Literal
if TYPE_CHECKING:
- from overcooked_simulator.game_server import PlayerRequestType
+ from cooperative_cuisine.game_server import PlayerRequestType
class PlayerInfo(TypedDict):
diff --git a/overcooked_simulator/state_representation.py b/cooperative_cuisine/state_representation.py
similarity index 100%
rename from overcooked_simulator/state_representation.py
rename to cooperative_cuisine/state_representation.py
diff --git a/overcooked_simulator/study_server.py b/cooperative_cuisine/study_server.py
similarity index 89%
rename from overcooked_simulator/study_server.py
rename to cooperative_cuisine/study_server.py
index 5a49922ba8e5e4838bf3a8fc58754e7908baf238..3319cdde14eb4748399c12b5b01cf821e703d879 100644
--- a/overcooked_simulator/study_server.py
+++ b/cooperative_cuisine/study_server.py
@@ -1,12 +1,12 @@
"""
# Usage
-- Set `CONNECT_WITH_STUDY_SERVER` in overcooked_gui.py to True.
+- Set `CONNECT_WITH_STUDY_SERVER` in gui.py to True.
- Run this script. Copy the manager id that is printed
- Run the game_server.py script with the manager id copied from the terminal
```
python game_server.py --manager_ids COPIED_UUID
```
-- Run 2 overcooked_gui.py scripts in different terminals. For more players change `NUMBER_PLAYER_PER_ENV` and start more guis.
+- Run 2 gui.py scripts in different terminals. For more players change `NUMBER_PLAYER_PER_ENV` and start more guis.
The environment starts when all players connected.
"""
@@ -27,11 +27,11 @@ import uvicorn
import yaml
from fastapi import FastAPI
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.game_server import CreateEnvironmentConfig
-from overcooked_simulator.overcooked_environment import EnvironmentConfig
-from overcooked_simulator.server_results import PlayerInfo
-from overcooked_simulator.utils import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.environment import EnvironmentConfig
+from cooperative_cuisine.game_server import CreateEnvironmentConfig
+from cooperative_cuisine.server_results import PlayerInfo
+from cooperative_cuisine.utils import (
url_and_port_arguments,
add_list_of_manager_ids_arguments,
)
@@ -43,7 +43,6 @@ log = logging.getLogger(__name__)
app = FastAPI()
-
# HARDCODED_MANAGER_ID = "1234"
USE_AAAMBOS_AGENT = False
@@ -116,16 +115,14 @@ class StudyState:
return filled and not self.is_full
def create_env(self, level):
- with open(ROOT_DIR / "game_content" / level["item_info_path"], "r") as file:
+ with open(ROOT_DIR / "configs" / level["item_info_path"], "r") as file:
item_info = file.read()
self.current_item_info: EnvironmentConfig = yaml.load(
item_info, Loader=yaml.Loader
)
- with open(
- ROOT_DIR / "game_content" / "layouts" / level["layout_path"], "r"
- ) as file:
+ with open(ROOT_DIR / "configs" / "layouts" / level["layout_path"], "r") as file:
layout = file.read()
- with open(ROOT_DIR / "game_content" / level["config_path"], "r") as file:
+ with open(ROOT_DIR / "configs" / level["config_path"], "r") as file:
environment_config = file.read()
self.current_config: EnvironmentConfig = yaml.load(
environment_config, Loader=yaml.Loader
@@ -234,9 +231,9 @@ class StudyState:
"aaambos",
"run",
"--arch_config",
- str(ROOT_DIR / "game_content" / "agents" / "arch_config.yml"),
+ str(ROOT_DIR / "configs" / "agents" / "arch_config.yml"),
"--run_config",
- str(ROOT_DIR / "game_content" / "agents" / "run_config.yml"),
+ str(ROOT_DIR / "configs" / "agents" / "run_config.yml"),
f'--general_plus="agent_websocket:{self.websocket_url + player_info["client_id"]};player_hash:{player_hash};agent_id:{player_id}"',
f"--instance={player_hash}",
]
@@ -248,7 +245,7 @@ class StudyState:
" ".join(
[
"python",
- str(ROOT_DIR / "game_content" / "agents" / "random_agent.py"),
+ str(ROOT_DIR / "configs" / "agents" / "random_agent.py"),
f'--uri {self.websocket_url + player_info["client_id"]}',
f"--player_hash {player_hash}",
f"--player_id {player_id}",
@@ -288,7 +285,6 @@ class StudyManager:
self.game_server_url: str | None = None
self.server_manager_id: str | None = None
-
self.running_studies: list[StudyState] = []
self.participant_id_to_study_map: dict[str, StudyState] = {}
@@ -300,7 +296,11 @@ class StudyManager:
] = {}
def create_study(self):
- study = StudyState(ROOT_DIR / "game_content" / "study" / "study_config.yaml", self.game_host, self.game_port)
+ study = StudyState(
+ ROOT_DIR / "configs" / "study" / "study_config.yaml",
+ self.game_host,
+ self.game_port,
+ )
study.start()
self.running_studies.append(study)
@@ -337,6 +337,7 @@ class StudyManager:
study_manager = StudyManager()
+
@app.post("/start_study/{participant_id}/{number_players}")
async def start_study(participant_id: str, number_players: int):
player_info = study_manager.add_participant(participant_id, number_players)
@@ -358,9 +359,9 @@ async def get_game_connection(participant_id: str):
@app.post("/connect_to_tutorial/{participant_id}")
async def want_to_play_tutorial(participant_id: str):
- environment_config_path = ROOT_DIR / "game_content" / "tutorial_env_config.yaml"
- layout_path = ROOT_DIR / "game_content" / "layouts" / "tutorial.layout"
- item_info_path = ROOT_DIR / "game_content" / "item_info.yaml"
+ environment_config_path = ROOT_DIR / "configs" / "tutorial_env_config.yaml"
+ layout_path = ROOT_DIR / "configs" / "layouts" / "tutorial.layout"
+ item_info_path = ROOT_DIR / "configs" / "item_info.yaml"
with open(item_info_path, "r") as file:
item_info = file.read()
@@ -403,13 +404,13 @@ async def want_to_play_tutorial(participant_id: str):
)
-
def main(study_host, study_port, game_host, game_port, manager_ids):
-
study_manager.set_game_server_url(game_host=game_host, game_port=game_port)
study_manager.set_manager_id(manager_id=manager_ids[0])
- print(f"Use {study_manager.server_manager_id=} for game_server_url=http://{game_host}:{game_port}")
+ print(
+ f"Use {study_manager.server_manager_id=} for game_server_url=http://{game_host}:{game_port}"
+ )
loop = asyncio.new_event_loop()
config = uvicorn.Config(app, host=study_host, port=study_port, loop=loop)
server = uvicorn.Server(config)
@@ -418,11 +419,16 @@ def main(study_host, study_port, game_host, game_port, manager_ids):
if __name__ == "__main__":
parser = argparse.ArgumentParser(
- prog="Overcooked Simulator Study Server",
+ prog="Cooperative Cuisine Study Server",
description="Study Server: Match Making, client pre and post managing.",
epilog="For further information, see https://scs.pages.ub.uni-bielefeld.de/cocosy/overcooked-simulator/overcooked_simulator.html",
)
- url_and_port_arguments(parser=parser, server_name="Study Server", default_study_port=8080, default_game_port=8000)
+ url_and_port_arguments(
+ parser=parser,
+ server_name="Study Server",
+ default_study_port=8080,
+ default_game_port=8000,
+ )
add_list_of_manager_ids_arguments(parser=parser)
args = parser.parse_args()
@@ -434,4 +440,3 @@ if __name__ == "__main__":
game_port=args.game_port,
manager_ids=args.manager_ids,
)
-
diff --git a/overcooked_simulator/utils.py b/cooperative_cuisine/utils.py
similarity index 97%
rename from overcooked_simulator/utils.py
rename to cooperative_cuisine/utils.py
index cd67511381483b80536225dbaeb2caae45a51d7d..2d0a7dc38472667f22e9673cddbbe4d8f29e7fe8 100644
--- a/overcooked_simulator/utils.py
+++ b/cooperative_cuisine/utils.py
@@ -18,13 +18,13 @@ import numpy as np
import numpy.typing as npt
from scipy.spatial import distance_matrix
-from overcooked_simulator import ROOT_DIR
+from cooperative_cuisine import ROOT_DIR
if TYPE_CHECKING:
- from overcooked_simulator.counters import Counter
-from overcooked_simulator.player import Player
+ from cooperative_cuisine.counters import Counter
+from cooperative_cuisine.player import Player
-DEFAULT_SERVER_URL = "risotto"
+DEFAULT_SERVER_URL = "localhost"
@dataclasses.dataclass
@@ -179,7 +179,6 @@ def setup_logging(enable_websocket_logging=False):
def url_and_port_arguments(
parser, server_name="game server", default_study_port=8080, default_game_port=8000
):
-
parser.add_argument(
"-study-url",
"--study-url",
diff --git a/setup.py b/setup.py
index 6973b6b234f283ffd72085b0329d2e163706ccce..658851b4e072e83add01ebbf22717eb837a7801a 100644
--- a/setup.py
+++ b/setup.py
@@ -48,15 +48,15 @@ setup(
],
description="The real-time overcooked simulation for a cognitive cooperative system",
entry_points={
- "console_scripts": ["overcooked-sim = overcooked_simulator.__main__:main"]
+ "console_scripts": ["cooperative_cuisine = cooperative_cuisine.__main__:main"]
},
install_requires=requirements,
license="MIT license",
long_description=readme + "\n\n" + history,
include_package_data=True,
- keywords=["overcooked_simulator"],
- name="overcooked_simulator",
- packages=find_packages(include=["overcooked_simulator", "overcooked_simulator.*"]),
+ keywords=["cooperative_cuisine"],
+ name="cooperative_cuisine",
+ packages=find_packages(include=["cooperative_cuisine", "cooperative_cuisine.*"]),
test_suite="tests",
tests_require=test_requirements,
url="https://gitlab.ub.uni-bielefeld.de/scs/cocosy/overcooked-simulator",
diff --git a/tests/test_start.py b/tests/test_start.py
index 8531f9d81dc52cb4327c98e641406ad2d45bdec2..eb4746dfb41dc33db2a548ef5b675adfc46e9d7d 100644
--- a/tests/test_start.py
+++ b/tests/test_start.py
@@ -3,23 +3,23 @@ from datetime import timedelta
import numpy as np
import pytest
-from overcooked_simulator import ROOT_DIR
-from overcooked_simulator.counters import Counter, CuttingBoard
-from overcooked_simulator.game_items import Item, ItemInfo, ItemType
-from overcooked_simulator.hooks import Hooks
-from overcooked_simulator.overcooked_environment import (
+from cooperative_cuisine import ROOT_DIR
+from cooperative_cuisine.counters import Counter, CuttingBoard
+from cooperative_cuisine.environment import (
Action,
Environment,
ActionType,
InterActionData,
)
-from overcooked_simulator.utils import create_init_env_time
+from cooperative_cuisine.game_items import Item, ItemInfo, ItemType
+from cooperative_cuisine.hooks import Hooks
+from cooperative_cuisine.utils import create_init_env_time
-layouts_folder = ROOT_DIR / "game_content" / "layouts"
-environment_config_path = ROOT_DIR / "game_content" / "environment_config.yaml"
-layout_path = ROOT_DIR / "game_content" / "layouts" / "basic.layout"
-layout_empty_path = ROOT_DIR / "game_content" / "layouts" / "basic.layout"
-item_info_path = ROOT_DIR / "game_content" / "item_info.yaml"
+layouts_folder = ROOT_DIR / "configs" / "layouts"
+environment_config_path = ROOT_DIR / "configs" / "environment_config.yaml"
+layout_path = ROOT_DIR / "configs" / "layouts" / "basic.layout"
+layout_empty_path = ROOT_DIR / "configs" / "layouts" / "basic.layout"
+item_info_path = ROOT_DIR / "configs" / "item_info.yaml"
# TODO: TESTs are in absolute pixel coordinates still.
@@ -238,9 +238,9 @@ def test_processing(env_config, layout_config, item_info):
def test_time_passed():
np.random.seed(42)
env = Environment(
- ROOT_DIR / "game_content" / "environment_config.yaml",
+ ROOT_DIR / "configs" / "environment_config.yaml",
layouts_folder / "empty.layout",
- ROOT_DIR / "game_content" / "item_info.yaml",
+ ROOT_DIR / "configs" / "item_info.yaml",
)
env.add_player("0")
env.reset_env_time()
@@ -260,9 +260,9 @@ def test_time_passed():
def test_time_limit():
np.random.seed(42)
env = Environment(
- ROOT_DIR / "game_content" / "environment_config.yaml",
+ ROOT_DIR / "configs" / "environment_config.yaml",
layouts_folder / "empty.layout",
- ROOT_DIR / "game_content" / "item_info.yaml",
+ ROOT_DIR / "configs" / "item_info.yaml",
)
env.add_player("0")