tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Botany fix (#7071)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-13 11:06:41 +13:00
committed by GitHub
parent 2a422c0af8
commit ec4326748b
3 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Server/Botany/Systems/BotanySystem.Plant.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.Botany.Components; using Content.Server.Botany.Components;
using Content.Server.Chemistry.EntitySystems; using Content.Server.Chemistry.EntitySystems;
using Content.Server.Popups; using Content.Server.Popups;
@@ -44,7 +44,8 @@ namespace Content.Server.Botany.Systems
foreach (var seed in _prototypeManager.EnumeratePrototypes<SeedPrototype>()) foreach (var seed in _prototypeManager.EnumeratePrototypes<SeedPrototype>())
{ {
AddSeedToDatabase(seed); seed.Uid = GetNextSeedUid();
Seeds[seed.Uid] = seed;
} }
} }

14
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/PlantDiethylamine.cs
View File

@@ -1,13 +1,7 @@
using Content.Server.Botany.Components; using Content.Server.Botany.Components;
using Content.Shared.Botany;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
{ {
@@ -24,15 +18,13 @@ namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
var random = IoCManager.Resolve<IRobustRandom>(); var random = IoCManager.Resolve<IRobustRandom>();
var chance = MathHelper.Lerp(15f, 125f, plantHolderComp.Seed.Lifespan) * 2f; if (random.Prob(0.1f))
if (random.Prob(chance))
{ {
plantHolderComp.CheckForDivergence(true); plantHolderComp.CheckForDivergence(true);
plantHolderComp.Seed.Lifespan++; plantHolderComp.Seed.Lifespan++;
} }
chance = MathHelper.Lerp(15f, 125f, plantHolderComp.Seed.Endurance) * 2f; if (random.Prob(0.1f))
if (random.Prob(chance))
{ {
plantHolderComp.CheckForDivergence(true); plantHolderComp.CheckForDivergence(true);
plantHolderComp.Seed.Endurance++; plantHolderComp.Seed.Endurance++;

16
Content.Server/Chemistry/ReagentEffects/PlantMetabolism/RobustHarvest.cs
View File

@@ -1,13 +1,7 @@
using Content.Server.Botany.Components; using Content.Server.Botany.Components;
using Content.Shared.Botany;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent; using Content.Shared.Chemistry.Reagent;
using JetBrains.Annotations; using JetBrains.Annotations;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Maths;
using Robust.Shared.Random; using Robust.Shared.Random;
using Robust.Shared.Serialization.Manager.Attributes;
namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
{ {
@@ -24,17 +18,13 @@ namespace Content.Server.Chemistry.ReagentEffects.PlantMetabolism
var random = IoCManager.Resolve<IRobustRandom>(); var random = IoCManager.Resolve<IRobustRandom>();
var chance = MathHelper.Lerp(15f, 150f, plantHolderComp.Seed.Potency) * 3.5f; if (plantHolderComp.Seed.Potency < 100 && random.Prob(0.1f))
if (random.Prob(chance))
{ {
plantHolderComp.CheckForDivergence(true); plantHolderComp.CheckForDivergence(true);
plantHolderComp.Seed.Potency++; plantHolderComp.Seed.Potency++;
} }
chance = MathHelper.Lerp(6f, 2f, plantHolderComp.Seed.Yield) * 0.15f; if (plantHolderComp.Seed.Yield > 1 && random.Prob(0.1f))
if (random.Prob(chance))
{ {
plantHolderComp.CheckForDivergence(true); plantHolderComp.CheckForDivergence(true);
plantHolderComp.Seed.Yield--; plantHolderComp.Seed.Yield--;