Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: DEATHB4DEFEAT <[email protected]>
Signed-off-by: VMSolidus <[email protected]>
  • Loading branch information
VMSolidus and DEATHB4DEFEAT committed Sep 19, 2024
1 parent f4d59b7 commit 3868b4a
Show file tree
Hide file tree
Showing 10 changed files with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ public async Task UpgradeLathe()

// Initially has all quality-1 parts.
foreach (var part in SConstruction.GetAllParts(serverTarget))
{
Assert.That(part.Rating, Is.EqualTo(1));
}

// Partially deconstruct lathe
await Interact(Screw, Pry, Pry);
Expand All @@ -81,9 +79,7 @@ public async Task UpgradeLathe()

// Query now returns higher quality parts.
foreach (var part in SConstruction.GetAllParts(SEntMan.GetEntity(Target!.Value)))
{
Assert.That(part.Rating, Is.EqualTo(4));
}
}
}

2 changes: 1 addition & 1 deletion Content.Server/Bed/BedSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ private void UpdateMetabolisms(EntityUid uid, StasisBedComponent component, bool
private void OnRefreshParts(EntityUid uid, StasisBedComponent component, RefreshPartsEvent args)
{
var metabolismRating = args.PartRatings[component.MachinePartMetabolismModifier];
component.Multiplier = component.BaseMultiplier * metabolismRating; //linear scaling so it's not OP
component.Multiplier = component.BaseMultiplier * metabolismRating; // Linear scaling so it's not OP
if (HasComp<EmaggedComponent>(uid))
component.Multiplier = 1f / component.Multiplier;
}
Expand Down
4 changes: 4 additions & 0 deletions Content.Server/Power/EntitySystems/UpgradePowerSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ private void OnRefreshParts(EntityUid uid, UpgradePowerDrawComponent component,
var load = component.BaseLoad;
var rating = args.PartRatings[component.MachinePartPowerDraw];
switch (component.Scaling)

{
case MachineUpgradeScalingType.Linear:
load += component.PowerDrawMultiplier * (rating - 1);
Expand All @@ -51,6 +52,7 @@ private void OnRefreshParts(EntityUid uid, UpgradePowerDrawComponent component,
load = 0;
break;
}

if (TryComp<ApcPowerReceiverComponent>(uid, out var powa))
powa.Load = load;
if (TryComp<PowerConsumerComponent>(uid, out var powa2))
Expand Down Expand Up @@ -80,6 +82,7 @@ private void OnSupplierRefreshParts(EntityUid uid, UpgradePowerSupplierComponent
var supply = component.BaseSupplyRate;
var rating = args.PartRatings[component.MachinePartPowerSupply];
switch (component.Scaling)

{
case MachineUpgradeScalingType.Linear:
supply += component.PowerSupplyMultiplier * component.BaseSupplyRate * (rating - 1);
Expand Down Expand Up @@ -119,6 +122,7 @@ private void OnSupplyRampingRefreshParts(EntityUid uid, UpgradePowerSupplyRampin
var rampRate = component.BaseRampRate;
var rating = args.PartRatings[component.MachinePartRampRate];
switch (component.Scaling)

{
case MachineUpgradeScalingType.Linear:
rampRate += component.SupplyRampingMultiplier * component.BaseRampRate * (rating - 1);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ private void OnExamine(EntityUid uid, TraversalDistorterComponent component, Exa
examine = Loc.GetString("traversal-distorter-desc-out");
break;
}

args.PushMarkup(examine);
}

Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/Cloning/CloningPodComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public sealed partial class CloningPodComponent : Component
public float PartRatingSpeedMultiplier = 0.75f;

/// <summary>
/// The machine part that affects cloning speed
/// The machine part that affects cloning speed
/// </summary>
[DataField]
public ProtoId<MachinePartPrototype> MachinePartCloningSpeed = "Manipulator";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
machine-part-component-on-examine-rating-text = [color=white]Rating:[/color] [color=cyan]{$rating}[/color]
machine-part-component-on-examine-type-text = [color=white]Type:[/color] [color=cyan]{$type}[/color]
machine-part-component-on-examine-type-text = [color=white]Type:[/color] [color=cyan]{$type}[/color]
2 changes: 1 addition & 1 deletion Resources/Locale/en-US/machine/machine.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ two-way-lever-cant = can't push the lever that way!
recycler-count-items = Recycled {$items} objects.
machine-already-in-use = {CAPITALIZE(THE($machine))} is already in use.
machine-already-in-use = {CAPITALIZE(THE($machine))} is already in use.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ fat-extractor-fact-2 = Adults should get a recommended 20-35% of their energy in
fat-extractor-fact-3 = Being overweight or obese puts you at an increased risk of chronic diseases, such as cardiovascular diseases, metabolic syndrome, type 2 diabetes, and some types of cancers.
fat-extractor-fact-4 = Not all fats are bad. A certain amount of fat is an essential part of a healthy balanced diet.
fat-extractor-fact-5 = Saturated fat should form no more than 11% of your daily calories.
fat-extractor-fact-6 = Unsaturated fat, that is monounsaturated fats, polyunsaturated fats, and omega-3 fatty acids, is found in plants and fish.
fat-extractor-fact-6 = Unsaturated fat, that is monounsaturated fats, polyunsaturated fats, and omega-3 fatty acids, is found in plants and fish.
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ comp-emitter-not-anchored = The {$target} isn't anchored to the ground!
emitter-component-upgrade-fire-rate = fire rate
emitter-component-current-type = The current selected type is: {$type}.
emitter-component-type-set = Type set to: {$type}
emitter-component-type-set = Type set to: {$type}
Original file line number Diff line number Diff line change
Expand Up @@ -304,4 +304,4 @@
prototypes:
- CrateSalvageAssortedGoodies
chance: 0.9
offset: 0.2
offset: 0.2

0 comments on commit 3868b4a

Please sign in to comment.