From acf195481c39ef8f8969c7428cb35bb44fe89e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Schr=C3=B6der?=
<fschroeder@techfak.uni-bielefeld.de>
Date: Mon, 22 Jan 2024 15:31:57 +0100
Subject: [PATCH] Refactor game items and rename 'ChipsSticks' to 'RawChips'
This commit includes a significant refactoring of the game items. The 'ChipsSticks' item has been renamed to 'RawChips' for clarity and accuracy across several game content files. Additionally, the 'FriedChips' and 'FriedFish' items have been reclassified from 'Ingredient' to 'Meal'. This change streamlines the hierarchy and makes the game items more intuitive to understand and use.
---
.../game_content/item_info.yaml | 9 +++----
.../game_content/item_info_debug.yaml | 26 ++++++-------------
.../gui_2d_vis/visualization.yaml | 2 +-
3 files changed, 13 insertions(+), 24 deletions(-)
diff --git a/overcooked_simulator/game_content/item_info.yaml b/overcooked_simulator/game_content/item_info.yaml
index bd12ebdd..00138537 100644
--- a/overcooked_simulator/game_content/item_info.yaml
+++ b/overcooked_simulator/game_content/item_info.yaml
@@ -94,7 +94,7 @@ Patty:
seconds: 4.0
equipment: CuttingBoard
-ChipsSticks:
+RawChips:
type: Ingredient
needs: [ Potato ]
seconds: 4.0
@@ -130,10 +130,12 @@ CookedPatty:
needs: [ Patty ]
equipment: Pan
+# --------------------------------------------------------------------------------
+
Chips:
type: Meal
seconds: 5.0
- needs: [ ChipsSticks ]
+ needs: [ RawChips ]
equipment: Basket
FriedFish:
@@ -142,9 +144,6 @@ FriedFish:
needs: [ ChoppedFish ]
equipment: Basket
-
-# --------------------------------------------------------------------------------
-
Burger:
type: Meal
needs: [ Bun, ChoppedLettuce, ChoppedTomato, CookedPatty ]
diff --git a/overcooked_simulator/game_content/item_info_debug.yaml b/overcooked_simulator/game_content/item_info_debug.yaml
index a7724749..b00ea70b 100644
--- a/overcooked_simulator/game_content/item_info_debug.yaml
+++ b/overcooked_simulator/game_content/item_info_debug.yaml
@@ -94,7 +94,7 @@ Patty:
seconds: 0.1
equipment: CuttingBoard
-ChipsSticks:
+RawChips:
type: Ingredient
needs: [ Potato ]
seconds: 0.1
@@ -130,21 +130,21 @@ CookedPatty:
needs: [ Patty ]
equipment: Pan
-FriedChips:
- type: Ingredient
+# --------------------------------------------------------------------------------
+
+Chips:
+ type: Meal
seconds: 0.1
- needs: [ ChipsSticks ]
+ needs: [ RawChips ]
equipment: Basket
FriedFish:
- type: Ingredient
+ type: Meal
seconds: 0.1
needs: [ ChoppedFish ]
equipment: Basket
-# --------------------------------------------------------------------------------
-
Burger:
type: Meal
needs: [ Bun, ChoppedLettuce, ChoppedTomato, CookedPatty ]
@@ -167,19 +167,9 @@ OnionSoup:
seconds: 0.1
equipment: Pot
-Chips:
- type: Meal
- needs: [ FriedChips ]
- equipment: ~
-
-FishMeal:
- type: Meal
- needs: [ FriedFish ]
- equipment: ~
-
FishAndChips:
type: Meal
- needs: [ FriedFish, FriedChips ]
+ needs: [ FriedFish, Chips ]
equipment: ~
Pizza:
diff --git a/overcooked_simulator/gui_2d_vis/visualization.yaml b/overcooked_simulator/gui_2d_vis/visualization.yaml
index 3dd8ef5a..db16fea1 100644
--- a/overcooked_simulator/gui_2d_vis/visualization.yaml
+++ b/overcooked_simulator/gui_2d_vis/visualization.yaml
@@ -337,7 +337,7 @@ Potato:
color: gray83
radius: 0.1
-ChipsSticks:
+RawChips:
parts:
- type: rect
color: ORANGE2
--
GitLab