Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Revert "Solution Entities" (#23160)

Browse Source 
Revert "Solution Entities (#21916)"

This reverts commit d75e743dd7.
This commit is contained in:
Emisse
2023-12-28 20:45:42 -07:00
committed by GitHub
parent c2c76c2035
commit 938d6d9945
180 changed files with 2959 additions and 3543 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Content.Server/Administration/Commands/AddReagent.cs
View File

@@ -1,11 +1,10 @@
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Robust.Shared.Console;
using Robust.Shared.Prototypes;
using System.Linq;
namespace Content.Server.Administration.Commands
{
@@ -42,13 +41,13 @@ namespace Content.Server.Administration.Commands
return;
}
var solutionContainerSystem = _entManager.System<SolutionContainerSystem>();
if (!solutionContainerSystem.TryGetSolution((uid.Value, man), args[1], out var solution))
if (!man.Solutions.ContainsKey(args[1]))
{
var validSolutions = string.Join(", ", solutionContainerSystem.EnumerateSolutions((uid.Value, man)).Select(s => s.Name));
var validSolutions = string.Join(", ", man.Solutions.Keys);
shell.WriteLine($"Entity does not have a \"{args[1]}\" solution. Valid solutions are:\n{validSolutions}");
return;
}
var solution = man.Solutions[args[1]];
if (!_protomanager.HasIndex<ReagentPrototype>(args[2]))
{
@@ -64,9 +63,9 @@ namespace Content.Server.Administration.Commands
var quantity = FixedPoint2.New(MathF.Abs(quantityFloat));
if (quantityFloat > 0)
solutionContainerSystem.TryAddReagent(solution.Value, args[2], quantity, out _);
_entManager.System<SolutionContainerSystem>().TryAddReagent(uid.Value, solution, args[2], quantity, out _);
else
solutionContainerSystem.RemoveReagent(solution.Value, args[2], quantity);
_entManager.System<SolutionContainerSystem>().RemoveReagent(uid.Value, solution, args[2], quantity);
}
}
}

13
Content.Server/Administration/Commands/SetSolutionCapacity.cs
View File

@@ -1,9 +1,8 @@
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Chemistry.Components.SolutionManager;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.FixedPoint;
using Robust.Shared.Console;
using System.Linq;
namespace Content.Server.Administration.Commands
{
@@ -36,13 +35,13 @@ namespace Content.Server.Administration.Commands
return;
}
var solutionContainerSystem = _entManager.System<SolutionContainerSystem>();
if (!solutionContainerSystem.TryGetSolution((uid.Value, man), args[1], out var solution))
if (!man.Solutions.ContainsKey(args[1]))
{
var validSolutions = string.Join(", ", solutionContainerSystem.EnumerateSolutions((uid.Value, man)).Select(s => s.Name));
var validSolutions = string.Join(", ", man.Solutions.Keys);
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 quantityFloat))
{
@@ -50,14 +49,14 @@ namespace Content.Server.Administration.Commands
return;
}
if (quantityFloat < 0.0f)
if(quantityFloat < 0.0f)
{
shell.WriteLine($"Cannot set the maximum volume of a solution to a negative number.");
return;
}
var quantity = FixedPoint2.New(quantityFloat);
solutionContainerSystem.SetCapacity(solution.Value, quantity);
_entManager.System<SolutionContainerSystem>().SetCapacity(uid.Value, solution, quantity);
}
}
}

11
Content.Server/Administration/Commands/SetSolutionTemperature.cs
View File

@@ -1,8 +1,7 @@
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
{
@@ -35,13 +34,13 @@ namespace Content.Server.Administration.Commands
return;
}
var solutionContainerSystem = _entManager.System<SolutionContainerSystem>();
if (!solutionContainerSystem.TryGetSolution((uid.Value, man), args[1], out var solution))
if (!man.Solutions.ContainsKey(args[1]))
{
var validSolutions = string.Join(", ", solutionContainerSystem.EnumerateSolutions((uid.Value, man)).Select(s => s.Name));
var validSolutions = string.Join(", ", man.Solutions.Keys);
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))
{
@@ -55,7 +54,7 @@ namespace Content.Server.Administration.Commands
return;
}
solutionContainerSystem.SetTemperature(solution.Value, quantity);
_entManager.System<SolutionContainerSystem>().SetTemperature(uid.Value, solution, quantity);
}
}
}

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

@@ -1,8 +1,7 @@
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
{
@@ -35,13 +34,13 @@ namespace Content.Server.Administration.Commands
return;
}
var solutionContainerSystem = _entManager.System<SolutionContainerSystem>();
if (!solutionContainerSystem.TryGetSolution((uid.Value, man), args[1], out var solutionEnt, out var solution))
if (!man.Solutions.ContainsKey(args[1]))
{
var validSolutions = string.Join(", ", solutionContainerSystem.EnumerateSolutions((uid.Value, man)).Select(s => s.Name));
var validSolutions = string.Join(", ", man.Solutions.Keys);
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))
{
@@ -51,19 +50,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;
}
solutionContainerSystem.SetThermalEnergy(solutionEnt.Value, quantity);
_entManager.System<SolutionContainerSystem>().SetThermalEnergy(uid.Value, solution, quantity);
}
}
}