MadisonBarks/Monolith
1
0
Fork 0
forked from SpaceStation14-Shenanigans/Monolith
Code Pull Requests Activity

Changed all int and some float things in Reagent code to Decimals

Browse Source
This commit is contained in:
PrPleGoo
2020-03-14 12:55:07 +01:00
parent b9f9eb6651
commit f05fdfb5fc
19 changed files with 101 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content.Server/GameObjects/Components/Nutrition/DrinkComponent.cs
+5 -4
View File
@@ -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));
}
Content.Server/GameObjects/Components/Nutrition/FoodComponent.cs
+1 -1
View File
@@ -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)
Content.Server/GameObjects/Components/Nutrition/StomachComponent.cs
+3 -3
View File
@@ -27,7 +27,7 @@ namespace Content.Server.GameObjects.Components.Nutrition
/// <summary>
/// Max volume of internal solution storage
/// </summary>
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;