From 6c6c38f34590bc79736eaaa50e60b1c89f4c584c Mon Sep 17 00:00:00 2001
From: Dominik Battefeld <dbattefeld@techfak.de>
Date: Thu, 21 Dec 2023 10:22:34 +0100
Subject: [PATCH] Add new yaml proposal, graph + graph plot dependencies
---
.../game_content/item_info_new.yaml | 79 +++++++++++++++++++
overcooked_simulator/main.py | 1 +
setup.py | 11 ++-
3 files changed, 90 insertions(+), 1 deletion(-)
create mode 100644 overcooked_simulator/game_content/item_info_new.yaml
diff --git a/overcooked_simulator/game_content/item_info_new.yaml b/overcooked_simulator/game_content/item_info_new.yaml
new file mode 100644
index 00000000..11f0ae05
--- /dev/null
+++ b/overcooked_simulator/game_content/item_info_new.yaml
@@ -0,0 +1,79 @@
+CuttingBoard:
+ type: Equipment
+
+Pot:
+ type: Equipment
+
+Pan:
+ type: Equipment
+
+# --------------------------------------------------------------------------------
+
+Tomato:
+ type: Ingredient
+
+Lettuce:
+ type: Ingredient
+
+Onion:
+ type: Ingredient
+
+Meat:
+ type: Ingredient
+
+Bun:
+ type: Ingredient
+
+ChoppedTomato:
+ type: Ingredient
+ needs: [ Tomato ]
+ steps: 500
+ equipment: CuttingBoard
+
+ChoppedLettuce:
+ type: Ingredient
+ needs: [ Lettuce ]
+ steps: 700
+ equipment: CuttingBoard
+
+ChoppedOnion:
+ type: Ingredient
+ needs: [ Onion ]
+ steps: 500
+ equipment: CuttingBoard
+
+ChoppedMeat:
+ type: Ingredient
+ needs: [ Meat ]
+ steps: 700
+ equipment: CuttingBoard
+
+CookedPatty:
+ type: Ingredient
+ steps: 500
+ needs: [ ChoppedMeat ]
+ equipment: Pan
+
+# --------------------------------------------------------------------------------
+
+Burger:
+ type: Meal
+ needs: [ Bun, ChoppedLettuce, ChoppedTomato, CookedPatty ]
+ equipment: [ ]
+
+Salad:
+ type: Meal
+ needs: [ ChoppedLettuce, ChoppedTomato ]
+ equipment: [ ]
+
+TomatoSoup:
+ type: Meal
+ steps: 500
+ needs: [ ChoppedTomato, ChoppedTomato, ChoppedTomato ]
+ equipment: Pot
+
+OnionSoup:
+ type: Meal
+ steps: 500
+ needs: [ ChoppedOnion, ChoppedOnion, ChoppedOnion ]
+ equipment: Pot
diff --git a/overcooked_simulator/main.py b/overcooked_simulator/main.py
index 239779f4..c12f884f 100644
--- a/overcooked_simulator/main.py
+++ b/overcooked_simulator/main.py
@@ -27,6 +27,7 @@ def setup_logging():
logging.StreamHandler(sys.stdout),
],
)
+ logging.getLogger("matplotlib").setLevel(logging.WARNING)
def main():
diff --git a/setup.py b/setup.py
index 69f30ff3..d1fff972 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,16 @@ with open("README.md") as readme_file:
with open("CHANGELOG.md") as history_file:
history = history_file.read()
-requirements = ["numpy", "pygame", "scipy", "pytest>=3", "pyyaml"]
+requirements = [
+ "numpy",
+ "pygame",
+ "scipy",
+ "pytest>=3",
+ "pyyaml",
+ "networkx",
+ "matplotlib",
+ "pygraphviz",
+]
test_requirements = [
"pytest>=3",
--
GitLab