diff --git a/Resources/Prototypes/Body/Organs/diona.yml b/Resources/Prototypes/Body/Organs/diona.yml index bf865a07fd..18af32295b 100644 --- a/Resources/Prototypes/Body/Organs/diona.yml +++ b/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 diff --git a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml index 68448bc0c9..a7eb60cf30 100644 --- a/Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml +++ b/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 diff --git a/Resources/Prototypes/_CP14/Body/Organs/silva.yml b/Resources/Prototypes/_CP14/Body/Organs/silva.yml new file mode 100644 index 0000000000..25f280518b --- /dev/null +++ b/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 diff --git a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml b/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml index 9c304166c5..eb78376db6 100644 --- a/Resources/Prototypes/_CP14/Body/Prototypes/silva.yml +++ b/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: diff --git a/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml b/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml index af1775ed97..616c3ca0e3 100644 --- a/Resources/Prototypes/_CP14/Reagents/Target Effects/positive_effects.yml +++ b/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) diff --git a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml index 62bcefdb80..615cee5c84 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_EN/SpeciesTabs/Silva.xml @@ -5,14 +5,16 @@ -The Silva are a race of humanoid plants living in deep relic forests. Emerging from the mother tree in the centre of their cities, the Silvas do not travel the world very often. +The Silva are a race of humanoid plants living in deep relic forests. Emerging from the mother tree in the centre of their cities, the Silva's do not travel the world very often. ## Magical photosynthesis -Silvas regenerate [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] mana while in sunlight, but without it, mana regeneration is completely absent. +Silva's regenerate [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] mana while in sunlight, but without it, mana regeneration is completely absent. + +Silva's can also drink water to regenerate small amounts of mana; life-giving moisture gives the silva a large amount of mana. ## Connection with nature -Silvas initially have basic and advanced vivification. +Silva's initially have basic and advanced vivification. - \ No newline at end of file + diff --git a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml index 43c3887cc6..f22ab844ea 100644 --- a/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml +++ b/Resources/ServerInfo/_CP14/Guidebook_RU/SpeciesTabs/Silva.xml @@ -9,9 +9,11 @@ ## Магический фотосинтез -Сильвы регенерируют [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] маны находясь под солнечным светом, но без него регенерация маны полностью отсутствует. +Сильвы регенерируют [protodata="CP14MobSilva" comp="CP14MagicEnergyPhotosynthesis" member="DaylightEnergy"/] маны находясь под солнечным светом, но без него регенерация маны полностью отсутствует. + +Сильвы также могут пить воду, чтобы восстановить небольшое количество маны, живительная влага дает сильвам большое количество маны. ## Связь с природой Сильвы имеют базовое и продвинутое жизнетворение с начала раунда. - \ No newline at end of file +