Metabolism tweaks / metabolism 4.0 (#5246)

* Metabolism tweaks

* use MetabolismArgs and convert ReagentEntityReactions into ReagentEffects

* fork forgor 💀

* fixes

Resources/Prototypes/Body/Mechanisms/human.yml

@@ -118,6 +118,7 @@
   # This is done because these chemicals need to have some effect even if they aren't being filtered out of your body.
   # You're technically 'immune to poison' without a heart, but.. uhh, you'll have bigger problems on your hands.
   - type: Metabolizer
+    maxReagents: 2
     metabolizerTypes: [Human]
     groups:
     - id: Medicine
@@ -147,6 +148,8 @@
   # TODO: Have it work off of the ent's solution container, and move this
   # to intestines instead.
   - type: Metabolizer
+    # mm yummy
+    maxReagents: 3
     metabolizerTypes: [Human]
     groups:
     - id: Food
@@ -164,6 +167,7 @@
     size: 1
     compatibility: Biological
   - type: Metabolizer # The liver metabolizes certain chemicals only, like alcohol.
+    maxReagents: 1
     metabolizerTypes: [Human]
     groups:
     - id: Alcohol
@@ -182,3 +186,8 @@
   - type: Mechanism
     size: 1
     compatibility: Biological
+  # The kidneys just remove anything that doesn't currently have any metabolisms, as a stopgap.
+  - type: Metabolizer
+    maxReagents: 5
+    metabolizerTypes: [Human]
+    removeEmpty: true

Resources/Prototypes/Entities/Mobs/NPCs/simplemob.yml

@@ -6,17 +6,14 @@
   components:
   - type: Reactive
     reactions:
+    - reagents: [Water]
+      methods: [Touch]
+      effects:
       - !type:ExtinguishReaction
-        touch: true
-        reagents:
-          - Water
+    - reagents: [WeldingFuel, Thermite, Plasma, Ethanol]
+      methods: [Touch]
+      effects:
       - !type:FlammableReaction
-        touch: true
-        reagents:
-          - WeldingFuel
-          - Thermite
-          - Plasma
-          - Ethanol
   - type: UtilityAI
     behaviorSets:
     - Clothing

Resources/Prototypes/Entities/Mobs/Species/human.yml

@@ -12,23 +12,18 @@
     - FootstepSound
   - type: Reactive
     reactions:
-    - !type:ExtinguishReaction
-      touch: true
-      reagents:
-      - Water
-    - !type:FlammableReaction
-      touch: true
-      reagents:
-      - WeldingFuel
-      - Thermite
-      - Plasma
-      - Ethanol
-      - Oil
-    - !type:WashCreamPieReaction
-      touch: true
-      reagents:
-      - Water
-      - SpaceCleaner
+    - reagents: [Water]
+      methods: [Touch]
+      effects:
+      - !type:ExtinguishReaction
+    - reagents: [WeldingFuel, Thermite, Plasma, Ethanol]
+      methods: [Touch]
+      effects:
+      - !type:FlammableReaction
+    - reagents: [Water, SpaceCleaner]
+      methods: [Touch]
+      effects:
+      - !type:WashCreamPieReaction
   - type: Flashable
   - type: Hands
   - type: MovementSpeedModifier

Resources/Prototypes/Entities/Objects/Specific/rehydrateable.yml

@@ -20,13 +20,11 @@
     state: cube
   - type: Reactive
     reactions:
+    - reagents: [Water]
+      methods: [Touch, Ingestion, Injection]
+      effects:
       - !type:AddToSolutionReaction
         solution: cube
-        touch: true
-        ingestion: true
-        injection: true
-        reagents:
-          - Water
   - type: Rehydratable
     target: MobMonkey
   - type: CollisionWake
@@ -62,13 +60,11 @@
     solution: plushie
   - type: Reactive
     reactions:
-    - !type:AddToSolutionReaction
-      solution: plushie
-      touch: true
-      ingestion: true
-      injection: true
-      reagents:
-      - Water
+    - reagents: [Water]
+      methods: [Touch, Ingestion, Injection]
+      effects:
+      - !type:AddToSolutionReaction
+        solution: plushie
   - type: Rehydratable
     target: MobCarp
   - type: CollisionWake

Resources/Prototypes/Entities/Structures/Walls/barricades.yml

@@ -46,19 +46,6 @@
     damage:
       types:
         Heat : 1 #per second, scales with number of fire 'stacks'
-  - type: Reactive
-    reactions:
-      - !type:ExtinguishReaction
-        touch: true
-        reagents:
-          - Water
-      - !type:FlammableReaction
-        touch: true
-        reagents:
-          - WeldingFuel
-          - Thermite
-          - Plasma
-          - Ethanol
   - type: Appearance
     visuals:
     - type: FireVisualizer

Resources/Prototypes/Entities/Structures/soil.yml

@@ -50,6 +50,9 @@
     anchored: true
   - type: Reactive
     reactions:
+    - reagents: [Water]
+      methods: [Touch, Ingestion, Injection]
+      effects:
       - !type:AddToSolutionReaction
         solution: soil
   - type: Appearance