let animals drink things (#18236)

* thirst .Owner removal

* thirst file scope

* drink update + minor refactor

* drink file scope

* let animals drink things

* dont eat/drink when dont need to

* admeme mouse override

* moo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

Resources/Prototypes/Entities/Effects/puddle.yml

@@ -4,9 +4,9 @@
   parent: Puddle
   abstract: true
   components:
-    - type: Transform
-      anchored: true
-      noRot: false
+  - type: Transform
+    anchored: true
+    noRot: false
 
 - type: entity
   id: PuddleSmear
@@ -16,67 +16,67 @@
   id: PuddleVomit
   parent: PuddleTemporary
   components:
-    - type: SolutionContainerManager
-      solutions:
-        puddle:
-          maxVol: 1000
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 5
-            - ReagentId: Water
-              Quantity: 5
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Water
+          Quantity: 5
 
 - type: entity
   id: PuddleEgg
   parent: PuddleTemporary
   components:
-    - type: SolutionContainerManager
-      solutions:
-        puddle:
-          maxVol: 1000
-          reagents:
-            - ReagentId: Egg
-              Quantity: 6 # same as when cooking
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Egg
+          Quantity: 6 # same as when cooking
 
 - type: entity
   id: PuddleTomato
   parent: PuddleTemporary
   components:
-    - type: SolutionContainerManager
-      solutions:
-        puddle:
-          maxVol: 1000
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 5
-            - ReagentId: Water
-              Quantity: 5
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 5
+        - ReagentId: Water
+          Quantity: 5
 
 - type: entity
   id: PuddleWatermelon
   parent: PuddleTemporary
   components:
-    - type: SolutionContainerManager
-      solutions:
-        puddle:
-          maxVol: 1000
-          reagents:
-            - ReagentId: Nutriment
-              Quantity: 15
-            - ReagentId: Water
-              Quantity: 15
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 15
+        - ReagentId: Water
+          Quantity: 15
 
 - type: entity
   id: PuddleFlour
   parent: PuddleTemporary
   components:
-    - type: SolutionContainerManager
-      solutions:
-        puddle:
-          maxVol: 1000
-          reagents:
-            - ReagentId: Flour
-              Quantity: 15
+  - type: SolutionContainerManager
+    solutions:
+      puddle:
+        maxVol: 1000
+        reagents:
+        - ReagentId: Flour
+          Quantity: 15
 
 - type: entity
   id: PuddleSparkle
@@ -105,57 +105,58 @@
   placement:
     mode: SnapgridCenter
   components:
-    - type: Clickable
-    - type: FootstepModifier
-      footstepSoundCollection:
-        collection: FootstepWater
-        params:
-          volume: 6
-    - type: Slippery
-      launchForwardsMultiplier: 2.0
-    - type: Transform
-      noRot: true
-      anchored: true
-    - type: Sprite
-      layers:
-        - sprite: Fluids/puddle.rsi
-          state: splat0
-      drawdepth: FloorObjects
-      color: "#FFFFFF80"
-    - type: Physics
-      bodyType: Static
-    - type: Fixtures
-      fixtures:
-        slipFixture:
-          shape:
-            !type:PhysShapeAabb
-            bounds: "-0.4,-0.4,0.4,0.4"
-          mask:
-            - ItemMask
-          layer:
-            - SlipLayer
-          hard: false
-    - type: IconSmooth
-      key: puddles
-      base: splat
-      mode: CardinalFlags
-    - type: SolutionContainerManager
-      solutions:
-        puddle: { maxVol: 1000 }
-    - type: Puddle
-    - type: Appearance
-    - type: EdgeSpreader
-    - type: StepTrigger
-    - type: NodeContainer
-      nodes:
-        puddle:
-          !type:SpreaderNode
-          nodeGroupID: Spreader
-    - type: Drink
-      isOpen: true
-      delay: 3
-      transferAmount: 1
-      solution: puddle
-      examinable: false
-    - type: ExaminableSolution
-      solution: puddle
+  - type: Clickable
+  - type: FootstepModifier
+    footstepSoundCollection:
+      collection: FootstepWater
+      params:
+        volume: 6
+  - type: Slippery
+    launchForwardsMultiplier: 2.0
+  - type: Transform
+    noRot: true
+    anchored: true
+  - type: Sprite
+    layers:
+    - sprite: Fluids/puddle.rsi
+      state: splat0
+    drawdepth: FloorObjects
+    color: "#FFFFFF80"
+  - type: Physics
+    bodyType: Static
+  - type: Fixtures
+    fixtures:
+      slipFixture:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.4,-0.4,0.4,0.4"
+        mask:
+        - ItemMask
+        layer:
+        - SlipLayer
+        hard: false
+  - type: IconSmooth
+    key: puddles
+    base: splat
+    mode: CardinalFlags
+  - type: SolutionContainerManager
+    solutions:
+      puddle: { maxVol: 1000 }
+  - type: Puddle
+  - type: Appearance
+  - type: EdgeSpreader
+  - type: StepTrigger
+  - type: NodeContainer
+    nodes:
+      puddle:
+        !type:SpreaderNode
+        nodeGroupID: Spreader
+  - type: Drink
+    isOpen: true
+    delay: 3
+    transferAmount: 1
+    solution: puddle
+    examinable: false
+  - type: ExaminableSolution
+    solution: puddle
+  - type: BadDrink

Resources/Prototypes/NPCs/nutrition.yml

@@ -1,11 +1,16 @@
 - type: htnCompound
   id: FoodCompound
   branches:
-    - tasks:
-        - id: PickFoodTargetPrimitive
-        - id: MoveToCombatTargetPrimitive
-        - id: EatPrimitive
-        - id: WaitIdleTimePrimitive
+  - tasks:
+    - id: PickFoodTargetPrimitive
+    - id: MoveToCombatTargetPrimitive
+    - id: EatPrimitive
+    - id: WaitIdleTimePrimitive
+  - tasks:
+    - id: PickDrinkTargetPrimitive
+    - id: MoveToCombatTargetPrimitive
+    - id: EatPrimitive
+    - id: WaitIdleTimePrimitive
 
 
 - type: htnPrimitive
@@ -13,9 +18,14 @@
   operator: !type:UtilityOperator
     proto: NearbyFood
 
+- type: htnPrimitive
+  id: PickDrinkTargetPrimitive
+  operator: !type:UtilityOperator
+    proto: NearbyDrink
+
 - type: htnPrimitive
   id: EatPrimitive
   preconditions:
-    - !type:KeyExistsPrecondition
-      key: CombatTarget
+  - !type:KeyExistsPrecondition
+    key: CombatTarget
   operator: !type:AltInteractOperator

Resources/Prototypes/NPCs/utility_queries.yml

@@ -3,7 +3,7 @@
   query:
     - !type:ComponentQuery
       components:
-        - type: Food
+      - type: Food
   considerations:
     - !type:TargetIsAliveCon
       curve: !type:InverseBoolCurve
@@ -17,6 +17,25 @@
     - !type:TargetAccessibleCon
       curve: !type:BoolCurve
 
+- type: utilityQuery
+  id: NearbyDrink
+  query:
+  - !type:ComponentQuery
+    components:
+    - type: Drink
+  considerations:
+  - !type:TargetIsAliveCon
+    curve: !type:InverseBoolCurve
+  - !type:TargetDistanceCon
+    curve: !type:PresetCurve
+      preset: TargetDistance
+  - !type:DrinkValueCon
+    curve: !type:QuadraticCurve
+      slope: 1.0
+      exponent: 0.4
+  - !type:TargetAccessibleCon
+    curve: !type:BoolCurve
+
 - type: utilityQuery
   id: NearbyMeleeTargets
   query: