Merge pull request #894 from FL-OZ/recipes_n_stuff

2020-05-11 11:08:08 +02:00
parent 079dc839de c9c1d0dfd7
commit 033a6a82b5
4 changed files with 371 additions and 28 deletions
--- a/Resources/Prototypes/Entities/Items/Consumables/food.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml
@@ -1482,19 +1482,21 @@
  - type: Icon
    sprite: Objects/Food/loadedbakedpotato.rsi

-# - type: entity
-#  parent: FoodBase
-#  id: FoodMeat
-#  name: Meat
-#  description: A slab of meat.
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/meat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/meat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodMeat
+  name: Meat
+  description: A slab of meat.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 5
+  - type: Sprite
+    sprite: Objects/Food/meat.rsi
+  - type: Icon
+    sprite: Objects/Food/meat.rsi

 - type: entity
  parent: FoodBase
@@ -2835,19 +2837,21 @@
  - type: Icon
    sprite: Objects/Food/xenobreadslice.rsi

-#- type: entity
-#  parent: FoodBase
-#  id: FoodXenomeat
-#  name: Xenomeat
-#  description: ''
-#  components:
-#  - type: Food
-#    uses: 1
-#    restore_amount: 1
-#  - type: Sprite
-#    sprite: Objects/Food/xenomeat.rsi
-#  - type: Icon
-#    sprite: Objects/Food/xenomeat.rsi
+- type: entity
+  parent: FoodBase
+  id: FoodXenomeat
+  name: Xenomeat
+  description: Yum.
+  components:
+  - type: Food
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 20
+  - type: Sprite
+    sprite: Objects/Food/xenomeat.rsi
+  - type: Icon
+    sprite: Objects/Food/xenomeat.rsi

 - type: entity
  parent: FoodBase
--- a/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/kitchen_reagent_containers.yml
@@ -0,0 +1,22 @@
+- type: entity
+  parent: BaseItem
+  id: ReagentContainerFlour
+  name: Flour
+  description: Not to be confused with flower.
+  components:
+  - type: Solution
+    maxVol: 50
+    contents:
+      reagents:
+      - ReagentId: chem.Flour
+        Quantity: 50
+  - type: Pourable
+    transferAmount: 5
+  - type: Drink
+    despawn_empty: true
+  - type: Sprite
+    sprite: Objects/Food/flour.rsi
+    state: icon
+  - type: Icon
+    sprite: Objects/Food/flour.rsi
+    state: icon
--- a/Resources/Prototypes/Kitchen/meal_recipes.yml
+++ b/Resources/Prototypes/Kitchen/meal_recipes.yml
@@ -1,17 +1,323 @@
+
+#Burgers
 - type: microwaveMealRecipe
  id: RecipeCheeseburger
  name: Cheeseburger Recipe
  result: FoodCheeseburger
  time: 5
  reagents:
-    chem.Nutriment: 10
+    chem.Flour: 5
+  solids:
+    FoodMeat: 1
+
+- type: microwaveMealRecipe
+  id: RecipeTofuBurger
+  name: Tofu Burger Recipe
+  result: FoodTofuBurger
+  time: 5
+  reagents:
+    chem.Flour: 15
+  solids:
+    Tofu: 1
+
+- type: microwaveMealRecipe
+  id: RecipeXenoburger
+  name: Xenoburger Recipe
+  result: FoodXenoburger
+  time: 5
+  reagents:
+    chem.Flour: 5
+  solids:
+    FoodXenomeat: 1
+
+- type: microwaveMealRecipe
+  id: RecipeSuperBiteBurger
+  name: Super Bite Burger Recipe
+  result: FoodSuperBiteBurger
+  time: 20
+  reagents:
+    chem.Flour: 15
+    chem.Salt: 5
+    chem.Pepper: 5
+  solids:
+    FoodMeat: 5
+    FoodCheeseWedge: 3
+    FoodTomato: 4
+    FoodEgg: 2
+
+#Breads & Sandwiches
+- type: microwaveMealRecipe
+  id: RecipeBread
+  name: Bread Recipe
+  result: DrinkFoodContainerBread
+  time: 15
+  reagents:
+    chem.Flour: 15
+
+- type: microwaveMealRecipe
+  id: RecipeSandwich
+  name: Sandwich Recipe
+  result: FoodSandwich
+  time: 10
  solids:
    FoodBreadSlice: 2
+    FoodMeatSteak: 1
+    FoodCheeseWedge: 1

+- type: microwaveMealRecipe
+  id: RecipeToastedSandwich
+  name: Toasted Sandwich Recipe
+  result: FoodToastedSandwich
+  time: 5
+  solids:
+    FoodSandwich: 1
+
+- type: microwaveMealRecipe
+  id: RecipeGrilledCheese
+  name: Grilled Cheese Recipe
+  result: FoodGrilledCheese
+  time: 5
+  solids:
+    FoodBreadSlice: 2
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeBaguette
+  name: Baguette Recipe
+  result: FoodBaguette
+  time: 10
+  reagents:
+    chem.Flour: 15
+    chem.Salt: 1
+    chem.Pepper: 1
+
+- type: microwaveMealRecipe
+  id: RecipeCreamCheeseBread
+  name: Cream Cheese Bread Recipe
+  result: DrinkFoodContainerCreamCheeseBread
+  time: 20
+  reagents:
+    chem.Flour: 15
+  solids:
+    FoodCheeseWedge: 2
+
+- type: microwaveMealRecipe
+  id: RecipeBananaBread
+  name: Banana Bread Recipe
+  result: DrinkFoodContainerBananaBread
+  time: 25
+  reagents:
+    chem.Flour: 15
+    chem.Milk: 5
+  solids:
+    FoodEgg: 3
+    FoodBanana: 1
+
+
+
+#Pizzas
+- type: microwaveMealRecipe
+  id: RecipeMargheritaPizza
+  name: Margherita Pizza Recipe
+  result: DrinkFoodContainerMargheritaPizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodCheeseWedge: 4
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeMushroomPizza
+  name: Mushroom Pizza Recipe
+  result: DrinkFoodContainerMushroomPizza
+  time: 25
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodMushroom: 5
+
+- type: microwaveMealRecipe
+  id: RecipeMeatPizza
+  name: Meat Pizza Recipe
+  result: DrinkFoodContainerMeatPizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodMeat: 3
+    FoodCheeseWedge: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeVegetablePizza
+  name: Vegetable Pizza Recipe
+  result: DrinkFoodContainerVegetablePizza
+  time: 30
+  reagents:
+    chem.Flour: 10
+  solids:
+    FoodEggplant: 1
+    FoodCarrot: 1
+    FoodCorn: 1
+    FoodTomato: 1
+
+#Italian
+- type: microwaveMealRecipe
+  id: RecipeSpaghetti
+  name:  Spaghetti Recipe
+  result: FoodSpaghetti
+  time: 1
+  reagents:
+    chem.Flour: 5
+
+- type: microwaveMealRecipe
+  id: RecipeBoiledSpaghetti
+  name: Boiled Spaghetti Recipe
+  result: FoodSpagettiBoiled
+  time: 5
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+
+- type: microwaveMealRecipe
+  id: RecipePastaTomato
+  name: Pasta Tomato Recipe
+  result: FoodPastaTomato
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+    FoodTomato: 2
+
+- type: microwaveMealRecipe
+  id: RecipeMeatballSpaghetti
+  name: Spaghetti & Meatballs Recipe
+  result: FoodMeatballSpaghetti
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodSpagetti: 1
+    FoodMeatball: 2
+
+- type: microwaveMealRecipe
+  id: RecipeCrabSpaghetti
+  name: Crab Spaghetti Recipe
+  result: FoodCrabSpaghetti
+  time: 10
+  reagents:
+    chem.H2O: 5
+  solids:
+    FoodCrabMeat: 2
+
+- type: microwaveMealRecipe
+  id: RecipeCopypasta
+  name: Copypasta Recipe
+  result: FoodCopypasta
+  time: 10
+  solids:
+    FoodPastaTomato: 2
+
+# - type: microwaveMealRecipe
+#   id: RecipeMoMMISpaghetti
+#   name: MoMMI Spaghetti Recipe
+#   result: FoodMoMMISpaghetti
+#   time: 10
+#   reagents:
+#     chem.Flour: 5
+#   solids:
+
+- type: microwaveMealRecipe
+  id: RecipeRisotto
+  name: Risotto Recipe
+  result: FoodRisotto
+  time: 10
+  reagents:
+    chem.Flour: 10 #This should be 10 units of rice.
+    chem.Wine: 5
+  solids:
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeBruschetta
+  name: Bruschetta Recipe
+  result: FoodBruschetta
+  time: 10
+  reagents:
+    chem.Flour: 10
+    chem.Salt: 2
+  solids:
+    FoodGarlic: 1
+    FoodCheeseWedge: 1
+    FoodTomato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeQuiche
+  name: Quiche Recipe
+  result: FoodQuiche
+  time: 10
+  solids:
+    FoodBlueTomato: 1
+    FoodGarlic: 1
+    FoodEgg: 1
+    FoodCheeseWedge: 1
+
+- type: microwaveMealRecipe
+  id: RecipeLasagna
+  name: Lasagna Recipe
+  result: FoodLasagna
+  time: 15
+  # reagents:
+  #   chem.TomatoJuice: 15
+  solids:
+    FoodFlatDough: 2
+    FoodMeat: 2
+    FoodEggPlant: 1
+    FoodCheeseWedge: 1
+
+#Soups & Stew
+- type: microwaveMealRecipe
+  id: RecipeMeatballSoup
+  name: Meatball Soup Recipe
+  result: FoodMeatballSoup
+  time: 10
+  reagents:
+    chem.H2O: 10
+  solids:
+    FoodMeatball: 1
+    FoodCarrot: 1
+    FoodPotato: 1
+
+- type: microwaveMealRecipe
+  id: RecipeNettleSoup
+  name: Nettle Soup Recipe
+  result: FoodNettleSoup
+  time: 10
+  reagents:
+    chem.H2O: 10
+  solids:
+    FoodNettle: 1
+    FoodEgg: 1
+    FoodPotato: 1
+
+#Other
+- type: microwaveMealRecipe
+  id: RecipeMeatSteak
+  name: Meat Steak Recipe
+  result: FoodMeatSteak
+  time: 10
+  reagents:
+    chem.Salt: 1
+    chem.Pepper: 1
+  solids:
+    FoodMeat: 1

 - type: microwaveMealRecipe
  id: RecipeMisoColaSoup
-  name: Salty Sweet MisoCola Soup Recipe
+  name: Salty Sweet MiloCola Soup Recipe
  result: DisgustingSweptSoup
  time: 15
  reagents:
@@ -19,3 +325,14 @@
  solids:
    FoodMiloSoup: 1

+
+
+#Handy template for copy **pasta**. Get it? Pasta? Aw whatever fuck you.
+# - type: microwaveMealRecipe
+#   id:
+#   name:
+#   result:
+#   time: 5
+#   reagents:
+
+#   solids:
--- a/Resources/Prototypes/Reagents/food_reagents.yml
+++ b/Resources/Prototypes/Reagents/food_reagents.yml