From 379b05f2cf8f314f4f580220ad18ac11942ea7fd Mon Sep 17 00:00:00 2001 From: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> Date: Tue, 22 Jul 2025 14:15:12 +0200 Subject: [PATCH] Increases magnet pull time to 9 minutes, increases warning time for salvage magnet, decreases wreck cost and other tweaks to the Salvage Magnet. (#3944) * Increases magnet time, reduces fulton time, etc. etc. * Update Content.Shared/Salvage/Magnet/SalvageOffering.cs Co-authored-by: Tobias Berger Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> * Update Content.Server/Salvage/SalvageSystem.Magnet.cs Co-authored-by: Tobias Berger Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> --------- Signed-off-by: AlgisAlphonse <94876543+AlgisAlphonse@users.noreply.github.com> Co-authored-by: Tobias Berger --- Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs | 4 ++-- Content.Server/Salvage/SalvageSystem.Magnet.cs | 2 +- Content.Shared/Salvage/Fulton/FultonComponent.cs | 2 +- Content.Shared/Salvage/Magnet/SalvageOffering.cs | 2 +- Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs b/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs index 07a8fe1f38..d7f95f1509 100644 --- a/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs +++ b/Content.Server/Salvage/Magnet/SalvageMagnetDataComponent.cs @@ -29,13 +29,13 @@ public sealed partial class SalvageMagnetDataComponent : Component /// How long salvage will be active for before despawning. /// [DataField] - public TimeSpan ActiveTime = TimeSpan.FromMinutes(6); + public TimeSpan ActiveTime = TimeSpan.FromMinutes(9); //DeltaV: was 6 minutes /// /// Cooldown between offerings after one ends. /// [DataField] - public TimeSpan OfferCooldown = TimeSpan.FromMinutes(3); + public TimeSpan OfferCooldown = TimeSpan.FromMinutes(2); //DeltaV: was 3 min /// /// Seeds currently offered diff --git a/Content.Server/Salvage/SalvageSystem.Magnet.cs b/Content.Server/Salvage/SalvageSystem.Magnet.cs index 50e1adcbd0..8b54c78473 100644 --- a/Content.Server/Salvage/SalvageSystem.Magnet.cs +++ b/Content.Server/Salvage/SalvageSystem.Magnet.cs @@ -107,7 +107,7 @@ public sealed partial class SalvageSystem { EndMagnet((uid, magnetData)); } - else if (!magnetData.Announced && (magnetData.EndTime.Value - curTime).TotalSeconds < 31) + else if (!magnetData.Announced && (magnetData.EndTime.Value - curTime).TotalSeconds < 59) //DeltaV: was 31 seconds. Increased to give time to actually fulton a crate out. { var magnet = GetMagnet((uid, magnetData)); diff --git a/Content.Shared/Salvage/Fulton/FultonComponent.cs b/Content.Shared/Salvage/Fulton/FultonComponent.cs index 236ee18c3a..56c5015c03 100644 --- a/Content.Shared/Salvage/Fulton/FultonComponent.cs +++ b/Content.Shared/Salvage/Fulton/FultonComponent.cs @@ -32,7 +32,7 @@ public sealed partial class FultonComponent : Component /// How long the fulton will remain before teleporting to the beacon. /// [ViewVariables(VVAccess.ReadWrite), DataField("duration")] - public TimeSpan FultonDuration = TimeSpan.FromSeconds(45); + public TimeSpan FultonDuration = TimeSpan.FromSeconds(30); // Delta-V - was 45 seconds [ViewVariables(VVAccess.ReadWrite), DataField("whitelist"), AutoNetworkedField] public EntityWhitelist? Whitelist = new() diff --git a/Content.Shared/Salvage/Magnet/SalvageOffering.cs b/Content.Shared/Salvage/Magnet/SalvageOffering.cs index a30328a6fa..95dc25cf35 100644 --- a/Content.Shared/Salvage/Magnet/SalvageOffering.cs +++ b/Content.Shared/Salvage/Magnet/SalvageOffering.cs @@ -7,5 +7,5 @@ public record struct SalvageOffering : ISalvageMagnetOffering { public SalvageMapPrototype SalvageMap; - uint ISalvageMagnetOffering.Cost => 1000; // DeltaV: Station gets next to no benefit from you pulling wrecks, force you to mine first. + uint ISalvageMagnetOffering.Cost => 500; // DeltaV: Station gets next to no benefit from you pulling wrecks, force you to mine first. } diff --git a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs index 3950b1b72b..953f1c8be2 100644 --- a/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs +++ b/Content.Shared/Salvage/SharedSalvageSystem.Magnet.cs @@ -16,9 +16,9 @@ public abstract partial class SharedSalvageSystem private readonly Dictionary _offeringWeights = new() { - { new AsteroidOffering(), 4.5f }, - { new DebrisOffering(), 3.5f }, - { new SalvageOffering(), 2.0f }, + { new AsteroidOffering(), 2.0f }, // DeltaV: was 4.5f + { new DebrisOffering(), 3.5f }, // DeltaV: was 3.5f + { new SalvageOffering(), 4.5f }, // DeltaV: was 2.0f }; private readonly List> _asteroidConfigs = new()