More tweaks

Simple-Station · Oct 4, 2024 · 9693a1a · 9693a1a
1 parent 9574ad1
commit 9693a1a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 15 deletions.
diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachne.yml b/Resources/Prototypes/Entities/Mobs/Species/arachne.yml
@@ -108,7 +108,7 @@
     - DoorBumpOpener
   - type: Bloodstream
     bloodReagent: DemonsBlood
-    bloodRegenerationThirst: 5 # 1 unit of demon's blood satiates 4 thirst
+    bloodRegenerationThirst: 4 # 1 unit of demon's blood satiates 4 thirst
   - type: BloodSucker
     webRequired: true
   - type: Arachne

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -33,8 +33,8 @@
         amount: 5
   - type: Bloodstream
     bloodReagent: Sap
-    bloodRegenerationHunger: 2
-    bloodRegenerationThirst: 2 # 1 unit of sap satiates 2 hunger and thirst
+    bloodRegenerationHunger: 1
+    bloodRegenerationThirst: 1 # 1 unit of sap satiates 1 hunger and thirst
   - type: Reactive
     groups:
       Flammable: [ Touch ]

diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -39,8 +39,6 @@
       amount: 5
   - type: Bloodstream
     bloodReagent: InsectBlood
-    bloodRegenerationHunger: 1.5
-    bloodRegenerationThirst: 1.5 # insect blood does not regenerate thirst or hunger, so keeping it quite low
   - type: DamageVisuals
     damageOverlayGroups:
       Brute:

diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -35,8 +35,8 @@
         color: "#2cf274"
   - type: Bloodstream
     bloodReagent: Slime # TODO Color slime blood based on their slime color or smth
-    bloodRegenerationHunger: 4
-    bloodRegenerationThirst: 2.5 # 1 of slime satiates 3 hunger
+    bloodRegenerationHunger: 2
+    bloodRegenerationThirst: 2 # 1 of slime satiates 2 hunger
   - type: Barotrauma
     damage:
       types:

diff --git a/Resources/Prototypes/Entities/Mobs/base.yml b/Resources/Prototypes/Entities/Mobs/base.yml
@@ -233,5 +233,5 @@
     bloodlossHealDamage:
       types:
         Bloodloss: -1
-    bloodRegenerationHunger: 2.5
-    bloodRegenerationThirst: 3 # 1 unit of normal blood satiates 3 thirst and 1 hunger for vampires and satiates 1 hunger and restores 1 blood for others
+    bloodRegenerationHunger: 1
+    bloodRegenerationThirst: 1.5 # 1 unit of normal blood satiates 1t, 0.3t for vampires, 0.75h, and restores 0.25 blood for non-humans...
diff --git a/Resources/Prototypes/Reagents/biological.yml b/Resources/Prototypes/Reagents/biological.yml
@@ -18,7 +18,7 @@
     Drink:
       effects:
       - !type:SatiateThirst
-        factor: 1.5
+        factor: 0.5
         conditions:
           - !type:OrganType
             type: Human
@@ -39,7 +39,7 @@
         - !type:OrganType
           type: Vampiric
         reagent: Protein
-        amount: 0.15
+        amount: 0.125 # See below
       - !type:AdjustReagent
         conditions:
         - !type:OrganType
@@ -50,7 +50,11 @@
       effects:
         - !type:AdjustReagent
           reagent: UncookedAnimalProteins
-          amount: 0.5
+          amount: 0.125 # 0.25 proteins for 1u of blood - restores 0.75 hunger, adds 0.25 blood per unit
+          conditions:
+          - !type:OrganType
+            type: Vampiric
+            shouldHave: false
     Medicine:
       effects:
       - !type:HealthChange
@@ -99,7 +103,7 @@
       # Delicious!
       effects:
       - !type:SatiateHunger
-        factor: 1.5
+        factor: 1
   footstepSound:
     collection: FootstepBlood
     params:
@@ -123,9 +127,9 @@
       # Sweet!
       effects:
       - !type:SatiateHunger
-        factor: 1
+        factor: 0.5
       - !type:SatiateThirst
-        factor: 1
+        factor: 0.5
   footstepSound:
     collection: FootstepBlood
     params: