More injectable food, condiment fixes, migrate Salt to TableSalt (#4846)

2021-10-13 09:03:12 +01:00
parent 2f3914e01e
commit 6d7b037dd6
12 changed files with 61 additions and 33 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/bread.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodBreadBase
  abstract: true
  components:
@@ -12,7 +12,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 26
        reagents:
        - ReagentId: Nutriment
          Quantity: 20
@@ -25,7 +25,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 7
+        maxVol: 8
        reagents:
        - ReagentId: Nutriment
          Quantity: 7
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodCakeBase
  abstract: true
  components:
@@ -13,7 +13,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 20
+        maxVol: 26
        reagents:
        - ReagentId: Nutriment
          Quantity: 20
@@ -29,7 +29,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 7
+        maxVol: 8
        reagents:
        - ReagentId: Nutriment
          Quantity: 7
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodDonkpocketBase
  abstract: true
  components:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donut.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodDonutBase
  abstract: true
  description: Goes great with robust coffee.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/misc.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodBakedBase
  abstract: true
  components:
@@ -12,7 +12,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 5
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -322,7 +322,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
          Quantity: 15
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pie.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodPieBase
  abstract: true
  components:
@@ -13,7 +13,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
          Quantity: 15
@@ -34,7 +34,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 5
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/pizza.yml
@@ -1,7 +1,7 @@
 # Base

 - type: entity
-  parent: BaseItem
+  parent: FoodInjectableBase
  id: FoodPizzaBase
  abstract: true
  components:
@@ -13,7 +13,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 15
+        maxVol: 20
        reagents:
        - ReagentId: Nutriment
          Quantity: 15
@@ -35,7 +35,8 @@
  - type: SolutionContainerManager
    solutions:
      food:
-        maxVol: 5
+        # Note: Keep FoodPizzaMoldySlice & FoodPizzaSliceBase roughly in sync
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -284,4 +285,14 @@
    layers:
    - state: plate-slice
    - state: moldy-slice
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        # Note: Keep FoodPizzaMoldySlice & FoodPizzaSliceBase roughly in sync
+        maxVol: 5
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 2
+        - ReagentId: Toxin
+          Quantity: 2
 # Tastes like stale crust, rancid cheese, mushroom.
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -24,6 +24,15 @@
        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
@@ -10,8 +10,16 @@
  description: A small plastic pack with condiments to put on your food.
  components:
  - type: Drink
+    solution: food
    openSounds:
      collection: packetOpenSounds
+  - type: DrawableSolution
+    solution: food
+  - type: InjectableSolution
+    solution: food
+  - type: DrainableSolution
+    solution: food
+    # Note NOT refillable
  - type: SolutionContainerManager
    solutions:
      food:
@@ -250,7 +258,7 @@
    solutions:
      food:
        reagents:
-        - ReagentId: Salt
+        - ReagentId: TableSalt
          Quantity: 10
  - type: Sprite
    layers:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -114,6 +114,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -171,6 +172,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -193,6 +195,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -215,6 +218,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -340,6 +344,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -364,6 +369,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 6
        reagents:
        - ReagentId: Nutriment
          Quantity: 5
@@ -452,6 +458,7 @@
  - type: SolutionContainerManager
    solutions:
      food:
+        maxVol: 3
        reagents:
        - ReagentId: Nutriment
          Quantity: 2
--- a/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Reagents/Consumable/Food/ingredients.yml
@@ -32,13 +32,6 @@
  physicalDesc:
  color: white

- type: reagent
-  id: Salt
-  name: salt
-  desc: Salt. From space oceans, presumably.
-  physicalDesc: Coarse.
-  color: white
-
 - type: reagent
  id: Blackpepper
  name: black pepper
--- a/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
@@ -46,8 +46,8 @@
 #  time: 20
 #  reagents:
 #    Flour: 15
-#    Salt: 5
-#    Pepper: 5
+#    TableSalt: 5
+#    Blackpepper: 5
 #  solids:
 #    FoodMeat: 5
 #    FoodCheeseSlice: 3
@@ -97,8 +97,8 @@
 #  time: 10
 #  reagents:
 #    Flour: 15
-#    Salt: 1
-#    Pepper: 1
+#    TableSalt: 1
+#    Blackpepper: 1

 - type: microwaveMealRecipe
  id: RecipeCreamCheeseBread
@@ -255,7 +255,7 @@
 #  time: 10
 #  reagents:
 #    Flour: 10
-#    Salt: 2
+#    TableSalt: 2
 #  solids:
 #    FoodGarlic: 1
 #    FoodCheeseSlice: 1
@@ -314,11 +314,11 @@
 #- type: microwaveMealRecipe
 #  id: RecipeMeatSteak
 #  name: meat steak recipe
-#  result: FoodMeatSteak
+#  result: FoodMeatCooked
 #  time: 10
 #  reagents:
-#    Salt: 1
-#    Pepper: 1
+#    TableSalt: 1
+#    Blackpepper: 1
 #  solids:
 #    FoodMeat: 1