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

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Client/Administration/UI/AdminAddReagentUI.cs
View File

@@ -2,6 +2,7 @@ using Content.Client.Eui;
using Content.Shared.Administration;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Eui;
using Content.Shared.FixedPoint;
using JetBrains.Annotations;
using Robust.Client.UserInterface.Controls;
using Robust.Client.UserInterface.CustomControls;
@@ -40,7 +41,7 @@ namespace Content.Client.Administration.UI
_window.HandleState((AdminAddReagentEuiState) state);
}
private void DoAdd(bool close, string reagentId, ReagentUnit amount)
private void DoAdd(bool close, string reagentId, FixedPoint2 amount)
{
SendMessage(new AdminAddReagentEuiMsg.DoAdd
{
@@ -121,7 +122,7 @@ namespace Content.Client.Administration.UI
_eui.DoAdd(
close,
_reagentIdEdit.Text,
ReagentUnit.New(float.Parse(_amountEdit.Text)));
FixedPoint2.New(float.Parse(_amountEdit.Text)));
}
private void CheckErrors()