Delete DrinkComponent, migrate prototypes to EdibleComponent (#40308)

2025-09-13 00:26:56 +02:00
parent 928e6c8079
commit 82e7cb020c
25 changed files with 139 additions and 376 deletions
--- a/Resources/Prototypes/Entities/Clothing/Head/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/misc.yml
@@ -320,6 +320,7 @@
    solution: drink
    delay: 0.5
    forceFeedDelay: 1.5
+    utensil: Spoon
  - type: FlavorProfile
    flavors:
      - water
--- a/Resources/Prototypes/Entities/Effects/puddle.yml
+++ b/Resources/Prototypes/Entities/Effects/puddle.yml
@@ -206,6 +206,7 @@
    delay: 3
    transferAmount: 1
    solution: puddle
+    utensil: None
  - type: ExaminableSolution
    solution: puddle
    locVolume: "examinable-solution-on-examine-volume-puddle"
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_metamorphic.yml
@@ -2122,7 +2122,6 @@
  id: DrinkTomatoJuice
  suffix: tomato juice
  components:
-  - type: Drink
  - type: SolutionContainerManager
    solutions:
      drink:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/bowl.yml
@@ -27,6 +27,7 @@
    edible: Drink
    solution: food
    destroyOnEmpty: false
+    utensil: Spoon
  - type: DamageOnLand
    damage:
      types:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Containers/condiments.yml
@@ -32,8 +32,11 @@
  components:
  - type: Item
    size: Tiny
-  - type: Drink
+  - type: Edible
+    edible: Food # usually contains powders like flour or condiments like ketchup
    solution: food
+    destroyOnEmpty: false
+    utensil: Spoon
  - type: Openable
    sound:
      collection: packetOpenSounds
@@ -74,6 +77,14 @@
  - type: ExaminableSolution
    exactVolume: true

+- type: entity
+  parent: BaseFoodCondimentPacket
+  id: BaseFoodCondimentPacketDrink
+  abstract: true
+  components:
+  - type: Edible
+    edible: Drink # slurping sounds!
+
 - type: entity
  parent: BaseFoodCondimentPacket
  id: FoodCondimentPacketAstrotame
@@ -103,7 +114,7 @@
    fillBaseName: packet-trans-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketBbq
  name: BBQ sauce
  description: Hand wipes not included.
@@ -123,7 +134,7 @@
    fillBaseName: packet-trans-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketCornoil
  name: corn oil
  description: Corn oil. A delicious oil used in cooking. Made from corn.
@@ -143,7 +154,7 @@
    fillBaseName: packet-trans-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketColdsauce
  name: coldsauce
  description: Coldsauce. Leaves the tongue numb in its passage.
@@ -163,7 +174,7 @@
    fillBaseName: packet-trans-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketHorseradish
  name: horseradish sauce
  description: A packet of smelly horseradish sauce.
@@ -183,7 +194,7 @@
    fillBaseName: packet-solid-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketHotsauce
  name: hotsauce
  description: You can almost TASTE the stomach ulcers now!
@@ -203,7 +214,7 @@
    fillBaseName: packet-trans-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketKetchup
  name: ketchup
  description: You feel more American already.
@@ -223,7 +234,7 @@
    fillBaseName: packet-solid-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketMustard
  name: mustard
  description: A condiment made from the ground-up seeds of the Mustard plant.
@@ -289,7 +300,7 @@
    fillBaseName: packet-solid-

 - type: entity
-  parent: BaseFoodCondimentPacket
+  parent: BaseFoodCondimentPacketDrink
  id: FoodCondimentPacketSoy
  name: soy sauce
  description: A salty soy-based flavoring.
@@ -335,8 +346,11 @@
  name: condiment bottle
  description: A thin glass bottle used to store condiments.
  components:
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: food
+    destroyOnEmpty: false
+    utensil: None
  - type: Openable
    sound:
      collection: pop
@@ -526,7 +540,7 @@
 # Shakers

 - type: entity
-  parent: BaseFoodCondiment
+  parent: BaseFoodCondiment # TODO: This should not inherit TrashOnSolutionEmpty, SpaceGarbage and the price of 0
  id: BaseFoodShaker
  abstract: true
  name: empty shaker
@@ -534,8 +548,11 @@
  components:
  - type: Item
    size: Tiny
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: food
+    destroyOnEmpty: false
+    utensil: None # don't conflict with stirring
  - type: SolutionContainerManager
    solutions:
      food:
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
@@ -25,10 +25,10 @@
    solution: food
  - type: DrainableSolution
    solution: food
-  - type: Drink
+  - type: Edible
+    edible: Food # usually contains powders like flour or condiments like ketchup
    solution: food
-    useSound:
-      collection: eating
+    utensil: Spoon
  - type: Damageable
    damageContainer: Inorganic
  - type: Spillable
@@ -224,6 +224,8 @@
        reagents:
        - ReagentId: OilOlive
          Quantity: 20
+  - type: Edible
+    edible: Drink # slurping sounds!

 - type: entity
  parent: ReagentPacketBase
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -9,14 +9,20 @@
  - type: SolutionContainerManager
  - type: Sprite
    state: produce
-  # let cows eat raw produce like wheat and oats
-  - type: Edible
-    requiresSpecialDigestion: true
  - type: Produce
  - type: PotencyVisuals
  - type: Appearance
  - type: Extractable
    grindableSolutionName: food
+
+- type: entity
+  parent: ProduceBase
+  id: ProduceBaseRuminant
+  abstract: true
+  components:
+  # let cows eat raw produce like wheat and oats
+  - type: Edible
+    requiresSpecialDigestion: true
  - type: Tag
    tags:
    - Ruminant
@@ -43,7 +49,7 @@
  name: wheat bushel
  description: Sigh... wheat... a-grain?
  id: WheatBushel
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/wheat.rsi
@@ -66,7 +72,7 @@
  name: meatwheat bushel
  description: Some blood-drenched wheat stalks. You can crush them into what passes for meat if you squint hard enough.
  id: MeatwheatBushel
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/meatwheat.rsi
@@ -90,7 +96,7 @@
  name: oat bushel
  description: Eat oats, do squats.
  id: OatBushel
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/oat.rsi
@@ -114,7 +120,7 @@
  name: sugarcane
  description: Sickly sweet.
  id: Sugarcane
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/sugarcane.rsi
@@ -226,7 +232,7 @@
  name: nettle
  description: Stingy little prick.
  id: Nettle
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/nettle.rsi
@@ -1964,7 +1970,7 @@
  name: rice bushel
  description: Can be ground into rice, perfect for pudding or sake.
  id: RiceBushel
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/rice.rsi
@@ -1983,7 +1989,7 @@
  name: soybeans
  description: For those who can't stand seeing good old meat.
  id: FoodSoybeans
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/soybeans.rsi
@@ -2047,7 +2053,7 @@
  name: koibean
  description: These beans seem a little bit fishy.
  id: FoodKoibean
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  components:
  - type: Sprite
    sprite: Objects/Specific/Hydroponics/koibean.rsi
--- a/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Hydroponics/leaves.yml
@@ -2,7 +2,7 @@

 - type: entity
  name: cannabis leaves
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  id: LeavesCannabis
  description: "Recently legalized in most galaxies."
  components:
@@ -167,7 +167,7 @@

 - type: entity
  name: tea leaves
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  id: LeavesTea
  description: "Can be dried out to make tea."
  components:
@@ -184,7 +184,7 @@

 - type: entity
  name: dried tea leaves
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  id: LeavesTeaDried
  description: "Dried tea leaves, ready to be ground."
  components:
@@ -200,7 +200,7 @@

 - type: entity
  name: tobacco leaves
-  parent: ProduceBase
+  parent: ProduceBaseRuminant
  id: LeavesTobacco
  description: "Dry them out to make some smokes."
  components:
@@ -208,6 +208,12 @@
    sprite: Objects/Specific/Hydroponics/tobacco.rsi
  - type: Produce
    seedId: tobacco
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        reagents:
+        - ReagentId: Nicotine
+          Quantity: 2

 - type: entity
  name: dried tobacco leaves
--- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/spray.yml
@@ -5,12 +5,16 @@
  suffix: Empty
  description: A spray bottle with an unscrewable top.
  components:
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: spray
-    ignoreEmpty: true
+    destroyOnEmpty: false
+    utensil: None
+    transferAmount: 10
    useSound:
      path: /Audio/Effects/spray3.ogg
-    transferAmount: 10
+      params:
+        variation: 0.2
  - type: Tag
    tags:
    - Spray
--- a/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
@@ -39,8 +39,11 @@
      interfaces:
        enum.TransferAmountUiKey.Key:
          type: TransferAmountBoundUserInterface
-    - type: Drink
+    - type: Edible
+      edible: Drink
      solution: beaker
+      destroyOnEmpty: false
+      utensil: Spoon
    - type: Spillable
      solution: beaker
    - type: Appearance
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-bottles.yml
@@ -24,7 +24,11 @@
  - type: SolutionContainerVisuals
    maxFillLevels: 6
    fillBaseName: bottle-1-
-  - type: Drink
+  - type: Edible
+    edible: Drink
+    solution: drink
+    destroyOnEmpty: false
+    utensil: None
  - type: SolutionContainerManager
    solutions:
      drink: # This solution name and target volume is hard-coded in ChemMasterComponent
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry-vials.yml
@@ -29,8 +29,11 @@
    fillBaseName: vial-1-
    inHandsMaxFillLevels: 4
    inHandsFillBaseName: -fill-
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: beaker
+    destroyOnEmpty: false
+    utensil: None
  - type: SolutionContainerManager
    solutions:
      beaker:
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -48,8 +48,11 @@
    interfaces:
      enum.TransferAmountUiKey.Key:
        type: TransferAmountBoundUserInterface
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: beaker
+    destroyOnEmpty: false
+    utensil: None
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 6
@@ -145,8 +148,11 @@
    interfaces:
      enum.TransferAmountUiKey.Key:
        type: TransferAmountBoundUserInterface
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: beaker
+    destroyOnEmpty: false
+    utensil: Spoon
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 6
--- a/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/bucket.yml
@@ -9,6 +9,7 @@
    edible: Drink
    solution: bucket
    destroyOnEmpty: false
+    utensil: Spoon
  - type: Sprite
    sprite: Objects/Tools/bucket.rsi
    layers:
--- a/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Anomaly/anomalies.yml
@@ -971,8 +971,11 @@
    - Honk
    - Carpetium
    - JuiceThatMakesYouWeh
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: anomaly
+    destroyOnEmpty: false
+    utensil: Spoon
  - type: DrainableSolution
    solution: anomaly
  - type: DrawableSolution
--- a/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/Janitor/janicart.yml
@@ -81,8 +81,11 @@
  - type: ReactiveContainer
    solution: bucket
    container: item_slot
-  - type: Drink
+  - type: Edible
+    edible: Drink
    solution: bucket
+    destroyOnEmpty: false
+    utensil: Spoon
  - type: Appearance
  - type: SolutionContainerVisuals
    maxFillLevels: 3
@@ -358,8 +361,11 @@
      interfaces:
        enum.StorageUiKey.Key:
          type: StorageBoundUserInterface
-    - type: Drink
+    - type: Edible
+      edible: Drink
      solution: bucket
+      destroyOnEmpty: false
+      utensil: Spoon
    - type: ContainerContainer
      containers:
        storagebase: !type:Container
--- a/Resources/Prototypes/XenoArch/effects.yml
+++ b/Resources/Prototypes/XenoArch/effects.yml
@@ -267,8 +267,11 @@
      solution: beaker
    - type: SolutionTransfer
      canChangeTransferAmount: true
-    - type: Drink
+    - type: Edible
+      edible: Drink
      solution: beaker
+      destroyOnEmpty: false
+      utensil: None

 - type: entity
  id: XenoArtifactSpeedUp