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

7
Content.IntegrationTests/Tests/Fluids/PuddleTest.cs
View File

@@ -4,6 +4,7 @@ using Content.Server.Fluids.Components;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Coordinates;
using Content.Shared.FixedPoint;
using NUnit.Framework;
using Robust.Shared.GameObjects;
using Robust.Shared.Map;
@@ -56,7 +57,7 @@ namespace Content.IntegrationTests.Tests.Fluids
server.Assert(() =>
{
var solution = new Solution("water", ReagentUnit.New(20));
var solution = new Solution("water", FixedPoint2.New(20));
var puddle = solution.SpillAt(coordinates, "PuddleSmear");
Assert.NotNull(puddle);
});
@@ -94,7 +95,7 @@ namespace Content.IntegrationTests.Tests.Fluids
server.Assert(() =>
{
var coordinates = grid.ToCoordinates();
var solution = new Solution("water", ReagentUnit.New(20));
var solution = new Solution("water", FixedPoint2.New(20));
var puddle = solution.SpillAt(coordinates, "PuddleSmear");
Assert.Null(puddle);
});
@@ -154,7 +155,7 @@ namespace Content.IntegrationTests.Tests.Fluids
// Spawn a puddle
await server.WaitAssertion(() =>
{
var solution = new Solution("water", ReagentUnit.New(amount));
var solution = new Solution("water", FixedPoint2.New(amount));
puddle = solution.SpillAt(sCoordinates, "PuddleSmear");
// Check that the puddle was created