(Reagent) Minor blood and uncooked protein rework (#20891)

* Blood makes non-animals take poison damage, and sates animal hunger at a very low rate

* Only affects humans, animal restrictions also removed

* ignore the other commits, blood and uncooked protein rework!

* Humans recieve a popup when they consume these reagents

* lower the original damage of uncooked proteins

* Change metablizing organs, make blood digest into uncooked protein instead of it having it's own effect

diff --git a/Resources/Locale/en-US/reagents/generic.ftl b/Resources/Locale/en-US/reagents/generic.ftl
index d41b3ff585bf11d2b599a408485791ff715a1611..2f5feff1b3b46b408fcc136bbf1b7cebdb65f290 100644 (file)
--- a/Resources/Locale/en-US/reagents/generic.ftl
+++ b/Resources/Locale/en-US/reagents/generic.ftl
@@ -7,3 +7,4 @@ generic-reagent-effect-tearing-up = Your eyes start to tear up.
 generic-reagent-effect-nauseous = You feel nauseous.
 generic-reagent-effect-parched = You feel parched.
 generic-reagent-effect-thirsty = You feel thirsty.
+generic-reagent-effect-sick = You feel sick after consuming that...

diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
index a8775799460d6a5a842e68954da233f47089f864..45311604107570784371b666cfc3f9657fb5e74b 100644 (file)
--- a/Resources/Prototypes/Reagents/biological.yml
+++ b/Resources/Prototypes/Reagents/biological.yml
@@ -10,13 +10,21 @@
   slippery: false
   metabolisms:
     Drink:
-      # Quenching!
       effects:
       - !type:SatiateThirst
         factor: 1.5
+        conditions:
+          - !type:OrganType
+            type: Human
+            shouldHave: false
+    Food:
+      effects:
+        - !type:AdjustReagent
+          reagent: UncookedAnimalProteins
+          amount: 0.5
   plantMetabolism:
-  - !type:PlantAdjustWater
-    amount: 0.5
+    - !type:PlantAdjustWater
+      amount: 0.5
 
 - type: reagent
   id: Slime
@@ -39,6 +47,7 @@
         factor: 1.5
 
 - type: reagent
+  parent: Blood
   id: CopperBlood
   name: reagent-name-hemocyanin-blood
   group: Biological
@@ -48,15 +57,6 @@
   recognizable: true
   physicalDesc: reagent-physical-desc-ferrous
   slippery: false
-  metabolisms:
-    Drink:
-      # Quenching!
-      effects:
-      - !type:SatiateThirst
-        factor: 1.5
-  plantMetabolism:
-  - !type:PlantAdjustWater
-    amount: 0.5
 
 - type: reagent
   id: ZombieBlood

diff --git a/Resources/Prototypes/Reagents/toxins.yml b/Resources/Prototypes/Reagents/toxins.yml
index 7e206cc9d8f91485798e97eaae326b50dc4aa27e..8c561d96f21317025f2f76795bf8db55ce3f9620 100644 (file)
--- a/Resources/Prototypes/Reagents/toxins.yml
+++ b/Resources/Prototypes/Reagents/toxins.yml
@@ -442,19 +442,34 @@
   flavor: bitter
   color: "#FFFFE5"
   metabolisms:
-    Poison:
+    Food:
       effects:
+      - !type:PopupMessage
+        conditions:
+          - !type:OrganType
+            type: Human
+        reagent: Protein
+        type: Local
+        visualType: MediumCaution
+        messages: [ "generic-reagent-effect-sick" ]
+        probability: 0.5
+      - !type:ChemVomit
+        probability: 0.1
+        conditions:
+          - !type:OrganType
+            type: Human
       - !type:HealthChange
         conditions:
         - !type:OrganType
           type: Human
         damage:
           types:
-            Poison: 2
+            Poison: 1
       - !type:AdjustReagent
         conditions:
         - !type:OrganType
-          type: Animal
+          type: Human
+          shouldHave: false
         reagent: Protein
         amount: 0.5