From ec1adebfab681d843f9a8bbf18b0e766385ecdf1 Mon Sep 17 00:00:00 2001 From: Jabkas Date: Wed, 3 Apr 2024 23:03:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=95=D0=B1=D0=B0=D0=BD=D0=BE=D0=B5=20=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=BE=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=BB=D0=BE=D1=81=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Content.Server/Anomaly/AnomalySystem.cs | 4 ++-- .../Anomaly/Components/AnomalyGeneratorComponent.cs | 6 +++--- Content.Server/Anomaly/Components/AnomalyVesselComponent.cs | 2 +- .../Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs | 4 ++-- Content.Shared/Anomaly/Components/AnomalyComponent.cs | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Content.Server/Anomaly/AnomalySystem.cs b/Content.Server/Anomaly/AnomalySystem.cs index c3f19aa177..434ab6fa30 100644 --- a/Content.Server/Anomaly/AnomalySystem.cs +++ b/Content.Server/Anomaly/AnomalySystem.cs @@ -109,14 +109,14 @@ public sealed partial class AnomalySystem : SharedAnomalySystem if (!Resolve(anomaly, ref component, false)) return 0; - var multiplier = 1f; + var multiplier = 1.5f; if (component.Stability > component.GrowthThreshold) multiplier = component.GrowingPointMultiplier; //more points for unstable //penalty of up to 50% based on health multiplier *= MathF.Pow(1.5f, component.Health) - 0.5f; - var severityValue = 1 / (1 + MathF.Pow(MathF.E, -7 * (component.Severity - 0.5f))); + var severityValue = 1.05 / (1.05 + MathF.Pow(MathF.E, -7 * (component.Severity - 1.5f))); return (int) ((component.MaxPointsPerSecond - component.MinPointsPerSecond) * severityValue * multiplier) + component.MinPointsPerSecond; } diff --git a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs index 1ff0290fc9..b4975ff1a1 100644 --- a/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs +++ b/Content.Server/Anomaly/Components/AnomalyGeneratorComponent.cs @@ -25,13 +25,13 @@ public sealed partial class AnomalyGeneratorComponent : Component /// The cooldown between generating anomalies. /// [DataField("cooldownLength"), ViewVariables(VVAccess.ReadWrite)] - public TimeSpan CooldownLength = TimeSpan.FromMinutes(5); + public TimeSpan CooldownLength = TimeSpan.FromMinutes(2); /// /// How long it takes to generate an anomaly after pushing the button. /// [DataField("generationLength"), ViewVariables(VVAccess.ReadWrite)] - public TimeSpan GenerationLength = TimeSpan.FromSeconds(8); + public TimeSpan GenerationLength = TimeSpan.FromSeconds(5); /// /// The material needed to generate an anomaly @@ -43,7 +43,7 @@ public sealed partial class AnomalyGeneratorComponent : Component /// The amount of material needed to generate a single anomaly /// [DataField("materialPerAnomaly"), ViewVariables(VVAccess.ReadWrite)] - public int MaterialPerAnomaly = 1500; // a bit less than a stack of plasma + public int MaterialPerAnomaly = 1000; // a bit less than a stack of plasma /// /// The random anomaly spawner entity diff --git a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs index 74c5e3e9ed..7d60653e0b 100644 --- a/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs +++ b/Content.Server/Anomaly/Components/AnomalyVesselComponent.cs @@ -24,7 +24,7 @@ public sealed partial class AnomalyVesselComponent : Component /// A multiplier applied to the amount of points generated. /// [DataField, ViewVariables(VVAccess.ReadWrite)] - public float PointMultiplier = 1; + public float PointMultiplier = 2; /// /// The maximum time between each beep diff --git a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs index 4afd8af21c..38ee17c6bd 100644 --- a/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs +++ b/Content.Server/Xenoarchaeology/XenoArtifacts/ArtifactComponent.cs @@ -58,13 +58,13 @@ public sealed partial class ArtifactComponent : Component /// to determine the monetary value of the artifact /// [DataField("priceMultiplier"), ViewVariables(VVAccess.ReadWrite)] - public float PriceMultiplier = 0.05f; + public float PriceMultiplier = 1.05f; /// /// The base amount of research points for each artifact node. /// [DataField("pointsPerNode"), ViewVariables(VVAccess.ReadWrite)] - public int PointsPerNode = 6500; + public int PointsPerNode = 10000; /// /// Research points which have been "consumed" from the theoretical max value of the artifact. diff --git a/Content.Shared/Anomaly/Components/AnomalyComponent.cs b/Content.Shared/Anomaly/Components/AnomalyComponent.cs index 89afbb0122..f9ab67bf2d 100644 --- a/Content.Shared/Anomaly/Components/AnomalyComponent.cs +++ b/Content.Shared/Anomaly/Components/AnomalyComponent.cs @@ -178,14 +178,14 @@ public sealed partial class AnomalyComponent : Component /// The minimum amount of research points generated per second /// [DataField("minPointsPerSecond")] - public int MinPointsPerSecond = 10; + public int MinPointsPerSecond = 65; /// /// The maximum amount of research points generated per second /// This doesn't include the point bonus for being unstable. /// [DataField("maxPointsPerSecond")] - public int MaxPointsPerSecond = 80; + public int MaxPointsPerSecond = 150; /// /// The multiplier applied to the point value for the