Skip to content
Snippets Groups Projects
Commit acf19548 authored by Florian Schröder's avatar Florian Schröder
Browse files

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.
parent 0d93ed46
No related branches found
No related tags found
1 merge request!30Resolve "Item and Meal extension fish and chips, pizza; general class for cooking counter -> stove, deep fryer, oven on class"
Pipeline #44366 passed
......@@ -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 ]
......
......@@ -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:
......
......@@ -337,7 +337,7 @@ Potato:
color: gray83
radius: 0.1
ChipsSticks:
RawChips:
parts:
- type: rect
color: ORANGE2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment