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

Revert 'Revert 'Solution Entities'' (#23168)

Browse Source
This commit is contained in:
TemporalOroboros
2023-12-29 04:47:43 -08:00
committed by GitHub
parent 93e1af2f8d
commit d23c8d5c19
180 changed files with 3541 additions and 2956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/Administration/Commands/SetSolutionThermalEnergy.cs
View File

@@ -1,7 +1,8 @@
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Robust.Shared.Console;
using System.Linq;
namespace Content.Server.Administration.Commands
{
@@ -34,13 +35,13 @@ namespace Content.Server.Administration.Commands
return;
}
if (!man.Solutions.ContainsKey(args[1]))
var solutionContainerSystem = _entManager.System<SolutionContainerSystem>();
if (!solutionContainerSystem.TryGetSolution((uid.Value, man), args[1], out var solutionEnt, out var solution))
{
var validSolutions = string.Join(", ", man.Solutions.Keys);
var validSolutions = string.Join(", ", solutionContainerSystem.EnumerateSolutions((uid.Value, man)).Select(s => s.Name));
shell.WriteLine($"Entity does not have a \"{args[1]}\" solution. Valid solutions are:\n{validSolutions}");
return;
}
var solution = man.Solutions[args[1]];
if (!float.TryParse(args[2], out var quantity))
{
@@ -50,19 +51,19 @@ namespace Content.Server.Administration.Commands
if (solution.GetHeatCapacity(null) <= 0.0f)
{
if(quantity != 0.0f)
if (quantity != 0.0f)
{
shell.WriteLine($"Cannot set the thermal energy of a solution with 0 heat capacity to a non-zero number.");
return;
}
}
else if(quantity <= 0.0f)
else if (quantity <= 0.0f)
{
shell.WriteLine($"Cannot set the thermal energy of a solution with heat capacity to a non-positive number.");
return;
}
_entManager.System<SolutionContainerSystem>().SetThermalEnergy(uid.Value, solution, quantity);
solutionContainerSystem.SetThermalEnergy(solutionEnt.Value, quantity);
}
}
}