return machine upgrade system

Content.Client/Lathe/UI/LatheMenu.xaml.cs

@@ -3,6 +3,7 @@
 using Content.Client.Materials;
 using Content.Shared.Lathe;
 using Content.Shared.Lathe.Prototypes;
+using Content.Shared.Materials;  // Corvax-Next
 using Content.Shared.Research.Prototypes;
 using Robust.Client.AutoGenerated;
 using Robust.Client.GameObjects;
@@ -137,10 +138,15 @@ private string GenerateTooltipText(LatheRecipePrototype prototype)
 
         foreach (var (id, amount) in prototype.Materials)
         {
-            if (!_prototypeManager.TryIndex(id, out var proto))
+            if (!_prototypeManager.TryIndex<MaterialPrototype>(id, out var proto)) // Corvax-Next
                 continue;
 
-            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, multiplier);
+            if (_entityManager.TryGetComponent<LatheComponent>(Entity, out var latheComp)) // Corvax-Next
+            {
+                float finalmaterial = latheComp.FinalMaterialUseMultiplier;
+            }
+
+            var adjustedAmount = SharedLatheSystem.AdjustMaterial(amount, prototype.ApplyMaterialDiscount, _entityManager.GetComponent<LatheComponent>(Entity).FinalMaterialUseMultiplier); // Corvax-Next: MaterialUseMultiplier<FinalMaterialUseMultiplier
             var sheetVolume = _materialStorage.GetSheetVolume(proto);
 
             var unit = Loc.GetString(proto.Unit);

Content.Server/Atmos/Piping/Binary/EntitySystems/GasRecyclerSystem.cs

@@ -1,6 +1,7 @@
 using Content.Server.Atmos.EntitySystems;
 using Content.Server.Atmos.Piping.Binary.Components;
 using Content.Server.Atmos.Piping.Components;
+using Content.Server.Construction; // Corvax-Next
 using Content.Server.NodeContainer;
 using Content.Server.NodeContainer.EntitySystems;
 using Content.Server.NodeContainer.Nodes;
@@ -28,6 +29,8 @@ public override void Initialize()
             SubscribeLocalEvent<GasRecyclerComponent, AtmosDeviceUpdateEvent>(OnUpdate);
             SubscribeLocalEvent<GasRecyclerComponent, AtmosDeviceDisabledEvent>(OnDisabled);
             SubscribeLocalEvent<GasRecyclerComponent, ExaminedEvent>(OnExamined);
+            SubscribeLocalEvent<GasRecyclerComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+            SubscribeLocalEvent<GasRecyclerComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
         }
 
         private void OnEnabled(EntityUid uid, GasRecyclerComponent comp, ref AtmosDeviceEnabledEvent args)
@@ -116,5 +119,26 @@ private void UpdateAppearance(EntityUid uid, GasRecyclerComponent? comp = null)
 
             _appearance.SetData(uid, PumpVisuals.Enabled, comp.Reacting);
         }
+
+        // Corvax-Next
+        private void OnRefreshParts(EntityUid uid, GasRecyclerComponent component, RefreshPartsEvent args)
+        {
+            var ratingTemp = args.PartRatings["Capacitor"];
+            var ratingPressure = args.PartRatings["Manipulator"];
+
+            var copy = new GasRecyclerComponent();
+
+            component.MinTemp = copy.MinTemp * MathF.Pow(0.95f, ratingTemp - 1);
+            component.MinPressure = copy.MinPressure * MathF.Pow(0.8f, ratingPressure - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, GasRecyclerComponent component, UpgradeExamineEvent args)
+        {
+            var copy = new GasRecyclerComponent();
+
+            args.AddPercentageUpgrade("gas-recycler-upgrade-min-temp", component.MinTemp / copy.MinTemp);
+            args.AddPercentageUpgrade("gas-recycler-upgrade-min-pressure", component.MinPressure / copy.MinPressure);
+        }
+        // End Corvax-Next
     }
 }

Content.Server/Atmos/Portable/PortableScrubberSystem.cs

@@ -5,6 +5,7 @@
 using Content.Shared.Destructible;
 using Content.Server.Atmos.Piping.Components;
 using Content.Server.Atmos.EntitySystems;
+using Content.Server.Construction; // Corvax-Next
 using Content.Server.Power.Components;
 using Content.Server.NodeContainer;
 using Robust.Server.GameObjects;
@@ -40,6 +41,8 @@ public override void Initialize()
             SubscribeLocalEvent<PortableScrubberComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<PortableScrubberComponent, DestructionEventArgs>(OnDestroyed);
             SubscribeLocalEvent<PortableScrubberComponent, GasAnalyzerScanEvent>(OnScrubberAnalyzed);
+            SubscribeLocalEvent<PortableScrubberComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+            SubscribeLocalEvent<PortableScrubberComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
         }
 
         private bool IsFull(PortableScrubberComponent component)
@@ -156,5 +159,26 @@ private void OnScrubberAnalyzed(EntityUid uid, PortableScrubberComponent compone
             args.GasMixtures ??= new List<(string, GasMixture?)>();
             args.GasMixtures.Add((Name(uid), component.Air));
         }
+
+        // Corvax-Next
+        private void OnRefreshParts(EntityUid uid, PortableScrubberComponent component, RefreshPartsEvent args)
+        {
+            var pressureRating = args.PartRatings["MatterBin"];
+            var transferRating = args.PartRatings["Manipulator"];
+
+            var copy = new PortableScrubberComponent();
+
+            component.MaxPressure = copy.MaxPressure * MathF.Pow(1.5f, pressureRating - 1);
+            component.TransferRate = copy.TransferRate * MathF.Pow(1.4f, transferRating - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, PortableScrubberComponent component, UpgradeExamineEvent args)
+        {
+            var copy = new PortableScrubberComponent();
+
+            args.AddPercentageUpgrade("portable-scrubber-component-upgrade-max-pressure", component.MaxPressure / copy.MaxPressure);
+            args.AddPercentageUpgrade("portable-scrubber-component-upgrade-transfer-rate", component.TransferRate / copy.TransferRate);
+        }
+        // End Corvax-Next
     }
 }

Content.Server/Bed/BedSystem.cs

@@ -1,4 +1,6 @@
 using Content.Server.Actions;
+using Content.Server.Construction; // Corvax-Next
+using Content.Shared.Emag.Components; // Corvax-Next
 using Content.Server.Bed.Components;
 using Content.Server.Body.Systems;
 using Content.Server.Power.Components;
@@ -34,6 +36,8 @@ public override void Initialize()
             SubscribeLocalEvent<StasisBedComponent, UnstrappedEvent>(OnStasisUnstrapped);
             SubscribeLocalEvent<StasisBedComponent, PowerChangedEvent>(OnPowerChanged);
             SubscribeLocalEvent<StasisBedComponent, GotEmaggedEvent>(OnEmagged);
+            SubscribeLocalEvent<StasisBedComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+            SubscribeLocalEvent<StasisBedComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
         }
 
         private void OnStrapped(Entity<HealOnBuckleComponent> bed, ref StrappedEvent args)
@@ -133,5 +137,24 @@ private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool
                 RaiseLocalEvent(buckledEntity, ref metabolicEvent);
             }
         }
+
+        // Corvax-Next
+        private void OnRefreshParts(EntityUid uid, StasisBedComponent component, RefreshPartsEvent args)
+        {
+            var metabolismRating = args.PartRatings["Capacitor"];
+            StasisBedComponent copy = new StasisBedComponent();
+
+            component.Multiplier = copy.Multiplier * metabolismRating; //linear scaling so it's not OP
+            if (HasComp<EmaggedComponent>(uid))
+                component.Multiplier = 1f / component.Multiplier;
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, StasisBedComponent component, UpgradeExamineEvent args)
+        {
+            StasisBedComponent copy = new StasisBedComponent();
+
+            args.AddPercentageUpgrade("stasis-bed-component-upgrade-stasis", component.Multiplier / copy.Multiplier);
+        }
+        // End Corvax-Next
     }
 }

Content.Server/Botany/Systems/SeedExtractorSystem.cs

@@ -1,4 +1,5 @@
 using Content.Server.Botany.Components;
+using Content.Server.Construction; // Corvax-Next
 using Content.Server.Popups;
 using Content.Server.Power.EntitySystems;
 using Content.Shared.Interaction;
@@ -18,6 +19,8 @@ public override void Initialize()
         base.Initialize();
 
         SubscribeLocalEvent<SeedExtractorComponent, InteractUsingEvent>(OnInteractUsing);
+        SubscribeLocalEvent<SeedExtractorComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+        SubscribeLocalEvent<SeedExtractorComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
     }
 
     private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor, InteractUsingEvent args)
@@ -51,4 +54,18 @@ private void OnInteractUsing(EntityUid uid, SeedExtractorComponent seedExtractor
             _botanySystem.SpawnSeedPacket(packetSeed, coords, args.User);
         }
     }
+
+    // Corvax-Next
+    private void OnRefreshParts(EntityUid uid, SeedExtractorComponent seedExtractor, RefreshPartsEvent args)
+    {
+        var manipulatorQuality = args.PartRatings["Manipulator"];
+
+        seedExtractor.BaseMaxSeeds = (int)MathF.Pow(new SeedExtractorComponent().BaseMaxSeeds, manipulatorQuality - 1);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, SeedExtractorComponent seedExtractor, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("seed-extractor-component-upgrade-seed-yield", seedExtractor.BaseMaxSeeds);
+    }
+    // End Corvax-Next
 }

Content.Server/Cargo/Systems/CargoSystem.Telepad.cs

@@ -3,6 +3,7 @@
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
 using Content.Server.Station.Components;
+using Content.Server.Construction; // Corvax-Next
 using Content.Shared.Cargo;
 using Content.Shared.Cargo.Components;
 using Content.Shared.DeviceLinking;
@@ -23,6 +24,8 @@ private void InitializeTelepad()
         // Shouldn't need re-anchored event
         SubscribeLocalEvent<CargoTelepadComponent, AnchorStateChangedEvent>(OnTelepadAnchorChange);
         SubscribeLocalEvent<FulfillCargoOrderEvent>(OnTelepadFulfillCargoOrder);
+        SubscribeLocalEvent<CargoTelepadComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+        SubscribeLocalEvent<CargoTelepadComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
     }
 
     private void OnTelepadFulfillCargoOrder(ref FulfillCargoOrderEvent args)
@@ -161,4 +164,18 @@ private void OnTelepadAnchorChange(EntityUid uid, CargoTelepadComponent componen
     {
         SetEnabled(uid, component);
     }
+
+    // Corvax-Next
+    private void OnRefreshParts(EntityUid uid, CargoTelepadComponent component, RefreshPartsEvent args)
+    {
+        var rating = args.PartRatings["Capacitor"] - 1;
+
+        component.Delay = new CargoTelepadComponent().Delay * MathF.Pow(0.8f, rating);
+    }
+
+    private void OnUpgradeExamine(EntityUid uid, CargoTelepadComponent component, UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("cargo-telepad-delay-upgrade", component.Delay / new CargoTelepadComponent().Delay);
+    }
+    // End Corvax-Next
 }

Content.Server/Chemistry/Components/SolutionHeaterComponent.cs

@@ -8,4 +8,12 @@ public sealed partial class SolutionHeaterComponent : Component
     /// </summary>
     [DataField, ViewVariables(VVAccess.ReadWrite)]
     public float HeatPerSecond;
+
+    // Corvax-Next
+    /// <summary>
+    /// How much heat is added per second to the solution, with no upgrades.
+    /// </summary>
+    [DataField("baseHeatPerSecond")]
+    public float BaseHeatPerSecond = 120;
+    // End Corvax-Next
 }

Content.Server/Chemistry/EntitySystems/SolutionHeaterSystem.cs

@@ -1,6 +1,7 @@
 using Content.Server.Chemistry.Components;
 using Content.Server.Power.Components;
 using Content.Server.Power.EntitySystems;
+using Content.Server.Construction; // Corvax-Next
 using Content.Shared.Chemistry.EntitySystems;
 using Content.Shared.Chemistry;
 using Content.Shared.Chemistry.Components.SolutionManager;
@@ -23,6 +24,8 @@ public override void Initialize()
         SubscribeLocalEvent<SolutionHeaterComponent, PowerChangedEvent>(OnPowerChanged);
         SubscribeLocalEvent<SolutionHeaterComponent, ItemPlacedEvent>(OnItemPlaced);
         SubscribeLocalEvent<SolutionHeaterComponent, ItemRemovedEvent>(OnItemRemoved);
+        SubscribeLocalEvent<SolutionHeaterComponent, RefreshPartsEvent>(OnRefreshParts); // Corvax-Next
+        SubscribeLocalEvent<SolutionHeaterComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
     }
 
     private void TurnOn(EntityUid uid)
@@ -62,6 +65,20 @@ private void OnPowerChanged(Entity<SolutionHeaterComponent> entity, ref PowerCha
         }
     }
 
+    // Corvax-Next
+    private void OnRefreshParts(Entity<SolutionHeaterComponent> entity, ref RefreshPartsEvent args)
+    {
+        var heatRating = args.PartRatings["Capacitor"] - 1;
+
+        entity.Comp.HeatPerSecond = entity.Comp.BaseHeatPerSecond * MathF.Pow(1.5f, heatRating);
+    }
+
+    private void OnUpgradeExamine(Entity<SolutionHeaterComponent> entity, ref UpgradeExamineEvent args)
+    {
+        args.AddPercentageUpgrade("solution-heater-upgrade-heat", entity.Comp.HeatPerSecond / entity.Comp.BaseHeatPerSecond);
+    }
+    // End Corvax-Next
+
     private void OnItemPlaced(Entity<SolutionHeaterComponent> entity, ref ItemPlacedEvent args)
     {
         TryTurnOn(entity);

Content.Server/Cloning/CloningSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Cloning.Components;
 using Content.Server.DeviceLinking.Systems;
+using Content.Server.Construction; // Corvax-Next
 using Content.Server.EUI;
 using Content.Server.Fluids.EntitySystems;
 using Content.Server.Humanoid;
@@ -75,6 +76,8 @@ public override void Initialize()
             SubscribeLocalEvent<CloningPodComponent, AnchorStateChangedEvent>(OnAnchor);
             SubscribeLocalEvent<CloningPodComponent, ExaminedEvent>(OnExamined);
             SubscribeLocalEvent<CloningPodComponent, GotEmaggedEvent>(OnEmagged);
+            SubscribeLocalEvent<CloningPodComponent, RefreshPartsEvent>(OnPartsRefreshed); // Corvax-Next
+            SubscribeLocalEvent<CloningPodComponent, UpgradeExamineEvent>(OnUpgradeExamine); // Corvax-Next
         }
 
         private void OnComponentInit(EntityUid uid, CloningPodComponent clonePod, ComponentInit args)
@@ -340,5 +343,26 @@ public void Reset(RoundRestartCleanupEvent ev)
         {
             ClonesWaitingForMind.Clear();
         }
+
+        // Corvax-Next
+        private void OnPartsRefreshed(EntityUid uid, CloningPodComponent component, RefreshPartsEvent args)
+        {
+            var materialRating = args.PartRatings["MatterBin"];
+            var speedRating = args.PartRatings["Manipulator"];
+
+            var copy = new CloningPodComponent();
+
+            component.UsedBiomass = (int)(copy.UsedBiomass * MathF.Pow(0.85f, materialRating - 1));
+            component.CloningTime = copy.CloningTime * MathF.Pow(0.75f, speedRating - 1);
+        }
+
+        private void OnUpgradeExamine(EntityUid uid, CloningPodComponent component, UpgradeExamineEvent args)
+        {
+            var copy = new CloningPodComponent();
+
+            args.AddPercentageUpgrade("cloning-pod-component-upgrade-speed", copy.CloningTime / component.CloningTime);
+            args.AddPercentageUpgrade("cloning-pod-component-upgrade-biomass-requirement", copy.UsedBiomass / component.UsedBiomass);
+        }
+        // End Corvax-Next
     }
 }

Content.Server/Construction/Components/MachineComponent.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Components;
 using Robust.Shared.Containers;
 using Robust.Shared.Prototypes;
 
@@ -15,3 +15,14 @@ public sealed partial class MachineComponent : Component
     [ViewVariables]
     public Container PartContainer = default!;
 }
+
+// Corvax-Next: maintain upgradeable machine parts
+/// <summary>
+/// The different types of scaling that are available for machine upgrades
+/// </summary>
+public enum MachineUpgradeScalingType : byte
+{
+    Linear,
+    Exponential
+}
+// End Corvax-Next

Content.Server/Construction/Components/MachineFrameComponent.cs

@@ -1,4 +1,5 @@
-using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Components;
+using Content.Shared.Construction.Prototypes; // Corvax-Next: upgradeable machine parts
 using Content.Shared.Stacks;
 using Content.Shared.Tag;
 using Robust.Shared.Containers;
@@ -15,6 +16,9 @@ public sealed partial class MachineFrameComponent : Component
         [ViewVariables]
         public bool HasBoard => BoardContainer?.ContainedEntities.Count != 0;
 
+        [ViewVariables] // Corvax-Next: upgradeable machine parts
+        public Dictionary<ProtoId<MachinePartPrototype>, int> Progress = new(); // Corvax-Next: upgradeable machine parts
+
         [ViewVariables]
         public readonly Dictionary<ProtoId<StackPrototype>, int> MaterialProgress = new();
 
@@ -24,6 +28,9 @@ public sealed partial class MachineFrameComponent : Component
         [ViewVariables]
         public readonly Dictionary<ProtoId<TagPrototype>, int> TagProgress = new();
 
+        [ViewVariables] // Corvax-Next: upgradeable machine parts
+        public Dictionary<ProtoId<MachinePartPrototype>, int> Requirements = new(); // Corvax-Next: upgradeable machine parts
+
         [ViewVariables]
         public Dictionary<ProtoId<StackPrototype>, int> MaterialRequirements = new();
 

Content.Server/Construction/Conditions/MachineFrameComplete.cs

@@ -92,6 +92,21 @@ public bool DoExamine(ExaminedEvent args)
                                 + "\n");
             }
 
+            // Frontier: restore upgradeable parts
+            foreach (var (part, required) in machineFrame.Requirements)
+            {
+                var amount = required - machineFrame.Progress[part];
+
+                if (amount == 0)
+                    continue;
+                var stockPart = protoManager.Index(part);
+
+                args.PushMarkup(Loc.GetString("construction-condition-machine-frame-required-element-entry",
+                                           ("amount", amount),
+                                           ("elementName", Loc.GetString(stockPart.Name))));
+            }
+            // End Frontier
+
             return true;
         }