From 3af1cc0dbd4c576a2568a4522400eebe4ca5bfdb Mon Sep 17 00:00:00 2001 From: Doru991 <75124791+Doru991@users.noreply.github.com> Date: Sun, 13 Aug 2023 10:10:22 +0300 Subject: [PATCH] Botany tweaks vol. 2.5 (#19039) * Buff nutriment on plants * Super composting buff * 1984 pt. 2 * Use standard function --- Content.Server/Botany/SeedPrototype.cs | 2 +- Content.Server/Botany/Systems/PlantHolderSystem.cs | 7 ++++++- Resources/Prototypes/Reagents/Consumable/Food/food.yml | 10 ++++++++-- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs index 4d27fbf4c5..0357782edf 100644 --- a/Content.Server/Botany/SeedPrototype.cs +++ b/Content.Server/Botany/SeedPrototype.cs @@ -125,7 +125,7 @@ public class SeedData #region Tolerances - [DataField("nutrientConsumption")] public float NutrientConsumption = 0.70f; + [DataField("nutrientConsumption")] public float NutrientConsumption = 0.75f; [DataField("waterConsumption")] public float WaterConsumption = 0.5f; [DataField("idealHeat")] public float IdealHeat = 293f; diff --git a/Content.Server/Botany/Systems/PlantHolderSystem.cs b/Content.Server/Botany/Systems/PlantHolderSystem.cs index 86bee23811..1c0582e5f4 100644 --- a/Content.Server/Botany/Systems/PlantHolderSystem.cs +++ b/Content.Server/Botany/Systems/PlantHolderSystem.cs @@ -300,7 +300,12 @@ namespace Content.Server.Botany.Systems ForceUpdateByExternalCause(uid, component); } } - + var seed = produce.Seed; + if (seed != null) + { + var nutrientBonus = seed.Potency / 2.5f; + AdjustNutrient(uid, nutrientBonus, component); + } EntityManager.QueueDeleteEntity(args.Used); } } diff --git a/Resources/Prototypes/Reagents/Consumable/Food/food.yml b/Resources/Prototypes/Reagents/Consumable/Food/food.yml index dd45faa8b1..70313d44ec 100644 --- a/Resources/Prototypes/Reagents/Consumable/Food/food.yml +++ b/Resources/Prototypes/Reagents/Consumable/Food/food.yml @@ -13,9 +13,9 @@ - !type:SatiateHunger plantMetabolism: - !type:PlantAdjustNutrition - amount: 1 + amount: 1.5 - !type:PlantAdjustHealth - amount: 0.5 + amount: 0.75 pricePerUnit: 2 - type: reagent @@ -39,6 +39,12 @@ - !type:ModifyBleedAmount amount: -0.25 - !type:SatiateHunger #Numbers are balanced with this in mind + it helps limit how much healing you can get from food + # Lets plants benefit too + plantMetabolism: + - !type:PlantAdjustNutrition + amount: 0.5 + - !type:PlantAdjustHealth + amount: 1.5 pricePerUnit: 2.5 - type: reagent