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

18
Content.Server/Administration/Toolshed/SolutionCommand.cs
View File

@@ -1,12 +1,12 @@
using System.Linq;
using Content.Server.Chemistry.Containers.EntitySystems;
using Content.Shared.Administration;
using Content.Shared.Chemistry.Components;
using Content.Shared.Chemistry.EntitySystems;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.FixedPoint;
using Robust.Shared.Toolshed;
using Robust.Shared.Toolshed.Syntax;
using Robust.Shared.Toolshed.TypeParsers;
using System.Linq;
namespace Content.Server.Administration.Toolshed;
@@ -24,10 +24,8 @@ public sealed class SolutionCommand : ToolshedCommand
{
_solutionContainer ??= GetSys<SolutionContainerSystem>();
_solutionContainer.TryGetSolution(input, name.Evaluate(ctx)!, out var solution);
if (solution is not null)
return new SolutionRef(input, solution);
if (_solutionContainer.TryGetSolution(input, name.Evaluate(ctx)!, out var solution))
return new SolutionRef(solution.Value);
return null;
}
@@ -55,11 +53,11 @@ public sealed class SolutionCommand : ToolshedCommand
var amount = amountRef.Evaluate(ctx);
if (amount > 0)
{
_solutionContainer.TryAddReagent(input.Owner, input.Solution, name.Value.ID, amount, out _);
_solutionContainer.TryAddReagent(input.Solution, name.Value.ID, amount, out _);
}
else if (amount < 0)
{
_solutionContainer.RemoveReagent(input.Owner, input.Solution, name.Value.ID, -amount);
_solutionContainer.RemoveReagent(input.Solution, name.Value.ID, -amount);
}
return input;
@@ -75,10 +73,10 @@ public sealed class SolutionCommand : ToolshedCommand
=> input.Select(x => AdjReagent(ctx, x, name, amountRef));
}
public readonly record struct SolutionRef(EntityUid Owner, Solution Solution)
public readonly record struct SolutionRef(Entity<SolutionComponent> Solution)
{
public override string ToString()
{
return $"{Owner} {Solution}";
return $"{Solution.Owner} {Solution.Comp.Solution}";
}
}