Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Botany tweaks vol. 2 (#18888)

Browse Source 
* Even more consumption

* Revert "Even more consumption"

This reverts commit 94ae0eca0ba1b4a55913f92519e1354b77e70734.

Oops forgot a file

* Believe it or not, more nutrient consumption

* Buff ez nutrient and l4z

* Add left 4 zed to emagged nutrimax just because

* Change some thresholds
This commit is contained in:
Doru991
2023-08-10 04:43:06 +03:00
committed by GitHub
parent e4bfb27a3b
commit 30f0ad2134
7 changed files with 36 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Botany/SeedPrototype.cs
View File

@@ -125,7 +125,7 @@ public class SeedData
#region Tolerances
[DataField("nutrientConsumption")] public float NutrientConsumption = 0.50f;
[DataField("nutrientConsumption")] public float NutrientConsumption = 0.70f;
[DataField("waterConsumption")] public float WaterConsumption = 0.5f;
[DataField("idealHeat")] public float IdealHeat = 293f;

6
Content.Server/Botany/Systems/MutationSystem.cs
View File

@@ -119,6 +119,7 @@ public sealed class MutationSystem : EntitySystem
{
// Probability that a bit flip happens for this value.
float p = mult*bits/totalbits;
p = Math.Clamp(p, 0, 1);
if (!Random(p))
{
return;
@@ -150,6 +151,7 @@ public sealed class MutationSystem : EntitySystem
{
// Probability that a bit flip happens for this value.
float p = mult*bits/totalbits;
p = Math.Clamp(p, 0, 1);
if (!Random(p))
{
return;
@@ -174,7 +176,8 @@ public sealed class MutationSystem : EntitySystem
private void MutateBool(ref bool val, bool polarity, int bits, int totalbits, float mult)
{
// Probability that a bit flip happens for this value.
float p = mult*bits/totalbits;
float p = mult * bits / totalbits;
p = Math.Clamp(p, 0, 1);
if (!Random(p))
{
return;
@@ -186,6 +189,7 @@ public sealed class MutationSystem : EntitySystem
private void MutateHarvestType(ref HarvestType val, int bits, int totalbits, float mult)
{
float p = mult * bits/totalbits;
p = Math.Clamp(p, 0, 1);
if (!Random(p))
return;

8
Content.Server/Botany/Systems/PlantHolderSystem.cs
View File

@@ -344,7 +344,7 @@ namespace Content.Server.Botany.Systems
}
// Weeds like water and nutrients! They may appear even if there's not a seed planted.
if (component.WaterLevel > 10 && component.NutritionLevel > 2)
if (component.WaterLevel > 10 && component.NutritionLevel > 5)
{
var chance = 0f;
if (component.Seed == null)
@@ -435,7 +435,7 @@ namespace Content.Server.Botany.Systems
// Make sure the plant is not starving.
if (_random.Prob(0.35f))
{
if (component.NutritionLevel > 2)
if (component.NutritionLevel > 5)
{
component.Health += healthMod;
}
@@ -904,8 +904,8 @@ namespace Content.Server.Botany.Systems
if (!component.DrawWarnings)
return;
_appearance.SetData(uid, PlantHolderVisuals.WaterLight, component.WaterLevel <= 10, app);
_appearance.SetData(uid, PlantHolderVisuals.NutritionLight, component.NutritionLevel <= 2, app);
_appearance.SetData(uid, PlantHolderVisuals.WaterLight, component.WaterLevel <= 15, app);
_appearance.SetData(uid, PlantHolderVisuals.NutritionLight, component.NutritionLevel <= 8, app);
_appearance.SetData(uid, PlantHolderVisuals.AlertLight,
component.WeedLevel >= 5 || component.PestLevel >= 5 || component.Toxins >= 40 || component.ImproperHeat ||
component.ImproperLight || component.ImproperPressure || component.MissingGas > 0, app);