Merge pull request #1789 from KittyCat432/silva-buffs

Silva buffs and liquid mana buffs

Resources/Prototypes/Body/Organs/diona.yml

@@ -108,7 +108,7 @@
   - type: Item
     size: Small
     heldPrefix: lungs
-  - type: Lung 
+  - type: Lung
   - type: Metabolizer
     removeEmpty: true
     solutionOnBody: false
@@ -137,7 +137,7 @@
   description: "The source of incredible, unending intelligence. Honk."
   components:
   - type: Brain
-  - type: Nymph # This will make the organs turn into a nymph when they're removed. 
+  - type: Nymph # This will make the organs turn into a nymph when they're removed.
     entityPrototype: OrganDionaNymphBrain
     transferMind: true
 
@@ -176,11 +176,11 @@
 
 - type: entity
   id: OrganDionaNymphStomach
-  parent: MobDionaNymphAccent 
+  parent: MobDionaNymphAccent
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Stomach
-  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it. 
+  description: Contains the stomach of a formerly fully-formed Diona. It doesn't taste any better for it.
   components:
   - type: IsDeadIC
   - type: Body
@@ -192,7 +192,7 @@
   categories: [ HideSpawnMenu ]
   name: diona nymph
   suffix: Lungs
-  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking. 
+  description: Contains the lungs of a formerly fully-formed Diona. Breathtaking.
   components:
   - type: IsDeadIC
   - type: Body

Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml

@@ -450,6 +450,12 @@
       effects:
       - !type:SatiateThirst
         factor: 4
+      - !type:CP14ManaChange #CE change
+        manaDelta: 0.2
+        safe: true
+        conditions:
+        - !type:OrganType
+          type: Plant
     Gas:
       effects:
       - !type:HealthChange

Resources/Prototypes/_CP14/Body/Organs/silva.yml

@@ -0,0 +1,133 @@
+- type: entity
+  id: CP14BaseSilvaOrgan
+  parent: BaseItem
+  abstract: true
+  components:
+  - type: Sprite
+    sprite: Mobs/Species/Diona/organs.rsi
+  - type: Organ
+  - type: Food
+  - type: Extractable
+    grindableSolutionName: organ
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: FlavorProfile
+    flavors:
+    - people
+
+- type: entity
+  id: CP14OrganSilvaBrain
+  parent: [CP14BaseSilvaOrgan, OrganHumanBrain]
+  categories: [ ForkFiltered ]
+  name: brain
+  description: "The central hub of a silva's pseudo-neurological activity, its root-like tendrils search for its former body."
+  components:
+  - type: Item
+    size: Small
+    heldPrefix: brain
+  - type: Sprite
+    state: brain
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: GreyMatter
+          Quantity: 5
+
+- type: entity
+  id: CP14OrganSilvaEyes
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: eyes
+  description: "I see you!"
+  components:
+  - type: Sprite
+    layers:
+    - state: eyeball-l
+    - state: eyeball-r
+
+- type: entity
+  id: CP14OrganSilvaStomach
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: stomach
+  description: "The silva's equivalent of a stomach, it reeks of asparagus and vinegar."
+  components:
+  - type: Sprite
+    state: stomach
+  - type: SolutionContainerManager
+    solutions:
+      stomach:
+        maxVol: 50
+      food:
+        maxVol: 5
+        reagents:
+        - ReagentId: UncookedAnimalProteins
+          Quantity: 5
+  - type: Stomach
+  - type: Metabolizer
+    maxReagents: 2
+    metabolizerTypes: [ Plant ]
+    removeEmpty: true
+    groups:
+    - id: Food
+    - id: Drink
+    - id: Medicine
+    - id: Poison
+    - id: Narcotic
+    - id: Alcohol
+      rateModifier: 0.1
+  - type: Item
+    size: Small
+    heldPrefix: stomach
+
+- type: entity
+  id: CP14OrganSilvaLungs
+  parent: CP14BaseSilvaOrgan
+  categories: [ ForkFiltered ]
+  name: lungs
+  description: "A spongy mess of slimy, leaf-like structures. Capable of breathing both carbon dioxide and oxygen."
+  components:
+  - type: Sprite
+    state: lungs
+  - type: Item
+    size: Small
+    heldPrefix: lungs
+  - type: Lung
+  - type: Metabolizer
+    removeEmpty: true
+    solutionOnBody: false
+    solution: "Lung"
+    metabolizerTypes: [ Plant ]
+    groups:
+    - id: Gas
+      rateModifier: 100.0
+  - type: SolutionContainerManager
+    solutions:
+      organ:
+        maxVol: 10
+        reagents:
+        - ReagentId: Nutriment
+          Quantity: 10
+      Lung:
+        maxVol: 100
+        canReact: False

Resources/Prototypes/_CP14/Body/Prototypes/silva.yml

@@ -8,21 +8,18 @@
       connections:
         - torso
       organs:
-        brain: OrganHumanBrain
-        eyes: OrganHumanEyes
+        brain: CP14OrganSilvaBrain
+        eyes: CP14OrganSilvaEyes
     torso:
-      part: TorsoHuman
+      part: TorsoDiona
       connections:
         - right_arm
         - left_arm
         - right_leg
         - left_leg
       organs:
-        heart: OrganHumanHeart
-        lungs: OrganHumanLungs
-        stomach: OrganHumanStomach
-        liver: OrganHumanLiver
-        kidneys: OrganHumanKidneys
+        lungs: CP14OrganSilvaLungs
+        stomach: CP14OrganSilvaStomach
     right_arm:
       part: CP14RightArmHuman
       connections:

Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml

@@ -32,6 +32,12 @@
       effects:
       - !type:SatiateThirst
         factor: 15
+      - !type:CP14ManaChange
+        manaDelta: 4
+        safe: true
+        conditions:
+        - !type:OrganType
+          type: Plant
   pricePerUnit: 1.0  # Most basic effect
 
 - type: reagent
@@ -47,7 +53,7 @@
       metabolismRate: 0.05
       effects:
       - !type:CP14ManaChange
-        manaDelta: 1.5
+        manaDelta: 3
         safe: true
   pricePerUnit: 5.0  # 2×Energia (0.4) + 1×Motion (0.2) + Water (0.1) = 0.7 → x7.14 (high value)