Add cheese & dough reactions (#5547)

* git mv * rename CreateEntityReaction -> CreateEntityTileReaction * cheese * change microwave recipes * remove unnecessary test * TryGet->Get
2021-11-27 11:50:14 +13:00
parent 7ecd08b8ca
commit 61423be24e
14 changed files with 169 additions and 91 deletions
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
@@ -34,6 +34,14 @@
      - id: MonkeyCubeBox
      - id: SprayBottleWater
      - id: ReagentContainerFlour
+        amount: 2
+      - id: ReagentContainerSugar
+      - id: FoodCondimentBottleEnzyme
+      # really, milk should go in the fridge. Unfortunately saltern only has freezers.
+      # yes, I'm using this as an excuse to not have to do extra work.
+      - id: ReagentContainerMilk
+        amount: 2
+      - id: ReagentContainerMilkSoy

 - type: entity
  id: ClosetJanitorFilled
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/dinnerware.yml
@@ -5,6 +5,7 @@
  startingInventory:
    ButchCleaver: 1
    KitchenKnife: 5
+    FoodBowlBig: 5
    DrinkGlass: 10
    DrinkMug: 5
    DrinkMugBlack: 2
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -2,14 +2,14 @@

 - type: entity
  name: bowl
-  parent: BaseItem
+  parent: ReagentContainerBase
  id: FoodBowlBig
  description: A simple bowl, used for soups and salads.
  components:
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 50 # enough to make cheese in.
  - type: Sprite
    sprite: Objects/Consumable/Food/bowl.rsi
    state: bowl
@@ -22,17 +22,11 @@
    damage:
      types:
        Blunt: 5
-  - type: Spillable
-    solution: food
-    # I suspect this ought to be more of a transformable container kinda thing.
-    # For now, these components make it usable.
  - type: Drink
    solution: food
    isOpen: true
  - type: DrawableSolution
    solution: food
-  - type: RefillableSolution
-    solution: food
  - type: Damageable
    damageContainer: Inorganic
  - type: Destructible
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -337,6 +337,7 @@
  description: A thin glass bottle used to store condiments.
  components:
  - type: Drink
+    solution: food
    openSounds:
      collection: pop
  - type: SolutionContainerManager
@@ -344,6 +345,8 @@
      food:
        maxVol: 30
  - type: SolutionTransfer
+    canChangeTransferAmount: true
+    minTransferAmount: 5
    maxTransferAmount: 30
  - type: Sprite
    netsync: false
@@ -480,6 +483,7 @@
  description: A smaller glass bottle used to store condiments.
  components:
  - type: Drink
+    solution: food
    openSounds:
      collection: pop
  - type: SolutionContainerManager
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -214,10 +214,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 50 # at least enough for one cheese
        reagents:
        - ReagentId: Milk
-          Quantity: 20
+          Quantity: 50

 - type: entity
  parent: ReagentContainerBase
@@ -230,10 +230,10 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol:  50
        reagents:
        - ReagentId: MilkSoy
-          Quantity: 20
+          Quantity: 50

 - type: entity
  parent: ReagentContainerBase
--- a/Resources/Prototypes/Reagents/fun.yml
+++ b/Resources/Prototypes/Reagents/fun.yml
@@ -5,7 +5,7 @@
  physicalDesc: fibrous
  color: "#800000"
  tileReactions:
-  - !type:CreateEntityReaction
+  - !type:CreateEntityTileReaction
    entity: Carpet
    maxOnTileWhitelist:
      tags: [ Carpet ]
@@ -31,7 +31,7 @@
  physicalDesc: buzzy
  color: "#FFD35D"
  tileReactions:
-  - !type:CreateEntityReaction
+  - !type:CreateEntityTileReaction
    entity: MobBee
    usage: 2
    maxOnTile: 2
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -4,19 +4,18 @@
  name: cheeseburger recipe
  result: FoodBurgerCheese
  time: 5
-  reagents:
-    Flour: 5
  solids:
+    FoodBreadPlainSlice: 2 # its not a burger bun, but its good enough
    FoodMeat: 1
+    FoodCheeseSlice: 1

 - type: microwaveMealRecipe
  id: RecipeClownBurger
  name: clownburger recipe
  result: FoodBurgerClown
  time: 5
-  reagents:
-    Flour: 5
  solids:
+    FoodBreadPlainSlice: 2
    ClothingMaskClown: 1

 # - type: microwaveMealRecipe
@@ -34,9 +33,8 @@
  name: xenoburger recipe
  result: FoodBurgerXeno
  time: 5
-  reagents:
-    Flour: 5
  solids:
+    FoodBreadPlainSlice: 2
    FoodMeatXeno: 1

 #- type: microwaveMealRecipe
@@ -60,8 +58,8 @@
  name: bread recipe
  result: FoodBreadPlain
  time: 15
-  reagents:
-    Flour: 15
+  solids:
+    FoodDough: 1

 # - type: microwaveMealRecipe
 #   id: RecipeSandwich
@@ -105,9 +103,8 @@
  name: cream cheese bread recipe
  result: FoodBreadCreamcheese
  time: 20
-  reagents:
-    Flour: 15
  solids:
+    FoodDough: 1
    FoodCheeseSlice: 2

 - type: microwaveMealRecipe
@@ -115,11 +112,8 @@
  name: banana bread recipe
  result: FoodBreadBanana
  time: 25
-  reagents:
-    Flour: 15
-    Milk: 5
  solids:
-    FoodEgg: 3
+    FoodDough: 1
    FoodBanana: 1

 #Pizzas
@@ -128,9 +122,8 @@
  name: margherita pizza recipe
  result: FoodPizzaMargherita
  time: 30
-  reagents:
-    Flour: 10
  solids:
+    FoodDough: 1
    FoodCheeseSlice: 4
    FoodTomato: 1

@@ -139,9 +132,8 @@
  name: mushroom pizza recipe
  result: FoodPizzaMushroom
  time: 25
-  reagents:
-    Flour: 10
  solids:
+    FoodDough: 1
    FoodMushroom: 5

 - type: microwaveMealRecipe
@@ -149,9 +141,8 @@
  name: meat pizza recipe
  result: FoodPizzaMeat
  time: 30
-  reagents:
-    Flour: 10
  solids:
+    FoodDough: 1
    FoodMeat: 3
    FoodCheeseSlice: 1
    FoodTomato: 1
@@ -161,9 +152,8 @@
  name: vegetable pizza recipe
  result: FoodPizzaVegetable
  time: 30
-  reagents:
-    Flour: 10
  solids:
+    FoodDough: 1
    FoodEggplant: 1
    FoodCarrot: 1
    FoodCorn: 1
@@ -365,9 +355,8 @@
  name: banana cream pie
  result: FoodPieBananaCream
  time: 15
-  reagents:
-    Flour: 10
  solids:
+    FoodCakeBatter: 1 # should really be pie pastry or whatever. Good enough.
    FoodBanana: 3

 #Donks i guess
--- a/Resources/Prototypes/Recipes/Reactions/food.yml
+++ b/Resources/Prototypes/Recipes/Reactions/food.yml
@@ -0,0 +1,59 @@
+- type: reaction
+  id: Curdling
+  impact: Low
+  quantized: true
+  reactants:
+    Milk:
+      amount: 40
+    Enzyme:
+      amount: 5
+      catalyst: true
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: FoodCheese
+
+- type: reaction
+  id: CreateDough
+  impact: Low
+  quantized: true
+  reactants:
+    Flour:
+      amount: 15
+    Water:
+      amount: 10
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: FoodDough
+
+- type: reaction
+  id: CreateCakeBatter
+  impact: Low
+  quantized: true
+  reactants:
+    Flour:
+      amount: 15
+    Egg:
+      amount: 12
+    Sugar:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: FoodCakeBatter
+
+# TG has a cake recipe that uses soy milk instead of eggs.
+# but afaik it spawns the exact same cake batter entity. 
+# Maybe change this if you want to do allergies or something
+- type: reaction
+  id: CreateVeganCakeBatter
+  impact: Low
+  quantized: true
+  reactants:
+    Flour:
+      amount: 15
+    MilkSoy:
+      amount: 12
+    Sugar:
+      amount: 5
+  effects:
+    - !type:CreateEntityReactionEffect
+      entity: FoodCakeBatter