diff --git a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
index ab1bb415d1..23e8c1a6ad 100644
--- a/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
+++ b/Content.Client/GameObjects/Components/Chemistry/InjectorComponent.cs
@@ -16,8 +16,8 @@ namespace Content.Client.GameObjects.Components.Chemistry
[RegisterComponent]
public class InjectorComponent : SharedInjectorComponent, IItemStatus
{
- [ViewVariables] private int CurrentVolume { get; set; }
- [ViewVariables] private int TotalVolume { get; set; }
+ [ViewVariables] private decimal CurrentVolume { get; set; }
+ [ViewVariables] private decimal TotalVolume { get; set; }
[ViewVariables] private InjectorToggleMode CurrentMode { get; set; }
[ViewVariables(VVAccess.ReadWrite)] private bool _uiUpdateNeeded;
@@ -28,9 +28,9 @@ namespace Content.Client.GameObjects.Components.Chemistry
//Handle net updates
public override void HandleComponentState(ComponentState curState, ComponentState nextState)
{
- var cast = (InjectorComponentState)curState;
- if (cast != null)
+ if(curState.GetType() == typeof(InjectorComponentState))
{
+ var cast = (InjectorComponentState) curState;
CurrentVolume = cast.CurrentVolume;
TotalVolume = cast.TotalVolume;
CurrentMode = cast.CurrentMode;
diff --git a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
index e43a1d7dd3..0839d6f164 100644
--- a/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
+++ b/Content.Server/Chemistry/Metabolism/DefaultDrink.cs
@@ -28,7 +28,7 @@ namespace Content.Server.Chemistry.Metabolism
}
//Remove reagent at set rate, satiate thirst if a ThirstComponent can be found
- int IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
+ decimal IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
{
int metabolismAmount = (int)Math.Round(MetabolismRate * tickTime);
if (solutionEntity.TryGetComponent(out ThirstComponent thirst))
diff --git a/Content.Server/Chemistry/Metabolism/DefaultFood.cs b/Content.Server/Chemistry/Metabolism/DefaultFood.cs
index 824721acfd..4de983702a 100644
--- a/Content.Server/Chemistry/Metabolism/DefaultFood.cs
+++ b/Content.Server/Chemistry/Metabolism/DefaultFood.cs
@@ -1,6 +1,7 @@
using System;
using Content.Server.GameObjects.Components.Nutrition;
using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Maths;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Serialization;
@@ -14,25 +15,25 @@ namespace Content.Server.Chemistry.Metabolism
class DefaultFood : IMetabolizable
{
//Rate of metabolism in units / second
- private int _metabolismRate;
- public int MetabolismRate => _metabolismRate;
+ private decimal _metabolismRate;
+ public decimal MetabolismRate => _metabolismRate;
//How much hunger is satiated when 1u of the reagent is metabolized
- private float _nutritionFactor;
- public float NutritionFactor => _nutritionFactor;
+ private decimal _nutritionFactor;
+ public decimal NutritionFactor => _nutritionFactor;
void IExposeData.ExposeData(ObjectSerializer serializer)
{
- serializer.DataField(ref _metabolismRate, "rate", 1);
- serializer.DataField(ref _nutritionFactor, "nutrimentFactor", 30.0f);
+ serializer.DataField(ref _metabolismRate, "rate", 1M);
+ serializer.DataField(ref _nutritionFactor, "nutrimentFactor", 30.0M);
}
//Remove reagent at set rate, satiate hunger if a HungerComponent can be found
- int IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
+ decimal IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
{
- int metabolismAmount = (int)Math.Round(MetabolismRate * tickTime);
+ var metabolismAmount = (MetabolismRate * (decimal) tickTime).RoundForReagents();
if (solutionEntity.TryGetComponent(out HungerComponent hunger))
- hunger.UpdateFood(metabolismAmount * NutritionFactor);
+ hunger.UpdateFood((float)(metabolismAmount * NutritionFactor));
//Return amount of reagent to be removed, remove reagent regardless of HungerComponent presence
return metabolismAmount;
diff --git a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
index 7382a7bdc2..2bdff9b1c2 100644
--- a/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
+++ b/Content.Server/Chemistry/ReactionEffects/ExplosionReactionEffect.cs
@@ -35,9 +35,9 @@ namespace Content.Server.Chemistry.ReactionEffects
serializer.DataField(ref _maxScale, "maxScale", 1);
}
- public void React(IEntity solutionEntity, int intensity)
+ public void React(IEntity solutionEntity, decimal intensity)
{
- float floatIntensity = intensity; //Use float to avoid truncation in scaling
+ float floatIntensity = (float)intensity;
if (solutionEntity == null)
return;
if(!solutionEntity.TryGetComponent(out SolutionComponent solution))
diff --git a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs
index d4140d31f4..b9f0527793 100644
--- a/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/InjectorComponent.cs
@@ -37,7 +37,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
/// attempt to inject it's entire contents upon use.
///
[ViewVariables]
- private int _transferAmount;
+ private decimal _transferAmount;
///
/// Initial storage volume of the injector
@@ -165,7 +165,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
}
//Get transfer amount. May be smaller than _transferAmount if not enough room
- int realTransferAmount = Math.Min(_transferAmount, targetBloodstream.EmptyVolume);
+ decimal realTransferAmount = Math.Min(_transferAmount, targetBloodstream.EmptyVolume);
if (realTransferAmount <= 0)
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, user,
@@ -193,7 +193,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
}
//Get transfer amount. May be smaller than _transferAmount if not enough room
- int realTransferAmount = Math.Min(_transferAmount, targetSolution.EmptyVolume);
+ decimal realTransferAmount = Math.Min(_transferAmount, targetSolution.EmptyVolume);
if (realTransferAmount <= 0)
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, user,
@@ -221,7 +221,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
}
//Get transfer amount. May be smaller than _transferAmount if not enough room
- int realTransferAmount = Math.Min(_transferAmount, targetSolution.CurrentVolume);
+ decimal realTransferAmount = Math.Min(_transferAmount, targetSolution.CurrentVolume);
if (realTransferAmount <= 0)
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, user,
diff --git a/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs b/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs
index b0f47233b0..1ad4386634 100644
--- a/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/PourableComponent.cs
@@ -69,7 +69,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
return false;
//Get transfer amount. May be smaller than _transferAmount if not enough room
- int realTransferAmount = Math.Min(attackPourable.TransferAmount, targetSolution.EmptyVolume);
+ decimal realTransferAmount = Math.Min(attackPourable.TransferAmount, targetSolution.EmptyVolume);
if (realTransferAmount <= 0) //Special message if container is full
{
_notifyManager.PopupMessage(Owner.Transform.GridPosition, eventArgs.User,
diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
index 98b064bfc2..b612c4052d 100644
--- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -7,6 +7,7 @@ using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces;
using Content.Shared.Chemistry;
using Content.Shared.GameObjects;
+using Content.Shared.Maths;
using Robust.Server.GameObjects.EntitySystems;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
@@ -205,7 +206,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
//Check the solution for every reaction
foreach (var reaction in _reactions)
{
- if (SolutionValidReaction(reaction, out int unitReactions))
+ if (SolutionValidReaction(reaction, out var unitReactions))
{
PerformReaction(reaction, unitReactions);
checkForNewReaction = true;
@@ -223,11 +224,13 @@ namespace Content.Server.GameObjects.Components.Chemistry
}
}
- public bool TryAddReagent(string reagentId, int quantity, out int acceptedQuantity, bool skipReactionCheck = false, bool skipColor = false)
+ public bool TryAddReagent(string reagentId, decimal quantity, out decimal acceptedQuantity, bool skipReactionCheck = false, bool skipColor = false)
{
- if (quantity > _maxVolume - _containedSolution.TotalVolume)
+ quantity = quantity.RoundForReagents();
+ var toAcceptQuantity = (_maxVolume - _containedSolution.TotalVolume).RoundForReagents();
+ if (quantity > toAcceptQuantity)
{
- acceptedQuantity = _maxVolume - _containedSolution.TotalVolume;
+ acceptedQuantity = toAcceptQuantity;
if (acceptedQuantity == 0) return false;
}
else
@@ -267,16 +270,16 @@ namespace Content.Server.GameObjects.Components.Chemistry
/// The reaction whose reactants will be checked for in the solution.
/// The number of times the reaction can occur with the given solution.
///
- private bool SolutionValidReaction(ReactionPrototype reaction, out int unitReactions)
+ private bool SolutionValidReaction(ReactionPrototype reaction, out decimal unitReactions)
{
- unitReactions = int.MaxValue; //Set to some impossibly large number initially
+ unitReactions = decimal.MaxValue; //Set to some impossibly large number initially
foreach (var reactant in reaction.Reactants)
{
- if (!ContainsReagent(reactant.Key, out int reagentQuantity))
+ if (!ContainsReagent(reactant.Key, out decimal reagentQuantity))
{
return false;
}
- int currentUnitReactions = reagentQuantity / reactant.Value.Amount;
+ var currentUnitReactions = (reagentQuantity / reactant.Value.Amount).RoundForReagents();
if (currentUnitReactions < unitReactions)
{
unitReactions = currentUnitReactions;
@@ -299,21 +302,21 @@ namespace Content.Server.GameObjects.Components.Chemistry
/// Solution to be reacted.
/// Reaction to occur.
/// The number of times to cause this reaction.
- private void PerformReaction(ReactionPrototype reaction, int unitReactions)
+ private void PerformReaction(ReactionPrototype reaction, decimal unitReactions)
{
//Remove non-catalysts
foreach (var reactant in reaction.Reactants)
{
if (!reactant.Value.Catalyst)
{
- int amountToRemove = unitReactions * reactant.Value.Amount;
+ var amountToRemove = (unitReactions * reactant.Value.Amount).RoundForReagents();
TryRemoveReagent(reactant.Key, amountToRemove);
}
}
//Add products
foreach (var product in reaction.Products)
{
- TryAddReagent(product.Key, (int)(unitReactions * product.Value), out int acceptedQuantity, true);
+ TryAddReagent(product.Key, (int)(unitReactions * product.Value), out var acceptedQuantity, true);
}
//Trigger reaction effects
foreach (var effect in reaction.Effects)
diff --git a/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs b/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs
index 0fa862ce82..ef4579331d 100644
--- a/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs
+++ b/Content.Server/GameObjects/Components/Metabolism/BloodstreamComponent.cs
@@ -39,7 +39,7 @@ namespace Content.Server.GameObjects.Components.Metabolism
///
/// Empty volume of internal solution
///
- public int EmptyVolume => _internalSolution.EmptyVolume;
+ public decimal EmptyVolume => _internalSolution.EmptyVolume;
public override void ExposeData(ObjectSerializer serializer)
{
@@ -98,7 +98,7 @@ namespace Content.Server.GameObjects.Components.Metabolism
//Run metabolism code for each reagent
foreach (var metabolizable in proto.Metabolism)
{
- int reagentDelta = metabolizable.Metabolize(Owner, reagent.ReagentId, tickTime);
+ var reagentDelta = metabolizable.Metabolize(Owner, reagent.ReagentId, tickTime);
_internalSolution.TryRemoveReagent(reagent.ReagentId, reagentDelta);
}
}
diff --git a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
index ab6f259b24..26d552f71f 100644
--- a/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
@@ -5,6 +5,7 @@ using Content.Server.GameObjects.EntitySystems;
using Content.Shared.Chemistry;
using Content.Shared.GameObjects.Components.Nutrition;
using Content.Shared.Interfaces;
+using Content.Shared.Maths;
using Robust.Server.GameObjects;
using Robust.Shared.GameObjects;
using Robust.Shared.Interfaces.GameObjects;
@@ -32,11 +33,11 @@ namespace Content.Server.GameObjects.Components.Nutrition
[ViewVariables]
private string _finishPrototype;
- public int TransferAmount => _transferAmount;
+ public decimal TransferAmount => _transferAmount;
[ViewVariables]
- private int _transferAmount = 2;
+ private decimal _transferAmount = 2;
- public int MaxVolume
+ public decimal MaxVolume
{
get => _contents.MaxVolume;
set => _contents.MaxVolume = value;
@@ -56,7 +57,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
{
return 0;
}
- return Math.Max(1, _contents.CurrentVolume / _transferAmount);
+ return Math.Max(1, (int)Math.Ceiling(_contents.CurrentVolume / _transferAmount));
}
diff --git a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
index df990b392c..a528c223b6 100644
--- a/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
@@ -99,7 +99,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
{
return 0;
}
- return Math.Max(1, _contents.CurrentVolume / _transferAmount);
+ return Math.Max(1, (int)Math.Ceiling(_contents.CurrentVolume / _transferAmount));
}
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
diff --git a/Content.Server/GameObjects/Components/Nutrition/StomachComponent.cs b/Content.Server/GameObjects/Components/Nutrition/StomachComponent.cs
index 95353351f9..294fc20fcb 100644
--- a/Content.Server/GameObjects/Components/Nutrition/StomachComponent.cs
+++ b/Content.Server/GameObjects/Components/Nutrition/StomachComponent.cs
@@ -27,7 +27,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
///
/// Max volume of internal solution storage
///
- public int MaxVolume
+ public decimal MaxVolume
{
get => _stomachContents.MaxVolume;
set => _stomachContents.MaxVolume = value;
@@ -141,10 +141,10 @@ namespace Content.Server.GameObjects.Components.Nutrition
private class ReagentDelta
{
public readonly string ReagentId;
- public readonly int Quantity;
+ public readonly decimal Quantity;
public float Lifetime { get; private set; }
- public ReagentDelta(string reagentId, int quantity)
+ public ReagentDelta(string reagentId, decimal quantity)
{
ReagentId = reagentId;
Quantity = quantity;
diff --git a/Content.Server/Interfaces/Chemistry/IReactionEffect.cs b/Content.Server/Interfaces/Chemistry/IReactionEffect.cs
index bd01799557..9e5e28071b 100644
--- a/Content.Server/Interfaces/Chemistry/IReactionEffect.cs
+++ b/Content.Server/Interfaces/Chemistry/IReactionEffect.cs
@@ -8,6 +8,6 @@ namespace Content.Shared.Interfaces
///
public interface IReactionEffect : IExposeData
{
- void React(IEntity solutionEntity, int intensity);
+ void React(IEntity solutionEntity, decimal intensity);
}
}
diff --git a/Content.Shared/Chemistry/DefaultMetabolizable.cs b/Content.Shared/Chemistry/DefaultMetabolizable.cs
index ab5816d9f0..7ceb3372c4 100644
--- a/Content.Shared/Chemistry/DefaultMetabolizable.cs
+++ b/Content.Shared/Chemistry/DefaultMetabolizable.cs
@@ -1,5 +1,6 @@
using System;
using Content.Shared.Interfaces.Chemistry;
+using Content.Shared.Maths;
using Robust.Shared.Interfaces.GameObjects;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Serialization;
@@ -10,17 +11,17 @@ namespace Content.Shared.Chemistry
class DefaultMetabolizable : IMetabolizable
{
//Rate of metabolism in units / second
- private int _metabolismRate = 1;
- public int MetabolismRate => _metabolismRate;
+ private decimal _metabolismRate = 1;
+ public decimal MetabolismRate => _metabolismRate;
void IExposeData.ExposeData(ObjectSerializer serializer)
{
serializer.DataField(ref _metabolismRate, "rate", 1);
}
- int IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
+ decimal IMetabolizable.Metabolize(IEntity solutionEntity, string reagentId, float tickTime)
{
- int metabolismAmount = (int)Math.Round(MetabolismRate * tickTime);
+ var metabolismAmount = (MetabolismRate * (decimal)tickTime).RoundForReagents();
return metabolismAmount;
}
}
diff --git a/Content.Shared/Chemistry/Solution.cs b/Content.Shared/Chemistry/Solution.cs
index bbb9937249..e10d99f389 100644
--- a/Content.Shared/Chemistry/Solution.cs
+++ b/Content.Shared/Chemistry/Solution.cs
@@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis;
+using Content.Shared.Maths;
using Robust.Shared.Interfaces.Serialization;
using Robust.Shared.Serialization;
using Robust.Shared.Utility;
@@ -23,7 +24,7 @@ namespace Content.Shared.Chemistry
/// The calculated total volume of all reagents in the solution (ex. Total volume of liquid in beaker).
///
[ViewVariables]
- public int TotalVolume { get; private set; }
+ public decimal TotalVolume { get; private set; }
///
/// Constructs an empty solution (ex. an empty beaker).
@@ -60,9 +61,10 @@ namespace Content.Shared.Chemistry
///
/// The prototype ID of the reagent to add.
/// The quantity in milli-units.
- public void AddReagent(string reagentId, int quantity)
+ public void AddReagent(string reagentId, decimal quantity)
{
- if(quantity <= 0)
+ quantity = quantity.RoundForReagents();
+ if (quantity <= 0)
return;
for (var i = 0; i < _contents.Count; i++)
@@ -85,7 +87,7 @@ namespace Content.Shared.Chemistry
///
/// The prototype ID of the reagent to add.
/// The quantity in milli-units.
- public int GetReagentQuantity(string reagentId)
+ public decimal GetReagentQuantity(string reagentId)
{
for (var i = 0; i < _contents.Count; i++)
{
@@ -96,7 +98,7 @@ namespace Content.Shared.Chemistry
return 0;
}
- public void RemoveReagent(string reagentId, int quantity)
+ public void RemoveReagent(string reagentId, decimal quantity)
{
if(quantity <= 0)
return;
@@ -109,7 +111,7 @@ namespace Content.Shared.Chemistry
var curQuantity = reagent.Quantity;
- var newQuantity = curQuantity - quantity;
+ var newQuantity = (curQuantity - quantity).RoundForReagents();
if (newQuantity <= 0)
{
_contents.RemoveSwap(i);
@@ -129,12 +131,12 @@ namespace Content.Shared.Chemistry
/// Remove the specified quantity from this solution.
///
/// The quantity of this solution to remove
- public void RemoveSolution(int quantity)
+ public void RemoveSolution(decimal quantity)
{
if(quantity <= 0)
return;
- var ratio = (float)(TotalVolume - quantity) / TotalVolume;
+ var ratio = (TotalVolume - quantity).RoundForReagents() / TotalVolume;
if (ratio <= 0)
{
@@ -149,12 +151,12 @@ namespace Content.Shared.Chemistry
// quantity taken is always a little greedy, so fractional quantities get rounded up to the nearest
// whole unit. This should prevent little bits of chemical remaining because of float rounding errors.
- var newQuantity = (int)Math.Floor(oldQuantity * ratio);
+ var newQuantity = (oldQuantity * ratio).RoundForReagents();
_contents[i] = new ReagentQuantity(reagent.ReagentId, newQuantity);
}
- TotalVolume = (int)Math.Floor(TotalVolume * ratio);
+ TotalVolume = (TotalVolume * ratio).RoundForReagents();
}
public void RemoveAllSolution()
@@ -163,7 +165,7 @@ namespace Content.Shared.Chemistry
TotalVolume = 0;
}
- public Solution SplitSolution(int quantity)
+ public Solution SplitSolution(decimal quantity)
{
if (quantity <= 0)
return new Solution();
@@ -178,8 +180,8 @@ namespace Content.Shared.Chemistry
}
newSolution = new Solution();
- var newTotalVolume = 0;
- var ratio = (float)(TotalVolume - quantity) / TotalVolume;
+ var newTotalVolume = 0M;
+ var ratio = (TotalVolume - quantity) / TotalVolume;
for (var i = 0; i < _contents.Count; i++)
{
@@ -228,7 +230,7 @@ namespace Content.Shared.Chemistry
public Solution Clone()
{
- var volume = 0;
+ var volume = 0M;
var newSolution = new Solution();
for (var i = 0; i < _contents.Count; i++)
@@ -246,9 +248,9 @@ namespace Content.Shared.Chemistry
public readonly struct ReagentQuantity
{
public readonly string ReagentId;
- public readonly int Quantity;
+ public readonly decimal Quantity;
- public ReagentQuantity(string reagentId, int quantity)
+ public ReagentQuantity(string reagentId, decimal quantity)
{
ReagentId = reagentId;
Quantity = quantity;
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs
index ebbb4b11e4..8bf232b96f 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/SharedInjectorComponent.cs
@@ -18,11 +18,11 @@ namespace Content.Shared.GameObjects.Components.Chemistry
[Serializable, NetSerializable]
protected sealed class InjectorComponentState : ComponentState
{
- public int CurrentVolume { get; }
- public int TotalVolume { get; }
+ public decimal CurrentVolume { get; }
+ public decimal TotalVolume { get; }
public InjectorToggleMode CurrentMode { get; }
- public InjectorComponentState(int currentVolume, int totalVolume, InjectorToggleMode currentMode) : base(ContentNetIDs.REAGENT_INJECTOR)
+ public InjectorComponentState(decimal currentVolume, decimal totalVolume, InjectorToggleMode currentMode) : base(ContentNetIDs.REAGENT_INJECTOR)
{
CurrentVolume = currentVolume;
TotalVolume = totalVolume;
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SharedReagentDispenserComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SharedReagentDispenserComponent.cs
index 0066dc3d50..9907fb3550 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SharedReagentDispenserComponent.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/SharedReagentDispenserComponent.cs
@@ -26,8 +26,8 @@ namespace Content.Shared.GameObjects.Components.Chemistry
public class ReagentDispenserBoundUserInterfaceState : BoundUserInterfaceState
{
public readonly bool HasBeaker;
- public readonly int BeakerCurrentVolume;
- public readonly int BeakerMaxVolume;
+ public readonly decimal BeakerCurrentVolume;
+ public readonly decimal BeakerMaxVolume;
public readonly string ContainerName;
///
/// A list of the reagents which this dispenser can dispense.
@@ -38,10 +38,10 @@ namespace Content.Shared.GameObjects.Components.Chemistry
///
public readonly List ContainerReagents;
public readonly string DispenserName;
- public readonly int SelectedDispenseAmount;
+ public readonly decimal SelectedDispenseAmount;
- public ReagentDispenserBoundUserInterfaceState(bool hasBeaker, int beakerCurrentVolume, int beakerMaxVolume, string containerName,
- List inventory, string dispenserName, List containerReagents, int selectedDispenseAmount)
+ public ReagentDispenserBoundUserInterfaceState(bool hasBeaker, decimal beakerCurrentVolume, decimal beakerMaxVolume, string containerName,
+ List inventory, string dispenserName, List containerReagents, decimal selectedDispenseAmount)
{
HasBeaker = hasBeaker;
BeakerCurrentVolume = beakerCurrentVolume;
diff --git a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
index 426daa0639..71ba3c6c91 100644
--- a/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
+++ b/Content.Shared/GameObjects/Components/Chemistry/SolutionComponent.cs
@@ -18,7 +18,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
[ViewVariables]
protected Solution _containedSolution = new Solution();
- protected int _maxVolume;
+ protected decimal _maxVolume;
private SolutionCaps _capabilities;
///
@@ -30,7 +30,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
/// The maximum volume of the container.
///
[ViewVariables(VVAccess.ReadWrite)]
- public int MaxVolume
+ public decimal MaxVolume
{
get => _maxVolume;
set => _maxVolume = value; // Note that the contents won't spill out if the capacity is reduced.
@@ -40,13 +40,13 @@ namespace Content.Shared.GameObjects.Components.Chemistry
/// The total volume of all the of the reagents in the container.
///
[ViewVariables]
- public int CurrentVolume => _containedSolution.TotalVolume;
+ public decimal CurrentVolume => _containedSolution.TotalVolume;
///
/// The volume without reagents remaining in the container.
///
[ViewVariables]
- public int EmptyVolume => MaxVolume - CurrentVolume;
+ public decimal EmptyVolume => MaxVolume - CurrentVolume;
///
/// The current blended color of all the reagents in the container.
@@ -122,7 +122,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
OnSolutionChanged();
}
- public bool TryRemoveReagent(string reagentId, int quantity)
+ public bool TryRemoveReagent(string reagentId, decimal quantity)
{
if (!ContainsReagent(reagentId, out var currentQuantity)) return false;
@@ -146,7 +146,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
return true;
}
- public Solution SplitSolution(int quantity)
+ public Solution SplitSolution(decimal quantity)
{
var solutionSplit = _containedSolution.SplitSolution(quantity);
OnSolutionChanged();
@@ -159,7 +159,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
SubstanceColor = Color.White;
Color mixColor = default;
- float runningTotalQuantity = 0;
+ var runningTotalQuantity = 0M;
foreach (var reagent in _containedSolution)
{
@@ -171,7 +171,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
if (mixColor == default)
mixColor = proto.SubstanceColor;
- mixColor = BlendRGB(mixColor, proto.SubstanceColor, reagent.Quantity / runningTotalQuantity);
+ mixColor = BlendRGB(mixColor, proto.SubstanceColor, (float) (reagent.Quantity / runningTotalQuantity));
}
}
@@ -216,7 +216,7 @@ namespace Content.Shared.GameObjects.Components.Chemistry
/// The reagent to check for.
/// Output the quantity of the reagent if it is contained, 0 if it isn't.
/// Return true if the solution contains the reagent.
- public bool ContainsReagent(string reagentId, out int quantity)
+ public bool ContainsReagent(string reagentId, out decimal quantity)
{
foreach (var reagent in _containedSolution.Contents)
{
diff --git a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs
index 4b03ef51e2..3a55de645f 100644
--- a/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs
+++ b/Content.Shared/Interfaces/Chemistry/IMetabolizable.cs
@@ -19,6 +19,6 @@ namespace Content.Shared.Interfaces.Chemistry
/// The reagent id
/// The time since the last metabolism tick in seconds.
/// The amount of reagent to be removed. The metabolizing organ should handle removing the reagent.
- int Metabolize(IEntity solutionEntity, string reagentId, float tickTime);
+ decimal Metabolize(IEntity solutionEntity, string reagentId, float tickTime);
}
}
diff --git a/Content.Shared/Maths/Rounders.cs b/Content.Shared/Maths/Rounders.cs
new file mode 100644
index 0000000000..4b07d84026
--- /dev/null
+++ b/Content.Shared/Maths/Rounders.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Content.Shared.Maths
+{
+ public static class Rounders
+ {
+ public static decimal RoundForReagents(this decimal me)
+ {
+ return Math.Round(me, 2);
+ }
+ }
+}