diff --git a/overcooked_simulator/game_content/item_info.yaml b/overcooked_simulator/game_content/item_info.yaml index bd12ebddb9e154d5bc785ce4386986a929b10370..001385378e930994f93fa88cd1e3ac91b82fa221 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 a7724749aedf178210190f833d06cc8e8fea1637..b00ea70b442e5e504f56d55f43e1ba7a398d32e2 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 3dd8ef5aee3a40af5bc240f810f2a06456dbc944..db16fea17cc82fc29f9ec472dc5dfa87a702bcb4 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