Generalize ReagentUnit into FixedPoint2 and use it for damage calculations (#5151)

* Damage units

* sum ext method
This commit is contained in:
mirrorcult
2021-11-03 16:48:03 -07:00
committed by GitHub
parent 8165d8f38c
commit 3ab4a30a0f
100 changed files with 730 additions and 601 deletions

View File

@@ -2,6 +2,7 @@ using System;
using Content.Shared.Chemistry;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Eui;
using Content.Shared.FixedPoint;
using Robust.Shared.Serialization;
namespace Content.Shared.Administration
@@ -9,8 +10,8 @@ namespace Content.Shared.Administration
[Serializable, NetSerializable]
public sealed class AdminAddReagentEuiState : EuiStateBase
{
public ReagentUnit MaxVolume;
public ReagentUnit CurVolume;
public FixedPoint2 MaxVolume;
public FixedPoint2 CurVolume;
}
public static class AdminAddReagentEuiMsg
@@ -25,7 +26,7 @@ namespace Content.Shared.Administration
public sealed class DoAdd : EuiMessageBase
{
public bool CloseAfter;
public ReagentUnit Amount;
public FixedPoint2 Amount;
public string ReagentId = string.Empty;
}
}