diff --git a/overcooked_simulator/game_content/item_info.yaml b/overcooked_simulator/game_content/item_info.yaml index 09003d8d997b6d955bde71d489ef2ccf04c0da4d..bd12ebddb9e154d5bc785ce4386986a929b10370 100644 --- a/overcooked_simulator/game_content/item_info.yaml +++ b/overcooked_simulator/game_content/item_info.yaml @@ -130,14 +130,14 @@ CookedPatty: needs: [ Patty ] equipment: Pan -FriedChips: - type: Ingredient +Chips: + type: Meal seconds: 5.0 needs: [ ChipsSticks ] equipment: Basket FriedFish: - type: Ingredient + type: Meal seconds: 5.0 needs: [ ChoppedFish ] equipment: Basket @@ -167,19 +167,9 @@ OnionSoup: seconds: 6.0 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 fc28936fd0bff0dd5e269b11bc4f18785e722453..3dd8ef5aee3a40af5bc240f810f2a06456dbc944 100644 --- a/overcooked_simulator/gui_2d_vis/visualization.yaml +++ b/overcooked_simulator/gui_2d_vis/visualization.yaml @@ -360,29 +360,6 @@ ChipsSticks: width: 0.8 center_offset: [ 0.0, -0.1 ] -FriedChips: - parts: - - type: rect - color: orange3 - height: 0.1 - width: 0.8 - center_offset: [ -0.2, -0.3 ] - - type: rect - color: orange3 - height: 0.1 - width: 0.8 - center_offset: [ 0.0, -0.3 ] - - type: rect - color: orange3 - height: 0.1 - width: 0.8 - center_offset: [ 0.2, -0.3 ] - - type: rect - color: orange3 - height: 0.8 - width: 0.1 - center_offset: [ -0.3, -0.0 ] - Chips: parts: - type: rect @@ -440,19 +417,6 @@ FriedFish: width: 0.3 center_offset: [ 0.2, -0.15 ] -FishMeal: - parts: - - type: rect - color: palevioletred4 - height: 0.3 - width: 0.3 - center_offset: [ -0.2, -0.15 ] - - type: rect - color: palevioletred4 - height: 0.3 - width: 0.3 - center_offset: [ 0.2, -0.15 ] - FishAndChips: parts: - type: rect