tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make RemoveReagent return a FixedPoint2 (#39266)

Browse Source 
change return
This commit is contained in:
slarticodefast
2025-07-29 16:39:48 +02:00
committed by GitHub
parent 3f41b47d2e
commit d4e77423ca
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Content.Shared/Chemistry/EntitySystems/SharedSolutionContainerSystem.cs
View File

@@ -510,20 +510,20 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
/// Removes reagent from a container. /// Removes reagent from a container.
/// </summary> /// </summary>
/// <param name="targetUid"></param> /// <param name="targetUid"></param>
/// <param name="container">Solution container from which we are removing reagent</param> /// <param name="container">Solution container from which we are removing reagent.</param>
/// <param name="reagentQuantity">The reagent to remove.</param> /// <param name="reagentQuantity">The reagent to remove.</param>
/// <returns>If the reagent to remove was found in the container.</returns> /// <returns>The amount of reagent that was removed.</returns>
public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity) public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentQuantity reagentQuantity)
{ {
var (uid, comp) = soln; var (uid, comp) = soln;
var solution = comp.Solution; var solution = comp.Solution;
var quant = solution.RemoveReagent(reagentQuantity); var quant = solution.RemoveReagent(reagentQuantity);
if (quant <= FixedPoint2.Zero) if (quant <= FixedPoint2.Zero)
return false; return FixedPoint2.Zero;
UpdateChemicals(soln); UpdateChemicals(soln);
return true; return quant;
} }
/// <summary> /// <summary>
@@ -533,8 +533,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
/// <param name="container">Solution container from which we are removing reagent</param> /// <param name="container">Solution container from which we are removing reagent</param>
/// <param name="prototype">The Id of the reagent to remove.</param> /// <param name="prototype">The Id of the reagent to remove.</param>
/// <param name="quantity">The amount of reagent to remove.</param> /// <param name="quantity">The amount of reagent to remove.</param>
/// <returns>If the reagent to remove was found in the container.</returns> /// <returns>The amount of reagent that was removed.</returns>
public bool RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null) public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, string prototype, FixedPoint2 quantity, List<ReagentData>? data = null)
{ {
return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data)); return RemoveReagent(soln, new ReagentQuantity(prototype, quantity, data));
} }
@@ -546,8 +546,8 @@ public abstract partial class SharedSolutionContainerSystem : EntitySystem
/// <param name="container">Solution container from which we are removing reagent</param> /// <param name="container">Solution container from which we are removing reagent</param>
/// <param name="reagentId">The reagent to remove.</param> /// <param name="reagentId">The reagent to remove.</param>
/// <param name="quantity">The amount of reagent to remove.</param> /// <param name="quantity">The amount of reagent to remove.</param>
/// <returns>If the reagent to remove was found in the container.</returns> /// <returns>The amount of reagent that was removed.</returns>
public bool RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity) public FixedPoint2 RemoveReagent(Entity<SolutionComponent> soln, ReagentId reagentId, FixedPoint2 quantity)
{ {
return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity)); return RemoveReagent(soln, new ReagentQuantity(reagentId, quantity));
} }